svn commit: r370998 - in /ibatis/trunk/cs/mapper: IBatisNet.DataAccess.Test/bin/Debug/providers.config IBatisNet.DataMapper.Test/bin/Debug/providers.config

2006-01-21 Thread gbayon
Author: gbayon
Date: Sat Jan 21 02:00:35 2006
New Revision: 370998

URL: http://svn.apache.org/viewcvs?rev=370998&view=rev
Log:
- Added SqlServer 2005 defintion in providers.config

Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/providers.config
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/providers.config

Modified: 
ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/providers.config
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/providers.config?rev=370998&r1=370997&r2=370998&view=diff
==
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/providers.config 
(original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/providers.config 
Sat Jan 21 02:00:35 2006
@@ -35,6 +35,23 @@
useParameterPrefixInSql="true" 
useParameterPrefixInParameter="true" 
parameterPrefix="@"/>
+ 
 http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/providers.config?rev=370998&r1=370997&r2=370998&view=diff
==
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/providers.config 
(original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/providers.config 
Sat Jan 21 02:00:35 2006
@@ -24,7 +24,8 @@
description="Microsoft SQL Server 7.0/2000, provider V1.0.5000.0 in 
framework .NET V1.1" 
enabled="true"
default="true" 
-   assemblyName="System.Data, Version=1.0.5000.0, Culture=neutral, 
PublicKeyToken=b77a5c561934e089" 
connectionClass="System.Data.SqlClient.SqlConnection" 
+   assemblyName="System.Data, Version=1.0.5000.0, Culture=neutral, 
PublicKeyToken=b77a5c561934e089" 
+   connectionClass="System.Data.SqlClient.SqlConnection" 
commandClass="System.Data.SqlClient.SqlCommand" 
parameterClass="System.Data.SqlClient.SqlParameter" 
parameterDbTypeClass="System.Data.SqlDbType" 
@@ -35,6 +36,23 @@
useParameterPrefixInSql="true" 
useParameterPrefixInParameter="true" 
parameterPrefix="@"/>
+ 
 

svn commit: r371170 - in /ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine: cache/CacheModel.java mapping/statement/CachingStatement.java

2006-01-21 Thread cbegin
Author: cbegin
Date: Sat Jan 21 18:31:59 2006
New Revision: 371170

URL: http://svn.apache.org/viewcvs?rev=371170&view=rev
Log:
Fixed IBATIS-223 Thread deadlock due to CacheModel.flush() (Sven's fix)

Modified:

ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/cache/CacheModel.java

ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/CachingStatement.java

Modified: 
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/cache/CacheModel.java
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/cache/CacheModel.java?rev=371170&r1=371169&r2=371170&view=diff
==
--- 
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/cache/CacheModel.java
 (original)
+++ 
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/cache/CacheModel.java
 Sat Jan 21 18:31:59 2006
@@ -24,17 +24,14 @@
 import java.util.*;
 
 /**
- *
+ * Wrapper for Caches.
  */
 public class CacheModel implements ExecuteListener {
-
-  private static final Map lockMap = new HashMap();
   /**
* This is used to represent null objects that are returned from the cache so
* that they can be cached, too.
*/
   public static final Object NULL_OBJECT = new Object();
-  private final Object STATS_LOCK = new Object();
   private int requests = 0;
   private int hits = 0;
 
@@ -237,12 +234,9 @@
* Clears the cache
*/
   public void flush() {
-lastFlush = System.currentTimeMillis();
-// use the controller's key
-CacheKey key = new CacheKey();
-key.update(controller);
-synchronized (getLock(key)) {
+   synchronized (this)  {
   controller.flush(this);
+  lastFlush = System.currentTimeMillis();
 }
   }
 
@@ -255,39 +249,32 @@
* @return The cached object (or null)
*/
   public Object getObject(CacheKey key) {
+   Object value = null;
 synchronized (this) {
   if (flushInterval != NO_FLUSH_INTERVAL
   && System.currentTimeMillis() - lastFlush > flushInterval) {
 flush();
   }
-}
 
-Object value = null;
-synchronized (getLock(key)) {
   value = controller.getObject(this, key);
-}
-
-if (serialize && !readOnly && (value != NULL_OBJECT && value != null)) {
-  try {
-ByteArrayInputStream bis = new ByteArrayInputStream((byte[]) value);
-ObjectInputStream ois = new ObjectInputStream(bis);
-value = ois.readObject();
-ois.close();
-  } catch (Exception e) {
-throw new NestedRuntimeException("Error caching serializable object.  
Be sure you're not attempting to use " +
-"a serialized cache for an object that may be taking advantage of 
lazy loading.  Cause: " + e, e);
+  if (serialize && !readOnly &&
+   (value != NULL_OBJECT && value != null)) {
+try {
+  ByteArrayInputStream bis = new ByteArrayInputStream((byte[]) value);
+  ObjectInputStream ois = new ObjectInputStream(bis);
+  value = ois.readObject();
+  ois.close();
+} catch (Exception e) {
+  throw new NestedRuntimeException("Error caching serializable object. 
 Be sure you're not attempting to use " +
+   "a serialized cache for an object 
that may be taking advantage of lazy loading.  Cause: " + e, e);
+}
   }
-}
-
-synchronized (STATS_LOCK) {
   requests++;
   if (value != null) {
 hits++;
   }
 }
-
 return value;
-
   }
 
   /**
@@ -297,39 +284,21 @@
* @param value The object to be cached
*/
   public void putObject(CacheKey key, Object value) {
-if (null == value) value = NULL_OBJECT;
-if (serialize && !readOnly && value != NULL_OBJECT) {
-  try {
-ByteArrayOutputStream bos = new ByteArrayOutputStream();
-ObjectOutputStream oos = new ObjectOutputStream(bos);
-oos.writeObject(value);
-oos.flush();
-oos.close();
-value = bos.toByteArray();
-  } catch (IOException e) {
-throw new NestedRuntimeException("Error caching serializable object.  
Cause: " + e, e);
+   if (null == value) value = NULL_OBJECT;
+   synchronized ( this )  {
+  if (serialize && !readOnly && value != NULL_OBJECT) {
+try {
+  ByteArrayOutputStream bos = new ByteArrayOutputStream();
+  ObjectOutputStream oos = new ObjectOutputStream(bos);
+  oos.writeObject(value);
+  oos.flush();
+  oos.close();
+  value = bos.toByteArray();
+} catch (IOException e) {
+  throw new NestedRuntimeException("Error caching serializable object. 
 Cause: " + e, e);
+}
   }
-}
-synchronized (getLock(key)) {
   controller.putObject(this, key, value);
 }
   }
-
-  /**
-   * OK, honestly, i have no idea what this does.
-   * @param key
-   * @return
-   */
-  

svn commit: r371173 - in /ibatis/trunk/java/mapper/mapper2: src/com/ibatis/sqlmap/engine/mapper/ src/com/ibatis/sqlmap/engine/mapper/metadata/ test/com/ibatis/sqlmap/mapper/

2006-01-21 Thread cbegin
Author: cbegin
Date: Sat Jan 21 19:13:39 2006
New Revision: 371173

URL: http://svn.apache.org/viewcvs?rev=371173&view=rev
Log:
Implemented stats based name matcher for use with auto crud ops generation

Added:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapper/

ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapper/Canonicalizer.java

ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapper/Match.java

ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapper/MatchCalculator.java

ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapper/NameMatcher.java

ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapper/metadata/

ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapper/metadata/Column.java

ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapper/metadata/Database.java

ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapper/metadata/DatabaseFactory.java

ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapper/metadata/Table.java
ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/mapper/

ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/mapper/CanonicalizerTest.java

ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/mapper/DatabaseMetadataTest.java

ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/mapper/MatchCalculatorTest.java

ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/mapper/NameMatcherTest.java

Added: 
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapper/Canonicalizer.java
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapper/Canonicalizer.java?rev=371173&view=auto
==
--- 
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapper/Canonicalizer.java
 (added)
+++ 
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapper/Canonicalizer.java
 Sat Jan 21 19:13:39 2006
@@ -0,0 +1,177 @@
+package com.ibatis.sqlmap.engine.mapper;
+
+import java.util.StringTokenizer;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Iterator;
+
+public class Canonicalizer {
+
+  public Map buildCanonicalMap(String[] originals) {
+return buildCanonicalMap(originals, null);
+  }
+  public Map buildCanonicalMap(String[] originals, String parentName) {
+Map map = new HashMap();
+for (int i=0; i < originals.length; i++) {
+  map.put(originals[i], originals[i]);
+}
+upperCase(map);
+removeUnderscores(map);
+removePKFK(map);
+removePrefixes(map);
+removeSuffixes(map);
+removePluralization(map);
+removeParentName(map, parentName);
+return map;
+  }
+
+  private void removeParentName(Map map, String parentName) {
+if (parentName != null) {
+  parentName = parentName.toUpperCase();
+  Iterator i = map.keySet().iterator();
+  while (i.hasNext()) {
+String original = (String) i.next();
+String canonical = (String) map.get(original);
+if (canonical.startsWith(parentName)) {
+  map.put(original, canonical.substring(parentName.length()));
+}
+if (canonical.endsWith(parentName)) {
+  map.put(original, canonical.substring(0, canonical.length() - 
parentName.length()));
+}
+  }
+}
+  }
+
+  private void upperCase(Map map) {
+Iterator i = map.keySet().iterator();
+while (i.hasNext()) {
+  String original = (String) i.next();
+  String canonical = (String) map.get(original);
+  map.put(original, canonical.toUpperCase());
+}
+  }
+
+  private void removePKFK(Map map) {
+Iterator i = map.keySet().iterator();
+while (i.hasNext()) {
+  String original = (String) i.next();
+  String canonical = (String) map.get(original);
+  if (canonical.startsWith("PK")) {
+map.put(original, canonical.substring(2));
+  } else if (canonical.startsWith("FK")) {
+map.put(original, canonical.substring(2));
+  }
+  if (canonical.endsWith("PK")) {
+map.put(original, canonical.substring(0, canonical.length() - 2));
+  } else if (canonical.endsWith("FK")) {
+map.put(original, canonical.substring(0, canonical.length() - 2));
+  }
+}
+  }
+
+  private void removePrefixes(Map map) {
+int prefix = findPrefixLength(map);
+
+if (prefix > 1) {
+  Iterator i = map.keySet().iterator();
+  while (i.hasNext()) {
+String original = (String) i.next();
+String canonical = (String) map.get(original);
+map.put(original, canonical.substring(prefix));
+  }
+}
+  }
+
+  private void removeSuffixes(Map map) {
+int suffix = findSuffixLength(map);
+
+if (suffix > 1) {
+  Iterator i = map.keySet().iterator();
+  while (i.hasNext()) {
+String original = (String) i.next();
+ 

svn commit: r371177 - in /ibatis/trunk/java/mapper/mapper2: build/build.properties build/version.properties doc/release.txt doc/wish-list.txt

2006-01-21 Thread cbegin
Author: cbegin
Date: Sat Jan 21 20:25:07 2006
New Revision: 371177

URL: http://svn.apache.org/viewcvs?rev=371177&view=rev
Log:
2.1.7 release

Removed:
ibatis/trunk/java/mapper/mapper2/doc/wish-list.txt
Modified:
ibatis/trunk/java/mapper/mapper2/build/build.properties
ibatis/trunk/java/mapper/mapper2/build/version.properties
ibatis/trunk/java/mapper/mapper2/doc/release.txt

Modified: ibatis/trunk/java/mapper/mapper2/build/build.properties
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/build/build.properties?rev=371177&r1=371176&r2=371177&view=diff
==
--- ibatis/trunk/java/mapper/mapper2/build/build.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/build/build.properties Sat Jan 21 20:25:07 
2006
@@ -31,6 +31,6 @@
 reports.coverage=./reports/coverage
 
 deploy.path=./exploded
-deploy.prefix=iBATIS_DBL-2.1.6.
+deploy.prefix=iBATIS_DBL-2.1.7.
 deploy.ext=.zip
 deploy.files=./deploy

Modified: ibatis/trunk/java/mapper/mapper2/build/version.properties
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/build/version.properties?rev=371177&r1=371176&r2=371177&view=diff
==
--- ibatis/trunk/java/mapper/mapper2/build/version.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/build/version.properties Sat Jan 21 
20:25:07 2006
@@ -1,5 +1,5 @@
 #Build version info
-#Sun Nov 06 11:16:16 MST 2005
-version=2.1.6
-buildDate=2005/11/06 11\:16
-buildNum=591
+#Sat Jan 21 21:08:44 MST 2006
+version=2.1.7
+buildDate=2006/01/21 21\:08
+buildNum=597

Modified: ibatis/trunk/java/mapper/mapper2/doc/release.txt
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/doc/release.txt?rev=371177&r1=371176&r2=371177&view=diff
==
--- ibatis/trunk/java/mapper/mapper2/doc/release.txt (original)
+++ ibatis/trunk/java/mapper/mapper2/doc/release.txt Sat Jan 21 20:25:07 2006
@@ -2,6 +2,19 @@
 Build Number: @buildNum@
 
 --
+ 2.1.7 - Jan 21, 2006
+--
+
+ o Fixed IBATIS-218 'i' character in property names, with Turkish locale
+ o Fixed IBATIS-219 NoClassDefFoundError: oracle/toplink/sessions/UnitOfWork
+ o Fixed IBATIS-228 Exception is thrown by TransactionManager when multiple 
commits are issued against a started transaction.
+ o Fixed IBATIS-229 Method getWriteablePropertyNames in 
com.ibatis.common.beans.ComplexBeanProbe gets the readable property names
+ o Fixed IBATIS-220 Null Pointer in SqlExecutor.handleResults where ResultSet 
is null.
+ o Fixed IBATIS-213 SELECT statement returns unexpected result when 'groupBy' 
and 'nullValue' are specified in resultMaps.
+ o Fixed IBATIS-221 Can't store a List in a Map 
+ o Fixed IBATIS-223 Thread deadlock due to CacheModel.flush() 
+
+--
  2.1.6 - Nov 5, 2005
 --
 




svn commit: r371181 - in /ibatis/trunk/site: pages/archive.vm pages/dao.vm pages/datamapper.vm pages/index.vm pages/petstore.vm template/ac2005us_banner_468x60.jpg template/jp4.gif template/menu.vm

2006-01-21 Thread cbegin
Author: cbegin
Date: Sat Jan 21 20:39:37 2006
New Revision: 371181

URL: http://svn.apache.org/viewcvs?rev=371181&view=rev
Log: (empty)

Removed:
ibatis/trunk/site/template/ac2005us_banner_468x60.jpg
Modified:
ibatis/trunk/site/pages/archive.vm
ibatis/trunk/site/pages/dao.vm
ibatis/trunk/site/pages/datamapper.vm
ibatis/trunk/site/pages/index.vm
ibatis/trunk/site/pages/petstore.vm
ibatis/trunk/site/template/jp4.gif
ibatis/trunk/site/template/menu.vm

Modified: ibatis/trunk/site/pages/archive.vm
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/site/pages/archive.vm?rev=371181&r1=371180&r2=371181&view=diff
==
--- ibatis/trunk/site/pages/archive.vm (original)
+++ ibatis/trunk/site/pages/archive.vm Sat Jan 21 20:39:37 2006
@@ -7,6 +7,17 @@
 
  News Archive
 
+ iBATIS Java 2.1.6 - Maintenance Release
+ (Nov 5, 2005) Just released a maintenance release to take care of the 
summer bug list. This puts us
+   in a good spot to start planning for 2.2.0, where we're currently 
discussing some changes to the current
+   version support levels, which will enable us to add a bunch of new 
features. If you aren't on the dev or
+   Java mailing list, then join up to discuss! For now, enjoy the 
cleanliness of version 2.1.6.
+ 
+   
+ Get iBATIS 2.1.6 from the Downloads page.
+ 
+   
+
  iBATIS for Ruby
  (August 25, 2005) It's official.  iBATIS is no longer a simple tool or 
framework. It is a genuine
  approach to integrating object oriented applications and relational 
databases.  We could have said that

Modified: ibatis/trunk/site/pages/dao.vm
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/site/pages/dao.vm?rev=371181&r1=371180&r2=371181&view=diff
==
--- ibatis/trunk/site/pages/dao.vm (original)
+++ ibatis/trunk/site/pages/dao.vm Sat Jan 21 20:39:37 2006
@@ -20,8 +20,6 @@
  includes the SQL Maps Framework. Although packaged together, the DAO 
Framework is completely independent and can be
  used without SQL Maps. .NET users can download the DataAccess framework 
seperately from the DataMapper framework.
 
-Download the 
iBATIS Data Access Objects framework and documentation!
-
 
 
 

Modified: ibatis/trunk/site/pages/datamapper.vm
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/site/pages/datamapper.vm?rev=371181&r1=371180&r2=371181&view=diff
==
--- ibatis/trunk/site/pages/datamapper.vm (original)
+++ ibatis/trunk/site/pages/datamapper.vm Sat Jan 21 20:39:37 2006
@@ -18,8 +18,6 @@
 nearly any database to any object model and is very tolerant of legacy 
designs, or even bad designs. This is all achieved 
 without special database tables, peer objects or code generation.
 
-Download the iBATIS Data Mapper framework and documentation!
-
 
 
 

Modified: ibatis/trunk/site/pages/index.vm
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/site/pages/index.vm?rev=371181&r1=371180&r2=371181&view=diff
==
--- ibatis/trunk/site/pages/index.vm (original)
+++ ibatis/trunk/site/pages/index.vm Sat Jan 21 20:39:37 2006
@@ -39,22 +39,37 @@
 
 News
 
+
+iBATIS Java 2.1.7 - Maintenance Release - Last 1.3 Compatible Release!
+
+(Jan 21, 2006) Well, as we said back in November, iBATIS will require JDK 
1.4 as of the 2.2.0 release.
+  We expect that this 2.1.7 release will be the last JDK 1.3 compatible 
release that we make, unless a serious
+  stability or security flaw is found, in which case we'll deploy a fix from a 
branch of the source.  This release
+  contains a number of minor bug fixes, an enhanced entity resolver. 2.2.0 
will be an interesting release with
+  some new features that we've been looking forward to.
+
+
+  
+Get iBATIS 2.1.7 from the Downloads page.
+
+  
+
   iBATIS.NET DataMapper V1.3 Beta and DataAccess V1.7 Beta
-  (Dec 15, 2005) The iBATIS.NET team is pleased to announce that the Beta 
distributions of the DataMapper V1.3 and DataAccess V1.7 frameworks are ready! 
-  Although this is primarily for bug fixes and documentation updates, there 
are some important changes:
+  (Dec 15, 2005) The iBATIS.NET team is pleased to announce that the Beta 
distributions of the DataMapper V1.3 and DataAccess V1.7 frameworks are ready! 
+  Although this is primarily for bug fixes and documentation updates, there 
are some important changes:
   
 Enabling Intellisense in Visual Studio 2003 for configuration 
and mapping files
-Updates to configuration and mapping schemas
-Now uses Castle.DynamicProxy V1.1.5.0
-Added assembly signatures
-Provides custom logger support
-Removes the use of Xml serialization for loading configuration 
files
-  
-
-  Please see the change log for more details.  Thanks on

svn commit: r371182 - in /ibatis/trunk/site/pages: dotnetdownloads.vm downloads.vm javadownloads.vm

2006-01-21 Thread cbegin
Author: cbegin
Date: Sat Jan 21 20:40:18 2006
New Revision: 371182

URL: http://svn.apache.org/viewcvs?rev=371182&view=rev
Log: (empty)

Added:
ibatis/trunk/site/pages/dotnetdownloads.vm
ibatis/trunk/site/pages/javadownloads.vm
Removed:
ibatis/trunk/site/pages/downloads.vm

Added: ibatis/trunk/site/pages/dotnetdownloads.vm
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/site/pages/dotnetdownloads.vm?rev=371182&view=auto
==
--- ibatis/trunk/site/pages/dotnetdownloads.vm (added)
+++ ibatis/trunk/site/pages/dotnetdownloads.vm Sat Jan 21 20:40:18 2006
@@ -0,0 +1,51 @@
+
+
+iBATIS Downloads
+
+
+
+
+iBATIS.NET Downloads
+
+Releases
+
+  http://cvs.apache.org/dist/ibatis/ibatis.net/beta/IBatisNet.DataMapper-bin-1.3.0.zip";>DataMapper
 1.3 [http://cvs.apache.org/dist/ibatis/ibatis.net/beta/IBatisNet.DataMapper-bin-1.3.0.md5";>MD5]
 (Apache Beta)
+  http://cvs.apache.org/dist/ibatis/ibatis.net/beta/IBatisNet.DataAccess-bin-1.7.0.zip";>DataAccess
 1.7 [http://cvs.apache.org/dist/ibatis/ibatis.net/beta/IBatisNet.DataAccess-bin-1.7.0.md5";>MD5]
 (Apache Beta)
+  http://cvs.apache.org/dist/ibatis/ibatis.net/beta/Source.zip";>Source 
Revision 356824 [http://cvs.apache.org/dist/ibatis/ibatis.net/beta/Source.md5";>MD5]
+
+
+
+  http://prdownloads.sourceforge.net/ibatisnet/DataMapper-bin-1.2.1.zip?download";>DataMapper
 1.2.1 (Apache General Availability)
+  http://prdownloads.sourceforge.net/ibatisnet/DataAccess-bin-1.6.1.zip?download";>DataAccess
 1.6.1 (Apache General Availability)
+  http://prdownloads.sourceforge.net/ibatisnet/iBATIS-src-SVN-179390.zip?download";>Source
 Revision 179390
+  http://sourceforge.net/project/showfiles.php?group_id=109704";>Old 
Releases (at SourceForge)
+
+
+
+  Examples
+
+  http://prdownloads.sourceforge.net/ibatisnet/Tutorial-1.2.1.zip?download";>DataMapper
 Tutorial 1.2.1 Docs and Source
+  http://prdownloads.sourceforge.net/ibatisnet/NPetshop-1.0.0.RC1.zip?download";>NPetShop
 Example Application
+
+
+Documentation 
+
+
+  
+English
+
+  http://cvs.apache.org/dist/ibatis/ibatis.net/beta/Doc-DataMapper-1.3.0.zip";>DataMapper
 1.3 Beta Docs [http://cvs.apache.org/dist/ibatis/ibatis.net/beta/Doc-DataMapper-1.3.0.md5";>MD5]
 (CHM, PDF, and SDK Help)
+  http://cvs.apache.org/dist/ibatis/ibatis.net/beta/Doc-DataAccess-1.7.0.zip";>DataAccess
 1.7 Beta Docs [http://cvs.apache.org/dist/ibatis/ibatis.net/beta/Doc-DataAccess-1.7.0.md5";>MD5]
 (CHM, PDF, and SDK Help)
+
+
+  http://prdownloads.sourceforge.net/ibatisnet/Tutorial-1.2.1.zip?download";>DataMapper
 Tutorial 1.2.1 Docs and Source
+  http://prdownloads.sourceforge.net/ibatisnet/DataMapper-doc-1.2.1.zip?download";>DataMapper
 1.2.1 Docs (CHM, PDF, and SDK Help)
+  http://prdownloads.sourceforge.net/ibatisnet/DataAccess-doc-1.6.1.zip?download";>DataAccess
 1.6.1 Docs (CHM, PDF, and SDK Help)
+  http://ibatisnet.sourceforge.net/docs/en/sdkhelp/web/";>DataMapper 1.2.1 
and DataAccess 1.6.1 Online SDK Help
+
+  
+
+
+
+
+

Added: ibatis/trunk/site/pages/javadownloads.vm
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/site/pages/javadownloads.vm?rev=371182&view=auto
==
--- ibatis/trunk/site/pages/javadownloads.vm (added)
+++ ibatis/trunk/site/pages/javadownloads.vm Sat Jan 21 20:40:18 2006
@@ -0,0 +1,42 @@
+
+
+iBATIS Downloads
+
+
+
+
+iBATIS for Java Downloads
+
+Releases
+
+  http://cvs.apache.org/dist/ibatis/beta/iBATIS_DBL-2.1.7.597.zip";>iBATIS
 Java 2.1.7 w/Binaries and Source (Jan 21, 2006 - Beta) 
+  http://prdownloads.sourceforge.net/ibatisdb/iBATIS_DBL-2.1.5.582.zip?download";>iBATIS
 Java 2.1.5 w/Binaries and Source (Jul 17, 2005 - General Availability) 

+  http://sourceforge.net/project/showfiles.php?group_id=61326";>Old Releases 
(at SourceForge) 
+
+
+Examples
+
+  http://cvs.apache.org/dist/ibatis/beta/JPetStore-5.0.zip";>JPetStore 5.0 
Example Application (Apache Alpha)
+
+
+Documentation 
+
+  English
+
+  http://prdownloads.sourceforge.net/ibatisnet/DevGuide.pdf?download";>Generic
 Developer Guide
+  http://prdownloads.sourceforge.net/ibatisdb/iBATIS-SqlMaps-2.pdf?download";>SQL
 Maps for Java, Developer Guide 
+  http://prdownloads.sourceforge.net/ibatisdb/iBATIS-SqlMaps-2-Tutorial.pdf?download";>SQL
 Maps for Java, Tutorial 
+  http://prdownloads.sourceforge.net/ibatisdb/iBATIS-DAO-2.pdf?download";>DAO
 for Java, Developer Guide
+
+  
+  Chinese
+
+  http://prdownloads.sourceforge.net/ibatisdb/iBATIS-SqlMaps-2_cn.pdf?download";>SQL
 Maps for Java, Developer Guide 
+  http://prdownloads.sourceforge.net/ibatisdb/iBATIS-SqlMaps-2-Tutorial_cn.pdf?download

svn commit: r371183 - in /ibatis/trunk/site: pages/petstore.vm template/jp4.gif

2006-01-21 Thread cbegin
Author: cbegin
Date: Sat Jan 21 20:45:28 2006
New Revision: 371183

URL: http://svn.apache.org/viewcvs?rev=371183&view=rev
Log: (empty)

Modified:
ibatis/trunk/site/pages/petstore.vm
ibatis/trunk/site/template/jp4.gif

Modified: ibatis/trunk/site/pages/petstore.vm
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/site/pages/petstore.vm?rev=371183&r1=371182&r2=371183&view=diff
==
--- ibatis/trunk/site/pages/petstore.vm (original)
+++ ibatis/trunk/site/pages/petstore.vm Sat Jan 21 20:45:28 2006
@@ -9,53 +9,12 @@
 
 iBATIS PetStore
 
-The official example application for iBATIS SQL Maps 2.0 and DAO 
2.0
+The official example application for iBATIS Data Mapper and DAO 
frameworks
 
-JPetStore is a fully functional web application based on iBATIS open source 
persistence layer products, including the
-SQL Maps 2.0 and Data Access Objects 2.0 frameworks. JPetStore is an excellent 
example of how these frameworks can be 
-implemented in a typical J2EE web application.
+PetStore is a fully functional web application based on iBATIS open source 
persistence layer products, including the
+SQL Maps and Data Access Objects frameworks. JPetStore is an excellent example 
of how the iBATIS frameworks can be 
+implemented in a typical J2EE and .NET web application.
 
-Features
-
-  
- SQL Maps 2.0
- Data Access Objects 2.0
- POJO Service Layer
- POJO Domain Classes
- Struts MVC (Experimental BeanAction approach)
- JSP Presentation Layer
-  
-  
-Qualities
-
-  
- 100% freeware and open source tools and frameworks
- Uses well known patterns and best practices
- Highly productive programming model
- Minimal Dependencies
- No stored procedures
- No generated code
-  
-  
-A New Beginning (and a work in progress)
-
-JPetStore 4.0 marks a new start for JPetStore. Now that all of the pet 
store comparisons and benchmarks are behind 
-it (hopefully), the focus of JPetStore 4 will be realigned. JPetStore 4 will 
now exclusively be a good example of 
-application best practices and good design principles. But it's not there yet. 
A lot of old scars remain from its 
-past as a tool for comparison to other platforms. These scars will slowly be 
erased. Here's the plan:
-
-  
- Reimplement the presentation layer to one of the following: Struts 
1.1, JSF or possibly Tapestry
-
-   Currently JP4 uses an experimental Struts implementation --see 
BeanAction Javadocs for more
-
- Replace the database schema with a better one. The current database 
is (and has always been) a nightmare of poor database design practices.
- Consider middle tier frameworks with AOP and/or IoC features. I'm 
totally behind the simplification of J2EE, and I think AOP and IoC are the 
paths that will lead us to achieving that goal.
-  
-
-NPetShop
-The Pet Store application has also been written for .NET and shares much of 
the same qualities as its Java brother.  However,
-because it was written entirely outside of the context of competition, it 
doesn't share as many of the battle scars!  :-)
 
 
 

Modified: ibatis/trunk/site/template/jp4.gif
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/site/template/jp4.gif?rev=371183&r1=371182&r2=371183&view=diff
==
Binary files - no diff available.




svn commit: r371184 - /ibatis/tags/java_release_2.1.7-597/

2006-01-21 Thread cbegin
Author: cbegin
Date: Sat Jan 21 20:47:19 2006
New Revision: 371184

URL: http://svn.apache.org/viewcvs?rev=371184&view=rev
Log:
Copied remotely

Added:
ibatis/tags/java_release_2.1.7-597/
  - copied from r371183, ibatis/trunk/



svn commit: r371208 - in /ibatis/trunk/java/mapper/mapper2: build/build.properties build/build.xml build/version.properties doc/jar-dependencies.txt doc/release.txt test/com/ibatis/sqlmap/DynamicPrepe

2006-01-21 Thread cbegin
Author: cbegin
Date: Sat Jan 21 21:42:15 2006
New Revision: 371208

URL: http://svn.apache.org/viewcvs?rev=371208&view=rev
Log: (empty)

Added:
ibatis/trunk/java/mapper/mapper2/test/testdomain/MyBean.java
Modified:
ibatis/trunk/java/mapper/mapper2/build/build.properties
ibatis/trunk/java/mapper/mapper2/build/build.xml
ibatis/trunk/java/mapper/mapper2/build/version.properties
ibatis/trunk/java/mapper/mapper2/doc/jar-dependencies.txt
ibatis/trunk/java/mapper/mapper2/doc/release.txt

ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/DynamicPrependTest.java

Modified: ibatis/trunk/java/mapper/mapper2/build/build.properties
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/build/build.properties?rev=371208&r1=371207&r2=371208&view=diff
==
--- ibatis/trunk/java/mapper/mapper2/build/build.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/build/build.properties Sat Jan 21 21:42:15 
2006
@@ -3,7 +3,6 @@
 #
 
 src.rt=../src
-src.compat=../compatibility
 src.dev=../devsrc
 src.test=../test
 

Modified: ibatis/trunk/java/mapper/mapper2/build/build.xml
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/build/build.xml?rev=371208&r1=371207&r2=371208&view=diff
==
--- ibatis/trunk/java/mapper/mapper2/build/build.xml (original)
+++ ibatis/trunk/java/mapper/mapper2/build/build.xml Sat Jan 21 21:42:15 2006
@@ -4,7 +4,6 @@
 
   
 
-
   
 
   
@@ -44,11 +43,6 @@
   
 
 
-  
-
-  
-
-
   
 
   
@@ -99,14 +93,10 @@
 
   
 
-
 
   
 
   
-  
-
-  
 
 
 
@@ -170,7 +160,6 @@
 
 
 
-
 
   
 
@@ -199,14 +188,7 @@
 
   
 
-  
-
-  
-  
-
-  
-
-  
+  
 
   
   
 
-  
-
-
-  
-
- 
-  
-  
-  
-
-  
-  
-
-  
-  
-
-
-  
-
-  
-
   
 
   
-  
   
 
 
@@ -324,7 +284,7 @@
 
   
 
-  
+  
 
   
 
@@ -342,16 +302,5 @@
   
 
   
-
-  
 
 

Modified: ibatis/trunk/java/mapper/mapper2/build/version.properties
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/build/version.properties?rev=371208&r1=371207&r2=371208&view=diff
==
--- ibatis/trunk/java/mapper/mapper2/build/version.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/build/version.properties Sat Jan 21 
21:42:15 2006
@@ -1,5 +1,5 @@
 #Build version info
-#Sat Jan 21 21:08:44 MST 2006
+#Sat Jan 21 22:36:29 MST 2006
 version=2.1.7
-buildDate=2006/01/21 21\:08
-buildNum=597
+buildDate=2006/01/21 22\:36
+buildNum=600

Modified: ibatis/trunk/java/mapper/mapper2/doc/jar-dependencies.txt
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/doc/jar-dependencies.txt?rev=371208&r1=371207&r2=371208&view=diff
==
--- ibatis/trunk/java/mapper/mapper2/doc/jar-dependencies.txt (original)
+++ ibatis/trunk/java/mapper/mapper2/doc/jar-dependencies.txt Sat Jan 21 
21:42:15 2006
@@ -1,16 +1,9 @@
 JAR File Dependencies
 -
 
-iBATIS 2.0 has no dependencies, as long as you're running JDK 1.4.
+iBATIS 2.0 requires JDK 1.4
 
-  * If you're running less than JDK 1.4 and if your app server also
-doesn't already supply the following, then you may need these:
-
-  JDBC 2.0 Extensions(http://java.sun.com/products/jdbc/download.html)
-  JTA 1.0.1a (http://java.sun.com/products/jta/)
-  Xerces 2.4.0   (http://xml.apache.org/xerces2-j/)
-
-All remaining libraries and JAR files are completely optional. Here's
+All other libraries and JAR files are completely optional. Here's
 a summary of those libraries and when you need to use them.  The versions
 listed here are simply the version tested.  Higher versions may or may not 
 work.
@@ -31,10 +24,6 @@
 
   Commons Logging(http://jakarta.apache.org/commons/)
   Log4J 1.2.8(http://logging.apache.org/log4j/docs/)
-
-  * If you want to use legacy (1.x) DAO framework or SQL Map APIs you'll need:
-
-  iBATIS DAO 1.3.1   (http://sourceforge.net/projects/ibatisdb/)
 
 That's it!
 

Modified: ibatis/trunk/java/mapper/mapper2/doc/release.txt
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/doc/release.txt?rev=371208&r1=371207&r2=371208&view=diff
==
--- ibatis/trunk/java/mapper/mapper2/doc/release.txt (original)
+++ ibatis/trunk/java/mapper/mapper2/doc/release.txt Sat Jan 21 21:42:15 2006
@@ -2,

svn commit: r371209 - /ibatis/trunk/java/mapper/mapper2/test/compatibility/

2006-01-21 Thread cbegin
Author: cbegin
Date: Sat Jan 21 21:43:19 2006
New Revision: 371209

URL: http://svn.apache.org/viewcvs?rev=371209&view=rev
Log:
Removed iBATIS 1.x compatibility libraries.

Removed:
ibatis/trunk/java/mapper/mapper2/test/compatibility/



svn commit: r371210 - /ibatis/trunk/java/mapper/mapper2/compatibility/

2006-01-21 Thread cbegin
Author: cbegin
Date: Sat Jan 21 21:43:47 2006
New Revision: 371210

URL: http://svn.apache.org/viewcvs?rev=371210&view=rev
Log:
Removed iBATIS 1.x compatibility libraries.

Removed:
ibatis/trunk/java/mapper/mapper2/compatibility/



svn commit: r371211 - /ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/client/template/JtaDaoTemplate.java

2006-01-21 Thread cbegin
Author: cbegin
Date: Sat Jan 21 21:46:57 2006
New Revision: 371211

URL: http://svn.apache.org/viewcvs?rev=371211&view=rev
Log:
Deleted deprecated JtaDaoTemplate

Removed:

ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/client/template/JtaDaoTemplate.java



svn commit: r371212 - /ibatis/trunk/java/mapper/mapper2/doc/release.txt

2006-01-21 Thread cbegin
Author: cbegin
Date: Sat Jan 21 21:47:24 2006
New Revision: 371212

URL: http://svn.apache.org/viewcvs?rev=371212&view=rev
Log:
Deleted deprecated JtaDaoTemplate

Modified:
ibatis/trunk/java/mapper/mapper2/doc/release.txt

Modified: ibatis/trunk/java/mapper/mapper2/doc/release.txt
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/doc/release.txt?rev=371212&r1=371211&r2=371212&view=diff
==
--- ibatis/trunk/java/mapper/mapper2/doc/release.txt (original)
+++ ibatis/trunk/java/mapper/mapper2/doc/release.txt Sat Jan 21 21:47:24 2006
@@ -6,6 +6,7 @@
 --
 
  o Removed iBATIS 1.x compatibility libraries, they are no longer supported.
+ o Removed deprectated JtaDaoTemplate
 
 --
  2.1.7 - Jan 21, 2006