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 tf...@apache.org on 2010/10/01 20:09:15 UTC
svn commit: r1003604 - in /db/torque/torque4/trunk:
torque-runtime/src/main/java/org/apache/torque/map/
torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapBuilder/
torque-templates/src/main/resources/org/apache/torque/templ...
Author: tfischer
Date: Fri Oct 1 18:09:15 2010
New Revision: 1003604
URL: http://svn.apache.org/viewvc?rev=1003604&view=rev
Log:
TORQUE-145: remove inputValidator attribute from schema
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapBuilder/doBuild.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd
Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java?rev=1003604&r1=1003603&r2=1003604&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java (original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java Fri Oct 1 18:09:15 2010
@@ -109,9 +109,6 @@ public class ColumnMap implements java.i
private Map inheritanceMaps = Collections
.synchronizedMap(new ListOrderedMap());
- /** Input validator class name. (in DTD but not used?) */
- private String inputValidator;
-
/** Java naming method the generator used. */
private String javaNamingMethod;
@@ -526,27 +523,6 @@ public class ColumnMap implements java.i
}
/**
- * Returns the input validator class name.
- * (This property is in the DTD, but currently not used by Torque?)
- *
- * @return Returns the inputValidator.
- */
- public String getInputValidator()
- {
- return inputValidator;
- }
-
- /**
- * Sets the input validator class name.
- *
- * @param inputValidator The inputValidator to set.
- */
- public void setInputValidator(String inputValidator)
- {
- this.inputValidator = inputValidator;
- }
-
- /**
* Returns whether getters and setters are generated with the
* access modifier "protected" rather than "public".
*
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapBuilder/doBuild.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapBuilder/doBuild.vm?rev=1003604&r1=1003603&r2=1003604&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapBuilder/doBuild.vm (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/mapBuilder/doBuild.vm Fri Oct 1 18:09:15 2010
@@ -102,7 +102,6 @@
#set ( $columnDescription = $columnElement.getAttribute("description") )
#set ( $default = $columnElement.getAttribute("default") )
#set ( $inheritance = $columnElement.getAttribute("inheritance") )
- #set ( $inputValidator = $columnElement.getAttribute("inputValidator") )
#set ( $size = $columnElement.getAttribute("size") )
#set ( $scale = $columnElement.getAttribute("scale") )
#set ( $referencedColumnElements = $columnElement.getChildren("referenced-column"))
@@ -128,9 +127,6 @@
#if ($inheritance != "false")
cMap.setInheritance("$inheritance");
#end
- #if ($inputValidator)
- cMap.setInputValidator("$inputValidator");
- #end
#if ($size)
cMap.setSize($size);
#if ($scale)
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd?rev=1003604&r1=1003603&r2=1003604&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd Fri Oct 1 18:09:15 2010
@@ -543,15 +543,6 @@ The inheritance method used (see Inherit
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="inputValidator" type="xs:string"
- use="optional" >
- <xs:annotation>
- <xs:documentation xml:lang="en">
-Simply sets the inputValidator property in the ColumnMap object for
-this column. Not used by torque directly.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
<xs:attribute name="protected" use="optional"
type="xs:boolean" default="false" >
<xs:annotation>
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org