Author: gk Date: Wed Nov 17 15:48:40 2021 New Revision: 1895112 URL: http://svn.apache.org/viewvc?rev=1895112&view=rev Log: - TORQUE-360 : moved package to TorqueSchemaAttributeName, allow relative and absoulte package in inheritance columns, update databsse schema version to 5.1 - added profile to compile generated sources, activate with -Pcompile-generated-sources - fixes in templates - update log4j2-test.xml, add beans generation in TestProcessing
Modified: db/torque/trunk/torque-templates/pom.xml db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/InheritanceAttributeName.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMInheritanceTransformer.java db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableAttributeName.java db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/setterMethodEnd.vm db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/bean/objectBeanMethods.vm db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/createDbObjectInstanceFromInheritance.vm db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-5-0-strict.xsd db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-5-0.xsd db/torque/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java db/torque/trunk/torque-templates/src/test/resources/log4j2-test.xml db/torque/trunk/torque-templates/src/test/schema/schema.xml Modified: db/torque/trunk/torque-templates/pom.xml URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/pom.xml?rev=1895112&r1=1895111&r2=1895112&view=diff ============================================================================== --- db/torque/trunk/torque-templates/pom.xml (original) +++ db/torque/trunk/torque-templates/pom.xml Wed Nov 17 15:48:40 2021 @@ -110,7 +110,7 @@ <suppressionFile>${project.parent.basedir}/suppression-owasp-fp.xml</suppressionFile> </suppressionFiles> </configuration> - </plugin> + </plugin> </plugins> </build> @@ -142,5 +142,71 @@ </plugins> </build> </profile> + <profile> + <id>compile-generated-sources</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.8.1</version> + <executions> + <execution> + <phase>integration-test</phase> + <goals> + <goal>testCompile</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>3.2.0</version> + <executions> + <execution> + <id>add-generated-resources</id> + <phase>pre-integration-test</phase> + <goals> + <goal>add-test-resource</goal> + </goals> + <configuration> + <resources> + <resource> + <directory>${project.build.directory}/generated-sources</directory> + <targetPath>${project.build.directory}/generated-classes</targetPath> + </resource> + <resource> + <directory>${project.build.directory}/generated-sources-2</directory> + <targetPath>${project.build.directory}/generated-classes-2</targetPath> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>3.2.0</version> + <executions> + <execution> + <id>add-generated-sources</id> + <phase>pre-integration-test</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>${project.build.directory}/generated-sources</source> + <source>${project.build.directory}/generated-sources-2</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> Modified: db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java?rev=1895112&r1=1895111&r2=1895112&view=diff ============================================================================== --- db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java (original) +++ db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java Wed Nov 17 15:48:40 2021 @@ -93,7 +93,9 @@ public enum TorqueSchemaAttributeName im /** attribute version */ VERSION ("version"), /** attribute version */ - ENUM_TYPE("enumType"); + ENUM_TYPE("enumType"), + /** package relative or absolute, only inheritance type */ + PACKAGE("package"); /** The name of the attribute, not null. */ private String name; Modified: db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/InheritanceAttributeName.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/InheritanceAttributeName.java?rev=1895112&r1=1895111&r2=1895112&view=diff ============================================================================== --- db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/InheritanceAttributeName.java (original) +++ db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/InheritanceAttributeName.java Wed Nov 17 15:48:40 2021 @@ -20,10 +20,12 @@ package org.apache.torque.templates.tran */ import org.apache.torque.generator.source.SourceAttributeName; +import org.apache.torque.templates.TorqueSchemaAttributeName; /** * Contains the attributes for a inheritance source element which are not - * defined in the Torque schema. + * defined in the Torque schema. Find them in {@link TorqueSchemaAttributeName}. + * */ public enum InheritanceAttributeName implements SourceAttributeName { @@ -39,7 +41,9 @@ public enum InheritanceAttributeName imp CLASS_NAME("className"), /** * The package of the class created from this inheritance element. + * now in {@link TorqueSchemaAttributeName}. */ + @Deprecated PACKAGE("package"), /** Modified: db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMInheritanceTransformer.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMInheritanceTransformer.java?rev=1895112&r1=1895111&r2=1895112&view=diff ============================================================================== --- db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMInheritanceTransformer.java (original) +++ db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMInheritanceTransformer.java Wed Nov 17 15:48:40 2021 @@ -1,5 +1,8 @@ package org.apache.torque.templates.transformer.om; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -30,6 +33,9 @@ import org.apache.torque.templates.Torqu */ public class OMInheritanceTransformer { + /** The logger. */ + private static Logger logger = LogManager.getLogger(OMInheritanceTransformer.class); + public void transform( SourceElement inheritanceElement, ControllerState controllerState) @@ -66,47 +72,106 @@ public class OMInheritanceTransformer } inheritanceElement.setAttribute( InheritanceAttributeName.CLASS_NAME, className); + + String tablePackage = (String) tableElement.getAttribute( + TableAttributeName.DB_OBJECT_PACKAGE); + + String thisElementPackage = (String) inheritanceElement.getAttribute( + TorqueSchemaAttributeName.PACKAGE); + + String packageName = updatePackage( thisElementPackage, tablePackage ); + logger.debug( "key: {}: package: {} from package: {}, table package: {}", + key, + packageName,thisElementPackage, tablePackage ); + inheritanceElement.setAttribute( - InheritanceAttributeName.PACKAGE, - tableElement.getAttribute( - TableAttributeName.DB_OBJECT_PACKAGE)); + TorqueSchemaAttributeName.PACKAGE, + packageName); { String extendsAttribute = (String) inheritanceElement.getAttribute( TorqueSchemaAttributeName.EXTENDS.getName()); String beanExtends = (String) inheritanceElement.getAttribute( InheritanceAttributeName.BEAN_EXTENDS); if (extendsAttribute == null) - { + { extendsAttribute = (String) tableElement.getAttribute( TableAttributeName.DB_OBJECT_CLASS_NAME); inheritanceElement.setAttribute( - TorqueSchemaAttributeName.EXTENDS.getName(), - extendsAttribute); + TorqueSchemaAttributeName.EXTENDS.getName(), + extendsAttribute); + + String beanClassName = tableElement.getAttribute( + TableAttributeName.BEAN_CLASS_NAME).toString(); + logger.debug( "key: {}: extends from default {} (not set in element) and beanClassName:{}..", + key, extendsAttribute, beanClassName ); + inheritanceElement.setAttribute( InheritanceAttributeName.BEAN_EXTENDS, - tableElement.getAttribute( - TableAttributeName.BEAN_CLASS_NAME)); + beanClassName); } else if (beanExtends == null) { + // we try to guess the extendsBean from extends - // and the bean package + // and the bean package if the element has to set its own package int lastDot = extendsAttribute.lastIndexOf("."); String unqualifiedClassname; - if (lastDot != -1) + + // we try to guess if the package is within the default table bean package + String tableBeanPackage = (String) tableElement.getAttribute( + TableAttributeName.BEAN_PACKAGE); + String extendPackage = extendsAttribute.substring(0, lastDot); + + String beanClassNameSuffix = controllerState.getOption( + "torque.om.className.beanClassNameSuffix").toString(); + + if (extendPackage.equals( packageName ) && lastDot != -1 ) { unqualifiedClassname = extendsAttribute.substring(lastDot + 1); } - else + else if (lastDot == -1 ) // no package at all { unqualifiedClassname = extendsAttribute; + } else { + + unqualifiedClassname = extendsAttribute.substring(lastDot + 1); + + int withBeanPackage = extendPackage.lastIndexOf( tablePackage ); + if (withBeanPackage != -1 && !extendPackage.equals( tablePackage )) { + extendPackage = extendPackage.substring(tablePackage.length()); + logger.debug( "key: {}: filtered extendPackage {} from table package: {} ", + key, extendPackage, tablePackage); + extendPackage = updatePackage( extendPackage, tableBeanPackage ) ; + } else { + extendPackage = tableBeanPackage ; + } + extendPackage += "."; + + logger.debug( "key: {}: extendPackage: {} from table bean package: {} ", + key, + extendPackage, + tableBeanPackage); + + String qualifiedClassname = + extendPackage + unqualifiedClassname + beanClassNameSuffix; + + logger.info("key: {}: override qualifiedClassname (ignoring beanClassNamePrefix): {}", + key, qualifiedClassname); + beanExtends = qualifiedClassname; + } + + if (beanExtends == null) + { + String beanClassNamePrefix = controllerState.getOption( + "torque.om.className.beanClassNamePrefix").toString(); + + beanExtends = beanClassNamePrefix + + unqualifiedClassname + + beanClassNameSuffix; + logger.debug( "using extendsAttribute: {} with beanextends {}", + extendsAttribute, beanExtends); } - beanExtends = controllerState.getOption( - "torque.om.className.beanClassNamePrefix") - + unqualifiedClassname - + controllerState.getOption( - "torque.om.className.beanClassNameSuffix"); inheritanceElement.setAttribute( InheritanceAttributeName.BEAN_EXTENDS, beanExtends); @@ -134,9 +199,38 @@ public class OMInheritanceTransformer beanClassName); } + + String tableBeanPackage = (String) tableElement.getAttribute( + TableAttributeName.BEAN_PACKAGE); + + String beanPackage = updatePackage( thisElementPackage, tableBeanPackage, ".bean" ); + + logger.debug( "key: {}: beanPackage {} from {}, {}", + key,beanPackage, thisElementPackage, tableBeanPackage ); + inheritanceElement.setAttribute( InheritanceAttributeName.BEAN_PACKAGE, - tableElement.getAttribute( - TableAttributeName.BEAN_PACKAGE)); + beanPackage); + } + + private String updatePackage(String thisBeanPackageName, String rootPackage) + { + return updatePackage(thisBeanPackageName, rootPackage, ""); + } + + private String updatePackage(String thisBeanPackageName, String rootPackage, String suffix) + { + String beanPackage = rootPackage; + + if (thisBeanPackageName != null) + { + if (thisBeanPackageName.startsWith( "." )) + { // relative + beanPackage += thisBeanPackageName; + } else { + beanPackage = thisBeanPackageName + suffix; + } + } + return beanPackage; } } Modified: db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableAttributeName.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableAttributeName.java?rev=1895112&r1=1895111&r2=1895112&view=diff ============================================================================== --- db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableAttributeName.java (original) +++ db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableAttributeName.java Wed Nov 17 15:48:40 2021 @@ -20,10 +20,11 @@ package org.apache.torque.templates.tran */ import org.apache.torque.generator.source.SourceAttributeName; +import org.apache.torque.templates.TorqueSchemaAttributeName; /** * Contains the attributes for a table source element which are not - * defined in the Torque schema. + * defined in the Torque schema. Find them in {@link TorqueSchemaAttributeName}. */ public enum TableAttributeName implements SourceAttributeName { Modified: db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/setterMethodEnd.vm URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/setterMethodEnd.vm?rev=1895112&r1=1895111&r2=1895112&view=diff ============================================================================== --- db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/setterMethodEnd.vm (original) +++ db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/setterMethodEnd.vm Wed Nov 17 15:48:40 2021 @@ -35,14 +35,16 @@ #set ( $foreignColumnGetter = $foreignColumnElement.getAttribute("getter") ) #set ( $localFieldElement = $foreignKeyElement.getChild("local-field-in-bean") ) #set ( $localReferenceFieldName = $localFieldElement.getAttribute("field") ) - #if ($foreignColumnElement.getAttribute("primitive") == "true") - if ($localReferenceFieldName != null && ${localReferenceFieldName}.${foreignColumnGetter}() != v) - #else - if ($localReferenceFieldName != null && !Objects.equals(${localReferenceFieldName}.${foreignColumnGetter}(), v)) - #end + #if ( $localReferenceFieldName ) + #if ($foreignColumnElement.getAttribute("primitive") == "true") + if ($localReferenceFieldName != null && ${localReferenceFieldName}.${foreignColumnGetter}() != v) + #else + if ($localReferenceFieldName != null && !Objects.equals(${localReferenceFieldName}.${foreignColumnGetter}(), v)) + #end { $localReferenceFieldName = null; } + #end #end ## Modified: db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/bean/objectBeanMethods.vm URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/bean/objectBeanMethods.vm?rev=1895112&r1=1895111&r2=1895112&view=diff ============================================================================== --- db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/bean/objectBeanMethods.vm (original) +++ db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/bean/objectBeanMethods.vm Wed Nov 17 15:48:40 2021 @@ -103,11 +103,14 @@ #set ( $localField = $localFieldElement.getAttribute("field") ) #set ( $beanFieldElement = $foreignKeyElement.getChild("local-field-in-bean") ) #set ( $beanFieldSetter = $beanFieldElement.getAttribute("setter") ) + + #if ($localField) if ($localField != null) { ${foreignBeanClassName} relatedBean = ${localField}.getBean(createdBeans); result.${beanFieldSetter}(relatedBean); } + #end #end #end result.setModified(isModified()); @@ -208,6 +211,7 @@ #set ( $setter = $localFieldElement.getAttribute("setter") ) #set ( $beanFieldElement = $foreignKeyElement.getChild("local-field-in-bean") ) #set ( $beanGetter = $beanFieldElement.getAttribute("getter") ) + #if ($beanGetter) { ${foreignBeanClassName} relatedBean = bean.${beanGetter}(); if (relatedBean != null) @@ -216,6 +220,7 @@ result.${setter}(relatedObject); } } + #end #end #end result.setModified(bean.isModified()); Modified: db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/createDbObjectInstanceFromInheritance.vm URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/createDbObjectInstanceFromInheritance.vm?rev=1895112&r1=1895111&r2=1895112&view=diff ============================================================================== --- db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/createDbObjectInstanceFromInheritance.vm (original) +++ db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/createDbObjectInstanceFromInheritance.vm Wed Nov 17 15:48:40 2021 @@ -46,13 +46,14 @@ #foreach ($inheritanceElement in $inheritanceElements) #set ( $inheritanceClasskeyConstant = $inheritanceElement.getAttribute("classkeyConstant") ) #set ( $inheritanceClassName = $inheritanceElement.getAttribute("className") ) + #set ( $inheritancePackage = $inheritanceElement.getAttribute("package") ) #if ($primitive) $if (classKey == $inheritanceClasskeyConstant) #else $if (${peerClassName}.${inheritanceClasskeyConstant}.equals(classKey)) #end { - $tableField = new ${inheritanceClassName}(); + $tableField = new ${inheritancePackage}.${inheritanceClassName}(); } #set ($if = "else if") #end Modified: db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-5-0-strict.xsd URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-5-0-strict.xsd?rev=1895112&r1=1895111&r2=1895112&view=diff ============================================================================== --- db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-5-0-strict.xsd (original) +++ db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-5-0-strict.xsd Wed Nov 17 15:48:40 2021 @@ -27,7 +27,7 @@ targetNamespace="http://db.apache.org/torque/5.0/templates/database" xmlns="http://db.apache.org/torque/5.0/templates/database" elementFormDefault="qualified" - version="5.0"> + version="5.1"> <xs:annotation> <xs:documentation xml:lang="en"> Modified: db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-5-0.xsd URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-5-0.xsd?rev=1895112&r1=1895111&r2=1895112&view=diff ============================================================================== --- db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-5-0.xsd (original) +++ db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-5-0.xsd Wed Nov 17 15:48:40 2021 @@ -27,7 +27,7 @@ targetNamespace="http://db.apache.org/torque/5.0/templates/database" xmlns="http://db.apache.org/torque/5.0/templates/database" elementFormDefault="qualified" - version="5.0"> + version="5.1"> <xs:annotation> <xs:documentation xml:lang="en"> @@ -42,6 +42,9 @@ The basic structure of a model is built as the root. This will contain references to options, external (include) models, new SQL Domain definitions, and tables. See the Torque project home page for more details. + +Added in version 5.1: inheritanceType has new optional attributes package. + </xs:documentation> </xs:annotation> @@ -592,6 +595,13 @@ The class name for the object that will </xs:documentation> </xs:annotation> </xs:attribute> + <xs:attribute name="package" type="javaQualifiedNameType" use="optional" > + <xs:annotation> + <xs:documentation xml:lang="en"> + The optional package, if starting with a dot ()".") this is a sub package of table package + </xs:documentation> + </xs:annotation> + </xs:attribute> <xs:attribute name="extends" type="javaQualifiedNameType" use="optional" > <xs:annotation> <xs:documentation xml:lang="en"> Modified: db/torque/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java?rev=1895112&r1=1895111&r2=1895112&view=diff ============================================================================== --- db/torque/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java (original) +++ db/torque/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java Wed Nov 17 15:48:40 2021 @@ -23,7 +23,6 @@ package org.apache.torque.templates; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; import java.io.FileInputStream; @@ -53,7 +52,6 @@ import org.apache.torque.generator.file. import org.apache.torque.generator.source.SourceProvider; import org.apache.torque.generator.source.stream.FileSourceProvider; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -96,8 +94,11 @@ public class TestProcessing final Controller controller = new Controller(); final List<UnitDescriptor> unitDescriptors = new ArrayList<>(); final Map<String, String> overrideOptions = new HashMap<>(); - overrideOptions.put("torque.om.package", "org.apache.torque.test"); - overrideOptions.put("torque.om.generateMapInit", "true"); + overrideOptions.put(TemplateOptionName.OM_PACKAGE.getName(), "org.apache.torque.test"); + overrideOptions.put(TemplateOptionName.OM_GENERATE_MAP_INIT.getName(), "true"); + + overrideOptions.put(TemplateOptionName.OM_GENERATE_BEANS.getName(), "true"); + //overrideOptions.put(TemplateOptionName.OM_USE_MANAGERS.getName(), "true"); CustomProjectPaths projectPaths = new CustomProjectPaths( new Maven2DirectoryProjectPaths(new File("."))); @@ -126,6 +127,14 @@ public class TestProcessing unitDescriptor.setOverrideOptions( new MapOptionsConfiguration(overrideOptions)); unitDescriptors.add(unitDescriptor); + +// Options options = controllerState.getUnitConfiguration().getOptions(); +// log.trace( "uc.options:"+ options ); +// +// Option omGenerateBeans = new OptionImpl( +// new QualifiedName(TemplateOptionName.OM_GENERATE_BEANS.getName()), +// true); +// options.setGlobalOption( omGenerateBeans ); // generate controller.run(unitDescriptors); Modified: db/torque/trunk/torque-templates/src/test/resources/log4j2-test.xml URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/test/resources/log4j2-test.xml?rev=1895112&r1=1895111&r2=1895112&view=diff ============================================================================== --- db/torque/trunk/torque-templates/src/test/resources/log4j2-test.xml (original) +++ db/torque/trunk/torque-templates/src/test/resources/log4j2-test.xml Wed Nov 17 15:48:40 2021 @@ -22,15 +22,20 @@ <Console name="console" target="SYSTEM_OUT"> <PatternLayout pattern="%d [%t] %-5p | %c - %m%n"/> </Console> - <File name="torque" fileName="./target/torque-templates/log/torque-templates.log"> + <RollingFile name="torque" fileName="./target/log/torque-templates.log" + filePattern="./target/log/torque-templates.log%i" > <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/> - </File> - <File name="velocity" fileName="./target/torque-templates/log/velocity.log"> + <Policies> + <SizeBasedTriggeringPolicy size="40 MB"/> + </Policies> + <DefaultRolloverStrategy max="1"/> + </RollingFile> + <File name="velocity" fileName="./target/log/velocity.log"> <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/> </File> </Appenders> <Loggers> - <Logger name="org.apache.torque" additivity="false" level="DEBUG"> + <Logger name="org.apache.torque" additivity="false" level="DEBUG"> <AppenderRef ref="torque" level="DEBUG"/> <AppenderRef ref="console" level="INFO"/> </Logger> Modified: db/torque/trunk/torque-templates/src/test/schema/schema.xml URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/test/schema/schema.xml?rev=1895112&r1=1895111&r2=1895112&view=diff ============================================================================== --- db/torque/trunk/torque-templates/src/test/schema/schema.xml (original) +++ db/torque/trunk/torque-templates/src/test/schema/schema.xml Wed Nov 17 15:48:40 2021 @@ -327,16 +327,22 @@ <inheritance key="B" class="InheritanceChildB" - extends="org.apache.torque.test.InheritanceTest" /> + <!-- B does not need to explicitely extend from table parent package, this is implicitely done + extends="org.apache.torque.test.InheritanceTest" + --> <inheritance key="C" class="InheritanceChildC" + package=".attribute.c" + extends="org.apache.torque.test.InheritanceTest" /> + <!-- C implicitely extends from table parent package, which has to be adjusted explicitely --> <inheritance key="D" class="InheritanceChildD" - extends="org.apache.torque.test.InheritanceChildC" + package="org.my.attribute.z" + extends="org.apache.torque.test.attribute.c.InheritanceChildC" /> </column> <column --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org