svn commit: r943251 - in /ibatis/java/ibatis-2/trunk/ibatis-2-core: build/version.properties doc/release.txt src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java
Author: jgbutler
Date: Tue May 11 19:53:12 2010
New Revision: 943251
URL: http://svn.apache.org/viewvc?rev=943251view=rev
Log:
Fix for IBATIS-376 - clean up ThreadLocal for hot deploy issues
Modified:
ibatis/java/ibatis-2/trunk/ibatis-2-core/build/version.properties
ibatis/java/ibatis-2/trunk/ibatis-2-core/doc/release.txt
ibatis/java/ibatis-2/trunk/ibatis-2-core/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java
Modified: ibatis/java/ibatis-2/trunk/ibatis-2-core/build/version.properties
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-2/trunk/ibatis-2-core/build/version.properties?rev=943251r1=943250r2=943251view=diff
==
--- ibatis/java/ibatis-2/trunk/ibatis-2-core/build/version.properties (original)
+++ ibatis/java/ibatis-2/trunk/ibatis-2-core/build/version.properties Tue May
11 19:53:12 2010
@@ -1,5 +1,5 @@
#Build version info
-#Sun Mar 29 17:24:27 CEST 2009
+#Tue May 11 14:48:36 CDT 2010
version=2.3.4
-buildDate=2009/03/29 17\:24
-buildNum=733
+buildDate=2010/05/11 14\:48
+buildNum=735
Modified: ibatis/java/ibatis-2/trunk/ibatis-2-core/doc/release.txt
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-2/trunk/ibatis-2-core/doc/release.txt?rev=943251r1=943250r2=943251view=diff
==
--- ibatis/java/ibatis-2/trunk/ibatis-2-core/doc/release.txt (original)
+++ ibatis/java/ibatis-2/trunk/ibatis-2-core/doc/release.txt Tue May 11
19:53:12 2010
@@ -12,6 +12,7 @@ Next Version
o IBATIS-508 - Lock occurs when heavy traffic: removed double synchronization
o IBATIS-389 - Unbalanced # in SQL causes unclear/misleading error message:
changed to throw more meaningful exception message
o IBATIS-536 - Errors when using PreparedStatement.setNull(i,Types.OTHER) on
some RDBMS: applied patch inspired by SpringSource
+ o IBATIS-376 - Clean up ThreadLocal for hot deploy issues
--
2.3.4
Modified:
ibatis/java/ibatis-2/trunk/ibatis-2-core/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-2/trunk/ibatis-2-core/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java?rev=943251r1=943250r2=943251view=diff
==
---
ibatis/java/ibatis-2/trunk/ibatis-2-core/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java
(original)
+++
ibatis/java/ibatis-2/trunk/ibatis-2-core/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java
Tue May 11 19:53:12 2010
@@ -43,7 +43,7 @@ public class SqlMapClientImpl implements
*/
public SqlMapExecutorDelegate delegate;
- protected ThreadLocal localSqlMapSession = new ThreadLocal();
+ protected ThreadLocalSqlMapSessionImpl localSqlMapSession = new
ThreadLocalSqlMapSessionImpl();
/**
* Constructor to supply a delegate
@@ -153,6 +153,7 @@ public class SqlMapClientImpl implements
getLocalSqlMapSession().endTransaction();
} finally {
getLocalSqlMapSession().close();
+ localSqlMapSession.remove();
}
}
@@ -253,7 +254,7 @@ public class SqlMapClientImpl implements
}
protected SqlMapSessionImpl getLocalSqlMapSession() {
-SqlMapSessionImpl sqlMapSession = (SqlMapSessionImpl)
localSqlMapSession.get();
+SqlMapSessionImpl sqlMapSession = localSqlMapSession.get();
if (sqlMapSession == null || sqlMapSession.isClosed()) {
sqlMapSession = new SqlMapSessionImpl(this);
localSqlMapSession.set(sqlMapSession);
svn commit: r940463 - /ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/SqlBuilder.java
Author: jgbutler
Date: Mon May 3 14:13:58 2010
New Revision: 940463
URL: http://svn.apache.org/viewvc?rev=940463view=rev
Log:
Add general SqlBuilder
Added:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/SqlBuilder.java
Added:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/SqlBuilder.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/SqlBuilder.java?rev=940463view=auto
==
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/SqlBuilder.java
(added)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/SqlBuilder.java
Mon May 3 14:13:58 2010
@@ -0,0 +1,244 @@
+package org.apache.ibatis.jdbc;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SqlBuilder {
+ private static final String AND = ) \nAND (;
+ private static final String OR = ) \nOR (;
+
+ private static final ThreadLocalSQL localSQL = new ThreadLocalSQL();
+
+ public static void BEGIN() {
+RESET();
+ }
+
+ public static void RESET() {
+localSQL.set(new SQL());
+ }
+
+ public static void UPDATE(String table) {
+sql().statementType = SQL.StatementType.UPDATE;
+sql().tables.add(table);
+ }
+
+ public static void SET(String sets) {
+sql().sets.add(sets);
+ }
+
+ public static String SQL() {
+try {
+ return sql().sql();
+} finally {
+RESET();
+}
+ }
+
+ public static void INSERT_INTO(String tableName) {
+sql().statementType = SQL.StatementType.INSERT;
+sql().tables.add(tableName);
+ }
+
+ public static void VALUES(String columns, String values) {
+sql().columns.add(columns);
+sql().values.add(values);
+ }
+
+ public static void SELECT(String columns) {
+sql().statementType = SQL.StatementType.SELECT;
+sql().select.add(columns);
+ }
+
+ public static void SELECT_DISTINCT(String columns) {
+sql().distinct = true;
+SELECT(columns);
+ }
+
+ public static void DELETE_FROM(String table) {
+sql().statementType = SQL.StatementType.DELETE;
+sql().tables.add(table);
+ }
+
+ public static void FROM(String table) {
+sql().tables.add(table);
+ }
+
+ public static void JOIN(String join) {
+sql().join.add(join);
+ }
+
+ public static void INNER_JOIN(String join) {
+sql().innerJoin.add(join);
+ }
+
+ public static void LEFT_OUTER_JOIN(String join) {
+sql().leftOuterJoin.add(join);
+ }
+
+ public static void RIGHT_OUTER_JOIN(String join) {
+sql().rightOuterJoin.add(join);
+ }
+
+ public static void OUTER_JOIN(String join) {
+sql().outerJoin.add(join);
+ }
+
+ public static void WHERE(String conditions) {
+sql().where.add(conditions);
+sql().lastList = sql().where;
+ }
+
+ public static void OR() {
+sql().lastList.add(OR);
+ }
+
+ public static void AND() {
+sql().lastList.add(AND);
+ }
+
+ public static void GROUP_BY(String columns) {
+sql().groupBy.add(columns);
+ }
+
+ public static void HAVING(String conditions) {
+sql().having.add(conditions);
+sql().lastList = sql().having;
+ }
+
+ public static void ORDER_BY(String columns) {
+sql().orderBy.add(columns);
+ }
+
+ private static SQL sql() {
+SQL sql = localSQL.get();
+if (sql == null) {
+ RESET();
+ sql = localSQL.get();
+}
+return sql;
+ }
+
+ private static class SQL {
+public enum StatementType {
+DELETE,
+INSERT,
+SELECT,
+UPDATE
+}
+
+StatementType statementType;
+ListString sets = new ArrayListString();
+ListString select = new ArrayListString();
+ListString tables = new ArrayListString();
+ListString join = new ArrayListString();
+ListString innerJoin = new ArrayListString();
+ListString outerJoin = new ArrayListString();
+ListString leftOuterJoin = new ArrayListString();
+ListString rightOuterJoin = new ArrayListString();
+ListString where = new ArrayListString();
+ListString having = new ArrayListString();
+ListString groupBy = new ArrayListString();
+ListString orderBy = new ArrayListString();
+ListString lastList = new ArrayListString();
+ListString columns = new ArrayListString();
+ListString values = new ArrayListString();
+boolean distinct;
+
+private void sqlClause(StringBuilder builder, String keyword, ListString
parts, String open, String close, String conjunction) {
+ if (!parts.isEmpty()) {
+if (builder.length() 0) builder.append(\n);
+builder.append(keyword);
+builder.append( );
+builder.append(open);
+String last = ;
+for (int i = 0, n = parts.size(); i n; i++) {
+ String part = parts.get(i);
+ if (i 0 !part.equals(AND) !part.equals(OR)
!last.equals(AND) !last.equals(OR)) {
+builder.append(conjunction);
+ }
+ builder.append(part
svn commit: r940489 - in /ibatis/java/ibatis-3/trunk/doc/en: iBATIS-3-User-Guide.doc iBATIS-3-User-Guide.pdf
Author: jgbutler Date: Mon May 3 15:52:16 2010 New Revision: 940489 URL: http://svn.apache.org/viewvc?rev=940489view=rev Log: Doc updates for SqlBuilder Modified: ibatis/java/ibatis-3/trunk/doc/en/iBATIS-3-User-Guide.doc ibatis/java/ibatis-3/trunk/doc/en/iBATIS-3-User-Guide.pdf Modified: ibatis/java/ibatis-3/trunk/doc/en/iBATIS-3-User-Guide.doc URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/doc/en/iBATIS-3-User-Guide.doc?rev=940489r1=940488r2=940489view=diff == Binary files - no diff available. Modified: ibatis/java/ibatis-3/trunk/doc/en/iBATIS-3-User-Guide.pdf URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/doc/en/iBATIS-3-User-Guide.pdf?rev=940489r1=940488r2=940489view=diff == Binary files - no diff available.
svn commit: r940510 - in /ibatis/java/ibatis-3/trunk/doc/en: iBATIS-3-User-Guide.doc iBATIS-3-User-Guide.pdf
Author: jgbutler Date: Mon May 3 16:53:03 2010 New Revision: 940510 URL: http://svn.apache.org/viewvc?rev=940510view=rev Log: Doc updates for SqlBuilder Modified: ibatis/java/ibatis-3/trunk/doc/en/iBATIS-3-User-Guide.doc ibatis/java/ibatis-3/trunk/doc/en/iBATIS-3-User-Guide.pdf Modified: ibatis/java/ibatis-3/trunk/doc/en/iBATIS-3-User-Guide.doc URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/doc/en/iBATIS-3-User-Guide.doc?rev=940510r1=940509r2=940510view=diff == Binary files - no diff available. Modified: ibatis/java/ibatis-3/trunk/doc/en/iBATIS-3-User-Guide.pdf URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/doc/en/iBATIS-3-User-Guide.pdf?rev=940510r1=940509r2=940510view=diff == Binary files - no diff available.
svn commit: r939007 - /ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/SelectBuilder.java
Author: jgbutler
Date: Wed Apr 28 16:41:34 2010
New Revision: 939007
URL: http://svn.apache.org/viewvc?rev=939007view=rev
Log:
Add support for DISTINCT in SelectBuilder
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/SelectBuilder.java
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/SelectBuilder.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/SelectBuilder.java?rev=939007r1=939006r2=939007view=diff
==
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/SelectBuilder.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/jdbc/SelectBuilder.java
Wed Apr 28 16:41:34 2010
@@ -22,6 +22,10 @@ public class SelectBuilder {
sql().select.add(columns);
}
+ public static void DISTINCT(boolean distinct) {
+sql().distinct = distinct;
+ }
+
public static void FROM(String table) {
sql().from.add(table);
}
@@ -75,7 +79,12 @@ public class SelectBuilder {
public static String SQL() {
try {
StringBuilder builder = new StringBuilder();
- selectClause(builder, SELECT, sql().select, , , , );
+ if (sql().distinct) {
+ selectClause(builder, SELECT DISTINCT, sql().select, , , , );
+ } else {
+ selectClause(builder, SELECT, sql().select, , , , );
+ }
+
selectClause(builder, FROM, sql().from, , , , );
selectClause(builder, JOIN, sql().join, , , JOIN);
selectClause(builder, INNER JOIN, sql().innerJoin, , , \nINNER
JOIN );
@@ -133,6 +142,7 @@ public class SelectBuilder {
ListString groupBy = new ArrayListString();
ListString orderBy = new ArrayListString();
ListString lastList = new ArrayListString();
+boolean distinct;
}
}
svn commit: r935997 - in /ibatis/java/ibator/trunk/core/ibator-core: doc/ReleaseNotes.txt doc/html/whatsNew.html src/main/java/org/apache/ibatis/ibator/plugins/EqualsHashCodePlugin.java
Author: jgbutler
Date: Tue Apr 20 17:10:50 2010
New Revision: 935997
URL: http://svn.apache.org/viewvc?rev=935997view=rev
Log:
[ibator] improve generated equals and hashCode methods
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/plugins/EqualsHashCodePlugin.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=935997r1=935996r2=935997view=diff
==
--- ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt Tue Apr 20
17:10:50 2010
@@ -46,6 +46,7 @@ Enhancements:
19. Added new or method to example classes
20. Added new useCompoundPropertyNames property on table
21. Further improved extensibility of the example classes
+22. EqulasHashCodePlugin now generates far superior methods
---
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=935997r1=935996r2=935997view=diff
==
--- ibatis/java/ibator/trunk/core/ibator-core/doc/html/whatsNew.html (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/whatsNew.html Tue Apr 20
17:10:50 2010
@@ -130,6 +130,7 @@ to iBATIS 3.x only requires two changes
liAdded new or method to example classes/li
liAdded new useCompoundPropertyNames property on lt;tablegt;/li
liEnabled a far simpler method for extending the example classes/li
+ liEqualsHashCodePlugin now generates far superior methods/li
/ul
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/plugins/EqualsHashCodePlugin.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/plugins/EqualsHashCodePlugin.java?rev=935997r1=935996r2=935997view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/plugins/EqualsHashCodePlugin.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/plugins/EqualsHashCodePlugin.java
Tue Apr 20 17:10:50 2010
@@ -37,10 +37,9 @@ import org.apache.ibatis.ibator.internal
* cases, but will probably NOT be correct if you have specified a rootClass -
* because our equals method only checks the fields it knows about.
* p
- * The tthashCode/tt method generated by this class is a very simplistic
- * implementation. A better implementation would rely on the HashCodeUtil
- * from www.javapractices.com - but we do not want to introduce another
- * dependency in this simple plugin.
+ * Similarly, the tthashCode/tt method generated by this class only
+ * relies on fields it knows about. Anything you add, or fields in a super
+ * class will not be factored into the hash code.
*
* @author Jeff Butler
*
@@ -131,15 +130,15 @@ public class EqualsHashCodePlugin extend
method.addBodyLine(return true;); //$NON-NLS-1$
method.addBodyLine(}); //$NON-NLS-1$
-StringBuilder sb = new StringBuilder();
-sb.append(if (!(that instanceof ); //$NON-NLS-1$
-sb.append(topLevelClass.getType().getShortName());
-sb.append()) {); //$NON-NLS-1$
-method.addBodyLine(sb.toString());
+method.addBodyLine(if (that == null) {); //$NON-NLS-1$
method.addBodyLine(return false;); //$NON-NLS-1$
method.addBodyLine(}); //$NON-NLS-1$
-
-sb.setLength(0);
+
+method.addBodyLine(if (getClass() != that.getClass()) {);
//$NON-NLS-1$
+method.addBodyLine(return false;); //$NON-NLS-1$
+method.addBodyLine(}); //$NON-NLS-1$
+
+StringBuilder sb = new StringBuilder();
sb.append(topLevelClass.getType().getShortName());
sb.append( other = (); //$NON-NLS-1$
sb.append(topLevelClass.getType().getShortName());
@@ -196,10 +195,10 @@ public class EqualsHashCodePlugin extend
}
/**
- * Generates a tthashCode/tt method that multiplies the hashCodes of
- * all fields.
+ * Generates a tthashCode/tt method that includes all fields.
* p
- * Note that this is a very simplistic implementation of hashCode.
+ * Note that this implementation is based on the eclipse foundation
+ * hashCode generator.
*
* @param topLevelClass the class to which the method will be added
* @param introspectedColumns
svn commit: r933783 - in /ibatis/java/ibatis-3/trunk/src: main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java test/java/org/apache/ibatis/submitted/dynsql/Parameter.java
Author: jgbutler
Date: Tue Apr 13 21:22:04 2010
New Revision: 933783
URL: http://svn.apache.org/viewvc?rev=933783view=rev
Log:
Fix for IBATIS-777 - Dynamic context should not call every setter
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java
ibatis/java/ibatis-3/trunk/src/test/java/org/apache/ibatis/submitted/dynsql/Parameter.java
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java?rev=933783r1=933782r2=933783view=diff
==
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java
Tue Apr 13 21:22:04 2010
@@ -17,17 +17,16 @@ public class DynamicContext {
OgnlRuntime.setPropertyAccessor(ContextMap.class, new ContextAccessor());
}
- private final ContextMap bindings = new ContextMap();
+ private final ContextMap bindings;
private final StringBuilder sqlBuilder = new StringBuilder();
private int uniqueNumber = 0;
public DynamicContext(Configuration configuration, Object parameterObject) {
if (parameterObject != null !(parameterObject instanceof Map)) {
MetaObject metaObject = configuration.newMetaObject(parameterObject);
- String[] names = metaObject.getGetterNames();
- for (String name : names) {
-bindings.put(name, metaObject.getValue(name));
- }
+ bindings = new ContextMap(metaObject);
+} else {
+ bindings = new ContextMap(null);
}
bindings.put(PARAMETER_OBJECT_KEY, parameterObject);
}
@@ -54,6 +53,28 @@ public class DynamicContext {
}
static class ContextMap extends HashMapString, Object {
+private MetaObject parameterMetaObject;
+public ContextMap(MetaObject parameterMetaObject) {
+ this.parameterMetaObject = parameterMetaObject;
+}
+
+@Override
+public Object get(Object key) {
+ if (super.containsKey(key)) {
+return super.get(key);
+ }
+
+ if (parameterMetaObject != null) {
+Object object = parameterMetaObject.getValue(key.toString());
+if (object != null) {
+ super.put(key.toString(), object);
+}
+
+return object;
+ }
+
+ return null;
+}
}
static class ContextAccessor implements PropertyAccessor {
@@ -81,5 +102,4 @@ public class DynamicContext {
map.put(name, value);
}
}
-
}
Modified:
ibatis/java/ibatis-3/trunk/src/test/java/org/apache/ibatis/submitted/dynsql/Parameter.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/test/java/org/apache/ibatis/submitted/dynsql/Parameter.java?rev=933783r1=933782r2=933783view=diff
==
---
ibatis/java/ibatis-3/trunk/src/test/java/org/apache/ibatis/submitted/dynsql/Parameter.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/test/java/org/apache/ibatis/submitted/dynsql/Parameter.java
Tue Apr 13 21:22:04 2010
@@ -25,6 +25,12 @@ public class Parameter {
private String schema;
private ListInteger ids;
private boolean enabled;
+
+ public String getFred() {
+// added this method to check for bug with DynamicContext
+// IBATIS-777
+throw new RuntimeException(This method should not be called.);
+ }
public String getSchema() {
return schema;
svn commit: r933789 - /ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/dom/xml/Document.java
Author: jgbutler
Date: Tue Apr 13 21:36:27 2010
New Revision: 933789
URL: http://svn.apache.org/viewvc?rev=933789view=rev
Log:
[Ibator] Support XML with no doctype
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/dom/xml/Document.java
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/dom/xml/Document.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/dom/xml/Document.java?rev=933789r1=933788r2=933789view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/dom/xml/Document.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/dom/xml/Document.java
Tue Apr 13 21:36:27 2010
@@ -36,6 +36,10 @@ public class Document {
this.systemId = systemId;
}
+public Document() {
+super();
+}
+
/**
* @return Returns the rootElement.
*/
@@ -70,14 +74,16 @@ public class Document {
sb.append(?xml version=\1.0\ encoding=\UTF-8\ ?); //$NON-NLS-1$
-OutputUtilities.newLine(sb);
-sb.append(!DOCTYPE ); //$NON-NLS-1$
-sb.append(rootElement.getName());
-sb.append( PUBLIC \); //$NON-NLS-1$
-sb.append(publicId);
-sb.append(\ \); //$NON-NLS-1$
-sb.append(systemId);
-sb.append(\ ); //$NON-NLS-1$
+if (publicId != null systemId != null) {
+OutputUtilities.newLine(sb);
+sb.append(!DOCTYPE ); //$NON-NLS-1$
+sb.append(rootElement.getName());
+sb.append( PUBLIC \); //$NON-NLS-1$
+sb.append(publicId);
+sb.append(\ \); //$NON-NLS-1$
+sb.append(systemId);
+sb.append(\ ); //$NON-NLS-1$
+}
OutputUtilities.newLine(sb);
sb.append(rootElement.getFormattedContent(0));
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: r922958 - in /ibatis/java/ibator/trunk/core: ibator-core/doc/releasing.txt ibator-systests-ibatis2-java2/pom.xml ibator-systests-ibatis2-java5/pom.xml ibator-systests-ibatis3/pom.xml
Author: jgbutler Date: Sun Mar 14 21:01:50 2010 New Revision: 922958 URL: http://svn.apache.org/viewvc?rev=922958view=rev Log: [ibator] build updates Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/releasing.txt ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/pom.xml ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/releasing.txt URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/releasing.txt?rev=922958r1=922957r2=922958view=diff == --- ibatis/java/ibator/trunk/core/ibator-core/doc/releasing.txt (original) +++ ibatis/java/ibator/trunk/core/ibator-core/doc/releasing.txt Sun Mar 14 21:01:50 2010 @@ -1,38 +1,53 @@ -Releasing Ibator: +Releasing Ibator + -1. Increment the version number in the POMs +Core Release Process + -2. Build and test the base Ibator with Maven +This process is similar to what is show at http://maven.apache.org/developers/release/apache-release.html +except that Ibator is not using the nexus repository manager, so the deployment +steps are different (and we are not publishing snapshot versions). -3. Build the new version of the Eclipse feature: - - Copy new ibator-core-x.x.x.jar and ibator-core-x.x.x-sources.jar into the core plugin +1. mvn release:prepare -DdryRun=true + + Make sure the new POMs look OK (pom.xml.next and pom.xml.tag) + +2. mvn release:clean + +3. mvn release:prepare -Dusername=xxx -Dpassword=xxx + +4. mvn deploy -DaltDeploymentRepository=local::default::file:/temp/IbatorDeploy + +5. scp the new artifacts to /www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/ibatis/ibator/etc. + + +Eclipse Release Process +=== + +1. Build the new version of the Eclipse feature: - Increment the version number of the feature - Increment the version number of any plugin that has changed - - Build the doc + - Run the build.xml script in the build project (creates a new feature version +at \temp\ibator.build\etc.) + - Add the new feature and plugin jars to the IbatorUpdateSite project - Add the new version of the feature to site.xml in the IbatorUpdateSite -project - - Build the update site (just the new version, not build all) - - Delete the files artifacts.xml and content.xml generated by the -site builder (these files do not properly categorize the features. -See Eclipse bug 227675 for a possible solution in release 3.5) - - Do SVN Revert on any old plugin versions that were regenerated by the -site build process +project (manually) -4. Run through the manual test scripts for the Eclipse feature +2. Run through the manual test scripts for the Eclipse feature -5. Zip the contents of the update site (remove project metadata) +3. Zip the contents of the update site (remove project metadata) -6. Commit everything +4. Commit everything -7. Make an SVN label +5. Make an SVN label -8. Run mvn assembly:assembly on the ibator-core project to create the base zip file. Put the +6. Run mvn assembly:assembly on the ibator-core project to create the base zip file. Put the new base Ibator zip file in /www/people.apache.org/builds/ibatis/alpha -9. Put the new zipped eclipse site in /www/people.apache.org/builds/ibatis/alpha +7. Put the new zipped eclipse site in /www/people.apache.org/builds/ibatis/alpha -10. Copy the new versions of ibator-core and ibator-maven-plugin from the local maven repo -to the Apache repo at ??? +9. Copy the new versions of ibator-core and ibator-maven-plugin from the local maven repo + to the Apache repo at ??? 10. Update /www/ibatis.apache.org/doc/tools/ibator from SVN (this updates the documentation) @@ -43,3 +58,4 @@ Releasing Ibator: 13. Update the iBATIS web site 14. Send out the announcement to dev@ and user@ + Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml?rev=922958r1=922957r2=922958view=diff == --- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml (original) +++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml Sun Mar 14 21:01:50 2010 @@ -23,6 +23,20 @@ /configuration /plugin plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-source-plugin/artifactId + version2.1/version +executions + execution +idattach-sources/id +phaseverify/phase +goals + goaljar-no-fork/goal +/goals + /execution +/executions + /plugin
svn commit: r922966 - in /ibatis/java/ibator/trunk/core: ibator-core/pom.xml ibator-maven-plugin/pom.xml ibator-systests-ibatis2-java2/pom.xml ibator-systests-ibatis2-java5/pom.xml ibator-systests-iba
Author: jgbutler Date: Sun Mar 14 21:29:23 2010 New Revision: 922966 URL: http://svn.apache.org/viewvc?rev=922966view=rev Log: [maven-release-plugin] rollback the release of ibator-1.2.2 Modified: ibatis/java/ibator/trunk/core/ibator-core/pom.xml ibatis/java/ibator/trunk/core/ibator-maven-plugin/pom.xml ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/pom.xml ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml Modified: ibatis/java/ibator/trunk/core/ibator-core/pom.xml URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/pom.xml?rev=922966r1=922965r2=922966view=diff == --- ibatis/java/ibator/trunk/core/ibator-core/pom.xml (original) +++ ibatis/java/ibator/trunk/core/ibator-core/pom.xml Sun Mar 14 21:29:23 2010 @@ -49,6 +49,7 @@ /archive /configuration /plugin +!-- plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-source-plugin/artifactId @@ -63,6 +64,7 @@ /execution /executions /plugin +-- plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-assembly-plugin/artifactId 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=922966r1=922965r2=922966view=diff == --- ibatis/java/ibator/trunk/core/ibator-maven-plugin/pom.xml (original) +++ ibatis/java/ibator/trunk/core/ibator-maven-plugin/pom.xml Sun Mar 14 21:29:23 2010 @@ -22,20 +22,6 @@ target1.5/target /configuration /plugin - plugin - groupIdorg.apache.maven.plugins/groupId - artifactIdmaven-source-plugin/artifactId - version2.1/version -executions - execution -idattach-sources/id -phaseverify/phase -goals - goaljar-no-fork/goal -/goals - /execution -/executions - /plugin /plugins /build dependencies Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml?rev=922966r1=922965r2=922966view=diff == --- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml (original) +++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml Sun Mar 14 21:29:23 2010 @@ -23,20 +23,6 @@ /configuration /plugin plugin - groupIdorg.apache.maven.plugins/groupId - artifactIdmaven-source-plugin/artifactId - version2.1/version -executions - execution -idattach-sources/id -phaseverify/phase -goals - goaljar-no-fork/goal -/goals - /execution -/executions - /plugin - plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-surefire-plugin/artifactId version2.4.3/version Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/pom.xml URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/pom.xml?rev=922966r1=922965r2=922966view=diff == --- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/pom.xml (original) +++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/pom.xml Sun Mar 14 21:29:23 2010 @@ -23,20 +23,6 @@ /configuration /plugin plugin - groupIdorg.apache.maven.plugins/groupId - artifactIdmaven-source-plugin/artifactId - version2.1/version -executions - execution -idattach-sources/id -phaseverify/phase -goals - goaljar-no-fork/goal -/goals - /execution -/executions - /plugin - plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-surefire-plugin/artifactId version2.4.3/version Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml?rev=922966r1=922965r2=922966view=diff == --- ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml (original) +++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml Sun Mar 14 21:29:23 2010 @@ -23,20 +23,6 @@ /configuration /plugin plugin - groupIdorg.apache.maven.plugins/groupId
svn commit: r923041 - /ibatis/java/ibator/tags/ibator-1.2.2/
Author: jgbutler Date: Mon Mar 15 03:04:20 2010 New Revision: 923041 URL: http://svn.apache.org/viewvc?rev=923041view=rev Log: Rollback release - not quite ready! Removed: ibatis/java/ibator/tags/ibator-1.2.2/
svn commit: r922723 - in /ibatis/java/ibator/trunk: core/ core/ibator-core/ core/ibator-core/doc/html/ core/ibator-core/doc/html/generatedobjects/ core/ibator-maven-plugin/ core/ibator-systests-ibatis
Author: jgbutler
Date: Sun Mar 14 02:15:08 2010
New Revision: 922723
URL: http://svn.apache.org/viewvc?rev=922723view=rev
Log:
[Ibator] more ducomentation and build updates
Modified:
ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/exampleClassUsage.html
ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/extendingExampleClass.html
ibatis/java/ibator/trunk/core/ibator-core/doc/html/whatsNew.html
ibatis/java/ibator/trunk/core/ibator-core/pom.xml
ibatis/java/ibator/trunk/core/ibator-maven-plugin/pom.xml
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/pom.xml
ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml
ibatis/java/ibator/trunk/core/pom.xml
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.properties
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html
Modified:
ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/exampleClassUsage.html
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/exampleClassUsage.html?rev=922723r1=922722r2=922723view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/exampleClassUsage.html
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/exampleClassUsage.html
Sun Mar 14 02:15:08 2010
@@ -99,6 +99,10 @@ example class (using JSE 5.0 parameteriz
/pre
pReturned records will meet these criteria./p
+h2Distinct Queries/h2
+pYou can force queries to be DISTINCT by calling the
codesetDistinct(true)/code
+method on any example class./p
+
h2Criteria Classes/h2
pThe codeCriteria/code inner class includes codeandXXX/code methods
for each field,
and each standard SQL predicate including:/p
Modified:
ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/extendingExampleClass.html
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/extendingExampleClass.html?rev=922723r1=922722r2=922723view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/extendingExampleClass.html
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/extendingExampleClass.html
Sun Mar 14 02:15:08 2010
@@ -32,43 +32,16 @@ specific needs of your application. Thi
predicates, or for using database specific functions in your where clauses./p
pThe generated example class includes a nested inner class where the actual
-functionality of the predicates exists. This inner class is always named
codeCriteria/code.
-If you wish to add predicates to dynamic where clauses, you must extend
-both the example class and the codeCriteria/code class. For example,
suppose there is a
+functionality of the predicates exists. This inner class is always named
codeGeneratedCriteria/code.
+Ibator also generates an inner class named codeCriteria/code which extends
+codeGeneratedCriteria/code and which you may
+use for adding your own functions to the example classes. The
codeCriteria/code
+class will not be deleted by the Eclipse Java code merger, so you may add to
it without
+fear of losing your changes upon regeneration./p
+pFor example, suppose there is a
table called CUSTOMER. Typically, Ibator would generate a class named
-codeCustomerExample/code. To add functionality to the
codeCustomerExample/code class, you must
-follow these steps:/p
-ul
- liExtend the codeCustomerExample/code class/li
- liExtend the nested codeCustomerExample$Criteria/code class/li
- liOverride the codecreateCriteriaInternal()/code method of the
- codeCustomerExample/code class so that the extended Criteria
- class is created/li
- liAdd functionality to the extended Criteria class/li
-/ul
-
-pThe following code fragment shows the basic requirements of an extended
-example class:/p
-pre
-import ibatortest.generated.CustomerExample;
-
-public class ExtendedCustomerExample extends CustomerExample {
-
- @Override
- protected Criteria createCriteriaInternal() {
-return new ExtendedCriteria();
- }
-
- public static class ExtendedCriteria extends CustomerExample.Criteria {
-
-// add additional predicate support here...
-
- }
-}
-/pre
-
-pOnce the basic class is created, adding additional predicates is a matter
-of adding additional methods to the extended codeCriteria/code class./p
+codeCustomerExample/code. To add functionality to the
codeCustomerExample/code class, you
+should add additional methods to the codeCustomerExample.Criteria/code
class./p
h2Extending vs. Plugging In/h2
pIf you find that you are extending the example classes frequently, it might
svn commit: r922480 - in /ibatis/java/ibator/trunk: core/ core/ibator-core/ core/ibator-core/doc/ core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/ core/ibator-core/src/main/java/org/apache
Author: jgbutler Date: Sat Mar 13 04:06:16 2010 New Revision: 922480 URL: http://svn.apache.org/viewvc?rev=922480view=rev Log: [Ibator] many updates to build and documentation Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt ibatis/java/ibator/trunk/core/ibator-core/pom.xml ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/CommentGenerator.java ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/DefaultCommentGenerator.java ibatis/java/ibator/trunk/core/ibator-maven-plugin/pom.xml ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/pom.xml ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml ibatis/java/ibator/trunk/core/pom.xml ibatis/java/ibator/trunk/eclipse/IbatorUpdateSite/site.xml ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.properties ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.xml ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/META-INF/MANIFEST.MF ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/ExistingJavaFileVisitor.java ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/JavaFileMerger.java ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/META-INF/MANIFEST.MF ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/importWizard.gif ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/META-INF/MANIFEST.MF ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator/feature.xml 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=922480r1=922479r2=922480view=diff == --- ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt (original) +++ ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt Sat Mar 13 04:06:16 2010 @@ -43,6 +43,7 @@ Enhancements: 18. Addedd support for distinct on select by example methods 19. Added new or method to example classes 20. Added new useCompoundPropertyNames property on table +21. Further improved extensibility of the example classes --- Modified: ibatis/java/ibator/trunk/core/ibator-core/pom.xml URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/pom.xml?rev=922480r1=922479r2=922480view=diff == --- ibatis/java/ibator/trunk/core/ibator-core/pom.xml (original) +++ ibatis/java/ibator/trunk/core/ibator-core/pom.xml Sat Mar 13 04:06:16 2010 @@ -1,10 +1,15 @@ 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; modelVersion4.0.0/modelVersion - groupIdorg.apache.ibatis.ibator/groupId + + parent +groupIdorg.apache.ibatis.ibator/groupId +artifactIdibator/artifactId +version1.2.2-SNAPSHOT/version + /parent + artifactIdibator-core/artifactId packagingjar/packaging - version1.2.2-SNAPSHOT/version nameApache iBATIS Ibator/name urlhttp://ibatis.apache.org/ibator.html/url @@ -58,7 +63,6 @@ /execution /executions /plugin - plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-assembly-plugin/artifactId @@ -69,7 +73,6 @@ /descriptors /configuration /plugin - /plugins /build @@ -126,4 +129,5 @@ scopetest/scope /dependency /dependencies + /project Modified: ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/CommentGenerator.java URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/CommentGenerator.java?rev=922480r1=922479r2=922480view=diff == --- ibatis/java/ibator/trunk/core/ibator-core/src
svn commit: r921590 - in /ibatis/java/ibator/trunk/core/ibator-core: doc/html/configreference/ src/main/java/org/apache/ibatis/ibator/api/dom/java/ src/main/java/org/apache/ibatis/ibator/generator/iba
Author: jgbutler
Date: Wed Mar 10 22:08:34 2010
New Revision: 921590
URL: http://svn.apache.org/viewvc?rev=921590view=rev
Log:
[ibator] further improvements to the example class for extensibility
Modified:
ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/properties.html
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaType.java
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/dom/java/InnerClass.java
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java
ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/IbatisGenerationTest.java
Modified:
ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/properties.html
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/properties.html?rev=921590r1=921589r2=921590view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/properties.html
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/properties.html
Wed Mar 10 22:08:34 2010
@@ -46,7 +46,7 @@ element./p
td valign=topurl/td
tdA URL value to use for the property file. This can be used to specify
a property
file in a specific place on the file system when used in a form like
-codefile://C:/myfolder/ibatorConfig.properties/code./td
+codefile:///C:/myfolder/ibatorConfig.properties/code./td
/tr
/table
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaType.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaType.java?rev=921590r1=921589r2=921590view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaType.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaType.java
Wed Mar 10 22:08:34 2010
@@ -32,6 +32,7 @@ public class FullyQualifiedJavaType impl
private static FullyQualifiedJavaType objectInstance = null;
private static FullyQualifiedJavaType dateInstance = null;
private static FullyQualifiedJavaType criteriaInstance = null;
+private static FullyQualifiedJavaType generatedCriteriaInstance = null;
/**
* The short name without any generic arguments
@@ -307,6 +308,14 @@ public class FullyQualifiedJavaType impl
return criteriaInstance;
}
+public static final FullyQualifiedJavaType getGeneratedCriteriaInstance() {
+if (generatedCriteriaInstance == null) {
+generatedCriteriaInstance = new
FullyQualifiedJavaType(GeneratedCriteria); //$NON-NLS-1$
+}
+
+return generatedCriteriaInstance;
+}
+
/* (non-Javadoc)
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/dom/java/InnerClass.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/dom/java/InnerClass.java?rev=921590r1=921589r2=921590view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/dom/java/InnerClass.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/dom/java/InnerClass.java
Wed Mar 10 22:08:34 2010
@@ -44,6 +44,8 @@ public class InnerClass extends JavaElem
private ListMethod methods;
+private boolean isAbstract;
+
/**
*
*/
@@ -118,6 +120,10 @@ public class InnerClass extends JavaElem
OutputUtilities.javaIndent(sb, indentLevel);
sb.append(getVisibility().getValue());
+if (isAbstract()) {
+sb.append(abstract ); //$NON-NLS-1$
+}
+
if (isStatic()) {
sb.append(static ); //$NON-NLS-1$
}
@@ -239,4 +245,12 @@ public class InnerClass extends JavaElem
public FullyQualifiedJavaType getType() {
return type;
}
+
+public boolean isAbstract() {
+return isAbstract;
+}
+
+public void setAbstract(boolean isAbtract) {
+this.isAbstract = isAbtract;
+}
}
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache
svn commit: r920579 - in /ibatis/java/ibator/trunk/eclipse: org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/ org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/actions
Author: jgbutler
Date: Mon Mar 8 23:58:51 2010
New Revision: 920579
URL: http://svn.apache.org/viewvc?rev=920579view=rev
Log:
[Ibator] Improve eclipse classloading
Modified:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/releasenotes.html
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/actions/RunIbatorAction.java
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/actions/RunIbatorThread.java
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/content/IbatorConfigurationFileAdapter.java
Modified:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/releasenotes.html
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/releasenotes.html?rev=920579r1=920578r2=920579view=diff
==
---
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/releasenotes.html
(original)
+++
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/releasenotes.html
Mon Mar 8 23:58:51 2010
@@ -13,6 +13,14 @@
liUpgraded to Ibator Version 1.2.2/li
liFixed divide by zero error when there are no tables that match
the configuration/li
+ liChanged build process to use PDE Headless build. The Ibator feature now
includes source bundles
+ for all plugins! Also, the feature is now well behaved according to
Eclipse
+ standards (no bundle is unpack upon install)./li
+ liEnhanced the classloading strategy for generating iBATIS artifacts from
the popup menu.
+ Ibator will now find resources and JAR files in project where the
configuration file
+ lives if that project is a Java project./li
+ liChanged classpath variable IBATOR_JAR to IBATOR_HOME/li
+ liChanged classpath variable IBATOR_JAR_SRC to IBATOR_SRC_HOME/li
/ul
h2Version 1.2.1/h2
Modified:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/actions/RunIbatorAction.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/actions/RunIbatorAction.java?rev=920579r1=920578r2=920579view=diff
==
---
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/actions/RunIbatorAction.java
(original)
+++
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/actions/RunIbatorAction.java
Mon Mar 8 23:58:51 2010
@@ -74,7 +74,7 @@
}
ErrorDialog.openError(shell, Ibator for iBATIS,
-Run Complete With Warninigs, ms, Status.WARNING);
+Run Complete With Warnings, ms, Status.WARNING);
}
} catch (Exception e) {
handleException(e, shell);
@@ -131,8 +131,7 @@
public void run(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException {
try {
-RunIbatorThread thread = new RunIbatorThread(selectedFile
-.getLocation().toFile(), warnings);
+RunIbatorThread thread = new RunIbatorThread(selectedFile,
warnings);
ResourcesPlugin.getWorkspace().run(thread, monitor);
} catch (CoreException e) {
Modified:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/actions/RunIbatorThread.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/actions/RunIbatorThread.java?rev=920579r1=920578r2=920579view=diff
==
---
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/actions/RunIbatorThread.java
(original)
+++
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/actions/RunIbatorThread.java
Mon Mar 8 23:58:51 2010
@@ -15,9 +15,11 @@
*/
package org.apache.ibatis.ibator.eclipse.ui.actions;
-import java.io.File;
import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.sql.SQLException;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -29,28 +31,37 @@
import org.apache.ibatis.ibator.eclipse.ui.IbatorUIPlugin;
import org.apache.ibatis.ibator.exception.InvalidConfigurationException
svn commit: r919542 - /ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html
Author: jgbutler Date: Fri Mar 5 18:59:38 2010 New Revision: 919542 URL: http://svn.apache.org/viewvc?rev=919542view=rev Log: [ibator] doc update Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html?rev=919542r1=919541r2=919542view=diff == --- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html (original) +++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html Fri Mar 5 18:59:38 2010 @@ -3,6 +3,7 @@ html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en head + meta http-equiv=Content-Type content=text/html / titleIbator Feature Debug Reference/title link type=text/css rel=stylesheet href=../ibatordoc/ibator.css/ /head @@ -77,6 +78,9 @@ libImportant:/b create a path variable named IBATOR_SOURCE that points to the code.../core/ibator-core/src/code folder in the source tree from SVN (Windowgt;Preferencesgt;Generalgt;Workspacegt;Linked Resources)/li + libImportant:/b the core Ibator project requires log4j to compile. Some eclipse +distributions do not include log4j. You can get it by adding the WTP XSL Developer Tools from +eclipse (HelpInstall New Software, etc.)/li liImport the plug-in projects into the workspace ol type=a liStart the Eclipse project import wizard
svn commit: r917330 - in /ibatis/java/ibator/trunk/core: ibator-core/doc/ ibator-core/doc/html/ ibator-core/doc/html/reference/ ibator-core/doc/html/running/ ibator-core/src/main/java/org/apache/ibati
Author: jgbutler Date: Sun Feb 28 23:55:42 2010 New Revision: 917330 URL: http://svn.apache.org/viewvc?rev=917330view=rev Log: [Ibator] More doc updates and some maven plugin enhancements Removed: ibatis/java/ibator/trunk/core/ibator-core/doc/html/reference/attributes.html Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/html/menu.html ibatis/java/ibator/trunk/core/ibator-core/doc/html/reference/pluggingIn.html ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithMaven.html ibatis/java/ibator/trunk/core/ibator-core/doc/todo.txt ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaType.java ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/Ibatis3FormattingUtilities.java ibatis/java/ibator/trunk/core/ibator-maven-plugin/src/main/java/org/apache/ibatis/ibator/maven/IbatorMojo.java Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/html/menu.html URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/menu.html?rev=917330r1=917329r2=917330view=diff == --- ibatis/java/ibator/trunk/core/ibator-core/doc/html/menu.html (original) +++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/menu.html Sun Feb 28 23:55:42 2010 @@ -56,7 +56,6 @@ nbsp;nbsp;a href=reference/building.html target=mainFrameBuilding Ibator from Source/abr/ nbsp;nbsp;a href=reference/extending.html target=mainFrameExtending Ibator/abr/ nbsp;nbsp;a href=reference/pluggingIn.html target=mainFrameImplementing Ibator Plugins/abr/ - nbsp;nbsp;a href=reference/attributes.html target=mainFrameIntrospected Table Attributes/abr/ nbsp;nbsp;a href=reference/logging.html target=mainFrameLogging Information/abr/ a href=philosophy.html target=mainFrameDesign Philosophy/abr/ a href=license.html target=mainFrameLicensing Information/abr/ Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/html/reference/pluggingIn.html URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/reference/pluggingIn.html?rev=917330r1=917329r2=917330view=diff == --- ibatis/java/ibator/trunk/core/ibator-core/doc/html/reference/pluggingIn.html (original) +++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/reference/pluggingIn.html Sun Feb 28 23:55:42 2010 @@ -30,7 +30,7 @@ different types of tasks that can be accomplished with Ibator plugins. Source code for the plugins is available with the Ibator downloads, or can be viewed online -a target=_blank href=http://svn.apache.org/repos/asf/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/; +a target=_blank href=http://svn.apache.org/repos/asf/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/plugins/; here/a./p h2Plugin Lifecycle/h2 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=917330r1=917329r2=917330view=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 23:55:42 2010 @@ -43,9 +43,226 @@ pOf course, things are never that easy! /p +h2Maven Goal and Execution/h2 +pThe Ibator Maven plugin includes one goal:/p +ul + licodeibator:generate/code/li +/ul +pThe goal is not automatically executed by Maven. It can be executed in two +ways./p +pThe goal can be executed from the command line with the command:/p +ul + licodemvn ibator:generate/code/li +/ul +pYou can pass parameters to the goal with standard Maven command line properties. +For example:/p +ul + licodemvn -Dibator.overwrite=true ibator:generate/code/li +/ul +pThis will run Ibator and instruct Ibator to overwrite any existing Java files +it may find./p +pIn a continuous build environment, you may want to automatically execute +Ibator as a part of a Maven build. This can be accomplished by configuring +the goal to execute automatically. An example of this is shown below:/p +pre + lt;project ...gt; + ... + lt;buildgt; + ... + lt;pluginsgt; +... +lt;plugingt; + lt;groupIdgt;org.apache.ibatis.ibatorlt;/groupIdgt; + lt;artifactIdgt;ibator-maven-pluginlt;/artifactIdgt; + lt;versiongt;1.2.2lt;/versiongt; + lt;executionsgt; +lt;executiongt; + lt;idGenerate iBATIS Artifactslt;/idgt; + lt;goalsgt; +lt;goalgeneratelt;/goalgt; + lt;/goalsgt; +lt;/executiongt
svn commit: r917079 - in /ibatis/java/ibator/trunk: core/ core/ibator-core/doc/ core/ibator-core/doc/html/ core/ibator-core/doc/html/configreference/ core/ibator-core/doc/html/generatedobjects/ core/i
Author: jgbutler Date: Sat Feb 27 23:16:13 2010 New Revision: 917079 URL: http://svn.apache.org/viewvc?rev=917079view=rev Log: [Ibator] documentation updates Added: ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/ ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/running.html ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningFromCmdLine.html ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithAnt.html ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithJava.html ibatis/java/ibator/trunk/core/ibator-core/doc/html/running/runningWithMaven.html Removed: ibatis/java/ibator/trunk/core/ibator-core/doc/html/running.html Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt ibatis/java/ibator/trunk/core/ibator-core/doc/html/afterRunning.html ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/daoGenerator.html ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/ibatorContext.html ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/ibatorPlugin.html ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/table.html ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/exampleClassUsage.html ibatis/java/ibator/trunk/core/ibator-core/doc/html/generatedobjects/javadao.html ibatis/java/ibator/trunk/core/ibator-core/doc/html/intro.html ibatis/java/ibator/trunk/core/ibator-core/doc/html/menu.html 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/config/PropertyRegistry.java ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml ibatis/java/ibator/trunk/core/pom.xml ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/manualTesting.html ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/toc_ibatordoc.xml 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=917079r1=917078r2=917079view=diff == --- ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt (original) +++ ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt Sat Feb 27 23:16:13 2010 @@ -42,7 +42,7 @@ 17. Added ability to set annotations on method parameters 18. Addedd support for distinct on select by example methods 19. Added new or method to example classes -20. Added new useCompoundColumnNames property on table +20. Added new useCompoundPropertyNames property on table --- Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/html/afterRunning.html URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/afterRunning.html?rev=917079r1=917078r2=917079view=diff == --- ibatis/java/ibator/trunk/core/ibator-core/doc/html/afterRunning.html (original) +++ ibatis/java/ibator/trunk/core/ibator-core/doc/html/afterRunning.html Sat Feb 27 23:16:13 2010 @@ -19,14 +19,79 @@ pAfter you run Ibator, you will need to create or modify other iBATIS configuration artifacts. The main tasks are as follows:/p ul - liCreate or Modify the SqlMapConfig.xml file/li - liCreate or modify the dao.xml file (only if using the iBATIS DAO Framework)/li + liFor iBATIS 3.x: +ul + liCreate or Modify the MapperConfig.xml file/li +/ul + /li + liFor iBATIS 2.x: +ul + liCreate or Modify the SqlMapConfig.xml file/li + liCreate or modify the dao.xml file (only if using the iBATIS DAO Framework)/li +/ul + /li /ul pEach task is described in detail below./p -h2Updating the SqlMapConfig.xml File/h2 -piBATIS uses an XML file, commonly named codeSqlMapConfig.xml/code, +h2Updating the MapperConfig.xml File (iBATIS 3.x)/h2 +piBATIS 3 uses an XML file, commonly named codeMapperConfig.xml/code, +to specify +information for a database connection, a transaction management scheme, and XML mapper +files that will be used in an iBATIS session. Ibator cannot create this file for you +because Ibator knows nothing about your execution environment. However, some of the +items in this file relate directly to Ibator generated items. Please refer to +the standard iBATIS data mapper developer guide for details about the different +configuration options./p + +pIbator specific needs in the configuration file are as follows:/p +ul + liIbator generated XML mapper files must be listed/li +/ul + +pFor example, suppose that Ibator
svn commit: r917111 - in /ibatis/java/ibator/trunk/core: ibator-core/doc/html/running/ ibator-core/src/main/java/org/apache/ibatis/ibator/api/ ibator-core/src/main/java/org/apache/ibatis/ibator/genera
Author: jgbutler
Date: Sun Feb 28 03:36:51 2010
New Revision: 917111
URL: http://svn.apache.org/viewvc?rev=917111view=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=917111r1=917110r2=917111view=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 @@
codetargetPackage/code attributes in all XML configurations as
follows:/p
ul
licodetargetProject/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 codetargetProject/code is interpreted in
Maven./li
licodetargetPackage/code will be translated to a suitable subdirectory
structure of the codetargetProject/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=917111r1=917110r2=917111view=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 @@
pOf course, things are never that easy! /p
+h2Interpretation of targetProject/h2
+pThe codetargetProject/code attribute of the generator configurations is
interpreted
+somewhat differently when running with Maven. If set to the special value
MAVEN (case
+sensitive), then codetargetProject/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
+codetargetProject/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=917111r1=917110r2=917111view=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
svn commit: r916479 - in /ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build: ./ build.xml
Author: jgbutler
Date: Thu Feb 25 22:45:38 2010
New Revision: 916479
URL: http://svn.apache.org/viewvc?rev=916479view=rev
Log:
[Ibator] Build Updates
Modified:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/ (props
changed)
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.xml
Propchange: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/
--
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 22:45:38 2010
@@ -0,0 +1 @@
+devBuildCallbacks.xml
Modified:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.xml?rev=916479r1=916478r2=916479view=diff
==
--- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.xml
(original)
+++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.xml
Thu Feb 25 22:45:38 2010
@@ -1,7 +1,10 @@
project name=org.apache.ibatis.ibator.build default=build
property file=build.properties /
+ property name=callbacks.file value=devBuildCallbacks.xml /
target name=init
+ available file=${callbacks.file}
property=callbacks.enabled/
+
!-- First, regenerate the documentation --
ant
antfile=../org.apache.ibatis.ibator.eclipse.doc/buildDoc.xml
dir=../org.apache.ibatis.ibator.eclipse.doc /
@@ -54,19 +57,11 @@
delete dir=${buildDirectory} /
/target
- target name=build depends=clean, init, pde-build /
-
- target name=jeffDev
- delete dir=C:/JavaTools/eclipse failonerror=false/
- delete dir=C:/EclipseWorkspaces/IbatorTest
failonerror=false/
- mkdir dir=C:/EclipseWorkspaces/IbatorTest/
- unzip dest=C:/Apache/Ibator/eclipse/IbatorUpdateSite
-
src=C:/Temp/ibator.build/I.TestBuild/org.apache.ibatis.ibator-TestBuild.zip
- overwrite=true /
- unzip dest=C:/JavaTools
- src=C:/Downloads/Eclipse/eclipse-SDK-3.5.1-win32.zip
/
+ target name=postBuildDevCallback if=callbacks.enabled
+ subant antfile=${callbacks.file} failonerror=false
buildpath=. target=post.build
+ /subant
/target
- target name=buildInDev depends=build, jeffDev /
+ target name=build depends=clean, init, pde-build,
postBuildDevCallback /
/project
svn commit: r916007 - in /ibatis/java/ibator/trunk/eclipse: org.apache.ibatis.ibator.build/ org.apache.ibatis.ibator.core/ org.apache.ibatis.ibator.eclipse.core/META-INF/ org.apache.ibatis.ibator.ecli
Author: jgbutler
Date: Wed Feb 24 22:28:06 2010
New Revision: 916007
URL: http://svn.apache.org/viewvc?rev=916007view=rev
Log:
[Ibator] More Eclipse Build Improvements
Added:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/customBuildCallbacks.xml
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator/sourceTemplateFeature/
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator/sourceTemplateFeature/LICENSE
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator/sourceTemplateFeature/NOTICE
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator/sourceTemplateFeature/feature.properties
Modified:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.properties
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.xml
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/build.properties
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/META-INF/MANIFEST.MF
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/buildDoc.xml
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/META-INF/MANIFEST.MF
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/plugin.xml
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/IbatorClasspathVariableInitializer.java
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/actions/AddIbatorAction.java
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/content/AdapterFactory.java
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator/build.properties
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator/feature.xml
Modified:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.properties
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.properties?rev=916007r1=916006r2=916007view=diff
==
---
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.properties
(original)
+++
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.properties
Wed Feb 24 22:28:06 2010
@@ -36,7 +36,7 @@
#archiveNamePrefix=
# The prefix that will be used in the generated archive.
-archivePrefix=eclipse
+archivePrefix=
# The location underwhich all of the build output will be collected.
collectingFolder=${archivePrefix}
Modified:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.xml?rev=916007r1=916006r2=916007view=diff
==
--- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.xml
(original)
+++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.xml
Wed Feb 24 22:28:06 2010
@@ -1,36 +1,11 @@
-!--
- This program and the accompanying materials are made available
- under the terms of the Eclipse Public License v1.0 which
- accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- This build script creates a build directory containing the plugins
- and features to be built, and then kicks off the PDE build process.
- You could just as easily do this from a shell script or cron job.
-
- Also, the script can be run inside the Eclipse IDE by choosing
- Run As - Ant Build from the context menu. It could obviously be
- run outside of the IDE if you have ANT installed on your path.
-
- If you have any questions about this build, feel free to contact me
- at patr...@rcpquickstart.com.
---
project name=org.apache.ibatis.ibator.build default=build
property file=build.properties /
- !--
- PDE Build expects that the build directory contains a plugins
- directory and a features directory. These directories should
contain
- the various plug-ins and features to be built.
-
- It's possible to use the CVS checkout process that is built
into
- PDE Build. This is done with map files and is beyond the scope
of
- this tutorial.
-
- This tutorial simply copies the projects directly from your
workspace
- into the appropriate build directory folders.
- --
target name=init
+ !-- First, regenerate the documentation --
+ ant
antfile=../org.apache.ibatis.ibator.eclipse.doc/buildDoc.xml
+ dir=../org.apache.ibatis.ibator.eclipse.doc
svn commit: r915109 - in /ibatis/java/ibator/trunk/eclipse: org.apache.ibatis.ibator.core/build.properties org.apache.ibatis.ibator.eclipse.core/build.properties org.apache.ibatis.ibator.eclipse.ui/bu
Author: jgbutler Date: Mon Feb 22 23:17:43 2010 New Revision: 915109 URL: http://svn.apache.org/viewvc?rev=915109view=rev Log: [Ibator] Improvements to Eclipse Build Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/build.properties ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/build.properties ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/build.properties Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/build.properties URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/build.properties?rev=915109r1=915108r2=915109view=diff == --- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/build.properties (original) +++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/build.properties Mon Feb 22 23:17:43 2010 @@ -1,12 +1,10 @@ -source.. = src/main/java, src/main/resources +source.. = src/main/java/,\ + src/main/resources/ output.. = bin/ bin.includes = META-INF/,\ .,\ LICENSE,\ NOTICE src.includes = LICENSE,\ - NOTICE,\ - src/main/java/,\ - src/main/resources/ -src.additionalRoots=src/main/java, src/main/resources + NOTICE\ Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/build.properties URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/build.properties?rev=915109r1=915108r2=915109view=diff == --- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/build.properties (original) +++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/build.properties Mon Feb 22 23:17:43 2010 @@ -5,5 +5,4 @@ LICENSE,\ NOTICE src.includes = NOTICE,\ - LICENSE,\ - src/ + LICENSE\ Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/build.properties URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/build.properties?rev=915109r1=915108r2=915109view=diff == --- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/build.properties (original) +++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/build.properties Mon Feb 22 23:17:43 2010 @@ -6,13 +6,11 @@ lib/antsupport.jar,\ LICENSE,\ NOTICE,\ - icons/iBatisLogo.gif + icons/ jars.compile.order = .,\ lib/antsupport.jar source.lib/antsupport.jar = antsrc/ output.lib/antsupport.jar = antbin/ src.includes = LICENSE,\ NOTICE,\ - antsrc/,\ - src/,\ icons/
svn commit: r912458 - in /ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core: .classpath .project .settings/ META-INF/ build.properties ibator-core-1.2.2-SNAPSHOT-sources.jar ibator-core-1
Author: jgbutler Date: Mon Feb 22 01:23:24 2010 New Revision: 912458 URL: http://svn.apache.org/viewvc?rev=912458view=rev Log: [Ibator] Eclipse plugin build updates Removed: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/.classpath ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/.project ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/.settings/ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/META-INF/ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/build.properties ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/ibator-core-1.2.2-SNAPSHOT-sources.jar ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/ibator-core-1.2.2-SNAPSHOT.jar
svn commit: r912472 - in /ibatis/java/ibator/trunk/eclipse: org.apache.ibatis.ibator.build/ org.apache.ibatis.ibator.core/ org.apache.ibatis.ibator.core/.settings/ org.apache.ibatis.ibator.core/META-I
Author: jgbutler
Date: Mon Feb 22 03:10:05 2010
New Revision: 912472
URL: http://svn.apache.org/viewvc?rev=912472view=rev
Log:
[Ibator] Eclipse plugin build updates
Added:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/.project
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.properties
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.xml
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/.classpath
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/.project
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/.settings/
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/.settings/org.eclipse.jdt.core.prefs
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/META-INF/
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/build.properties
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/src/
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/src/main/
Modified:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/ (props
changed)
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.core/build.properties
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/build.properties
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/META-INF/MANIFEST.MF
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/build.properties
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/wizards/NewConfigFileWizard.java
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/wizards/NewConfigFileWizardPage1.java
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator/build.properties
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator/feature.xml
Added: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/.project
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/.project?rev=912472view=auto
==
--- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/.project
(added)
+++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/.project
Mon Feb 22 03:10:05 2010
@@ -0,0 +1,11 @@
+?xml version=1.0 encoding=UTF-8?
+projectDescription
+ nameorg.apache.ibatis.ibator.build/name
+ comment/comment
+ projects
+ /projects
+ buildSpec
+ /buildSpec
+ natures
+ /natures
+/projectDescription
Added:
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.properties
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.properties?rev=912472view=auto
==
---
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.properties
(added)
+++
ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.build/build.properties
Mon Feb 22 03:10:05 2010
@@ -0,0 +1,247 @@
+###
+# Copyright (c) 2003, 2006 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###
+#
+# Parameters describing how and where to execute the build.
+# Typical users need only update the following properties:
+#baseLocation - where things you are building against are installed
+#bootclasspath - The base jars to compile against (typicaly rt.jar)
+#configs - the list of {os, ws, arch} configurations to build.
+#
+# Of course any of the settings here can be overridden by spec'ing
+# them on the command line (e.g., -DbaseLocation=d:/eclipse
+
+# Install specific properties
+baseLocation=C:/JavaTools/eclipse_galileo
+ pdeBuildPluginVersion=3.5.1.R35x_20090820
+ equinoxLauncherPluginVersion=1.0.201.R35x_v20090715
+ buildDirectory=C:/Temp/ibator.build
+
+#The type of the top level element we are building, generally feature
+topLevelElementType = feature
+#The id of the top level element we are building
+topLevelElementId = org.apache.ibatis.ibator
svn commit: r911981 - in /ibatis/java/ibator/trunk/eclipse: org.apache.ibatis.ibator.core/ org.apache.ibatis.ibator.core/META-INF/ org.apache.ibatis.ibator.eclipse.doc/ org.apache.ibatis.ibator.eclips
Author: jgbutler Date: Fri Feb 19 21:00:19 2010 New Revision: 911981 URL: http://svn.apache.org/viewvc?rev=911981view=rev Log: [Ibator] Updates to the Eclipse Plugin for Ibator 1.2.2 Added: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/ibator-core-1.2.2-SNAPSHOT-sources.jar (with props) ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/ibator-core-1.2.2-SNAPSHOT.jar (with props) Removed: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/buildIbator.xml ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/ibator-src.zip ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/ibator.jar Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/.classpath ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/build.properties ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/buildDoc.xml ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/importWizard.gif ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/toc_javadoc.xml ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/content/IbatorConfigVerifyer.java ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/wizards/NewConfigFileWizard.java ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator/feature.xml Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/.classpath URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/.classpath?rev=911981r1=911980r2=911981view=diff == --- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/.classpath (original) +++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/.classpath Fri Feb 19 21:00:19 2010 @@ -1,7 +1,7 @@ ?xml version=1.0 encoding=UTF-8? classpath + classpathentry exported=true kind=lib path=ibator-core-1.2.2-SNAPSHOT.jar/ classpathentry kind=con path=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5/ classpathentry kind=con path=org.eclipse.pde.core.requiredPlugins/ - classpathentry exported=true kind=lib path=ibator.jar sourcepath=ibator-src.zip/ classpathentry kind=output path=bin/ /classpath Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF?rev=911981r1=911980r2=911981view=diff == --- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF (original) +++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF Fri Feb 19 21:00:19 2010 @@ -3,7 +3,7 @@ Bundle-Name: Ibator Core Plug-in Bundle-SymbolicName: org.apache.ibatis.ibator.core Bundle-Version: 1.2.2 -Bundle-ClassPath: ibator.jar +Bundle-ClassPath: ibator-core-1.2.2-SNAPSHOT.jar Export-Package: org.apache.ibatis.ibator.ant, org.apache.ibatis.ibator.api, org.apache.ibatis.ibator.api.dom, @@ -20,6 +20,12 @@ org.apache.ibatis.ibator.generator.ibatis2.model, org.apache.ibatis.ibator.generator.ibatis2.sqlmap, org.apache.ibatis.ibator.generator.ibatis2.sqlmap.elements, + org.apache.ibatis.ibator.generator.ibatis3, + org.apache.ibatis.ibator.generator.ibatis3.javamapper, + org.apache.ibatis.ibator.generator.ibatis3.javamapper.elements, + org.apache.ibatis.ibator.generator.ibatis3.model, + org.apache.ibatis.ibator.generator.ibatis3.xmlmapper, + org.apache.ibatis.ibator.generator.ibatis3.xmlmapper.elements, org.apache.ibatis.ibator.internal, org.apache.ibatis.ibator.internal.db, org.apache.ibatis.ibator.internal.rules, Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/build.properties URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/build.properties?rev=911981r1=911980r2=911981view=diff == --- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/build.properties (original) +++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.core/build.properties Fri Feb 19 21:00:19 2010 @@ -1,5 +1,5 @@ bin.includes = META-INF/,\ - ibator.jar,\ LICENSE,\ NOTICE,\ - ibator-src.zip + ibator-core-1.2.2-SNAPSHOT.jar
svn commit: r911984 - /ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html
Author: jgbutler Date: Fri Feb 19 21:06:22 2010 New Revision: 911984 URL: http://svn.apache.org/viewvc?rev=911984view=rev Log: [Ibator] Updates to the Eclipse Plugin for Ibator 1.2.2 Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html Modified: ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html?rev=911984r1=911983r2=911984view=diff == --- ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html (original) +++ ibatis/java/ibator/trunk/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html Fri Feb 19 21:06:22 2010 @@ -141,34 +141,12 @@ like to rebuild the documentation, simply execute the codebuildDoc.xml/code file in the codeorg.apache.ibatis.ibator.eclipse.doc/code project (an Ant build file)./p -h2Building the Ibator Core JAR in Eclipse/h2 -pThe core Ibator JAR file has it's source code attached in the plugin, so you -should be able to step into core Ibator methods for debug. If you have found a bug -in Ibator, or would like to test an enhancement, you should modify the Ibator source code, -and then rebuild the JAR for inclusion in the plugin./p -pIf you would like to modify/enhance the Ibator core JAR, then you can create a -Java project for the core JAR by following these steps:/p -ol - liStart the Eclipse new project wizard - (Filegt;Newgt;Project...) - /li - liSelect the Java Project from Existing Ant Buildfile wizard, press Next/li - liBrowse to the build.xml file in the checked out project (for example -/Ibator/source/core/build/build.xml). Select the javac task found in target build.compile. -The other javac tasks are used during the normal Ibator build to compile tests -and test support classes. -Accept the default for the other fields and press Finish./li - liWait for the workspace to build. bNote:/b you will need to add Ant to the - build path for the project for a successful compile. You can find an Ant JAR - in the ../core/devlib subdirectory of your SVN checkout directory./li -/ol - -pNote that Ibator is compiled with JDK 5.0 for distribution./p - -pIf you make a change in the Ibator core files, you can use the codebuildIbator.xml/code -Ant build file in the codeorg.apache.ibatis.ibator.core/code project to update the -JAR in the plug-in. Note that this build file does not run the entire Ibator build (i.e. it -does not run the tests)./p +h2Updating the Ibator Core JAR in Eclipse/h2 +pThe core Ibator JAR is built with Maven. If you want to make a change to the core +Ibator JAR then you will need to build the new JAR with Maven and then copy the new +JAR into the codeorg.apache.ibatis.ibator.core/code project in Eclipse. You might +need to update the codeMANIFEST.MF/code file in this project also if you have changed +the name of the Ibator JAR file./p /body /html
svn commit: r911119 - in /ibatis/java/ibator/trunk/core/ibator-core: doc/ src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/
Author: jgbutler
Date: Wed Feb 17 17:55:37 2010
New Revision: 99
URL: http://svn.apache.org/viewvc?rev=99view=rev
Log:
[Ibator] Fix for IBATIS-731 - rename key field to avoid name collisions
Modified:
ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DeleteByPrimaryKeyMethodGenerator.java
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByPrimaryKeyMethodGenerator.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=99r1=98r2=99view=diff
==
--- ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt Wed Feb 17
17:55:37 2010
@@ -15,6 +15,7 @@
4. Fixed IBATIS-601 - improper validation of generatedKey
5. Fixed IBATIS-609 - incorrect parsing of Java generic types
6. Fixed spelling error LONCVARCHAR-LONGVARCHAR (thanks Allard)
+7. Fixed IBATIS-731 - change name of primary key variable to avoid conflicts
Enhancements:
1. IBATIS-569 - Make it easier to override IbatorRules in plugins
@@ -42,6 +43,7 @@
19. Added new or method to example classes
20. Added new useCompoundColumnNames property on table
+
---
Version 1.2.1:
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DeleteByPrimaryKeyMethodGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DeleteByPrimaryKeyMethodGenerator.java?rev=99r1=98r2=99view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DeleteByPrimaryKeyMethodGenerator.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/DeleteByPrimaryKeyMethodGenerator.java
Wed Feb 17 17:55:37 2010
@@ -54,14 +54,14 @@
sb.setLength(0);
sb.append(keyType.getShortName());
-sb.append( key = new ); //$NON-NLS-1$
+sb.append( _key = new ); //$NON-NLS-1$
sb.append(keyType.getShortName());
sb.append(();); //$NON-NLS-1$
method.addBodyLine(sb.toString());
for (IntrospectedColumn introspectedColumn :
introspectedTable.getPrimaryKeyColumns()) {
sb.setLength(0);
-sb.append(key.); //$NON-NLS-1$
+sb.append(_key.); //$NON-NLS-1$
sb.append(JavaBeansUtil.getSetterMethodName(introspectedColumn
.getJavaProperty()));
sb.append('(');
@@ -74,7 +74,7 @@
sb.setLength(0);
sb.append(int rows = ); //$NON-NLS-1$
sb.append(daoTemplate.getDeleteMethod(introspectedTable.getIbatis2SqlMapNamespace(),
-introspectedTable.getDeleteByPrimaryKeyStatementId(), key));
//$NON-NLS-1$
+introspectedTable.getDeleteByPrimaryKeyStatementId(),
_key)); //$NON-NLS-1$
method.addBodyLine(sb.toString());
method.addBodyLine(return rows;); //$NON-NLS-1$
@@ -105,7 +105,7 @@
if (introspectedTable.getRules().generatePrimaryKeyClass()) {
FullyQualifiedJavaType type = new
FullyQualifiedJavaType(introspectedTable.getPrimaryKeyType());
importedTypes.add(type);
-method.addParameter(new Parameter(type, key)); //$NON-NLS-1$
+method.addParameter(new Parameter(type, _key)); //$NON-NLS-1$
} else {
for (IntrospectedColumn introspectedColumn :
introspectedTable.getPrimaryKeyColumns()) {
FullyQualifiedJavaType type = introspectedColumn
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByPrimaryKeyMethodGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByPrimaryKeyMethodGenerator.java?rev=99r1=98r2=99view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByPrimaryKeyMethodGenerator.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements
svn commit: r911126 - in /ibatis/java/ibator/trunk/core/ibator-core: doc/ReleaseNotes.txt src/main/java/org/apache/ibatis/ibator/api/Ibator.java
Author: jgbutler
Date: Wed Feb 17 18:04:03 2010
New Revision: 911126
URL: http://svn.apache.org/viewvc?rev=911126view=rev
Log:
[Ibator] Fixes for IBATIS-699 - Overwrite unmergeable XML files if enabled
Modified:
ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/Ibator.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=911126r1=911125r2=911126view=diff
==
--- ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt Wed Feb 17
18:04:03 2010
@@ -16,6 +16,7 @@
5. Fixed IBATIS-609 - incorrect parsing of Java generic types
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
Enhancements:
1. IBATIS-569 - Make it easier to override IbatorRules in plugins
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/Ibator.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/Ibator.java?rev=911126r1=911125r2=911126view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/Ibator.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/Ibator.java
Wed Feb 17 18:04:03 2010
@@ -234,6 +234,10 @@
if (targetFile.exists()) {
if (gxf.isMergeable()) {
source = XmlFileMergerJaxp.getMergedSource(gxf,
targetFile);
+} else if (shellCallback.isOverwriteEnabled()) {
+ source = gxf.getFormattedContent();
+warnings.add(Messages.getString(Warning.11,
//$NON-NLS-1$
+targetFile.getAbsolutePath()));
} else {
source = gxf.getFormattedContent();
targetFile = getUniqueFileName(directory,
gxf.getFileName());
svn commit: r906271 - in /ibatis/java/ibator/trunk/core/ibator-core: doc/ src/main/java/org/apache/ibatis/ibator/config/ src/main/java/org/apache/ibatis/ibator/internal/db/ src/main/java/org/apache/ib
Author: jgbutler
Date: Wed Feb 3 22:44:12 2010
New Revision: 906271
URL: http://svn.apache.org/viewvc?rev=906271view=rev
Log:
[Ibator] Add new useCompoundTableNames property
Modified:
ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/config/PropertyRegistry.java
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/util/JavaBeansUtil.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=906271r1=906270r2=906271view=diff
==
--- ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt Wed Feb 3
22:44:12 2010
@@ -40,6 +40,7 @@
17. Added ability to set annotations on method parameters
18. Addedd support for distinct on select by example methods
19. Added new or method to example classes
+20. Added new useCompoundColumnNames property on table
---
Version 1.2.1:
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/config/PropertyRegistry.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/config/PropertyRegistry.java?rev=906271r1=906270r2=906271view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/config/PropertyRegistry.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/config/PropertyRegistry.java
Wed Feb 3 22:44:12 2010
@@ -40,6 +40,7 @@
public static final String TABLE_USE_COLUMN_INDEXES = useColumnIndexes;
//$NON-NLS-1$
public static final String TABLE_USE_ACTUAL_COLUMN_NAMES =
useActualColumnNames; //$NON-NLS-1$
+public static final String TABLE_USE_COMPOUND_COLUMN_NAMES =
useCompoundColumnNames; //$NON-NLS-1$
public static final String TABLE_IGNORE_QUALIFIERS_AT_RUNTIME =
ignoreQualifiersAtRuntime; //$NON-NLS-1$
public static final String TABLE_RUNTIME_CATALOG = runtimeCatalog;
//$NON-NLS-1$
public static final String TABLE_RUNTIME_SCHEMA = runtimeSchema;
//$NON-NLS-1$
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java?rev=906271r1=906270r2=906271view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
Wed Feb 3 22:44:12 2010
@@ -214,6 +214,7 @@
private void calculateExtraColumnInformation(TableConfiguration tc,
MapActualTableName, ListIntrospectedColumn columns) {
+ StringBuilder sb = new StringBuilder();
Pattern pattern = null;
String replaceString = null;
if (tc.getColumnRenamingRule() != null) {
@@ -234,6 +235,12 @@
if
(StringUtility.isTrue(tc.getProperty(PropertyRegistry.TABLE_USE_ACTUAL_COLUMN_NAMES)))
{
introspectedColumn.setJavaProperty(JavaBeansUtil.getValidPropertyName(calculatedColumnName));
+} else if
(StringUtility.isTrue(tc.getProperty(PropertyRegistry.TABLE_USE_COMPOUND_COLUMN_NAMES)))
{
+ sb.setLength(0);
+ sb.append(calculatedColumnName);
+ sb.append('_');
+
sb.append(JavaBeansUtil.getCamelCaseString(introspectedColumn.getRemarks(),
true));
+
introspectedColumn.setJavaProperty(JavaBeansUtil.getValidPropertyName(sb.toString()));
} else {
introspectedColumn.setJavaProperty(JavaBeansUtil.getCamelCaseString(calculatedColumnName,
false));
}
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/util/JavaBeansUtil.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/util/JavaBeansUtil.java?rev=906271r1=906270r2=906271view=diff
svn commit: r902881 - in /ibatis/java/ibator/trunk/core: ibator-systests-ibatis2-java2/ ibator-systests-ibatis2-java2/src/main/resources/ ibator-systests-ibatis2-java5/ ibator-systests-ibatis2-java5/s
Author: jgbutler
Date: Mon Jan 25 17:17:28 2010
New Revision: 902881
URL: http://svn.apache.org/viewvc?rev=902881view=rev
Log:
[ibator] Update to latest ibatis, turn down Spring logging messages
Added:
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/main/resources/log4j.properties
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/main/resources/log4j.properties
Modified:
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/pom.xml
ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml?rev=902881r1=902880r2=902881view=diff
==
--- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml
(original)
+++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/pom.xml Mon Jan
25 17:17:28 2010
@@ -83,5 +83,11 @@
version1.8.0.10/version
scopetest/scope
/dependency
+dependency
+ groupIdlog4j/groupId
+ artifactIdlog4j/artifactId
+ version1.2.13/version
+ scopetest/scope
+/dependency
/dependencies
/project
Added:
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/main/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/main/resources/log4j.properties?rev=902881view=auto
==
---
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/main/resources/log4j.properties
(added)
+++
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/main/resources/log4j.properties
Mon Jan 25 17:17:28 2010
@@ -0,0 +1,14 @@
+# log4j.properties for
+
+# Set root category priority to ERROR and its only appender to LOGFILE.
+log4j.rootCategory=ERROR, CONSOLE
+
+#Spring Framework
+#log4j.logger.org.springframework=DEBUG
+#log4j.logger.org.springframework.orm=DEBUG
+#log4j.logger.org.springframework.transaction=DEBUG
+
+# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%-d{HH:mm:ss} %-5p %60.60c
%-25.25M %m%n
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/pom.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/pom.xml?rev=902881r1=902880r2=902881view=diff
==
--- ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/pom.xml
(original)
+++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/pom.xml Mon Jan
25 17:17:28 2010
@@ -83,5 +83,11 @@
version1.8.0.10/version
scopetest/scope
/dependency
+dependency
+ groupIdlog4j/groupId
+ artifactIdlog4j/artifactId
+ version1.2.13/version
+ scopetest/scope
+/dependency
/dependencies
/project
Added:
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/main/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/main/resources/log4j.properties?rev=902881view=auto
==
---
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/main/resources/log4j.properties
(added)
+++
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/main/resources/log4j.properties
Mon Jan 25 17:17:28 2010
@@ -0,0 +1,14 @@
+# log4j.properties for
+
+# Set root category priority to ERROR and its only appender to LOGFILE.
+log4j.rootCategory=ERROR, CONSOLE
+
+#Spring Framework
+#log4j.logger.org.springframework=DEBUG
+#log4j.logger.org.springframework.orm=DEBUG
+#log4j.logger.org.springframework.transaction=DEBUG
+
+# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%-d{HH:mm:ss} %-5p %60.60c
%-25.25M %m%n
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml?rev=902881r1=902880r2=902881view=diff
==
--- ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml (original)
+++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml Mon Jan 25
17:17:28 2010
@@ -72,7 +72,7 @@
dependency
groupIdorg.apache.ibatis/groupId
artifactIdibatis
svn commit: r902897 - in /ibatis/java/ibator/trunk/core: ibator-core/doc/ ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ ibator-core/src/main/java/org/apache/ibatis/ibator
Author: jgbutler
Date: Mon Jan 25 18:02:52 2010
New Revision: 902897
URL: http://svn.apache.org/viewvc?rev=902897view=rev
Log:
[ibator] add new or method to example classes
Modified:
ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/conditional/java2/SelectByExampleTest.java
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/ConditionalJava5Test.java
ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/conditional/java5/ConditionalJava5Test.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=902897r1=902896r2=902897view=diff
==
--- ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt (original)
+++ ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt Mon Jan 25
18:02:52 2010
@@ -30,7 +30,7 @@
columnOverrides (thanks to Dan Turkenkopf for the idea and a nice initial
patch)
10. Gather column comments during introspection
11. IBATIS-592 - Additional attributes for SqlMaps
-12. Fixed addCriterionfor JDBC* methods so that they all do a null check
+12. Fixed addCriterionforJDBC* methods so that they all do a null check
13. Fixed IbatorRunner so that configuration errors are shown (thanks to Karel
Rank)
14. Added XML ids to changeable attributes on introspected table, also
change the XML merger so that the XML ids no longer need to contain
@@ -39,6 +39,7 @@
16. IBATIS-605 - Added Informix Dialect
17. Added ability to set annotations on method parameters
18. Addedd support for distinct on select by example methods
+19. Added new or method to example classes
---
Version 1.2.1:
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java?rev=902897r1=902896r2=902897view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java
Mon Jan 25 18:02:52 2010
@@ -95,6 +95,7 @@
method.addParameter(new Parameter(type, example)); //$NON-NLS-1$
method.addBodyLine(this.orderByClause = example.orderByClause;);
//$NON-NLS-1$
method.addBodyLine(this.oredCriteria = example.oredCriteria;);
//$NON-NLS-1$
+method.addBodyLine(this.distinct = example.distinct;);
//$NON-NLS-1$
commentGenerator.addGeneralMethodComment(method,
introspectedTable);
topLevelClass.addMethod(method);
}
@@ -188,7 +189,19 @@
method.addParameter(new Parameter(FullyQualifiedJavaType
.getCriteriaInstance(), criteria)); //$NON-NLS-1$
method.addBodyLine(oredCriteria.add(criteria);); //$NON-NLS-1$
+commentGenerator.addGeneralMethodComment(method, introspectedTable);
+topLevelClass.addMethod(method);
+method = new Method();
+method.setVisibility(JavaVisibility.PUBLIC);
+if (ibatorContext.getSuppressTypeWarnings(introspectedTable)) {
+method.addSuppressTypeWarningsAnnotation();
+}
+method.setName(or); //$NON-NLS-1$
+method.setReturnType(FullyQualifiedJavaType.getCriteriaInstance());
+method.addBodyLine(Criteria criteria = createCriteriaInternal(););
//$NON-NLS-1$
+method.addBodyLine(oredCriteria.add(criteria);); //$NON-NLS-1$
+method.addBodyLine(return criteria;); //$NON-NLS-1$
commentGenerator.addGeneralMethodComment(method, introspectedTable);
topLevelClass.addMethod(method);
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java?rev=902897r1=902896r2=902897view=diff
svn commit: r898724 - /ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml
Author: jgbutler Date: Wed Jan 13 11:33:24 2010 New Revision: 898724 URL: http://svn.apache.org/viewvc?rev=898724view=rev Log: [ibator] update to new release of ibatis Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml?rev=898724r1=898723r2=898724view=diff == --- ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml (original) +++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml Wed Jan 13 11:33:24 2010 @@ -72,7 +72,7 @@ dependency groupIdorg.apache.ibatis/groupId artifactIdibatis-sqlmap/artifactId - version3.0-beta-6/version + version3.0-beta-8/version /dependency dependency groupIdorg.hsqldb/groupId
svn commit: r896120 - in /ibatis/java/ibator/trunk/core: ibator-core/doc/ ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ ibator-core/src/main/java/org/apache/ibatis/ibator
Author: jgbutler Date: Tue Jan 5 16:36:05 2010 New Revision: 896120 URL: http://svn.apache.org/viewvc?rev=896120view=rev Log: [ibator] add support for distinct on selectByExample methods Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt ibatis/java/ibator/trunk/core/ibator-core/doc/todo.txt ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/SelectByExampleWithBLOBsElementGenerator.java ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/SelectByExampleWithoutBLOBsElementGenerator.java ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/SelectByExampleWithBLOBsElementGenerator.java ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/SelectByExampleWithoutBLOBsElementGenerator.java ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java2/src/test/java/ibatortest/java2/execute/flat/java2/FlatJava2Test.java ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/flat/java2/FlatJava2Test.java ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/flat/java5/FlatJava5Test.java ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/src/test/java/ibatortest/execute/flat/java5/FlatJava5Test.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=896120r1=896119r2=896120view=diff == --- ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt (original) +++ ibatis/java/ibator/trunk/core/ibator-core/doc/ReleaseNotes.txt Tue Jan 5 16:36:05 2010 @@ -38,6 +38,7 @@ 15. Many refactorings to make way for iBATIS3 16. IBATIS-605 - Added Informix Dialect 17. Added ability to set annotations on method parameters +18. Addedd support for distinct on select by example methods --- Version 1.2.1: Modified: ibatis/java/ibator/trunk/core/ibator-core/doc/todo.txt URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/todo.txt?rev=896120r1=896119r2=896120view=diff == --- ibatis/java/ibator/trunk/core/ibator-core/doc/todo.txt (original) +++ ibatis/java/ibator/trunk/core/ibator-core/doc/todo.txt Tue Jan 5 16:36:05 2010 @@ -5,6 +5,8 @@ 1. Add a way to override default types in the JavaTypeResolver 2. Document change to JavaTypeResolver interface in release notes 3. Document attributes +4. tableSet - to allow specification of common attributes for a set of + tables Future Modified: ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java URL: http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java?rev=896120r1=896119r2=896120view=diff == --- ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java (original) +++ ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/model/ExampleGenerator.java Tue Jan 5 16:36:05 2010 @@ -124,6 +124,31 @@ commentGenerator.addGeneralMethodComment(method, introspectedTable); topLevelClass.addMethod(method); +// add field, getter, setter for distinct +field = new Field(); +field.setVisibility(JavaVisibility.PROTECTED); +field.setType(FullyQualifiedJavaType.getBooleanPrimitiveInstance()); +field.setName(distinct); //$NON-NLS-1$ +commentGenerator.addFieldComment(field, introspectedTable); +topLevelClass.addField(field); + +method = new Method(); +method.setVisibility(JavaVisibility.PUBLIC); +method.setName(setDistinct); //$NON-NLS-1$ +method.addParameter(new Parameter(FullyQualifiedJavaType +.getBooleanPrimitiveInstance(), distinct)); //$NON-NLS-1$ +method.addBodyLine(this.distinct = distinct;); //$NON-NLS-1$ +commentGenerator.addGeneralMethodComment(method, introspectedTable); +topLevelClass.addMethod(method
svn commit: r896270 - in /ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis: parsing/ session/ submitted/cglib_lazy_error/ submitted/substitution_in_annots/
Author: jgbutler
Date: Tue Jan 5 23:27:10 2010
New Revision: 896270
URL: http://svn.apache.org/viewvc?rev=896270view=rev
Log:
Clean up a few tests
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/XPathParserTest.java
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/session/SqlSessionTest.java
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/substitution_in_annots/SubstitutionInAnnotsTest.java
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/XPathParserTest.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/XPathParserTest.java?rev=896270r1=896269r2=896270view=diff
==
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/XPathParserTest.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/XPathParserTest.java
Tue Jan 5 23:27:10 2010
@@ -13,7 +13,7 @@
String resource = resources/nodelet_test.xml;
Reader reader = Resources.getResourceAsReader(resource);
XPathParser parser = new XPathParser(reader, false, null, null);
-assertEquals(5.8d, parser.evalDouble(/employee/height));
+assertEquals((Double) 5.8d, parser.evalDouble(/employee/height));
assertEquals(${id_var}, parser.evalString(/employee/@id));
assertEquals(Boolean.TRUE, parser.evalBoolean(/employee/active));
assertEquals(id${id_var}/id,
parser.evalNode(/employee/@id).toString().trim());
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/session/SqlSessionTest.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/session/SqlSessionTest.java?rev=896270r1=896269r2=896270view=diff
==
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/session/SqlSessionTest.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/session/SqlSessionTest.java
Tue Jan 5 23:27:10 2010
@@ -42,7 +42,7 @@
SqlSession session = sqlMapper.openSession();
try {
Integer count = (Integer)
session.selectOne(domain.blog.mappers.BlogMapper.selectCountOfPosts);
- assertEquals(5, count);
+ assertEquals(5, count.intValue());
} finally {
session.close();
}
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java?rev=896270r1=896269r2=896270view=diff
==
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java
Tue Jan 5 23:27:10 2010
@@ -112,10 +112,10 @@
selected2 = personMapper.selectById(2);
selected3 = personMapper.selectById(3);
Person selected4 = personMapper.selectById(4);
- Assert.assertEquals(1,selected1.getId());
- Assert.assertEquals(2,selected2.getId());
- Assert.assertEquals(3,selected3.getId());
- Assert.assertEquals(4,selected4.getId());
+ Assert.assertEquals(1,selected1.getId().longValue());
+ Assert.assertEquals(2,selected2.getId().longValue());
+ Assert.assertEquals(3,selected3.getId().longValue());
+ Assert.assertEquals(4,selected4.getId().longValue());
} finally {
sqlSession.close();
@@ -128,7 +128,7 @@
try {
PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
Person selected1 = personMapper.selectByStringId(1);
- Assert.assertEquals(1,selected1.getId());
+ Assert.assertEquals(1,selected1.getId().longValue());
} finally {
sqlSession.close();
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/substitution_in_annots/SubstitutionInAnnotsTest.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/substitution_in_annots/SubstitutionInAnnotsTest.java?rev=896270r1=896269r2=896270view=diff
==
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/substitution_in_annots/SubstitutionInAnnotsTest.java
(original)
+++
ibatis
svn commit: r890113 - /ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java
Author: jgbutler Date: Sun Dec 13 20:20:34 2009 New Revision: 890113 URL: http://svn.apache.org/viewvc?rev=890113view=rev Log: Fix for IBATIS-712 - iBATIS was picking the CLOB type handler for VARCHAR Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java?rev=890113r1=890112r2=890113view=diff == --- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java (original) +++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java Sun Dec 13 20:20:34 2009 @@ -55,7 +55,7 @@ register(String.class, new StringTypeHandler()); register(String.class, JdbcType.CHAR, new StringTypeHandler()); register(String.class, JdbcType.CLOB, new ClobTypeHandler()); -register(String.class, JdbcType.VARCHAR, new ClobTypeHandler()); +register(String.class, JdbcType.VARCHAR, new StringTypeHandler()); register(String.class, JdbcType.LONGVARCHAR, new ClobTypeHandler()); register(String.class, JdbcType.NVARCHAR, new NStringTypeHandler()); register(String.class, JdbcType.NCHAR, new NStringTypeHandler());
svn commit: r890119 - in /ibatis/java/ibator/trunk/core: ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/ ibator-core/src/main/java/org/apache/ibatis/ibator/generator
Author: jgbutler
Date: Sun Dec 13 21:10:03 2009
New Revision: 890119
URL: http://svn.apache.org/viewvc?rev=890119view=rev
Log:
[Ibator] minor updates to resolve some compiler warnings
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleParmsInnerclassGenerator.java
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/util/ClassloaderUtility.java
ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleParmsInnerclassGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleParmsInnerclassGenerator.java?rev=890119r1=890118r2=890119view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleParmsInnerclassGenerator.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleParmsInnerclassGenerator.java
Sun Dec 13 21:10:03 2009
@@ -42,7 +42,7 @@
InnerClass innerClass = new InnerClass(
new FullyQualifiedJavaType(UpdateByExampleParms));
//$NON-NLS-1$
-innerClass.setVisibility(JavaVisibility.PRIVATE);
+innerClass.setVisibility(JavaVisibility.PROTECTED);
innerClass.setStatic(true);
innerClass.setSuperClass(introspectedTable.getExampleType());
ibatorContext.getCommentGenerator().addClassComment(innerClass,
introspectedTable);
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java?rev=890119r1=890118r2=890119view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/model/ExampleGenerator.java
Sun Dec 13 21:10:03 2009
@@ -241,7 +241,7 @@
method.addBodyLine(super();); //$NON-NLS-1$
method.addBodyLine(this.condition = condition;); //$NON-NLS-1$
method.addBodyLine(this.value = value;); //$NON-NLS-1$
-method.addBodyLine(if (value instanceof List) {); //$NON-NLS-1$
+method.addBodyLine(if (value instanceof List?) {); //$NON-NLS-1$
method.addBodyLine(this.listValue = true;); //$NON-NLS-1$
method.addBodyLine(} else {); //$NON-NLS-1$
method.addBodyLine(this.singleValue = true;); //$NON-NLS-1$
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/util/ClassloaderUtility.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/util/ClassloaderUtility.java?rev=890119r1=890118r2=890119view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/util/ClassloaderUtility.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/util/ClassloaderUtility.java
Sun Dec 13 21:10:03 2009
@@ -53,7 +53,7 @@
}
try {
-urls.add(file.toURL());
+urls.add(file.toURI().toURL());
} catch (MalformedURLException e) {
// this shouldn't happen, but just in case...
throw new RuntimeException(
Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml?rev=890119r1=890118r2=890119view=diff
==
--- ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml (original)
+++ ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/pom.xml Sun Dec 13
21:10:03 2009
@@ -72,7 +72,7 @@
dependency
groupIdorg.apache.ibatis/groupId
artifactIdibatis-sqlmap/artifactId
- version3.0-beta-5/version
+ version3.0-beta-6/version
/dependency
dependency
groupIdorg.hsqldb/groupId
svn commit: r880814 - /ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/quotedcolumnnames/CreateDB.sql
Author: jgbutler Date: Mon Nov 16 15:48:47 2009 New Revision: 880814 URL: http://svn.apache.org/viewvc?rev=880814view=rev Log: Fix quoted column names test Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/quotedcolumnnames/CreateDB.sql Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/quotedcolumnnames/CreateDB.sql URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/quotedcolumnnames/CreateDB.sql?rev=880814r1=880813r2=880814view=diff == --- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/quotedcolumnnames/CreateDB.sql (original) +++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/quotedcolumnnames/CreateDB.sql Mon Nov 16 15:48:47 2009 @@ -1,3 +1,5 @@ +drop table names if exists; + create table names ( ID int, FIRST_NAME varchar(20),
svn commit: r836404 - in /ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator: api/IntrospectedColumn.java internal/db/DatabaseIntrospector.java
Author: jgbutler
Date: Sun Nov 15 20:20:21 2009
New Revision: 836404
URL: http://svn.apache.org/viewvc?rev=836404view=rev
Log:
[ibator] add column default info to introspected column
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/IntrospectedColumn.java
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/IntrospectedColumn.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/IntrospectedColumn.java?rev=836404r1=836403r2=836404view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/IntrospectedColumn.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/api/IntrospectedColumn.java
Sun Nov 15 20:20:21 2009
@@ -61,6 +61,8 @@
// any database comment associated with this column. May be null
protected String remarks;
+
+protected String defaultValue;
/**
* Constructs a Column definition. This object holds all the
@@ -278,4 +280,12 @@
public void setRemarks(String remarks) {
this.remarks = remarks;
}
+
+public String getDefaultValue() {
+return defaultValue;
+}
+
+public void setDefaultValue(String defaultValue) {
+this.defaultValue = defaultValue;
+}
}
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java?rev=836404r1=836403r2=836404view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
Sun Nov 15 20:20:21 2009
@@ -444,6 +444,7 @@
introspectedColumn.setNullable(rs.getInt(NULLABLE) ==
DatabaseMetaData.columnNullable); //$NON-NLS-1$
introspectedColumn.setScale(rs.getInt(DECIMAL_DIGITS));
//$NON-NLS-1$
introspectedColumn.setRemarks(rs.getString(REMARKS));
//$NON-NLS-1$
+introspectedColumn.setDefaultValue(rs.getString(COLUMN_DEF));
//$NON-NLS-1$
ActualTableName atn = new
ActualTableName(rs.getString(TABLE_CAT), //$NON-NLS-1$
rs.getString(TABLE_SCHEM), //$NON-NLS-1$
svn commit: r836419 - /ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/AbstractXmlElementGenerator.java
Author: jgbutler
Date: Sun Nov 15 20:50:38 2009
New Revision: 836419
URL: http://svn.apache.org/viewvc?rev=836419view=rev
Log:
[ibator] fix selectkey for ibatis3
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/AbstractXmlElementGenerator.java
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/AbstractXmlElementGenerator.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/AbstractXmlElementGenerator.java?rev=836419r1=836418r2=836419view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/AbstractXmlElementGenerator.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis3/xmlmapper/elements/AbstractXmlElementGenerator.java
Sun Nov 15 20:50:38 2009
@@ -54,7 +54,13 @@
answer.addAttribute(new Attribute(
keyProperty, introspectedColumn.getJavaProperty()));
//$NON-NLS-1$
if(StringUtility.stringHasValue(generatedKey.getType())) {
- answer.addAttribute(new Attribute(type, generatedKey.getType()));
//$NON-NLS-1$
+if (pre.equalsIgnoreCase(generatedKey.getType())) { //$NON-NLS-1$
+answer.addAttribute(new Attribute(order, BEFORE));
//$NON-NLS-1$ //$NON-NLS-2$
+} else if (post.equalsIgnoreCase(generatedKey.getType())) {
//$NON-NLS-1$
+answer.addAttribute(new Attribute(order, AFTER));
//$NON-NLS-1$ //$NON-NLS-2$
+} else {
+answer.addAttribute(new Attribute(order,
generatedKey.getType())); //$NON-NLS-1$
+}
}
answer.addElement(new
TextElement(generatedKey.getRuntimeSqlStatement()));
svn commit: r833947 - in /ibatis/java/ibator/trunk/core/ibator-core: doc/html/configreference/daoGenerator.html src/main/java/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Java2Im
Author: jgbutler
Date: Mon Nov 9 00:05:36 2009
New Revision: 833947
URL: http://svn.apache.org/viewvc?rev=833947view=rev
Log:
[ibator] more changes for ibatis3
Modified:
ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/daoGenerator.html
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Java2Impl.java
Modified:
ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/daoGenerator.html
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/daoGenerator.html?rev=833947r1=833946r2=833947view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/daoGenerator.html
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/doc/html/configreference/daoGenerator.html
Mon Nov 9 00:05:36 2009
@@ -30,10 +30,10 @@
/tr
tr
td valign=toptype/td
-tdThis attribute is used to select one of the predefined DAO templates,
or
-to specify a user provided DAO template.
-Any user provided DAO template must extend the class
-
codeorg.apache.ibatis.ibator.generator.ibatis2.dao.templates.AbstractDAOTemplate/code
+tdThis attribute is used to select one of the predefined DAO generators,
or
+to specify a user provided DAO generator.
+Any user provided DAO generator must extend the class
+codeorg.apache.ibatis.ibator.generator.AbstractJavaGenerator/code
class, and must have a public default constructor.
pThe attribute accepts the following four values for selecting one
of the
predefined DAO generators:/p
Modified:
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Java2Impl.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Java2Impl.java?rev=833947r1=833946r2=833947view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Java2Impl.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/main/java/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Java2Impl.java
Mon Nov 9 00:05:36 2009
@@ -28,7 +28,6 @@
import org.apache.ibatis.ibator.generator.AbstractJavaGenerator;
import org.apache.ibatis.ibator.generator.AbstractXmlGenerator;
import org.apache.ibatis.ibator.generator.ibatis2.dao.DAOGenerator;
-import
org.apache.ibatis.ibator.generator.ibatis2.dao.templates.AbstractDAOTemplate;
import
org.apache.ibatis.ibator.generator.ibatis2.dao.templates.GenericCIDAOTemplate;
import
org.apache.ibatis.ibator.generator.ibatis2.dao.templates.GenericSIDAOTemplate;
import
org.apache.ibatis.ibator.generator.ibatis2.dao.templates.IbatisDAOTemplate;
@@ -75,20 +74,19 @@
String type =
ibatorContext.getDaoGeneratorConfiguration().getConfigurationType();
-AbstractDAOTemplate abstractDAOTemplate;
+AbstractJavaGenerator javaGenerator;
if (IBATIS.equalsIgnoreCase(type)) { //$NON-NLS-1$
-abstractDAOTemplate = new IbatisDAOTemplate();
+javaGenerator = new DAOGenerator(new IbatisDAOTemplate(),
isJava5Targeted());
} else if (SPRING.equalsIgnoreCase(type)) { //$NON-NLS-1$
-abstractDAOTemplate = new SpringDAOTemplate();
+javaGenerator = new DAOGenerator(new SpringDAOTemplate(),
isJava5Targeted());
} else if (GENERIC-CI.equalsIgnoreCase(type)) { //$NON-NLS-1$
-abstractDAOTemplate = new GenericCIDAOTemplate();
+javaGenerator = new DAOGenerator(new GenericCIDAOTemplate(),
isJava5Targeted());
} else if (GENERIC-SI.equalsIgnoreCase(type)) { //$NON-NLS-1$
-abstractDAOTemplate = new GenericSIDAOTemplate();
+javaGenerator = new DAOGenerator(new GenericSIDAOTemplate(),
isJava5Targeted());
} else {
-abstractDAOTemplate = (AbstractDAOTemplate)
IbatorObjectFactory.createInternalObject(type);
+javaGenerator = (AbstractJavaGenerator)
IbatorObjectFactory.createInternalObject(type);
}
-AbstractJavaGenerator javaGenerator = new
DAOGenerator(abstractDAOTemplate, isJava5Targeted());
initializeAbstractGenerator(javaGenerator, warnings, progressCallback);
daoGenerators.add(javaGenerator);
}
svn commit: r833752 - in /ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator: api/dom/java/ internal/util/
Author: jgbutler
Date: Sat Nov 7 20:19:35 2009
New Revision: 833752
URL: http://svn.apache.org/viewvc?rev=833752view=rev
Log:
[ibator] switch build to maven
Added:
ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTest.java
- copied, changed from r833748,
ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTests.java
ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/internal/util/JavaBeansUtilTest.java
- copied, changed from r833748,
ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/internal/util/JavaBeansUtilTests.java
Removed:
ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTests.java
ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/internal/util/JavaBeansUtilTests.java
Copied:
ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTest.java
(from r833748,
ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTests.java)
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTest.java?p2=ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTest.javap1=ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTests.javar1=833748r2=833752rev=833752view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTests.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTest.java
Sat Nov 7 20:19:35 2009
@@ -26,8 +26,8 @@
* @author Jeff Butler
*
*/
-public class FullyQualifiedJavaTypeTests {
-
+public class FullyQualifiedJavaTypeTest {
+
@Test
public void testJavaType() {
FullyQualifiedJavaType fqjt =
@@ -80,19 +80,19 @@
public void testGenericType3() {
FullyQualifiedJavaType listOfStrings = new
FullyQualifiedJavaType(java.util.List); //$NON-NLS-1$
listOfStrings.addTypeArgument(new
FullyQualifiedJavaType(java.lang.String)); //$NON-NLS-1$
-
+
FullyQualifiedJavaType fqjt =
new FullyQualifiedJavaType(java.util.Map); //$NON-NLS-1$
fqjt.addTypeArgument(new FullyQualifiedJavaType(java.lang.String));
//$NON-NLS-1$
fqjt.addTypeArgument(listOfStrings);
-
+
assertTrue(fqjt.isExplicitlyImported());
assertEquals(MapString, ListString, fqjt.getShortName());
//$NON-NLS-1$
assertEquals(java.util.Mapjava.lang.String,
java.util.Listjava.lang.String, fqjt.getFullyQualifiedName()); //$NON-NLS-1$
assertEquals(java.util, fqjt.getPackageName()); //$NON-NLS-1$
assertEquals(2, fqjt.getImportList().size());
}
-
+
@Test
public void testGenericType4() {
FullyQualifiedJavaType fqjt =
@@ -103,7 +103,7 @@
assertEquals(java.util, fqjt.getPackageName()); //$NON-NLS-1$
assertEquals(2, fqjt.getImportList().size());
}
-
+
@Test
public void testWildcardType1() {
FullyQualifiedJavaType fqjt =
@@ -160,7 +160,7 @@
assertEquals(java.util, fqjt.getPackageName()); //$NON-NLS-1$
assertEquals(2, fqjt.getImportList().size());
}
-
+
@Test
public void testNestedClass1() {
FullyQualifiedJavaType fqjt = new
FullyQualifiedJavaType(org.foo.Bar.Inner);
Copied:
ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/internal/util/JavaBeansUtilTest.java
(from r833748,
ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/internal/util/JavaBeansUtilTests.java)
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/internal/util/JavaBeansUtilTest.java?p2=ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/internal/util/JavaBeansUtilTest.javap1=ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/internal/util/JavaBeansUtilTests.javar1=833748r2=833752rev=833752view=diff
==
---
ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/internal/util/JavaBeansUtilTests.java
(original)
+++
ibatis/java/ibator/trunk/core/ibator-core/src/test/java/org/apache/ibatis/ibator/internal/util/JavaBeansUtilTest.java
Sat Nov 7 20:19:35 2009
svn commit: r833772 [12/25] - in /ibatis/java/ibator/trunk/core: ./ ibator-core/doc/ ibator-core/doc/html/ ibator-core/doc/html/configreference/ ibator-core/doc/html/generatedobjects/ ibator-core/doc/
Added:
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/main/java/ibatortest/execute/miscellaneous/FirstName.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/main/java/ibatortest/execute/miscellaneous/FirstName.java?rev=833772view=auto
==
---
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/main/java/ibatortest/execute/miscellaneous/FirstName.java
(added)
+++
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/main/java/ibatortest/execute/miscellaneous/FirstName.java
Sat Nov 7 22:59:00 2009
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ibatortest.execute.miscellaneous;
+
+/**
+ * @author Jeff Butler
+ *
+ */
+public class FirstName {
+
+private String value;
+
+/**
+ *
+ */
+public FirstName() {
+super();
+}
+
+public String getValue() {
+return value;
+}
+
+public void setValue(String value) {
+this.value = value;
+}
+
+@Override
+public boolean equals(Object arg0) {
+if (arg0 == null) {
+return false;
+}
+
+return value.equals(((FirstName)arg0).getValue());
+}
+
+@Override
+public int hashCode() {
+return value == null ? 0 : value.hashCode();
+}
+
+}
Added:
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/main/java/ibatortest/execute/miscellaneous/FirstNameTypeHandler.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/main/java/ibatortest/execute/miscellaneous/FirstNameTypeHandler.java?rev=833772view=auto
==
---
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/main/java/ibatortest/execute/miscellaneous/FirstNameTypeHandler.java
(added)
+++
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/main/java/ibatortest/execute/miscellaneous/FirstNameTypeHandler.java
Sat Nov 7 22:59:00 2009
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ibatortest.execute.miscellaneous;
+
+import java.sql.SQLException;
+import java.sql.Types;
+
+import com.ibatis.sqlmap.client.extensions.ParameterSetter;
+import com.ibatis.sqlmap.client.extensions.ResultGetter;
+import com.ibatis.sqlmap.client.extensions.TypeHandlerCallback;
+
+/**
+ * @author Jeff Butler
+ *
+ */
+public class FirstNameTypeHandler implements TypeHandlerCallback {
+
+/**
+ *
+ */
+public FirstNameTypeHandler() {
+super();
+}
+
+/* (non-Javadoc)
+ * @see
com.ibatis.sqlmap.client.extensions.TypeHandlerCallback#setParameter(com.ibatis.sqlmap.client.extensions.ParameterSetter,
java.lang.Object)
+ */
+public void setParameter(ParameterSetter arg0, Object arg1)
+throws SQLException {
+if (arg1 == null) {
+arg0.setNull(Types.VARCHAR);
+} else {
+arg0.setString(((FirstName) arg1).getValue());
+}
+}
+
+/* (non-Javadoc)
+ * @see
com.ibatis.sqlmap.client.extensions.TypeHandlerCallback#getResult(com.ibatis.sqlmap.client.extensions.ResultGetter)
+ */
+public Object getResult(ResultGetter arg0) throws SQLException {
+return valueOf(arg0.getString());
+}
+
+/* (non-Javadoc)
+ * @see
com.ibatis.sqlmap.client.extensions.TypeHandlerCallback#valueOf(java.lang.String)
+ */
+public Object valueOf(String arg0) {
+if (arg0 == null) {
+return null;
+} else {
+FirstName answer = new FirstName();
+answer.setValue(arg0);
+return answer;
+}
+}
+
+}
Added:
svn commit: r833772 [22/25] - in /ibatis/java/ibator/trunk/core: ./ ibator-core/doc/ ibator-core/doc/html/ ibator-core/doc/html/configreference/ ibator-core/doc/html/generatedobjects/ ibator-core/doc/
Added:
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/hierarchical/java2/UpdateByExampleTest.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/hierarchical/java2/UpdateByExampleTest.java?rev=833772view=auto
==
---
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/hierarchical/java2/UpdateByExampleTest.java
(added)
+++
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/hierarchical/java2/UpdateByExampleTest.java
Sat Nov 7 22:59:00 2009
@@ -0,0 +1,851 @@
+/*
+ * Copyright 2007 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ibatortest.execute.hierarchical.java2;
+
+import ibatortest.generated.hierarchical.java2.dao.AwfulTableDAO;
+import ibatortest.generated.hierarchical.java2.dao.FieldsblobsDAO;
+import ibatortest.generated.hierarchical.java2.dao.FieldsonlyDAO;
+import ibatortest.generated.hierarchical.java2.dao.PkblobsDAO;
+import ibatortest.generated.hierarchical.java2.dao.PkfieldsDAO;
+import ibatortest.generated.hierarchical.java2.dao.PkfieldsblobsDAO;
+import ibatortest.generated.hierarchical.java2.dao.PkonlyDAO;
+import ibatortest.generated.hierarchical.java2.model.AwfulTable;
+import ibatortest.generated.hierarchical.java2.model.AwfulTableExample;
+import ibatortest.generated.hierarchical.java2.model.Fieldsblobs;
+import ibatortest.generated.hierarchical.java2.model.FieldsblobsExample;
+import ibatortest.generated.hierarchical.java2.model.FieldsblobsWithBLOBs;
+import ibatortest.generated.hierarchical.java2.model.Fieldsonly;
+import ibatortest.generated.hierarchical.java2.model.FieldsonlyExample;
+import ibatortest.generated.hierarchical.java2.model.PkblobsExample;
+import ibatortest.generated.hierarchical.java2.model.PkblobsKey;
+import ibatortest.generated.hierarchical.java2.model.PkblobsWithBLOBs;
+import ibatortest.generated.hierarchical.java2.model.Pkfields;
+import ibatortest.generated.hierarchical.java2.model.PkfieldsExample;
+import ibatortest.generated.hierarchical.java2.model.Pkfieldsblobs;
+import ibatortest.generated.hierarchical.java2.model.PkfieldsblobsExample;
+import ibatortest.generated.hierarchical.java2.model.PkfieldsblobsWithBLOBs;
+import ibatortest.generated.hierarchical.java2.model.PkonlyExample;
+import ibatortest.generated.hierarchical.java2.model.PkonlyKey;
+
+import java.sql.SQLException;
+import java.util.List;
+
+/**
+ *
+ * @author Jeff Butler
+ *
+ */
+public class UpdateByExampleTest extends AbstractHierarchicalJava2Test {
+
+@SuppressWarnings(unchecked)
+public void testFieldsOnlyUpdateByExampleSelective() {
+FieldsonlyDAO dao = getFieldsonlyDAO();
+
+try {
+Fieldsonly record = new Fieldsonly();
+record.setDoublefield(11.22);
+record.setFloatfield(33.44);
+record.setIntegerfield(5);
+dao.insert(record);
+
+record = new Fieldsonly();
+record.setDoublefield(44.55);
+record.setFloatfield(66.77);
+record.setIntegerfield(8);
+dao.insert(record);
+
+record = new Fieldsonly();
+record.setDoublefield(88.99);
+record.setFloatfield(100.111);
+record.setIntegerfield(9);
+dao.insert(record);
+
+record = new Fieldsonly();
+record.setDoublefield(99d);
+FieldsonlyExample example = new FieldsonlyExample();
+example.createCriteria().andIntegerfieldGreaterThan(5);
+
+int rows = dao.updateByExampleSelective(record, example);
+assertEquals(2, rows);
+
+example.clear();
+example.createCriteria().andIntegerfieldEqualTo(5);
+List answer = dao.selectByExample(example);
+assertEquals(1, answer.size());
+record = (Fieldsonly) answer.get(0);
+assertEquals(record.getDoublefield(), 11.22);
+assertEquals(record.getFloatfield(), 33.44);
+assertEquals(record.getIntegerfield().intValue(), 5);
+
+example.clear();
+example.createCriteria().andIntegerfieldEqualTo(8);
+answer = dao.selectByExample(example);
+
svn commit: r833772 [16/25] - in /ibatis/java/ibator/trunk/core: ./ ibator-core/doc/ ibator-core/doc/html/ ibator-core/doc/html/configreference/ ibator-core/doc/html/generatedobjects/ ibator-core/doc/
Added:
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/UpdateByExampleTest.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/UpdateByExampleTest.java?rev=833772view=auto
==
---
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/UpdateByExampleTest.java
(added)
+++
ibatis/java/ibator/trunk/core/ibator-systests-ibatis2-java5/src/test/java/ibatortest/execute/conditional/java5/UpdateByExampleTest.java
Sat Nov 7 22:59:00 2009
@@ -0,0 +1,836 @@
+/*
+ * Copyright 2007 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ibatortest.execute.conditional.java5;
+
+import ibatortest.generated.conditional.java5.dao.AwfulTableDAO;
+import ibatortest.generated.conditional.java5.dao.FieldsblobsDAO;
+import ibatortest.generated.conditional.java5.dao.FieldsonlyDAO;
+import ibatortest.generated.conditional.java5.dao.PkblobsDAO;
+import ibatortest.generated.conditional.java5.dao.PkfieldsDAO;
+import ibatortest.generated.conditional.java5.dao.PkfieldsblobsDAO;
+import ibatortest.generated.conditional.java5.dao.PkonlyDAO;
+import ibatortest.generated.conditional.java5.model.AwfulTable;
+import ibatortest.generated.conditional.java5.model.AwfulTableExample;
+import ibatortest.generated.conditional.java5.model.Fieldsblobs;
+import ibatortest.generated.conditional.java5.model.FieldsblobsExample;
+import ibatortest.generated.conditional.java5.model.FieldsblobsWithBLOBs;
+import ibatortest.generated.conditional.java5.model.Fieldsonly;
+import ibatortest.generated.conditional.java5.model.FieldsonlyExample;
+import ibatortest.generated.conditional.java5.model.Pkblobs;
+import ibatortest.generated.conditional.java5.model.PkblobsExample;
+import ibatortest.generated.conditional.java5.model.Pkfields;
+import ibatortest.generated.conditional.java5.model.PkfieldsExample;
+import ibatortest.generated.conditional.java5.model.Pkfieldsblobs;
+import ibatortest.generated.conditional.java5.model.PkfieldsblobsExample;
+import ibatortest.generated.conditional.java5.model.PkonlyExample;
+import ibatortest.generated.conditional.java5.model.PkonlyKey;
+
+import java.sql.SQLException;
+import java.util.List;
+
+/**
+ *
+ * @author Jeff Butler
+ *
+ */
+public class UpdateByExampleTest extends AbstractConditionalJava5Test {
+
+public void testFieldsOnlyUpdateByExampleSelective() {
+FieldsonlyDAO dao = getFieldsonlyDAO();
+
+try {
+Fieldsonly record = new Fieldsonly();
+record.setDoublefield(11.22);
+record.setFloatfield(33.44);
+record.setIntegerfield(5);
+dao.insert(record);
+
+record = new Fieldsonly();
+record.setDoublefield(44.55);
+record.setFloatfield(66.77);
+record.setIntegerfield(8);
+dao.insert(record);
+
+record = new Fieldsonly();
+record.setDoublefield(88.99);
+record.setFloatfield(100.111);
+record.setIntegerfield(9);
+dao.insert(record);
+
+record = new Fieldsonly();
+record.setDoublefield(99d);
+FieldsonlyExample example = new FieldsonlyExample();
+example.createCriteria().andIntegerfieldGreaterThan(5);
+
+int rows = dao.updateByExampleSelective(record, example);
+assertEquals(2, rows);
+
+example.clear();
+example.createCriteria().andIntegerfieldEqualTo(5);
+ListFieldsonly answer = dao.selectByExample(example);
+assertEquals(1, answer.size());
+record = answer.get(0);
+assertEquals(record.getDoublefield(), 11.22);
+assertEquals(record.getFloatfield(), 33.44);
+assertEquals(record.getIntegerfield().intValue(), 5);
+
+example.clear();
+example.createCriteria().andIntegerfieldEqualTo(8);
+answer = dao.selectByExample(example);
+assertEquals(1, answer.size());
+record = (Fieldsonly) answer.get(0);
+assertEquals(record.getDoublefield(), 99d);
+assertEquals(record.getFloatfield(), 66.77);
+
svn commit: r833821 - /ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/
Author: jgbutler Date: Sun Nov 8 04:11:33 2009 New Revision: 833821 URL: http://svn.apache.org/viewvc?rev=833821view=rev Log: [ibator] tests for ibatis3 support Modified: ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/ (props changed) Propchange: ibatis/java/ibator/trunk/core/ibator-systests-ibatis3/ -- --- svn:ignore (added) +++ svn:ignore Sun Nov 8 04:11:33 2009 @@ -0,0 +1 @@ +target
svn commit: r827568 - in /ibatis/java/ibator/trunk/core: doc/ReleaseNotes.txt src/org/apache/ibatis/ibator/api/dom/java/Parameter.java src/org/apache/ibatis/ibator/internal/types/JavaTypeResolverDefau
Author: jgbutler
Date: Tue Oct 20 14:34:43 2009
New Revision: 827568
URL: http://svn.apache.org/viewvc?rev=827568view=rev
Log:
[ibator] Fixed spelling error LONCVARCHAR-LONGVARCHAR
Modified:
ibatis/java/ibator/trunk/core/doc/ReleaseNotes.txt
ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/api/dom/java/Parameter.java
ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/internal/types/JavaTypeResolverDefaultImpl.java
Modified: ibatis/java/ibator/trunk/core/doc/ReleaseNotes.txt
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/doc/ReleaseNotes.txt?rev=827568r1=827567r2=827568view=diff
==
--- ibatis/java/ibator/trunk/core/doc/ReleaseNotes.txt (original)
+++ ibatis/java/ibator/trunk/core/doc/ReleaseNotes.txt Tue Oct 20 14:34:43 2009
@@ -12,6 +12,7 @@
fields are null - thanks to Benjamin Klatt for finding this bug
4. Fixed IBATIS-601 - improper validation of generatedKey
5. Fixed IBATIS-609 - incorrect parsing of Java generic types
+6. Fixed spelling error LONCVARCHAR-LONGVARCHAR (thanks Allard)
Enhancements:
1. IBATIS-569 - Make it easier to override IbatorRules in plugins
@@ -34,6 +35,7 @@
the prefix ibatorgenerated_
15. Many refactorings to make way for iBATIS3
16. IBATIS-605 - Added Informix Dialect
+17. Added ability to set annotations on method parameters
---
Version 1.2.1:
Modified:
ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/api/dom/java/Parameter.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/api/dom/java/Parameter.java?rev=827568r1=827567r2=827568view=diff
==
---
ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/api/dom/java/Parameter.java
(original)
+++
ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/api/dom/java/Parameter.java
Tue Oct 20 14:34:43 2009
@@ -35,6 +35,11 @@
annotations = new ArrayListString();
}
+public Parameter(FullyQualifiedJavaType type, String name, String
annotation) {
+this(type, name);
+addAnnotation(annotation);
+}
+
/**
* @return Returns the name.
*/
Modified:
ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/internal/types/JavaTypeResolverDefaultImpl.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/internal/types/JavaTypeResolverDefaultImpl.java?rev=827568r1=827567r2=827568view=diff
==
---
ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/internal/types/JavaTypeResolverDefaultImpl.java
(original)
+++
ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/internal/types/JavaTypeResolverDefaultImpl.java
Tue Oct 20 14:34:43 2009
@@ -83,7 +83,7 @@
new FullyQualifiedJavaType(Object.class.getName(;
typeMap.put(Types.LONGVARBINARY, new
JdbcTypeInformation(LONGVARBINARY, //$NON-NLS-1$
new FullyQualifiedJavaType(byte[]))); //$NON-NLS-1$
-typeMap.put(Types.LONGVARCHAR, new JdbcTypeInformation(LONCVARCHAR,
//$NON-NLS-1$
+typeMap.put(Types.LONGVARCHAR, new JdbcTypeInformation(LONGVARCHAR,
//$NON-NLS-1$
new FullyQualifiedJavaType(String.class.getName(;
typeMap.put(Types.NULL, new JdbcTypeInformation(NULL, //$NON-NLS-1$
new FullyQualifiedJavaType(Object.class.getName(;
svn commit: r826043 - /ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java
Author: jgbutler
Date: Fri Oct 16 19:13:44 2009
New Revision: 826043
URL: http://svn.apache.org/viewvc?rev=826043view=rev
Log:
Can't call getString() on a BLOB column - makes the logger blow up.
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java?rev=826043r1=826042r2=826043view=diff
==
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java
Fri Oct 16 19:13:44 2009
@@ -64,7 +64,13 @@
StringBuilder row = new StringBuilder();
row.append(==Row: );
for (int i = 1; i = columnCount; i++) {
- String colname = rs.getString(i);
+ String colname;
+ try {
+colname = rs.getString(i);
+ } catch (SQLException e) {
+// generally can't call getString() on a BLOB column
+colname = Cannot Display;
+ }
row.append(colname);
if (i != columnCount) row.append(, );
}
svn commit: r824905 - in /ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/api/dom/java: Method.java Parameter.java
Author: jgbutler
Date: Tue Oct 13 20:16:44 2009
New Revision: 824905
URL: http://svn.apache.org/viewvc?rev=824905view=rev
Log:
[ibator] Add support for annotations on parameters
Modified:
ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/api/dom/java/Method.java
ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/api/dom/java/Parameter.java
Modified:
ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/api/dom/java/Method.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/api/dom/java/Method.java?rev=824905r1=824904r2=824905view=diff
==
---
ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/api/dom/java/Method.java
(original)
+++
ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/api/dom/java/Method.java
Tue Oct 13 20:16:44 2009
@@ -116,9 +116,7 @@
comma = true;
}
-sb.append(parameter.getType().getShortName());
-sb.append(' ');
-sb.append(parameter.getName());
+sb.append(parameter.getFormattedContent());
}
sb.append(')');
Modified:
ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/api/dom/java/Parameter.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/api/dom/java/Parameter.java?rev=824905r1=824904r2=824905view=diff
==
---
ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/api/dom/java/Parameter.java
(original)
+++
ibatis/java/ibator/trunk/core/src/org/apache/ibatis/ibator/api/dom/java/Parameter.java
Tue Oct 13 20:16:44 2009
@@ -15,6 +15,9 @@
*/
package org.apache.ibatis.ibator.api.dom.java;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author Jeff Butler
@@ -23,10 +26,13 @@
private String name;
private FullyQualifiedJavaType type;
+private ListString annotations;
+
public Parameter(FullyQualifiedJavaType type, String name) {
super();
this.name = name;
this.type = type;
+annotations = new ArrayListString();
}
/**
@@ -41,4 +47,32 @@
public FullyQualifiedJavaType getType() {
return type;
}
+
+public ListString getAnnotations() {
+return annotations;
+}
+
+public void addAnnotation(String annotation) {
+annotations.add(annotation);
+}
+
+public String getFormattedContent() {
+StringBuilder sb = new StringBuilder();
+
+for (String annotation : annotations) {
+sb.append(annotation);
+sb.append(' ');
+}
+
+sb.append(type.getShortName());
+sb.append(' ');
+sb.append(name);
+
+return sb.toString();
+}
+
+@Override
+public String toString() {
+return getFormattedContent();
+}
}
svn commit: r799904 - /ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/SetSqlNode.java
Author: jgbutler
Date: Sat Aug 1 18:17:14 2009
New Revision: 799904
URL: http://svn.apache.org/viewvc?rev=799904view=rev
Log:
Fix bug in the set tag
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/SetSqlNode.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/SetSqlNode.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/SetSqlNode.java?rev=799904r1=799903r2=799904view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/SetSqlNode.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/SetSqlNode.java
Sat Aug 1 18:17:14 2009
@@ -3,7 +3,7 @@
public class SetSqlNode extends TrimSqlNode {
public SetSqlNode(SqlNode contents) {
-super(contents, SET, null, null, ,);
+super(contents, SET, ,, null, null);
}
}
svn commit: r794130 - in /ibatis/trunk/java/tools/ibator/core: src/org/apache/ibatis/ibator/api/dom/java/ src/org/apache/ibatis/ibator/generator/ src/org/apache/ibatis/ibator/generator/ibatis2/model/
Author: jgbutler
Date: Wed Jul 15 02:12:41 2009
New Revision: 794130
URL: http://svn.apache.org/viewvc?rev=794130view=rev
Log:
[Ibator] Additional refactorings for iBATIS3
Removed:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/model/BaseModelClassGenerator.java
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaType.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/AbstractJavaGenerator.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/test/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTests.java
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaType.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaType.java?rev=794130r1=794129r2=794130view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaType.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaType.java
Wed Jul 15 02:12:41 2009
@@ -121,7 +121,18 @@
public ListString getImportList() {
ListString answer = new ArrayListString();
if (isExplicitlyImported()) {
-answer.add(baseQualifiedName);
+int index = baseShortName.indexOf('.');
+if (index == -1) {
+answer.add(baseQualifiedName);
+} else {
+// an inner class is specified, only import the top
+// level class
+StringBuilder sb = new StringBuilder();
+sb.append(packageName);
+sb.append('.');
+sb.append(baseShortName.substring(0, index));
+answer.add(sb.toString());
+}
}
for (FullyQualifiedJavaType fqjt : typeArguments) {
@@ -338,9 +349,16 @@
private void simpleParse(String typeSpecification) {
baseQualifiedName = typeSpecification.trim();
-int lastIndex = baseQualifiedName.lastIndexOf('.');
-if (lastIndex == -1) {
-baseShortName = typeSpecification;
+if (baseQualifiedName.contains(.)) {
+packageName = getPackage(baseQualifiedName);
+baseShortName = baseQualifiedName.substring(packageName.length() +
1);
+if (java.lang.equals(packageName)) { //$NON-NLS-1$
+explicitlyImported = false;
+} else {
+explicitlyImported = true;
+}
+} else {
+baseShortName = baseQualifiedName;
explicitlyImported = false;
packageName = ; //$NON-NLS-1$
@@ -372,14 +390,6 @@
primitive = false;
primitiveTypeWrapper = null;
}
-} else {
-baseShortName = baseQualifiedName.substring(lastIndex + 1);
-packageName = baseQualifiedName.substring(0, lastIndex);
-if (java.lang.equals(packageName)) { //$NON-NLS-1$
-explicitlyImported = false;
-} else {
-explicitlyImported = true;
-}
}
}
@@ -422,4 +432,32 @@
typeArguments.add(new FullyQualifiedJavaType(finalType));
}
}
+
+/**
+ * Returns the pack name of a fully qualified type.
+ *
+ * This method relies on convention - we assume that package names
+ * are all lower case. Not totally fool proof, but correct in
+ * most instances.
+ *
+ * @param baseQualifiedName
+ * @return
+ */
+private static String getPackage(String baseQualifiedName) {
+StringBuilder sb = new StringBuilder();
+StringTokenizer st = new StringTokenizer(baseQualifiedName, .);
+while (st.hasMoreTokens()) {
+String s = st.nextToken();
+if (Character.isUpperCase(s.charAt(0))) {
+break;
+} else {
+if (sb.length() 0) {
+sb.append('.');
+}
+sb.append(s);
+}
+}
+
+return sb.toString();
+}
}
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/AbstractJavaGenerator.java
URL:
http
svn commit: r792971 - /ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java
Author: jgbutler
Date: Fri Jul 10 15:05:39 2009
New Revision: 792971
URL: http://svn.apache.org/viewvc?rev=792971view=rev
Log:
Add parameter object to dynamic bindings
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java?rev=792971r1=792970r2=792971view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java
Fri Jul 10 15:05:39 2009
@@ -12,7 +12,7 @@
public DynamicContext(Object parameterObject) {
if (parameterObject instanceof Map) {
- bindings = (MapString,Object)parameterObject;
+ bindings.putAll((MapString,Object)parameterObject);
} else if (parameterObject != null) {
MetaObject metaObject = MetaObject.forObject(parameterObject);
String[] names = metaObject.getGetterNames();
@@ -20,6 +20,7 @@
bindings.put(name,metaObject.getValue(name));
}
}
+bindings.put(_parameter, parameterObject);
}
public MapString, Object getBindings() {
svn commit: r791980 - in /ibatis/trunk/java/ibatis-3/ibatis-3-core/src: main/java/org/apache/ibatis/builder/xml/ test/java/org/apache/ibatis/submitted/selectkey/
Author: jgbutler
Date: Tue Jul 7 21:19:25 2009
New Revision: 791980
URL: http://svn.apache.org/viewvc?rev=791980view=rev
Log:
Apply current namespace when looking up select key elements
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/CreateDB.sql
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/MapperConfig.xml
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/SelectKeyTest.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java?rev=791980r1=791979r2=791980view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java
Tue Jul 7 21:19:25 2009
@@ -47,6 +47,7 @@
String keyProperty = context.getStringAttribute(keyProperty);
KeyGenerator keyGenerator;
String keyStatementId = id + SelectKeyGenerator.SELECT_KEY_SUFFIX;
+keyStatementId = builderAssistant.applyCurrentNamespace(keyStatementId);
if (configuration.hasKeyGenerator(keyStatementId)) {
keyGenerator = configuration.getKeyGenerator(keyStatementId);
} else {
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/CreateDB.sql
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/CreateDB.sql?rev=791980view=auto
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/CreateDB.sql
(added)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/CreateDB.sql
Tue Jul 7 21:19:25 2009
@@ -0,0 +1,9 @@
+create table table1 (
+ id int generated by default as identity (start with 11) not null,
+ name varchar(20)
+);
+
+create table table2 (
+ id int generated by default as identity (start with 22) not null,
+ name varchar(20)
+);
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/MapperConfig.xml
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/MapperConfig.xml?rev=791980r1=791979r2=791980view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/MapperConfig.xml
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/MapperConfig.xml
Tue Jul 7 21:19:25 2009
@@ -5,6 +5,19 @@
http://ibatis.apache.org/dtd/ibatis-3-config.dtd;
configuration
+ environments default=development
+environment id=development
+ transactionManager type=JDBC
+property name= value=/
+ /transactionManager
+ dataSource type=UNPOOLED
+property name=driver value=org.hsqldb.jdbcDriver/
+property name=url value=jdbc:hsqldb:mem:lname/
+property name=username value=sa/
+ /dataSource
+/environment
+ /environments
+
mappers
mapper resource=org/apache/ibatis/submitted/selectkey/Table1.xml/
mapper resource=org/apache/ibatis/submitted/selectkey/Table2.xml/
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/SelectKeyTest.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/SelectKeyTest.java?rev=791980r1=791979r2=791980view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/SelectKeyTest.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/SelectKeyTest.java
Tue Jul 7 21:19:25 2009
@@ -1,14 +1,54 @@
package org.apache.ibatis.submitted.selectkey;
import org.apache.ibatis.io.Resources;
+import org.apache.ibatis.jdbc.ScriptRunner;
import org.apache.ibatis.session.*;
+
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.BeforeClass;
import org.junit.Test;
+import java.io.PrintWriter;
import java.io.Reader;
+import java.sql.Connection;
+import
svn commit: r791993 - /ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
Author: jgbutler
Date: Tue Jul 7 22:18:20 2009
New Revision: 791993
URL: http://svn.apache.org/viewvc?rev=791993view=rev
Log:
Fix a silly upper case error
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java?rev=791993r1=791992r2=791993view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
Tue Jul 7 22:18:20 2009
@@ -155,7 +155,7 @@
for (int i = 1, n = rsmd.getColumnCount(); i = n; i++) {
boolean useLabel = mappedStatement.getConfiguration().isUseColumnLabel();
String columnLabel = (useLabel ? rsmd.getColumnLabel(i) :
rsmd.getColumnName(i));
- columnLabel.toUpperCase();
+ columnLabel = columnLabel.toUpperCase();
String propName = metaResultObject.findProperty(columnLabel);
colSet.add(columnLabel);
if (propName != null) {
svn commit: r791615 - in /ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic: DynamicContext.java ForEachSqlNode.java PrefixSqlNode.java
Author: jgbutler
Date: Mon Jul 6 21:05:34 2009
New Revision: 791615
URL: http://svn.apache.org/viewvc?rev=791615view=rev
Log:
Make nested foreach tags work
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ForEachSqlNode.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/PrefixSqlNode.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java?rev=791615r1=791614r2=791615view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicContext.java
Mon Jul 6 21:05:34 2009
@@ -8,6 +8,7 @@
private MapString,Object bindings = new HashMapString,Object();
private StringBuilder sqlBuilder = new StringBuilder();
+ private int uniqueNumber = 0;
public DynamicContext(Object parameterObject) {
if (parameterObject instanceof Map) {
@@ -37,5 +38,8 @@
public String getSql() {
return sqlBuilder.toString().trim();
}
-
+
+ public int getUniqueNumber() {
+return uniqueNumber++;
+ }
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ForEachSqlNode.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ForEachSqlNode.java?rev=791615r1=791614r2=791615view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ForEachSqlNode.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ForEachSqlNode.java
Mon Jul 6 21:05:34 2009
@@ -32,9 +32,10 @@
int i = 0;
for (Object o : iterable) {
first = applySeparator(context, first);
- applyItem(context, o, i);
+ int uniqueNumber = context.getUniqueNumber();
+ applyItem(context, o, uniqueNumber);
applyIndex(context, i);
- contents.apply(new FilteredDynamicContext(context, item, i));
+ contents.apply(new FilteredDynamicContext(context, item, uniqueNumber));
i++;
}
applyClose(context);
@@ -117,6 +118,11 @@
delegate.appendSql(parser.parse(sql));
}
+
+@Override
+public int getUniqueNumber() {
+ return delegate.getUniqueNumber();
+}
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/PrefixSqlNode.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/PrefixSqlNode.java?rev=791615r1=791614r2=791615view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/PrefixSqlNode.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/PrefixSqlNode.java
Mon Jul 6 21:05:34 2009
@@ -72,6 +72,11 @@
public String getSql() {
return delegate.getSql();
}
+
+@Override
+public int getUniqueNumber() {
+ return delegate.getUniqueNumber();
+}
}
}
svn commit: r790258 - in /ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested: NestedForEach.xml NestedForEachTest.java
Author: jgbutler
Date: Wed Jul 1 16:45:28 2009
New Revision: 790258
URL: http://svn.apache.org/viewvc?rev=790258view=rev
Log:
A more complex nested foreach test
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/NestedForEach.xml
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/NestedForEachTest.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/NestedForEach.xml
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/NestedForEach.xml?rev=790258r1=790257r2=790258view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/NestedForEach.xml
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/NestedForEach.xml
Wed Jul 1 16:45:28 2009
@@ -15,7 +15,7 @@
select *
from names
where
- foreach collection=names item=name
+ foreach collection=names item=name separator=or
foreach collection=name.firstNames item=firstName separator=or
(lastName = #{name.lastName} and firstName = #{firstName})
/foreach
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/NestedForEachTest.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/NestedForEachTest.java?rev=790258r1=790257r2=790258view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/NestedForEachTest.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/NestedForEachTest.java
Wed Jul 1 16:45:28 2009
@@ -89,4 +89,31 @@
sqlSession.close();
}
}
+
+@Test
+@SuppressWarnings(unchecked)
+public void testNestedSelect2() {
+SqlSession sqlSession = sqlSessionFactory.openSession();
+try {
+Name name = new Name();
+name.setLastName(Flintstone);
+name.addFirstName(Fred);
+name.addFirstName(Wilma);
+
+Parameter parameter = new Parameter();
+parameter.addName(name);
+
+name = new Name();
+name.setLastName(Rubble);
+name.addFirstName(Betty);
+parameter.addName(name);
+
+ListMapString, Object answer =
+
sqlSession.selectList(org.apache.ibatis.submitted.nested.nestedSelect,
parameter);
+
+assertEquals(3, answer.size());
+} finally {
+sqlSession.close();
+}
+}
}
svn commit: r789882 - in /ibatis/trunk/java/ibatis-3/ibatis-3-core/src: main/java/org/apache/ibatis/builder/xml/dynamic/ test/java/org/apache/ibatis/submitted/criterion/
Author: jgbutler
Date: Tue Jun 30 19:15:12 2009
New Revision: 789882
URL: http://svn.apache.org/viewvc?rev=789882view=rev
Log:
Fix and test for allowing OGNL expressions in string substitutions
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/criterion/
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/criterion/CreateDB.sql
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/criterion/Criterion.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/criterion/Criterion.xml
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/criterion/CriterionTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/criterion/MapperConfig.xml
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/criterion/Parameter.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TextSqlNode.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TextSqlNode.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TextSqlNode.java?rev=789882r1=789881r2=789882view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TextSqlNode.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TextSqlNode.java
Tue Jun 30 19:15:12 2009
@@ -1,5 +1,8 @@
package org.apache.ibatis.builder.xml.dynamic;
+import org.apache.ibatis.builder.BuilderException;
+import org.apache.ibatis.ognl.Ognl;
+import org.apache.ibatis.ognl.OgnlException;
import org.apache.ibatis.parsing.GenericTokenParser;
public class TextSqlNode implements SqlNode {
@@ -24,7 +27,12 @@
}
public String handleToken(String content) {
- return String.valueOf(context.getBindings().get(content));
+ try {
+Object value = Ognl.getValue(content, context.getBindings());
+return String.valueOf(value);
+ } catch (OgnlException e) {
+throw new BuilderException(Error evaluating expression '+content+'.
Cause: + e, e);
+ }
}
}
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/criterion/CreateDB.sql
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/criterion/CreateDB.sql?rev=789882view=auto
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/criterion/CreateDB.sql
(added)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/criterion/CreateDB.sql
Tue Jun 30 19:15:12 2009
@@ -0,0 +1,12 @@
+create table names (
+ id int,
+ firstName varchar(20),
+ lastName varchar(20)
+);
+
+insert into names (id, firstName, lastName) values(1, 'Fred', 'Flintstone');
+insert into names (id, firstName, lastName) values(2, 'Wilma', 'Flintstone');
+insert into names (id, firstName, lastName) values(3, 'Pebbles', 'Flintstone');
+insert into names (id, firstName, lastName) values(4, 'Barney', 'Rubble');
+insert into names (id, firstName, lastName) values(5, 'Betty', 'Rubble');
+insert into names (id, firstName, lastName) values(6, 'Bamm Bamm', 'Rubble');
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/criterion/Criterion.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/criterion/Criterion.java?rev=789882view=auto
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/criterion/Criterion.java
(added)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/criterion/Criterion.java
Tue Jun 30 19:15:12 2009
@@ -0,0 +1,18 @@
+package org.apache.ibatis.submitted.criterion;
+
+public class Criterion {
+private String test;
+private Object value;
+public String getTest() {
+return test;
+}
+public void setTest(String test) {
+this.test = test;
+}
+public Object getValue() {
+return value;
+}
+public void setValue(Object value) {
+this.value = value;
+}
+}
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/criterion/Criterion.xml
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/criterion/Criterion.xml?rev=789882view=auto
svn commit: r789162 - in /ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested: ./ CreateDB.sql MapperConfig.xml Name.java NestedForEach.xml NestedForEachTest.java
Author: jgbutler
Date: Sun Jun 28 22:02:35 2009
New Revision: 789162
URL: http://svn.apache.org/viewvc?rev=789162view=rev
Log:
More forEach tests
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/CreateDB.sql
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/MapperConfig.xml
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/Name.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/NestedForEach.xml
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/NestedForEachTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/Parameter.java
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/CreateDB.sql
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/CreateDB.sql?rev=789162view=auto
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/CreateDB.sql
(added)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/CreateDB.sql
Sun Jun 28 22:02:35 2009
@@ -0,0 +1,12 @@
+create table names (
+ id int,
+ firstName varchar(20),
+ lastName varchar(20)
+);
+
+insert into names (id, firstName, lastName) values(1, 'Fred', 'Flintstone');
+insert into names (id, firstName, lastName) values(2, 'Wilma', 'Flintstone');
+insert into names (id, firstName, lastName) values(3, 'Pebbles', 'Flintstone');
+insert into names (id, firstName, lastName) values(4, 'Barney', 'Rubble');
+insert into names (id, firstName, lastName) values(5, 'Betty', 'Rubble');
+insert into names (id, firstName, lastName) values(6, 'Bamm Bamm', 'Rubble');
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/MapperConfig.xml
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/MapperConfig.xml?rev=789162view=auto
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/MapperConfig.xml
(added)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/MapperConfig.xml
Sun Jun 28 22:02:35 2009
@@ -0,0 +1,29 @@
+?xml version=1.0 encoding=UTF-8 ?
+
+!DOCTYPE configuration
+PUBLIC -//ibatis.apache.org//DTD Config 3.0//EN
+http://ibatis.apache.org/dtd/ibatis-3-config.dtd;
+configuration
+
+ typeAliases
+typeAlias alias=Parameter
type=org.apache.ibatis.submitted.nested.Parameter/
+ /typeAliases
+
+ environments default=development
+environment id=development
+ transactionManager type=JDBC
+property name= value=/
+ /transactionManager
+ dataSource type=UNPOOLED
+property name=driver value=org.hsqldb.jdbcDriver/
+property name=url value=jdbc:hsqldb:mem:aname/
+property name=username value=sa/
+ /dataSource
+/environment
+ /environments
+
+ mappers
+mapper resource=org/apache/ibatis/submitted/nested/NestedForEach.xml /
+ /mappers
+
+/configuration
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/Name.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/Name.java?rev=789162view=auto
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/Name.java
(added)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/Name.java
Sun Jun 28 22:02:35 2009
@@ -0,0 +1,24 @@
+package org.apache.ibatis.submitted.nested;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Name {
+private String lastName;
+private ListString firstNames;
+public Name() {
+firstNames = new ArrayListString();
+}
+public String getLastName() {
+return lastName;
+}
+public void setLastName(String lastName) {
+this.lastName = lastName;
+}
+public ListString getFirstNames() {
+return firstNames;
+}
+public void addFirstName(String firstName) {
+firstNames.add(firstName);
+}
+}
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested/NestedForEach.xml
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/nested
svn commit: r785762 - in /ibatis/trunk/java/tools/ibator/core: build/ devlib/ test/org/apache/ibatis/ibator/api/dom/java/ test/org/apache/ibatis/ibator/internal/util/
Author: jgbutler
Date: Wed Jun 17 19:18:19 2009
New Revision: 785762
URL: http://svn.apache.org/viewvc?rev=785762view=rev
Log:
[Ibator] Upgrade JUnit
Added:
ibatis/trunk/java/tools/ibator/core/devlib/junit-4.6.jar (with props)
Removed:
ibatis/trunk/java/tools/ibator/core/devlib/junit.jar
Modified:
ibatis/trunk/java/tools/ibator/core/build/version.properties
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTests.java
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/internal/util/JavaBeansUtilTests.java
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=785762r1=785761r2=785762view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Wed Jun 17
19:18:19 2009
@@ -1,4 +1,4 @@
#Ibator build version info
-#Tue Jun 16 17:01:10 CDT 2009
+#Wed Jun 17 13:58:14 CDT 2009
version=1.2.2
-buildNum=745
+buildNum=746
Added: ibatis/trunk/java/tools/ibator/core/devlib/junit-4.6.jar
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/devlib/junit-4.6.jar?rev=785762view=auto
==
Binary file - no diff available.
Propchange: ibatis/trunk/java/tools/ibator/core/devlib/junit-4.6.jar
--
svn:mime-type = application/octet-stream
Modified:
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTests.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTests.java?rev=785762r1=785761r2=785762view=diff
==
---
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTests.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTests.java
Wed Jun 17 19:18:19 2009
@@ -16,14 +16,19 @@
package org.apache.ibatis.ibator.api.dom.java;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
/**
* @author Jeff Butler
*
*/
-public class FullyQualifiedJavaTypeTests extends TestCase {
+public class FullyQualifiedJavaTypeTests {
+@Test
public void testJavaType() {
FullyQualifiedJavaType fqjt =
new FullyQualifiedJavaType(java.lang.String); //$NON-NLS-1$
@@ -34,6 +39,7 @@
assertEquals(0, fqjt.getImportList().size());
}
+@Test
public void testSimpleType() {
FullyQualifiedJavaType fqjt =
new FullyQualifiedJavaType(com.foo.Bar); //$NON-NLS-1$
@@ -44,6 +50,7 @@
assertEquals(1, fqjt.getImportList().size());
}
+@Test
public void testGenericType1() {
FullyQualifiedJavaType fqjt =
new FullyQualifiedJavaType(java.util.Listjava.lang.String);
//$NON-NLS-1$
@@ -55,6 +62,7 @@
}
+@Test
public void testGenericType2() {
FullyQualifiedJavaType fqjt =
new FullyQualifiedJavaType(java.util.Mapjava.lang.String,
java.util.Listjava.lang.String); //$NON-NLS-1$
@@ -66,6 +74,7 @@
}
+@Test
public void testGenericType3() {
FullyQualifiedJavaType listOfStrings = new
FullyQualifiedJavaType(java.util.List); //$NON-NLS-1$
listOfStrings.addTypeArgument(new
FullyQualifiedJavaType(java.lang.String)); //$NON-NLS-1$
Modified:
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/internal/util/JavaBeansUtilTests.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/internal/util/JavaBeansUtilTests.java?rev=785762r1=785761r2=785762view=diff
==
---
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/internal/util/JavaBeansUtilTests.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/internal/util/JavaBeansUtilTests.java
Wed Jun 17 19:18:19 2009
@@ -16,15 +16,16 @@
package org.apache.ibatis.ibator.internal.util;
-import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
+import org.junit.Test;
/**
* @author Jeff Butler
*
*/
-public class JavaBeansUtilTests extends TestCase {
+public class
svn commit: r785424 - in /ibatis/trunk/java/tools/ibator/core: build/ doc/ htmldoc/ src/org/apache/ibatis/ibator/api/dom/ src/org/apache/ibatis/ibator/api/dom/java/ test/org/apache/ibatis/ibator/api/
Author: jgbutler
Date: Tue Jun 16 21:55:57 2009
New Revision: 785424
URL: http://svn.apache.org/viewvc?rev=785424view=rev
Log:
[Ibator] Fix for IBATIS-609 - incorrect parsing of Java generic types
Added:
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/api/
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/api/dom/
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/api/dom/java/
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTests.java
Modified:
ibatis/trunk/java/tools/ibator/core/build/version.properties
ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt
ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/OutputUtilities.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/CompilationUnit.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaType.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/Interface.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/TopLevelClass.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/java/TopLevelEnumeration.java
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=785424r1=785423r2=785424view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Tue Jun 16
21:55:57 2009
@@ -1,4 +1,4 @@
#Ibator build version info
-#Mon Jun 08 17:15:58 CDT 2009
+#Tue Jun 16 16:44:16 CDT 2009
version=1.2.2
-buildNum=742
+buildNum=744
Modified: ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt?rev=785424r1=785423r2=785424view=diff
==
--- ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt (original)
+++ ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt Tue Jun 16
21:55:57 2009
@@ -11,6 +11,7 @@
3. Fixed NPE and incorrect calculation in generated equals when certain
fields are null - thanks to Benjamin Klatt for finding this bug
4. Fixed IBATIS-601 - improper validation of generatedKey
+5. Fixed IBATIS-609 - incorrect parsing of Java generic types
Enhancements:
1. IBATIS-569 - Make it easier to override IbatorRules in plugins
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=785424r1=785423r2=785424view=diff
==
--- ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html (original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html Tue Jun 16
21:55:57 2009
@@ -60,6 +60,7 @@
(from EqualsHashCodePlugin) when certain
fields are null - thanks to Benjamin Klatt for finding this bug./li
liIBATIS-601 - improper validation of lt;generatedKeygt;/li
+ liIBATIS-609 - incorrect parsing of Java generic types/li
/ul
h3Enhancements/h3
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/OutputUtilities.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/OutputUtilities.java?rev=785424r1=785423r2=785424view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/OutputUtilities.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/dom/OutputUtilities.java
Tue Jun 16 21:55:57 2009
@@ -15,6 +15,11 @@
*/
package org.apache.ibatis.ibator.api.dom;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
+
/**
* @author Jeff Butler
*/
@@ -75,4 +80,25 @@
public static void newLine(StringBuilder sb) {
sb.append(lineSeparator);
}
+
+/**
+ * returns a unique set of import xxx; Strings for the set of types
+ * @param importedTypes
+ * @return
+ */
+public static SetString calculateImports(SetFullyQualifiedJavaType
importedTypes) {
+StringBuilder sb = new StringBuilder();
+SetString importStrings = new TreeSetString();
+for (FullyQualifiedJavaType fqjt : importedTypes) {
+for (String importString : fqjt.getImportList()) {
+sb.setLength(0);
+sb.append(import ); //$NON-NLS-1
svn commit: r785428 - in /ibatis/trunk/java/tools/ibator/core: build/version.properties doc/ReleaseNotes.txt htmldoc/configreference/generatedKey.html htmldoc/whatsNew.html src/org/apache/ibatis/ibato
Author: jgbutler
Date: Tue Jun 16 22:13:32 2009
New Revision: 785428
URL: http://svn.apache.org/viewvc?rev=785428view=rev
Log:
[Ibator] Fix for IBATIS-605 - Informix Dialect
Modified:
ibatis/trunk/java/tools/ibator/core/build/version.properties
ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt
ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/generatedKey.html
ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseDialects.java
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=785428r1=785427r2=785428view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Tue Jun 16
22:13:32 2009
@@ -1,4 +1,4 @@
#Ibator build version info
-#Tue Jun 16 16:44:16 CDT 2009
+#Tue Jun 16 17:01:10 CDT 2009
version=1.2.2
-buildNum=744
+buildNum=745
Modified: ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt?rev=785428r1=785427r2=785428view=diff
==
--- ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt (original)
+++ ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt Tue Jun 16
22:13:32 2009
@@ -33,6 +33,7 @@
change the XML merger so that the XML ids no longer need to contain
the prefix ibatorgenerated_
15. Many refactorings to make way for iBATIS3
+16. IBATIS-605 - Added Informix Dialect
---
Version 1.2.1:
Modified:
ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/generatedKey.html
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/generatedKey.html?rev=785428r1=785427r2=785428view=diff
==
---
ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/generatedKey.html
(original)
+++
ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/generatedKey.html
Tue Jun 16 22:13:32 2009
@@ -62,6 +62,10 @@
tdThis will translate to: codeCALL IDENTITY()/code/td
/tr
tr
+ th valign=topInformix/th
+ tdThis will translate to: codeselect
dbinfo('sqlca.sqlerrd1') from systables where tabid=1/code/td
+/tr
+tr
thMySql/th
tdThis will translate to: codeSELECT
LAST_INSERT_ID()/code/td
/tr
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=785428r1=785427r2=785428view=diff
==
--- ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html (original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html Tue Jun 16
22:13:32 2009
@@ -105,6 +105,8 @@
plugins./li
liFixed addCriterionfor JDBC* methods so that they all do a null
check./li
liFixed IbatorRunner so that configuration errors are shown (thanks to
Karel Rank)/li
+ liIBATIS-605 - Added Informix Dialect for
+ a href=configreference/generatedKey.htmllt;generatedKeygt;/a/li
/ul
h2Version 1.2.1/h2
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseDialects.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseDialects.java?rev=785428r1=785427r2=785428view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseDialects.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseDialects.java
Tue Jun 16 22:13:32 2009
@@ -29,7 +29,8 @@
DERBY(VALUES IDENTITY_VAL_LOCAL()), //$NON-NLS-1$
HSQLDB(CALL IDENTITY()), //$NON-NLS-1$
SYBASE(SELECT @@IDENTITY), //$NON-NLS-1$
-DB2_MF(SELECT IDENTITY_VAL_LOCAL() FROM SYSIBM.SYSDUMMY1); //$NON-NLS-1$
+DB2_MF(SELECT IDENTITY_VAL_LOCAL() FROM SYSIBM.SYSDUMMY1), //$NON-NLS-1$
+INFORMIX(select dbinfo('sqlca.sqlerrd1') from systables where tabid=1);
//$NON-NLS-1$
private String identityRetrievalStatement;
@@ -69,6 +70,8 @@
returnValue = SYBASE;
} else if (DB2_MF.equalsIgnoreCase(database)) { //$NON-NLS-1$
returnValue = DB2_MF;
+} else if (Informix.equalsIgnoreCase(database)) { //$NON-NLS-1$
+returnValue = INFORMIX
svn commit: r774520 - in /ibatis/trunk/java/tools/ibator/core: build/ doc/ htmldoc/ src/org/apache/ibatis/ibator/api/ src/org/apache/ibatis/ibator/config/ src/org/apache/ibatis/ibator/internal/util/me
Author: jgbutler
Date: Wed May 13 20:40:34 2009
New Revision: 774520
URL: http://svn.apache.org/viewvc?rev=774520view=rev
Log:
[Ibator] Fix for IBATIS-601 - improper validation of generatedKey. Also took
the opportunity to improve validation in several other places.
Modified:
ibatis/trunk/java/tools/ibator/core/build/version.properties
ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt
ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorRunner.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/ColumnOverride.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/ColumnRenamingRule.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/GeneratedKey.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorConfiguration.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IgnoredColumn.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/JavaModelGeneratorConfiguration.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/SqlMapGeneratorConfiguration.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/TableConfiguration.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties
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=774520r1=774519r2=774520view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Wed May 13
20:40:34 2009
@@ -1,4 +1,4 @@
#Ibator build version info
-#Tue Apr 28 18:50:09 CDT 2009
+#Wed May 13 15:35:15 CDT 2009
version=1.2.2
-buildNum=729
+buildNum=732
Modified: ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt?rev=774520r1=774519r2=774520view=diff
==
--- ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt (original)
+++ ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt Wed May 13
20:40:34 2009
@@ -10,6 +10,7 @@
across lines
3. Fixed NPE and incorrect calculation in generated equals when certain
fields are null - thanks to Benjamin Klatt for finding this bug
+4. Fixed IBATIS-601 - improper validation of generatedKey
Enhancements:
1. IBATIS-569 - Make it easier to override IbatorRules in plugins
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=774520r1=774519r2=774520view=diff
==
--- ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html (original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html Wed May 13
20:40:34 2009
@@ -53,7 +53,7 @@
liFixed NPE and incorrect calculation in generated equals method
(from EqualsHashCodePlugin) when certain
fields are null - thanks to Benjamin Klatt for finding this bug./li
-
+ liIBATIS-601 - improper validation of lt;generatedKeygt;/li
/ul
h3Enhancements/h3
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorRunner.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorRunner.java?rev=774520r1=774519r2=774520view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorRunner.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorRunner.java
Wed May 13 20:40:34 2009
@@ -46,6 +46,8 @@
private static final String TABLES = -tables; //$NON-NLS-1$
private static final String VERBOSE = -verbose; //$NON-NLS-1$
private static final String FORCE_JAVA_LOGGING = -forceJavaLogging;
//$NON-NLS-1$
+private static final String HELP_1 = -?; //$NON-NLS-1$
+private static final String HELP_2 = -h; //$NON-NLS-1$
public static void main(String[] args) {
if (args.length == 0) {
@@ -56,6 +58,12 @@
MapString, String arguments = parseCommandLine(args);
+if (arguments.containsKey(HELP_1)) {
+usage();
+System.exit(0
svn commit: r773765 - in /ibatis/trunk/java/tools/ibator/core: build/ doc/ htmldoc/ htmldoc/reference/ src/org/apache/ibatis/ibator/api/ src/org/apache/ibatis/ibator/exception/ src/org/apache/ibatis/i
Author: jgbutler Date: Tue May 12 02:28:03 2009 New Revision: 773765 URL: http://svn.apache.org/viewvc?rev=773765view=rev Log: [Ibator] Show errors properly when there is a configuration error. Also some changes to IntrospectedTable attributes Added: ibatis/trunk/java/tools/ibator/core/htmldoc/reference/attributes.html Modified: ibatis/trunk/java/tools/ibator/core/build/version.properties ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt ibatis/trunk/java/tools/ibator/core/htmldoc/menu.html ibatis/trunk/java/tools/ibator/core/htmldoc/reference/intro.html ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorRunner.java 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/exception/InvalidConfigurationException.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/XmlConstants.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/RenameExampleClassPlugin.java 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=773765r1=773764r2=773765view=diff == --- ibatis/trunk/java/tools/ibator/core/build/version.properties (original) +++ ibatis/trunk/java/tools/ibator/core/build/version.properties Tue May 12 02:28:03 2009 @@ -1,4 +1,4 @@ #Ibator build version info -#Wed Apr 22 12:17:30 CDT 2009 +#Tue Apr 28 18:50:09 CDT 2009 version=1.2.2 -buildNum=727 +buildNum=729 Modified: ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt?rev=773765r1=773764r2=773765view=diff == --- ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt (original) +++ ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt Tue May 12 02:28:03 2009 @@ -26,6 +26,7 @@ 10. Gather column comments during introspection 11. IBATIS-592 - Additional attributes for SqlMaps 12. Fixed addCriterionfor JDBC* methods so that they all do a null check +13. Fixed IbatorRunner so that configuration errors are shown (thanks to Karel Rank) --- Version 1.2.1: Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/menu.html URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/menu.html?rev=773765r1=773764r2=773765view=diff == --- ibatis/trunk/java/tools/ibator/core/htmldoc/menu.html (original) +++ ibatis/trunk/java/tools/ibator/core/htmldoc/menu.html Tue May 12 02:28:03 2009 @@ -52,6 +52,7 @@ nbsp;nbsp;a href=reference/building.html target=mainFrameBuilding Ibator from Source/abr/ nbsp;nbsp;a href=reference/extending.html target=mainFrameExtending Ibator/abr/ nbsp;nbsp;a href=reference/pluggingIn.html target=mainFrameImplementing Ibator Plugins/abr/ + nbsp;nbsp;a href=reference/attributes.html target=mainFrameIntrospected Table Attributes/abr/ nbsp;nbsp;a href=reference/logging.html target=mainFrameLogging Information/abr/ a href=philosophy.html target=mainFrameDesign Philosophy/abr/ a href=license.html target=mainFrameLicensing Information/abr/ Added: ibatis/trunk/java/tools/ibator/core/htmldoc/reference/attributes.html URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/reference/attributes.html?rev=773765view=auto == --- ibatis/trunk/java/tools/ibator/core/htmldoc/reference/attributes.html (added) +++ ibatis/trunk/java/tools/ibator/core/htmldoc/reference/attributes.html Tue May 12 02:28:03 2009 @@ -0,0 +1,60 @@ +!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN + http://www.w3c.org/TR/xhtml1/DTD/xhtml1-transitional.dtd; + +html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en +head + titleIntrospected Table Attributes/title + link type=text/css rel=stylesheet href=../ibator.css/ +/head +body + +div class=menuNav + p +a href=../index.html target=_topShow Menu/a +a href=attributes.html target=_topHide Menu/a + /p +/div + +h1Introspected Table Attributes/h1 +pAfter the database introspection step, and before code generation begins, + Ibator calculates many attributes that are used by the actual code generators. + Plugins can override any of these attributes before code generation by + implementing the codeinitialized/code method./p + +table
svn commit: r758304 - in /ibatis/trunk/java/tools/ibator/core: build/version.properties doc/ReleaseNotes.txt htmldoc/whatsNew.html src/org/apache/ibatis/ibator/plugins/EqualsHashCodePlugin.java testJa
Author: jgbutler
Date: Wed Mar 25 15:37:31 2009
New Revision: 758304
URL: http://svn.apache.org/viewvc?rev=758304view=rev
Log:
[Ibator] NPE and incorrect calculation in generated equals methods when fields
are null
Modified:
ibatis/trunk/java/tools/ibator/core/build/version.properties
ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt
ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/EqualsHashCodePlugin.java
ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java5/FlatJava5Tests.java
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=758304r1=758303r2=758304view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Wed Mar 25
15:37:31 2009
@@ -1,4 +1,4 @@
#Ibator build version info
-#Fri Mar 20 15:17:17 CDT 2009
+#Wed Mar 25 10:30:37 CDT 2009
version=1.2.2
-buildNum=717
+buildNum=724
Modified: ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt?rev=758304r1=758303r2=758304view=diff
==
--- ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt (original)
+++ ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt Wed Mar 25
15:37:31 2009
@@ -8,6 +8,8 @@
1. Fixed NPE when no DAOs are generated
2. Fixed IBATIS-579 - don't allow column names with spaces to break
across lines
+3. Fixed NPE and incorrect calculation in generated equals when certain
+ fields are null - thanks to Benjamin Klatt for finding this bug
Enhancements:
1. IBATIS-569 - Make it easier to override IbatorRules in plugins
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=758304r1=758303r2=758304view=diff
==
--- ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html (original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html Wed Mar 25
15:37:31 2009
@@ -50,6 +50,10 @@
liNPE when no DAOs are generated./li
liIBATIS-579 - Don't allow column names that contain spaces to
break across lines in generated XML./li
+ liFixed NPE and incorrect calculation in generated equals method
+ (from EqualsHashCodePlugin) when certain
+ fields are null - thanks to Benjamin Klatt for finding this bug./li
+
/ul
h3Enhancements/h3
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/EqualsHashCodePlugin.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/EqualsHashCodePlugin.java?rev=758304r1=758303r2=758304view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/EqualsHashCodePlugin.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/EqualsHashCodePlugin.java
Wed Mar 25 15:37:31 2009
@@ -154,11 +154,11 @@
sb.setLength(0);
if (first) {
-sb.append(return ); //$NON-NLS-1$
+sb.append(return (); //$NON-NLS-1$
first = false;
} else {
OutputUtilities.javaIndent(sb, 1);
-sb.append( ); //$NON-NLS-1$
+sb.append( (); //$NON-NLS-1$
}
String getterMethod = JavaBeansUtil.getGetterMethodName(
@@ -172,15 +172,17 @@
sb.append(() == ); //$NON-NLS-1$
sb.append(other.); //$NON-NLS-1$
sb.append(getterMethod);
-sb.append(()); //$NON-NLS-1$
+sb.append(())); //$NON-NLS-1$
} else {
sb.append(this.); //$NON-NLS-1$
sb.append(getterMethod);
-sb.append(() == null ? other == null : this.); //$NON-NLS-1$
+sb.append(() == null ? other.); //$NON-NLS-1$
+sb.append(getterMethod);
+sb.append(() == null : this.); //$NON-NLS-1$
sb.append(getterMethod);
sb.append(().equals(other.); //$NON-NLS-1$
sb.append(getterMethod);
-sb.append(())); //$NON-NLS-1$
+sb.append((; //$NON-NLS-1$
}
if (!iter.hasNext()) {
Modified:
ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/flat/java5/FlatJava5Tests.java
URL:
http://svn.apache.org/viewvc
svn commit: r758350 - in /ibatis/trunk/java/tools/ibator/core: build/ htmldoc/reference/ src/org/apache/ibatis/ibator/api/ src/org/apache/ibatis/ibator/internal/util/messages/ src/org/apache/ibatis/ib
Author: jgbutler
Date: Wed Mar 25 17:18:04 2009
New Revision: 758350
URL: http://svn.apache.org/viewvc?rev=758350view=rev
Log:
[Ibator] Some improvements to the logging API
Added:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/logging/AbstractLogFactory.java
Modified:
ibatis/trunk/java/tools/ibator/core/build/version.properties
ibatis/trunk/java/tools/ibator/core/htmldoc/reference/logging.html
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/CommentGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/logging/LogFactory.java
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=758350r1=758349r2=758350view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Wed Mar 25
17:18:04 2009
@@ -1,4 +1,4 @@
#Ibator build version info
-#Wed Mar 25 10:30:37 CDT 2009
+#Wed Mar 25 11:41:10 CDT 2009
version=1.2.2
-buildNum=724
+buildNum=725
Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/reference/logging.html
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/reference/logging.html?rev=758350r1=758349r2=758350view=diff
==
--- ibatis/trunk/java/tools/ibator/core/htmldoc/reference/logging.html
(original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/reference/logging.html Wed Mar
25 17:18:04 2009
@@ -49,6 +49,21 @@
pcodeorg.apache.ibatis.ibator.logging.LogFactory.forceJavaLogging();/code/p
pbImportant:/b You should specify the above line of code ibefore/i
any other Ibator code./p
+h2Supplying an Alternate Implementation/h2
+pIf you prefer to use a different logging implementation than Log4J or
+standard Java logging, you may supply an alternate implementation of the key
logging
+interfaces as follows:/p
+ol
+ liCreate an implementation of the
codeorg.apache.ibatis.ibator.logging.Log/code
+ interface that implements the key logging methods for you logging
implementation
+ of choice./li
+ liCreate an implementation of the
codeorg.apache.ibatis.ibator.logging.AbstractLogFactory/code
+ interface that will return instances of your codeLog/code
implementation./li
+ liConfigure Ibator to use your new LogFactory by calling the method
+
codeorg.apache.ibatis.ibator.logging.LogFactory.setLogFactory(AbstractLogFactory)/code
+ and supplying an instance of your codeAbstractLogFactory/code
implementation./li
+/ol
+
h2Configuring Log4J Logging/h2
pThe following is a sample Log4J configuration file:/p
pre
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/CommentGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/CommentGenerator.java?rev=758350r1=758349r2=758350view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/CommentGenerator.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/CommentGenerator.java
Wed Mar 25 17:18:04 2009
@@ -54,7 +54,7 @@
*
* @param field
* @param introspectedTable
- * @param columnName
+ * @param introspectedColumn
*/
public void addFieldComment(Field field, IntrospectedTable
introspectedTable, IntrospectedColumn introspectedColumn);
@@ -88,6 +88,8 @@
* This method should add a suitable comment as a child element of the
* specified xmlElement to warn users that the element was generated and
* is subject to regeneration.
+ *
+ * @param xmlElement
*/
public void addComment(XmlElement xmlElement);
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=758350r1=758349r2=758350view=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
Wed Mar 25 17:18:04 2009
@@ -87,23 +87,30 @@
Tracing.3=Removing column {0} in table {1} because it is ignored by
configuration
Tracing.4=Found override for column {0} in table {1}
-Usage.Lines=19
+Usage.Lines=26
Usage.0=Apache iBATIS Ibator
svn commit: r749128 - in /ibatis/trunk/java/tools/ibator/eclipse: IbatorUpdateSite/ org.apache.ibatis.ibator.core/ org.apache.ibatis.ibator.core/META-INF/ org.apache.ibatis.ibator.eclipse.core/META-IN
Author: jgbutler Date: Sun Mar 1 22:05:01 2009 New Revision: 749128 URL: http://svn.apache.org/viewvc?rev=749128view=rev Log: [Ibator] Fixed divide by zero error, updated Eclipse plugin to version 1.2.2 Modified: ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/site.xml ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/ibator-src.zip ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/ibator.jar ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/META-INF/MANIFEST.MF ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/callback/EclipseProgressCallback.java ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/META-INF/MANIFEST.MF ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/releasenotes.html ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/toc_ibatordoc.xml ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/toc_javadoc.xml ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator/feature.xml Modified: ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/site.xml URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/site.xml?rev=749128r1=749127r2=749128view=diff == --- ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/site.xml (original) +++ ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/site.xml Sun Mar 1 22:05:01 2009 @@ -6,6 +6,9 @@ feature url=features/org.apache.ibatis.ibator_1.2.1.jar id=org.apache.ibatis.ibator version=1.2.1 category name=Ibator Version 1.2/ /feature + feature url=features/org.apache.ibatis.ibator_1.2.2.jar id=org.apache.ibatis.ibator version=1.2.2 + category name=Ibator Version 1.2/ + /feature category-def name=Ibator Version 1.2 label=Ibator Version 1.2 description Versions of the Ibator featured based on Ibator version 1.2 and Eclipse version 3.4.1 Modified: ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF?rev=749128r1=749127r2=749128view=diff == --- ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF (original) +++ ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/META-INF/MANIFEST.MF Sun Mar 1 22:05:01 2009 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Ibator Core Plug-in Bundle-SymbolicName: org.apache.ibatis.ibator.core -Bundle-Version: 1.2.1 +Bundle-Version: 1.2.2 Bundle-ClassPath: ibator.jar Export-Package: org.apache.ibatis.ibator.ant, org.apache.ibatis.ibator.api, @@ -26,5 +26,6 @@ org.apache.ibatis.ibator.internal.types, org.apache.ibatis.ibator.internal.util, org.apache.ibatis.ibator.internal.util.messages, + org.apache.ibatis.ibator.logging, org.apache.ibatis.ibator.plugins Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/ibator-src.zip URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/ibator-src.zip?rev=749128r1=749127r2=749128view=diff == Binary files - no diff available. Modified: ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/ibator.jar URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/ibator.jar?rev=749128r1=749127r2=749128view=diff == Binary files - no diff available. Modified: ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/META-INF/MANIFEST.MF?rev=749128r1=749127r2=749128view=diff == --- ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/META-INF/MANIFEST.MF (original) +++ ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/META-INF/MANIFEST.MF Sun Mar 1 22:05:01 2009 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Apache iBATIS Ibator Eclipse Core Support Plug-in Bundle-SymbolicName: org.apache.ibatis.ibator.eclipse.core -Bundle-Version: 1.2.1 +Bundle-Version: 1.2.2 Bundle-Vendor: ibatis.apache.org
svn commit: r746869 - in /ibatis/trunk/java/tools/ibator/core: doc/ src/org/apache/ibatis/ibator/internal/db/ src/org/apache/ibatis/ibator/internal/util/ src/org/apache/ibatis/ibator/internal/util/mes
Author: jgbutler
Date: Mon Feb 23 03:31:07 2009
New Revision: 746869
URL: http://svn.apache.org/viewvc?rev=746869view=rev
Log:
[Ibator] Some additional debug warnings
Modified:
ibatis/trunk/java/tools/ibator/core/doc/todo.txt
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/StringUtility.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/RenameExampleClassPlugin.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/SqlMapConfigPlugin.java
Modified: ibatis/trunk/java/tools/ibator/core/doc/todo.txt
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/doc/todo.txt?rev=746869r1=746868r2=746869view=diff
==
--- ibatis/trunk/java/tools/ibator/core/doc/todo.txt (original)
+++ ibatis/trunk/java/tools/ibator/core/doc/todo.txt Mon Feb 23 03:31:07 2009
@@ -1,5 +1,10 @@
Core:
+ 1.2.2
+
+1. Add a way to override default types in the JavaTypeResolver
+
+
Future
1. Write page explaining how to use the GENERIC DAOs
@@ -12,6 +17,7 @@
4. Java merger with ANTLR?
+
Eclipse:
Future
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java?rev=746869r1=746868r2=746869view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
Mon Feb 23 03:31:07 2009
@@ -174,14 +174,12 @@
// add warning that the table has no columns, remove from the
list
String warning = Messages.getString(Warning.1,
introspectedTable.getFullyQualifiedTable().toString()); //$NON-NLS-1$
warnings.add(warning);
-logger.debug(warning);
iter.remove();
} else if (!introspectedTable.hasPrimaryKeyColumns()
!introspectedTable.hasBaseColumns()) {
// add warning that the table has only BLOB columns, remove
from the list
String warning = Messages.getString(Warning.18,
introspectedTable.getFullyQualifiedTable().toString()); //$NON-NLS-1$
warnings.add(warning);
-logger.debug(warning);
iter.remove();
} else {
// now make sure that all columns called out in the
configuration
@@ -269,7 +267,6 @@
introspectedColumn.getActualColumnName());
warnings.add(warning);
-logger.debug(warning);
}
}
@@ -462,6 +459,29 @@
closeResultSet(rs);
+if (answer.size() 1
+ !StringUtility.stringContainsSQLWildcard(localSchema)
+ !StringUtility.stringContainsSQLWildcard(localTableName)) {
+// issue a warning if there is more than one table and
+// no wildcards were used
+ActualTableName inputAtn = new ActualTableName(tc.getCatalog(),
+tc.getSchema(), tc.getTableName());
+
+StringBuilder sb = new StringBuilder();
+boolean comma = false;
+for (ActualTableName atn : answer.keySet()) {
+if (comma) {
+sb.append(',');
+} else {
+comma = true;
+}
+sb.append(atn.toString());
+}
+
+warnings.add(Messages.getString(Warning.25, //$NON-NLS-1$
+inputAtn.toString(), sb.toString()));
+}
+
return answer;
}
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/StringUtility.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/StringUtility.java?rev=746869r1=746868r2=746869view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/StringUtility.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/StringUtility.java
Mon Feb 23 03:31:07 2009
@@ -111,4 +111,12 @@
return sb.toString
svn commit: r730666 - in /ibatis/trunk/java/tools/ibator/core: build/ doc/ htmldoc/ htmldoc/configreference/ src/org/apache/ibatis/ibator/config/ src/org/apache/ibatis/ibator/internal/db/ src/org/apac
Author: jgbutler Date: Thu Jan 1 19:44:52 2009 New Revision: 730666 URL: http://svn.apache.org/viewvc?rev=730666view=rev Log: [Ibator] Changes for IBATIS-571 - auto delimiting of SQL Keywords Added: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/SqlReservedWords.java Modified: ibatis/trunk/java/tools/ibator/core/build/version.properties ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/PropertyRegistry.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/rules/IbatorRulesDelegate.java ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/CreateDB.sql ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/CreateDB.sql ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/BaseMiscellaneousTest.java ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/MiscellaneousTests.java ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/SqlMapConfig.xml 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=730666r1=730665r2=730666view=diff == --- ibatis/trunk/java/tools/ibator/core/build/version.properties (original) +++ ibatis/trunk/java/tools/ibator/core/build/version.properties Thu Jan 1 19:44:52 2009 @@ -1,4 +1,4 @@ #Ibator build version info -#Sun Dec 28 16:25:29 CST 2008 +#Thu Jan 01 19:08:47 CST 2009 version=1.2.1 -buildNum=683 +buildNum=696 Modified: ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt?rev=730666r1=730665r2=730666view=diff == --- ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt (original) +++ ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt Thu Jan 1 19:44:52 2009 @@ -1,4 +1,11 @@ --- +Version 1.2.2: + +Enhancements: +1. IBATIS-569 - Make it easier to override IbatorRules in plugins +2. IBATIS-571 - Added autoDelimitKeywords support to ibatorContext + +--- Version 1.2.1: Bugs: Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html?rev=730666r1=730665r2=730666view=diff == --- ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html (original) +++ ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html Thu Jan 1 19:44:52 2009 @@ -148,6 +148,20 @@ thProperty Values/th /tr tr +td valign=topautoDelimitKeywords/td +tdIf true, then Ibator will delimit SQL keywords if they are used as + column names in tables. + Ibator maintains a list of SQL keywords + for many different databases. However, the list may not be + totally comprehensive. If a particular keyword is not on Ibator's + list, you may force the column to be delimited with a + codelt;columnOverridegt;/code.p/ + pSee the source code for the class + codeorg.apache.ibatis.ibator.internal.db.SqlReservedWords/code + for a list of keywords recognized by Ibator./p + piThe default value is false./i/p/td + /tr + tr td valign=topsuppressTypeWarnings/td tdIf true, then Ibator will add an annotation to any method that uses a non-parameterized type to suppress compiler type warnings. 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=730666r1=730665r2=730666view=diff == --- ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html (original) +++ ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html Thu Jan 1 19:44:52 2009 @@ -16,6 +16,24 @@ /div h1What's New in Ibator/h1 +h2Version 1.2.2/h2 +h3Bugs Fixed/h3 +ul +/ul + +h3Enhancements/h3 +ul + liIBATIS-569 - Modified
svn commit: r729795 - in /ibatis/trunk/java/tools/ibator/core: build/ src/org/apache/ibatis/ibator/api/ src/org/apache/ibatis/ibator/internal/rules/
Author: jgbutler
Date: Sun Dec 28 14:29:10 2008
New Revision: 729795
URL: http://svn.apache.org/viewvc?rev=729795view=rev
Log:
Changes for IBATIS-569 - provide a method of overriding IbatorRules
Added:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/rules/BaseIbatorRules.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/rules/IbatorRulesDelegate.java
Modified:
ibatis/trunk/java/tools/ibator/core/build/version.properties
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/internal/rules/ConditionalModelRules.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/rules/FlatModelRules.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/rules/HierarchicalModelRules.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/rules/IbatorRules.java
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=729795r1=729794r2=729795view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Sun Dec 28
14:29:10 2008
@@ -1,4 +1,4 @@
#Ibator build version info
-#Mon Dec 22 15:32:20 CST 2008
+#Sun Dec 28 16:25:29 CST 2008
version=1.2.1
-buildNum=681
+buildNum=683
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=729795r1=729794r2=729795view=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
Sun Dec 28 14:29:10 2008
@@ -491,11 +491,11 @@
calculateSqlMapFileName();
if (tableConfiguration.getModelType() == ModelType.HIERARCHICAL) {
-rules = new HierarchicalModelRules(tableConfiguration, this);
+rules = new HierarchicalModelRules(this);
} else if (tableConfiguration.getModelType() == ModelType.FLAT) {
-rules = new FlatModelRules(tableConfiguration, this);
+rules = new FlatModelRules(this);
} else {
-rules = new ConditionalModelRules(tableConfiguration, this);
+rules = new ConditionalModelRules(this);
}
ibatorContext.getPlugins().initialized(this);
@@ -686,4 +686,8 @@
public void setRules(IbatorRules rules) {
this.rules = rules;
}
+
+public TableConfiguration getTableConfiguration() {
+return tableConfiguration;
+}
}
Added:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/rules/BaseIbatorRules.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/rules/BaseIbatorRules.java?rev=729795view=auto
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/rules/BaseIbatorRules.java
(added)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/rules/BaseIbatorRules.java
Sun Dec 28 14:29:10 2008
@@ -0,0 +1,299 @@
+/*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ibatis.ibator.internal.rules;
+
+import org.apache.ibatis.ibator.api.IntrospectedTable;
+import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
+import org.apache.ibatis.ibator.config.TableConfiguration;
+
+/**
+ * This class centralizes all the rules related to code generation - including
+ * the methods and objects to create, and certain attributes related to those
+ * objects.
+ *
+ * See package JavaDoc for more information.
+ *
+ * @author Jeff Butler
+ */
+public abstract class BaseIbatorRules implements IbatorRules {
+
+protected TableConfiguration tableConfiguration;
+protected IntrospectedTable
svn commit: r728712 - in /ibatis/trunk/java/tools/ibator: core/build/ core/src/org/apache/ibatis/ibator/api/ core/src/org/apache/ibatis/ibator/config/ eclipse/org.apache.ibatis.ibator.eclipse.doc/html
Author: jgbutler
Date: Mon Dec 22 07:41:15 2008
New Revision: 728712
URL: http://svn.apache.org/viewvc?rev=728712view=rev
Log:
[Ibator] Plugin and documentation improvements
Modified:
ibatis/trunk/java/tools/ibator/core/build/version.properties
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/IbatorContext.java
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/buildingFromSVN.html
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/eclipseui.html
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/manualTesting.html
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/releasenotes.html
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=728712r1=728711r2=728712view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Mon Dec 22
07:41:15 2008
@@ -1,4 +1,4 @@
#Ibator build version info
-#Thu Dec 18 16:54:10 CST 2008
+#Sun Dec 21 20:24:13 CST 2008
version=1.2.1
-buildNum=678
+buildNum=680
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=728712r1=728711r2=728712view=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
Mon Dec 22 07:41:15 2008
@@ -111,7 +111,7 @@
protected TableConfiguration tableConfiguration;
protected FullyQualifiedTable fullyQualifiedTable;
protected IbatorContext ibatorContext;
-private IbatorRules rules;
+protected IbatorRules rules;
protected ListIntrospectedColumn primaryKeyColumns;
protected ListIntrospectedColumn baseColumns;
protected ListIntrospectedColumn blobColumns;
@@ -328,16 +328,6 @@
}
public IbatorRules getRules() {
-if (rules == null) {
-if (tableConfiguration.getModelType() == ModelType.HIERARCHICAL) {
-rules = new HierarchicalModelRules(tableConfiguration, this);
-} else if (tableConfiguration.getModelType() == ModelType.FLAT) {
-rules = new FlatModelRules(tableConfiguration, this);
-} else {
-rules = new ConditionalModelRules(tableConfiguration, this);
-}
-}
-
return rules;
}
@@ -500,6 +490,14 @@
calculateSqlMapPackage();
calculateSqlMapFileName();
+if (tableConfiguration.getModelType() == ModelType.HIERARCHICAL) {
+rules = new HierarchicalModelRules(tableConfiguration, this);
+} else if (tableConfiguration.getModelType() == ModelType.FLAT) {
+rules = new FlatModelRules(tableConfiguration, this);
+} else {
+rules = new ConditionalModelRules(tableConfiguration, this);
+}
+
ibatorContext.getPlugins().initialized(this);
}
@@ -678,4 +676,14 @@
* @return the number of progress messages
*/
public abstract int getGenerationSteps();
+
+/**
+ * This method exists to give plugins the opportunity
+ * to replace the calculated rules if necessary.
+ *
+ * @param rules
+ */
+public void setRules(IbatorRules rules) {
+this.rules = rules;
+}
}
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java?rev=728712r1=728711r2=728712view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java
Mon Dec 22 07:41:15 2008
@@ -452,10 +452,6 @@
} finally {
closeConnection(connection);
}
-
-for (IntrospectedTable introspectedTable : introspectedTables) {
-introspectedTable.calculateGenerators(warnings, callback);
-}
}
public int getGenerationSteps() {
@@ -495,6 +491,7 @@
callback.checkCancel
svn commit: r728794 - in /ibatis/trunk/java/tools/ibator: core/build/ core/htmldoc/configreference/ core/htmldoc/generatedobjects/ eclipse/IbatorUpdateSite/features/ eclipse/IbatorUpdateSite/plugins/
Author: jgbutler Date: Mon Dec 22 13:42:36 2008 New Revision: 728794 URL: http://svn.apache.org/viewvc?rev=728794view=rev Log: [Ibator} Ibator version 1.2.1 Added: ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/features/org.apache.ibatis.ibator_1.2.1.jar (with props) ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/plugins/org.apache.ibatis.ibator.core_1.2.1.jar (with props) ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/plugins/org.apache.ibatis.ibator.eclipse.core_1.2.1.jar (with props) ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/plugins/org.apache.ibatis.ibator.eclipse.doc_1.2.1.jar (with props) ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/plugins/org.apache.ibatis.ibator.eclipse.ui_1.2.1.jar (with props) Modified: ibatis/trunk/java/tools/ibator/core/build/version.properties ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/columnRenamingRule.html ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/table.html ibatis/trunk/java/tools/ibator/core/htmldoc/generatedobjects/extendingExampleClass.html ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/ibator-src.zip ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/ibator.jar ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/manualTesting.html ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/releasenotes.html ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/html-src/eclipseui/usingAnt.html 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=728794r1=728793r2=728794view=diff == --- ibatis/trunk/java/tools/ibator/core/build/version.properties (original) +++ ibatis/trunk/java/tools/ibator/core/build/version.properties Mon Dec 22 13:42:36 2008 @@ -1,4 +1,4 @@ #Ibator build version info -#Sun Dec 21 20:24:13 CST 2008 +#Mon Dec 22 15:32:20 CST 2008 version=1.2.1 -buildNum=680 +buildNum=681 Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/columnRenamingRule.html URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/columnRenamingRule.html?rev=728794r1=728793r2=728794view=diff == --- ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/columnRenamingRule.html (original) +++ ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/columnRenamingRule.html Mon Dec 22 13:42:36 2008 @@ -17,7 +17,7 @@ h1The lt;columnRenamingRulegt; Element/h1 pThe lt;columnRenamingRulegt; element is used to tell Ibator to rename -database columns before calulating the corresponding property +database columns before calculating the corresponding property name in an introspected table. This is useful when all columns in a table have a common prefix that should be removed before calculating the property name. For example, suppose a table @@ -30,7 +30,7 @@ /ul pIt might be annoying to have the generated properties all containing the CUST prefix. The prefix can be removed by - specifying a renimg rule like this:/p + specifying a renamimg rule like this:/p pcodelt;columnRenamingRule searchString=^CUST_ replaceString= /gt;/code/p @@ -103,7 +103,7 @@ /tr tr tdreplaceString/td -tdThis is a string to be substituted for every occurance of the +tdThis is a string to be substituted for every occurrence of the search string. If not specified, the empty string is used./td /tr /table Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html?rev=728794r1=728793r2=728794view=diff == --- ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html (original) +++ ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html Mon Dec 22 13:42:36 2008 @@ -155,7 +155,7 @@ compiling the generated objects with a JSE 5.0 compiler. In that situation, the Ibator generated code would generate many compiler warnings if the annotation is not allowed. This property is not needed and will have - no effect when using the Ibatis2Java5 targetRuntime./p + no effect when using the Ibatis2Java5 targetRuntime.p/ piThe default value is false./i/p/td /tr tr @@ -163,7 +163,7 @@ tdThe value to use as the beginning identifier delimiter for SQL
svn commit: r728819 - in /ibatis/trunk/site/pages: ibator.vm index.vm
Author: jgbutler Date: Mon Dec 22 14:56:03 2008 New Revision: 728819 URL: http://svn.apache.org/viewvc?rev=728819view=rev Log: [Ibator] Site updates for version 1.2.1 Modified: ibatis/trunk/site/pages/ibator.vm ibatis/trunk/site/pages/index.vm Modified: ibatis/trunk/site/pages/ibator.vm URL: http://svn.apache.org/viewvc/ibatis/trunk/site/pages/ibator.vm?rev=728819r1=728818r2=728819view=diff == --- ibatis/trunk/site/pages/ibator.vm (original) +++ ibatis/trunk/site/pages/ibator.vm Mon Dec 22 14:56:03 2008 @@ -29,12 +29,16 @@ Abator means one who abates a nuisance./p h3Ibator News/h3 +p(December 22, 2008) Ibator version 1.2.1 is released. This version fixes a couple of bugs + that manifested in the Eclipse plugin, enhances the Plugin API, and adds a couple of features + to the Eclipse plugin. Even though this is a relatively minor release, we recommend that + everyone upgrade./p p(December 11, 2008) Ibator version 1.2.0 is released. This version has several important enhancements over Abator 1.1.0. See the a href=http://ibatis.apache.org/docs/tools/ibator/whatsNew.html;What's New?/a section of the online documentation for full details. Note that Ibator requires Java 5.0 or greater. The Eclipse plugin requires Eclipse 3.4.1 or greater. Ibator - generates code compatible with iATIS version 2.2.0 or greater./p + generates code compatible with iBATIS version 2.2.0 or greater./p p(April 14, 2008) Due to a trade registration dispute, Abator is renamed to Ibator. iBATOR is currently under development. The initial source code drop can be checked out from SVN at a href=http://svn.apache.org/repos/asf/ibatis/trunk/java/tools/ibator/; target=_blank @@ -56,8 +60,8 @@ standalone JAR includes an Ant task to run Ibator, or you can run Ibator from the command line of from Java code./p ul - lia href=http://people.apache.org/builds/ibatis/alpha/ibator-1.2.0-665.zip; - Ibator 1.2.0 w/Binaries and Source/a + lia href=http://people.apache.org/builds/ibatis/alpha/ibator-1.2.1-681.zip; + Ibator 1.2.1 w/Binaries and Source/a /li /ul @@ -74,7 +78,7 @@ pWhen run as an Eclipse plugin, Ibator will persist the generated Java classes and SqlMap files in Eclipse projects. Ibator can be run iteratively multiple time as the database design matures -- and any hand coded additions to generated Java classes or SqlMap files will remain undisturbed./p + - and any hand coded additions to generated Java classes or SqlMap files will remain undisturbed./p pDocumentation for Ibator is integrated into the Eclipse help system./p @@ -85,7 +89,10 @@ liJDK 5.0 or Higher/li /ul h3Automatic Eclipse Install/h3 -pUse the built in Eclipse install support by following these steps:/p +pIf you've already installed a prior version of Ibator, simply run the Eclipse Update + tool and the new version will be found automatically./p +pIf you've not previously installed Ibator, use the built in Eclipse install support by + following these steps:/p ol liTake the Helpgt;Software Updates... Menu Option/li liSelect the Available Software Tab/li @@ -105,7 +112,7 @@ h3Manual Eclipse Install/h3 pThe automatic install is much preferred, but you can also install Ibator manually if you desire. To install manually, download the file - a href=http://people.apache.org/builds/ibatis/alpha/IbatorForEclipse1.2.0.zip;IbatorForEclipse1.2.0.zip/a + a href=http://people.apache.org/builds/ibatis/alpha/IbatorForEclipse1.2.1.zip;IbatorForEclipse1.2.1.zip/a and unzip the file to some convenient location. After unzipping the update site archive, follow these steps in Eclipse:/p Modified: ibatis/trunk/site/pages/index.vm URL: http://svn.apache.org/viewvc/ibatis/trunk/site/pages/index.vm?rev=728819r1=728818r2=728819view=diff == --- ibatis/trunk/site/pages/index.vm (original) +++ ibatis/trunk/site/pages/index.vm Mon Dec 22 14:56:03 2008 @@ -49,13 +49,13 @@ h2News/h2 -h3Apache iBATIS Ibator Version 1.2.0 Released/h3 -p(December 11, 2008) Ibator version 1.2.0 is released. This version has several important - enhancements over Abator 1.1.0. See the +h3Apache iBATIS Ibator Version 1.2.1 Released/h3 +p(December 22, 2008) Ibator version 1.2.1 is released. This version fixes a couple of bugs + that manifested in the Eclipse plugin, enhances the Plugin API, and adds a couple of features + to the Eclipse plugin. Even though this is a relatively minor release, we recommend that + everyone upgrade. See the a href=http://ibatis.apache.org/docs/tools/ibator/whatsNew.html;What's New?/a - section of the online documentation for full details. Note that Ibator requires - Java 5.0 or greater. The Eclipse plugin requires Eclipse 3.4.1 or greater. Ibator - generates code compatible with iATIS version 2.2.0 or greater./p
svn commit: r727776 - in /ibatis/trunk/java/tools/ibator/core: build/ buildsupport/org/apache/ibatis/ibator/build/test/ doc/ htmldoc/ htmldoc/configreference/ htmldoc/reference/ src/org/apache/ibatis/
Author: jgbutler
Date: Thu Dec 18 09:45:44 2008
New Revision: 727776
URL: http://svn.apache.org/viewvc?rev=727776view=rev
Log:
[ibator] add a plugin method to allow alteration of certain fundamental
attributes of code generation
Added:
ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/test/
ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/test/TestPlugin.java
Modified:
ibatis/trunk/java/tools/ibator/core/build/build.xml
ibatis/trunk/java/tools/ibator/core/build/setupCmdLine.bat
ibatis/trunk/java/tools/ibator/core/build/version.properties
ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt
ibatis/trunk/java/tools/ibator/core/doc/releasing.txt
ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ignoreColumn.html
ibatis/trunk/java/tools/ibator/core/htmldoc/reference/pluggingIn.html
ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorPlugin.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorPluginAdapter.java
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/IbatorContext.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/IbatorPluginAggregator.java
ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/miscellaneous/MiscellaneousTests.java
ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/ibatorConfig.xml
Modified: ibatis/trunk/java/tools/ibator/core/build/build.xml
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/build/build.xml?rev=727776r1=727775r2=727776view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/build.xml (original)
+++ ibatis/trunk/java/tools/ibator/core/build/build.xml Thu Dec 18 09:45:44 2008
@@ -41,6 +41,7 @@
path id=emma.runtime.path
pathelement location=${work.instrumented}/
pathelement location=${work.classes}/
+pathelement location=${work.buildsupport}/
path refid=emma.lib/
/path
@@ -77,7 +78,7 @@
/fileset
/copy
-propertyfile file=version.properties comment=ibator build version
info
+propertyfile file=version.properties comment=Ibator build version
info
entry key=buildNum default=0 type=int operation=+ value=1/
/propertyfile
/target
Modified: ibatis/trunk/java/tools/ibator/core/build/setupCmdLine.bat
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/build/setupCmdLine.bat?rev=727776r1=727775r2=727776view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/setupCmdLine.bat (original)
+++ ibatis/trunk/java/tools/ibator/core/build/setupCmdLine.bat Thu Dec 18
09:45:44 2008
@@ -1,6 +1,6 @@
rem Change the values in this file to the proper directories on your machine
if defined JAVA_HOME goto java_home_defined
-set JAVA_HOME=C:\JavaTools\jdk1.5.0_11
+set JAVA_HOME=C:\JavaTools\jdk1.5.0_17
:java_home_defined
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=727776r1=727775r2=727776view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Thu Dec 18
09:45:44 2008
@@ -1,4 +1,4 @@
-#ibator build version info
-#Tue Dec 16 09:32:54 CST 2008
+#Ibator build version info
+#Thu Dec 18 11:42:11 CST 2008
version=1.2.1
-buildNum=667
+buildNum=673
Added:
ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/test/TestPlugin.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/test/TestPlugin.java?rev=727776view=auto
==
---
ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/test/TestPlugin.java
(added)
+++
ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/test/TestPlugin.java
Thu Dec 18 09:45:44 2008
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES
svn commit: r727852 - in /ibatis/trunk/java/tools/ibator/core: build/ buildsupport/org/apache/ibatis/ibator/build/test/ doc/ htmldoc/ htmldoc/configreference/ htmldoc/reference/ src/org/apache/ibatis/
Author: jgbutler
Date: Thu Dec 18 15:11:17 2008
New Revision: 727852
URL: http://svn.apache.org/viewvc?rev=727852view=rev
Log:
[ibator] further improvements and documentation of the plugin API
Added:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/RenameExampleClassPlugin.java
Removed:
ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/test/
Modified:
ibatis/trunk/java/tools/ibator/core/build/build.xml
ibatis/trunk/java/tools/ibator/core/build/version.properties
ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt
ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorPlugin.html
ibatis/trunk/java/tools/ibator/core/htmldoc/reference/pluggingIn.html
ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorPlugin.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IbatorPluginAdapter.java
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/IbatorContext.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/IbatorPluginAggregator.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/ibatorConfig.xml
Modified: ibatis/trunk/java/tools/ibator/core/build/build.xml
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/build/build.xml?rev=727852r1=727851r2=727852view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/build.xml (original)
+++ ibatis/trunk/java/tools/ibator/core/build/build.xml Thu Dec 18 15:11:17 2008
@@ -41,7 +41,6 @@
path id=emma.runtime.path
pathelement location=${work.instrumented}/
pathelement location=${work.classes}/
-pathelement location=${work.buildsupport}/
path refid=emma.lib/
/path
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=727852r1=727851r2=727852view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Thu Dec 18
15:11:17 2008
@@ -1,4 +1,4 @@
#Ibator build version info
-#Thu Dec 18 11:42:11 CST 2008
+#Thu Dec 18 16:54:10 CST 2008
version=1.2.1
-buildNum=673
+buildNum=678
Modified: ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt?rev=727852r1=727851r2=727852view=diff
==
--- ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt (original)
+++ ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt Thu Dec 18
15:11:17 2008
@@ -13,6 +13,10 @@
2. Added methods to IntrospectedTable to get/set attributes. This
allows plugin classes to maintain table based state between
plugin calls.
+3. Added initialized method to the plugin API. This
+ allows plugins to alter some of the fundamental code generation items
+ (like the name of a generated class, for example).
+4. Added an example plugin to show usage of the initialized method.
---
Version 1.2.0: Renamed to Ibator
Modified:
ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorPlugin.html
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorPlugin.html?rev=727852r1=727851r2=727852view=diff
==
---
ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorPlugin.html
(original)
+++
ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorPlugin.html
Thu Dec 18 15:11:17 2008
@@ -53,6 +53,21 @@
dependancy in this simple plugin./p/td
/tr
tr
+td valign=topcode(package).RenameExampleClassPlugin/code/td
+tdThis plugin demonstrates usage of the codeinitialized/code method
+by renaming the generated example classes generated by Ibator.
+pThis plugin accepts two properties:/p
+ul
+ littsearchString/tt (required) a regular expression used to
search
+ the default generated name of the example class./li
+ littreplaceString/tt (required) the string to be inserted on
matches of the
+ttsearchString/tt./li
+/ul
+pFor example, to rename the generated example classes from
xxxExample to
+ xxxCriteria
svn commit: r726025 - /ibatis/trunk/site/pages/javadownloads.vm
Author: jgbutler Date: Fri Dec 12 06:52:21 2008 New Revision: 726025 URL: http://svn.apache.org/viewvc?rev=726025view=rev Log: Update the Java Downloads Page for Release 2.3.4 Modified: ibatis/trunk/site/pages/javadownloads.vm Modified: ibatis/trunk/site/pages/javadownloads.vm URL: http://svn.apache.org/viewvc/ibatis/trunk/site/pages/javadownloads.vm?rev=726025r1=726024r2=726025view=diff == --- ibatis/trunk/site/pages/javadownloads.vm (original) +++ ibatis/trunk/site/pages/javadownloads.vm Fri Dec 12 06:52:21 2008 @@ -24,17 +24,17 @@ If you absolutely require the last General Availability version, you can download it in the sidebar to the right. /div - h4Release 2.3.3 (JDK 1.5 Required)/h4 + h4Release 2.3.4 (JDK 1.5 Required)/h4 ul li - a href=[preferred]/ibatis/binaries/ibatis.java/ibatis-2.3.3.720.zipbDownload iBATIS Java 2.3.3/b/a + a href=[preferred]/ibatis/binaries/ibatis.java/ibatis-2.3.4.726.zipbDownload iBATIS Java 2.3.4/b/a br/ Includes binaries, source, and documentation - br/ [Status: bBeta/b | Jul 16, 2008] + br/ [Status: bGA/b | Sep 19, 2008] br/ - [a href=http://www.apache.org/dist/ibatis/binaries/ibatis.java/ibatis-2.3.3.720.zip.md5;MD5/a] - [a href=http://www.apache.org/dist/ibatis/binaries/ibatis.java/ibatis-2.3.3.720.zip.asc;PGP/a] + [a href=http://www.apache.org/dist/ibatis/binaries/ibatis.java/ibatis-2.3.4.726.zip.md5;MD5/a] + [a href=http://www.apache.org/dist/ibatis/binaries/ibatis.java/ibatis-2.3.4.726.zip.asc;PGP/a] - a href=https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10601styleName=Htmlversion=12313115;Release Notes /a + a href=https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10601styleName=Htmlversion=12313310;Release Notes /a /li /ul h4Developer Build/h4
svn commit: r725807 - in /ibatis/trunk/java/tools/ibator: core/build/ core/doc/ core/htmldoc/ eclipse/IbatorUpdateSite/ eclipse/IbatorUpdateSite/features/ eclipse/IbatorUpdateSite/plugins/ eclipse/org
Author: jgbutler
Date: Thu Dec 11 12:46:20 2008
New Revision: 725807
URL: http://svn.apache.org/viewvc?rev=725807view=rev
Log:
[ibator] final (hopefully) changes for release
Added:
ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/
ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/.project
ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/features/
ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/features/org.apache.ibatis.ibator_1.2.0.jar
(with props)
ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/index.html
ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/plugins/
ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/plugins/org.apache.ibatis.ibator.core_1.2.0.jar
(with props)
ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/plugins/org.apache.ibatis.ibator.eclipse.core_1.2.0.jar
(with props)
ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/plugins/org.apache.ibatis.ibator.eclipse.doc_1.2.0.jar
(with props)
ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/plugins/org.apache.ibatis.ibator.eclipse.ui_1.2.0.jar
(with props)
ibatis/trunk/java/tools/ibator/eclipse/IbatorUpdateSite/site.xml
Removed:
ibatis/trunk/java/tools/ibator/core/doc/MigrationNotes.txt
Modified:
ibatis/trunk/java/tools/ibator/core/build/build.xml
ibatis/trunk/java/tools/ibator/core/build/version.properties
ibatis/trunk/java/tools/ibator/core/doc/todo.txt
ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/ibator.jar
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/build.properties
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/buildDoc.xml
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.ui/build.properties
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator/feature.properties
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator/feature.xml
Modified: ibatis/trunk/java/tools/ibator/core/build/build.xml
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/build/build.xml?rev=725807r1=725806r2=725807view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/build.xml (original)
+++ ibatis/trunk/java/tools/ibator/core/build/build.xml Thu Dec 11 12:46:20 2008
@@ -106,7 +106,7 @@
jar destfile=${deploy.files}/ibator.jar basedir=${work.classes}
manifest
attribute name=Main-Class
value=org.apache.ibatis.ibator.api.IbatorRunner/
-attribute name=Specification-Title value=Apache iBATIS ibator/
+attribute name=Specification-Title value=Apache iBATIS Ibator/
attribute name=Specification-Version value=${version}/
attribute name=Specification-Vendor value=The Apache Software
Foundation/
/manifest
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=725807r1=725806r2=725807view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Thu Dec 11
12:46:20 2008
@@ -1,4 +1,4 @@
#ibator build version info
-#Wed Dec 10 15:49:21 CST 2008
+#Thu Dec 11 14:08:45 CST 2008
version=1.2.0
-buildNum=656
+buildNum=665
Modified: ibatis/trunk/java/tools/ibator/core/doc/todo.txt
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/doc/todo.txt?rev=725807r1=725806r2=725807view=diff
==
--- ibatis/trunk/java/tools/ibator/core/doc/todo.txt (original)
+++ ibatis/trunk/java/tools/ibator/core/doc/todo.txt Thu Dec 11 12:46:20 2008
@@ -8,22 +8,16 @@
runtime, rather than requiring a connection in the
XML config.
-3. Refactoring: Make a class for each type of method to be generated
-
-4. Comments generated through a plugin
-
-5. Checking in rootClass implemented through a plugin
-
-6. Relationships?
+3. Relationships?
+
+4. Java merger with ANTLR?
Eclipse:
- 1.2
+ Future
-1. Rename to ibator
-
-2. Write a launch configuration for the plugin to allow better
+1. Write a launch configuration for the plugin to allow better
control of the class path.
-3. Get rid of the Generate iBATIS Artifacts popup menu - should
+2. Get rid of the Generate iBATIS Artifacts popup menu - should
only run with a launch configuration or with Ant.
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
svn commit: r725467 - in /ibatis/trunk/java/tools/ibator/eclipse: org.apache.ibatis.ibator.eclipse.core/ org.apache.ibatis.ibator.eclipse.doc/ org.apache.ibatis.ibator.eclipse.ui/
Author: jgbutler Date: Wed Dec 10 14:20:31 2008 New Revision: 725467 URL: http://svn.apache.org/viewvc?rev=725467view=rev Log: [ibator] update ignored resources Modified: ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/ (props changed) ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/ (props changed) ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.ui/ (props changed) Propchange: ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/ -- --- svn:ignore (added) +++ svn:ignore Wed Dec 10 14:20:31 2008 @@ -0,0 +1 @@ +bin Propchange: ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/ -- --- svn:ignore (added) +++ svn:ignore Wed Dec 10 14:20:31 2008 @@ -0,0 +1 @@ +html Propchange: ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.ui/ -- --- svn:ignore (added) +++ svn:ignore Wed Dec 10 14:20:31 2008 @@ -0,0 +1,2 @@ +antbin +bin
svn commit: r725566 [2/2] - in /ibatis/trunk/java/tools/ibator: core/build/ eclipse/org.apache.ibatis.ibator.core/ eclipse/org.apache.ibatis.ibator.eclipse.core/ eclipse/org.apache.ibatis.ibator.eclip
Modified: ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator/feature.xml URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator/feature.xml?rev=725566r1=725565r2=725566view=diff == --- ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator/feature.xml (original) +++ ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator/feature.xml Wed Dec 10 19:51:12 2008 @@ -1,22 +1,26 @@ ?xml version=1.0 encoding=UTF-8? feature id=org.apache.ibatis.ibator - label=Ibator Feature + label=%featureName version=1.2.0 - provider-name=The Apache Software Foundation + provider-name=%providerName - description url=http://www.example.com/description; - [Enter Feature Description here.] + description + %description /description - copyright url=http://www.example.com/copyright; - [Enter Copyright Description here.] + copyright + %copyright /copyright - license url=http://www.example.com/license; - [Enter License Description here.] + license url=%licanseURL + %license /license + url + update label=%updateSiteName url=http://ibatis.apache.org/tools/ibator// + /url + plugin id=org.apache.ibatis.ibator.core download-size=0 @@ -34,13 +38,13 @@ id=org.apache.ibatis.ibator.eclipse.doc download-size=0 install-size=0 - version=0.0.0/ + version=0.0.0 + unpack=false/ plugin id=org.apache.ibatis.ibator.eclipse.ui download-size=0 install-size=0 - version=0.0.0 - unpack=false/ + version=0.0.0/ /feature
svn commit: r724764 - in /ibatis/trunk/java/tools/ibator/core: build/ htmldoc/ htmldoc/configreference/ src/org/apache/ibatis/ibator/api/ src/org/apache/ibatis/ibator/config/ src/org/apache/ibatis/iba
Author: jgbutler Date: Tue Dec 9 08:01:13 2008 New Revision: 724764 URL: http://svn.apache.org/viewvc?rev=724764view=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=724764r1=724763r2=724764view=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=724764r1=724763r2=724764view=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=toptargetPackage/td -tdThis is the package where the generated DAO interfaces and classes will be placed. In +tdThis 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. +pbNote:/b the package for DAO implementation classes may +be overridden by specifying the optional codeimplamentationPackage/code +attribute as shown below./p/td /tr tr td valign=toptargetProject/td @@ -86,7 +90,24 @@ /table h2Optional Attributes/h2 -None. +table border=1 cellspacing=0 cellpadding=5 + tr +thAttribute/th +thDescription/th + /tr + tr +td valign=topimplementationPackage/td +tdIf 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
svn commit: r724414 - in /ibatis/trunk/java/tools/ibator/core: build/ doc/ htmldoc/ htmldoc/reference/ src/org/apache/ibatis/ibator/api/ src/org/apache/ibatis/ibator/config/xml/ src/org/apache/ibatis/
Author: jgbutler Date: Mon Dec 8 09:17:15 2008 New Revision: 724414 URL: http://svn.apache.org/viewvc?rev=724414view=rev Log: [Ibator] More documentation Updates Modified: ibatis/trunk/java/tools/ibator/core/build/version.properties ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt ibatis/trunk/java/tools/ibator/core/htmldoc/afterRunning.html ibatis/trunk/java/tools/ibator/core/htmldoc/intro.html ibatis/trunk/java/tools/ibator/core/htmldoc/license.html ibatis/trunk/java/tools/ibator/core/htmldoc/migratingFromAbator.html ibatis/trunk/java/tools/ibator/core/htmldoc/reference/building.html ibatis/trunk/java/tools/ibator/core/htmldoc/running.html ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedColumn.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/xml/ParserEntityResolver.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/sqlmap/elements/AbstractXmlElementGenerator.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/types/JdbcTypeNameTranslator.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/EqualsHashCodePlugin.java 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=724414r1=724413r2=724414view=diff == --- ibatis/trunk/java/tools/ibator/core/build/version.properties (original) +++ ibatis/trunk/java/tools/ibator/core/build/version.properties Mon Dec 8 09:17:15 2008 @@ -1,4 +1,4 @@ #ibator build version info -#Sun Dec 07 20:41:27 CST 2008 +#Mon Dec 08 11:13:44 CST 2008 version=1.2.0 -buildNum=649 +buildNum=651 Modified: ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt?rev=724414r1=724413r2=724414view=diff == --- ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt (original) +++ ibatis/trunk/java/tools/ibator/core/doc/ReleaseNotes.txt Mon Dec 8 09:17:15 2008 @@ -1,5 +1,5 @@ --- -Version 1.2.0: Renamed to ibator +Version 1.2.0: Renamed to Ibator Bugs: 1. Fixed the JavaTypeResolver so that an unsupported data type can be @@ -9,19 +9,17 @@ Enhancements: 1. Ibator now includes a plugin machanism that you can use to extend or - modify code generated by ibator. In most cases, you should be able + modify code generated by Ibator. In most cases, you should be able to write plugins to replace any custom classes that subclass one of ibator's built-in generators. Plugins are now the preferred method for - extending ibator and we recommend that you do not extend ibator's + extending Ibator and we recommend that you do not extend Ibator's built in generators unless absolutely necessary. -2. Major refactoring of ibator internals. This has changed - the interface for overriding any of the supplied ibator generators. +2. Major refactoring of Ibator internals. This has changed + the interface for overriding any of the supplied Ibator generators. 3. Added support for runtimeCatalog and runtimeSchema properties to the table configuration. Thanks to Dan Turkenkopf for the idea and the patch! -4. Added ability to configure an implementation of IntrospectedTable interface. - This to allow overriding of many default behaviors of ibator. -5. New method - insertSelective +4. New method - insertSelective Changes: @@ -30,14 +28,10 @@ the jdbcConnection element to ibatorConfiguration, removed the rootClasspath property from javaModelGenerator 3. Changed API on the JavaTypeResolver interface -4. Changed API on the SqlMapGenerator interface. If you have previously extended - one of ibator's implementations, we suggest you switch to an ibator plugin. -5. Changed API on the DAOGenerator interface. If you have previously extended - one of ibator's implementations, we suggest you switch to an ibator plugin. -6. Removed Legacy generator set -7. Removed after generation hook methods in favor of the new ibator +4. Removed Legacy generator set +5. Removed after generation hook methods in favor of the new ibator plugin mechanism. -8. ibatorContext elements now require an id +6. ibatorContext elements now require an id --- Version 1.1.0: Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/afterRunning.html URL: http://svn.apache.org/viewvc/ibatis/trunk
svn commit: r724075 - in /ibatis/trunk/java/tools/ibator/core: build/ htmldoc/ htmldoc/reference/ src/org/apache/ibatis/ibator/ant/ src/org/apache/ibatis/ibator/api/ src/org/apache/ibatis/ibator/confi
Author: jgbutler
Date: Sat Dec 6 20:56:51 2008
New Revision: 724075
URL: http://svn.apache.org/viewvc?rev=724075view=rev
Log:
[ibator] improvements to progress reporting
Modified:
ibatis/trunk/java/tools/ibator/core/build/build.xml
ibatis/trunk/java/tools/ibator/core/build/version.properties
ibatis/trunk/java/tools/ibator/core/htmldoc/migratingFromAbator.html
ibatis/trunk/java/tools/ibator/core/htmldoc/reference/extending.html
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/ant/AntProgressCallback.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java
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/api/JavaTypeResolver.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/ProgressCallback.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java
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/dao/templates/AbstractDAOTemplate.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/NullProgressCallback.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties
Modified: ibatis/trunk/java/tools/ibator/core/build/build.xml
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/build/build.xml?rev=724075r1=724074r2=724075view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/build.xml (original)
+++ ibatis/trunk/java/tools/ibator/core/build/build.xml Sat Dec 6 20:56:51 2008
@@ -232,7 +232,7 @@
classname=org.apache.ibatis.ibator.ant.IbatorAntTask
classpathref=emma.runtime.path/
- ibator
configfile=${basedir}/../testJava2/ibatortest/java2/ibatorConfig.xml
+ ibator
configfile=${basedir}/../testJava2/ibatortest/java2/ibatorConfig.xml
verbose=true
propertyset
propertyref name=generated.source.dir.java2/
/propertyset
@@ -261,7 +261,7 @@
echo message=Expect three warnings from ibator (BLOBSONLY,
NonExistantTable, FRED) /
-ibator configfile=${basedir}/../testJava5/ibatortest/ibatorConfig.xml
+ibator configfile=${basedir}/../testJava5/ibatortest/ibatorConfig.xml
verbose=true
propertyset
propertyref name=generated.source.dir.java5/
propertyref name=generated.bin.dir.java5/
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=724075r1=724074r2=724075view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Sat Dec 6
20:56:51 2008
@@ -1,4 +1,4 @@
#ibator build version info
-#Thu Nov 27 07:43:20 CST 2008
+#Sat Dec 06 16:47:44 CST 2008
version=1.2.0
-buildNum=642
+buildNum=647
Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/migratingFromAbator.html
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/migratingFromAbator.html?rev=724075r1=724074r2=724075view=diff
==
--- ibatis/trunk/java/tools/ibator/core/htmldoc/migratingFromAbator.html
(original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/migratingFromAbator.html Sat
Dec 6 20:56:51 2008
@@ -63,7 +63,7 @@
page for full details./li
liThe codeJavaTypeResolver/code interface has changed and is
simplified. If you specified a custom implementation on the
-lt;javaTypeResolvergt; element, you must rework your implementation
+codelt;javaTypeResolvergt;/code element, you must rework your
implementation
class./li
liThe ibator classloading strategy has changed substantially, and we now
svn commit: r724076 - in /ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2: dao/ model/ sqlmap/
Author: jgbutler
Date: Sat Dec 6 20:58:55 2008
New Revision: 724076
URL: http://svn.apache.org/viewvc?rev=724076view=rev
Log:
[ibator] improvements to progress reporting
Modified:
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
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=724076r1=724075r2=724076view=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
Sat Dec 6 20:58:55 2008
@@ -69,7 +69,7 @@
public ListCompilationUnit getCompilationUnits() {
FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
-progressCallback.startGenerationTask(Messages.getString(Progress.14,
table.toString()));
+progressCallback.startTask(Messages.getString(Progress.14,
table.toString()));
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=724076r1=724075r2=724076view=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
Sat Dec 6 20:58:55 2008
@@ -44,7 +44,7 @@
public ListCompilationUnit getCompilationUnits() {
FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
-progressCallback.startGenerationTask(Messages.getString(Progress.8,
table.toString()));
+progressCallback.startTask(Messages.getString(Progress.8,
table.toString()));
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=724076r1=724075r2=724076view=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
Sat Dec 6 20:58:55 2008
@@ -55,7 +55,7 @@
public ListCompilationUnit getCompilationUnits() {
FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
-progressCallback.startGenerationTask(Messages.getString(Progress.6,
table.toString()));
+progressCallback.startTask(Messages.getString(Progress.6,
table.toString()));
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=724076r1=724075r2=724076view=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
Sat Dec 6 20:58:55 2008
@@ -47,7 +47,7
svn commit: r721812 - in /ibatis/trunk/java/tools/ibator/core: build/ htmldoc/reference/ src/org/apache/ibatis/ibator/api/ src/org/apache/ibatis/ibator/internal/
Author: jgbutler
Date: Sun Nov 30 05:49:27 2008
New Revision: 721812
URL: http://svn.apache.org/viewvc?rev=721812view=rev
Log:
[ibator] Some API changes to aid the Eclipse plugin
Modified:
ibatis/trunk/java/tools/ibator/core/build/version.properties
ibatis/trunk/java/tools/ibator/core/htmldoc/reference/extending.html
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/GeneratedJavaFile.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/ProgressCallback.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/ShellCallback.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/DefaultShellCallback.java
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=721812r1=721811r2=721812view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Sun Nov 30
05:49:27 2008
@@ -1,4 +1,4 @@
#ibator build version info
-#Wed Nov 12 13:18:01 CST 2008
+#Thu Nov 27 07:43:20 CST 2008
version=1.2.0
-buildNum=639
+buildNum=642
Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/reference/extending.html
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/reference/extending.html?rev=721812r1=721811r2=721812view=diff
==
--- ibatis/trunk/java/tools/ibator/core/htmldoc/reference/extending.html
(original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/reference/extending.html Sun
Nov 30 05:49:27 2008
@@ -68,6 +68,26 @@
a primary key). The base codeIntrospectedTable/code class holds an
instance
of codeorg.apache.ibatis.ibator.internal.rules.IbatorRules/code that can
be queried
to determine many of the rules for code generation./p
+pIbator supplies two implementations of introspected table. The
implementation is chosen
+bases on the value of the codetargetRuntime/code attribute of the
+codelt;ibatorContextgt;/code element. In many cases it will be fer
simpler
+to extend one of the built in implementations, rather than creating an
implementation
+from scratch. The following table shows the built in implementations:/p
+table cellspacing=0 cellpadding=5 border=1
+ tr
+thTargetRuntime/th
+thImplementation/th
+ /tr
+ tr
+tdIbatis2Java2 (default)/td
+
tdcodeorg.apache.ibatis.ibator.generator.ibatis2.IntrospectedTableIbatis2Java2Impl/code/td
+ /tr
+ tr
+tdIbatis2Java5/td
+
tdcodeorg.apache.ibatis.ibator.generator.ibatis2.IntrospectedTableIbatis2Java5Impl/code/td
+ /tr
+/table
+
pIf you choose to implement this extension point, specify the fully qualified
class name of your implementation with the codetargetRuntime/code
attribute of the codelt;ibatorContextgt;/code element./p
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/GeneratedJavaFile.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/GeneratedJavaFile.java?rev=721812r1=721811r2=721812view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/GeneratedJavaFile.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/GeneratedJavaFile.java
Sun Nov 30 05:49:27 2008
@@ -66,14 +66,14 @@
* Java merge function, you may return null from this method.
*
* @return the CompilationUnit associated with this file, or
- * null if the file is not mergable.
+ * null if the file is not mergeable.
*/
public CompilationUnit getCompilationUnit() {
return compilationUnit;
}
/**
- * A Java file is mergable if the getCompilationUnit() method
+ * A Java file is mergeable if the getCompilationUnit() method
* returns a valid compilation unit.
*
*/
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java?rev=721812r1=721811r2=721812view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java
Sun Nov 30 05:49:27 2008
@@ -219,7 +219,7 @@
String source;
try {
File directory = shellCallback.getDirectory(gxf
-.getTargetProject(), gxf.getTargetPackage
svn commit: r713555 - in /ibatis/trunk/java/tools/ibator/core: build/ buildsupport/org/apache/ibatis/ibator/build/ htmldoc/ htmldoc/configreference/ htmldoc/reference/ src/org/apache/ibatis/ibator/api
Author: jgbutler Date: Wed Nov 12 15:19:31 2008 New Revision: 713555 URL: http://svn.apache.org/viewvc?rev=713555view=rev Log: [ibator] Zeroing in on final API. More documentation. Added: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Java2Impl.java (contents, props changed) - copied, changed from r705122, ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Impl.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Java5Impl.java Removed: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/IntrospectedTableIbatis2Impl.java Modified: ibatis/trunk/java/tools/ibator/core/build/version.properties ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/EmmaDumperTask.java ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/classPathEntry.html ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/ibatorContext.html ibatis/trunk/java/tools/ibator/core/htmldoc/migratingFromAbator.html ibatis/trunk/java/tools/ibator/core/htmldoc/reference/extending.html ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/IntrospectedColumn.java 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/IbatorContext.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/dao/elements/SelectByExampleWithBLOBsMethodGenerator.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/SelectByExampleWithoutBLOBsMethodGenerator.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/generator/ibatis2/dao/elements/UpdateByExampleParmsInnerclassGenerator.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/internal/IbatorObjectFactory.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/StringUtility.java ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/EqualsHashCodePlugin.java ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/ibatorConfig.xml 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=713555r1=713554r2=713555view=diff == --- ibatis/trunk/java/tools/ibator/core/build/version.properties (original) +++ ibatis/trunk/java/tools/ibator/core/build/version.properties Wed Nov 12 15:19:31 2008 @@ -1,4 +1,4 @@ #ibator build version info -#Wed Oct 15 21:47:23 CDT 2008 +#Wed Nov 12 13:18:01 CST 2008 version=1.2.0 -buildNum=636 +buildNum=639 Modified: ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/EmmaDumperTask.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/EmmaDumperTask.java?rev=713555r1=713554r2=713555view=diff == --- ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/EmmaDumperTask.java (original) +++ ibatis/trunk/java/tools/ibator/core/buildsupport/org/apache/ibatis/ibator/build/EmmaDumperTask.java Wed Nov 12 15:19:31 2008 @@ -29,7 +29,7 @@ * lost if not forced to dump. BTW - this seems like a bug in emma! * p * This class is not intended to be used by clients. The class uses - * reflection to dump emma so that the build is not dependant on emma. + * reflection to dump emma so that the build is not dependent on emma. * * @author Jeff Butler * Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/classPathEntry.html URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/classPathEntry.html?rev=713555r1=713554r2=713555view=diff == --- ibatis/trunk/java/tools/ibator/core/htmldoc/configreference/classPathEntry.html (original
svn commit: r705128 - in /ibatis/trunk/java/tools/ibator/core/htmldoc: migratingFromAbator.html whatsNew.html
Author: jgbutler Date: Wed Oct 15 20:16:17 2008 New Revision: 705128 URL: http://svn.apache.org/viewvc?rev=705128view=rev Log: [ibator] more documentation updates Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/migratingFromAbator.html ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/migratingFromAbator.html URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/migratingFromAbator.html?rev=705128r1=705127r2=705128view=diff == --- ibatis/trunk/java/tools/ibator/core/htmldoc/migratingFromAbator.html (original) +++ ibatis/trunk/java/tools/ibator/core/htmldoc/migratingFromAbator.html Wed Oct 15 20:16:17 2008 @@ -32,8 +32,9 @@ quot;http://ibatis.apache.org/dtd/ibator-config_1_0.dtdquot;gt; /pre /li - liAll abator* elements are renamed to ibator*. For example, -lt;abatorConfigurationgt; is renamed to lt;ibatorConfigurationgt;/li + liThe lt;abatorConfigurationgt; element is renamed to lt;ibatorConfigurationgt;/li + liThe lt;abatorContextgt; element is renamed to lt;ibatorContextgt;/li + lilt;ibatorContextgt; elements now require an ID/li liThe codegeneratorSet/code attribute is removed from the codelt;ibatorContextgt;/code element and replaced with the codetargetJRE/code attribute. Valid values for this @@ -62,6 +63,20 @@ simplified. If you specified a custom implementation on the lt;javaTypeResolvergt; element, you must rework your implementation class./li + liThe ibator classloading strategy has changed substantially, and we now recommend that + you manage the runtime classpath external to ibator. If you manage the classpath with + configuration entries, you must make the + following changes from Abator: + ul +liClass path entries are specified at the configuration file level +with the a href=configreference/classPathEntry.htmllt;classPathEntrygt;/a +element - now a child element of codelt;ibatorConfigurationgt;/code only./li +liA codelt;classPathEntrygt;/code element is not longer allowed as a child +of codelt;jdbcConnectiongt;/code/li +liThe rootClasspath property is no longer valid for the codelt;javaModelGeneratorgt;/code +element./li + /ul + /li /ul /body /html \ No newline at end of file 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=705128r1=705127r2=705128view=diff == --- ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html (original) +++ ibatis/trunk/java/tools/ibator/core/htmldoc/whatsNew.html Wed Oct 15 20:16:17 2008 @@ -56,41 +56,28 @@ ul liJSE 5.0 or higher is required for ibator/li liIbator does not contain the legacy code generators from Abator. You must - choose either the Java2 or Java5 generator set - and code generated from + choose Java2 or Java5 as a target JRE - and code generated from ibator is compatible with iBATIS version 2.2.0 or higher only. If you are using an earlier version of iBATIS - upgrade! If you are not able to upgrade, then you must continue to use Abator./li - liThe DOCTYPE entry for configuration files has changed. The the - a href=configreference/ibatorConfiguration.htmllt;ibatorConfigurationgt;/a - reference page for the correct DOCTYPE./li - liThe classloading strategy in ibator is changed and simplified from Abator. All - classes are now loaded through the same classloader - including JDBC drivers, - Java model root classes, plugins, and ibator implementation classes. The - configuration for classloading has changed in these ways: - ul -liClass path entries are specified at the configuration file level -with the a href=configreference/classPathEntry.htmllt;classPathEntrygt;/a -element - now a child element of codelt;ibatorConfigurationgt;/code only./li -liA codelt;classPathEntrygt;/code element is not longer allowed as a child -of codelt;jdbcConnectiongt;/code/li -liThe rootClasspath property is no longer valid for the codelt;javaModelGeneratorgt;/code -element./li - /ul -/li - liRenamed lt;abatorConfigurationgt; to lt;ibatorConfigurationgt;/li - liRenamed lt;abatorContextgt; to lt;ibatorContextgt;/li - lilt;ibatorContextgt; elements now require an ID/li - liThe API on the codeDAOGenerator/code, codeJavaTypeResolver/code, - codeJavaModelGenerator/code, and codeSqlMapGenerator/code interfaces - has changed. In most cases, implementations of these interfaces should + liThe classloading strategy in ibator is changed from Abator. In all cases, we
svn commit: r683968 - in /ibatis/trunk/java/tools/ibator/core: build/ testJava2/ibatortest/java2/ testJava2/ibatortest/java2/execute/conditional/java2/ testJava5/ibatortest/
Author: jgbutler
Date: Fri Aug 8 07:05:10 2008
New Revision: 683968
URL: http://svn.apache.org/viewvc?rev=683968view=rev
Log:
Ibator: Add tests for BIT datatype
Modified:
ibatis/trunk/java/tools/ibator/core/build/version.properties
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/CreateDB.sql
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/InsertTests.java
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/ibatorConfig.xml
ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/CreateDB.sql
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=683968r1=683967r2=683968view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Fri Aug 8
07:05:10 2008
@@ -1,4 +1,4 @@
#ibator build version info
-#Wed Jul 23 17:01:53 CDT 2008
+#Tue Jul 29 16:30:16 CDT 2008
version=1.2.0
-buildNum=577
+buildNum=581
Modified:
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/CreateDB.sql
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/CreateDB.sql?rev=683968r1=683967r2=683968view=diff
==
--- ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/CreateDB.sql
(original)
+++ ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/CreateDB.sql
Fri Aug 8 07:05:10 2008
@@ -74,6 +74,7 @@
id7$$ int not null,
EmailAddress varchar(30),
from varchar(30),
+ active bit not null,
primary key(CuStOmEr iD)
);
Modified:
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/InsertTests.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/InsertTests.java?rev=683968r1=683967r2=683968view=diff
==
---
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/InsertTests.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/execute/conditional/java2/InsertTests.java
Fri Aug 8 07:05:10 2008
@@ -224,6 +224,7 @@
record.setSecondCustomerId(new Integer(567));
record.setSecondFirstName(fred2);
record.setThirdFirstName(fred3);
+record.setActive(true);
Integer generatedCustomerId = dao.insert(record);
assertEquals(57, generatedCustomerId.intValue());
@@ -251,6 +252,8 @@
.getSecondFirstName());
assertEquals(record.getThirdFirstName(), returnedRecord
.getThirdFirstName());
+assertEquals(record.isActive(), returnedRecord
+.isActive());
} catch (Exception e) {
fail(e.getMessage());
}
Modified:
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/ibatorConfig.xml
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/ibatorConfig.xml?rev=683968r1=683967r2=683968view=diff
==
---
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/ibatorConfig.xml
(original)
+++
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/ibatorConfig.xml
Fri Aug 8 07:05:10 2008
@@ -45,6 +45,7 @@
columnOverride column=first_name property=thirdFirstName /
columnOverride column=firstName property=fourthFirstName /
columnOverride column=from delimitedColumnName=true /
+ columnOverride column=active javaType=boolean /
/table
/ibatorContext
@@ -84,6 +85,7 @@
columnOverride column=first_name property=thirdFirstName /
columnOverride column=firstName property=fourthFirstName /
columnOverride column=from delimitedColumnName=true /
+ columnOverride column=active javaType=boolean /
/table
/ibatorContext
@@ -123,6 +125,7 @@
columnOverride column=first_name property=thirdFirstName /
columnOverride column=firstName property=fourthFirstName /
columnOverride column=from delimitedColumnName=true /
+ columnOverride column=active javaType=boolean /
/table
/ibatorContext
Modified: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/CreateDB.sql
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/CreateDB.sql?rev=683968r1=683967r2=683968view=diff
svn commit: r678576 [4/4] - in /ibatis/trunk/java/tools/ibator/core: build/ devlib/ testJava5/ testJava5/ibatortest/ testJava5/ibatortest/execute/conditional/java2/ testJava5/ibatortest/execute/condit
Modified:
ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/hierarchical/java5/UpdateByExampleTests.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/hierarchical/java5/UpdateByExampleTests.java?rev=678576r1=678575r2=678576view=diff
==
---
ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/hierarchical/java5/UpdateByExampleTests.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/hierarchical/java5/UpdateByExampleTests.java
Mon Jul 21 14:30:05 2008
@@ -16,24 +16,13 @@
package ibatortest.execute.hierarchical.java5;
-import java.sql.SQLException;
-import java.util.List;
-
-import ibatortest.BaseTest;
import ibatortest.generated.hierarchical.java5.dao.AwfulTableDAO;
-import ibatortest.generated.hierarchical.java5.dao.AwfulTableDAOImpl;
import ibatortest.generated.hierarchical.java5.dao.FieldsblobsDAO;
-import ibatortest.generated.hierarchical.java5.dao.FieldsblobsDAOImpl;
import ibatortest.generated.hierarchical.java5.dao.FieldsonlyDAO;
-import ibatortest.generated.hierarchical.java5.dao.FieldsonlyDAOImpl;
import ibatortest.generated.hierarchical.java5.dao.PkblobsDAO;
-import ibatortest.generated.hierarchical.java5.dao.PkblobsDAOImpl;
import ibatortest.generated.hierarchical.java5.dao.PkfieldsDAO;
-import ibatortest.generated.hierarchical.java5.dao.PkfieldsDAOImpl;
import ibatortest.generated.hierarchical.java5.dao.PkfieldsblobsDAO;
-import ibatortest.generated.hierarchical.java5.dao.PkfieldsblobsDAOImpl;
import ibatortest.generated.hierarchical.java5.dao.PkonlyDAO;
-import ibatortest.generated.hierarchical.java5.dao.PkonlyDAOImpl;
import ibatortest.generated.hierarchical.java5.model.AwfulTable;
import ibatortest.generated.hierarchical.java5.model.AwfulTableExample;
import ibatortest.generated.hierarchical.java5.model.Fieldsblobs;
@@ -52,22 +41,17 @@
import ibatortest.generated.hierarchical.java5.model.PkonlyExample;
import ibatortest.generated.hierarchical.java5.model.PkonlyKey;
+import java.util.List;
+
/**
*
* @author Jeff Butler
*
*/
-public class UpdateByExampleTests extends BaseTest {
-
-protected void setUp() throws Exception {
-super.setUp();
-initSqlMapClient(
-ibatortest/execute/hierarchical/java5/SqlMapConfig.xml,
-null);
-}
+public class UpdateByExampleTests extends BaseHierarchicalJava5Test {
public void testFieldsOnlyUpdateByExampleSelective() {
-FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+FieldsonlyDAO dao = getFieldsonlyDAO();
try {
Fieldsonly record = new Fieldsonly();
@@ -122,13 +106,13 @@
assertEquals(record.getDoublefield(), 99d);
assertEquals(record.getFloatfield(), 100.111);
assertEquals(record.getIntegerfield().intValue(), 9);
-} catch (SQLException e) {
+} catch (Exception e) {
fail(e.getMessage());
}
}
public void testFieldsOnlyUpdateByExample() {
-FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+FieldsonlyDAO dao = getFieldsonlyDAO();
try {
Fieldsonly record = new Fieldsonly();
@@ -165,13 +149,13 @@
assertNull(record.getDoublefield());
assertNull(record.getFloatfield());
assertEquals(record.getIntegerfield().intValue(), 22);
-} catch (SQLException e) {
+} catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKOnlyUpdateByExampleSelective() {
-PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+PkonlyDAO dao = getPkonlyDAO();
try {
PkonlyKey key = new PkonlyKey();
@@ -211,13 +195,13 @@
rows = dao.countByExample(example);
assertEquals(1, rows);
-} catch (SQLException e) {
+} catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKOnlyUpdateByExample() {
-PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+PkonlyDAO dao = getPkonlyDAO();
try {
PkonlyKey key = new PkonlyKey();
@@ -251,13 +235,13 @@
rows = dao.countByExample(example);
assertEquals(1, rows);
-} catch (SQLException e) {
+} catch (Exception e) {
fail(e.getMessage());
}
}
public void testPKFieldsUpdateByExampleSelective() {
-PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+PkfieldsDAO dao = getPkfieldsDAO();
try {
Pkfields record = new Pkfields();
@@ -291,13 +275,13 @@
rows = dao.countByExample(example);
assertEquals(1, rows);
-} catch (SQLException e) {
+} catch (Exception e) {
svn commit: r677634 - in /ibatis/trunk/java/tools/ibator/core: build/version.properties src/org/apache/ibatis/ibator/plugins/EqualsHashCodePlugin.java
Author: jgbutler
Date: Thu Jul 17 09:39:28 2008
New Revision: 677634
URL: http://svn.apache.org/viewvc?rev=677634view=rev
Log:
Fix for IBATIS-523
Modified:
ibatis/trunk/java/tools/ibator/core/build/version.properties
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/EqualsHashCodePlugin.java
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=677634r1=677633r2=677634view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Thu Jul 17
09:39:28 2008
@@ -1,4 +1,4 @@
#ibator build version info
-#Thu Jun 26 21:06:44 CDT 2008
+#Thu Jul 17 11:33:46 CDT 2008
version=1.2.0
-buildNum=559
+buildNum=560
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/EqualsHashCodePlugin.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/EqualsHashCodePlugin.java?rev=677634r1=677633r2=677634view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/EqualsHashCodePlugin.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/plugins/EqualsHashCodePlugin.java
Thu Jul 17 09:39:28 2008
@@ -191,9 +191,10 @@
sb.append(().equals(other.); //$NON-NLS-1$
sb.append(getterMethod);
sb.append(())); //$NON-NLS-1$
-if (!iter.hasNext()) {
-sb.append(';');
-}
+}
+
+if (!iter.hasNext()) {
+sb.append(';');
}
method.addBodyLine(sb.toString());
svn commit: r672075 - in /ibatis/trunk/java/tools/ibator/core: build/version.properties src/org/apache/ibatis/ibator/api/Ibator.java src/org/apache/ibatis/ibator/internal/java/dao/BaseDAOGenerator.jav
Author: jgbutler
Date: Thu Jun 26 19:09:53 2008
New Revision: 672075
URL: http://svn.apache.org/viewvc?rev=672075view=rev
Log:
ibator: fix for IBATIS-518
Modified:
ibatis/trunk/java/tools/ibator/core/build/version.properties
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/dao/BaseDAOGenerator.java
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=672075r1=672074r2=672075view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Thu Jun 26
19:09:53 2008
@@ -1,4 +1,4 @@
#ibator build version info
-#Thu Jun 05 13:28:34 CDT 2008
+#Thu Jun 26 21:06:44 CDT 2008
version=1.2.0
-buildNum=556
+buildNum=559
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java?rev=672075r1=672074r2=672075view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java
Thu Jun 26 19:09:53 2008
@@ -247,7 +247,7 @@
.getTargetProject(), gjf.getTargetPackage(), warnings);
targetFile = new File(directory, gjf.getFileName());
if (targetFile.exists()) {
-if (shellCallback.mergeSupported()) {
+if (shellCallback.mergeSupported() gjf.isMergeable()) {
source = shellCallback.mergeJavaFile(gjf,
MergeConstants.OLD_JAVA_ELEMENT_TAGS,
warnings);
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/dao/BaseDAOGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/dao/BaseDAOGenerator.java?rev=672075r1=672074r2=672075view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/dao/BaseDAOGenerator.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/dao/BaseDAOGenerator.java
Thu Jun 26 19:09:53 2008
@@ -735,7 +735,7 @@
Method method = new Method();
method.setVisibility(exampleMethodVisibility);
-FullyQualifiedJavaType returnType;
+FullyQualifiedJavaType returnType =
FullyQualifiedJavaType.getNewListInstance();;
if (useJava5Features) {
FullyQualifiedJavaType fqjt;
if (introspectedTable.getRules().generateBaseRecordClass()) {
@@ -748,11 +748,9 @@
}
compilationUnit.addImportedType(fqjt);
-returnType = FullyQualifiedJavaType.getNewListInstance();
returnType.addTypeArgument(fqjt);
-} else {
-returnType = FullyQualifiedJavaType.getNewListInstance();
}
+
method.setReturnType(returnType);
method.setName(methodNameCalculator.getSelectByExampleWithoutBLOBsMethodName(introspectedTable));
@@ -767,18 +765,14 @@
if (!interfaceMethod) {
// generate the implementation method
-StringBuffer sb = new StringBuffer();
if (useJava5Features) {
method.addSuppressTypeWarningsAnnotation();
-sb.append(returnType.getShortName());
-sb.append( list = (); //$NON-NLS-1$
-sb.append(returnType.getShortName());
-sb.append() ); //$NON-NLS-1$
-} else {
-sb.append(List list = ); //$NON-NLS-1$
}
-
+
+StringBuffer sb = new StringBuffer();
+sb.append(returnType.getShortName());
+sb.append( list = ); //$NON-NLS-1$
sb.append(daoTemplate.getQueryForListMethod(table.getSqlMapNamespace(),
XmlConstants.SELECT_BY_EXAMPLE_STATEMENT_ID,
example)); //$NON-NLS-1$
@@ -806,21 +800,18 @@
Method method = new Method();
method.setVisibility(exampleMethodVisibility);
-FullyQualifiedJavaType returnType;
+FullyQualifiedJavaType returnType =
FullyQualifiedJavaType.getNewListInstance();
if (useJava5Features) {
FullyQualifiedJavaType fqjt;
if (introspectedTable.getRules().generateRecordWithBLOBsClass()) {
fqjt
svn commit: r663717 [2/2] - in /ibatis/trunk/java/tools/ibator/core: build/ doc/ htmldoc/ htmldoc/configreference/ src/org/apache/ibatis/ibator/ant/ src/org/apache/ibatis/ibator/api/ src/org/apache/ib
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/model/JavaModelGeneratorJava2Impl.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/model/JavaModelGeneratorJava2Impl.java?rev=663717r1=663716r2=663717view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/model/JavaModelGeneratorJava2Impl.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/model/JavaModelGeneratorJava2Impl.java
Thu Jun 5 12:40:22 2008
@@ -87,23 +87,10 @@
*/
protected Properties properties;
-/**
- * The target package from the JavaModelGenerator congiguration element
- */
-protected String targetPackage;
-
-/**
- * The target project from the JavaModelGenerator congiguration element
- */
-protected String targetProject;
-
-private MapFullyQualifiedTable, MapString, Object tableValueMaps;
-
private MapString, PropertyDescriptor[] propertyDescriptorMap;
public JavaModelGeneratorJava2Impl() {
super();
-tableValueMaps = new HashMapFullyQualifiedTable, MapString,
Object();
properties = new Properties();
propertyDescriptorMap = new HashMapString, PropertyDescriptor[]();
}
@@ -112,25 +99,6 @@
this.properties.putAll(properties);
}
-/*
- * (non-Javadoc)
- *
- * @see
org.apache.ibatis.ibator.api.JavaModelGenerator#setTargetPackage(java.lang.String)
- */
-public void setTargetPackage(String targetPackage) {
-this.targetPackage = targetPackage;
-}
-
-private MapString, Object getTableValueMap(FullyQualifiedTable table) {
-MapString, Object map = tableValueMaps.get(table);
-if (map == null) {
-map = new HashMapString, Object();
-tableValueMaps.put(table, map);
-}
-
-return map;
-}
-
/**
* Adds fields and getter/setter methods for each ColumnDefinition passed
* into the method.
@@ -231,40 +199,14 @@
}
}
-/**
- * Calculates the package for generated domain objects.
- *
- * @param table
- *the current table
- * @return the calculated package
- */
-protected String getJavaModelPackage(FullyQualifiedTable table) {
-String key = getJavaModelPackage; //$NON-NLS-1$
-String s;
-
-MapString, Object map = getTableValueMap(table);
-s = (String) map.get(key);
-if (s == null) {
-StringBuffer sb = new StringBuffer(targetPackage);
-if
(true.equalsIgnoreCase(properties.getProperty(PropertyRegistry.ANY_ENABLE_SUB_PACKAGES)))
{ //$NON-NLS-1$
-sb.append(table.getSubPackage());
-}
-
-s = sb.toString();
-map.put(key, s);
-}
-
-return s;
-}
-
protected TopLevelClass getPrimaryKey(IntrospectedTable introspectedTable)
{
if (!introspectedTable.getRules().generatePrimaryKeyClass()) {
return null;
}
-FullyQualifiedTable table = introspectedTable.getTable();
-FullyQualifiedJavaType type = getPrimaryKeyType(table);
+FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
+FullyQualifiedJavaType type = introspectedTable.getPrimaryKeyType();
TopLevelClass answer = new TopLevelClass(type);
answer.setVisibility(JavaVisibility.PUBLIC);
ibatorContext.getCommentGenerator().addJavaFileComment(answer);
@@ -287,14 +229,14 @@
return null;
}
-FullyQualifiedTable table = introspectedTable.getTable();
-FullyQualifiedJavaType type = getBaseRecordType(table);
+FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
+FullyQualifiedJavaType type = introspectedTable.getBaseRecordType();
TopLevelClass answer = new TopLevelClass(type);
answer.setVisibility(JavaVisibility.PUBLIC);
ibatorContext.getCommentGenerator().addJavaFileComment(answer);
if (introspectedTable.getRules().generatePrimaryKeyClass()) {
-answer.setSuperClass(getPrimaryKeyType(table));
+answer.setSuperClass(introspectedTable.getPrimaryKeyType());
} else {
String rootClass = getRootClass(introspectedTable);
if (rootClass != null) {
@@ -327,16 +269,16 @@
return null;
}
-FullyQualifiedTable table = introspectedTable.getTable();
-FullyQualifiedJavaType type = getRecordWithBLOBsType(table);
+FullyQualifiedTable table = introspectedTable.getFullyQualifiedTable();
+FullyQualifiedJavaType type =
introspectedTable.getRecordWithBLOBsType();
TopLevelClass answer = new
svn commit: r663718 - /ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/IntrospectedTableDefaultImpl.java
Author: jgbutler
Date: Thu Jun 5 12:48:52 2008
New Revision: 663718
URL: http://svn.apache.org/viewvc?rev=663718view=rev
Log:
ibator: many changes to improve extensibility and enable future refactorings
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/IntrospectedTableDefaultImpl.java
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/IntrospectedTableDefaultImpl.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/IntrospectedTableDefaultImpl.java?rev=663718r1=663717r2=663718view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/IntrospectedTableDefaultImpl.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/IntrospectedTableDefaultImpl.java
Thu Jun 5 12:48:52 2008
@@ -41,11 +41,11 @@
*/
public class IntrospectedTableDefaultImpl implements IntrospectedTable {
-private TableConfiguration tableConfiguration;
-private ColumnDefinitions columnDefinitions;
-private FullyQualifiedTable fullyQualifiedTable;
+protected TableConfiguration tableConfiguration;
+protected ColumnDefinitions columnDefinitions;
+protected FullyQualifiedTable fullyQualifiedTable;
+protected IbatorContext ibatorContext;
private IbatorRules rules;
-private IbatorContext ibatorContext;
/**
*
@@ -97,11 +97,11 @@
public IbatorRules getRules() {
if (rules == null) {
if (tableConfiguration.getModelType() == ModelType.HIERARCHICAL) {
-this.rules = new HierarchicalModelRules(tableConfiguration,
this);
+rules = new HierarchicalModelRules(tableConfiguration, this);
} else if (tableConfiguration.getModelType() == ModelType.FLAT) {
-this.rules = new FlatModelRules(tableConfiguration, this);
+rules = new FlatModelRules(tableConfiguration, this);
} else {
-this.rules = new ConditionalModelRules(tableConfiguration,
this);
+rules = new ConditionalModelRules(tableConfiguration, this);
}
}
svn commit: r663760 - in /ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator: api/ config/ config/xml/ internal/ internal/db/ internal/java/model/ internal/sqlmap/ internal/types/ intern
Author: jgbutler
Date: Thu Jun 5 15:05:48 2008
New Revision: 663760
URL: http://svn.apache.org/viewvc?rev=663760view=rev
Log:
ibator: minor refactoring
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/FullyQualifiedTable.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/TableConfiguration.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/internal/DefaultCommentGenerator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/DatabaseIntrospector.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/db/IntrospectedTableDefaultImpl.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/model/JavaModelGeneratorJava2Impl.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/sqlmap/SqlMapGeneratorIterateImpl.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/types/JavaTypeResolverDefaultImpl.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/StringUtility.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/messages/messages.properties
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/FullyQualifiedTable.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/FullyQualifiedTable.java?rev=663760r1=663759r2=663760view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/FullyQualifiedTable.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/FullyQualifiedTable.java
Thu Jun 5 15:05:48 2008
@@ -288,7 +288,6 @@
}
// TODO - strip characters that are not valid in package names
-
return sb.toString();
}
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java?rev=663760r1=663759r2=663760view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/IbatorContext.java
Thu Jun 5 15:05:48 2008
@@ -465,7 +465,7 @@
super.addProperty(name, value);
if (PropertyRegistry.CONTEXT_SUPPRESS_TYPE_WARNINGS.equals(name)) {
-suppressTypeWarnings = true.equalsIgnoreCase(value);
//$NON-NLS-1$
+suppressTypeWarnings = StringUtility.isTrue(value);
} else if (PropertyRegistry.CONTEXT_BEGINNING_DELIMITER.equals(name)) {
beginningDelimiter = value;
} else if (PropertyRegistry.CONTEXT_ENDING_DELIMITER.equals(name)) {
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/TableConfiguration.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/TableConfiguration.java?rev=663760r1=663759r2=663760view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/TableConfiguration.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/config/TableConfiguration.java
Thu Jun 5 15:05:48 2008
@@ -481,7 +481,7 @@
}
}
-if
(true.equalsIgnoreCase(getProperty(PropertyRegistry.TABLE_USE_COLUMN_INDEXES)))
{ //$NON-NLS-1$
+if
(StringUtility.isTrue(getProperty(PropertyRegistry.TABLE_USE_COLUMN_INDEXES))) {
// when using column indexes, either both or neither query ids
should be set
if (selectByExampleStatementEnabled
selectByPrimaryKeyStatementEnabled) {
boolean queryId1Set =
StringUtility.stringHasValue(selectByExampleQueryId);
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=663760r1=663759r2=663760view=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
svn commit: r648102 [25/34] - in /ibatis/trunk/java/tools/ibator/core: ./ build/ devlib/ doc/ htmldoc/ htmldoc/configreference/ htmldoc/generatedobjects/ htmldoc/reference/ htmldoc/usage/ src/ src/org
Added: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java5/SqlMapConfig.xml URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java5/SqlMapConfig.xml?rev=648102view=auto == --- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java5/SqlMapConfig.xml (added) +++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java5/SqlMapConfig.xml Mon Apr 14 19:32:53 2008 @@ -0,0 +1,28 @@ +?xml version=1.0 encoding=UTF-8? +!DOCTYPE sqlMapConfig + PUBLIC -//ibatis.apache.org//DTD SQL Map Config 2.0//EN + http://ibatis.apache.org/dtd/sql-map-config-2.dtd; + +sqlMapConfig + + settings useStatementNamespaces=true / + + transactionManager type=JDBC +dataSource type=SIMPLE + property name=JDBC.Driver value=org.hsqldb.jdbcDriver/ + property name=JDBC.ConnectionURL value=jdbc:hsqldb:mem:aname/ + property name=JDBC.Username value=sa/ + property name=JDBC.Password value=/ + property name=JDBC.DefaultAutoCommit value=true/ +/dataSource + /transactionManager + + sqlMap resource=ibatortest/generated/conditional/java5/xml/FIELDSBLOBS_SqlMap.xml / + sqlMap resource=ibatortest/generated/conditional/java5/xml/FIELDSONLY_SqlMap.xml / + sqlMap resource=ibatortest/generated/conditional/java5/xml/PKBLOBS_SqlMap.xml / + sqlMap resource=ibatortest/generated/conditional/java5/xml/PKFIELDS_SqlMap.xml / + sqlMap resource=ibatortest/generated/conditional/java5/xml/PKFIELDSBLOBS_SqlMap.xml / + sqlMap resource=ibatortest/generated/conditional/java5/xml/PKONLY_SqlMap.xml / + sqlMap resource=ibatortest/generated/conditional/java5/xml/awful table_SqlMap.xml / + +/sqlMapConfig Added: ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java5/UpdateByExampleTests.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java5/UpdateByExampleTests.java?rev=648102view=auto == --- ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java5/UpdateByExampleTests.java (added) +++ ibatis/trunk/java/tools/ibator/core/testJava5/ibatortest/execute/conditional/java5/UpdateByExampleTests.java Mon Apr 14 19:32:53 2008 @@ -0,0 +1,851 @@ +/* + * Copyright 2007 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package ibatortest.execute.conditional.java5; + +import java.sql.SQLException; +import java.util.List; + +import ibatortest.BaseTest; +import ibatortest.generated.conditional.java5.dao.AwfulTableDAO; +import ibatortest.generated.conditional.java5.dao.AwfulTableDAOImpl; +import ibatortest.generated.conditional.java5.dao.FieldsblobsDAO; +import ibatortest.generated.conditional.java5.dao.FieldsblobsDAOImpl; +import ibatortest.generated.conditional.java5.dao.FieldsonlyDAO; +import ibatortest.generated.conditional.java5.dao.FieldsonlyDAOImpl; +import ibatortest.generated.conditional.java5.dao.PkblobsDAO; +import ibatortest.generated.conditional.java5.dao.PkblobsDAOImpl; +import ibatortest.generated.conditional.java5.dao.PkfieldsDAO; +import ibatortest.generated.conditional.java5.dao.PkfieldsDAOImpl; +import ibatortest.generated.conditional.java5.dao.PkfieldsblobsDAO; +import ibatortest.generated.conditional.java5.dao.PkfieldsblobsDAOImpl; +import ibatortest.generated.conditional.java5.dao.PkonlyDAO; +import ibatortest.generated.conditional.java5.dao.PkonlyDAOImpl; +import ibatortest.generated.conditional.java5.model.AwfulTable; +import ibatortest.generated.conditional.java5.model.AwfulTableExample; +import ibatortest.generated.conditional.java5.model.Fieldsblobs; +import ibatortest.generated.conditional.java5.model.FieldsblobsExample; +import ibatortest.generated.conditional.java5.model.FieldsblobsWithBLOBs; +import ibatortest.generated.conditional.java5.model.Fieldsonly; +import ibatortest.generated.conditional.java5.model.FieldsonlyExample; +import ibatortest.generated.conditional.java5.model.Pkblobs; +import ibatortest.generated.conditional.java5.model.PkblobsExample; +import ibatortest.generated.conditional.java5.model.Pkfields; +import ibatortest.generated.conditional.java5.model.PkfieldsExample; +import
svn commit: r648102 [21/34] - in /ibatis/trunk/java/tools/ibator/core: ./ build/ devlib/ doc/ htmldoc/ htmldoc/configreference/ htmldoc/generatedobjects/ htmldoc/reference/ htmldoc/usage/ src/ src/org
Added:
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/ibatorConfig.xml
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/ibatorConfig.xml?rev=648102view=auto
==
---
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/ibatorConfig.xml
(added)
+++
ibatis/trunk/java/tools/ibator/core/testJava2/ibatortest/java2/ibatorConfig.xml
Mon Apr 14 19:32:53 2008
@@ -0,0 +1,151 @@
+?xml version=1.0 encoding=UTF-8?
+!DOCTYPE ibatorConfiguration
+ PUBLIC -//Apache Software Foundation//DTD iBATOR for iBATIS Configuration
1.0//EN
+ http://ibatis.apache.org/dtd/ibator-config_1_0.dtd;
+
+ibatorConfiguration
+
+ ibatorContext generatorSet=Java2 defaultModelType=flat
+jdbcConnection driverClass=org.hsqldb.jdbcDriver
+connectionURL=jdbc:hsqldb:mem:aname
+userId=sa /
+
+javaModelGenerator
targetPackage=ibatortest.java2.generated.flat.java2.model
targetProject=${generated.source.dir.java2}
+ property name=enableSubPackages value=true /
+ property name=trimStrings value=true /
+/javaModelGenerator
+
+sqlMapGenerator targetPackage=ibatortest.java2.generated.flat.java2.xml
targetProject=${generated.source.dir.java2}
+ property name=enableSubPackages value=true /
+/sqlMapGenerator
+
+daoGenerator type=GENERIC-CI
targetPackage=ibatortest.java2.generated.flat.java2.dao
targetProject=${generated.source.dir.java2}
+ property name=enableSubPackages value=true /
+/daoGenerator
+
+table tableName=FieldsOnly /
+table tableName=PKOnly /
+table tableName=PKFields /
+table tableName=PKBlobs /
+table tableName=PKFieldsBlobs /
+table tableName=FieldsBlobs /
+table tableName=awful table alias=A
+ property name=useColumnIndexes value=true/
+ generatedKey column=CuStOmEr iD sqlStatement=HSQLDB identity=true
/
+ columnOverride column=customer id property=secondCustomerId /
+ columnOverride column=first name property=firstFirstName /
+ columnOverride column=First Name property=secondFirstName /
+ ignoreColumn column=first Name /
+ columnOverride column=first_name property=thirdFirstName /
+ columnOverride column=firstName property=fourthFirstName /
+ columnOverride column=from delimitedColumnName=true /
+/table
+ /ibatorContext
+
+ ibatorContext generatorSet=Java2 defaultModelType=hierarchical
+jdbcConnection driverClass=org.hsqldb.jdbcDriver
+connectionURL=jdbc:hsqldb:mem:aname
+userId=sa /
+
+javaModelGenerator
targetPackage=ibatortest.java2.generated.hierarchical.java2.model
targetProject=${generated.source.dir.java2}
+ property name=enableSubPackages value=true /
+ property name=trimStrings value=true /
+/javaModelGenerator
+
+sqlMapGenerator
targetPackage=ibatortest.java2.generated.hierarchical.java2.xml
targetProject=${generated.source.dir.java2}
+ property name=enableSubPackages value=true /
+/sqlMapGenerator
+
+daoGenerator type=GENERIC-CI
targetPackage=ibatortest.java2.generated.hierarchical.java2.dao
targetProject=${generated.source.dir.java2}
+ property name=enableSubPackages value=true /
+/daoGenerator
+
+table tableName=FieldsOnly /
+table tableName=PKOnly /
+table tableName=PKFields /
+table tableName=PKBlobs /
+table tableName=PKFieldsBlobs /
+table tableName=FieldsBlobs /
+table tableName=awful table alias=A
+ property name=useColumnIndexes value=true/
+ generatedKey column=CuStOmEr iD sqlStatement=HSQLDB identity=true
/
+ columnOverride column=customer id property=secondCustomerId /
+ columnOverride column=first name property=firstFirstName /
+ columnOverride column=First Name property=secondFirstName /
+ ignoreColumn column=first Name /
+ columnOverride column=first_name property=thirdFirstName /
+ columnOverride column=firstName property=fourthFirstName /
+ columnOverride column=from delimitedColumnName=true /
+/table
+ /ibatorContext
+
+ ibatorContext generatorSet=Java2 defaultModelType=conditional
+jdbcConnection driverClass=org.hsqldb.jdbcDriver
+connectionURL=jdbc:hsqldb:mem:aname
+userId=sa /
+
+javaModelGenerator
targetPackage=ibatortest.java2.generated.conditional.java2.model
targetProject=${generated.source.dir.java2}
+ property name=enableSubPackages value=true /
+ property name=trimStrings value=true /
+/javaModelGenerator
+
+sqlMapGenerator
targetPackage=ibatortest.java2.generated.conditional.java2.xml
targetProject=${generated.source.dir.java2}
+ property name=enableSubPackages value=true /
+/sqlMapGenerator
+
+daoGenerator type=GENERIC-CI
targetPackage=ibatortest.java2.generated.conditional.java2.dao
targetProject=${generated.source.dir.java2}
+ property name=enableSubPackages value=true /
+
svn commit: r643182 - in /ibatis/trunk/java/mapper/mapper2/tools/abator/core: build/ doc/ src/org/apache/ibatis/abator/internal/db/ src/org/apache/ibatis/abator/internal/java/model/ src/org/apache/iba
Author: jgbutler
Date: Mon Mar 31 15:20:05 2008
New Revision: 643182
URL: http://svn.apache.org/viewvc?rev=643182view=rev
Log:
Abator: handle unsupported data types better
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/DatabaseIntrospector.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/types/JavaTypeResolverDefaultImpl.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/util/messages/messages.properties
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties?rev=643182r1=643181r2=643182view=diff
==
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
(original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
Mon Mar 31 15:20:05 2008
@@ -1,4 +1,4 @@
#Abator build version info
-#Thu Mar 20 19:55:36 CDT 2008
+#Mon Mar 31 17:14:36 CDT 2008
version=1.1.0
-buildNum=426
+buildNum=428
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt?rev=643182r1=643181r2=643182view=diff
==
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt
(original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt Mon
Mar 31 15:20:05 2008
@@ -1,4 +1,10 @@
---
+Version 1.1.1:
+Bugs -
+1. When unsupported data type, allow chance to override. Otherwise, default
+ to Object Java type and OTHER JDBC type
+
+---
Version 1.1.0:
Bugs -
1. corner case where the new by example methods fail if a criteria
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/DatabaseIntrospector.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/DatabaseIntrospector.java?rev=643182r1=643181r2=643182view=diff
==
---
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/DatabaseIntrospector.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/DatabaseIntrospector.java
Mon Mar 31 15:20:05 2008
@@ -248,12 +248,25 @@
try {
javaTypeResolver.initializeResolvedJavaType(cd);
} catch (UnsupportedDataTypeException e) {
-// if the type is not supported, then we'll report a
warning and
-// ignore the column
-warnings.add(Messages.getString(Warning.14, //$NON-NLS-1$
+boolean warn = true;
+if (tc.isColumnIgnored(cd.getActualColumnName())) {
+warn = false;
+}
+
+ColumnOverride co =
tc.getColumnOverride(cd.getActualColumnName());
+if (co != null) {
+if (StringUtility.stringHasValue(co.getJavaType())
+
StringUtility.stringHasValue(co.getJavaType())) {
+warn = false;
+}
+}
+
+// if the type is not supported, then we'll report a
warning
+if (warn) {
+warnings.add(Messages.getString(Warning.24,
//$NON-NLS-1$
entry.getKey().toString(),
cd.getActualColumnName()));
-tableColumns.remove();
+}
}
}
}
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java?rev=643182r1=643181r2=643182view=diff
==
---
ibatis/trunk/java/mapper/mapper2/tools
svn commit: r639313 - in /ibatis/trunk/java/mapper/mapper2: build/version.properties doc/release.txt src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java
Author: jgbutler
Date: Thu Mar 20 08:21:12 2008
New Revision: 639313
URL: http://svn.apache.org/viewvc?rev=639313view=rev
Log:
Fix for IBATIS-497 - Improper use of hashCode in SqlExecuter
Modified:
ibatis/trunk/java/mapper/mapper2/build/version.properties
ibatis/trunk/java/mapper/mapper2/doc/release.txt
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java
Modified: ibatis/trunk/java/mapper/mapper2/build/version.properties
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/build/version.properties?rev=639313r1=639312r2=639313view=diff
==
--- ibatis/trunk/java/mapper/mapper2/build/version.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/build/version.properties Thu Mar 20
08:21:12 2008
@@ -1,5 +1,5 @@
#Build version info
-#Wed Mar 12 10:54:51 CDT 2008
+#Thu Mar 20 10:18:10 CDT 2008
version=2.3.1
-buildDate=2008/03/12 10\:54
-buildNum=700
+buildDate=2008/03/20 10\:18
+buildNum=701
Modified: ibatis/trunk/java/mapper/mapper2/doc/release.txt
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/doc/release.txt?rev=639313r1=639312r2=639313view=diff
==
--- ibatis/trunk/java/mapper/mapper2/doc/release.txt (original)
+++ ibatis/trunk/java/mapper/mapper2/doc/release.txt Thu Mar 20 08:21:12 2008
@@ -10,6 +10,7 @@
o Fixed IBATIS-484 - Make setType method in JdbcTypeRegistry public
o Fixed IBATIS-490 - Improper use of getColumnLabel()
o Fixed IBATIS-494 - Improper NULL handling in Blob and Clob Type Handlers
+ o Fixed IBATIS-497 - Improper use of hashCode in SqlExecuter
--
Modified:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java?rev=639313r1=639312r2=639313view=diff
==
---
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java
Thu Mar 20 08:21:12 2008
@@ -575,7 +575,7 @@
*/
public void addBatch(StatementScope statementScope, Connection conn,
String sql, Object[] parameters) throws SQLException {
PreparedStatement ps = null;
- if (currentSql != null sql.hashCode() == currentSql.hashCode()
sql.length() == currentSql.length()) {
+ if (currentSql != null currentSql.equals(sql)) {
int last = statementList.size() - 1;
ps = (PreparedStatement) statementList.get(last);
} else {
svn commit: r639526 - /ibatis/tags/abator_release_1.1.0-426/
Author: jgbutler Date: Thu Mar 20 20:05:06 2008 New Revision: 639526 URL: http://svn.apache.org/viewvc?rev=639526view=rev Log: Tag for Abator 1.1.0 Release Added: ibatis/tags/abator_release_1.1.0-426/ - copied from r639525, ibatis/trunk/java/mapper/mapper2/tools/abator/
svn commit: r636016 - in /ibatis/trunk/java/mapper/mapper2/tools/abator/core: build/ doc/ htmldoc/ htmldoc/configreference/ src/org/apache/ibatis/abator/config/ src/org/apache/ibatis/abator/internal/d
Author: jgbutler
Date: Tue Mar 11 10:20:37 2008
New Revision: 636016
URL: http://svn.apache.org/viewvc?rev=636016view=rev
Log:
Abator: enhancement so that Abator will not override members in a rootClass if
there is an exact match
Added:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/util/ClassloaderUtility.java
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.xml
ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/javaModelGenerator.html
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/table.html
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/whatsNew.html
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/PropertyRegistry.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/db/ConnectionFactory.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/java/model/JavaModelGeneratorJava2Impl.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/internal/util/messages/messages.properties
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/abatorConfig.xml
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/miscellaneous/BaseClass.java
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.xml
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.xml?rev=636016r1=636015r2=636016view=diff
==
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.xml
(original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.xml Tue Mar
11 10:20:37 2008
@@ -41,8 +41,8 @@
property name=reports.junit value=${reports.dir}/junit /
target name=clean unless=${TSTAMP}
- tstamp/
- available classname=java.lang.annotation.Annotation
property=usingJava5/
+tstamp/
+available classname=java.lang.annotation.Annotation
property=usingJava5/
delete dir=${work.dir} /
delete dir=${deploy.dir} /
delete dir=${reports.dir} /
@@ -204,8 +204,6 @@
/target
target name=test.generate.test.code.java5 depends=test.prepare
if=usingJava5
- echo message=Expect three warnings from Abator (BLOBSONLY,
NonExistantTable, FRED) /
-
!-- note that the class does not exist until the build runs.
Validating Ant editors will complain that the task cannot be
found, but it's not really an error. --
@@ -215,20 +213,33 @@
pathelement location=${deploy.files}/abator.jar/
/classpath
/taskdef
+
+!-- compile the base class so Abator can load it --
+javac destdir=${generated.bin.dir.java5}
+ deprecation=true
+ debug=true
+ source=1.5
+ target=1.5
+ src path=${basedir}/../testJava5/
+ include name=abatortest/execute/miscellaneous/BaseClass.java /
+/javac
- abator
configfile=${basedir}/../testJava5/abatortest/abatorConfig.xml
- propertyset
- propertyref name=generated.source.dir.java5/
- /propertyset
- /abator
+echo message=Expect three warnings from Abator (BLOBSONLY,
NonExistantTable, FRED) /
+
+abator configfile=${basedir}/../testJava5/abatortest/abatorConfig.xml
+ propertyset
+propertyref name=generated.source.dir.java5/
+propertyref name=generated.bin.dir.java5/
+ /propertyset
+/abator
/target
target name=test.compile.test.code.java2
depends=test.generate.test.code.java2
javac destdir=${generated.bin.dir.java2}
- deprecation=true
- debug=true
- source=1.4
- target=1.4
+ deprecation=true
+ debug=true
+ source=1.4
+ target=1.4
src path=${generated.source.dir.java2}/
src path=${basedir}/../testJava2/
/javac
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties?rev=636016r1=636015r2=636016view=diff
==
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
(original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
Tue Mar 11 10:20:37 2008
@@ -1,4 +1,4 @@
#Abator build version info
-#Mon Feb 25 15:55:41 CST 2008
+#Tue Mar 11 11:44:54 CDT 2008
version=1.1.0
-buildNum=413
+buildNum=421
Modified:
ibatis/trunk
svn commit: r631643 - in /ibatis/trunk/java/mapper/mapper2: build/version.properties doc/release.txt src/com/ibatis/sqlmap/engine/mapping/result/AutoResultMap.java
Author: jgbutler
Date: Wed Feb 27 08:54:07 2008
New Revision: 631643
URL: http://svn.apache.org/viewvc?rev=631643view=rev
Log:
Fix for IBATIS-490: improper use of getColumnLabel()
Modified:
ibatis/trunk/java/mapper/mapper2/build/version.properties
ibatis/trunk/java/mapper/mapper2/doc/release.txt
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/AutoResultMap.java
Modified: ibatis/trunk/java/mapper/mapper2/build/version.properties
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/build/version.properties?rev=631643r1=631642r2=631643view=diff
==
--- ibatis/trunk/java/mapper/mapper2/build/version.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/build/version.properties Wed Feb 27
08:54:07 2008
@@ -1,5 +1,5 @@
#Build version info
-#Mon Jan 14 11:40:37 MST 2008
+#Wed Feb 27 09:38:03 CST 2008
version=2.3.1
-buildDate=2008/01/14 11\:40
-buildNum=698
+buildDate=2008/02/27 09\:38
+buildNum=699
Modified: ibatis/trunk/java/mapper/mapper2/doc/release.txt
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/doc/release.txt?rev=631643r1=631642r2=631643view=diff
==
--- ibatis/trunk/java/mapper/mapper2/doc/release.txt (original)
+++ ibatis/trunk/java/mapper/mapper2/doc/release.txt Wed Feb 27 08:54:07 2008
@@ -8,6 +8,7 @@
o Fixed BATIS-391 - Cannot access Lists within custom objects.
o Fixed IBATIS-388 - Add methods to unwrap all proxied objects
o Fixed IBATIS-484 - Make setType method in JdbcTypeRegistry public
+ o Fixed IBATIS-490 - Improper use of getColumnLabel()
--
Modified:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/AutoResultMap.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/AutoResultMap.java?rev=631643r1=631642r2=631643view=diff
==
---
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/AutoResultMap.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/AutoResultMap.java
Wed Feb 27 08:54:07 2008
@@ -82,7 +82,7 @@
List resultMappingList = new ArrayList();
ResultSetMetaData rsmd = rs.getMetaData();
for (int i = 0, n = rsmd.getColumnCount(); i n; i++) {
-String columnName = rsmd.getColumnLabel(i + 1);
+String columnName = rsmd.getColumnName(i + 1);
String upperColumnName =
columnName.toUpperCase(java.util.Locale.ENGLISH);
String matchedProp = (String) propertyMap.get(upperColumnName);
Class type = null;
@@ -118,7 +118,7 @@
List resultMappingList = new ArrayList();
ResultSetMetaData rsmd = rs.getMetaData();
for (int i = 0, n = rsmd.getColumnCount(); i n; i++) {
-String columnName = rsmd.getColumnLabel(i + 1);
+String columnName = rsmd.getColumnName(i + 1);
ResultMapping resultMapping = new ResultMapping();
resultMapping.setPropertyName(columnName);
resultMapping.setColumnName(columnName);
@@ -137,7 +137,7 @@
List resultMappingList = new ArrayList();
ResultSetMetaData rsmd = rs.getMetaData();
for (int i = 0, n = rsmd.getColumnCount(); i n; i++) {
-String columnName = rsmd.getColumnLabel(i + 1);
+String columnName = rsmd.getColumnName(i + 1);
ResultMapping resultMapping = new ResultMapping();
resultMapping.setPropertyName(columnName);
resultMapping.setColumnName(columnName);
@@ -156,7 +156,7 @@
private void initializePrimitiveResults(ResultSet rs) {
try {
ResultSetMetaData rsmd = rs.getMetaData();
- String columnName = rsmd.getColumnLabel(1);
+ String columnName = rsmd.getColumnName(1);
ResultMapping resultMapping = new ResultMapping();
resultMapping.setPropertyName(columnName);
resultMapping.setColumnName(columnName);
svn commit: r631326 - in /ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc: ./ configreference/ generatedobjects/ reference/ usage/
Author: jgbutler Date: Tue Feb 26 10:25:25 2008 New Revision: 631326 URL: http://svn.apache.org/viewvc?rev=631326view=rev Log: Abator: Documentation Updates Removed: ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/roadmap.html Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/afterRunning.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/abatorConfiguration.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/abatorContext.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/classPathEntry.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/columnOverride.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/columnRenamingRule.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/commentGenerator.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/daoGenerator.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/generatedKey.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/ignoreColumn.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/javaModelGenerator.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/javaTypeResolver.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/jdbcConnection.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/properties.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/property.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/sqlMapGenerator.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/table.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/xmlconfig.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/generatedobjects/exampleClassUsage.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/generatedobjects/extendingExampleClass.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/generatedobjects/javadao.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/generatedobjects/javamodel.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/generatedobjects/results.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/generatedobjects/sqlmap.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/intro.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/license.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/menu.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/philosophy.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/quickstart.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/reference/building.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/reference/extending.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/reference/intro.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/running.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/usage/db2.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/usage/intro.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/usage/mysql.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/usage/oracle.html ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/whatsNew.html Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/afterRunning.html URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/afterRunning.html?rev=631326r1=631325r2=631326view=diff == --- ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/afterRunning.html (original) +++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/afterRunning.html Tue Feb 26 10:25:25 2008 @@ -7,6 +7,12 @@ link type=text/css rel=stylesheet href=abator.css/ /head body +p align=right + font size=-2 +a href=index.html target=_topFrames/a +a href=afterRunning.html target=_topNo Frames/a + /font +/p h1Tasks After Running Abator/h1 pAfter you run Abator, you will need to create or modify other iBATIS configuration artifacts. The main tasks are as follows:/p Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/abatorConfiguration.html URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/configreference/abatorConfiguration.html?rev=631326r1=631325r2=631326view=diff
