db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henn...@apache.org
Subject svn commit: r239626 - in /db/torque/generator/trunk: ./ src/conf/ src/dtd/ src/java/org/apache/torque/engine/database/model/ src/java/org/apache/torque/engine/database/transform/ src/java/org/apache/torque/engine/platform/ src/java/org/apache/torque/ta...
Date Wed, 24 Aug 2005 12:20:23 GMT
Author: henning
Date: Wed Aug 24 05:19:51 2005
New Revision: 239626

URL: http://svn.apache.org/viewcvs?rev=239626&view=rev
Log:
Remove trailing blanks


Modified:
    db/torque/generator/trunk/maven.xml
    db/torque/generator/trunk/project.xml
    db/torque/generator/trunk/src/conf/build.properties
    db/torque/generator/trunk/src/conf/default.properties
    db/torque/generator/trunk/src/dtd/database.dtd
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Column.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Database.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Domain.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/JavaNameGenerator.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameFactory.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/SchemaType.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Table.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/TypeMap.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/XmlToAppData.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/XmlToData.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/Platform.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformCloudscapeImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDb2400Impl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDb2Impl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDefaultImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformFactory.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMssqlImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMysqlImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformOracleImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformPostgresqlImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformSapdbImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformSybaseImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/package.html
    db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataModelTask.java
    db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataSQLTask.java
    db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueJDBCTransformTask.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/DomainTest.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/MssqlDomainTest.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/NameFactoryTest.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/OracleDomainTest.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/PostgresqlDomainTest.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/TableTest.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/TypeMapTest.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/domaintest-schema.xml
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/tabletest-schema.xml
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/transform/SQLToAppDataTest.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/platform/PlatformMysqlImplTest.java
    db/torque/generator/trunk/xdocs/index.xml
    db/torque/generator/trunk/xdocs/properties-reference.xml
    db/torque/generator/trunk/xdocs/schema-reference.xml

Modified: db/torque/generator/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/maven.xml?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/maven.xml (original)
+++ db/torque/generator/trunk/maven.xml Wed Aug 24 05:19:51 2005
@@ -41,7 +41,7 @@
       file="${maven.src.dir}/dtd/database.dtd"
       tofile="target/docs/database.dtd.txt"
     />
-  </postGoal>  
+  </postGoal>
 
   <!-- ================================================================== -->
   <!-- D I S T : B U I L D _ B I N   P R E   G O A L                      -->
@@ -59,15 +59,15 @@
     </j:forEach>
 
     <!--copy build-torque.xml to the right place -->
-    <copy 
+    <copy
       file="${maven.src.dir}/conf/build-torque.xml"
       todir="${maven.dist.bin.assembly.dir}"
     />
-    <copy 
+    <copy
       file="${maven.src.dir}/conf/build.properties"
       todir="${maven.dist.bin.assembly.dir}"
     />
-    <copy 
+    <copy
       file="${maven.src.dir}/conf/default.properties"
       todir="${maven.dist.bin.assembly.dir}"
     />
@@ -89,7 +89,7 @@
         <include name="project.xml"/>
         <include name="project.properties"/>
       </fileset>
-    </copy>  
+    </copy>
   </preGoal>
 
   <!-- ================================================================== -->

Modified: db/torque/generator/trunk/project.xml
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/project.xml?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/project.xml (original)
+++ db/torque/generator/trunk/project.xml Wed Aug 24 05:19:51 2005
@@ -123,7 +123,7 @@
         <dist.bundle>true</dist.bundle>
       </properties>
     </dependency>
-    
+
     <dependency>
       <artifactId>xml-apis</artifactId>
       <groupId>xml-apis</groupId>
@@ -132,7 +132,7 @@
       <properties>
         <dist.bundle>true</dist.bundle>
       </properties>
-    </dependency>    
+    </dependency>
 
   </dependencies>
 

Modified: db/torque/generator/trunk/src/conf/build.properties
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/conf/build.properties?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/conf/build.properties (original)
+++ db/torque/generator/trunk/src/conf/build.properties Wed Aug 24 05:19:51 2005
@@ -29,14 +29,14 @@
 #  P R O J E C T
 #
 # -------------------------------------------------------------------
-# This is the name of your Torque project. Your non-Java generated 
+# This is the name of your Torque project. Your non-Java generated
 # files will be named using the project name selected below. If your
 # project=killerapp then you will have a generated:
 #
 #   killerapp-schema.sql
 #
 # The custom is then to also rename your project XML schema from
-# project-schema.xml to killerapp-schema.xml. This is required 
+# project-schema.xml to killerapp-schema.xml. This is required
 # for a few targets such as datasql, datadump, and datadtd.
 # -------------------------------------------------------------------
 
@@ -70,7 +70,7 @@
 #   If true, Torque adds methods to get database fields by name/position.
 #
 # addIntakeRetrievable
-#   If true, the data objects will implement Intake's Retrievable 
+#   If true, the data objects will implement Intake's Retrievable
 #   interface
 #
 # addSaveMethod
@@ -83,16 +83,16 @@
 #   A string to pre-pend to the file names of base data and peer objects.
 #
 # complexObjectModel
-#   If true, Torque generates data objects with collection support and 
+#   If true, Torque generates data objects with collection support and
 #   methods to easily retreive foreign key relationships.
 #
 # targetPackage
-#   Sets the Java package the om files will generated to, e.g. 
+#   Sets the Java package the om files will generated to, e.g.
 #   "com.company.project.om".
 #
 # useClasspath
 #   If true, Torque will not look in the <code>templatePath</code> directory,
-#   for templates, but instead load them from the classpath, allowing you to 
+#   for templates, but instead load them from the classpath, allowing you to
 #   use Torque without extracted it from the jar.
 #
 # useManagers
@@ -106,9 +106,9 @@
 #   cannot combined with the manager setting from above.
 #
 # silentDbFetch
-#   If true, the getXXX() methods which retrieve associated objects 
-#   will fetch the associated objects silently. If false, only the 
-#   methods where a connection is specified explicitly will 
+#   If true, the getXXX() methods which retrieve associated objects
+#   will fetch the associated objects silently. If false, only the
+#   methods where a connection is specified explicitly will
 #   fetch the associated objects silently; the methods where no connection
 #   is specified will not do a silent fetch and return null if no previous
 #   explicit fetch was made.
@@ -150,7 +150,7 @@
 # Torque system with the generated SQL.
 #
 # sameJavaName
-#   If true, the JDBC task will set the javaName attribute for the tables 
+#   If true, the JDBC task will set the javaName attribute for the tables
 #   and columns to be the same as SQL name.
 # -------------------------------------------------------------------
 

Modified: db/torque/generator/trunk/src/conf/default.properties
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/conf/default.properties?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/conf/default.properties (original)
+++ db/torque/generator/trunk/src/conf/default.properties Wed Aug 24 05:19:51 2005
@@ -118,7 +118,7 @@
 # -------------------------------------------------------------------
 
 # ID Broker Default Values
-torque.idTableXMLFile = 
+torque.idTableXMLFile =
 torque.initialID = 101
 torque.initialIDValue = 1000
 torque.initialIDStep  = 10

Modified: db/torque/generator/trunk/src/dtd/database.dtd
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/dtd/database.dtd?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/dtd/database.dtd (original)
+++ db/torque/generator/trunk/src/dtd/database.dtd Wed Aug 24 05:19:51 2005
@@ -44,8 +44,8 @@
               the rest of the letters are converted to lowercase.
      underscoreOmitSchema - The section of the name before and including
               the last dot in the name is removed. For the remaining part,
-              underscores are removed, first letter is capitalized, 
-              first letter after an underscore is capitalized, 
+              underscores are removed, first letter is capitalized,
+              first letter after an underscore is capitalized,
               the rest of the letters are converted to lowercase.
      javaname   - same as underscore, but no letters are converted
               to lowercase.
@@ -89,7 +89,7 @@
 
 <!--
      note: the interface="true", requires that useManagers=true in the
-     properties file. 
+     properties file.
 -->
 <!ELEMENT table (column+,(foreign-key|index|unique|id-method-parameter)*)>
 <!ATTLIST table
@@ -129,7 +129,7 @@
         | NULL | OTHER   | JAVA_OBJECT | DISTINCT   | STRUCT    | ARRAY
         | BLOB | CLOB    | REF         | BOOLEANINT | BOOLEANCHAR
         | DOUBLE
-    ) #IMPLIED 
+    ) #IMPLIED
   javaType (object|primitive) #IMPLIED
   size CDATA #IMPLIED
   scale CDATA #IMPLIED

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Column.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Column.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Column.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Column.java Wed Aug 24 05:19:51 2005
@@ -125,10 +125,10 @@
     public void loadFromXML(Attributes attrib)
     {
         String dom = attrib.getValue("domain");
-        if (StringUtils.isNotEmpty(dom)) 
+        if (StringUtils.isNotEmpty(dom))
         {
             domain = new Domain(getTable().getDatabase().getDomain(dom));
-        } 
+        }
         else
         {
             domain = new Domain(getPlatform().getDomainForSchemaType(DEFAULT_TYPE));
@@ -194,7 +194,7 @@
 
         this.inputValidator = attrib.getValue("inputValidator");
         description = attrib.getValue("description");
-        
+
         isProtected = ("true".equals(attrib.getValue("protected")));
     }
 
@@ -242,7 +242,7 @@
 
     /**
      * Get name to use in Java sources to build method names.
-     * 
+     *
      * @return the capitalised javaName
      */
     public String getJavaName()
@@ -264,7 +264,7 @@
         }
         return StringUtils.capitalize(javaName);
     }
-    
+
     /**
      * Returns the name for the getter method to retrieve the value of this
      * column
@@ -298,7 +298,7 @@
 
     /**
      * Get variable name to use in Java sources (= uncapitalised java name)
-     */    
+     */
     public String getUncapitalisedJavaName()
     {
         return StringUtils.uncapitalize(getJavaName());
@@ -430,10 +430,10 @@
     {
         isNotNull = status;
     }
-    
+
     /**
      * Return NOT NULL String for this column
-     * 
+     *
      * @return "NOT NULL" if null values are not allowed or an empty String.
      */
     public String getNotNullString()
@@ -449,7 +449,7 @@
     {
         return isProtected;
     }
-    
+
     /**
      * Set the isProtected property of the Column
      */
@@ -457,7 +457,7 @@
     {
         isProtected = prot;
     }
-    
+
     /**
      * Set if the column is a primary key or not
      */
@@ -617,10 +617,10 @@
             needsTransactionInPostgres = true;
         }
     }
-    
+
     /**
      * Returns the column jdbc type as an object
-     * 
+     *
      * @deprecated the type conversion is handled by the platform package
      *             (since torque 3.2)
      */
@@ -818,14 +818,14 @@
 
     public String getAutoIncrementString()
     {
-        if (isAutoIncrement() 
+        if (isAutoIncrement()
                 && IDMethod.NATIVE.equals(getTable().getIdMethod()))
         {
             return getPlatform().getAutoIncrement();
         }
         return "";
     }
-    
+
     /**
      * Set the column type from a string property
      * (normally a string from an sql input file)
@@ -1015,7 +1015,7 @@
         }
         return new PlatformDefaultImpl();
     }
-    
+
     public String getSqlString()
     {
         List resultList = new ArrayList();
@@ -1058,7 +1058,7 @@
         }
         return StringUtils.join(resultList.iterator(), ' ');
     }
-    
+
     /**
      * Return the correctGetters property of the column
      *
@@ -1071,7 +1071,7 @@
     }
 
     /**
-     * Set the correctGetters property of the column. If set to true, the 
+     * Set the correctGetters property of the column. If set to true, the
      * column returns is&lt;xxx&gt; as the getter name which is correct for the
      * Bean Specs but incompatible to pre-3.2 releases.
      *

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Database.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Database.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Database.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Database.java Wed Aug 24 05:19:51 2005
@@ -67,7 +67,7 @@
     {
         this.databaseType = databaseType;
     }
-    
+
     /**
      * Load the database object from an xml tag.
      *
@@ -110,12 +110,12 @@
 //        this.name = (name == null ? Torque.getDefaultDB() : name);
         this.name = (name == null ? "default" : name);
     }
-    
+
     public String getFileName()
     {
         return fileName;
     }
-    
+
     public void setFileName(String name)
     {
         this.fileName = name;
@@ -313,11 +313,11 @@
     public void addDomain(Domain domain) {
         domainMap.put(domain.getName(), domain);
     }
-    
+
     public Domain getDomain(String domainName) {
         return (Domain) domainMap.get(domainName);
     }
-    
+
     protected String getDatabaseType()
     {
         return databaseType;
@@ -362,7 +362,7 @@
 
     /**
      * Initializes the model.
-     * 
+     *
      * @throws EngineException
      */
     public void doFinalInitialization() throws EngineException
@@ -412,7 +412,7 @@
                 }
                 else
                 {
-                    // TODO check type and size 
+                    // TODO check type and size
                     List referrers = foreignTable.getReferrers();
                     if ((referrers == null || !referrers.contains(currFK)))
                     {
@@ -457,7 +457,7 @@
                         {
                             throw new EngineException("Attempt to set foreign"
                                     + " key to nonexistent column: table="
-                                    +  currTable.getName() + ", foreign column=" 
+                                    +  currTable.getName() + ", foreign column="
                                     +  foreignColumnName);
                         }
                         else

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Domain.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Domain.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Domain.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Domain.java Wed Aug 24 05:19:51 2005
@@ -36,7 +36,7 @@
     private SchemaType torqueType;
     private String sqlType;
     private String defaultValue;
-    
+
     /**
      * Creates a new instance with a <code>null</code> name.
      */
@@ -54,7 +54,7 @@
     {
         this.name = name;
     }
-    
+
     /**
      * Creates a new Domain and set the name
      */
@@ -74,7 +74,7 @@
         this.torqueType = type;
         this.sqlType = sqlType;
     }
-    
+
     /**
      * Creates a new Domain and set the name
      */
@@ -97,12 +97,12 @@
         this.sqlType = sqlType;
         this.size = size;
     }
-    
+
     public Domain(Domain domain)
     {
         copy(domain);
     }
-    
+
     public void copy(Domain domain)
     {
         this.defaultValue = domain.getDefaultValue();
@@ -113,7 +113,7 @@
         this.sqlType = domain.getSqlType();
         this.torqueType = domain.getType();
     }
-    
+
     /**
      * Imports a column from an XML specification
      */
@@ -178,10 +178,10 @@
     {
         this.scale = scale;
     }
-    
+
     /**
      * Replaces the size if the new value is not null.
-     * 
+     *
      * @param value The size to set.
      */
     public void replaceScale(String value)
@@ -204,10 +204,10 @@
     {
         this.size = size;
     }
-    
+
     /**
      * Replaces the size if the new value is not null.
-     * 
+     *
      * @param value The size to set.
      */
     public void replaceSize(String value)
@@ -238,10 +238,10 @@
     {
         this.torqueType = SchemaType.getEnum(torqueType);
     }
-    
+
     /**
      * Replaces the default value if the new value is not null.
-     * 
+     *
      * @param value The defaultValue to set.
      */
     public void replaceType(String value)
@@ -249,7 +249,7 @@
         this.torqueType = SchemaType.getEnum(
                 StringUtils.defaultString(value, getType().getName()));
     }
-    
+
     /**
      * @return Returns the defaultValue.
      */
@@ -279,8 +279,8 @@
             }
         }
         return dflt.toString();
-    } 
-     
+    }
+
     /**
      * @param defaultValue The defaultValue to set.
      */
@@ -288,10 +288,10 @@
     {
         this.defaultValue = defaultValue;
     }
-    
+
     /**
      * Replaces the default value if the new value is not null.
-     * 
+     *
      * @param value The defaultValue to set.
      */
     public void replaceDefaultValue(String value)
@@ -302,7 +302,7 @@
     /**
      * @return Returns the sqlType.
      */
-    public String getSqlType() 
+    public String getSqlType()
     {
         return sqlType;
     }
@@ -310,24 +310,24 @@
     /**
      * @param sqlType The sqlType to set.
      */
-    public void setSqlType(String sqlType) 
+    public void setSqlType(String sqlType)
     {
         this.sqlType = sqlType;
     }
 
     /**
      * Return the size and scale in brackets for use in an sql schema.
-     * 
-     * @return size and scale or an empty String if there are no values 
+     *
+     * @return size and scale or an empty String if there are no values
      *         available.
      */
     public String printSize()
     {
-        if (size != null && scale != null) 
+        if (size != null && scale != null)
         {
             return '(' + size + ',' + scale + ')';
         }
-        else if (size != null) 
+        else if (size != null)
         {
             return '(' + size + ')';
         }

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/JavaNameGenerator.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/JavaNameGenerator.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/JavaNameGenerator.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/JavaNameGenerator.java Wed Aug 24 05:19:51 2005
@@ -82,7 +82,7 @@
     /**
      * Converts a database schema name to java object name.  Removes
      * <code>STD_SEPARATOR_CHAR</code> and <code>SCHEMA_SEPARATOR_CHAR</code>,
-     * capitilizes first letter of name and each letter after the 
+     * capitilizes first letter of name and each letter after the
      * <code>STD_SEPERATOR</code> and <code>SCHEMA_SEPARATOR_CHAR</code>,
      * converts the rest of the letters to lowercase.
      *
@@ -94,8 +94,8 @@
     protected String underscoreMethod(String schemaName)
     {
         StringBuffer name = new StringBuffer();
-        
-        // remove the STD_SEPARATOR_CHARs and capitalize 
+
+        // remove the STD_SEPARATOR_CHARs and capitalize
         // the tokens
         StringTokenizer tok = new StringTokenizer
             (schemaName, String.valueOf(STD_SEPARATOR_CHAR));
@@ -104,8 +104,8 @@
             String namePart = ((String) tok.nextElement()).toLowerCase();
             name.append(StringUtils.capitalize(namePart));
         }
-        
-        // remove the SCHEMA_SEPARATOR_CHARs and capitalize 
+
+        // remove the SCHEMA_SEPARATOR_CHARs and capitalize
         // the tokens
         schemaName = name.toString();
         name = new StringBuffer();
@@ -120,8 +120,8 @@
     }
 
     /**
-     * Converts a database schema name to java object name. 
-     * First, it removes all characters before the last occurence of 
+     * Converts a database schema name to java object name.
+     * First, it removes all characters before the last occurence of
      * .<code>SCHEMA_SEPARATOR_CHAR</code>. Then, in a second step, removes
      * <code>STD_SEPARATOR_CHAR</code>, capitilizes first letter of
      * name and each letter after the <code>STD_SEPERATOR</code>,
@@ -171,11 +171,11 @@
             name.append(StringUtils.capitalize(namePart));
         }
 
-        // remove the SCHEMA_SEPARATOR_CHARs and capitalize 
+        // remove the SCHEMA_SEPARATOR_CHARs and capitalize
         // the tokens
         schemaName = name.toString();
         name = new StringBuffer();
-        
+
         tok = new StringTokenizer
             (schemaName, String.valueOf(SCHEMA_SEPARATOR_CHAR));
         while (tok.hasMoreTokens())

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameFactory.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameFactory.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameFactory.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameFactory.java Wed Aug 24 05:19:51 2005
@@ -82,7 +82,7 @@
                 }
                 catch (InstantiationException e)
                 {
-                    throw new EngineException("Unable to instantiate class " 
+                    throw new EngineException("Unable to instantiate class "
                             + name + ": Make sure it's in your run-time classpath", e);
                 }
                 catch (Exception e)

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/SchemaType.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/SchemaType.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/SchemaType.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/SchemaType.java Wed Aug 24 05:19:51 2005
@@ -28,7 +28,7 @@
  * @author <a href="mailto:mpoeschl@marmot.at>Martin Poeschl</a>
  * @version $Id$
  */
-public class SchemaType extends Enum 
+public class SchemaType extends Enum
 {
     public static final SchemaType BIT = new SchemaType("BIT");
     public static final SchemaType TINYINT = new SchemaType("TINYINT");
@@ -60,28 +60,28 @@
     public static final SchemaType BOOLEANINT = new SchemaType("BOOLEANINT");
     public static final SchemaType BOOLEANCHAR = new SchemaType("BOOLEANCHAR");
     public static final SchemaType DOUBLE = new SchemaType("DOUBLE");
-    
-    private SchemaType(String type) 
+
+    private SchemaType(String type)
     {
         super(type);
     }
- 
-    public static SchemaType getEnum(String type) 
+
+    public static SchemaType getEnum(String type)
     {
         return (SchemaType) getEnum(SchemaType.class, type);
     }
- 
-    public static Map getEnumMap() 
+
+    public static Map getEnumMap()
     {
         return getEnumMap(SchemaType.class);
     }
- 
-    public static List getEnumList() 
+
+    public static List getEnumList()
     {
         return getEnumList(SchemaType.class);
     }
- 
-    public static Iterator iterator() 
+
+    public static Iterator iterator()
     {
         return iterator(SchemaType.class);
     }

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Table.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Table.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Table.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Table.java Wed Aug 24 05:19:51 2005
@@ -784,7 +784,7 @@
 
     /**
      * Returns a List containing all the columns in the table
-     * 
+     *
      * @return a List containing all the columns
      */
     public List getColumns()
@@ -802,7 +802,7 @@
 
     /**
      * Returns a List containing all the FKs in the table
-     * 
+     *
      * @return a List containing all the FKs
      */
     public List getForeignKeys()

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/TypeMap.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/TypeMap.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/TypeMap.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/TypeMap.java Wed Aug 24 05:19:51 2005
@@ -77,11 +77,11 @@
 {
     /** Logging class from commons.logging */
     private static Log log = LogFactory.getLog(Column.class);
-    
+
     private static final SchemaType[] TEXT_TYPES =
     {
-        SchemaType.CHAR, SchemaType.VARCHAR, SchemaType.LONGVARCHAR, 
-        SchemaType.CLOB, SchemaType.DATE, SchemaType.TIME, 
+        SchemaType.CHAR, SchemaType.VARCHAR, SchemaType.LONGVARCHAR,
+        SchemaType.CLOB, SchemaType.DATE, SchemaType.TIME,
         SchemaType.TIMESTAMP, SchemaType.BOOLEANCHAR
     };
 
@@ -363,7 +363,7 @@
             torqueTypeToJdbcTypeMap = new Hashtable();
 
             Iterator iter = SchemaType.iterator();
-            while (iter.hasNext()) 
+            while (iter.hasNext())
             {
                 SchemaType type = (SchemaType) iter.next();
                 torqueTypeToJdbcTypeMap.put(type, type);

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/XmlToAppData.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/XmlToAppData.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/XmlToAppData.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/XmlToAppData.java Wed Aug 24 05:19:51 2005
@@ -136,14 +136,14 @@
             {
                 alreadyReadFiles = new Vector(3, 1);
             }
-            
+
             // remember the file to avoid looping
             alreadyReadFiles.add(xmlFile);
-            
+
             currentXmlFile = xmlFile;
-            
+
             SAXParser parser = saxFactory.newSAXParser();
-            
+
             FileReader fr = null;
             try
             {
@@ -157,7 +157,7 @@
             BufferedReader br = new BufferedReader(fr);
             try
             {
-                log.info("Parsing file: '" 
+                log.info("Parsing file: '"
                         + (new File(xmlFile)).getName() + "'");
                 InputSource is = new InputSource(br);
                 parser.parse(is, this);
@@ -178,7 +178,7 @@
         database.doFinalInitialization();
         return database;
     }
-    
+
     /**
      * EntityResolver implementation. Called by the XML parser
      *
@@ -328,7 +328,7 @@
                     + rawName + ") called");
         }
     }
-    
+
     /**
      * Handles exception which occur when the xml file is parsed
      * @param e the exception which occured while parsing
@@ -338,8 +338,8 @@
     {
         log.error("Sax parser threw an Exception", e);
         throw new SAXException(
-                "Error while parsing " 
-                + currentXmlFile 
+                "Error while parsing "
+                + currentXmlFile
                 + " at line "
                 + e.getLineNumber()
                 + " column "

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/XmlToData.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/XmlToData.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/XmlToData.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/XmlToData.java Wed Aug 24 05:19:51 2005
@@ -133,11 +133,11 @@
 
                     if (col == null)
                     {
-                        throw new SAXException("Column " 
-                                + attributes.getQName(i) + " in table " 
+                        throw new SAXException("Column "
+                                + attributes.getQName(i) + " in table "
                                 + rawName + " unknown.");
                     }
-                        
+
                     String value = attributes.getValue(i);
                     columnValues.add(new ColumnValue(col, value));
                 }
@@ -158,7 +158,7 @@
     public InputSource resolveEntity(String publicId, String systemId)
             throws SAXException
     {
-		try 
+		try
 		{
 			if (dataDTD != null && dtdFileName.equals(systemId))
 			{
@@ -170,8 +170,8 @@
 			    log.info("Resolver: used " + systemId);
 			    return getInputSource(systemId);
 			}
-		} 
-		catch (IOException e) 
+		}
+		catch (IOException e)
 		{
 			throw new SAXException(e);
 		}

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/Platform.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/Platform.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/Platform.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/Platform.java Wed Aug 24 05:19:51 2005
@@ -31,7 +31,7 @@
     static final String IDENTITY = "identity";
     /** constant for native id method */
     static final String SEQUENCE = "sequence";
-    
+
     /**
      * Returns the native IdMethod (sequence|identity)
      *
@@ -53,7 +53,7 @@
      * @return the db specific domain
      */
     Domain getDomainForSchemaType(SchemaType jdbcType);
-    
+
     /**
      * @return The RDBMS-specific SQL fragment for <code>NULL</code>
      * or <code>NOT NULL</code>.
@@ -64,18 +64,18 @@
      * @return The RDBMS-specific SQL fragment for autoincrement.
      */
     String getAutoIncrement();
-    
+
     /**
      * Returns if the RDBMS-specific SQL type has a size attribute.
-     * 
+     *
      * @param sqlType the SQL type
      * @return true if the type has a size attribute
      */
     boolean hasSize(String sqlType);
-    
+
     /**
      * Returns if the RDBMS-specific SQL type has a scale attribute.
-     * 
+     *
      * @param sqlType the SQL type
      * @return true if the type has a scale attribute
      */

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformCloudscapeImpl.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformCloudscapeImpl.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformCloudscapeImpl.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformCloudscapeImpl.java Wed Aug 24 05:19:51 2005
@@ -49,7 +49,7 @@
         setSchemaDomainMapping(new Domain(SchemaType.BINARY, "LONG BINARY"));
         setSchemaDomainMapping(new Domain(SchemaType.VARBINARY, "LONG BINARY"));
         setSchemaDomainMapping(new Domain(SchemaType.LONGVARBINARY, "LONG VARBINARY"));
-        setSchemaDomainMapping(new Domain(SchemaType.JAVA_OBJECT, "SERIALIZE"));    
+        setSchemaDomainMapping(new Domain(SchemaType.JAVA_OBJECT, "SERIALIZE"));
     }
 
     /**
@@ -59,5 +59,5 @@
     {
         return "DEFAULT AUTOINCREMENT";
     }
-    
+
 }

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDb2400Impl.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDb2400Impl.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDb2400Impl.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDb2400Impl.java Wed Aug 24 05:19:51 2005
@@ -52,7 +52,7 @@
         setSchemaDomainMapping(new Domain(SchemaType.VARBINARY, "VARCHAR (32000) FOR BIT DATA"));
         setSchemaDomainMapping(new Domain(SchemaType.LONGVARBINARY, "LONG VARCHAR FOR BIT DATA"));
     }
-    
+
     /**
      * @see Platform#getMaxColumnNameLength()
      */

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDb2Impl.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDb2Impl.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDb2Impl.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDb2Impl.java Wed Aug 24 05:19:51 2005
@@ -65,5 +65,5 @@
     {
         return "GENERATED ALWAYS AS IDENTITY";
     }
-    
+
 }

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDefaultImpl.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDefaultImpl.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDefaultImpl.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDefaultImpl.java Wed Aug 24 05:19:51 2005
@@ -33,35 +33,35 @@
 public class PlatformDefaultImpl implements Platform
 {
     private Map schemaDomainMap;
-    
+
     /**
      * Default constructor.
      */
-    public PlatformDefaultImpl() 
+    public PlatformDefaultImpl()
     {
         initialize();
     }
-    
+
     private void initialize()
     {
         schemaDomainMap = new Hashtable(30);
         Iterator iter = SchemaType.iterator();
-        while (iter.hasNext()) 
+        while (iter.hasNext())
         {
             SchemaType type = (SchemaType) iter.next();
             schemaDomainMap.put(type, new Domain(type));
         }
-        schemaDomainMap.put(SchemaType.BOOLEANCHAR, 
+        schemaDomainMap.put(SchemaType.BOOLEANCHAR,
                 new Domain(SchemaType.BOOLEANCHAR, "CHAR"));
-        schemaDomainMap.put(SchemaType.BOOLEANINT, 
+        schemaDomainMap.put(SchemaType.BOOLEANINT,
                 new Domain(SchemaType.BOOLEANINT, "INTEGER"));
     }
 
-    protected void setSchemaDomainMapping(Domain domain) 
+    protected void setSchemaDomainMapping(Domain domain)
     {
         schemaDomainMap.put(domain.getType(), domain);
     }
-    
+
     /**
      * @see Platform#getMaxColumnNameLength()
      */
@@ -81,7 +81,7 @@
     /**
      * @see Platform#getDomainForJdbcType(SchemaType)
      */
-    public Domain getDomainForSchemaType(SchemaType jdbcType) 
+    public Domain getDomainForSchemaType(SchemaType jdbcType)
     {
         return (Domain) schemaDomainMap.get(jdbcType);
     }

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformFactory.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformFactory.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformFactory.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformFactory.java Wed Aug 24 05:19:51 2005
@@ -56,7 +56,7 @@
             }
             catch (Throwable t)
             {
-                log.warn("problems with platform " + platformName 
+                log.warn("problems with platform " + platformName
                         + ": " + t.getMessage());
                 log.warn("Torque will use PlatformDefaultImpl instead");
 
@@ -70,7 +70,7 @@
     /**
      * compute the name of the concrete Class representing the Platform
      * specified by <code>platform</code>
-     * 
+     *
      * @param platform the name of the platform as specified in the repository
      */
     private static String getClassnameFor(String platform)
@@ -85,7 +85,7 @@
 
     /**
      * Gets the platforms.
-     * 
+     *
      * @return Returns a HashMap
      */
     private static HashMap getPlatforms()

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMssqlImpl.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMssqlImpl.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMssqlImpl.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMssqlImpl.java Wed Aug 24 05:19:51 2005
@@ -50,9 +50,9 @@
         setSchemaDomainMapping(new Domain(SchemaType.TIMESTAMP, "DATETIME"));
         setSchemaDomainMapping(new Domain(SchemaType.BINARY, "BINARY(7132)"));
         setSchemaDomainMapping(new Domain(SchemaType.VARBINARY, "IMAGE"));
-        setSchemaDomainMapping(new Domain(SchemaType.LONGVARBINARY, "IMAGE"));      
+        setSchemaDomainMapping(new Domain(SchemaType.LONGVARBINARY, "IMAGE"));
     }
-    
+
     /**
      * @see Platform#getMaxColumnNameLength()
      */
@@ -60,13 +60,13 @@
     {
         return 30;
     }
-    
+
     /**
      * @return Explicitly returns <code>NULL</code> if null values are
      * allowed (as recomended by Microsoft).
      * @see Platform#getNullString(boolean)
      */
-    public String getNullString(boolean notNull) 
+    public String getNullString(boolean notNull)
     {
         return (notNull ? "NOT NULL" : "NULL");
     }

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMysqlImpl.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMysqlImpl.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMysqlImpl.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMysqlImpl.java Wed Aug 24 05:19:51 2005
@@ -64,7 +64,7 @@
      * @see Platform#hasSize(String)
      */
     public boolean hasSize(String sqlType) {
-        return !("MEDIUMTEXT".equals(sqlType) || "LONGTEXT".equals(sqlType) 
+        return !("MEDIUMTEXT".equals(sqlType) || "LONGTEXT".equals(sqlType)
                 || "BLOB".equals(sqlType) || "MEDIUMBLOB".equals(sqlType)
                 || "LONGBLOB".equals(sqlType));
     }

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformOracleImpl.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformOracleImpl.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformOracleImpl.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformOracleImpl.java Wed Aug 24 05:19:51 2005
@@ -58,7 +58,7 @@
         setSchemaDomainMapping(new Domain(SchemaType.VARBINARY, "BLOB"));
         setSchemaDomainMapping(new Domain(SchemaType.LONGVARBINARY, "LONG RAW"));
     }
-    
+
     /**
      * @see Platform#getMaxColumnNameLength()
      */

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformPostgresqlImpl.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformPostgresqlImpl.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformPostgresqlImpl.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformPostgresqlImpl.java Wed Aug 24 05:19:51 2005
@@ -58,7 +58,7 @@
         setSchemaDomainMapping(new Domain(SchemaType.BLOB, "BYTEA"));
         setSchemaDomainMapping(new Domain(SchemaType.CLOB, "TEXT"));
     }
-    
+
     /**
      * @see Platform#getNativeIdMethod()
      */
@@ -74,5 +74,5 @@
     {
         return "";
     }
-    
+
 }

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformSapdbImpl.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformSapdbImpl.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformSapdbImpl.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformSapdbImpl.java Wed Aug 24 05:19:51 2005
@@ -72,5 +72,5 @@
     {
         return "DEFAULT SERIAL";
     }
-    
+
 }

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformSybaseImpl.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformSybaseImpl.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformSybaseImpl.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformSybaseImpl.java Wed Aug 24 05:19:51 2005
@@ -51,7 +51,7 @@
         setSchemaDomainMapping(new Domain(SchemaType.VARBINARY, "IMAGE"));
         setSchemaDomainMapping(new Domain(SchemaType.LONGVARBINARY, "IMAGE"));
     }
-    
+
     /**
      * @see Platform#getMaxColumnNameLength()
      */

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/package.html
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/package.html?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/package.html (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/package.html Wed Aug 24 05:19:51 2005
@@ -20,23 +20,23 @@
 </head>
 
 <body bgcolor="#FFFFFF">
-This package contains classes that provide compatibility to a range of RDBM platforms. 
+This package contains classes that provide compatibility to a range of RDBM platforms.
 <p>
-The <code>Platform</code> interface provides callbacks that allow to get 
+The <code>Platform</code> interface provides callbacks that allow to get
 RDBMS Platform specific information whereever neccessary.
 
 <p>
-The class <code>PlatformDefaultImpl</code> implements <code>Platform</code> and 
+The class <code>PlatformDefaultImpl</code> implements <code>Platform</code> and
 provides default implementations of all methods.
 
 <p>
-For each supported Platform <code>Xxx</code> there is a class <code>PlatformXxxImpl</code> 
+For each supported Platform <code>Xxx</code> there is a class <code>PlatformXxxImpl</code>
 which extends <code>PlatformDefaultImpl</code> and may override the methods of the
 baseclass.
 
 <p>
 The factory class <code>PlatformFactory</code> can be used to create <code>Platform</code>
-instances. 
+instances.
 
 </body>
 </html>

Modified: db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataModelTask.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataModelTask.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataModelTask.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataModelTask.java Wed Aug 24 05:19:51 2005
@@ -66,7 +66,7 @@
 
     /**
      * Map of data model name to database name.
-     * Should probably stick to the convention of them being the same but 
+     * Should probably stick to the convention of them being the same but
      * I know right now in a lot of cases they won't be.
      */
     protected Hashtable dataModelDbMap;
@@ -243,9 +243,9 @@
                     FileSet fs = (FileSet) filesets.get(i);
                     DirectoryScanner ds = fs.getDirectoryScanner(project);
                     File srcDir = fs.getDir(project);
-                    
+
                     String[] dataModelFiles = ds.getIncludedFiles();
-                    
+
                     // Make a transaction for each file
                     for (int j = 0; j < dataModelFiles.length; j++)
                     {
@@ -258,11 +258,11 @@
                     }
                 }
             }
-            
+
             Iterator i = dataModels.iterator();
             databaseNames = new Hashtable();
             dataModelDbMap = new Hashtable();
-            
+
             // Different datamodels may state the same database
             // names, we just want the unique names of databases.
             while (i.hasNext())

Modified: db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataSQLTask.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataSQLTask.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataSQLTask.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataSQLTask.java Wed Aug 24 05:19:51 2005
@@ -139,9 +139,9 @@
         try
         {
             Database db = (Database) getDataModels().get(0);
-            
+
             List data;
-            
+
             if (dataXmlFile != null)
             {
                 XmlToData dataXmlParser = new XmlToData(db, dataDTD);
@@ -150,7 +150,7 @@
             else
             {
                 data = new ArrayList();
-                
+
                 // Deal with the filesets.
                 for (int i = 0; i < filesets.size(); i++)
                 {
@@ -159,7 +159,7 @@
                     File srcDir = fs.getDir(project);
 
                     String[] dataModelFiles = ds.getIncludedFiles();
-                    
+
                     // Make a transaction for each file
                     for (int j = 0; j < dataModelFiles.length; j++)
                     {
@@ -186,7 +186,7 @@
             FileInputStream fis = new FileInputStream(getSqlDbMap());
             p.load(fis);
             fis.close();
-            
+
             p.setProperty(getOutputFile(), db.getName());
             p.store(new FileOutputStream(getSqlDbMap()), "Sqlfile -> Database map");
         }

Modified: db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueJDBCTransformTask.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueJDBCTransformTask.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueJDBCTransformTask.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueJDBCTransformTask.java Wed Aug 24 05:19:51 2005
@@ -187,91 +187,91 @@
         log("DB driver sucessfuly instantiated");
 
         Connection con = null;
-        try 
+        try
         {
             // Attempt to connect to a database.
             con = DriverManager.getConnection(dbUrl, dbUser, dbPassword);
             log("DB connection established");
-    
+
             // Get the database Metadata.
             DatabaseMetaData dbMetaData = con.getMetaData();
-    
+
             // The database map.
-            List tableList = getTableNames(dbMetaData);        
+            List tableList = getTableNames(dbMetaData);
 
             databaseNode = doc.createElement("database");
             databaseNode.setAttribute("name", dbUser);
-    
+
             // Build a database-wide column -> table map.
             columnTableMap = new Hashtable();
-    
+
             log("Building column/table map...");
             for (int i = 0; i < tableList.size(); i++)
             {
                 String curTable = (String) tableList.get(i);
                 List columns = getColumns(dbMetaData, curTable);
-    
+
                 for (int j = 0; j < columns.size(); j++)
                 {
                     List col = (List) columns.get(j);
                     String name = (String) col.get(0);
-    
+
                     columnTableMap.put(name, curTable);
                 }
             }
-    
+
             for (int i = 0; i < tableList.size(); i++)
             {
                 // Add Table.
                 String curTable = (String) tableList.get(i);
                 // dbMap.addTable(curTable);
                 log("Processing table: " + curTable);
-    
+
                 Element table = doc.createElement("table");
                 table.setAttribute("name", curTable);
                 if (isSameJavaName())
                 {
                     table.setAttribute("javaName", curTable);
                 }
-    
+
                 // Add Columns.
                 // TableMap tblMap = dbMap.getTable(curTable);
-    
+
                 List columns = getColumns(dbMetaData, curTable);
                 List primKeys = getPrimaryKeys(dbMetaData, curTable);
                 Collection forgnKeys = getForeignKeys(dbMetaData, curTable);
-    
+
                 // Set the primary keys.
                 primaryKeys = new Hashtable();
-    
+
                 for (int k = 0; k < primKeys.size(); k++)
                 {
                     String curPrimaryKey = (String) primKeys.get(k);
                     primaryKeys.put(curPrimaryKey, curPrimaryKey);
                 }
-    
+
                 for (int j = 0; j < columns.size(); j++)
                 {
                     List col = (List) columns.get(j);
                     String name = (String) col.get(0);
                     Integer type = ((Integer) col.get(1));
                     int size = ((Integer) col.get(2)).intValue();
-    
+
                     // From DatabaseMetaData.java
                     //
                     // Indicates column might not allow NULL values.  Huh?
                     // Might? Boy, that's a definitive answer.
                     /* int columnNoNulls = 0; */
-    
+
                     // Indicates column definitely allows NULL values.
                     /* int columnNullable = 1; */
-    
+
                     // Indicates NULLABILITY of column is unknown.
                     /* int columnNullableUnknown = 2; */
-    
+
                     Integer nullType = (Integer) col.get(3);
                     String defValue = (String) col.get(4);
-    
+
                     Element column = doc.createElement("column");
                     column.setAttribute("name", name);
                     if (isSameJavaName())
@@ -279,7 +279,7 @@
                         column.setAttribute("javaName", name);
                     }
                     column.setAttribute("type", TypeMap.getTorqueType(type).getName());
-    
+
                     if (size > 0 && (type.intValue() == Types.CHAR
                             || type.intValue() == Types.VARCHAR
                             || type.intValue() == Types.LONGVARCHAR
@@ -288,17 +288,17 @@
                     {
                         column.setAttribute("size", String.valueOf(size));
                     }
-    
+
                     if (nullType.intValue() == 0)
                     {
                         column.setAttribute("required", "true");
                     }
-    
+
                     if (primaryKeys.containsKey(name))
                     {
                         column.setAttribute("primaryKey", "true");
                     }
-    
+
                     if (defValue != null)
                     {
                         // trim out parens & quotes out of def value.
@@ -307,17 +307,17 @@
                         {
                             defValue = defValue.substring(1, defValue.length() - 1);
                         }
-    
+
                         if (defValue.startsWith("'") && defValue.endsWith("'"))
                         {
                             defValue = defValue.substring(1, defValue.length() - 1);
                         }
-    
+
                         column.setAttribute("default", defValue);
                     }
                     table.appendChild(column);
                 }
-    
+
                 // Foreign keys for this table.
                 for (Iterator l = forgnKeys.iterator(); l.hasNext();)
                 {

Modified: db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/DomainTest.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/DomainTest.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/DomainTest.java (original)
+++ db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/DomainTest.java Wed Aug 24 05:19:51 2005
@@ -62,7 +62,7 @@
         assertEquals("0", amount.getDefaultValue());
         assertEquals("amount domain", amount.getDescription());
     }
-    
+
     /**
      * test if the tables get the package name from the properties file
      */
@@ -84,7 +84,7 @@
         assertEquals("(10,2)", price.printSize());
         assertEquals("price DECIMAL(10,2) default 0", price.getSqlString());
     }
-    
+
     /**
      * test if the tables get the package name from the properties file
      */
@@ -101,7 +101,7 @@
         assertEquals("(12,2)", price.printSize());
         assertEquals("price DECIMAL(12,2) default 1000", price.getSqlString());
     }
-    
+
     public void testDecimalColumn() throws Exception
     {
         Table table = db.getTable("article");
@@ -134,7 +134,7 @@
         assertEquals("native_id MEDIUMINT NOT NULL AUTO_INCREMENT", col.getSqlString());
         col = table.getColumn("name");
         assertEquals("", col.getAutoIncrementString());
-    }    
+    }
 
     public void testIdBrokerAutoincrement() throws Exception
     {
@@ -144,8 +144,8 @@
         assertEquals("article_id MEDIUMINT NOT NULL", col.getSqlString());
         col = table.getColumn("name");
         assertEquals("", col.getAutoIncrementString());
-    }    
-    
+    }
+
     public void testBooleanint() throws Exception
     {
         Table table = db.getTable("types");
@@ -155,7 +155,7 @@
         assertEquals("INTEGER", col.getType());
         assertEquals("INTEGER", col.getDomain().getSqlType());
         assertEquals("cbooleanint INTEGER", col.getSqlString());
-    }    
+    }
 
     public void testBlob() throws Exception
     {
@@ -165,6 +165,6 @@
         assertEquals("BLOB", col.getTorqueType());
         assertEquals("LONGBLOB", col.getDomain().getSqlType());
         assertEquals("cblob LONGBLOB", col.getSqlString());
-    }    
+    }
 
 }

Modified: db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/MssqlDomainTest.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/MssqlDomainTest.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/MssqlDomainTest.java (original)
+++ db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/MssqlDomainTest.java Wed Aug 24 05:19:51 2005
@@ -69,7 +69,7 @@
         assertEquals("(10,2)", price.printSize());
         assertEquals("price NUMERIC(10,2) default 0 NULL", price.getSqlString());
     }
-    
+
     /**
      * test if the tables get the package name from the properties file
      */
@@ -85,7 +85,7 @@
         assertEquals("(12,2)", price.printSize());
         assertEquals("price NUMERIC(12,2) default 1000 NULL", price.getSqlString());
     }
-    
+
     public void testDecimalColumn() throws Exception
     {
         Table table = db.getTable("article");
@@ -116,7 +116,7 @@
         assertEquals("native_id INT NOT NULL IDENTITY", col.getSqlString());
         col = table.getColumn("name");
         assertEquals("", col.getAutoIncrementString());
-    }    
+    }
 
     public void testIdBrokerAutoincrement() throws Exception
     {
@@ -126,8 +126,8 @@
         assertEquals("article_id INT NOT NULL", col.getSqlString());
         col = table.getColumn("name");
         assertEquals("", col.getAutoIncrementString());
-    }    
-    
+    }
+
     public void testBooleanint() throws Exception
     {
         Table table = db.getTable("types");
@@ -136,6 +136,6 @@
         assertEquals("BOOLEANINT", col.getTorqueType());
         assertEquals("INT", col.getDomain().getSqlType());
         assertEquals("cbooleanint INT NULL", col.getSqlString());
-    }    
-    
+    }
+
 }

Modified: db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/NameFactoryTest.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/NameFactoryTest.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/NameFactoryTest.java (original)
+++ db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/NameFactoryTest.java Wed Aug 24 05:19:51 2005
@@ -68,15 +68,15 @@
                 }
         }, {
             {
-                "MY_USER", 
+                "MY_USER",
                         NameGenerator.CONV_METHOD_UNDERSCORE }, {
-                "MY_USER", 
+                "MY_USER",
                         NameGenerator.CONV_METHOD_UNDERSCORE_OMIT_SCHEMA }, {
-                "MY_USER", 
+                "MY_USER",
                         NameGenerator.CONV_METHOD_JAVANAME }, {
-                "MY_USER", 
+                "MY_USER",
                         NameGenerator.CONV_METHOD_NOCHANGE }, {
-                "MY_SCHEMA.MY_USER", 
+                "MY_SCHEMA.MY_USER",
                         NameGenerator.CONV_METHOD_UNDERSCORE }, {
                 "MY_SCHEMA.MY_USER",
                         NameGenerator.CONV_METHOD_UNDERSCORE_OMIT_SCHEMA }, {
@@ -99,11 +99,11 @@
                 makeString(4) + "_FK_1",
                 makeString(5) + "_FK_2" },
             {
-                "MyUser", 
-                "MyUser", 
-                "MYUSER", 
-                "MY_USER", 
-                "MySchemaMyUser", 
+                "MyUser",
+                "MyUser",
+                "MYUSER",
+                "MY_USER",
+                "MySchemaMyUser",
                 "MyUser",
                 "MYSCHEMAMYUSER",
                 "MY_SCHEMA.MY_USER"
@@ -171,7 +171,7 @@
             }
         }
     }
-    
+
     /**
      * @throws Exception on fail
      */
@@ -180,7 +180,7 @@
         try
         {
             NameFactory.generateName("non.existing.class", new ArrayList());
-            assertTrue("Expected an EngineException", false);           
+            assertTrue("Expected an EngineException", false);
         }
         catch (EngineException ex)
         {

Modified: db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/OracleDomainTest.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/OracleDomainTest.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/OracleDomainTest.java (original)
+++ db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/OracleDomainTest.java Wed Aug 24 05:19:51 2005
@@ -69,7 +69,7 @@
         assertEquals("(10,2)", price.printSize());
         assertEquals("price NUMBER(10,2) default 0", price.getSqlString());
     }
-    
+
     /**
      * test if the tables get the package name from the properties file
      */
@@ -85,7 +85,7 @@
         assertEquals("(12,2)", price.printSize());
         assertEquals("price NUMBER(12,2) default 1000", price.getSqlString());
     }
-    
+
     public void testDecimalColumn() throws Exception
     {
         Table table = db.getTable("article");
@@ -116,7 +116,7 @@
         assertEquals("native_id NUMBER(10,0) NOT NULL", col.getSqlString());
         col = table.getColumn("name");
         assertEquals("", col.getAutoIncrementString());
-    }    
+    }
 
     public void testIdBrokerAutoincrement() throws Exception
     {
@@ -126,8 +126,8 @@
         assertEquals("article_id NUMBER(10,0) NOT NULL", col.getSqlString());
         col = table.getColumn("name");
         assertEquals("", col.getAutoIncrementString());
-    }    
-    
+    }
+
     public void testBooleanint() throws Exception
     {
         Table table = db.getTable("types");
@@ -136,6 +136,6 @@
         assertEquals("BOOLEANINT", col.getTorqueType());
         assertEquals("NUMBER", col.getDomain().getSqlType());
         assertEquals("cbooleanint NUMBER(1,0)", col.getSqlString());
-    }    
-    
+    }
+
 }

Modified: db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/PostgresqlDomainTest.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/PostgresqlDomainTest.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/PostgresqlDomainTest.java (original)
+++ db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/PostgresqlDomainTest.java Wed Aug 24 05:19:51 2005
@@ -49,7 +49,7 @@
         xmlToAppData = null;
         super.tearDown();
     }
-  
+
     /**
      * test if the tables get the package name from the properties file
      */
@@ -69,7 +69,7 @@
         assertEquals("(10,2)", price.printSize());
         assertEquals("price NUMERIC(10,2) default 0", price.getSqlString());
     }
-    
+
     /**
      * test if the tables get the package name from the properties file
      */
@@ -85,7 +85,7 @@
         assertEquals("(12,2)", price.printSize());
         assertEquals("price NUMERIC(12,2) default 1000", price.getSqlString());
     }
-    
+
     public void testDecimalColumn() throws Exception
     {
         Table table = db.getTable("article");
@@ -116,7 +116,7 @@
         assertEquals("native_id INTEGER NOT NULL", col.getSqlString());
         col = table.getColumn("name");
         assertEquals("", col.getAutoIncrementString());
-    }    
+    }
 
     public void testIdBrokerAutoincrement() throws Exception
     {
@@ -126,8 +126,8 @@
         assertEquals("article_id INTEGER NOT NULL", col.getSqlString());
         col = table.getColumn("name");
         assertEquals("", col.getAutoIncrementString());
-    }    
-    
+    }
+
     public void testBooleanint() throws Exception
     {
         Table table = db.getTable("types");
@@ -136,6 +136,6 @@
         assertEquals("BOOLEANINT", col.getTorqueType());
         assertEquals("INT2", col.getDomain().getSqlType());
         assertEquals("cbooleanint INT2", col.getSqlString());
-    }    
-    
+    }
+
 }

Modified: db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/TableTest.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/TableTest.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/TableTest.java (original)
+++ db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/TableTest.java Wed Aug 24 05:19:51 2005
@@ -63,7 +63,7 @@
 		Table table2 = db.getTable("table_native");
 		assertEquals(IDMethod.NATIVE, table2.getIdMethod());
     }
-    
+
     public void testNoPk() throws Exception
     {
         Table table = db.getTable("nopk");
@@ -71,7 +71,7 @@
         List pks = table.getPrimaryKey();
         assertTrue(pks.size() == 0);
     }
-    
+
     public void testSinglePk() throws Exception
     {
         Table table = db.getTable("singlepk");
@@ -79,9 +79,9 @@
         List pks = table.getPrimaryKey();
         assertTrue(pks.size() == 1);
         Column col = (Column) pks.get(0);
-        assertEquals(col.getName(), "singlepk_id");        
+        assertEquals(col.getName(), "singlepk_id");
     }
-    
+
     public void testMultiPk() throws Exception
     {
         Table table = db.getTable("multipk");
@@ -89,12 +89,12 @@
         List pks = table.getPrimaryKey();
         assertTrue(pks.size() == 2);
         Column cola = (Column) pks.get(0);
-        assertEquals(cola.getName(), "multipk_a");        
+        assertEquals(cola.getName(), "multipk_a");
         Column colb = (Column) pks.get(1);
-        assertEquals(colb.getName(), "multipk_b");  
-        assertEquals(table.printPrimaryKey(), "multipk_a,multipk_b");     
+        assertEquals(colb.getName(), "multipk_b");
+        assertEquals(table.printPrimaryKey(), "multipk_a,multipk_b");
     }
- 
+
     public void testSingleFk() throws Exception
     {
         Table table = db.getTable("singlefk");
@@ -128,24 +128,24 @@
         assertEquals(fk.getForeignTableName(), "multipk");
         assertTrue(fk.getForeignColumns().size() == 2);
     }
-    
+
     public void testReferrers() throws Exception
     {
         Table table = db.getTable("singlepk");
         List refs = table.getReferrers();
         assertTrue(refs.size() == 1);
         ForeignKey fk = (ForeignKey) refs.get(0);
-        assertEquals(fk.getTableName(), "singlefk");        
+        assertEquals(fk.getTableName(), "singlefk");
     }
-    
+
     public void testUnique() throws Exception
     {
         Table table = db.getTable("unique_test");
         List unices = table.getUnices();
         assertTrue(unices.size() == 1);
         Unique unique = (Unique) unices.get(0);
-        assertEquals(unique.getName(), "unique_name");   
-        assertTrue(unique.getColumns().size() == 2);     
+        assertEquals(unique.getName(), "unique_name");
+        assertTrue(unique.getColumns().size() == 2);
     }
-    
+
 }

Modified: db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/TypeMapTest.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/TypeMapTest.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/TypeMapTest.java (original)
+++ db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/TypeMapTest.java Wed Aug 24 05:19:51 2005
@@ -21,7 +21,7 @@
 
 /**
  * Tests for TypeMap.
- * 
+ *
  * @author <a href="mailto:mpoeschl@marmot.at>Martin Poeschl</a>
  */
 public class TypeMapTest extends TestCase {
@@ -56,9 +56,9 @@
     }
 
     public void testGetTorqueType() {
-        assertEquals(TypeMap.getTorqueType(new Integer(Types.FLOAT)), 
+        assertEquals(TypeMap.getTorqueType(new Integer(Types.FLOAT)),
                 SchemaType.FLOAT);
-        assertEquals(TypeMap.getTorqueType(new Integer(Types.CHAR)), 
+        assertEquals(TypeMap.getTorqueType(new Integer(Types.CHAR)),
                 SchemaType.CHAR);
     }
 

Modified: db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/domaintest-schema.xml
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/domaintest-schema.xml?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/domaintest-schema.xml (original)
+++ db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/domaintest-schema.xml Wed Aug 24 05:19:51 2005
@@ -18,13 +18,13 @@
 
 <database name="domaindb" defaultIdMethod="idbroker">
   <domain name="amount" type="NUMERIC" size="10" scale="2" default="0" description="amount domain" />
-  
+
   <table name="product">
     <column name="product_id" required="true" primaryKey="true" type="INTEGER" />
     <column name="name" size="40" />
     <column name="price" domain="amount" />
   </table>
-  
+
   <table name="article">
     <column name="article_id" required="true" primaryKey="true" type="INTEGER" />
     <column name="name" size="40" />

Modified: db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/tabletest-schema.xml
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/tabletest-schema.xml?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/tabletest-schema.xml (original)
+++ db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/tabletest-schema.xml Wed Aug 24 05:19:51 2005
@@ -22,7 +22,7 @@
     <column name="table_a_id" required="true" primaryKey="true" type="INTEGER" />
     <column name="col_a" type="CHAR" size="5" />
   </table>
-  
+
   <table name="table_native" idMethod="native">
     <column name="table_a_id" required="true" primaryKey="true" type="INTEGER" />
     <column name="col_a" type="CHAR" size="5" />
@@ -61,7 +61,7 @@
       <reference local="singlepk_id" foreign="id"/>
     </foreign-key>
   </table>
-  
+
   <table name="multifk">
     <column name="id" required="true" primaryKey="true" type="INTEGER" />
     <column name="multipk_a" required="true" type="INTEGER" />
@@ -72,7 +72,7 @@
       <reference local="multipk_b" foreign="multipk_b"/>
     </foreign-key>
   </table>
-  
+
   <table name="unique_test">
     <column name="id" required="true" primaryKey="true" type="INTEGER" />
     <column name="col_a" type="CHAR" size="5" />
@@ -82,7 +82,7 @@
       <unique-column name="col_b"/>
     </unique>
   </table>
-  
-  
+
+
 </database>
 

Modified: db/torque/generator/trunk/src/test/org/apache/torque/engine/database/transform/SQLToAppDataTest.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/test/org/apache/torque/engine/database/transform/SQLToAppDataTest.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/test/org/apache/torque/engine/database/transform/SQLToAppDataTest.java (original)
+++ db/torque/generator/trunk/src/test/org/apache/torque/engine/database/transform/SQLToAppDataTest.java Wed Aug 24 05:19:51 2005
@@ -27,7 +27,7 @@
  */
 public class SQLToAppDataTest extends TestCase
 {
-    
+
     /**
      * Class to test for void SQLToAppData(String, String)
      */

Modified: db/torque/generator/trunk/src/test/org/apache/torque/engine/platform/PlatformMysqlImplTest.java
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/src/test/org/apache/torque/engine/platform/PlatformMysqlImplTest.java?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/src/test/org/apache/torque/engine/platform/PlatformMysqlImplTest.java (original)
+++ db/torque/generator/trunk/src/test/org/apache/torque/engine/platform/PlatformMysqlImplTest.java Wed Aug 24 05:19:51 2005
@@ -28,12 +28,12 @@
 public class PlatformMysqlImplTest extends TestCase {
 
     Platform platform;
-    
+
     public void setUp()
     {
         platform = PlatformFactory.getPlatformFor("mysql");
     }
-    
+
     public void testGetMaxColumnNameLength() {
         assertEquals(64, platform.getMaxColumnNameLength());
     }

Modified: db/torque/generator/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/xdocs/index.xml?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/xdocs/index.xml (original)
+++ db/torque/generator/trunk/xdocs/index.xml Wed Aug 24 05:19:51 2005
@@ -34,22 +34,22 @@
 
       <p>
         Torque offers a <a href="http://maven.apache.org/">Maven</a> plugin
-        (<a href="../maven-plugin/">maven-plugin</a>) that can be used to 
+        (<a href="../maven-plugin/">maven-plugin</a>) that can be used to
         invoke the generator.
       </p>
-      
+
       <p>
         Torque also offers an <a href="http://ant.apache.org/">Ant</a> build
         file (<code>build-torque.xml</code>) which could be added to your
         project. It defines the following targets:
       </p>
-      
+
       <p>
-        The following tasks are available as both Ant tasks 
+        The following tasks are available as both Ant tasks
         (<code>ant @task@</code>) and, after installing maven-plugin as
         Maven goals (<code>maven torque:@task@</code>):
       </p>
-      
+
       <subsection name="SQL tasks">
         <ul>
           <li>

Modified: db/torque/generator/trunk/xdocs/properties-reference.xml
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/xdocs/properties-reference.xml?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/xdocs/properties-reference.xml (original)
+++ db/torque/generator/trunk/xdocs/properties-reference.xml Wed Aug 24 05:19:51 2005
@@ -73,8 +73,8 @@
       <td>Not set</td>
       <td>
         The subpackage (relative to <code>${torque.targetPackage}</code>)
-        where Torque will put the generated Peer Java classes. 
-        If not set, the Peer classes will be generated in 
+        where Torque will put the generated Peer Java classes.
+        If not set, the Peer classes will be generated in
         <code>${torque.targetPackage}</code>
       </td>
     </tr>
@@ -82,9 +82,9 @@
       <td><code>torque.subpackage.object</code></td>
       <td>Not set</td>
       <td>
-        The subpackage (relative to <code>${torque.targetPackage}</code>) 
-        where Torque will put the generated Object Java classes. 
-        If not set, the Object classes will be generated in 
+        The subpackage (relative to <code>${torque.targetPackage}</code>)
+        where Torque will put the generated Object Java classes.
+        If not set, the Object classes will be generated in
         <code>${torque.targetPackage}</code>
       </td>
     </tr>
@@ -92,7 +92,7 @@
       <td><code>torque.subpackage.map</code></td>
       <td><code>map</code></td>
       <td>
-        The subpackage (relative to <code>${torque.targetPackage}</code>) 
+        The subpackage (relative to <code>${torque.targetPackage}</code>)
         where Torque will put the generated Java classes for the database map.
       </td>
     </tr>
@@ -100,10 +100,10 @@
       <td><code>torque.subpackage.manager</code></td>
       <td>Not set</td>
       <td>
-        The subpackage (relative to <code>${torque.targetPackage}</code>) 
-        where Torque will put the generated Java Manager classes, 
+        The subpackage (relative to <code>${torque.targetPackage}</code>)
+        where Torque will put the generated Java Manager classes,
         if they are generated at all.
-        If not set, the Manager classes will be generated in 
+        If not set, the Manager classes will be generated in
         <code>${torque.targetPackage}</code>
       </td>
     </tr>
@@ -111,8 +111,8 @@
       <td><code>torque.subpackage.bean</code></td>
       <td><code>bean</code></td>
       <td>
-        The subpackage (relative to <code>${torque.targetPackage}</code>) 
-        where Torque will put the generated JavaBean classes, if they are 
+        The subpackage (relative to <code>${torque.targetPackage}</code>)
+        where Torque will put the generated JavaBean classes, if they are
         generated at all.
       </td>
     </tr>
@@ -120,10 +120,10 @@
       <td><code>torque.subpackage.base</code></td>
       <td>Not set</td>
       <td>
-        The subpackage (relative to <code>${torque.targetPackage}</code>) 
-        where Torque will put the generated BaseObject, BasePeer, 
+        The subpackage (relative to <code>${torque.targetPackage}</code>)
+        where Torque will put the generated BaseObject, BasePeer,
         (and BaseManager, if they are generated at all) Java classes.
-        If not set, the Base classes will be generated in 
+        If not set, the Base classes will be generated in
         <code>${torque.targetPackage}</code>
       </td>
     </tr>
@@ -131,8 +131,8 @@
       <td><code>torque.subpackage.base.bean</code></td>
       <td><code>bean</code></td>
       <td>
-        The subpackage (relative to <code>${torque.targetPackage}</code>) 
-        where Torque will put the generated BaseBean Java classes, 
+        The subpackage (relative to <code>${torque.targetPackage}</code>)
+        where Torque will put the generated BaseBean Java classes,
         if they are generated at all.
       </td>
     </tr>
@@ -144,7 +144,7 @@
         when the schema has actually been updated.
       </td>
     </tr>
-    
+
     <tr>
       <td colspan="3"><strong> Directories and Paths </strong></td>
     </tr>
@@ -283,7 +283,7 @@
       <td><code>false</code></td>
       <td/>
     </tr>
-    
+
     <tr>
       <td colspan="3"><strong> Template Variables </strong></td>
     </tr>
@@ -383,8 +383,8 @@
         A string to append to the name of generated Beans
       </td>
     </tr>
-    
-    
+
+
     <tr>
       <td colspan="3"><strong> Misc. Settings </strong></td>
     </tr>
@@ -429,7 +429,7 @@
       <td><code>1000</code></td>
       <td>
         The start value of the ID broker for supplying IDs to Torque. This value is incremented every
-        time Torque requests ID keys from the broker. If you pre-load your table straight from SQL, 
+        time Torque requests ID keys from the broker. If you pre-load your table straight from SQL,
         make sure that you don't accidentially overlap with this setting, because Torque doesn't keep
         record of what IDs are already taken in the database. If you overlap, inserting new objects
         will fail because the ID assigned by Torque is already taken.
@@ -444,12 +444,12 @@
         to do lots of inserts straight in a row, increment this value to get slightly better performance.
       </td>
     </tr>
-    
+
     <tr>
       <td><code>torque.omzip.src.base</code></td>
       <td><code>false</code></td>
       <td>
-        Whether the om generated base src (BaseX.java) files should be included in 
+        Whether the om generated base src (BaseX.java) files should be included in
         the src jar produced by om-zip.
       </td>
     </tr>
@@ -457,7 +457,7 @@
       <td><code>torque.omzip.src.extension</code></td>
       <td><code>false</code></td>
       <td>
-        Whether the om generated extension src (X.java) files should be included in 
+        Whether the om generated extension src (X.java) files should be included in
         the src jar produced by om-zip.
       </td>
     </tr>
@@ -465,7 +465,7 @@
       <td><code>torque.omzip.bin.base</code></td>
       <td><code>false</code></td>
       <td>
-        Whether the om generated base class (BaseX.class) files should be included 
+        Whether the om generated base class (BaseX.class) files should be included
         in the bin jar produced by om-zip.
       </td>
     </tr>
@@ -473,7 +473,7 @@
       <td><code>torque.omzip.bin.extension</code></td>
       <td><code>false</code></td>
       <td>
-        Whether the om generated extension class (X.class) files should be included 
+        Whether the om generated extension class (X.class) files should be included
         in the bin jar produced by om-zip.
       </td>
     </tr>
@@ -482,7 +482,7 @@
       <td><code>false</code></td>
       <td>Whether the generated om files should be deleted following the om-zip.</td>
     </tr>
-    
+
     <tr>
       <td colspan="3"><strong> Compile Settings </strong></td>
     </tr>

Modified: db/torque/generator/trunk/xdocs/schema-reference.xml
URL: http://svn.apache.org/viewcvs/db/torque/generator/trunk/xdocs/schema-reference.xml?rev=239626&r1=239625&r2=239626&view=diff
==============================================================================
--- db/torque/generator/trunk/xdocs/schema-reference.xml (original)
+++ db/torque/generator/trunk/xdocs/schema-reference.xml Wed Aug 24 05:19:51 2005
@@ -43,7 +43,7 @@
        document in the src/conf/torque/schema.
      </p>
    </section>
-   
+
    <section name="Element: database">
        <p>
          The database element and its relevant attributes.
@@ -210,13 +210,13 @@
        </p>
      </subsection>
    </section>
-   
+
    <section name="Element: external-schema">
        <p>
          Includes another schema file.
        </p>
        <source><![CDATA[
-         <external-schema 
+         <external-schema
            filename="extext-schema.xml" />
        ]]>
        </source>
@@ -227,17 +227,17 @@
          Domains are used to define attributes for columns.
        </p>
        <source><![CDATA[
-         <domain 
-           name="amount" 
-           type="NUMERIC" 
-           size="10" 
-           scale="2" 
-           default="0" 
+         <domain
+           name="amount"
+           type="NUMERIC"
+           size="10"
+           scale="2"
+           default="0"
            description="amount domain" />
        ]]>
        </source>
    </section>
-   
+
    <section name="Element: table">
        <p>
          The table element and its relevant attributes
@@ -356,7 +356,7 @@
        </p>
      </subsection>
    </section>
-   
+
    <section name="Element: column">
        <p>
          The column element and its relevant attributes



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


Mime
View raw message