Author: jgbutler
Date: Sun Feb 28 03:36:51 2010
New Revision: 917111
URL: http://svn.apache.org/viewvc?rev=917111&view=rev
Log:
[Ibator] improvements to the Maven plugin
Modified:
ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/running.html
ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithMaven.html
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/IntrospectedTable.java
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/ResultMapWithBLOBsElementGenerator.java
ibatis/java/ibator/trunk/core/ibator-maven-plugin/pom.xml
ibatis/java/ibator/trunk/core/ibator-maven-plugin/src/main/java/org/apache/ibatis/ibator/maven/IbatorMojo.java
ibatis/java/ibator/trunk/core/ibator-maven-plugin/src/main/java/org/apache/ibatis/ibator/maven/MavenShellCallback.java
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/main/resources/ibatorConfig.xml
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/main/resources/ibatorConfig.xml
ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/main/resources/ibatorConfig.xml
Modified:
ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/running.html
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/running.html?rev=917111&r1=917110&r2=917111&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/running.html
(original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/running.html Sun
Feb 28 03:36:51 2010
@@ -39,7 +39,9 @@
<code>targetPackage</code> attributes in all XML configurations as
follows:</p>
<ul>
<li><code>targetProject</code> is assumed to be an existing directory
structure.
- Ibator will fail if this directory structure does not exist.</li>
+ Ibator will fail if this directory structure does not exist. There is one
exception to this
+ rule - when Ibator is running through the Maven plugin. See the Maven
plugin page
+ for information about how <code>targetProject</code> is interpreted in
Maven.</li>
<li><code>targetPackage</code> will be translated to a suitable subdirectory
structure of the <code>targetProject</code>
directory structure. Ibator will create these subdirectories if
necessary.</li>
Modified:
ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithMaven.html
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithMaven.html?rev=917111&r1=917110&r2=917111&view=diff
==============================================================================
---
ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithMaven.html
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithMaven.html
Sun Feb 28 03:36:51 2010
@@ -43,5 +43,12 @@
<p>Of course, things are never that easy! </p>
+<h2>Interpretation of targetProject</h2>
+<p>The <code>targetProject</code> attribute of the generator configurations is
interpreted
+somewhat differently when running with Maven. If set to the special value
"MAVEN" (case
+sensitive), then <code>targetProject</code> will be set to the plugin's output
directory,
+and that directory will be created if it doesn't already exist. If not set to
"MAVEN", then
+<code>targetProject</code> will be interpreted as normal by Ibator - it must
be set
+to a directory that already exists.</p>
</body>
</html>
\ No newline at end of file
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/IntrospectedTable.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/IntrospectedTable.java?rev=917111&r1=917110&r2=917111&view=diff
==============================================================================
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/IntrospectedTable.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/IntrospectedTable.java
Sun Feb 28 03:36:51 2010
@@ -478,7 +478,7 @@
protected void calculateXmlAttributes() {
setIbatis2SqlMapPackage(calculateIbatis2SqlMapPackage());
setIbatis2SqlMapFileName(calculateIbatis2SqlMapFileName());
- setIbatis3XmlMapperFileName(calculateIbatis3XmlMapperFileName()); //
TODO? works for now
+ setIbatis3XmlMapperFileName(calculateIbatis3XmlMapperFileName());
setIbatis3XmlMapperPackage(getIbatis2SqlMapPackage()); // TODO? works
for now
setIbatis2SqlMapNamespace(calculateIbatis2SqlMapNamespace());
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/ResultMapWithBLOBsElementGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/ResultMapWithBLOBsElementGenerator.java?rev=917111&r1=917110&r2=917111&view=diff
==============================================================================
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/ResultMapWithBLOBsElementGenerator.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/ResultMapWithBLOBsElementGenerator.java
Sun Feb 28 03:36:51 2010
@@ -51,12 +51,8 @@
answer.addAttribute(new Attribute("type", //$NON-NLS-1$
returnType));
- StringBuilder sb = new StringBuilder();
-// TODO - what do we need to do here for iBATIS3?
-// sb.append(introspectedTable.getSqlMapNamespace());
-// sb.append('.');
- sb.append(introspectedTable.getBaseResultMapId());
- answer.addAttribute(new Attribute("extends", sb.toString()));
//$NON-NLS-1$
+ answer.addAttribute(new Attribute("extends", //$NON-NLS-1$
+ introspectedTable.getBaseResultMapId()));
ibatorContext.getCommentGenerator().addComment(answer);
Modified: ibatis/java/ibator/trunk/core/ibator-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-maven-plugin/pom.xml?rev=917111&r1=917110&r2=917111&view=diff
==============================================================================
--- ibatis/java/ibator/trunk/core/ibator-maven-plugin/pom.xml (original)
+++ ibatis/java/ibator/trunk/core/ibator-maven-plugin/pom.xml Sun Feb 28
03:36:51 2010
@@ -5,7 +5,7 @@
<artifactId>ibator-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>1.2.2-SNAPSHOT</version>
- <name>ibator-maven-plugin Maven Mojo</name>
+ <name>Apache iBATIS Ibator - Maven Plugin</name>
<url>http://ibatis.apache.org/ibator.html</url>
<build>
<plugins>
Modified:
ibatis/java/ibator/trunk/core/ibator-maven-plugin/src/main/java/org/apache/ibatis/ibator/maven/IbatorMojo.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-maven-plugin/src/main/java/org/apache/ibatis/ibator/maven/IbatorMojo.java?rev=917111&r1=917110&r2=917111&view=diff
==============================================================================
---
ibatis/java/ibator/trunk/core/ibator-maven-plugin/src/main/java/org/apache/ibatis/ibator/maven/IbatorMojo.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-maven-plugin/src/main/java/org/apache/ibatis/ibator/maven/IbatorMojo.java
Sun Feb 28 03:36:51 2010
@@ -21,7 +21,6 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
-import java.util.Properties;
import java.util.Set;
import org.apache.ibatis.ibator.api.Ibator;
@@ -53,7 +52,7 @@
private MavenProject project;
/**
- * @parameter expression="${ibator.output.directory}"
+ * @parameter expression="${ibator.outputDirectory}"
*
default-value="${project.build.directory}/generated-sources/ibator"
* @required
*/
@@ -62,11 +61,11 @@
/**
* Location of the configuration file.
*
- * @parameter expression="${ibator.configuration.file}"
+ * @parameter expression="${ibator.configurationFile}"
*
default-value="${basedir}/src/main/resources/ibatorConfig.xml"
* @required
*/
- private File configFile;
+ private File configurationFile;
/**
* Specifies whether the mojo writes progress messages to the log
@@ -88,58 +87,54 @@
* then jdbc.driver, jdbc.url must be supplies also,
* and jdbc.user.id and jdbc.password may be supplied.
*
- * @parameter expression="${ibator.sql.script.file}"
+ * @parameter expression="${ibator.sqlScript}"
*/
private File sqlScript;
/**
* JDBC Driver to use if a sql.script.file is specified
*
- * @parameter expression="${ibator.jdbc.driver}"
+ * @parameter expression="${ibator.jdbcDriver}"
*/
private String jdbcDriver;
/**
* JDBC URL to use if a sql.script.file is specified
*
- * @parameter expression="${ibator.jdbc.url}"
+ * @parameter expression="${ibator.jdbcURL}"
*/
private String jdbcURL;
/**
* JDBC user ID to use if a sql.script.file is specified
*
- * @parameter expression="${ibator.jdbc.user.id}"
+ * @parameter expression="${ibator.jdbcUserId}"
*/
private String jdbcUserId;
/**
* JDBC password to use if a sql.script.file is specified
*
- * @parameter expression="${ibator.jdbc.password}"
+ * @parameter expression="${ibator.jdbcPassword}"
*/
private String jdbcPassword;
- /**
- * @parameter expression=${ibator.configuration.properties}
- */
- private Properties configurationProperties;
-
public void execute() throws MojoExecutionException {
- if (configFile == null) {
+ if (configurationFile == null) {
throw new
MojoExecutionException(Messages.getString("RuntimeError.0")); //$NON-NLS-1$
}
List<String> warnings = new ArrayList<String>();
- if (!configFile.exists()) {
+ if (!configurationFile.exists()) {
throw new MojoExecutionException(Messages.getString(
- "RuntimeError.1", configFile.toString())); //$NON-NLS-1$
+ "RuntimeError.1", configurationFile.toString()));
//$NON-NLS-1$
}
runScriptIfNecessary();
Set<String> fullyqualifiedTables = new HashSet<String>();
+ // TODO...
// if (StringUtility.stringHasValue(fullyQualifiedTableNames)) {
// StringTokenizer st = new
StringTokenizer(fullyQualifiedTableNames,
// ","); //$NON-NLS-1$
@@ -152,6 +147,7 @@
// }
Set<String> contexts = new HashSet<String>();
+ // TODO...
// if (StringUtility.stringHasValue(contextIds)) {
// StringTokenizer st = new StringTokenizer(contextIds, ",");
//$NON-NLS-1$
// while (st.hasMoreTokens()) {
@@ -163,9 +159,9 @@
// }
try {
- IbatorConfigurationParser cp = new
IbatorConfigurationParser(configurationProperties, warnings);
+ IbatorConfigurationParser cp = new
IbatorConfigurationParser(project.getProperties(), warnings);
IbatorConfiguration config = cp
- .parseIbatorConfiguration(configFile);
+ .parseIbatorConfiguration(configurationFile);
ShellCallback callback = new MavenShellCallback(this, overwrite);
Modified:
ibatis/java/ibator/trunk/core/ibator-maven-plugin/src/main/java/org/apache/ibatis/ibator/maven/MavenShellCallback.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-maven-plugin/src/main/java/org/apache/ibatis/ibator/maven/MavenShellCallback.java?rev=917111&r1=917110&r2=917111&view=diff
==============================================================================
---
ibatis/java/ibator/trunk/core/ibator-maven-plugin/src/main/java/org/apache/ibatis/ibator/maven/MavenShellCallback.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-maven-plugin/src/main/java/org/apache/ibatis/ibator/maven/MavenShellCallback.java
Sun Feb 28 03:36:51 2010
@@ -40,6 +40,10 @@
@Override
public File getDirectory(String targetProject, String targetPackage)
throws ShellException {
+ if (!"MAVEN".equals(targetProject)) {
+ return super.getDirectory(targetProject, targetPackage);
+ }
+
// targetProject is the output directory from the ibator Mojo.
// it will be created if necessary
//
Modified:
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/main/resources/ibatorConfig.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/main/resources/ibatorConfig.xml?rev=917111&r1=917110&r2=917111&view=diff
==============================================================================
---
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/main/resources/ibatorConfig.xml
(original)
+++
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/main/resources/ibatorConfig.xml
Sun Feb 28 03:36:51 2010
@@ -16,16 +16,16 @@
connectionURL="jdbc:hsqldb:mem:aname"
userId="sa" />
- <javaModelGenerator
targetPackage="ibatortest.java2.generated.flat.java2.model"
targetProject="${generated.source.dir.java2}">
+ <javaModelGenerator
targetPackage="ibatortest.java2.generated.flat.java2.model"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
<property name="trimStrings" value="true" />
</javaModelGenerator>
- <sqlMapGenerator targetPackage="ibatortest.java2.generated.flat.java2.xml"
targetProject="${generated.source.dir.java2}">
+ <sqlMapGenerator targetPackage="ibatortest.java2.generated.flat.java2.xml"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</sqlMapGenerator>
- <daoGenerator type="GENERIC-SI"
targetPackage="ibatortest.java2.generated.flat.java2.dao"
targetProject="${generated.source.dir.java2}">
+ <daoGenerator type="GENERIC-SI"
targetPackage="ibatortest.java2.generated.flat.java2.dao"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</daoGenerator>
@@ -56,16 +56,16 @@
connectionURL="jdbc:hsqldb:mem:aname"
userId="sa" />
- <javaModelGenerator
targetPackage="ibatortest.java2.generated.hierarchical.java2.model"
targetProject="${generated.source.dir.java2}">
+ <javaModelGenerator
targetPackage="ibatortest.java2.generated.hierarchical.java2.model"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
<property name="trimStrings" value="true" />
</javaModelGenerator>
- <sqlMapGenerator
targetPackage="ibatortest.java2.generated.hierarchical.java2.xml"
targetProject="${generated.source.dir.java2}">
+ <sqlMapGenerator
targetPackage="ibatortest.java2.generated.hierarchical.java2.xml"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</sqlMapGenerator>
- <daoGenerator type="GENERIC-CI"
targetPackage="ibatortest.java2.generated.hierarchical.java2.dao"
targetProject="${generated.source.dir.java2}">
+ <daoGenerator type="GENERIC-CI"
targetPackage="ibatortest.java2.generated.hierarchical.java2.dao"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</daoGenerator>
@@ -96,16 +96,16 @@
connectionURL="jdbc:hsqldb:mem:aname"
userId="sa" />
- <javaModelGenerator
targetPackage="ibatortest.java2.generated.conditional.java2.model"
targetProject="${generated.source.dir.java2}">
+ <javaModelGenerator
targetPackage="ibatortest.java2.generated.conditional.java2.model"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
<property name="trimStrings" value="true" />
</javaModelGenerator>
- <sqlMapGenerator
targetPackage="ibatortest.java2.generated.conditional.java2.xml"
targetProject="${generated.source.dir.java2}">
+ <sqlMapGenerator
targetPackage="ibatortest.java2.generated.conditional.java2.xml"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</sqlMapGenerator>
- <daoGenerator type="SPRING"
targetPackage="ibatortest.java2.generated.conditional.java2.dao"
targetProject="${generated.source.dir.java2}">
+ <daoGenerator type="SPRING"
targetPackage="ibatortest.java2.generated.conditional.java2.dao"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</daoGenerator>
@@ -136,15 +136,15 @@
connectionURL="jdbc:hsqldb:mem:aname"
userId="sa" />
- <javaModelGenerator
targetPackage="ibatortest.java2.generated.miscellaneous.model"
targetProject="${generated.source.dir.java2}">
+ <javaModelGenerator
targetPackage="ibatortest.java2.generated.miscellaneous.model"
targetProject="MAVEN">
<property name="trimStrings" value="true" />
<property name="rootClass"
value="ibatortest.java2.execute.miscellaneous.BaseClass" />
</javaModelGenerator>
- <sqlMapGenerator
targetPackage="ibatortest.java2.generated.miscellaneous.xml"
targetProject="${generated.source.dir.java2}">
+ <sqlMapGenerator
targetPackage="ibatortest.java2.generated.miscellaneous.xml"
targetProject="MAVEN">
</sqlMapGenerator>
- <daoGenerator type="GENERIC-CI"
targetPackage="ibatortest.java2.generated.miscellaneous.dao"
targetProject="${generated.source.dir.java2}">
+ <daoGenerator type="GENERIC-CI"
targetPackage="ibatortest.java2.generated.miscellaneous.dao"
targetProject="MAVEN">
<property name="rootInterface"
value="ibatortest.java2.execute.miscellaneous.BaseInterface" />
<property name="methodNameCalculator" value="EXTENDED"/>
</daoGenerator>
Modified:
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/main/resources/ibatorConfig.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/main/resources/ibatorConfig.xml?rev=917111&r1=917110&r2=917111&view=diff
==============================================================================
---
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/main/resources/ibatorConfig.xml
(original)
+++
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/main/resources/ibatorConfig.xml
Sun Feb 28 03:36:51 2010
@@ -10,23 +10,23 @@
<ibatorPlugin type="org.apache.ibatis.ibator.plugins.EqualsHashCodePlugin"
/>
<ibatorPlugin type="org.apache.ibatis.ibator.plugins.SqlMapConfigPlugin" >
<property name="targetPackage" value="ibatortest.generated.flat" />
- <property name="targetProject" value="${generated.source.dir.java5}" />
+ <property name="targetProject" value="MAVEN" />
</ibatorPlugin>
<jdbcConnection driverClass="org.hsqldb.jdbcDriver"
connectionURL="jdbc:hsqldb:mem:aname"
userId="sa" />
- <javaModelGenerator targetPackage="ibatortest.generated.flat.java5.model"
targetProject="${generated.source.dir.java5}">
+ <javaModelGenerator targetPackage="ibatortest.generated.flat.java5.model"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
<property name="trimStrings" value="true" />
</javaModelGenerator>
- <sqlMapGenerator targetPackage="ibatortest.generated.flat.java5.xml"
targetProject="${generated.source.dir.java5}">
+ <sqlMapGenerator targetPackage="ibatortest.generated.flat.java5.xml"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</sqlMapGenerator>
- <daoGenerator type="GENERIC-CI"
targetPackage="ibatortest.generated.flat.java5.dao"
targetProject="${generated.source.dir.java5}">
+ <daoGenerator type="GENERIC-CI"
targetPackage="ibatortest.generated.flat.java5.dao" targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</daoGenerator>
@@ -59,16 +59,16 @@
connectionURL="jdbc:hsqldb:mem:aname"
userId="sa" />
- <javaModelGenerator targetPackage="ibatortest.generated.flat.java2.model"
targetProject="${generated.source.dir.java5}">
+ <javaModelGenerator targetPackage="ibatortest.generated.flat.java2.model"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
<property name="trimStrings" value="true" />
</javaModelGenerator>
- <sqlMapGenerator targetPackage="ibatortest.generated.flat.java2.xml"
targetProject="${generated.source.dir.java5}">
+ <sqlMapGenerator targetPackage="ibatortest.generated.flat.java2.xml"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</sqlMapGenerator>
- <daoGenerator type="GENERIC-SI"
targetPackage="ibatortest.generated.flat.java2.dao"
targetProject="${generated.source.dir.java5}">
+ <daoGenerator type="GENERIC-SI"
targetPackage="ibatortest.generated.flat.java2.dao" targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</daoGenerator>
@@ -99,16 +99,16 @@
connectionURL="jdbc:hsqldb:mem:aname"
userId="sa" />
- <javaModelGenerator
targetPackage="ibatortest.generated.hierarchical.java5.model"
targetProject="${generated.source.dir.java5}">
+ <javaModelGenerator
targetPackage="ibatortest.generated.hierarchical.java5.model"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
<property name="trimStrings" value="true" />
</javaModelGenerator>
- <sqlMapGenerator
targetPackage="ibatortest.generated.hierarchical.java5.xml"
targetProject="${generated.source.dir.java5}">
+ <sqlMapGenerator
targetPackage="ibatortest.generated.hierarchical.java5.xml"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</sqlMapGenerator>
- <daoGenerator type="SPRING"
targetPackage="ibatortest.generated.hierarchical.java5.dao"
targetProject="${generated.source.dir.java5}">
+ <daoGenerator type="SPRING"
targetPackage="ibatortest.generated.hierarchical.java5.dao"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</daoGenerator>
@@ -141,16 +141,16 @@
connectionURL="jdbc:hsqldb:mem:aname"
userId="sa" />
- <javaModelGenerator
targetPackage="ibatortest.generated.hierarchical.java2.model"
targetProject="${generated.source.dir.java5}">
+ <javaModelGenerator
targetPackage="ibatortest.generated.hierarchical.java2.model"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
<property name="trimStrings" value="true" />
</javaModelGenerator>
- <sqlMapGenerator
targetPackage="ibatortest.generated.hierarchical.java2.xml"
targetProject="${generated.source.dir.java5}">
+ <sqlMapGenerator
targetPackage="ibatortest.generated.hierarchical.java2.xml"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</sqlMapGenerator>
- <daoGenerator type="GENERIC-CI"
targetPackage="ibatortest.generated.hierarchical.java2.dao"
targetProject="${generated.source.dir.java5}">
+ <daoGenerator type="GENERIC-CI"
targetPackage="ibatortest.generated.hierarchical.java2.dao"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</daoGenerator>
@@ -182,16 +182,16 @@
connectionURL="jdbc:hsqldb:mem:aname"
userId="sa" />
- <javaModelGenerator
targetPackage="ibatortest.generated.conditional.java5.model"
targetProject="${generated.source.dir.java5}">
+ <javaModelGenerator
targetPackage="ibatortest.generated.conditional.java5.model"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
<property name="trimStrings" value="true" />
</javaModelGenerator>
- <sqlMapGenerator
targetPackage="ibatortest.generated.conditional.java5.xml"
targetProject="${generated.source.dir.java5}">
+ <sqlMapGenerator
targetPackage="ibatortest.generated.conditional.java5.xml"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</sqlMapGenerator>
- <daoGenerator type="GENERIC-SI"
targetPackage="ibatortest.generated.conditional.java5.dao"
targetProject="${generated.source.dir.java5}">
+ <daoGenerator type="GENERIC-SI"
targetPackage="ibatortest.generated.conditional.java5.dao"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</daoGenerator>
@@ -224,16 +224,16 @@
connectionURL="jdbc:hsqldb:mem:aname"
userId="sa" />
- <javaModelGenerator
targetPackage="ibatortest.generated.conditional.java2.model"
targetProject="${generated.source.dir.java5}">
+ <javaModelGenerator
targetPackage="ibatortest.generated.conditional.java2.model"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
<property name="trimStrings" value="true" />
</javaModelGenerator>
- <sqlMapGenerator
targetPackage="ibatortest.generated.conditional.java2.xml"
targetProject="${generated.source.dir.java5}">
+ <sqlMapGenerator
targetPackage="ibatortest.generated.conditional.java2.xml"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</sqlMapGenerator>
- <daoGenerator type="SPRING"
targetPackage="ibatortest.generated.conditional.java2.dao"
targetProject="${generated.source.dir.java5}">
+ <daoGenerator type="SPRING"
targetPackage="ibatortest.generated.conditional.java2.dao"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</daoGenerator>
@@ -273,15 +273,15 @@
connectionURL="jdbc:hsqldb:mem:aname"
userId="sa" />
- <javaModelGenerator
targetPackage="ibatortest.generated.miscellaneous.model"
targetProject="${generated.source.dir.java5}">
+ <javaModelGenerator
targetPackage="ibatortest.generated.miscellaneous.model" targetProject="MAVEN">
<property name="trimStrings" value="true" />
<property name="rootClass"
value="ibatortest.execute.miscellaneous.BaseClass" />
</javaModelGenerator>
- <sqlMapGenerator targetPackage="ibatortest.generated.miscellaneous.xml"
targetProject="${generated.source.dir.java5}">
+ <sqlMapGenerator targetPackage="ibatortest.generated.miscellaneous.xml"
targetProject="MAVEN">
</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="MAVEN"
implementationPackage="ibatortest.generated.miscellaneous.dao.impl">
<property name="rootInterface"
value="ibatortest.execute.miscellaneous.BaseInterface" />
<property name="methodNameCalculator" value="EXTENDED"/>
@@ -312,12 +312,12 @@
connectionURL="jdbc:hsqldb:mem:aname"
userId="sa" />
- <javaModelGenerator
targetPackage="ibatortest.generated.miscellaneous.model"
targetProject="${generated.source.dir.java5}">
+ <javaModelGenerator
targetPackage="ibatortest.generated.miscellaneous.model" targetProject="MAVEN">
<property name="trimStrings" value="true" />
</javaModelGenerator>
<sqlMapGenerator targetPackage="ibatortest.generated.miscellaneous.xml"
- targetProject="${generated.source.dir.java5}"/>
+ targetProject="MAVEN"/>
<table tableName="AnotherAwfulTable" />
</ibatorContext>
Modified:
ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/main/resources/ibatorConfig.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/main/resources/ibatorConfig.xml?rev=917111&r1=917110&r2=917111&view=diff
==============================================================================
---
ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/main/resources/ibatorConfig.xml
(original)
+++
ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/main/resources/ibatorConfig.xml
Sun Feb 28 03:36:51 2010
@@ -13,16 +13,16 @@
connectionURL="jdbc:hsqldb:mem:aname"
userId="sa" />
- <javaModelGenerator targetPackage="ibatortest.generated.flat.java5.model"
targetProject="generatedsrc">
+ <javaModelGenerator targetPackage="ibatortest.generated.flat.java5.model"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
<property name="trimStrings" value="true" />
</javaModelGenerator>
- <sqlMapGenerator targetPackage="ibatortest.generated.flat.java5.xml"
targetProject="generatedsrc">
+ <sqlMapGenerator targetPackage="ibatortest.generated.flat.java5.xml"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</sqlMapGenerator>
- <daoGenerator type="MAPPER"
targetPackage="ibatortest.generated.flat.java5.dao"
targetProject="generatedsrc">
+ <daoGenerator type="MAPPER"
targetPackage="ibatortest.generated.flat.java5.dao" targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</daoGenerator>
@@ -52,16 +52,16 @@
connectionURL="jdbc:hsqldb:mem:aname"
userId="sa" />
- <javaModelGenerator
targetPackage="ibatortest.generated.hierarchical.java5.model"
targetProject="generatedsrc">
+ <javaModelGenerator
targetPackage="ibatortest.generated.hierarchical.java5.model"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
<property name="trimStrings" value="true" />
</javaModelGenerator>
- <sqlMapGenerator
targetPackage="ibatortest.generated.hierarchical.java5.xml"
targetProject="generatedsrc">
+ <sqlMapGenerator
targetPackage="ibatortest.generated.hierarchical.java5.xml"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</sqlMapGenerator>
- <daoGenerator type="MAPPER"
targetPackage="ibatortest.generated.hierarchical.java5.dao"
targetProject="generatedsrc">
+ <daoGenerator type="MAPPER"
targetPackage="ibatortest.generated.hierarchical.java5.dao"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</daoGenerator>
@@ -90,16 +90,16 @@
connectionURL="jdbc:hsqldb:mem:aname"
userId="sa" />
- <javaModelGenerator
targetPackage="ibatortest.generated.conditional.java5.model"
targetProject="generatedsrc">
+ <javaModelGenerator
targetPackage="ibatortest.generated.conditional.java5.model"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
<property name="trimStrings" value="true" />
</javaModelGenerator>
- <sqlMapGenerator
targetPackage="ibatortest.generated.conditional.java5.xml"
targetProject="generatedsrc">
+ <sqlMapGenerator
targetPackage="ibatortest.generated.conditional.java5.xml"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</sqlMapGenerator>
- <daoGenerator type="MAPPER"
targetPackage="ibatortest.generated.conditional.java5.dao"
targetProject="generatedsrc">
+ <daoGenerator type="MAPPER"
targetPackage="ibatortest.generated.conditional.java5.dao"
targetProject="MAVEN">
<property name="enableSubPackages" value="true" />
</daoGenerator>
@@ -136,15 +136,15 @@
connectionURL="jdbc:hsqldb:mem:aname"
userId="sa" />
- <javaModelGenerator
targetPackage="ibatortest.generated.miscellaneous.model"
targetProject="generatedsrc">
+ <javaModelGenerator
targetPackage="ibatortest.generated.miscellaneous.model" targetProject="MAVEN">
<property name="trimStrings" value="true" />
<property name="rootClass"
value="ibatortest.execute.miscellaneous.BaseClass" />
</javaModelGenerator>
- <sqlMapGenerator targetPackage="ibatortest.generated.miscellaneous.xml"
targetProject="generatedsrc">
+ <sqlMapGenerator targetPackage="ibatortest.generated.miscellaneous.xml"
targetProject="MAVEN">
</sqlMapGenerator>
- <daoGenerator type="MAPPER"
targetPackage="ibatortest.generated.miscellaneous.dao"
targetProject="generatedsrc">
+ <daoGenerator type="MAPPER"
targetPackage="ibatortest.generated.miscellaneous.dao" targetProject="MAVEN">
<property name="rootInterface"
value="ibatortest.execute.miscellaneous.BaseInterface" />
<property name="methodNameCalculator" value="EXTENDED"/>
</daoGenerator>
@@ -177,12 +177,12 @@
connectionURL="jdbc:hsqldb:mem:aname"
userId="sa" />
- <javaModelGenerator
targetPackage="ibatortest.generated.miscellaneous.model"
targetProject="generatedsrc">
+ <javaModelGenerator
targetPackage="ibatortest.generated.miscellaneous.model" targetProject="MAVEN">
<property name="trimStrings" value="true" />
</javaModelGenerator>
<sqlMapGenerator targetPackage="ibatortest.generated.miscellaneous.xml"
- targetProject="generatedsrc"/>
+ targetProject="MAVEN"/>
<table tableName="AnotherAwfulTable" />
</ibatorContext>
