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 tv...@apache.org on 2006/10/20 14:18:17 UTC
svn commit: r466086 - in
/db/torque/generator/trunk/src/java/org/apache/torque: engine/
engine/database/model/ engine/database/transform/ engine/platform/
engine/sql/ task/
Author: tv
Date: Fri Oct 20 05:18:13 2006
New Revision: 466086
URL: http://svn.apache.org/viewvc?view=rev&rev=466086
Log:
Preparation for release:
- "wrestled" the code (thanks to Henning)
-- removed trailing blanks
-- Relicensed with copyright -2006
- Fixed some checkstyle complaints
Modified:
db/torque/generator/trunk/src/java/org/apache/torque/engine/EngineException.java
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/ConstraintNameGenerator.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/ForeignKey.java
db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/IDMethod.java
db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/IdMethodParameter.java
db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Index.java
db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Inheritance.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/NameGenerator.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/model/Unique.java
db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/DTDResolver.java
db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/SQLToAppData.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/PlatformAxionImpl.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/PlatformDerbyImpl.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/PlatformHypersonicImpl.java
db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformInterbaseImpl.java
db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMsaccessImpl.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/engine/sql/ParseException.java
db/torque/generator/trunk/src/java/org/apache/torque/engine/sql/SQLScanner.java
db/torque/generator/trunk/src/java/org/apache/torque/engine/sql/Token.java
db/torque/generator/trunk/src/java/org/apache/torque/task/PackageAsPathTask.java
db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataDumpTask.java
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/TorqueDocumentationTask.java
db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueJDBCTransformTask.java
db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueSQLExec.java
db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueSQLTask.java
db/torque/generator/trunk/src/java/org/apache/torque/task/package.html
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/EngineException.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/EngineException.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/EngineException.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/EngineException.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Column.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Column.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.database.model;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -744,30 +744,30 @@
* If size attribute is an integer number, it will be returned.
* If size attribute is of the format "Precision,Scale", then Precision
* will be returned.
- * If size is null or the size value is not an valid integer,
+ * If size is null or the size value is not an valid integer,
* null is returned.
* <p>
* Note: Unparseable values will be logged as a warning.
- *
- * @return The precision portion of the size attribute.
+ *
+ * @return The precision portion of the size attribute.
*/
public String getPrecision()
{
String size = getSize();
- if ( size == null )
+ if (size == null)
{
return size;
}
int cLoc = size.indexOf(',');
- if ( cLoc > 0 )
+ if (cLoc > 0)
{
size = size.substring(0, cLoc);
}
- try
+ try
{
Integer.parseInt(size);
- }
- catch ( NumberFormatException e )
+ }
+ catch (NumberFormatException e)
{
log.warn("getPrecision(): Size attribute found ("
+ getSize()
@@ -778,43 +778,43 @@
}
/**
- * Try to determine the scale of the field from the scale and size
+ * Try to determine the scale of the field from the scale and size
* attribute.
* If scale attribute is an integer number, it will be returned.
* If size attribute is of the format "Precision,Scale", then Scale
* will be returned.
- * If scale and size attributes are null or the scale value found
+ * If scale and size attributes are null or the scale value found
* is not an valid integer, a null value is returned.
* <p>
* Note: Unparseable values will be logged as a warning.
- *
- * @return The precision portion of the size attribute.
+ *
+ * @return The precision portion of the size attribute.
*/
public String getScale()
{
String scale = domain.getScale();
// Check for scale on size attribute if no scale attribute
- if ( scale == null )
+ if (scale == null)
{
scale = getSize();
- if ( scale == null ) // No scale or size attribute set.
+ if (scale == null) // No scale or size attribute set.
{
return scale;
}
int cLoc = scale.indexOf(',');
- if ( cLoc < 0 ) // Size did not have "P,S" format
+ if (cLoc < 0) // Size did not have "P,S" format
{
return null;
}
- scale = scale.substring(cLoc + 1 );
+ scale = scale.substring(cLoc + 1);
}
// Validate that scale string found is integer.
- try
+ try
{
Integer.parseInt(scale);
}
- catch ( NumberFormatException e )
+ catch (NumberFormatException e)
{
log.warn("getScale(): Scale (or size=\"p,s\") attribute found ("
+ scale
@@ -1173,7 +1173,7 @@
/**
* Get the value of the inheritance attribute defined in the schema XML.
- *
+ *
* @return Returns the inheritanceType.
*/
public String getInheritanceType()
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/ConstraintNameGenerator.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/ConstraintNameGenerator.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/ConstraintNameGenerator.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/ConstraintNameGenerator.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.database.model;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Database.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Database.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.database.model;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -316,11 +316,13 @@
tbl.setPackage(getPackage());
}
- public void addDomain(Domain domain) {
+ public void addDomain(Domain domain)
+ {
domainMap.put(domain.getName(), domain);
}
- public Domain getDomain(String domainName) {
+ public Domain getDomain(String domainName)
+ {
return (Domain) domainMap.get(domainName);
}
@@ -478,7 +480,7 @@
/**
* Get the base name to use when creating related Java Classes.
- *
+ *
* @return A Java syntax capatible version of the dbName using the method
* defined by the defaultJavaNamingMethod XML value.
*/
@@ -501,11 +503,11 @@
}
return javaName;
}
-
+
/**
- * Convert dbName to a Java compatible name by the JavaName method only
+ * Convert dbName to a Java compatible name by the JavaName method only
* (ignores the defaultJavaNamingMethod).
- *
+ *
* @return The current dbName converted to a standard format that can
* be used as part of a Java Object name.
*/
@@ -528,7 +530,7 @@
}
return javaName;
}
-
+
/**
* Creats a string representation of this Database.
* The representation is given in xml format.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Domain.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Domain.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.database.model;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/ForeignKey.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/ForeignKey.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/ForeignKey.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/ForeignKey.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.database.model;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/IDMethod.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/IDMethod.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/IDMethod.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/IDMethod.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.database.model;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
{
/**
* Key generation via database-specific ID method.
- * For example, this would be auto-increment for MySQL,
+ * For example, this would be auto-increment for MySQL,
* sequence for Oracle, etc.
*/
String NATIVE = "native";
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/IdMethodParameter.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/IdMethodParameter.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/IdMethodParameter.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/IdMethodParameter.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.database.model;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Index.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Index.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Index.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Index.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.database.model;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Inheritance.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Inheritance.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Inheritance.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Inheritance.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.database.model;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/JavaNameGenerator.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/JavaNameGenerator.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.database.model;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -136,7 +136,8 @@
{
// take only part after last dot
int lastDotPos = schemaName.lastIndexOf(SCHEMA_SEPARATOR_CHAR);
- if (lastDotPos != -1) {
+ if (lastDotPos != -1)
+ {
schemaName = schemaName.substring(lastDotPos + 1);
}
StringBuffer name = new StringBuffer();
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameFactory.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameFactory.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.database.model;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameGenerator.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameGenerator.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameGenerator.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameGenerator.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.database.model;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/SchemaType.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/SchemaType.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.database.model;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -31,10 +31,10 @@
public class SchemaType extends Enum
{
/**
- * Serialization support
+ * Serialization support
*/
private static final long serialVersionUID = 17588853769472381L;
-
+
public static final SchemaType BIT = new SchemaType("BIT");
public static final SchemaType TINYINT = new SchemaType("TINYINT");
public static final SchemaType SMALLINT = new SchemaType("SMALLINT");
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Table.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Table.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.database.model;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -262,7 +262,7 @@
* @return unique name for constraint
* @throws EngineException
*/
- private final String acquireConstraintName(String nameType, int nbr)
+ private String acquireConstraintName(String nameType, int nbr)
throws EngineException
{
List inputs = new ArrayList(4);
@@ -1145,7 +1145,7 @@
public void setCorrectGetters(Boolean value)
{
boolean correctGetters = value != null && value.booleanValue();
- for (Iterator it = columnList.iterator(); it.hasNext(); )
+ for (Iterator it = columnList.iterator(); it.hasNext();)
{
Column col = (Column) it.next();
col.setCorrectGetters(correctGetters);
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/TypeMap.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/TypeMap.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -215,7 +215,7 @@
* Initializes the SQL to Java map so that it
* can be used by client code.
*/
- public synchronized static void initialize()
+ public static synchronized void initialize()
{
if (!isInitialized)
{
@@ -558,8 +558,8 @@
if (st == null)
{
st = SchemaType.VARCHAR;
- log.warn("SchemaType for JdbcType '" + sqlType +
- "' is not defined: Defaulting to '" + st + '\'');
+ log.warn("SchemaType for JdbcType '" + sqlType
+ + "' is not defined: Defaulting to '" + st + '\'');
}
return st;
}
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Unique.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Unique.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Unique.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Unique.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.database.model;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/DTDResolver.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/DTDResolver.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/DTDResolver.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/DTDResolver.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.database.transform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -78,7 +78,7 @@
* An implementation of the SAX <code>EntityResolver</code>
* interface to be called by the XML parser. If the dtd is the
* current Torque DTD, the DTD is read from the generator jar.
- * In all other cases, null is returned to indicate that the parser
+ * In all other cases, null is returned to indicate that the parser
* should open a regular connection to the systemId URI.
*
* @param publicId The public identifier of the external entity
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/SQLToAppData.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/SQLToAppData.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/SQLToAppData.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/SQLToAppData.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.database.transform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -518,7 +518,7 @@
else
{
StringBuffer line = new StringBuffer();
- for (Iterator tokenIt = tokens.iterator();
+ for (Iterator tokenIt = tokens.iterator();
tokenIt.hasNext();)
{
line.append(tokenIt.next());
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/XmlToAppData.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/XmlToAppData.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.database.transform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -154,7 +154,7 @@
throw new FileNotFoundException
(new File(xmlFile).getAbsolutePath());
}
- BufferedInputStream bufferedInputStream
+ BufferedInputStream bufferedInputStream
= new BufferedInputStream(fileInputStream);
try
{
@@ -170,11 +170,11 @@
}
catch (SAXParseException e)
{
- throw new EngineException("Sax error on line "
+ throw new EngineException("Sax error on line "
+ e.getLineNumber()
+ " column "
+ e.getColumnNumber()
- + " : "
+ + " : "
+ e.getMessage(),
e);
}
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/XmlToData.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/XmlToData.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.database.transform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/Platform.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/Platform.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.platform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -28,9 +28,9 @@
public interface Platform
{
/** constant for native id method */
- static final String IDENTITY = "identity";
+ String IDENTITY = "identity";
/** constant for native id method */
- static final String SEQUENCE = "sequence";
+ String SEQUENCE = "sequence";
/**
* Returns the native IdMethod (sequence|identity)
@@ -80,14 +80,14 @@
* @return true if the type has a scale attribute
*/
boolean hasScale(String sqlType);
-
+
/**
* Returns whether the "not null part" of the definition of a column
- * should be generated before the "autoincrement part" in a "create table"
+ * should be generated before the "autoincrement part" in a "create table"
* statement.
- *
+ *
* @return true if the "not null part" should be first,
- * false if the "autoincrement part" should be first in a
+ * false if the "autoincrement part" should be first in a
* "create table" statement.
*/
boolean createNotNullBeforeAutoincrement();
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformAxionImpl.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformAxionImpl.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformAxionImpl.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformAxionImpl.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.platform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformCloudscapeImpl.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformCloudscapeImpl.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.platform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDb2400Impl.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDb2400Impl.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.platform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDb2Impl.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDb2Impl.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.platform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDefaultImpl.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDefaultImpl.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.platform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -123,7 +123,7 @@
{
return true;
}
-
+
/**
* @see Platform#createNotNullBeforeAutoincrement()
*/
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDerbyImpl.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDerbyImpl.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDerbyImpl.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDerbyImpl.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.platform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@
{
return 128;
}
-
+
/**
* @see Platform#getAutoIncrement()
*/
@@ -80,9 +80,9 @@
*/
public String getNativeIdMethod()
{
- return Platform.IDENTITY;
+ return Platform.IDENTITY;
}
-
+
/**
* @see Platform#hasScale(String)
*/
@@ -100,5 +100,5 @@
|| "VARCHAR".equals(sqlType) || "CHAR".equals(sqlType)
|| "BINARY".equals(sqlType)
|| "BLOB".equals(sqlType) || "CLOB".equals(sqlType);
- }
+ }
}
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformFactory.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformFactory.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.platform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformHypersonicImpl.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformHypersonicImpl.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformHypersonicImpl.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformHypersonicImpl.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.platform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -50,17 +50,17 @@
}
/**
- * @return The RDBMS-specific SQL fragment for autoincrement.
+ * @return The RDBMS-specific SQL fragment for autoincrement.
* @see Platform#getAutoIncrement()
*/
public String getAutoIncrement()
{
return "GENERATED BY DEFAULT AS IDENTITY (START WITH 1)";
}
-
+
/**
* Returns whether the "not null part" of the definition of a column
- * should be generated before the "autoincrement part" in a "create table"
+ * should be generated before the "autoincrement part" in a "create table"
* statement.
* @return false.
* @see Platform#createNotNullBeforeAutoincrement()
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformInterbaseImpl.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformInterbaseImpl.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformInterbaseImpl.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformInterbaseImpl.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.platform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMsaccessImpl.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMsaccessImpl.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMsaccessImpl.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMsaccessImpl.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.platform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMssqlImpl.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMssqlImpl.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.platform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMysqlImpl.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMysqlImpl.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.platform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -62,7 +62,8 @@
/**
* @see Platform#hasSize(String)
*/
- public boolean hasSize(String sqlType) {
+ public boolean hasSize(String 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/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformOracleImpl.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.platform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformPostgresqlImpl.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformPostgresqlImpl.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.platform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformSapdbImpl.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformSapdbImpl.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.platform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformSybaseImpl.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformSybaseImpl.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.platform;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/package.html
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/package.html?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,5 +1,5 @@
<!--
- Copyright 2001-2005 The Apache Software Foundation.
+ Copyright 2001-2006 The Apache Software Foundation.
Licensed under the Apache License, Version 2.0 (the "License")
you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/sql/ParseException.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/sql/ParseException.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/sql/ParseException.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/sql/ParseException.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.sql;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/sql/SQLScanner.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/sql/SQLScanner.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/sql/SQLScanner.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/sql/SQLScanner.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.sql;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/sql/Token.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/sql/Token.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/sql/Token.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/sql/Token.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.engine.sql;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/task/PackageAsPathTask.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/task/PackageAsPathTask.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/task/PackageAsPathTask.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/task/PackageAsPathTask.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.task;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataDumpTask.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataDumpTask.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataDumpTask.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataDumpTask.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.task;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -339,7 +339,7 @@
/**
* Dummy implementation of the remove() method of the iterator
- * interface. This implementation always throws a
+ * interface. This implementation always throws a
* UnsupportedOperationException
*
* @throws UnsupportedOperationException always.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataModelTask.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataModelTask.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.task;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -283,13 +283,13 @@
context.put("databaseNames", databaseNames);
context.put("targetDatabase", targetDatabase);
context.put("targetPackage", targetPackage);
-
+
return context;
}
/**
* Change type of "now" to java.util.Date
- *
+ *
* @see org.apache.velocity.texen.ant.TexenTask#populateInitialContext(org.apache.velocity.context.Context)
*/
protected void populateInitialContext(Context context) throws Exception
@@ -351,7 +351,7 @@
Hashtable env = super.getProject().getProperties();
for (Iterator i = env.entrySet().iterator(); i.hasNext();)
{
- Map.Entry entry = (Map.Entry)i.next();
+ Map.Entry entry = (Map.Entry) i.next();
String key = (String) entry.getKey();
if (key.startsWith("torque."))
{
Modified: db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataSQLTask.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataSQLTask.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.task;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDocumentationTask.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDocumentationTask.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDocumentationTask.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDocumentationTask.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.task;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
Modified: db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueJDBCTransformTask.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueJDBCTransformTask.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- 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 Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.task;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -519,10 +519,10 @@
{
// this seems to be happening in some db drivers (sybase)
// when retrieving foreign keys from views.
- log("WARN: Could not read foreign keys for Table "
+ log("WARN: Could not read foreign keys for Table "
+ tableName
+ " : "
- + e.getMessage(),
+ + e.getMessage(),
Project.MSG_WARN);
}
finally
Modified: db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueSQLExec.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueSQLExec.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueSQLExec.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueSQLExec.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.task;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -875,11 +875,11 @@
public static class OnError extends EnumeratedAttribute
{
public static final String CONTINUE = "continue";
-
+
public static final String STOP = "stop";
public static final String ABORT = "abort";
-
+
public String[] getValues()
{
return new String[] {CONTINUE, STOP, ABORT};
Modified: db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueSQLTask.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueSQLTask.java?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueSQLTask.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueSQLTask.java Fri Oct 20 05:18:13 2006
@@ -1,7 +1,7 @@
package org.apache.torque.task;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -53,7 +53,7 @@
/**
* Sets the name of the database to generate sql for.
- *
+ *
* @param database the name of the database to generate sql for.
*/
public void setDatabase(String database)
@@ -63,7 +63,7 @@
/**
* Returns the name of the database to generate sql for.
- *
+ *
* @return the name of the database to generate sql for.
*/
public String getDatabase()
@@ -73,7 +73,7 @@
/**
* Sets the suffix of the generated sql files.
- *
+ *
* @param suffix the suffix of the generated sql files.
*/
public void setSuffix(String suffix)
@@ -83,7 +83,7 @@
/**
* Returns the suffix of the generated sql files.
- *
+ *
* @return the suffix of the generated sql files.
*/
public String getSuffix()
Modified: db/torque/generator/trunk/src/java/org/apache/torque/task/package.html
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/task/package.html?view=diff&rev=466086&r1=466085&r2=466086
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/task/package.html (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/task/package.html Fri Oct 20 05:18:13 2006
@@ -1,5 +1,5 @@
<!--
- Copyright 2001-2005 The Apache Software Foundation.
+ Copyright 2001-2006 The Apache Software Foundation.
Licensed under the Apache License, Version 2.0 (the "License")
you may not use this file except in compliance with the License.
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org