Author: cbegin Date: Sat Mar 27 17:33:51 2010 New Revision: 928237 URL: http://svn.apache.org/viewvc?rev=928237&view=rev Log: removed compat module
Added: ibatis/java/ibatis-3/trunk/ibatis-3-core/LICENSE ibatis/java/ibatis-3/trunk/ibatis-3-core/NOTICE ibatis/java/ibatis-3/trunk/ibatis-3-core/TODO Removed: ibatis/java/ibatis-3/trunk/LICENSE ibatis/java/ibatis-3/trunk/NOTICE ibatis/java/ibatis-3/trunk/TODO ibatis/java/ibatis-3/trunk/common.xml ibatis/java/ibatis-3/trunk/ibatis-3-compat/ ibatis/java/ibatis-3/trunk/pom.xml Modified: ibatis/java/ibatis-3/trunk/build.xml ibatis/java/ibatis-3/trunk/version.properties Modified: ibatis/java/ibatis-3/trunk/build.xml URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/build.xml?rev=928237&r1=928236&r2=928237&view=diff ============================================================================== --- ibatis/java/ibatis-3/trunk/build.xml (original) +++ ibatis/java/ibatis-3/trunk/build.xml Sat Mar 27 17:33:51 2010 @@ -1,4 +1,222 @@ -<project name="iBATIS-3" default="all" basedir="." > +<project name="Maven Module Builder" default="all" basedir="." xmlns:artifact="urn:maven-artifact-ant"> + + <property name="module" value="ibatis-3-core"/> + + <!-- INPUTS --> + <!-- <property name="module" value="some-module-name" /> --> + <property name="src.dir" value="${module}/src/main/java" /> + <property name="test.dir" value="${module}/src/test/java" /> + + <!-- OUTPUTS --> + <property name="build.root" value="./build/${module}"/> + + <property name="classes" value="${build.root}/classes"/> + <property name="classes.test" value="${build.root}/classes-test"/> + <property name="classes.instrumented" value="${build.root}/classes-instrumented"/> + + <property name="reports.junit" value="${build.root}/reports-junit"/> + <property name="reports.coverage" value="${build.root}/reports-coverage"/> + + <property name="deploy.tozip" value="${build.root}/exploded"/> + <property name="deploy.dist" value="${build.root}/dist"/> + + <!-- MAVEN --> + + <path id="maven-ant-tasks.classpath" + path="ant-lib/maven-ant-tasks-2.0.9.jar" /> + + <typedef resource="org/apache/maven/artifact/ant/antlib.xml" + uri="urn:maven-artifact-ant" + classpathref="maven-ant-tasks.classpath" /> + + <artifact:pom id="${module}.pom" file="${module}/pom.xml" /> + + <artifact:dependencies pathId="compile.dep" usescope="compile" pomrefid="${module}.pom" /> + <artifact:dependencies pathId="test.dep" usescope="test" pomrefid="${module}.pom" /> + + <!-- EMMA --> + + <path id="emma.classpath"> + <pathelement location="ant-lib/emma_ant.jar" /> + <pathelement location="ant-lib/emma.jar" /> + </path> + + <taskdef resource="emma_ant.properties" + classpathref="emma.classpath" /> + + <!-- PATHS --> + + <path id="classes-to-instrument"> + <pathelement location="${classes}"/> + </path> + + <path id="classpath"> + <pathelement location="${classes}"/> + <pathelement location="${classes.test}"/> + <path refid="emma.classpath"/> + <path refid="compile.dep"/> + <path refid="test.dep"/> + </path> + + <target name="clean"> + <delete dir="${build.root}"/> + <delete dir="ibderby"/> + <delete dir="${module}/ibderby"/> + <delete> + <fileset dir="./"> + <include name="junit*.properties"/> + <include name="coverage.ec"/> + <include name="derby.log"/> + <include name="${module}/derby.log"/> + </fileset> + </delete> + </target> + + <target name="prepare" depends="clean"> + <mkdir dir="${build.root}"/> + <mkdir dir="${classes}"/> + <mkdir dir="${classes.test}"/> + <mkdir dir="${classes.instrumented}"/> + <mkdir dir="${reports.junit}"/> + <mkdir dir="${reports.coverage}"/> + <mkdir dir="${deploy.dist}"/> + <!-- Prepare Release Docs --> + <propertyfile file="version.properties" comment="Build version info"> + <entry key="buildDate" type="date" value="now"/> + <entry key="buildNum" default="0" type="int" operation="+" value="1"/> + </propertyfile> + </target> + + <target name="compile" depends="prepare"> + <javac srcdir="${src.dir}" destdir="${classes}" classpathref="classpath" deprecation="false" debug="true"/> + <copy todir="${classes}"> + <fileset dir="${src.dir}" > + <exclude name="**/*.java"/> + </fileset> + </copy> + <javac srcdir="${test.dir}" destdir="${classes.test}" classpathref="classpath" deprecation="false" debug="true"/> + <copy todir="${classes.test}"> + <fileset dir="${test.dir}" > + <exclude name="**/*.java"/> + </fileset> + </copy> + </target> + + <target name="test.instrument" depends="compile"> + <emma> + <instr instrpathref="classes-to-instrument" + destdir="${classes.instrumented}" + metadatafile="./coverage.ec" + merge="true"> + <filter excludes="org.apache.ibatis.ognl.*"/> + </instr> + </emma> + </target> + + <target name="test.run" depends="test.instrument"> + <junit printsummary="true" showoutput="true"> + <formatter type="xml"/> + <batchtest todir="${reports.junit}" fork="yes" haltonerror="no" failureproperty="testsFailed"> + <fileset dir="${classes.test}"> + <include name="**/*Test.class"/> + <exclude name="**/Base*Test.class"/> + </fileset> + </batchtest> + <classpath path="${classes.instrumented}"/> + <classpath refid="classpath"/> + </junit> + </target> + + <target name="test.report" depends="test.run" > + <junitreport todir="${reports.junit}"> + <fileset dir="${reports.junit}"> + <include name="TEST-*.xml"/> + </fileset> + <report format="frames" todir="${reports.junit}"/> + </junitreport> + </target> + + <target name="test.coverage" depends="test.report" > + <emma> + <report sourcepath="${src.dir}" + sort="+block,+name,+method,+class" + metrics="method:70,block:80,line:80,class:100" + > + <fileset dir="./"> + <include name="*.ec"/> + </fileset> + <html outfile="${reports.coverage}/coverage.html" + depth="method" + columns="name,class,method,block,line" + /> + </report> + </emma> + </target> + + <target name="dist.jar.lib" depends="compile"> + <property file="version.properties"/> + <property name="deploy.exploded" value="${deploy.tozip}/${module}-${version}.${buildNum}"/> + <mkdir dir="${deploy.exploded}"/> + <jar jarfile="${deploy.exploded}/${module}-${version}.${buildNum}.jar"> + <manifest> + <attribute name="Built-On" value="${buildDate}"/> + <section name="${module}"> + <attribute name="Implementation-Title" value="${module}"/> + <attribute name="Implementation-Version" value="${version} build# ${buildNum}"/> + <attribute name="Implementation-Vendor" value="Apache Software Foundation"/> + </section> + </manifest> + <fileset dir="${classes}"/> + <fileset dir="./"> + <include name="LICENSE"/> + <include name="NOTICE"/> + </fileset> + </jar> + </target> + + <target name="dist.jar.src" depends="compile"> + <property file="version.properties"/> + <property name="deploy.exploded" value="${deploy.tozip}/${module}-${version}.${buildNum}"/> + <mkdir dir="${deploy.exploded}"/> + <jar jarfile="${deploy.exploded}/${module}-src-${version}.${buildNum}.zip"> + <manifest> + <attribute name="Built-On" value="${buildDate}"/> + <section name="${module}"> + <attribute name="Implementation-Title" value="${module}"/> + <attribute name="Implementation-Version" value="${version} build# ${buildNum}"/> + <attribute name="Implementation-Vendor" value="Apache Software Foundation"/> + </section> + </manifest> + <fileset dir="${src.dir}"/> + <fileset dir="./"> + <include name="LICENSE"/> + <include name="NOTICE"/> + </fileset> + </jar> + </target> + + <target name="dist.assemble" depends="dist.jar.lib,dist.jar.src"> + <property file="version.properties"/> + <property name="deploy.exploded" value="${deploy.tozip}/${module}-${version}.${buildNum}"/> + <mkdir dir="${deploy.exploded}"/> + <copy todir="${deploy.exploded}"> + <fileset dir="./"> + <include name="LICENSE"/> + <include name="NOTICE"/> + </fileset> + </copy> + </target> + + <target name="dist" depends="dist.assemble"> + <property file="version.properties"/> + <zip zipfile="${deploy.dist}/${module}-${version}.${buildNum}.zip"> + <fileset dir="${deploy.tozip}"/> + </zip> + </target> + + <target name="all" depends="test.coverage,dist"> + <fail if="testsFailed" message="The tests did not pass"/> + </target> <target name="build.migrations"> <property file="version.properties"/> @@ -25,46 +243,5 @@ <fileset dir="${migrations.tozip}"/> </zip> </target> - - <target name="all"> - <antcall target="_external_run"> - <param name="target" value="all"/> - </antcall> - <antcall target="build.migrations"/> - </target> - - <target name="clean"> - <antcall target="_external_run"> - <param name="target" value="clean"/> - </antcall> - </target> - - <target name="compile"> - <antcall target="_external_run"> - <param name="target" value="compile"/> - </antcall> - </target> - - <target name="test"> - <antcall target="_external_run"> - <param name="target" value="test.coverage"/> - </antcall> - </target> - - <target name="dist"> - <antcall target="_external_run"> - <param name="target" value="dist"/> - </antcall> - </target> - - <target name="_external_run"> - <ant antfile="common.xml" target="${target}"> - <property name="module" value="ibatis-3-core"/> - </ant> - <ant antfile="common.xml" target="${target}"> - <property name="module" value="ibatis-3-compat"/> - </ant> - </target> - - -</project> \ No newline at end of file + +</project> Added: ibatis/java/ibatis-3/trunk/ibatis-3-core/LICENSE URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/LICENSE?rev=928237&view=auto ============================================================================== --- ibatis/java/ibatis-3/trunk/ibatis-3-core/LICENSE (added) +++ ibatis/java/ibatis-3/trunk/ibatis-3-core/LICENSE Sat Mar 27 17:33:51 2010 @@ -0,0 +1,202 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. + Added: ibatis/java/ibatis-3/trunk/ibatis-3-core/NOTICE URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/NOTICE?rev=928237&view=auto ============================================================================== --- ibatis/java/ibatis-3/trunk/ibatis-3-core/NOTICE (added) +++ ibatis/java/ibatis-3/trunk/ibatis-3-core/NOTICE Sat Mar 27 17:33:51 2010 @@ -0,0 +1,34 @@ +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + +OGNL +//-------------------------------------------------------------------------- +// Copyright (c) 2004, Drew Davidson and Luke Blanshard +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// Neither the name of the Drew Davidson nor the names of its contributors +// may be used to endorse or promote products derived from this software +// without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF +// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +// DAMAGE. +//-------------------------------------------------------------------------- Added: ibatis/java/ibatis-3/trunk/ibatis-3-core/TODO URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/TODO?rev=928237&view=auto ============================================================================== --- ibatis/java/ibatis-3/trunk/ibatis-3-core/TODO (added) +++ ibatis/java/ibatis-3/trunk/ibatis-3-core/TODO Sat Mar 27 17:33:51 2010 @@ -0,0 +1,14 @@ +################################### +# TO-DO List # +################################### + +Required: + * Fix #{index} references in foreach (2,2,2)... + * Add <e param=""> and <ne param=""> for nullable equals and not equals (= vs. is conversion) + +Nice to Have: + + * Preserve select key id on failed statement (refactor keygenerator interface) + * Commit required option at statement level + * http://issues.apache.org/jira/browse/IBATIS-357 + Modified: ibatis/java/ibatis-3/trunk/version.properties URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/version.properties?rev=928237&r1=928236&r2=928237&view=diff ============================================================================== --- ibatis/java/ibatis-3/trunk/version.properties (original) +++ ibatis/java/ibatis-3/trunk/version.properties Sat Mar 27 17:33:51 2010 @@ -1,5 +1,5 @@ #Build version info -#Mon Mar 01 23:05:11 MST 2010 +#Sat Mar 27 11:18:09 MDT 2010 version=3.0.0 -buildDate=2010/03/01 23\:05 -buildNum=243 +buildDate=2010/03/27 11\:18 +buildNum=244