merge from trunk
authorCherian Mathew <c.mathew@bgbm.org>
Tue, 20 Jan 2015 11:20:50 +0000 (11:20 +0000)
committerCherian Mathew <c.mathew@bgbm.org>
Tue, 20 Jan 2015 11:20:50 +0000 (11:20 +0000)
commit48a32bd357bb5b56f62b1ab90383f4a1239cdbd4
treec231d2e64746df312ac5a4824199fe3c22395cdb
parentc7ce22269b4bd24cb3d28fa7f3992413e81613ee
parent612e9a7a6e9ea0f0f1e0b2b6b44d9522e62ceac1
merge from trunk
13 files changed:
.gitattributes
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/cdmlib-remote-webapp.war
eu.etaxonomy.taxeditor.test/.classpath
eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.test/build.properties
eu.etaxonomy.taxeditor.test/src/main/resources/h2/cdmTest.h2.db
eu.etaxonomy.taxeditor.test/src/main/resources/h2/cdmTest.trace.db
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManagerTest.java