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

2010-01-05 Thread jgbutler 
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/

2010-01-05 Thread jgbutler 
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)
+++

svn commit: r896322 - /ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java

2010-01-05 Thread cbegin 
Author: cbegin
Date: Wed Jan  6 05:09:25 2010
New Revision: 896322

URL: http://svn.apache.org/viewvc?rev=896322view=rev
Log:
ibatis-727 fixed silly deprecated date constructor bug

Modified:

ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java

Modified: 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java?rev=896322r1=896321r2=896322view=diff
==
--- 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java
 (original)
+++ 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java
 Wed Jan  6 05:09:25 2010
@@ -134,9 +134,7 @@
   protected Date nowInTimeZone(String toTimezone) {
 final Calendar c = new GregorianCalendar(TimeZone.getTimeZone(toTimezone), 
Locale.US);
 c.setTimeInMillis(new GregorianCalendar().getTimeInMillis());
-return new Date(
-c.get(Calendar.YEAR), c.get(Calendar.MONTH), c.get(Calendar.DATE),
-c.get(Calendar.HOUR), c.get(Calendar.MINUTE), c.get(Calendar.SECOND));
+return c.getTime();
   }
 
   protected void copyResourceTo(String resource, File toFile) {

svn commit: r896323 - in /ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis: cache/ cache/decorators/ cache/impl/ executor/

2010-01-05 Thread cbegin 
Author: cbegin
Date: Wed Jan  6 05:32:42 2010
New Revision: 896323

URL: http://svn.apache.org/viewvc?rev=896323view=rev
Log:
ibatis-724 fixed: Performance inefficiency using 
org.apache.ibatis.cache.Cache#hasKey

Modified:

ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/Cache.java

ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/FifoCache.java

ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/LoggingCache.java

ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java

ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/ScheduledCache.java

ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SerializedCache.java

ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SoftCache.java

ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SynchronizedCache.java

ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/TransactionalCache.java

ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/WeakCache.java

ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/impl/PerpetualCache.java

ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BaseExecutor.java

ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/CachingExecutor.java

Modified: 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/Cache.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/Cache.java?rev=896323r1=896322r2=896323view=diff
==
--- 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/Cache.java
 (original)
+++ 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/Cache.java
 Wed Jan  6 05:32:42 2010
@@ -12,8 +12,6 @@
 
   Object getObject(Object key);
 
-  boolean hasKey(Object key);
-
   Object removeObject(Object key);
 
   void clear();

Modified: 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/FifoCache.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/FifoCache.java?rev=896323r1=896322r2=896323view=diff
==
--- 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/FifoCache.java
 (original)
+++ 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/FifoCache.java
 Wed Jan  6 05:32:42 2010
@@ -41,10 +41,6 @@
 return delegate.getObject(key);
   }
 
-  public boolean hasKey(Object key) {
-return delegate.hasKey(key);
-  }
-
   public Object removeObject(Object key) {
 return delegate.removeObject(key);
   }

Modified: 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/LoggingCache.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/LoggingCache.java?rev=896323r1=896322r2=896323view=diff
==
--- 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/LoggingCache.java
 (original)
+++ 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/LoggingCache.java
 Wed Jan  6 05:32:42 2010
@@ -32,17 +32,14 @@
 
   public Object getObject(Object key) {
 requests++;
-if (hasKey(key)) {
+final Object value = delegate.getObject(key);
+if (value != null) {
   hits++;
 }
 if (log.isDebugEnabled()) {
   log.debug(Cache Hit Ratio [ + getId() + ]:  + getHitRatio());
 }
-return delegate.getObject(key);
-  }
-
-  public boolean hasKey(Object key) {
-return delegate.hasKey(key);
+return value;
   }
 
   public Object removeObject(Object key) {

Modified: 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java?rev=896323r1=896322r2=896323view=diff
==
--- 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java
 (original)
+++ 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java
 Wed Jan  6