svn commit: r928431 - in /ibatis/java/ibatis-3/trunk: ant-lib/ build.xml doc/ ibatis-3-core/bundle.xml ibatis-3-core/doc/ ibatis-3-core/migrations.xml ibatis-3-core/pom.xml version.properties
Author: cbegin
Date: Sun Mar 28 15:27:53 2010
New Revision: 928431
URL: http://svn.apache.org/viewvc?rev=928431view=rev
Log:
removed ant build, using maven exclusively now
Added:
ibatis/java/ibatis-3/trunk/ibatis-3-core/bundle.xml
ibatis/java/ibatis-3/trunk/ibatis-3-core/doc/
- copied from r928231, ibatis/java/ibatis-3/trunk/doc/
ibatis/java/ibatis-3/trunk/ibatis-3-core/migrations.xml
Removed:
ibatis/java/ibatis-3/trunk/ant-lib/
ibatis/java/ibatis-3/trunk/build.xml
ibatis/java/ibatis-3/trunk/doc/
ibatis/java/ibatis-3/trunk/version.properties
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/pom.xml
Added: ibatis/java/ibatis-3/trunk/ibatis-3-core/bundle.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/bundle.xml?rev=928431view=auto
==
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/bundle.xml (added)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/bundle.xml Sun Mar 28 15:27:53 2010
@@ -0,0 +1,19 @@
+assembly
+ idbundle/id
+ formats
+formatzip/format
+ /formats
+ files
+file
+
sourcetarget/${project.artifactId}-${project.version}.${project.packaging}/source
+/file
+file
+
sourcetarget/${project.artifactId}-${project.version}-sources.${project.packaging}/source
+/file
+ /files
+ dependencySets
+dependencySet
+ outputDirectoryoptional/${dependency.artifactId}/outputDirectory
+/dependencySet
+ /dependencySets
+/assembly
\ No newline at end of file
Added: ibatis/java/ibatis-3/trunk/ibatis-3-core/migrations.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/migrations.xml?rev=928431view=auto
==
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/migrations.xml (added)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/migrations.xml Sun Mar 28 15:27:53
2010
@@ -0,0 +1,19 @@
+assembly
+ idmigrations/id
+ formats
+formatzip/format
+ /formats
+ outputDirectoryibatis-migrations/outputDirectory
+ files
+file
+
sourcetarget/${project.artifactId}-${project.version}.${project.packaging}/source
+ outputDirectorylib/outputDirectory
+/file
+ /files
+ fileSets
+fileSet
+ directorysrc/main/scripts/directory
+ outputDirectory/outputDirectory
+/fileSet
+ /fileSets
+/assembly
\ No newline at end of file
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/pom.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/pom.xml?rev=928431r1=928430r2=928431view=diff
==
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/pom.xml (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/pom.xml Sun Mar 28 15:27:53 2010
@@ -42,6 +42,16 @@
build
plugins
plugin
+artifactIdmaven-assembly-plugin/artifactId
+version2.2-beta-5/version
+configuration
+ descriptors
+descriptorbundle.xml/descriptor
+descriptormigrations.xml/descriptor
+ /descriptors
+/configuration
+ /plugin
+ plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-compiler-plugin/artifactId
version2.0.2/version
@@ -76,8 +86,6 @@
artifactIdmaven-source-plugin/artifactId
executions
execution
-idattach-sources/id
-phaseverify/phase
goals
goaljar/goal
/goals
@@ -89,7 +97,7 @@
resource
directorysrc/main/java/directory
excludes
- exclude*.java/exclude
+ exclude**/*.java/exclude
/excludes
/resource
/resources
@@ -97,7 +105,7 @@
testResource
directorysrc/test/java/directory
excludes
- exclude*.java/exclude
+ exclude**/*.java/exclude
/excludes
/testResource
/testResources
@@ -119,19 +127,19 @@
groupIdlog4j/groupId
artifactIdlog4j/artifactId
version1.2.13/version
- scopeprovided/scope
+ optionaltrue/optional
/dependency
dependency
groupIdcommons-logging/groupId
artifactIdcommons-logging/artifactId
version1.1.1/version
- scopeprovided/scope
+ optionaltrue/optional
/dependency
dependency
groupIdcglib/groupId
artifactIdcglib/artifactId
version2.1_3/version
- scopeprovided/scope
+ optionaltrue/optional
/dependency
!-- Test dependencies --
dependency
svn commit: r928432 - /ibatis/java/ibatis-3/trunk/ibatis-3-core/
Author: cbegin Date: Sun Mar 28 15:31:45 2010 New Revision: 928432 URL: http://svn.apache.org/viewvc?rev=928432view=rev Log: ignored project files Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/ (props changed) Propchange: ibatis/java/ibatis-3/trunk/ibatis-3-core/ -- --- svn:ignore (original) +++ svn:ignore Sun Mar 28 15:31:45 2010 @@ -4,3 +4,5 @@ target ibatis-3-core.iml .classpath .project +*.ipr +*.iws
svn commit: r928433 - in /ibatis/java/ibatis-3: temp/ trunk/
Author: cbegin Date: Sun Mar 28 15:34:38 2010 New Revision: 928433 URL: http://svn.apache.org/viewvc?rev=928433view=rev Log: Renamed trunk (ibatis/java/ibatis-3/trunk) to temp. Added: ibatis/java/ibatis-3/temp/ - copied from r928432, ibatis/java/ibatis-3/trunk/ Removed: ibatis/java/ibatis-3/trunk/
svn commit: r928434 - in /ibatis/java/ibatis-3: temp/ibatis-3-core/ trunk/
Author: cbegin Date: Sun Mar 28 15:35:17 2010 New Revision: 928434 URL: http://svn.apache.org/viewvc?rev=928434view=rev Log: Moved ibatis/java/ibatis-3/temp/ibatis-3-core to ibatis/java/ibatis-3/trunk. Added: ibatis/java/ibatis-3/trunk/ - copied from r928433, ibatis/java/ibatis-3/temp/ibatis-3-core/ Removed: ibatis/java/ibatis-3/temp/ibatis-3-core/
svn commit: r928435 - /ibatis/java/ibatis-3/temp/
Author: cbegin Date: Sun Mar 28 15:35:30 2010 New Revision: 928435 URL: http://svn.apache.org/viewvc?rev=928435view=rev Log: Removed ibatis/java/ibatis-3/temp Removed: ibatis/java/ibatis-3/temp/
svn commit: r928450 - in /ibatis/java/ibatis-3/trunk: migrations.xml pom.xml
Author: cbegin
Date: Sun Mar 28 16:41:47 2010
New Revision: 928450
URL: http://svn.apache.org/viewvc?rev=928450view=rev
Log:
changed artifact id for ibatis to be more maven-like
Modified:
ibatis/java/ibatis-3/trunk/migrations.xml
ibatis/java/ibatis-3/trunk/pom.xml
Modified: ibatis/java/ibatis-3/trunk/migrations.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/migrations.xml?rev=928450r1=928449r2=928450view=diff
==
--- ibatis/java/ibatis-3/trunk/migrations.xml (original)
+++ ibatis/java/ibatis-3/trunk/migrations.xml Sun Mar 28 16:41:47 2010
@@ -2,7 +2,7 @@
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd;
idmigrations/id
- baseDirectoryibatis-3-migrations-${project.version}/baseDirectory
+ baseDirectoryibatis-migrations-${project.version}/baseDirectory
formats
formatzip/format
/formats
Modified: ibatis/java/ibatis-3/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/pom.xml?rev=928450r1=928449r2=928450view=diff
==
--- ibatis/java/ibatis-3/trunk/pom.xml (original)
+++ ibatis/java/ibatis-3/trunk/pom.xml Sun Mar 28 16:41:47 2010
@@ -1,13 +1,10 @@
project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
- parent
-groupIdorg.apache.ibatis/groupId
-artifactIdibatis-3/artifactId
-version3.0-SNAPSHOT/version
- /parent
modelVersion4.0.0/modelVersion
- artifactIdibatis-3-core/artifactId
- nameibatis-3-core/name
+ groupIdorg.apache.ibatis/groupId
+ artifactIdibatis-core/artifactId
+ nameibatis-core/name
+ version3.0-beta11/version
packagingjar/packaging
urlhttp://ibatis.apache.org/url
licenses
svn commit: r928495 - in /ibatis/java/ibator/trunk/core: ibator-core/doc/ ibator-core/doc/html/ ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/ ibator-systests
Author: jgbutler
Date: Sun Mar 28 21:18:43 2010
New Revision: 928495
URL: http://svn.apache.org/viewvc?rev=928495view=rev
Log:
[Ibator] Tests and fix for corner case issue with insertSelective, sequences,
and iBATIS3
Modified:
ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt
ibatis/java/ibator/trunk/core/ibator-core/doc/html/whatsNew.html
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/InsertSelectiveElementGenerator.java
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/main/resources/CreateDB.sql
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/main/resources/ibatorConfig.xml
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/miscellaneous/AbstractMiscellaneousTest.java
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/miscellaneous/MiscellaneousTest.java
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/resources/ibatortest/java2/execute/miscellaneous/SqlMapConfig.xml
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/main/resources/CreateDB.sql
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/main/resources/ibatorConfig.xml
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/miscellaneous/MiscellaneousTest.java
ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/main/resources/CreateDB.sql
ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/main/resources/ibatorConfig.xml
ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/miscellaneous/MiscellaneousTest.java
Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt?rev=928495r1=928494r2=928495view=diff
==
--- ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt Sun Mar 28
21:18:43 2010
@@ -17,6 +17,8 @@ Bugs:
6. Fixed spelling error LONCVARCHAR-LONGVARCHAR (thanks Allard)
7. Fixed IBATIS-731 - change name of primary key variable to avoid conflicts
8. Fixed IBATIS-699 - Overwrite unmergeable XML files if enabled
+9. Fixed issue where insertSelective failed if there is a sequence generating
the
+ primary key (issue only with iBATIS3)
Enhancements:
1. IBATIS-569 - Make it easier to override IbatorRules in plugins
Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/html/whatsNew.html
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/whatsNew.html?rev=928495r1=928494r2=928495view=diff
==
--- ibatis/java/ibator/trunk/core/ibator-core/doc/html/whatsNew.html (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/whatsNew.html Sun Mar 28
21:18:43 2010
@@ -78,6 +78,8 @@ to iBATIS 3.x only requires two changes
liFixed spelling error LONCVARCHAR-LONGVARCHAR (thanks Allard)/li
liFixed IBATIS-731 - change name of primary key variable to avoid
conflicts/li
liFixed IBATIS-699 - Overwrite unmergeable XML files if enabled/li
+ liFixed issue where insertSelective failed if there is a sequence
generating the
+ primary key (issue only with iBATIS3)/li
/ul
h3Enhancements/h3
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/InsertSelectiveElementGenerator.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/InsertSelectiveElementGenerator.java?rev=928495r1=928494r2=928495view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/InsertSelectiveElementGenerator.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/InsertSelectiveElementGenerator.java
Sun Mar 28 21:18:43 2010
@@ -50,6 +50,7 @@ public class InsertSelectiveElementGener
GeneratedKey gk = introspectedTable.getGeneratedKey();
+String sequenceColumn = null;
if (gk != null gk.isBeforeInsert()) {
IntrospectedColumn introspectedColumn =
introspectedTable.getColumn(gk.getColumn());
// if the column is null, then it's a configuration error. The
@@ -57,6 +58,7 @@ public class InsertSelectiveElementGener
if (introspectedColumn != null) {
// pre-generated key
svn commit: r928540 - /ibatis/java/ibatis-3/trunk/pom.xml
Author: cbegin Date: Mon Mar 29 00:11:26 2010 New Revision: 928540 URL: http://svn.apache.org/viewvc?rev=928540view=rev Log: corrected SNAPSHOT version Modified: ibatis/java/ibatis-3/trunk/pom.xml Modified: ibatis/java/ibatis-3/trunk/pom.xml URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/pom.xml?rev=928540r1=928539r2=928540view=diff == --- ibatis/java/ibatis-3/trunk/pom.xml (original) +++ ibatis/java/ibatis-3/trunk/pom.xml Mon Mar 29 00:11:26 2010 @@ -4,7 +4,7 @@ groupIdorg.apache.ibatis/groupId artifactIdibatis-core/artifactId nameibatis-core/name - version3.0-beta11/version + version3.0-SNAPSHOT/version packagingjar/packaging urlhttp://ibatis.apache.org/url licenses
svn commit: r928551 - in /ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis: executor/ErrorContext.java jdbc/ScriptRunner.java migration/MigrationReader.java
Author: cbegin
Date: Mon Mar 29 00:50:50 2010
New Revision: 928551
URL: http://svn.apache.org/viewvc?rev=928551view=rev
Log:
maintain newlines in migration scripts.
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/executor/ErrorContext.java
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/migration/MigrationReader.java
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/executor/ErrorContext.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/executor/ErrorContext.java?rev=928551r1=928550r2=928551view=diff
==
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/executor/ErrorContext.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/executor/ErrorContext.java
Mon Mar 29 00:50:50 2010
@@ -2,7 +2,7 @@ package org.apache.ibatis.executor;
public class ErrorContext {
- private static String NEWLINE; // Can't be final due to a weird Java
compiler issue.
+ private static final String LINE_SEPARATOR =
System.getProperty(line.separator,\n);
private static final ThreadLocalErrorContext LOCAL = new
ThreadLocalErrorContext();
private ErrorContext stored;
@@ -13,14 +13,6 @@ public class ErrorContext {
private String sql;
private Throwable cause;
- static {
-try {
- NEWLINE = System.getProperty(line.separator);
-} catch (Throwable t) {
- NEWLINE = \n;
-}
- }
-
private ErrorContext() {
}
@@ -93,42 +85,42 @@ public class ErrorContext {
// message
if (this.message != null) {
- description.append(NEWLINE);
+ description.append(LINE_SEPARATOR);
description.append(### );
description.append(this.message);
}
// resource
if (resource != null) {
- description.append(NEWLINE);
+ description.append(LINE_SEPARATOR);
description.append(### The error may exist in );
description.append(resource);
}
// object
if (object != null) {
- description.append(NEWLINE);
+ description.append(LINE_SEPARATOR);
description.append(### The error may involve );
description.append(object);
}
// activity
if (activity != null) {
- description.append(NEWLINE);
+ description.append(LINE_SEPARATOR);
description.append(### The error occurred while );
description.append(activity);
}
// activity
if (sql != null) {
- description.append(NEWLINE);
+ description.append(LINE_SEPARATOR);
description.append(### SQL: );
description.append(sql.replace('\n', ' ').replace('\r', '
').replace('\t', ' ').trim());
}
// cause
if (cause != null) {
- description.append(NEWLINE);
+ description.append(LINE_SEPARATOR);
description.append(### Cause: );
description.append(cause.toString());
}
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java?rev=928551r1=928550r2=928551view=diff
==
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java
Mon Mar 29 00:50:50 2010
@@ -8,6 +8,8 @@ import java.sql.*;
public class ScriptRunner {
+ private static final String LINE_SEPARATOR =
System.getProperty(line.separator,\n);
+
private static final String DEFAULT_DELIMITER = ;;
private Connection connection;
@@ -75,16 +77,14 @@ public class ScriptRunner {
}
private void executeFullScript(Reader reader) {
-final String lineseparator = System.getProperty(line.separator);
StringBuffer script = new StringBuffer();
try {
BufferedReader lineReader = new BufferedReader(reader);
String line;
while ((line = lineReader.readLine()) != null) {
script.append(line);
-script.append(lineseparator);
+script.append(LINE_SEPARATOR);
}
- System.out.println(script);
executeStatement(script.toString());
commitConnection();
} catch (Exception e) {
@@ -161,13 +161,13 @@ public class ScriptRunner {
println(trimmedLine);
} else if (commandReadyToExecute(trimmedLine)) {
command.append(line.substring(0, line.lastIndexOf(delimiter)));
- command.append( );
+ command.append(LINE_SEPARATOR);
println(command);
executeStatement(command.toString());
command.setLength(0);
} else if (trimmedLine.length() 0) {
command.append(line);
- command.append( );
+ command.append(LINE_SEPARATOR);
