db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r1470235 [5/7] - in /db/torque/torque4/trunk: torque-generator/ torque-generator/src/main/java/org/apache/torque/generator/configuration/ torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/ torque-generator/src/...
Date Sat, 20 Apr 2013 21:23:42 GMT
Copied: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/model/PropertyAccessTest.java (from r1465295, db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/model/PropertyAccessTest.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/model/PropertyAccessTest.java?p2=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/model/PropertyAccessTest.java&p1=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/model/PropertyAccessTest.java&r1=1465295&r2=1470235&rev=1470235&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/model/PropertyAccessTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/model/PropertyAccessTest.java Sat Apr 20 21:23:39 2013
@@ -1,4 +1,4 @@
-package org.apache.torque.generator.source.model;
+package org.apache.torque.generator.source.transform.model;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -32,7 +32,7 @@ import java.util.Queue;
 import java.util.Set;
 import java.util.Vector;
 
-import org.apache.torque.generator.source.SourceException;
+import org.apache.torque.generator.source.transform.SourceTransformerException;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -60,7 +60,7 @@ public class PropertyAccessTest
             new PropertyAccess(null, "publicIntField");
             fail("Exception expected");
         }
-        catch (NullPointerException e)
+        catch (final NullPointerException e)
         {
             assertEquals("target must not be null", e.getMessage());
         }
@@ -74,7 +74,7 @@ public class PropertyAccessTest
             new PropertyAccess(testClass, null);
             fail("Exception expected");
         }
-        catch (NullPointerException e)
+        catch (final NullPointerException e)
         {
             assertEquals("propertyName must not be null", e.getMessage());
         }
@@ -83,21 +83,21 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyNotExistentField() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "fieldDoesNotExist");
         try
         {
             propertyAccess.setProperty(2);
             fail("Exception expected");
         }
-        catch (NoSuchPropertyException e)
+        catch (final NoSuchPropertyException e)
         {
             assertEquals("Neither public field nor public getter/setter exists "
                     + "for property fieldDoesNotExist or fieldDoesNotExists "
                     + "or fieldDoesNotExistArray or fieldDoesNotExistList "
                     + "and no public field exists for property "
                     + "_fieldDoesNotExist of class "
-                    + "org.apache.torque.generator.source.model"
+                    + "org.apache.torque.generator.source.transform.model"
                     + ".PropertyAccessTest$TestClass",
                 e.getMessage());
         }
@@ -106,21 +106,21 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPrivateField() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "privateIntField");
         try
         {
             propertyAccess.setProperty(2);
             fail("Exception expected");
         }
-        catch (NoSuchPropertyException e)
+        catch (final NoSuchPropertyException e)
         {
             assertEquals("Neither public field nor public getter/setter exists "
                     + "for property privateIntField or privateIntFields "
                     + "or privateIntFieldArray or privateIntFieldList "
                     + "and no public field exists for property "
                     + "_privateIntField of class "
-                    + "org.apache.torque.generator.source.model"
+                    + "org.apache.torque.generator.source.transform.model"
                     + ".PropertyAccessTest$TestClass",
                 e.getMessage());
         }
@@ -129,21 +129,21 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyProtectedField() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "protectedIntField");
         try
         {
             propertyAccess.setProperty(2);
             fail("Exception expected");
         }
-        catch (NoSuchPropertyException e)
+        catch (final NoSuchPropertyException e)
         {
             assertEquals("Neither public field nor public getter/setter exists "
                     + "for property protectedIntField or protectedIntFields "
                     + "or protectedIntFieldArray or protectedIntFieldList "
                     + "and no public field exists for property "
                     + "_protectedIntField of class "
-                    + "org.apache.torque.generator.source.model"
+                    + "org.apache.torque.generator.source.transform.model"
                     + ".PropertyAccessTest$TestClass",
                 e.getMessage());
         }
@@ -152,21 +152,21 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyField() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "intField");
         try
         {
             propertyAccess.setProperty(2);
             fail("Exception expected");
         }
-        catch (NoSuchPropertyException e)
+        catch (final NoSuchPropertyException e)
         {
             assertEquals("Neither public field nor public getter/setter exists "
                     + "for property intField or intFields "
                     + "or intFieldArray or intFieldList "
                     + "and no public field exists for property "
                     + "_intField of class "
-                    + "org.apache.torque.generator.source.model"
+                    + "org.apache.torque.generator.source.transform.model"
                     + ".PropertyAccessTest$TestClass",
                 e.getMessage());
         }
@@ -175,7 +175,7 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicField() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicIntField");
         propertyAccess.setProperty(2);
         assertEquals(2, testClass.publicIntField);
@@ -190,7 +190,7 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicFieldEndingWithS() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicFieldEndingWith");
         propertyAccess.setProperty(2);
         assertEquals(2, testClass.publicFieldEndingWiths);
@@ -206,7 +206,7 @@ public class PropertyAccessTest
     public void testSetPropertyPublicFieldStartingWithUnderscore()
             throws Exception
     {
-        PropertyAccess propertyAccess = new PropertyAccess(
+        final PropertyAccess propertyAccess = new PropertyAccess(
                 testClass,
                 "publicFieldStartingWithUnderscore");
         propertyAccess.setProperty(2);
@@ -216,7 +216,7 @@ public class PropertyAccessTest
     @Test
     public void testAccessPublicFieldFromBaseClass() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicIntFieldFromBaseClass");
         propertyAccess.setProperty(2);
         assertEquals(2, testClass.publicIntFieldFromBaseClass);
@@ -225,17 +225,17 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicFieldWrongClass() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicIntField");
         try
         {
             propertyAccess.setProperty("abc");
             fail("Exception expected");
         }
-        catch (SourceException e)
+        catch (final SourceTransformerException e)
         {
             assertEquals("The field publicIntField of class "
-                    + "org.apache.torque.generator.source.model"
+                    + "org.apache.torque.generator.source.transform.model"
                     + ".PropertyAccessTest$TestClass cannot be set to abc "
                     + "because the argument has the wrong type "
                     + "java.lang.String",
@@ -246,17 +246,17 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyIntFieldNull() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicIntField");
         try
         {
             propertyAccess.setProperty(null);
             fail("Exception expected");
         }
-        catch (SourceException e)
+        catch (final SourceTransformerException e)
         {
             assertEquals("The field publicIntField of class "
-                    + "org.apache.torque.generator.source.model"
+                    + "org.apache.torque.generator.source.transform.model"
                     + ".PropertyAccessTest$TestClass because the value is null"
                     + " which is not allowed",
                 e.getMessage());
@@ -266,7 +266,7 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringField() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringField");
         propertyAccess.setProperty("abc");
         assertEquals("abc", testClass.publicStringField);
@@ -275,7 +275,7 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringFieldNull() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringField");
         testClass.publicStringField = "abc";
         propertyAccess.setProperty(null);
@@ -285,7 +285,7 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringArrayField() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringArrayField");
         propertyAccess.setProperty("abc");
         assertArrayEquals(new Object[] {"abc"}, testClass.publicStringArrayField);
@@ -295,7 +295,7 @@ public class PropertyAccessTest
     public void testSetPropertyPublicStringArrayFieldAlreadyFilled()
             throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringArrayField");
         testClass.publicStringArrayField = new String[] {"def", "XYZ"};
         propertyAccess.setProperty("abc");
@@ -307,7 +307,7 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringArrayFieldNull() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringArrayField");
         testClass.publicStringArrayField = new String[] {"abc"};
         propertyAccess.setProperty(null);
@@ -319,7 +319,7 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringArrayFieldArray() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringArrayField");
         testClass.publicStringArrayField = new String[] {"XYZ", "def"};
         propertyAccess.setProperty(new String[] {"abc"});
@@ -330,10 +330,10 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringCollectionField() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringCollectionField");
         propertyAccess.setProperty("abc");
-        List<String> expected = new ArrayList<String>();
+        final List<String> expected = new ArrayList<String>();
         expected.add("abc");
         assertEquals(expected, testClass.publicStringCollectionField);
     }
@@ -342,14 +342,14 @@ public class PropertyAccessTest
     public void testSetPropertyPublicStringCollectionFieldAlreadyFilled()
             throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringCollectionField");
-        List<String> initial = new ArrayList<String>();
+        final List<String> initial = new ArrayList<String>();
         initial.add("def");
         initial.add("XYZ");
         testClass.publicStringCollectionField = initial;
         propertyAccess.setProperty("abc");
-        List<String> expected = new ArrayList<String>();
+        final List<String> expected = new ArrayList<String>();
         expected.add("def");
         expected.add("XYZ");
         expected.add("abc");
@@ -359,11 +359,11 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringCollectionFieldNull() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringCollectionField");
         testClass.publicStringField = "abc";
         propertyAccess.setProperty(null);
-        List<String> expected = new ArrayList<String>();
+        final List<String> expected = new ArrayList<String>();
         expected.add(null);
         assertEquals(expected, testClass.publicStringCollectionField);
     }
@@ -378,16 +378,16 @@ public class PropertyAccessTest
     public void testSetPropertyPublicStringCollectionFieldCollection()
             throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringCollectionField");
-        List<String> initial = new ArrayList<String>();
+        final List<String> initial = new ArrayList<String>();
         initial.add("def");
         initial.add("XYZ");
         testClass.publicStringCollectionField = initial;
-        List<String> setValue = new ArrayList<String>();
+        final List<String> setValue = new ArrayList<String>();
         setValue.add("abc");
         propertyAccess.setProperty(setValue);
-        List<String> expected = new ArrayList<String>();
+        final List<String> expected = new ArrayList<String>();
         expected.add("abc");
         assertEquals(expected, testClass.publicStringCollectionField);
     }
@@ -395,10 +395,10 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringListField() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringListField");
         propertyAccess.setProperty("abc");
-        List<String> expected = new ArrayList<String>();
+        final List<String> expected = new ArrayList<String>();
         expected.add("abc");
         assertEquals(expected, testClass.publicStringListField);
     }
@@ -406,10 +406,10 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringSetField() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringSetField");
         propertyAccess.setProperty("abc");
-        Set<String> expected = new HashSet<String>();
+        final Set<String> expected = new HashSet<String>();
         expected.add("abc");
         assertEquals(expected, testClass.publicStringSetField);
     }
@@ -417,10 +417,10 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringQueueField() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringQueueField");
         propertyAccess.setProperty("abc");
-        LinkedList<String> expected = new LinkedList<String>();
+        final LinkedList<String> expected = new LinkedList<String>();
         expected.add("abc");
         assertEquals(expected, testClass.publicStringQueueField);
     }
@@ -428,29 +428,38 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringVectorField() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringVectorField");
         propertyAccess.setProperty("abc");
-        Vector<String> expected = new Vector<String>();
+        final Vector<String> expected = new Vector<String>();
         expected.add("abc");
         assertEquals(expected, testClass.publicStringVectorField);
     }
 
     @Test
+    public void testSetPropertyPublicBooleanFieldUsingConverter()
+            throws Exception
+    {
+        final PropertyAccess propertyAccess
+                = new PropertyAccess(testClass, "publicBooleanField");
+        propertyAccess.setProperty("true");
+        assertEquals(Boolean.TRUE, testClass.publicBooleanField);
+    }
+
+    @Test
     public void testSetPropertyOnlyGetter() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "onlyGetter");
         try
         {
             propertyAccess.setProperty(2);
             fail("Exception expected");
         }
-        catch (PropertyNotWriteableException e)
+        catch (final PropertyNotWriteableException e)
         {
             assertEquals("The property onlyGetter of class "
-                    + "org.apache.torque.generator.source.model."
-                    + "PropertyAccessTest$TestClass is not writeable",
+                    + testClass.getClass().getName() + " is not writeable",
                 e.getMessage());
         }
     }
@@ -458,22 +467,21 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPrivateSetter() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "privateIntSetter");
         try
         {
             propertyAccess.setProperty(2);
             fail("Exception expected");
         }
-        catch (NoSuchPropertyException e)
+        catch (final NoSuchPropertyException e)
         {
             assertEquals("Neither public field nor public getter/setter exists "
                     + "for property privateIntSetter or privateIntSetters "
                     +  "or privateIntSetterArray or privateIntSetterList "
                     + "and no public field exists for property "
                     + "_privateIntSetter of class "
-                    + "org.apache.torque.generator.source.model"
-                    + ".PropertyAccessTest$TestClass",
+                    + testClass.getClass().getName(),
                 e.getMessage());
         }
     }
@@ -481,22 +489,21 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyProtectedSetter() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "protectedIntSetter");
         try
         {
             propertyAccess.setProperty(2);
             fail("Exception expected");
         }
-        catch (NoSuchPropertyException e)
+        catch (final NoSuchPropertyException e)
         {
             assertEquals("Neither public field nor public getter/setter exists "
                     + "for property protectedIntSetter or protectedIntSetters "
                     +  "or protectedIntSetterArray or protectedIntSetterList "
                     + "and no public field exists for property "
                     + "_protectedIntSetter of class "
-                    + "org.apache.torque.generator.source.model"
-                    + ".PropertyAccessTest$TestClass",
+                    + testClass.getClass().getName(),
                 e.getMessage());
         }
     }
@@ -504,22 +511,21 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertySetter() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "intSetter");
         try
         {
             propertyAccess.setProperty(2);
             fail("Exception expected");
         }
-        catch (NoSuchPropertyException e)
+        catch (final NoSuchPropertyException e)
         {
             assertEquals("Neither public field nor public getter/setter exists "
                     + "for property intSetter or intSetters "
                     +  "or intSetterArray or intSetterList "
                     + "and no public field exists for property "
                     + "_intSetter of class "
-                    + "org.apache.torque.generator.source.model"
-                    + ".PropertyAccessTest$TestClass",
+                    + testClass.getClass().getName(),
                 e.getMessage());
         }
     }
@@ -527,7 +533,7 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicSetter() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicIntSetter");
         propertyAccess.setProperty(2);
         assertEquals(2, testClass.publicIntField);
@@ -536,7 +542,7 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicSetterEndingWithS() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicSetterEndingWith");
         propertyAccess.setProperty(2);
         assertEquals(2, testClass.publicFieldEndingWiths);
@@ -545,7 +551,7 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicSetterFromBaseClass() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicIntSetterFromBaseClass");
         propertyAccess.setProperty(2);
         assertEquals(2, testClass.publicIntFieldFromBaseClass);
@@ -554,18 +560,18 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicSetterWrongClass() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicIntSetter");
         try
         {
             propertyAccess.setProperty("abc");
             fail("Exception expected");
         }
-        catch (SourceException e)
+        catch (final SourceTransformerException e)
         {
             assertEquals("The field publicIntSetter of class "
-                    + "org.apache.torque.generator.source.model"
-                    + ".PropertyAccessTest$TestClass cannot be set to abc "
+                    + testClass.getClass().getName()
+                    + " cannot be set to abc "
                     + "because the argument has the wrong type "
                     + "java.lang.String",
                 e.getMessage());
@@ -575,18 +581,18 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyIntSetterNull() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicIntSetter");
         try
         {
             propertyAccess.setProperty(null);
             fail("Exception expected");
         }
-        catch (SourceException e)
+        catch (final SourceTransformerException e)
         {
             assertEquals("The field publicIntSetter of class "
-                    + "org.apache.torque.generator.source.model"
-                    + ".PropertyAccessTest$TestClass because the value is null"
+                    + testClass.getClass().getName()
+                    + " because the value is null"
                     + " which is not allowed",
                 e.getMessage());
         }
@@ -595,7 +601,7 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringSetter() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringSetter");
         propertyAccess.setProperty("abc");
         assertEquals("abc", testClass.publicStringField);
@@ -604,7 +610,7 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringSetterNull() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringSetter");
         testClass.publicStringField = "abc";
         propertyAccess.setProperty(null);
@@ -614,7 +620,7 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringArraySetter() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringArraySetter");
         propertyAccess.setProperty("abc");
         assertArrayEquals(new Object[] {"abc"}, testClass.publicStringArrayField);
@@ -624,7 +630,7 @@ public class PropertyAccessTest
     public void testSetPropertyPublicStringArraySetterAlreadyFilled()
             throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringArraySetter");
         testClass.publicStringArrayField = new String[] {"def", "XYZ"};
         propertyAccess.setProperty("abc");
@@ -636,7 +642,7 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringArraySetterNull() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringArraySetter");
         testClass.publicStringArrayField = new String[] {"abc"};
         propertyAccess.setProperty(null);
@@ -646,7 +652,7 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringArraySetterArray() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringArraySetter");
         propertyAccess.setProperty(new String[] {"abc"});
         assertArrayEquals(new String[] {"abc"}, testClass.publicStringArrayField);
@@ -656,18 +662,18 @@ public class PropertyAccessTest
     public void testSetPropertyPublicStringArraySetterWithoutGetter()
             throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringArraySetterWithoutGetter");
         try
         {
             propertyAccess.setProperty("abc");
             fail("Exception expected");
         }
-       catch (PropertyNotReadableException e)
+       catch (final PropertyNotReadableException e)
        {
            assertEquals("The property publicStringArraySetterWithoutGetter "
                    + "of class "
-                   + "org.apache.torque.generator.source.model.PropertyAccessTest$TestClass"
+                   + testClass.getClass().getName()
                    + " is not readable",
                e.getMessage());
        }
@@ -677,17 +683,18 @@ public class PropertyAccessTest
     public void testSetPropertyPublicStringArrayGetterWithoutSetter()
             throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringArrayGetterWithoutSetter");
-        try{
+        try
+        {
             propertyAccess.setProperty("abc");
             fail("Exception expected");
         }
-       catch (PropertyNotWriteableException e)
+       catch (final PropertyNotWriteableException e)
        {
            assertEquals("The property publicStringArrayGetterWithoutSetter "
                    + "of class "
-                   + "org.apache.torque.generator.source.model.PropertyAccessTest$TestClass"
+                   + testClass.getClass().getName()
                    + " is not writeable",
                e.getMessage());
        }
@@ -696,10 +703,10 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringCollectionSetter() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringCollectionSetter");
         propertyAccess.setProperty("abc");
-        List<String> expected = new ArrayList<String>();
+        final List<String> expected = new ArrayList<String>();
         expected.add("abc");
         assertEquals(expected, testClass.publicStringCollectionField);
     }
@@ -708,14 +715,14 @@ public class PropertyAccessTest
     public void testSetPropertyPublicStringCollectionSetterAlreadyFilled()
             throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringCollectionSetter");
-        List<String> initial = new ArrayList<String>();
+        final List<String> initial = new ArrayList<String>();
         initial.add("def");
         initial.add("XYZ");
         testClass.publicStringCollectionField = initial;
         propertyAccess.setProperty("abc");
-        List<String> expected = new ArrayList<String>();
+        final List<String> expected = new ArrayList<String>();
         expected.add("def");
         expected.add("XYZ");
         expected.add("abc");
@@ -726,11 +733,11 @@ public class PropertyAccessTest
     public void testSetPropertyPublicStringCollectionSetterNull()
             throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringCollectionSetter");
         testClass.publicStringField = "abc";
         propertyAccess.setProperty(null);
-        List<String> expected = new ArrayList<String>();
+        final List<String> expected = new ArrayList<String>();
         expected.add(null);
         assertEquals(expected, testClass.publicStringCollectionField);
     }
@@ -745,16 +752,16 @@ public class PropertyAccessTest
     public void testSetPropertyPublicStringCollectionSetterCollection()
             throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringCollectionSetter");
-        List<String> initial = new ArrayList<String>();
+        final List<String> initial = new ArrayList<String>();
         initial.add("def");
         initial.add("XYZ");
         testClass.publicStringCollectionField = initial;
-        List<String> setValue = new ArrayList<String>();
+        final List<String> setValue = new ArrayList<String>();
         setValue.add("abc");
         propertyAccess.setProperty(setValue);
-        List<String> expected = new ArrayList<String>();
+        final List<String> expected = new ArrayList<String>();
         expected.add("abc");
         assertEquals(expected, testClass.publicStringCollectionField);
     }
@@ -762,10 +769,10 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringListSetter() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringListSetter");
         propertyAccess.setProperty("abc");
-        List<String> expected = new ArrayList<String>();
+        final List<String> expected = new ArrayList<String>();
         expected.add("abc");
         assertEquals(expected, testClass.publicStringListField);
     }
@@ -773,10 +780,10 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringSetSetter() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringSetSetter");
         propertyAccess.setProperty("abc");
-        Set<String> expected = new HashSet<String>();
+        final Set<String> expected = new HashSet<String>();
         expected.add("abc");
         assertEquals(expected, testClass.publicStringSetField);
     }
@@ -784,10 +791,10 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringQueueSetter() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringQueueSetter");
         propertyAccess.setProperty("abc");
-        LinkedList<String> expected = new LinkedList<String>();
+        final LinkedList<String> expected = new LinkedList<String>();
         expected.add("abc");
         assertEquals(expected, testClass.publicStringQueueField);
     }
@@ -795,10 +802,10 @@ public class PropertyAccessTest
     @Test
     public void testSetPropertyPublicStringVectorSetter() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringVectorSetter");
         propertyAccess.setProperty("abc");
-        Vector<String> expected = new Vector<String>();
+        final Vector<String> expected = new Vector<String>();
         expected.add("abc");
         assertEquals(expected, testClass.publicStringVectorField);
     }
@@ -813,19 +820,18 @@ public class PropertyAccessTest
     public void testSetPropertyPublicStringCollectionOnlyGetter()
             throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringCollectionGetterWithoutSetter");
         try
         {
             propertyAccess.setProperty("abc");
             fail("Exception expected");
         }
-        catch (PropertyNotWriteableException e)
+        catch (final PropertyNotWriteableException e)
         {
             assertEquals("The property "
                     + "publicStringCollectionGetterWithoutSetter of class "
-                    + "org.apache.torque.generator.source.model."
-                    + "PropertyAccessTest$TestClass is not writeable",
+                    + testClass.getClass().getName() + " is not writeable",
                 e.getMessage());
         }
     }
@@ -840,26 +846,36 @@ public class PropertyAccessTest
     public void testSetPropertyPublicStringCollectionOnlyGetterAlreadyFilled()
             throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
                 = new PropertyAccess(testClass, "publicStringCollectionGetterWithoutSetter");
-        List<String> initial = new ArrayList<String>();
+        final List<String> initial = new ArrayList<String>();
         initial.add("def");
         initial.add("XYZ");
         testClass.publicStringCollectionField = initial;
         propertyAccess.setProperty("abc");
-        List<String> expected = new ArrayList<String>();
+        final List<String> expected = new ArrayList<String>();
         expected.add("def");
         expected.add("XYZ");
         expected.add("abc");
         assertEquals(expected, testClass.publicStringCollectionField);
     }
 
+    @Test
+    public void testSetPropertyPublicBooleanSetterWithConverter()
+            throws Exception
+    {
+        final PropertyAccess propertyAccess
+                = new PropertyAccess(testClass, "publicBooleanSetter");
+        propertyAccess.setProperty("true");
+        assertEquals(Boolean.TRUE, testClass.publicBooleanField);
+    }
+
     // start tests of getPropertyType method
 
     @Test
     public void testGetPropertyTypeNotExistentField() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
             = new PropertyAccess(testClass, "fieldDoesNotExist");
         assertEquals(null, propertyAccess.getPropertyType());
     }
@@ -867,7 +883,7 @@ public class PropertyAccessTest
     @Test
     public void testGetPropertyTypePrivateField() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
             = new PropertyAccess(testClass, "privateIntField");
         assertEquals(null, propertyAccess.getPropertyType());
     }
@@ -875,7 +891,7 @@ public class PropertyAccessTest
     @Test
     public void testGetPropertyTypePublicIntField() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
             = new PropertyAccess(testClass, "publicIntField");
         assertEquals(int.class, propertyAccess.getPropertyType());
     }
@@ -883,7 +899,7 @@ public class PropertyAccessTest
     @Test
     public void testGetPropertyTypePublicStringField() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
             = new PropertyAccess(testClass, "publicStringField");
         assertEquals(String.class, propertyAccess.getPropertyType());
     }
@@ -891,7 +907,7 @@ public class PropertyAccessTest
     @Test
     public void testGetPropertyTypePublicIntSetter() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
             = new PropertyAccess(testClass, "publicIntSetter");
         assertEquals(int.class, propertyAccess.getPropertyType());
     }
@@ -899,7 +915,7 @@ public class PropertyAccessTest
     @Test
     public void testGetPropertyTypePublicStringSetter() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
             = new PropertyAccess(testClass, "publicStringSetter");
         assertEquals(String.class, propertyAccess.getPropertyType());
     }
@@ -909,7 +925,7 @@ public class PropertyAccessTest
     @Test
     public void testGetFirstGenericTypeArgumentNotExistentField() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
             = new PropertyAccess(testClass, "fieldDoesNotExist");
         assertEquals(null, propertyAccess.getFirstGenericTypeArgument());
     }
@@ -917,7 +933,7 @@ public class PropertyAccessTest
     @Test
     public void testGetFirstGenericTypeArgumentPrivateField() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
             = new PropertyAccess(testClass, "privateIntField");
         assertEquals(null, propertyAccess.getFirstGenericTypeArgument());
     }
@@ -925,7 +941,7 @@ public class PropertyAccessTest
     @Test
     public void testGetFirstGenericTypeArgumentPublicIntField() throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
             = new PropertyAccess(testClass, "publicIntField");
         assertEquals(null, propertyAccess.getFirstGenericTypeArgument());
     }
@@ -934,7 +950,7 @@ public class PropertyAccessTest
     public void testGetFirstGenericTypeArgumentPublicCollectionField()
             throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
             = new PropertyAccess(testClass, "publicStringCollectionField");
         assertEquals(String.class, propertyAccess.getFirstGenericTypeArgument());
     }
@@ -943,7 +959,7 @@ public class PropertyAccessTest
     public void testGetFirstGenericTypeArgumentPublicCollectionSetter()
             throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
             = new PropertyAccess(testClass, "publicStringCollectionSetter");
         assertEquals(String.class, propertyAccess.getFirstGenericTypeArgument());
     }
@@ -952,7 +968,7 @@ public class PropertyAccessTest
     public void testGetFirstGenericTypeArgumentPublicCollectionGetterWithoutSetter()
             throws Exception
     {
-        PropertyAccess propertyAccess
+        final PropertyAccess propertyAccess
             = new PropertyAccess(
                     testClass,
                     "publicStringCollectionGetterWithoutSetter");
@@ -971,6 +987,8 @@ public class PropertyAccessTest
 
         public String publicStringField;
 
+        public Boolean publicBooleanField;
+
         public String[] publicStringArrayField;
 
         public Collection<String> publicStringCollectionField;
@@ -992,32 +1010,38 @@ public class PropertyAccessTest
             return 0;
         }
 
-        private void setPrivateIntSetter(int value)
+        private void setPrivateIntSetter(final int value)
         {
             privateIntField = value;
         }
 
-        protected void setProtectedIntSetter(int value)
+        protected void setProtectedIntSetter(final int value)
         {
             protectedIntField = value;
         }
 
-        void setIntSetter(int value)
+        void setIntSetter(final int value)
         {
             intField = value;
         }
 
-        public void setPublicIntSetter(int value)
+        @Override
+        public void setPublicIntSetter(final int value)
         {
             publicIntField = value;
         }
 
-        public void setPublicStringSetter(String value)
+        public void setPublicStringSetter(final String value)
         {
             publicStringField = value;
         }
 
-        public void setPublicStringArraySetter(String[] value)
+        public void setPublicBooleanSetter(final Boolean value)
+        {
+            publicBooleanField = value;
+        }
+
+        public void setPublicStringArraySetter(final String[] value)
         {
             publicStringArrayField = value;
         }
@@ -1027,7 +1051,7 @@ public class PropertyAccessTest
             return publicStringArrayField;
         }
 
-        public void setPublicStringArraySetterWithoutGetter(String[] value)
+        public void setPublicStringArraySetterWithoutGetter(final String[] value)
         {
             publicStringArrayField = value;
         }
@@ -1037,7 +1061,7 @@ public class PropertyAccessTest
             return publicStringArrayField;
         }
 
-        public void setPublicStringCollectionSetter(Collection<String> value)
+        public void setPublicStringCollectionSetter(final Collection<String> value)
         {
             publicStringCollectionField = value;
         }
@@ -1047,7 +1071,7 @@ public class PropertyAccessTest
             return publicStringCollectionField;
         }
 
-        public void setPublicStringCollectionSetterWithoutGetter(Collection<String> value)
+        public void setPublicStringCollectionSetterWithoutGetter(final Collection<String> value)
         {
             publicStringCollectionField = value;
         }
@@ -1057,7 +1081,7 @@ public class PropertyAccessTest
             return publicStringCollectionField;
         }
 
-        public void setPublicStringListSetter(List<String> value)
+        public void setPublicStringListSetter(final List<String> value)
         {
             publicStringListField = value;
         }
@@ -1067,7 +1091,7 @@ public class PropertyAccessTest
             return publicStringListField;
         }
 
-        public void setPublicStringSetSetter(Set<String> value)
+        public void setPublicStringSetSetter(final Set<String> value)
         {
             publicStringSetField = value;
         }
@@ -1077,7 +1101,7 @@ public class PropertyAccessTest
             return publicStringSetField;
         }
 
-        public void setPublicStringQueueSetter(Queue<String> value)
+        public void setPublicStringQueueSetter(final Queue<String> value)
         {
             publicStringQueueField = value;
         }
@@ -1087,7 +1111,7 @@ public class PropertyAccessTest
             return publicStringQueueField;
         }
 
-        public void setPublicStringVectorSetter(Vector<String> value)
+        public void setPublicStringVectorSetter(final Vector<String> value)
         {
             publicStringVectorField = value;
         }
@@ -1097,7 +1121,7 @@ public class PropertyAccessTest
             return publicStringVectorField;
         }
 
-        public void setPublicSetterEndingWiths(int value)
+        public void setPublicSetterEndingWiths(final int value)
         {
             publicFieldEndingWiths = value;
         }
@@ -1110,12 +1134,12 @@ public class PropertyAccessTest
 
         public int publicIntField; // to be overridden
 
-        public void setPublicIntSetterFromBaseClass(int value)
+        public void setPublicIntSetterFromBaseClass(final int value)
         {
             publicIntFieldFromBaseClass = value;
         }
 
-        public void setPublicIntSetter(int value) // to be overridden
+        public void setPublicIntSetter(final int value) // to be overridden
         {
             publicIntField = value;
         }

Copied: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/groovy/GroovyTest.java (from r1460227, db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/groovy/GroovyTemplateTest.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/groovy/GroovyTest.java?p2=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/groovy/GroovyTest.java&p1=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/groovy/GroovyTemplateTest.java&r1=1460227&r2=1470235&rev=1470235&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/groovy/GroovyTemplateTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/groovy/GroovyTest.java Sat Apr 20 21:23:39 2013
@@ -40,13 +40,16 @@ import org.junit.Test;
  *
  * @version $Id$
  */
-public class GroovyTemplateTest
+public class GroovyTest
 {
     private static final File TARGET_DIR
-            = new File("target/test/otherTemplateLanguages");
+            = new File("target/test/groovy");
 
-    private static final File OUTPUT_FILE
-            = new File(TARGET_DIR, "output.txt");
+    private static final File SCRIPT_OUTPUT_FILE
+            = new File(TARGET_DIR, "scriptOutput.txt");
+
+    private static final File TEMPLATE_OUTPUT_FILE
+            = new File(TARGET_DIR, "templateOutput.txt");
 
     @Before
     public void setUp() throws Exception
@@ -60,11 +63,11 @@ public class GroovyTemplateTest
      * @throws Exception if an error occurs.
      */
     @Test
-    public void testGroovyTemplate() throws Exception
+    public void testGroovy() throws Exception
     {
-        Controller controller = new Controller();
-        List<UnitDescriptor> unitDescriptors = new ArrayList<UnitDescriptor>();
-        CustomProjectPaths projectPaths = new CustomProjectPaths(
+        final Controller controller = new Controller();
+        final List<UnitDescriptor> unitDescriptors = new ArrayList<UnitDescriptor>();
+        final CustomProjectPaths projectPaths = new CustomProjectPaths(
                 new Maven2DirectoryProjectPaths(
                         new File("src/test/groovyTemplates")));
         projectPaths.setOutputDirectory(null, TARGET_DIR);
@@ -73,10 +76,13 @@ public class GroovyTemplateTest
                 projectPaths,
                 new DefaultTorqueGeneratorPaths()));
         controller.run(unitDescriptors);
-        // TODO: check outcome against reference file
-        assertTrue(OUTPUT_FILE.exists());
+        assertTrue(SCRIPT_OUTPUT_FILE.exists());
+        assertEquals(
+                "groovy script output: root",
+                FileUtils.readFileToString(SCRIPT_OUTPUT_FILE));
+        assertTrue(TEMPLATE_OUTPUT_FILE.exists());
         assertEquals(
                 "groovy template output: root",
-                FileUtils.readFileToString(OUTPUT_FILE));
+                FileUtils.readFileToString(TEMPLATE_OUTPUT_FILE));
     }
 }

Modified: db/torque/torque4/trunk/torque-generator/src/test/loadAdditionalSourceTransformer/src/main/torque-gen/conf/control.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/loadAdditionalSourceTransformer/src/main/torque-gen/conf/control.xml?rev=1470235&r1=1470234&r2=1470235&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/loadAdditionalSourceTransformer/src/main/torque-gen/conf/control.xml (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/loadAdditionalSourceTransformer/src/main/torque-gen/conf/control.xml Sat Apr 20 21:23:39 2013
@@ -23,7 +23,7 @@
     xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"
     xmlns="http://db.apache.org/torque/4.0/generator/configuration">
   <output name="output" file="output.txt">
-    <source xsi:type="fileSource" elements="root" format="xml">
+    <source xsi:type="fileSource" elements="/" format="xml">
       <transformer class="org.apache.torque.generator.source.transform.LoadAdditionalSourceTransformer">
         <element>/root/element</element>
         <fileIncludes>

Modified: db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/expectedPropertiesDebugOutput.properties
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/expectedPropertiesDebugOutput.properties?rev=1470235&r1=1470234&r2=1470235&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/expectedPropertiesDebugOutput.properties (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/expectedPropertiesDebugOutput.properties Sat Apr 20 21:23:39 2013
@@ -1,4 +1,4 @@
-# start output of outlet org.apache.torque.generator.velocity.propertiesCopy, current source element is properties
+# start output of outlet org.apache.torque.generator.velocity.propertiesCopy, current model element is (name=properties,attributes=(),children=((name=entry,attributes=(key=propertyName1,null=propertyValue1),children=()),(name=entry,attributes=(key=propertyName2,null=propertyValue2),children=())))
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -16,10 +16,10 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-# start output of outlet org.apache.torque.generator.velocity.propertyCopy, current source element is entry
+# start output of outlet org.apache.torque.generator.velocity.propertyCopy, current model element is (name=entry,attributes=(key=propertyName1,null=propertyValue1),children=())
 propertyName1 = propertyValue1
-# end output of outlet org.apache.torque.generator.velocity.propertyCopy, current source element is entry
-# start output of outlet org.apache.torque.generator.velocity.propertyCopy, current source element is entry
+# end output of outlet org.apache.torque.generator.velocity.propertyCopy, current model is (name=entry,attributes=(key=propertyName1,null=propertyValue1),children=())
+# start output of outlet org.apache.torque.generator.velocity.propertyCopy, current model element is (name=entry,attributes=(key=propertyName2,null=propertyValue2),children=())
 propertyName2 = propertyValue2
-# end output of outlet org.apache.torque.generator.velocity.propertyCopy, current source element is entry
-# end output of outlet org.apache.torque.generator.velocity.propertiesCopy, current source element is properties
+# end output of outlet org.apache.torque.generator.velocity.propertyCopy, current model is (name=entry,attributes=(key=propertyName2,null=propertyValue2),children=())
+# end output of outlet org.apache.torque.generator.velocity.propertiesCopy, current model is (name=properties,attributes=(),children=((name=entry,attributes=(key=propertyName1,null=propertyValue1),children=()),(name=entry,attributes=(key=propertyName2,null=propertyValue2),children=())))

Modified: db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/conf/control.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/conf/control.xml?rev=1470235&r1=1470234&r2=1470235&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/conf/control.xml (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/conf/control.xml Sat Apr 20 21:23:39 2013
@@ -34,7 +34,7 @@
         <action xsi:type="optionAction" option="package" />
        </mergepoint>
     </filenameOutlet>
-    <source xsi:type="fileSource" elements="properties">
+    <source xsi:type="fileSource" elements="/">
       <include>propertiesData.properties</include>
     </source>
     <outlet name="org.apache.torque.generator.velocity.propertiesToJava" />
@@ -49,19 +49,19 @@
         <action xsi:type="optionAction" option="package" />
        </mergepoint>
     </filenameOutlet>
-    <source xsi:type="fileSource" elements="properties">
+    <source xsi:type="fileSource">
       <include>propertiesData.properties</include>
     </source>
     <outlet name="org.apache.torque.generator.velocity.propertiesExtendedToJava" />
   </output>
   <output name="properties" file="Properties.properties" type="properties">
-    <source xsi:type="fileSource" elements="properties">
+    <source xsi:type="fileSource" elements="/">
       <include>propertiesData.properties</include>
     </source>
     <outlet name="org.apache.torque.generator.velocity.propertiesCopy"/>
   </output>
   <output name="torqueImage" file="logo.png">
-    <source xsi:type="fileSource" elements="properties">
+    <source xsi:type="fileSource" elements="/">
       <include>propertiesData.properties</include>
     </source>
     <outlet name="org.apache.torque.generator.logoCopy"/>

Added: db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/temp
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/temp?rev=1470235&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/temp (added)
+++ db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/temp Sat Apr 20 21:23:39 2013
@@ -0,0 +1,25 @@
+# start output of outlet org.apache.torque.generator.velocity.propertiesCopy, current model element is (name=properties,attributes=(),children=((name=entry,attributes=(key=propertyName1,null=propertyValue1),children=()),(name=entry,attributes=(key=propertyName2,null=propertyValue2),children=())))
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# start output of outlet org.apache.torque.generator.velocity.propertyCopy, current model element is (name=entry,attributes=(key=propertyName1,null=propertyValue1),children=())
+propertyName1 = propertyValue1
+# end output of outlet org.apache.torque.generator.velocity.propertyCopy, current model is (name=entry,attributes=(key=propertyName1,null=propertyValue1),children=())
+# start output of outlet org.apache.torque.generator.velocity.propertyCopy, current model element is (name=entry,attributes=(key=propertyName2,null=propertyValue2),children=())
+propertyName2 = propertyValue2
+# end output of outlet org.apache.torque.generator.velocity.propertyCopy, current model is (name=entry,attributes=(key=propertyName2,null=propertyValue2),children=())
+# end output of outlet org.apache.torque.generator.velocity.propertiesCopy, current model is (name=properties,attributes=(),children=((name=entry,attributes=(key=propertyName1,null=propertyValue1),children=()),(name=entry,attributes=(key=propertyName2,null=propertyValue2),children=())))

Modified: db/torque/torque4/trunk/torque-templates/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/pom.xml?rev=1470235&r1=1470234&r2=1470235&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/pom.xml (original)
+++ db/torque/torque4/trunk/torque-templates/pom.xml Sat Apr 20 21:23:39 2013
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.5</version>
+      <version>2.6</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>

Added: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Column.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Column.java?rev=1470235&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Column.java (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Column.java Sat Apr 20 21:23:39 2013
@@ -0,0 +1,77 @@
+package org.apache.torque.templates.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * The model of the column tag in a Torque schema file.
+ *
+ * @version $Id: $
+ */
+public class Column
+{
+    // Torque schema properties
+
+    public Table parent;
+
+    public List<Option> optionList = new ArrayList<Option>();
+
+    public List<Inheritance> inheritanceList = new ArrayList<Inheritance>();
+
+    public String name;
+
+    public String type;
+
+    public String size;
+
+    public String scale;
+
+    public String _default;
+
+    public Boolean useDatabaseDefaultValue;
+
+    public Boolean primaryKey;
+
+    public Boolean autoIncrement;
+
+    public Boolean required;
+
+    public String javaName;
+
+    public String javaType;
+
+    public String domain;
+
+    public String inheritanceType;
+
+    public Boolean _protected;
+
+    public Boolean version;
+
+    public String description;
+
+    // SQL generation properties
+
+    /** Contains the SQL to define the column. */
+    public String ddlSql;
+}

Added: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Database.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Database.java?rev=1470235&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Database.java (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Database.java Sat Apr 20 21:23:39 2013
@@ -0,0 +1,75 @@
+package org.apache.torque.templates.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * The model of the database tag in a Torque schema file.
+ *
+ * @version $Id: $
+ */
+public class Database
+{
+    // properties from schema
+
+    public List<Option> optionList = new ArrayList<Option>();
+
+    public List<IncludeSchema> includeSchemaList = new ArrayList<IncludeSchema>();
+
+    public List<ExternalSchema> externalSchemaList
+        = new ArrayList<ExternalSchema>();
+
+    public List<Domain> domainList = new ArrayList<Domain>();
+
+    public List<Table> tableList = new ArrayList<Table>();
+
+    public List<View> viewList = new ArrayList<View>();
+
+    public String name;
+
+    public String defaultJavaType;
+
+    public String defaultIdMethod;
+
+    // general generation properties
+
+    public String rootDatabaseName;
+
+    /**
+     * List of all tables, including the tables from loaded
+     * external-schema definitions.
+     */
+    public List<Table> allTables = new ArrayList<Table>();
+
+    /**
+     * List of all views, including the views from loaded
+     * external-schema definitions.
+     */
+    public List<View> allViews = new ArrayList<View>();
+
+    /**
+     * List of all schema names in the tables of the database.
+     */
+    public List<String> schemaNameList = new ArrayList<String>();
+
+
+}

Added: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Domain.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Domain.java?rev=1470235&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Domain.java (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Domain.java Sat Apr 20 21:23:39 2013
@@ -0,0 +1,43 @@
+package org.apache.torque.templates.model;
+
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * The model of the domain tag in a Torque schema file.
+ *
+ * @version $Id: $
+ */
+public class Domain
+{
+    public Database parent;
+
+    public String name;
+
+    public String type;
+
+    public String size;
+
+    public String scale;
+
+    public String _default;
+
+    public String description;
+}

Added: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ExternalSchema.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ExternalSchema.java?rev=1470235&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ExternalSchema.java (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ExternalSchema.java Sat Apr 20 21:23:39 2013
@@ -0,0 +1,41 @@
+package org.apache.torque.templates.model;
+
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * The model of the externam-schema tag in a Torque schema file.
+ *
+ * @version $Id: $
+ */
+public class ExternalSchema
+{
+    // properties from schema
+
+    public Database parent;
+
+    /** The file name of the external schema. */
+    public String filename;
+
+    // general generation properties
+
+    // the database element of the loaded external schema
+    public Database database;
+}

Added: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ForeignKey.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ForeignKey.java?rev=1470235&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ForeignKey.java (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ForeignKey.java Sat Apr 20 21:23:39 2013
@@ -0,0 +1,55 @@
+package org.apache.torque.templates.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * The model of the foreign-key tag in a Torque schema file.
+ *
+ * @version $Id: $
+ */
+public class ForeignKey
+{
+    public Table parent;
+
+    public List<Option> optionList = new ArrayList<Option>();
+
+    public List<Reference> referenceList = new ArrayList<Reference>();
+
+    public String name;
+
+    public String foreignTable;
+
+    public String onDelete;
+
+    public String onUpdate;
+
+    // SQL generation properties
+
+    /** Contains all local column names in a comma-separated String. */
+    public String localColumnNames;
+
+    /** Contains all foreign column names in a comma-separated String. */
+    public String foreignColumnNames;
+
+}

Added: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IdMethodParameter.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IdMethodParameter.java?rev=1470235&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IdMethodParameter.java (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IdMethodParameter.java Sat Apr 20 21:23:39 2013
@@ -0,0 +1,37 @@
+package org.apache.torque.templates.model;
+
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * The model of the id-method-parameter tag in a Torque schema file.
+ *
+ * @version $Id: $
+ */
+public class IdMethodParameter
+{
+    public Table parent;
+
+    /** The name of the parameter. */
+    public String name;
+
+    /** The value of the parameter. */
+    public String value;
+}

Added: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IncludeSchema.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IncludeSchema.java?rev=1470235&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IncludeSchema.java (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IncludeSchema.java Sat Apr 20 21:23:39 2013
@@ -0,0 +1,34 @@
+package org.apache.torque.templates.model;
+
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * The model of the include-schema tag in a Torque schema file.
+ *
+ * @version $Id: $
+ */
+public class IncludeSchema
+{
+    public Database parent;
+
+    /** The file name of the schema to include. */
+    public String filename;
+}

Added: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Index.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Index.java?rev=1470235&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Index.java (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Index.java Sat Apr 20 21:23:39 2013
@@ -0,0 +1,48 @@
+package org.apache.torque.templates.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * The model of the index tag in a Torque schema file.
+ *
+ * @version $Id: $
+ */
+public class Index
+{
+    // schema properties
+
+    public Table parent;
+
+    public List<Option> optionList = new ArrayList<Option>();
+
+    public List<IndexColumn> indexColumnList = new ArrayList<IndexColumn>();
+
+    public String name;
+
+    // SQL generatiopn properties
+
+    /** Contains all index column names in a comma-separated String. */
+    public String indexColumnNames;
+
+}

Added: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IndexColumn.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IndexColumn.java?rev=1470235&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IndexColumn.java (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IndexColumn.java Sat Apr 20 21:23:39 2013
@@ -0,0 +1,34 @@
+package org.apache.torque.templates.model;
+
+
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * The model of the index-column tag in a Torque schema file.
+ *
+ * @version $Id: $
+ */
+public class IndexColumn
+{
+    public Index parent;
+
+    public String name;
+}

Added: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Inheritance.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Inheritance.java?rev=1470235&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Inheritance.java (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Inheritance.java Sat Apr 20 21:23:39 2013
@@ -0,0 +1,40 @@
+package org.apache.torque.templates.model;
+
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * The model of the option tag in a Torque schema file.
+ *
+ * @version $Id: $
+ */
+public class Inheritance
+{
+    public Column parent;
+
+    /** A value found in the column marked as the inheritance key column. */
+    public String key;
+
+    /** The class name for the object that will inherit the record values. */
+    public String _class;
+
+    /** The class that the inheritor class will extend. */
+    public String _extends;
+}

Added: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Option.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Option.java?rev=1470235&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Option.java (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Option.java Sat Apr 20 21:23:39 2013
@@ -0,0 +1,41 @@
+package org.apache.torque.templates.model;
+
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * The model of the option tag in a Torque schema file.
+ *
+ * @version $Id: $
+ */
+public class Option
+{
+    public Database parentDatabase;
+
+    public Table parentTable;
+
+    public Column parentColumn;
+
+    /** The key of the option. */
+    public String key;
+
+    /** The value of the option. */
+    public String value;
+}

Added: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Reference.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Reference.java?rev=1470235&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Reference.java (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Reference.java Sat Apr 20 21:23:39 2013
@@ -0,0 +1,37 @@
+package org.apache.torque.templates.model;
+
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * The model of the reference tag in a Torque schema file.
+ *
+ * @version $Id: $
+ */
+public class Reference
+{
+    public ForeignKey parent;
+
+    /** The unqualified name of the foreign column. */
+    public String foreign;
+
+    /** The unqualified name of the local column. */
+    public String local;
+}

Added: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java?rev=1470235&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java (added)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java Sat Apr 20 21:23:39 2013
@@ -0,0 +1,150 @@
+package org.apache.torque.templates.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * The model of the table tag in a Torque schema file.
+ *
+ * @version $Id: $
+ */
+public class Table
+{
+    // properties from schema
+
+    public Database parent;
+
+    public List<Option> optionList = new ArrayList<Option>();
+
+    public List<Column> columnList = new ArrayList<Column>();
+
+    public List<ForeignKey> foreignKeyList = new ArrayList<ForeignKey>();
+
+    public List<Index> indexList = new ArrayList<Index>();
+
+    public List<Unique> uniqueList = new ArrayList<Unique>();
+
+    public List<IdMethodParameter> idMethodParameterList
+            = new ArrayList<IdMethodParameter>();
+
+    public String name;
+
+    public String _interface;
+
+    public String baseClass;
+
+    public String basePeer;
+
+    public String idMethod;
+
+    public String _abstract;
+
+    public String javaName;
+
+    public String skipSql;
+
+    public String description;
+
+    // general generation properties
+
+    /** Contains all primary key columns of the table. */
+    public List<Column> primaryKeyList = new ArrayList<Column>();
+
+    // properties for generation of ORM classes
+
+    public String dbObjectClassName;
+
+    public String baseDbObjectClassName;
+
+    public String peerClassName;
+
+    public String basePeerClassName;
+
+    public String peerImplClassName;
+
+    public String basePeerImplClassName;
+
+    public String beanClassName;
+
+    public String baseBeanClassName;
+
+    public String managerClassName;
+
+    public String baseManagerClassName;
+
+    public String recordMapperClassName;
+
+    public String baseRecordMapperClassName;
+
+    public String dbObjectPackage;
+
+    public String baseDbObjectPackage;
+
+    public String peerPackage;
+
+    public String basePeerPackage;
+
+    public String recordMapperPackage;
+
+    public String baseRecordMapperPackage;
+
+    public String managerPackage;
+
+    public String baseManagerPackage;
+
+    public String beanPackage;
+
+    public String baseBeanPackage;
+
+    public String optimisticLockingMode;
+
+    public String useManagers;
+
+    public String saveMethodsInDbObjects;
+
+    public String peerInterface;
+
+    // properties for sql generation
+
+    /**
+     * The unqualified part of the table name, omitting schema and database
+     * information.
+     */
+    public String unqualifiedName;
+
+    /**
+     * The name of the constraint defining the primary key of a table.
+     */
+    public String primaryKeyConstraintName;
+
+    /**
+     * The name of the sequence from which the primary key of the table
+     * is generated.
+     */
+    public String sequenceName;
+
+    /**
+     * The attribute contains all primary key columns
+     * in a comma-separated String.
+     */
+    public String primaryKeyColumnNames;
+}



---------------------------------------------------------------------
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