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 @@
<path id="runtime.src">
<pathelement location="${src.rt}"/>
- <pathelement location="${src.compat}"/>
</path>
<path id="test.src">
@@ -44,11 +43,6 @@
</fileset>
</delete>
<delete>
- <fileset dir="${src.compat}">
- <include name="**/*.class"/>
- </fileset>
- </delete>
- <delete>
<fileset dir="${src.dev}">
<include name="**/*.class"/>
</fileset>
@@ -99,14 +93,10 @@
<target name="src.compile" depends="prepare">
<javac srcdir="${src.rt}" sourcepathref="sourcepath"
classpathref="classpath" destdir="${work.classes}" deprecation="true"
debug="true"/>
- <javac srcdir="${src.compat}" sourcepathref="sourcepath"
classpathref="classpath" destdir="${work.classes}" deprecation="true"
debug="true"/>
<copy todir="${work.classes}">
<fileset dir="${src.rt}" >
<exclude name="**/*.java"/>
</fileset>
- <fileset dir="${src.compat}" >
- <exclude name="**/*.java"/>
- </fileset>
</copy>
<javac srcdir="${src.dev}" sourcepathref="sourcepath"
classpathref="classpath" destdir="${work.tests}" deprecation="false"
debug="true"/>
<javac srcdir="${src.test}" sourcepathref="sourcepath"
classpathref="classpath" destdir="${work.tests}" deprecation="false"
debug="true"/>
@@ -170,7 +160,6 @@
<filter excludes="net.*"/>
<filter excludes="*Test"/>
<filter excludes="testdomain.*"/>
- <filter excludes="compatibility.*"/>
<filter excludes="xmltester.*"/>
</instr>
</emma>
@@ -199,14 +188,7 @@
</junitreport>
</target>
- <target name="test.compatibility" depends="test.report">
- <java fork="true" classname="compatibility.RunAllCompat"
failonerror="true">
- <classpath path="${work.instr}"/>
- <classpath refid="classpath"/>
- </java>
- </target>
-
- <target name="test.coverage" depends="test.compatibility" >
+ <target name="test.coverage" depends="test.report" >
<emma enabled="${coverage.enabled}">
<report sourcepath="${src.rt}"
sort="+block,+name,+method,+class"
@@ -283,31 +265,9 @@
</jar>
</target>
- <target name="jar.compatibility" depends="src.compile">
- <mkdir dir="${deploy.path}/lib/1-x-Compatibility/"/>
- <jar jarfile="${deploy.path}/lib/1-x-Compatibility/ibatis-sqlmap-1-x.jar">
- <manifest>
- <attribute name="Built-On" value="${buildDate}"/>
- <section name="com/ibatis/db/">
- <attribute name="Implementation-Title" value="iBatis compatibility"/>
- <attribute name="Implementation-Version" value="${version} build#
${buildNum}"/>
- <attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
- </section>
- </manifest>
- <fileset dir="${work.classes}">
- <include name="com/ibatis/db/**/*"/>
- </fileset>
- <fileset dir="${deploy.path}">
- <include name="release.txt"/>
- <include name="license.txt"/>
- </fileset>
- </jar>
- </target>
-
<target name="jar.src" depends="src.compile">
<jar jarfile="${deploy.path}/src/ibatis-src.zip">
<fileset dir="${src.rt}"/>
- <fileset dir="${src.compat}"/>
<fileset dir="${deploy.path}">
<include name="release.txt"/>
<include name="license.txt"/>
@@ -324,7 +284,7 @@
</jar>
</target>
- <target name="deploy.assemble"
depends="jar.sqlmaps,jar.dao,jar.common,jar.compatibility,jar.src, jar.javadoc">
+ <target name="deploy.assemble"
depends="jar.sqlmaps,jar.dao,jar.common,jar.src, jar.javadoc">
<copy todir="${deploy.path}/lib">
<fileset dir="${lib.rt}">
<include name="**/*.jar"/>
@@ -342,16 +302,5 @@
<target name="all" depends="test.coverage, src.javadoc, deploy.zipfile">
<fail if="testsFailed" message="The tests did not pass"/>
</target>
-
- <!--
- <taskdef name="convertSqlMaps"
classname="com.ibatis.db.sqlmap.upgrade.ConvertTask" classpathref="classpath"/>
- <target name="convert">
- <convertSqlMaps todir="F:/out/" overwrite="true">
- <fileset dir="${tests}/compatibility/">
- <include name="**/maps/*.xml"/>
- </fileset>
- </convertSqlMaps>
- </target>
- -->
</project>
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,6 +2,12 @@
Build Number: @buildNum@
------------------------------
+ 2.2.0 - ??? ??, 2006
+------------------------------
+
+ o Removed iBATIS 1.x compatibility libraries, they are no longer supported.
+
+------------------------------
2.1.7 - Jan 21, 2006
------------------------------
Modified:
ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/DynamicPrependTest.java
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/DynamicPrependTest.java?rev=371208&r1=371207&r2=371208&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/DynamicPrependTest.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/DynamicPrependTest.java
Sat Jan 21 21:42:15 2006
@@ -1,12 +1,11 @@
package com.ibatis.sqlmap;
import testdomain.Account;
+import testdomain.MyBean;
import java.sql.SQLException;
import java.util.Arrays;
import java.util.List;
-
-import compatibility.domain.MyBean;
public class DynamicPrependTest extends BaseSqlMapTest {
Added: ibatis/trunk/java/mapper/mapper2/test/testdomain/MyBean.java
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/test/testdomain/MyBean.java?rev=371208&view=auto
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/test/testdomain/MyBean.java (added)
+++ ibatis/trunk/java/mapper/mapper2/test/testdomain/MyBean.java Sat Jan 21
21:42:15 2006
@@ -0,0 +1,42 @@
+package testdomain;
+
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: bgoodin
+ * Date: May 25, 2005
+ * Time: 6:57:01 AM
+ * To change this template use File | Settings | File Templates.
+ */
+public class MyBean {
+
+ public List getMyList() {
+ return myList;
+ }
+
+ public void setMyList(List myList) {
+ this.myList = myList;
+ }
+
+ public Object[] getMyArray() {
+ return myArray;
+ }
+
+ public void setMyArray(Object[] myArray) {
+ this.myArray = myArray;
+ }
+
+ public int[] getIntArray() {
+ return intArray;
+ }
+
+ public void setIntArray(int[] intArray) {
+ this.intArray = intArray;
+ }
+
+ private List myList;
+ private Object[] myArray;
+ private int[] intArray;
+
+}
