Author: cbegin
Date: Sun Oct 5 23:27:25 2008
New Revision: 701958
URL: http://svn.apache.org/viewvc?rev=701958&view=rev
Log:
added dtd files
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/monarch-configuration.dtd
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/monarch-mapper.dtd
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/example/BlogMapper.xml
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/example/MapperConfig.xml
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/monarch-configuration.dtd
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/monarch-configuration.dtd?rev=701958&view=auto
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/monarch-configuration.dtd
(added)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/monarch-configuration.dtd
Sun Oct 5 23:27:25 2008
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!ELEMENT configuration (properties?, typeAliases?, typeHandlers?,
objectFactory?, plugins?, environments?, mappers)>
+
+<!ELEMENT properties (property*)>
+<!ATTLIST properties
+resource CDATA #IMPLIED
+url CDATA #IMPLIED
+>
+
+<!ELEMENT property EMPTY>
+<!ATTLIST property
+name CDATA #REQUIRED
+value CDATA #REQUIRED
+>
+
+<!ELEMENT typeAliases (typeAlias+)>
+
+<!ELEMENT typeAlias EMPTY>
+<!ATTLIST typeAlias
+alias CDATA #REQUIRED
+type CDATA #REQUIRED
+>
+
+<!ELEMENT typeHandlers (typeHandler+)>
+
+<!ELEMENT typeHandler EMPTY>
+<!ATTLIST typeHandler
+javaType CDATA #REQUIRED
+jdbcType CDATA #IMPLIED
+callback CDATA #REQUIRED
+>
+
+<!ELEMENT objectFactory (property*)>
+<!ATTLIST objectFactory
+type CDATA #REQUIRED
+>
+
+<!ELEMENT plugins (plugin+)>
+
+<!ELEMENT plugin (property*)>
+<!ATTLIST plugin
+interceptor CDATA #REQUIRED
+>
+
+<!ELEMENT environments (environment*)>
+<!ATTLIST environments
+default CDATA #REQUIRED
+>
+
+<!ELEMENT environment (transactionManager,dataSource)>
+<!ATTLIST environment
+id CDATA #REQUIRED
+>
+
+<!ELEMENT transactionManager (property*)>
+<!ATTLIST transactionManager
+type CDATA #REQUIRED
+>
+
+<!ELEMENT dataSource (property*)>
+<!ATTLIST dataSource
+type CDATA #REQUIRED
+>
+
+<!ELEMENT mappers (mapper+)>
+
+<!ELEMENT mapper EMPTY>
+<!ATTLIST mapper
+resource CDATA #IMPLIED
+url CDATA #IMPLIED
+>
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/monarch-mapper.dtd
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/monarch-mapper.dtd?rev=701958&view=auto
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/monarch-mapper.dtd
(added)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/main/java/org/apache/ibatis/monarch/builder/monarch-mapper.dtd
Sun Oct 5 23:27:25 2008
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!ELEMENT mapper (cache-ref | cache | resultMap* | parameterMap* | sql* |
statement* | insert* | update* | delete* | select* | procedure*)+>
+<!ATTLIST mapper
+xmlns:fo CDATA #IMPLIED
+namespace CDATA #IMPLIED
+>
+
+<!ELEMENT cache-ref EMPTY>
+<!ATTLIST cache-ref
+namespace CDATA #REQUIRED
+>
+
+<!ELEMENT cache (property*)>
+<!ATTLIST cache
+type CDATA #REQUIRED
+eviction CDATA #REQUIRED
+flushInterval CDATA #REQUIRED
+size CDATA #REQUIRED
+readOnly CDATA #REQUIRED
+>
+
+<!ELEMENT parameterMap (parameter+)>
+<!ATTLIST parameterMap
+id CDATA #REQUIRED
+type CDATA #REQUIRED
+>
+
+<!ELEMENT parameter EMPTY>
+<!ATTLIST parameter
+property CDATA #REQUIRED
+javaType CDATA #IMPLIED
+jdbcType CDATA #IMPLIED
+mode (IN | OUT | INOUT) #IMPLIED
+resultMap CDATA #IMPLIED
+scale CDATA #IMPLIED
+typeHandler CDATA #IMPLIED
+>
+
+<!ELEMENT resultMap (constructor,id*,result*,collection* discriminator?)>
+<!ATTLIST resultMap
+id CDATA #REQUIRED
+type CDATA #REQUIRED
+extends CDATA #IMPLIED
+>
+
+<!ELEMENT constructor (id*,result*)>
+<!ATTLIST resultMap
+id CDATA #REQUIRED
+type CDATA #REQUIRED
+extends CDATA #IMPLIED
+>
+
+<!ELEMENT id EMPTY>
+<!ATTLIST result
+property CDATA #REQUIRED
+javaType CDATA #IMPLIED
+column CDATA #IMPLIED
+jdbcType CDATA #IMPLIED
+typeHandler CDATA #IMPLIED
+>
+
+<!ELEMENT result EMPTY>
+<!ATTLIST result
+property CDATA #REQUIRED
+javaType CDATA #IMPLIED
+column CDATA #IMPLIED
+jdbcType CDATA #IMPLIED
+typeHandler CDATA #IMPLIED
+>
+
+<!ELEMENT collection EMPTY>
+<!ATTLIST result
+property CDATA #REQUIRED
+column CDATA #IMPLIED
+javaType CDATA #IMPLIED
+jdbcType CDATA #IMPLIED
+select CDATA #IMPLIED
+resultMap CDATA #IMPLIED
+typeHandler CDATA #IMPLIED
+>
+
+<!ELEMENT discriminator (case+)>
+<!ATTLIST discriminator
+column CDATA #IMPLIED
+javaType CDATA #REQUIRED
+jdbcType CDATA #IMPLIED
+typeHandler CDATA #IMPLIED
+>
+
+<!ELEMENT case EMPTY>
+<!ATTLIST case
+value CDATA #REQUIRED
+resultMap CDATA #REQUIRED
+>
+
+<!ELEMENT property EMPTY>
+<!ATTLIST property
+name CDATA #REQUIRED
+value CDATA #REQUIRED
+>
+
+<!ELEMENT typeAlias EMPTY>
+<!ATTLIST typeAlias
+alias CDATA #REQUIRED
+type CDATA #REQUIRED
+>
+
+<!ELEMENT include EMPTY>
+<!ATTLIST include
+refid CDATA #REQUIRED
+>
+
+<!ELEMENT sql (#PCDATA | include | include)*>
+<!ATTLIST sql
+id CDATA #REQUIRED
+>
+
+<!ELEMENT statement (#PCDATA | include)*>
+<!ATTLIST statement
+id CDATA #REQUIRED
+parameterMap CDATA #IMPLIED
+parameterClass CDATA #IMPLIED
+resultMap CDATA #IMPLIED
+resultClass CDATA #IMPLIED
+resultSetType (FORWARD_ONLY | SCROLL_INSENSITIVE | SCROLL_SENSITIVE) #IMPLIED
+fetchSize CDATA #IMPLIED
+timeout CDATA #IMPLIED
+flushCache (true|false) #IMPLIED
+useCache (true|false) #IMPLIED
+>
+
+<!ELEMENT select (#PCDATA | include | include)*>
+<!ATTLIST select
+id CDATA #REQUIRED
+parameterMap CDATA #IMPLIED
+parameterClass CDATA #IMPLIED
+resultMap CDATA #IMPLIED
+resultClass CDATA #IMPLIED
+resultSetType (FORWARD_ONLY | SCROLL_INSENSITIVE | SCROLL_SENSITIVE) #IMPLIED
+fetchSize CDATA #IMPLIED
+timeout CDATA #IMPLIED
+flushCache (true|false) #IMPLIED
+useCache (true|false) #IMPLIED
+>
+
+<!ELEMENT insert (#PCDATA | selectKey | include)*>
+<!ATTLIST insert
+id CDATA #REQUIRED
+parameterMap CDATA #IMPLIED
+parameterClass CDATA #IMPLIED
+timeout CDATA #IMPLIED
+flushCache (true|false) #IMPLIED
+>
+
+<!ELEMENT selectKey (#PCDATA | include)*>
+<!ATTLIST selectKey
+resultClass CDATA #IMPLIED
+keyProperty CDATA #IMPLIED
+order (before|after) #IMPLIED
+>
+
+<!ELEMENT update (#PCDATA | include)*>
+<!ATTLIST update
+id CDATA #REQUIRED
+parameterMap CDATA #IMPLIED
+parameterClass CDATA #IMPLIED
+timeout CDATA #IMPLIED
+flushCache (true|false) #IMPLIED
+>
+
+<!ELEMENT delete (#PCDATA | include)*>
+<!ATTLIST delete
+id CDATA #REQUIRED
+parameterMap CDATA #IMPLIED
+parameterClass CDATA #IMPLIED
+timeout CDATA #IMPLIED
+flushCache (true|false) #IMPLIED
+>
+
+<!ELEMENT procedure (#PCDATA | include)*>
+<!ATTLIST procedure
+id CDATA #REQUIRED
+parameterMap CDATA #IMPLIED
+parameterClass CDATA #IMPLIED
+resultMap CDATA #IMPLIED
+resultClass CDATA #IMPLIED
+resultSetType (FORWARD_ONLY | SCROLL_INSENSITIVE | SCROLL_SENSITIVE) #IMPLIED
+fetchSize CDATA #IMPLIED
+timeout CDATA #IMPLIED
+flushCache (true|false) #IMPLIED
+useCache (true|false) #IMPLIED
+>
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/example/BlogMapper.xml
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/example/BlogMapper.xml?rev=701958&r1=701957&r2=701958&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/example/BlogMapper.xml
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/example/BlogMapper.xml
Sun Oct 5 23:27:25 2008
@@ -6,6 +6,13 @@
<property name="" value=""/>
</cache>
+ <parameterMap id="" type="">
+ <param property="id" javaType="" jdbcType="" typeHandler=""
+ mode="" scale="" resultMap=""/>
+ <param property="dept" javaType="" jdbcType="" typeHandler=""
+ mode="" scale="" resultMap=""/>
+ </parameterMap>
+
<resultMap id="" type="" extends="">
<constructor>
<id column="" javaType="" jdbcType="" typeHandler=""/>
@@ -19,13 +26,6 @@
</discriminator>
</resultMap>
- <parameterMap id="" type="">
- <param property="id" javaType="" jdbcType="" typeHandler=""
- mode="" scale="" resultMap=""/>
- <param property="dept" javaType="" jdbcType="" typeHandler=""
- mode="" scale="" resultMap=""/>
- </parameterMap>
-
<select id="selectAllPeople" useCache="true" flushCache="false"
parameterType="" resultType="" resultMap="">
select * from PERSON order by
${opts.order,javaType="",jdbcType="",typeHandler="",mode="",scale="",resultMap=""}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/example/MapperConfig.xml
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/example/MapperConfig.xml?rev=701958&r1=701957&r2=701958&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/example/MapperConfig.xml
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-monarch/src/test/java/org/apache/ibatis/monarch/example/MapperConfig.xml
Sun Oct 5 23:27:25 2008
@@ -1,24 +1,26 @@
<configuration>
+ <properties resource="" url="">
+ <property name="" value=""/>
+ </properties>
+
<typeAliases>
<typeAlias alias="" type=""/>
</typeAliases>
- <plugins>
- <plugin interceptor="">
- <property name="" value=""/>
- </plugin>
- </plugins>
+ <typeHandlers>
+ <typeHandler javaType="" jdbcType="" handler=""/>
+ </typeHandlers>
<objectFactory type="">
<property name="" value=""/>
</objectFactory>
- <settings>
- <setting name="" value=""/>
- <setting name="" value=""/>
- <setting name="" value=""/>
- </settings>
+ <plugins>
+ <plugin interceptor="">
+ <property name="" value=""/>
+ </plugin>
+ </plugins>
<environments default="development">
<environment id="development">
@@ -31,10 +33,6 @@
</environment>
</environments>
- <typeHandlers>
- <typeHandler javaType="" jdbcType="" handler=""/>
- </typeHandlers>
-
<mappers>
<mapper type="com.domain.PersonMapper"/>
<mapper type="com.domain.AnotherMapper" xml="resources/AnotherMapper.xml"/>
