diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..c1c2bdfb6539f68aed2d70806ce03db238e02653 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +**/target/** +**/TESTDB/** +**/file.log +**/derby.log +**/*.log4j diff --git a/db/org.tinygroup.dbrouter/pom.xml b/db/org.tinygroup.dbrouter/pom.xml index a8d100017b8d35e0599b28b25fe505cc1837d717..d7cb173f7d9f104573b23b57df05e23a265af617 100644 --- a/db/org.tinygroup.dbrouter/pom.xml +++ b/db/org.tinygroup.dbrouter/pom.xml @@ -48,6 +48,10 @@ javax.transaction jta + + javax.resource + connector + diff --git a/framework/org.tinygroup.convert/src/test/java/org/tinygroup/convert/TestObjectJackJson.java b/framework/org.tinygroup.convert/src/test/java/org/tinygroup/convert/TestObjectJackJson.java index 4e2cca3f7ac361c6e25ef0c30fe93b5351040166..a6cad2c5b68d5a92612f0a1c0538b950fdaedb10 100644 --- a/framework/org.tinygroup.convert/src/test/java/org/tinygroup/convert/TestObjectJackJson.java +++ b/framework/org.tinygroup.convert/src/test/java/org/tinygroup/convert/TestObjectJackJson.java @@ -58,11 +58,10 @@ public class TestObjectJackJson extends AbstractConvertTestCase { maps.put("student", student); maps.put("id", 1234); ObjectToJson objectToXml = new ObjectToJson(JsonSerialize.Inclusion.NON_NULL); - assertEquals(objectToXml.convert(maps), "{\"id\":1234,\"student\":{\"id\":1,\"name\":\"haha\",\"email\":\"email\",\"address\":\"address\",\"birthday\":{\"birthday\":\"2010-11-22\"}}}"); + assertEquals(objectToXml.convert(maps), "{\"student\":{\"id\":1,\"name\":\"haha\",\"email\":\"email\",\"address\":\"address\",\"birthday\":{\"birthday\":\"2010-11-22\"}},\"id\":1234}"); } public void testJson2Map() throws ConvertException { - String json = "{\"student\":{\"id\":1,\"name\":\"haha\",\"email\":\"email\",\"address\":\"address\",\"birthday\":{\"birthday\":\"2010-11-22\"}},\"id\":1234}"; JsonToObject jsonToObject = new JsonToObject(HashMap.class); Map maps = (Map) jsonToObject.convert(json); diff --git a/framework/org.tinygroup.spring305/pom.xml b/framework/org.tinygroup.spring305/pom.xml index abb587ecb01b983e08779bdb19825c1ccc0a8d32..49bb96a501508b7c43be74bde1ffc72e04f4c758 100644 --- a/framework/org.tinygroup.spring305/pom.xml +++ b/framework/org.tinygroup.spring305/pom.xml @@ -52,11 +52,6 @@ spring-orm 3.0.5.RELEASE - - org.springframework - spring-orm - 3.0.5.RELEASE - org.springframework spring-webmvc