svn commit: r1855923 [2/2] - 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/controller/ torque-generat...

classic Classic list List threaded Threaded
1 message Options
gk
Reply | Threaded
Open this post in threaded view
|

svn commit: r1855923 [2/2] - 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/controller/ torque-generat...

gk
Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableAndViewTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableAndViewTransformer.java?rev=1855923&r1=1855922&r2=1855923&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableAndViewTransformer.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableAndViewTransformer.java Wed Mar 20 16:19:39 2019
@@ -30,9 +30,10 @@ import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.torque.generator.control.ControllerState;
 import org.apache.torque.generator.processor.string.Camelbacker;
 import org.apache.torque.generator.processor.string.WrapReservedJavaWords;
@@ -129,15 +130,15 @@ public class OMTableAndViewTransformer e
                 TableChildElementName.PRIMARY_KEYS);
 
         // position is one based
-        int columnPosition = 1;
+        AtomicInteger columnPosition = new AtomicInteger(1);
         for (SourceElement element : tableElement.getChildren(
                 TorqueSchemaElementName.COLUMN))
         {
             columnTransformer.transform(
                     element,
                     controllerState,
-                    columnPosition);
-            columnPosition++;
+                    columnPosition.get());
+            columnPosition.incrementAndGet();
         }
 
         setCreateDefaultDateMethodsAttributes(tableElement);
@@ -573,7 +574,7 @@ public class OMTableAndViewTransformer e
             if ("java.util.Date".equals(
                     column.getAttribute(JavaFieldAttributeName.FIELD_TYPE)))
             {
-                String defaultValue = ObjectUtils.toString(column.getAttribute(
+                String defaultValue = Objects.toString(column.getAttribute(
                         TorqueSchemaAttributeName.DEFAULT));
                 if (CURRENT_DATE.equalsIgnoreCase(defaultValue))
                 {

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java?rev=1855923&r1=1855922&r2=1855923&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java Wed Mar 20 16:19:39 2019
@@ -24,7 +24,7 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.torque.generator.control.ControllerState;
 import org.apache.torque.generator.source.transform.SourceTransformer;
 import org.apache.torque.generator.source.transform.SourceTransformerException;

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java?rev=1855923&r1=1855922&r2=1855923&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java Wed Mar 20 16:19:39 2019
@@ -23,8 +23,8 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.torque.generator.control.ControllerState;
 import org.apache.torque.generator.source.SourceElement;
 import org.apache.torque.generator.source.SourcePath;

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SizedForBitDataSqlType.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SizedForBitDataSqlType.java?rev=1855923&r1=1855922&r2=1855923&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SizedForBitDataSqlType.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SizedForBitDataSqlType.java Wed Mar 20 16:19:39 2019
@@ -19,7 +19,7 @@ package org.apache.torque.templates.type
  * under the License.
  */
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * <p>

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SqlType.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SqlType.java?rev=1855923&r1=1855922&r2=1855923&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SqlType.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SqlType.java Wed Mar 20 16:19:39 2019
@@ -19,7 +19,7 @@ package org.apache.torque.templates.type
  * under the License.
  */
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * The SQL type data for a column. Can contain additional information such as

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/index.groovy
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/index.groovy?rev=1855923&r1=1855922&r2=1855923&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/index.groovy (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/index.groovy Wed Mar 20 16:19:39 2019
@@ -16,7 +16,7 @@
 // under the License.
 import org.apache.torque.generator.template.groovy.TorqueGenGroovy
 import org.apache.torque.templates.model.Index
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
 
 TorqueGenGroovy torqueGenGroovy = (TorqueGenGroovy) torqueGen
 Index index = torqueGenGroovy.model

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/hsqldb/index.groovy
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/hsqldb/index.groovy?rev=1855923&r1=1855922&r2=1855923&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/hsqldb/index.groovy (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/hsqldb/index.groovy Wed Mar 20 16:19:39 2019
@@ -16,7 +16,7 @@
 // under the License.
 import org.apache.torque.generator.template.groovy.TorqueGenGroovy
 import org.apache.torque.templates.model.Index
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
 
 TorqueGenGroovy torqueGenGroovy = (TorqueGenGroovy) torqueGen
 Index index = torqueGenGroovy.model

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/index.groovy
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/index.groovy?rev=1855923&r1=1855922&r2=1855923&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/index.groovy (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/index.groovy Wed Mar 20 16:19:39 2019
@@ -17,7 +17,7 @@ package org.apache.torque.templates.sql.
 // under the License.
 import org.apache.torque.generator.template.groovy.TorqueGenGroovy
 import org.apache.torque.templates.model.Index
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
 
 TorqueGenGroovy torqueGenGroovy = (TorqueGenGroovy) torqueGen
 Index index = torqueGenGroovy.model

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/index.groovy
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/index.groovy?rev=1855923&r1=1855922&r2=1855923&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/index.groovy (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/index.groovy Wed Mar 20 16:19:39 2019
@@ -16,7 +16,7 @@
 // under the License.
 import org.apache.torque.generator.template.groovy.TorqueGenGroovy
 import org.apache.torque.templates.model.Index
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
 
 TorqueGenGroovy torqueGenGroovy = (TorqueGenGroovy) torqueGen
 Index index = torqueGenGroovy.model

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/columnComment.groovy
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/columnComment.groovy?rev=1855923&r1=1855922&r2=1855923&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/columnComment.groovy (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/columnComment.groovy Wed Mar 20 16:19:39 2019
@@ -18,7 +18,7 @@
 // no Comments on columns in mysql
 import org.apache.torque.generator.template.groovy.TorqueGenGroovy
 import org.apache.torque.templates.model.Column
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
 
 TorqueGenGroovy torqueGenGroovy = torqueGen
 Column column = torqueGenGroovy.model

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/index.groovy
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/index.groovy?rev=1855923&r1=1855922&r2=1855923&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/index.groovy (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/index.groovy Wed Mar 20 16:19:39 2019
@@ -16,7 +16,7 @@
 // under the License.
 import org.apache.torque.generator.template.groovy.TorqueGenGroovy
 import org.apache.torque.templates.model.Index
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
 
 TorqueGenGroovy torqueGenGroovy = (TorqueGenGroovy) torqueGen
 Index index = torqueGenGroovy.model

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/tableComment.groovy
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/tableComment.groovy?rev=1855923&r1=1855922&r2=1855923&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/tableComment.groovy (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/tableComment.groovy Wed Mar 20 16:19:39 2019
@@ -18,7 +18,7 @@
 // no Comments on columns in mysql
 import org.apache.torque.generator.template.groovy.TorqueGenGroovy
 import org.apache.torque.templates.model.Table
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
 
 TorqueGenGroovy torqueGenGroovy = torqueGen
 Table table = torqueGenGroovy.model

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/columnComment.groovy
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/columnComment.groovy?rev=1855923&r1=1855922&r2=1855923&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/columnComment.groovy (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/columnComment.groovy Wed Mar 20 16:19:39 2019
@@ -18,7 +18,7 @@
 // no Comments on columns in mysql
 import org.apache.torque.generator.template.groovy.TorqueGenGroovy
 import org.apache.torque.templates.model.Column
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
 
 TorqueGenGroovy torqueGenGroovy = torqueGen
 Column column = torqueGenGroovy.model

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/index.groovy
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/index.groovy?rev=1855923&r1=1855922&r2=1855923&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/index.groovy (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/index.groovy Wed Mar 20 16:19:39 2019
@@ -16,7 +16,7 @@
 // under the License.
 import org.apache.torque.generator.template.groovy.TorqueGenGroovy
 import org.apache.torque.templates.model.Index
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
 
 TorqueGenGroovy torqueGenGroovy = (TorqueGenGroovy) torqueGen
 Index index = torqueGenGroovy.model

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/tableComment.groovy
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/tableComment.groovy?rev=1855923&r1=1855922&r2=1855923&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/tableComment.groovy (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/tableComment.groovy Wed Mar 20 16:19:39 2019
@@ -18,7 +18,7 @@
 // no Comments on columns in mysql
 import org.apache.torque.generator.template.groovy.TorqueGenGroovy
 import org.apache.torque.templates.model.Table
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
 
 TorqueGenGroovy torqueGenGroovy = torqueGen
 Table table = torqueGenGroovy.model

Modified: db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/jdbc2schema/Jdbc2SchemaTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/jdbc2schema/Jdbc2SchemaTest.java?rev=1855923&r1=1855922&r2=1855923&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/jdbc2schema/Jdbc2SchemaTest.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/jdbc2schema/Jdbc2SchemaTest.java Wed Mar 20 16:19:39 2019
@@ -78,45 +78,50 @@ public class Jdbc2SchemaTest /* implemen
     }
 
     @BeforeEach
-    public void setUp() throws Exception
+    public void setUp()
     {
-        BasicConfigurator.configure();
-        Connection connection = DriverManager.getConnection(URL);
-        InputStream inputStream = getClass().getResourceAsStream(SQL_FILENAME);
-        BufferedReader bufferedReader = new BufferedReader(
-                new InputStreamReader(inputStream, SQL_CHARSET));
-        String line;
-        StringBuilder queryBuffer = new StringBuilder();
-        while ((line = bufferedReader.readLine()) != null)
-        {
-            if (line.trim().length() == 0 || line.trim().startsWith("--"))
+        try {
+            BasicConfigurator.configure();
+            Connection connection = DriverManager.getConnection(URL);
+            InputStream inputStream = getClass().getResourceAsStream(SQL_FILENAME);
+            BufferedReader bufferedReader = new BufferedReader(
+                    new InputStreamReader(inputStream, SQL_CHARSET));
+            String line;
+            StringBuilder queryBuffer = new StringBuilder();
+            while ((line = bufferedReader.readLine()) != null)
             {
-                continue;
+                if (line.trim().length() == 0 || line.trim().startsWith("--"))
+                {
+                    continue;
+                }
+                queryBuffer.append(line);
             }
-            queryBuffer.append(line);
-        }
-        StringTokenizer tokenizer
-            = new StringTokenizer(queryBuffer.toString(), ";", false);
-        while (tokenizer.hasMoreTokens())
-        {
-            String sqlQuery = tokenizer.nextToken();
-            Statement statement = connection.createStatement();
-            try
+            StringTokenizer tokenizer
+                = new StringTokenizer(queryBuffer.toString(), ";", false);
+            while (tokenizer.hasMoreTokens())
             {
-                statement.execute(sqlQuery);
+                String sqlQuery = tokenizer.nextToken();
+                Statement statement = connection.createStatement();
+                try
+                {
+                    statement.execute(sqlQuery);
+                }
+                catch (SQLException e)
+                {
+                    log.info(e.getMessage(),e);
+                    fail();
+                }
+                statement.close();
             }
-            catch (SQLException e)
+            connection.close();
+
+            String testRoot = "target";
             {
-                log.info(e.getMessage());
+                File generatedSchemaDir = new File(testRoot, "generated-schema");
+                FileUtils.deleteDirectory(generatedSchemaDir);
             }
-            statement.close();
-        }
-        connection.close();
-
-        String testRoot = "target";
-        {
-            File generatedSchemaDir = new File(testRoot, "generated-schema");
-            FileUtils.deleteDirectory(generatedSchemaDir);
+        } catch (SQLException | IOException e) {
+            fail();
         }
     }
 

Added: db/torque/torque4/trunk/torque-templates/src/test/resources/log4j2-test.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/resources/log4j2-test.xml?rev=1855923&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/resources/log4j2-test.xml (added)
+++ db/torque/torque4/trunk/torque-templates/src/test/resources/log4j2-test.xml Wed Mar 20 16:19:39 2019
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<Configuration status="warn" name="Torque" packages="">
+     <Appenders>
+       <Console name="console" target="SYSTEM_OUT">
+          <PatternLayout pattern="%d [%t] %-5p | %c - %m%n"/>
+      </Console>
+      <File name="torque" fileName="./target/torque-gen/log/torque-gen.log">
+          <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+      </File>
+       <File name="velocity" fileName="./target/torque-gen/log/velocity.log">
+          <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+      </File>
+    </Appenders>
+    <Loggers>
+          <Logger name="org.apache.torque" additivity="false" level="DEBUG">
+          <AppenderRef ref="torque" level="DEBUG"/>
+          <AppenderRef ref="console" level="INFO"/>
+      </Logger>
+      <Logger name="org.apache.torque.generator.template.velocity" additivity="false" level="DEBUG">
+          <AppenderRef ref="torque" level="DEBUG"/>
+          <AppenderRef ref="console" level="INFO"/>
+      </Logger>
+      <Logger name="org.apache.velocity" additivity="false" level="DEBUG">
+          <AppenderRef ref="velocity" level="DEBUG"/>
+          <AppenderRef ref="console" level="INFO"/>
+      </Logger>
+      <Root level="INFO"><!-- log4j 1.2 has DEBUG -->
+          <AppenderRef ref="console"/>
+      </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file

Propchange: db/torque/torque4/trunk/torque-templates/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/jdbc2schema/expected-schema.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/jdbc2schema/expected-schema.xml?rev=1855923&r1=1855922&r2=1855923&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/jdbc2schema/expected-schema.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/jdbc2schema/expected-schema.xml Wed Mar 20 16:19:39 2019
@@ -17,6 +17,8 @@
   <table name="AUTHOR">
     <column default="GENERATED_BY_DEFAULT" primaryKey="true" name="AUTHOR_ID" type="INTEGER"/>
     <column name="NAME" required="true" type="VARCHAR" size="50"/>
+    <column name="CREATED_AT" type="TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+    <column name="UPDATED_AT" type="TIMESTAMP" default="CURRENT_TIMESTAMP"/>
   </table>
   <table name="BOOK">
     <column default="GENERATED_BY_DEFAULT" primaryKey="true" name="BOOK_ID" type="INTEGER"/>

Modified: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/jdbc2schema/jdbc2schemaTest.sql
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/jdbc2schema/jdbc2schemaTest.sql?rev=1855923&r1=1855922&r2=1855923&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/jdbc2schema/jdbc2schemaTest.sql (original)
+++ db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/jdbc2schema/jdbc2schemaTest.sql Wed Mar 20 16:19:39 2019
@@ -42,6 +42,8 @@ CREATE TABLE author
 (
     author_id INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
     name VARCHAR(50) NOT NULL,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     PRIMARY KEY(author_id));
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]