updated CDMServer and corresponding test files to use dbunit datasets with the possib...

[taxeditor.git] / eu.etaxonomy.taxeditor.remoting / src / main / java / eu / etaxonomy / cdm / api / application / CdmApplicationRemoteConfiguration.java

diff --git a/eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java b/eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
index 90cfc09909bd84ff974481bfed98d01ecaa83cfe..b664cbe6920324c03860ada14d2aadbb4e82652f 100644 (file)
--- a/eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
+++ b/eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
@@ -1,8 +1,8 @@
 /**\r
 * Copyright (C) 2014 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
 * http://www.e-taxonomy.eu\r
-* \r
+*\r
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
@@ -11,17 +11,17 @@ package eu.etaxonomy.cdm.api.application;
 \r
 import javax.sql.DataSource;\r
 \r
-import org.hibernate.SessionFactory;\r
-\r
 import org.apache.log4j.Logger;\r
+import org.hibernate.SessionFactory;\r
 import org.springframework.beans.factory.annotation.Autowired;\r
 import org.springframework.stereotype.Component;\r
 import org.springframework.transaction.PlatformTransactionManager;\r
 import org.springframework.transaction.TransactionStatus;\r
 \r
+import eu.etaxonomy.cdm.api.cache.ICachedCommonService;\r
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
 import eu.etaxonomy.cdm.api.conversation.ConversationHolderMock;\r
-import eu.etaxonomy.cdm.api.service.IDatabaseService;\r
+import eu.etaxonomy.cdm.api.service.ICommonService;\r
 import eu.etaxonomy.cdm.ext.geo.IEditGeoService;\r
 \r
 \r
@@ -32,16 +32,19 @@ import eu.etaxonomy.cdm.ext.geo.IEditGeoService;
  */\r
 @Component\r
 public class CdmApplicationRemoteConfiguration extends CdmApplicationDefaultConfiguration {\r
-       \r
+\r
        @SuppressWarnings("unused")\r
        private static final Logger logger = Logger.getLogger(CdmApplicationRemoteConfiguration.class);\r
 \r
        @Autowired\r
        IEditGeoService editGeoService;\r
-       \r
+\r
+    @Autowired\r
+    private ICachedCommonService cachedCommonService;\r
+\r
        public CdmApplicationRemoteConfiguration() {\r
        }\r
-       \r
+\r
     /* (non-Javadoc)\r
      * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#getTransactionManager()\r
      */\r
@@ -76,40 +79,47 @@ public class CdmApplicationRemoteConfiguration extends CdmApplicationDefaultConf
     public void commitTransaction(TransactionStatus txStatus) throws UnsupportedOperationException {\r
                throw new UnsupportedOperationException("commitTransaction is not implemented for CdmApplicationRemoteConfiguration");\r
        }\r
-                       \r
+\r
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#NewConversation()\r
         */\r
        @Override\r
-       public ConversationHolder NewConversation() {           \r
+       public ConversationHolder NewConversation() {\r
                return new ConversationHolderMock();\r
        }\r
-       \r
+\r
        /**\r
         * @return\r
         */\r
        public IEditGeoService getEditGeoService() {\r
                return this.editGeoService;\r
        }\r
-       \r
+\r
+    /**\r
+     * @return\r
+     */\r
+    public ICachedCommonService getCachedCommonService(){\r
+        return this.cachedCommonService;\r
+    }\r
+\r
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#setDataSource(javax.sql.DataSource)\r
         */\r
        @Override\r
-       public void setDataSource(DataSource dataSource) {                      \r
+       public void setDataSource(DataSource dataSource) {\r
     }\r
-       \r
+\r
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#setTransactionManager(org.springframework.transaction.PlatformTransactionManager)\r
         */\r
        @Override\r
-       public void setTransactionManager(PlatformTransactionManager transactionManager) {        \r
+       public void setTransactionManager(PlatformTransactionManager transactionManager) {\r
     }\r
-       \r
+\r
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#setSessionFactory(org.hibernate.SessionFactory)\r
         */\r
        @Override\r
-    public void setSessionFactory(SessionFactory sessionFactory) {     \r
+    public void setSessionFactory(SessionFactory sessionFactory) {\r
     }\r
 }\r