Author: jgbutler Date: Tue Dec 9 08:01:13 2008 New Revision: 724764 URL: http://svn.apache.org/viewvc?rev=724764&view=rev Log: [ibator] Allow specification of a separate package for DAO implementation classes
Modified: ibatis/trunk/java/tools/ibator/core/build/version.properties ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/daoGenerator.html ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedTable.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/DAOGeneratorConfiguration.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/xml/IbatorConfigurationParser.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/xml/ibator-config_1_0.dtd ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Java2Impl.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/DAOGenerator.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/BaseRecordGenerator.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/PrimaryKeyGenerator.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/RecordWithBLOBsGenerator.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/SqlMapGenerator.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/IbatorObjectFactory.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/BaseMiscellaneousTest.java ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/ibatorConfig.xml Modified: ibatis/trunk/java/tools/ibator/core/build/version.properties URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/build/version.properties?rev=724764&r1=724763&r2=724764&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/build/version.properties (original) +++ ibatis/trunk/java/tools/ibator/core/build/version.properties Tue Dec 9 08:01:13 2008 @@ -1,4 +1,4 @@ #ibator build version info -#Mon Dec 08 11:13:44 CST 2008 +#Tue Dec 09 09:52:26 CST 2008 version=1.2.0 -buildNum=651 +buildNum=653 Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/daoGenerator.html URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/daoGenerator.html?rev=724764&r1=724763&r2=724764&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/daoGenerator.html (original) +++ ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/daoGenerator.html Tue Dec 9 08:01:13 2008 @@ -63,15 +63,19 @@ </tr> <tr> <td valign="top">targetPackage</td> - <td>This is the package where the generated DAO interfaces and classes will be placed. In + <td>This is the package where the generated DAO interfaces and implementation classes + will be placed. In the default generators, the property "enableSubPackages" controls how the actual package is calculated. If true, then the calculated package will be the targetPackage plus sub packages for the table's catalog and schema if they exist. - If false (the default) then the calculated package will be + If "enableSubPackages" is false (the default) then the calculated package will be exactly what is specified in the targetPackage attribute. Ibator will create folders as required for the generated - packages.</td> + packages. + <p><b>Note:</b> the package for DAO implementation classes may + be overridden by specifying the optional <code>implamentationPackage</code> + attribute as shown below.</p></td> </tr> <tr> <td valign="top">targetProject</td> @@ -86,7 +90,24 @@ </table> <h2>Optional Attributes</h2> -None. +<table border="1" cellspacing="0" cellpadding="5"> + <tr> + <th>Attribute</th> + <th>Description</th> + </tr> + <tr> + <td valign="top">implementationPackage</td> + <td>If specified, DAO implementation classes will be placed in this package. + In the default generators, the property "enableSubPackages" + controls how the actual package is calculated. If true, + then the calculated package will be the implementationPackage plus + sub packages for the table's catalog and schema if they exist. + If "enableSubPackages" is false (the default) then the calculated package will be + exactly what is specified in the implementationPackage attribute. + Ibator will create folders as required for the generated + packages.</td> + </tr> +</table> <h2>Child Elements</h2> <ul> Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html?rev=724764&r1=724763&r2=724764&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html (original) +++ ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html Tue Dec 9 08:01:13 2008 @@ -52,6 +52,8 @@ for further information.</li> <li>New generated method - insertSelective. This method will allow you to use column defaults on a table definition on insert</li> + <li>Added the ability to specify a that DAO implementation classes be in a + seperate package from the DAO interface classes.</li> </ul> <h3>Changes from Abator</h3> Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedTable.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedTable.java?rev=724764&r1=724763&r2=724764&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedTable.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedTable.java Tue Dec 9 08:01:13 2008 @@ -335,7 +335,7 @@ public FullyQualifiedJavaType getDAOImplementationType() { StringBuilder sb = new StringBuilder(); - sb.append(getDAOPackage()); + sb.append(getDAOImplementationPackage()); sb.append('.'); sb.append(fullyQualifiedTable.getDomainObjectName()); sb.append("DAOImpl"); //$NON-NLS-1$ @@ -347,7 +347,7 @@ public FullyQualifiedJavaType getDAOInterfaceType() { StringBuilder sb = new StringBuilder(); - sb.append(getDAOPackage()); + sb.append(getDAOInterfacePackage()); sb.append('.'); sb.append(fullyQualifiedTable.getDomainObjectName()); sb.append("DAO"); //$NON-NLS-1$ @@ -363,7 +363,7 @@ || blobColumns.size() > 0; } - protected String getDAOPackage() { + protected String getDAOInterfacePackage() { DAOGeneratorConfiguration config = ibatorContext.getDaoGeneratorConfiguration(); StringBuilder sb = new StringBuilder(); @@ -375,6 +375,22 @@ return sb.toString(); } + protected String getDAOImplementationPackage() { + DAOGeneratorConfiguration config = ibatorContext.getDaoGeneratorConfiguration(); + + StringBuilder sb = new StringBuilder(); + if (StringUtility.stringHasValue(config.getImplementationPackage())) { + sb.append(config.getImplementationPackage()); + } else { + sb.append(config.getTargetPackage()); + } + if (StringUtility.isTrue(config.getProperty(PropertyRegistry.ANY_ENABLE_SUB_PACKAGES))) { + sb.append(fullyQualifiedTable.getSubPackage()); + } + + return sb.toString(); + } + protected String getJavaModelPackage() { JavaModelGeneratorConfiguration config = ibatorContext.getJavaModelGeneratorConfiguration(); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/DAOGeneratorConfiguration.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/DAOGeneratorConfiguration.java?rev=724764&r1=724763&r2=724764&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/DAOGeneratorConfiguration.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/DAOGeneratorConfiguration.java Tue Dec 9 08:01:13 2008 @@ -24,7 +24,7 @@ */ public class DAOGeneratorConfiguration extends TypedPropertyHolder { private String targetPackage; - + private String implementationPackage; private String targetProject; /** @@ -64,8 +64,20 @@ answer.addAttribute(new Attribute("targetProject", targetProject)); //$NON-NLS-1$ } + if (implementationPackage != null) { + answer.addAttribute(new Attribute("implementationPackage", targetProject)); //$NON-NLS-1$ + } + addPropertyXmlElements(answer); return answer; } + + public String getImplementationPackage() { + return implementationPackage; + } + + public void setImplementationPackage(String implementationPackage) { + this.implementationPackage = implementationPackage; + } } Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/xml/IbatorConfigurationParser.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/xml/IbatorConfigurationParser.java?rev=724764&r1=724763&r2=724764&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/xml/IbatorConfigurationParser.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/xml/IbatorConfigurationParser.java Tue Dec 9 08:01:13 2008 @@ -604,10 +604,12 @@ String type = attributes.getProperty("type"); //$NON-NLS-1$ String targetPackage = attributes.getProperty("targetPackage"); //$NON-NLS-1$ String targetProject = attributes.getProperty("targetProject"); //$NON-NLS-1$ + String implementationPackage = attributes.getProperty("implementationPackage"); //$NON-NLS-1$ daoGeneratorConfiguration.setConfigurationType(type); daoGeneratorConfiguration.setTargetPackage(targetPackage); daoGeneratorConfiguration.setTargetProject(targetProject); + daoGeneratorConfiguration.setImplementationPackage(implementationPackage); NodeList nodeList = node.getChildNodes(); for (int i = 0; i < nodeList.getLength(); i++) { Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/xml/ibator-config_1_0.dtd URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/xml/ibator-config_1_0.dtd?rev=724764&r1=724763&r2=724764&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/xml/ibator-config_1_0.dtd (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/xml/ibator-config_1_0.dtd Tue Dec 9 08:01:13 2008 @@ -133,7 +133,8 @@ <!ATTLIST daoGenerator type CDATA #REQUIRED targetPackage CDATA #REQUIRED - targetProject CDATA #REQUIRED> + targetProject CDATA #REQUIRED + implementationPackage CDATA #IMPLIED> <!-- The table element is used to specify a database table that will be the source information Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Java2Impl.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Java2Impl.java?rev=724764&r1=724763&r2=724764&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Java2Impl.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Java2Impl.java Tue Dec 9 08:01:13 2008 @@ -76,13 +76,13 @@ String type = ibatorContext.getDaoGeneratorConfiguration().getConfigurationType(); AbstractDAOTemplate abstractDAOTemplate; - if ("IBATIS".equalsIgnoreCase(type)) { + if ("IBATIS".equalsIgnoreCase(type)) { //$NON-NLS-1$ abstractDAOTemplate = new IbatisDAOTemplate(); - } else if ("SPRING".equalsIgnoreCase(type)) { + } else if ("SPRING".equalsIgnoreCase(type)) { //$NON-NLS-1$ abstractDAOTemplate = new SpringDAOTemplate(); - } else if ("GENERIC-CI".equalsIgnoreCase(type)) { + } else if ("GENERIC-CI".equalsIgnoreCase(type)) { //$NON-NLS-1$ abstractDAOTemplate = new GenericCIDAOTemplate(); - } else if ("GENERIC-SI".equalsIgnoreCase(type)) { + } else if ("GENERIC-SI".equalsIgnoreCase(type)) { //$NON-NLS-1$ abstractDAOTemplate = new GenericSIDAOTemplate(); } else { abstractDAOTemplate = (AbstractDAOTemplate) IbatorObjectFactory.createInternalObject(type); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/DAOGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/DAOGenerator.java?rev=724764&r1=724763&r2=724764&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/DAOGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/DAOGenerator.java Tue Dec 9 08:01:13 2008 @@ -69,7 +69,8 @@ @Override public List<CompilationUnit> getCompilationUnits() { FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable(); - progressCallback.startTask(Messages.getString("Progress.14", table.toString())); + progressCallback.startTask( + Messages.getString("Progress.14", table.toString())); //$NON-NLS-1$ TopLevelClass topLevelClass = getTopLevelClassShell(); Interface interfaze = getInterfaceShell(); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/BaseRecordGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/BaseRecordGenerator.java?rev=724764&r1=724763&r2=724764&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/BaseRecordGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/BaseRecordGenerator.java Tue Dec 9 08:01:13 2008 @@ -44,7 +44,8 @@ @Override public List<CompilationUnit> getCompilationUnits() { FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable(); - progressCallback.startTask(Messages.getString("Progress.8", table.toString())); + progressCallback.startTask( + Messages.getString("Progress.8", table.toString())); //$NON-NLS-1$ IbatorPlugin plugins = ibatorContext.getPlugins(); CommentGenerator commentGenerator = ibatorContext.getCommentGenerator(); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java?rev=724764&r1=724763&r2=724764&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java Tue Dec 9 08:01:13 2008 @@ -55,7 +55,8 @@ @Override public List<CompilationUnit> getCompilationUnits() { FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable(); - progressCallback.startTask(Messages.getString("Progress.6", table.toString())); + progressCallback.startTask( + Messages.getString("Progress.6", table.toString())); //$NON-NLS-1$ CommentGenerator commentGenerator = ibatorContext.getCommentGenerator(); FullyQualifiedJavaType type = introspectedTable.getExampleType(); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/PrimaryKeyGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/PrimaryKeyGenerator.java?rev=724764&r1=724763&r2=724764&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/PrimaryKeyGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/PrimaryKeyGenerator.java Tue Dec 9 08:01:13 2008 @@ -48,7 +48,8 @@ @Override public List<CompilationUnit> getCompilationUnits() { FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable(); - progressCallback.startTask(Messages.getString("Progress.7", table.toString())); + progressCallback.startTask( + Messages.getString("Progress.7", table.toString())); //$NON-NLS-1$ IbatorPlugin plugins = ibatorContext.getPlugins(); CommentGenerator commentGenerator = ibatorContext.getCommentGenerator(); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/RecordWithBLOBsGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/RecordWithBLOBsGenerator.java?rev=724764&r1=724763&r2=724764&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/RecordWithBLOBsGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/RecordWithBLOBsGenerator.java Tue Dec 9 08:01:13 2008 @@ -48,7 +48,8 @@ @Override public List<CompilationUnit> getCompilationUnits() { FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable(); - progressCallback.startTask(Messages.getString("Progress.9", table.toString())); + progressCallback.startTask( + Messages.getString("Progress.9", table.toString())); //$NON-NLS-1$ IbatorPlugin plugins = ibatorContext.getPlugins(); CommentGenerator commentGenerator = ibatorContext.getCommentGenerator(); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/SqlMapGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/SqlMapGenerator.java?rev=724764&r1=724763&r2=724764&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/SqlMapGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/SqlMapGenerator.java Tue Dec 9 08:01:13 2008 @@ -54,7 +54,8 @@ protected XmlElement getSqlMapElement() { FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable(); - progressCallback.startTask(Messages.getString("Progress.12", table.toString())); + progressCallback.startTask( + Messages.getString("Progress.12", table.toString())); //$NON-NLS-1$ XmlElement answer = new XmlElement("sqlMap"); //$NON-NLS-1$ answer.addAttribute(new Attribute("namespace", //$NON-NLS-1$ table.getSqlMapNamespace())); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/IbatorObjectFactory.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/IbatorObjectFactory.java?rev=724764&r1=724763&r2=724764&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/IbatorObjectFactory.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/IbatorObjectFactory.java Tue Dec 9 08:01:13 2008 @@ -180,9 +180,9 @@ String type = ibatorContext.getTargetRuntime(); if (!StringUtility.stringHasValue(type)) { type = IntrospectedTableIbatis2Java2Impl.class.getName(); - } else if ("Ibatis2Java2".equalsIgnoreCase(type)) { + } else if ("Ibatis2Java2".equalsIgnoreCase(type)) { //$NON-NLS-1$ type = IntrospectedTableIbatis2Java2Impl.class.getName(); - } else if ("Ibatis2Java5".equalsIgnoreCase(type)) { + } else if ("Ibatis2Java5".equalsIgnoreCase(type)) { //$NON-NLS-1$ type = IntrospectedTableIbatis2Java5Impl.class.getName(); } Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties?rev=724764&r1=724763&r2=724764&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties Tue Dec 9 08:01:13 2008 @@ -76,8 +76,6 @@ Progress.7=Generating Primary Key class for table {0} Progress.8=Generating Record class for table {0} Progress.9=Generating Record class (with BLOBs) for table {0} -Progress.10=Generating DAO Implementation for table {0} -Progress.11=Generating DAO Interface for table {0} Progress.12=Generating SQL Map for table {0} Progress.13=Found SQL Statement: {0} Progress.14=Generating DAO Interface and Implementation for table {0} Modified: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/BaseMiscellaneousTest.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/BaseMiscellaneousTest.java?rev=724764&r1=724763&r2=724764&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/BaseMiscellaneousTest.java (original) +++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/BaseMiscellaneousTest.java Tue Dec 9 08:01:13 2008 @@ -2,9 +2,9 @@ import ibatortest.BaseTest; import ibatortest.generated.miscellaneous.dao.MyObjectDAO; -import ibatortest.generated.miscellaneous.dao.MyObjectDAOImpl; +import ibatortest.generated.miscellaneous.dao.impl.MyObjectDAOImpl; import ibatortest.generated.miscellaneous.dao.RegexrenameDAO; -import ibatortest.generated.miscellaneous.dao.RegexrenameDAOImpl; +import ibatortest.generated.miscellaneous.dao.impl.RegexrenameDAOImpl; public class BaseMiscellaneousTest extends BaseTest { Modified: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/ibatorConfig.xml URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/ibatorConfig.xml?rev=724764&r1=724763&r2=724764&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/ibatorConfig.xml (original) +++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/ibatorConfig.xml Tue Dec 9 08:01:13 2008 @@ -278,7 +278,8 @@ <sqlMapGenerator targetPackage="ibatortest.generated.miscellaneous.xml" targetProject="${generated.source.dir.java5}"> </sqlMapGenerator> - <daoGenerator type="GENERIC-CI" targetPackage="ibatortest.generated.miscellaneous.dao" targetProject="${generated.source.dir.java5}"> + <daoGenerator type="GENERIC-CI" targetPackage="ibatortest.generated.miscellaneous.dao" targetProject="${generated.source.dir.java5}" + implementationPackage="ibatortest.generated.miscellaneous.dao.impl"> <property name="rootInterface" value="ibatortest.execute.miscellaneous.BaseInterface" /> <property name="methodNameCalculator" value="EXTENDED"/> </daoGenerator>