[Practicalxml-commits] SF.net SVN: practicalxml:[179] trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 179
          http://practicalxml.svn.sourceforge.net/practicalxml/?rev=179&view=rev
Author:   kdgregory
Date:     2009-11-23 14:34:08 +0000 (Mon, 23 Nov 2009)

Log Message:
-----------
merge 1.1-dev branch to trunk

Modified Paths:
--------------
    trunk/pom.xml
    trunk/src/main/java/net/sf/practicalxml/OutputUtil.java
    trunk/src/main/java/net/sf/practicalxml/XmlUtil.java
    trunk/src/main/java/net/sf/practicalxml/converter/package.html
    trunk/src/main/java/net/sf/practicalxml/internal/package.html
    trunk/src/main/java/net/sf/practicalxml/junit/DomAsserts.java
    trunk/src/test/java/net/sf/practicalxml/AbstractTestCase.java
    trunk/src/test/java/net/sf/practicalxml/TestXmlUtil.java

Added Paths:
-----------
    trunk/src/main/java/net/sf/practicalxml/converter/BeanConverter.java
    trunk/src/main/java/net/sf/practicalxml/converter/ConversionException.java
    trunk/src/main/java/net/sf/practicalxml/converter/JsonConverter.java
    trunk/src/main/java/net/sf/practicalxml/converter/bean/
    trunk/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlAppenders.java
    trunk/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlConverter.java
    trunk/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlOptions.java
    trunk/src/main/java/net/sf/practicalxml/converter/bean/Introspection.java
    trunk/src/main/java/net/sf/practicalxml/converter/bean/IntrospectionCache.java
    trunk/src/main/java/net/sf/practicalxml/converter/bean/Xml2BeanConverter.java
    trunk/src/main/java/net/sf/practicalxml/converter/bean/Xml2BeanOptions.java
    trunk/src/main/java/net/sf/practicalxml/converter/bean/package.html
    trunk/src/main/java/net/sf/practicalxml/converter/internal/
    trunk/src/main/java/net/sf/practicalxml/converter/internal/ConversionStrings.java
    trunk/src/main/java/net/sf/practicalxml/converter/internal/ConversionUtils.java
    trunk/src/main/java/net/sf/practicalxml/converter/internal/JavaConversionUtils.java
    trunk/src/main/java/net/sf/practicalxml/converter/internal/JsonUtils.java
    trunk/src/main/java/net/sf/practicalxml/converter/internal/TypeUtils.java
    trunk/src/main/java/net/sf/practicalxml/converter/json/
    trunk/src/main/java/net/sf/practicalxml/converter/json/Json2XmlConverter.java
    trunk/src/main/java/net/sf/practicalxml/converter/json/Json2XmlOptions.java
    trunk/src/main/java/net/sf/practicalxml/converter/json/Xml2JsonConverter.java
    trunk/src/main/java/net/sf/practicalxml/converter/json/Xml2JsonOptions.java
    trunk/src/main/java/net/sf/practicalxml/converter/json/package.html
    trunk/src/perftest/
    trunk/src/perftest/java/
    trunk/src/perftest/java/net/
    trunk/src/perftest/java/net/sf/
    trunk/src/perftest/java/net/sf/practicalxml/
    trunk/src/perftest/java/net/sf/practicalxml/perftest/
    trunk/src/perftest/java/net/sf/practicalxml/perftest/AbstractPerformanceTest.java
    trunk/src/perftest/java/net/sf/practicalxml/perftest/converter/
    trunk/src/perftest/java/net/sf/practicalxml/perftest/converter/BeanExerciser.java
    trunk/src/perftest/java/net/sf/practicalxml/perftest/converter/JsonExerciser.java
    trunk/src/perftest/java/net/sf/practicalxml/perftest/package.html
    trunk/src/test/java/net/sf/practicalxml/converter/
    trunk/src/test/java/net/sf/practicalxml/converter/AbstractConversionTestCase.java
    trunk/src/test/java/net/sf/practicalxml/converter/bean/
    trunk/src/test/java/net/sf/practicalxml/converter/bean/AbstractBeanConverterTestCase.java
    trunk/src/test/java/net/sf/practicalxml/converter/bean/TestBean2XmlAppenders.java
    trunk/src/test/java/net/sf/practicalxml/converter/bean/TestBean2XmlConverter.java
    trunk/src/test/java/net/sf/practicalxml/converter/bean/TestBeanConverter.java
    trunk/src/test/java/net/sf/practicalxml/converter/bean/TestIntrospection.java
    trunk/src/test/java/net/sf/practicalxml/converter/bean/TestIntrospectionCache.java
    trunk/src/test/java/net/sf/practicalxml/converter/bean/TestXml2BeanConverter.java
    trunk/src/test/java/net/sf/practicalxml/converter/internal/
    trunk/src/test/java/net/sf/practicalxml/converter/internal/TestJavaConversionUtils.java
    trunk/src/test/java/net/sf/practicalxml/converter/internal/TestJsonUtils.java
    trunk/src/test/java/net/sf/practicalxml/converter/internal/TestTypeUtils.java
    trunk/src/test/java/net/sf/practicalxml/converter/json/
    trunk/src/test/java/net/sf/practicalxml/converter/json/TestJson2XmlConverter.java
    trunk/src/test/java/net/sf/practicalxml/converter/json/TestJsonConverter.java
    trunk/src/test/java/net/sf/practicalxml/converter/json/TestXml2JsonConverter.java

Removed Paths:
-------------
    trunk/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlAppenders.java
    trunk/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlConverter.java
    trunk/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlOptions.java
    trunk/src/main/java/net/sf/practicalxml/converter/bean/Introspection.java
    trunk/src/main/java/net/sf/practicalxml/converter/bean/IntrospectionCache.java
    trunk/src/main/java/net/sf/practicalxml/converter/bean/Xml2BeanConverter.java
    trunk/src/main/java/net/sf/practicalxml/converter/bean/Xml2BeanOptions.java
    trunk/src/main/java/net/sf/practicalxml/converter/bean/package.html
    trunk/src/main/java/net/sf/practicalxml/converter/internal/ConversionStrings.java
    trunk/src/main/java/net/sf/practicalxml/converter/internal/ConversionUtils.java
    trunk/src/main/java/net/sf/practicalxml/converter/internal/JavaConversionUtils.java
    trunk/src/main/java/net/sf/practicalxml/converter/internal/JsonUtils.java
    trunk/src/main/java/net/sf/practicalxml/converter/internal/TypeUtils.java
    trunk/src/main/java/net/sf/practicalxml/converter/json/Json2XmlConverter.java
    trunk/src/main/java/net/sf/practicalxml/converter/json/Json2XmlOptions.java
    trunk/src/main/java/net/sf/practicalxml/converter/json/Xml2JsonConverter.java
    trunk/src/main/java/net/sf/practicalxml/converter/json/Xml2JsonOptions.java
    trunk/src/main/java/net/sf/practicalxml/converter/json/package.html
    trunk/src/perftest/java/
    trunk/src/perftest/java/net/
    trunk/src/perftest/java/net/sf/
    trunk/src/perftest/java/net/sf/practicalxml/
    trunk/src/perftest/java/net/sf/practicalxml/perftest/
    trunk/src/perftest/java/net/sf/practicalxml/perftest/AbstractPerformanceTest.java
    trunk/src/perftest/java/net/sf/practicalxml/perftest/converter/
    trunk/src/perftest/java/net/sf/practicalxml/perftest/converter/BeanExerciser.java
    trunk/src/perftest/java/net/sf/practicalxml/perftest/converter/JsonExerciser.java
    trunk/src/perftest/java/net/sf/practicalxml/perftest/package.html
    trunk/src/test/java/net/sf/practicalxml/converter/AbstractConversionTestCase.java
    trunk/src/test/java/net/sf/practicalxml/converter/bean/
    trunk/src/test/java/net/sf/practicalxml/converter/bean/AbstractBeanConverterTestCase.java
    trunk/src/test/java/net/sf/practicalxml/converter/bean/TestBean2XmlAppenders.java
    trunk/src/test/java/net/sf/practicalxml/converter/bean/TestBean2XmlConverter.java
    trunk/src/test/java/net/sf/practicalxml/converter/bean/TestBeanConverter.java
    trunk/src/test/java/net/sf/practicalxml/converter/bean/TestIntrospection.java
    trunk/src/test/java/net/sf/practicalxml/converter/bean/TestIntrospectionCache.java
    trunk/src/test/java/net/sf/practicalxml/converter/bean/TestXml2BeanConverter.java
    trunk/src/test/java/net/sf/practicalxml/converter/internal/
    trunk/src/test/java/net/sf/practicalxml/converter/internal/TestJavaConversionUtils.java
    trunk/src/test/java/net/sf/practicalxml/converter/internal/TestJsonUtils.java
    trunk/src/test/java/net/sf/practicalxml/converter/internal/TestTypeUtils.java
    trunk/src/test/java/net/sf/practicalxml/converter/json/
    trunk/src/test/java/net/sf/practicalxml/converter/json/TestJson2XmlConverter.java
    trunk/src/test/java/net/sf/practicalxml/converter/json/TestJsonConverter.java
    trunk/src/test/java/net/sf/practicalxml/converter/json/TestXml2JsonConverter.java

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk:128