merge from trunk
authorCherian Mathew <c.mathew@bgbm.org>
Wed, 28 Jan 2015 13:26:36 +0000 (13:26 +0000)
committerCherian Mathew <c.mathew@bgbm.org>
Wed, 28 Jan 2015 13:26:36 +0000 (13:26 +0000)
commit79c42b3f9a596c03b7789d26d203435a8f9576c4
tree3f87e12823510a0830a18e9eab6c17348986fb06
parent82dd347146ade7d78f042d471ad8d4dedb189b43
parent11a77ce7b9e7107aec76752f8b66e365119f3ad9
merge from trunk
.gitattributes
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmTransientEntityCacher.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java
eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/cdmlib-remote-webapp.war
eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/httpInvokerServiceClients.xml
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/HttpInvokerServicesTest.java