Project

General

Profile

« Previous | Next » 

Revision c7ce2226

Added by Cherian Mathew over 9 years ago

ICdmEntitySessionManager, CdmEntitySessionManager, MockCdmEntitySessionManager : removed cdm entity session access methods
CdmServiceInterceptorException, CdmServiceRequestExecutor, TermServiceRequestExecutor : New executor classes to be used to execute intercept remote service requests starting with the term service
httpInvokerServiceClients : replaced term service executor with custom executor
hibernate.cfg.xml : new model 3.4 updates
CdmApplicationRemoteConfiguration : added method to access the session manager

View differences:

eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
1 1
/**
2
* Copyright (C) 2014 EDIT
3
* European Distributed Institute of Taxonomy
4
* http://www.e-taxonomy.eu
5
*
6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7
* See LICENSE.TXT at the top of this package for the full license terms.
8
*/
2
 * Copyright (C) 2014 EDIT
3
 * European Distributed Institute of Taxonomy
4
 * http://www.e-taxonomy.eu
5
 *
6
 * The contents of this file are subject to the Mozilla Public License Version 1.1
7
 * See LICENSE.TXT at the top of this package for the full license terms.
8
 */
9 9

  
10 10
package eu.etaxonomy.cdm.api.application;
11 11

  
......
18 18
import org.springframework.transaction.PlatformTransactionManager;
19 19
import org.springframework.transaction.TransactionStatus;
20 20

  
21
import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration;
22 21
import eu.etaxonomy.cdm.api.cache.ICachedCommonService;
23 22
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
24 23
import eu.etaxonomy.cdm.api.conversation.ConversationHolderMock;
25
import eu.etaxonomy.cdm.api.service.ICommonService;
26 24
import eu.etaxonomy.cdm.ext.geo.IEditGeoService;
27
import eu.etaxonomy.taxeditor.session.CdmEntitySessionManager;
28 25
import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;
29 26

  
30 27

  
......
36 33
@Component
37 34
public class CdmApplicationRemoteConfiguration extends CdmApplicationDefaultConfiguration {
38 35

  
39
	@SuppressWarnings("unused")
40
	private static final Logger logger = Logger.getLogger(CdmApplicationRemoteConfiguration.class);
36
    @SuppressWarnings("unused")
37
    private static final Logger logger = Logger.getLogger(CdmApplicationRemoteConfiguration.class);
41 38

  
42
	@Autowired
43
	IEditGeoService editGeoService;
39
    @Autowired
40
    IEditGeoService editGeoService;
44 41

  
45 42
    @Autowired
46 43
    private ICachedCommonService cachedCommonService;
47
    
48
	@Autowired
49
	protected ICdmEntitySessionManager cdmEntitySessionManager;
50 44

  
51
	public CdmApplicationRemoteConfiguration() {
52
	}
45

  
46
    @Autowired
47
    protected ICdmEntitySessionManager cdmEntitySessionManager;
48

  
49
    public CdmApplicationRemoteConfiguration() {
50
    }
53 51

  
54 52
    /* (non-Javadoc)
55 53
     * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#getTransactionManager()
56 54
     */
57 55
    @Override
58 56
    public PlatformTransactionManager getTransactionManager() throws UnsupportedOperationException {
59
		throw new UnsupportedOperationException("getTransactionManager is not implemented for CdmApplicationRemoteConfiguration");
60
	}
57
        throw new UnsupportedOperationException("getTransactionManager is not implemented for CdmApplicationRemoteConfiguration");
58
    }
61 59

  
62 60

  
63 61
    /* (non-Javadoc)
......
65 63
     */
66 64
    @Override
67 65
    public TransactionStatus startTransaction() throws UnsupportedOperationException {
68
		throw new UnsupportedOperationException("startTransaction is not implemented for CdmApplicationRemoteConfiguration");
69
	}
66
        throw new UnsupportedOperationException("startTransaction is not implemented for CdmApplicationRemoteConfiguration");
67
    }
70 68

  
71 69

  
72 70
    /* (non-Javadoc)
......
74 72
     */
75 73
    @Override
76 74
    public TransactionStatus startTransaction(Boolean readOnly) throws UnsupportedOperationException {
77
		throw new UnsupportedOperationException("startTransaction is not implemented for CdmApplicationRemoteConfiguration");
78
	}
75
        throw new UnsupportedOperationException("startTransaction is not implemented for CdmApplicationRemoteConfiguration");
76
    }
79 77

  
80 78

  
81 79
    /* (non-Javadoc)
......
83 81
     */
84 82
    @Override
85 83
    public void commitTransaction(TransactionStatus txStatus) throws UnsupportedOperationException {
86
		throw new UnsupportedOperationException("commitTransaction is not implemented for CdmApplicationRemoteConfiguration");
87
	}
88

  
89
	/* (non-Javadoc)
90
	 * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#NewConversation()
91
	 */
92
	@Override
93
	public ConversationHolder NewConversation() {
94
		return new ConversationHolderMock();
95
	}
96

  
97
	/**
98
	 * @return
99
	 */
100
	public IEditGeoService getEditGeoService() {
101
		return this.editGeoService;
102
	}
84
        throw new UnsupportedOperationException("commitTransaction is not implemented for CdmApplicationRemoteConfiguration");
85
    }
86

  
87
    /* (non-Javadoc)
88
     * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#NewConversation()
89
     */
90
    @Override
91
    public ConversationHolder NewConversation() {
92
        return new ConversationHolderMock();
93
    }
94

  
95
    /**
96
     * @return
97
     */
98
    public IEditGeoService getEditGeoService() {
99
        return this.editGeoService;
100
    }
103 101

  
104 102
    /**
105 103
     * @return
......
107 105
    public ICachedCommonService getCachedCommonService(){
108 106
        return this.cachedCommonService;
109 107
    }
110
    
111
    
108

  
109

  
112 110
    public ICdmEntitySessionManager getCdmEntitySessionManager() {
113
    	return this.cdmEntitySessionManager;
111
        return this.cdmEntitySessionManager;
114 112
    }
115 113

  
116
	/* (non-Javadoc)
117
	 * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#setDataSource(javax.sql.DataSource)
118
	 */
119
	@Override
120
	public void setDataSource(DataSource dataSource) {
114
    /* (non-Javadoc)
115
     * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#setDataSource(javax.sql.DataSource)
116
     */
117
    @Override
118
    public void setDataSource(DataSource dataSource) {
121 119
    }
122 120

  
123
	/* (non-Javadoc)
124
	 * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#setTransactionManager(org.springframework.transaction.PlatformTransactionManager)
125
	 */
126
	@Override
127
	public void setTransactionManager(PlatformTransactionManager transactionManager) {
121
    /* (non-Javadoc)
122
     * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#setTransactionManager(org.springframework.transaction.PlatformTransactionManager)
123
     */
124
    @Override
125
    public void setTransactionManager(PlatformTransactionManager transactionManager) {
128 126
    }
129 127

  
130
	/* (non-Javadoc)
131
	 * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#setSessionFactory(org.hibernate.SessionFactory)
132
	 */
133
	@Override
128
    /* (non-Javadoc)
129
     * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#setSessionFactory(org.hibernate.SessionFactory)
130
     */
131
    @Override
134 132
    public void setSessionFactory(SessionFactory sessionFactory) {
135 133
    }
136 134
}

Also available in: Unified diff