Author: cbegin
Date: Mon May 25 06:06:06 2009
New Revision: 778293
URL: http://svn.apache.org/viewvc?rev=778293&view=rev
Log:
deprecated event based XML parsing.
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/util/NodeEvent.java
- copied, changed from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeEvent.java
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/util/NodeEventParser.java
- copied, changed from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeEventParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/util/NodeEventWrapper.java
- copied, changed from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeEventWrapper.java
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/test/java/com/ibatis/common/util/NodeletParserTest.java
- copied, changed from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/NodeletParserTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/test/java/domain/
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/test/java/domain/misc/
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/test/java/domain/misc/Employee.java
(contents, props changed)
- copied, changed from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/misc/Employee.java
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/test/java/resources/
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/test/java/resources/nodelet_test.xml
(props changed)
- copied unchanged from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/resources/nodelet_test.xml
Removed:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeEvent.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeEventParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeEventWrapper.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/NodeletParserTest.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapConfigParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapParser.java
Copied:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/util/NodeEvent.java
(from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeEvent.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/util/NodeEvent.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/util/NodeEvent.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeEvent.java&r1=778077&r2=778293&rev=778293&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeEvent.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/util/NodeEvent.java
Mon May 25 06:06:06 2009
@@ -1,4 +1,4 @@
-package org.apache.ibatis.parsing;
+package com.ibatis.common.util;
import java.lang.annotation.*;
Copied:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/util/NodeEventParser.java
(from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeEventParser.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/util/NodeEventParser.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/util/NodeEventParser.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeEventParser.java&r1=778077&r2=778293&rev=778293&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeEventParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/util/NodeEventParser.java
Mon May 25 06:06:06 2009
@@ -1,7 +1,8 @@
-package org.apache.ibatis.parsing;
+package com.ibatis.common.util;
import org.w3c.dom.*;
import org.xml.sax.*;
+import org.apache.ibatis.parsing.*;
import javax.xml.parsers.*;
import java.io.*;
Copied:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/util/NodeEventWrapper.java
(from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeEventWrapper.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/util/NodeEventWrapper.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/util/NodeEventWrapper.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeEventWrapper.java&r1=778077&r2=778293&rev=778293&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeEventWrapper.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/common/util/NodeEventWrapper.java
Mon May 25 06:06:06 2009
@@ -1,4 +1,6 @@
-package org.apache.ibatis.parsing;
+package com.ibatis.common.util;
+
+import org.apache.ibatis.parsing.*;
import java.lang.reflect.Method;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapConfigParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapConfigParser.java?rev=778293&r1=778292&r2=778293&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapConfigParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapConfigParser.java
Mon May 25 06:06:06 2009
@@ -5,15 +5,15 @@
import com.ibatis.sqlmap.engine.datasource.DataSourceFactory;
import com.ibatis.sqlmap.engine.transaction.TransactionConfig;
import com.ibatis.sqlmap.engine.transaction.TransactionManager;
+import com.ibatis.common.util.NodeEvent;
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.mapping.ExecutorType;
import org.apache.ibatis.reflection.MetaClass;
import org.apache.ibatis.reflection.ObjectFactory;
import org.apache.ibatis.type.JdbcType;
import org.apache.ibatis.type.TypeHandler;
-import org.apache.ibatis.parsing.NodeEvent;
import org.apache.ibatis.parsing.XNode;
-import org.apache.ibatis.parsing.NodeEventParser;
+import com.ibatis.common.util.NodeEventParser;
import java.io.Reader;
import java.util.HashMap;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapParser.java?rev=778293&r1=778292&r2=778293&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapParser.java
Mon May 25 06:06:06 2009
@@ -8,9 +8,9 @@
import org.apache.ibatis.reflection.MetaClass;
import org.apache.ibatis.type.JdbcType;
import org.apache.ibatis.type.TypeHandler;
-import org.apache.ibatis.parsing.NodeEvent;
+import com.ibatis.common.util.NodeEvent;
import org.apache.ibatis.parsing.XNode;
-import org.apache.ibatis.parsing.NodeEventParser;
+import com.ibatis.common.util.NodeEventParser;
import java.io.Reader;
import java.util.*;
Copied:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/test/java/com/ibatis/common/util/NodeletParserTest.java
(from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/NodeletParserTest.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/test/java/com/ibatis/common/util/NodeletParserTest.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/test/java/com/ibatis/common/util/NodeletParserTest.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/NodeletParserTest.java&r1=778077&r2=778293&rev=778293&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/NodeletParserTest.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/test/java/com/ibatis/common/util/NodeletParserTest.java
Mon May 25 06:06:06 2009
@@ -1,7 +1,8 @@
-package org.apache.ibatis.parsing;
+package com.ibatis.common.util;
import domain.misc.Employee;
import org.apache.ibatis.io.Resources;
+import org.apache.ibatis.parsing.XNode;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
Copied:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/test/java/domain/misc/Employee.java
(from r778077,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/misc/Employee.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/test/java/domain/misc/Employee.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/test/java/domain/misc/Employee.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/misc/Employee.java&r1=778077&r2=778293&rev=778293&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/domain/misc/Employee.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/test/java/domain/misc/Employee.java
Mon May 25 06:06:06 2009
@@ -76,4 +76,4 @@
public void setWeightUnits(String weightUnits) {
this.weightUnits = weightUnits;
}
-}
+}
\ No newline at end of file
Propchange:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/test/java/domain/misc/Employee.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/test/java/resources/nodelet_test.xml
------------------------------------------------------------------------------
svn:mergeinfo =
