Project

General

Profile

« Previous | Next » 

Revision c8c8e55b

Added by Niels Hoffmann over 12 years ago

merged with trunk

View differences:

.gitattributes
778 778
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/CdmProgressMonitorAdapter.java -text
779 779
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/CommonHelper.java -text
780 780
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ContextListenerAdapter.java -text
781
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ConversationHolderMock.java -text
782 781
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DataChangeBridge.java -text
783 782
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java -text
784 783
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/FeatureNodeContainer.java -text
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
2 2
Bundle-ManifestVersion: 2
3 3
Bundle-Name: Application
4 4
Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
5
Bundle-Version: 3.0.6.SNAPSHOT
5
Bundle-Version: 3.0.6.qualifier
6 6
Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
7 7
Bundle-Vendor: EDIT
8 8
Bundle-Localization: plugin
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
2 2
Bundle-ManifestVersion: 2
3 3
Bundle-Name: Bulkeditor Bundle
4 4
Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
5
Bundle-Version: 3.0.6.SNAPSHOT
5
Bundle-Version: 3.0.6.qualifier
6 6
Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
7 7
Bundle-Vendor: EDIT
8 8
Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,eu.etaxonomy.taxeditor.annotatedlineeditor.handler,eu.etaxonomy.taxeditor.bulkeditor,eu.etaxonomy.taxeditor.bulkeditor.command,eu.etaxonomy.taxeditor.bulkeditor.handler,eu.etaxonomy.taxeditor.bulkeditor.input,eu.etaxonomy.taxeditor.bulkeditor.internal,eu.etaxonomy.taxeditor.bulkeditor.referencingobjects
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
778 778
 lib/batik-all-1.7.jar,
779 779
 lib/c3p0-0.9.1.jar,
780 780
 lib/cdmlib-commons-3.0.7-SNAPSHOT.jar,
781
 lib/cdmlib-ext-3.0.4-SNAPSHOT.jar,
782 781
 lib/cdmlib-ext-3.0.7-SNAPSHOT.jar,
783 782
 lib/cdmlib-io-3.0.7-SNAPSHOT.jar,
784 783
 lib/cdmlib-model-3.0.7-SNAPSHOT.jar,
eu.etaxonomy.taxeditor.cdmlib/build.properties
130 130
               lib/xom-1.0.jar,\
131 131
               lib/xsltc.jar,\
132 132
               lib/xstream-1.3.1.jar,\
133
               lib/yjp-controller-api-redist-8.0.1.jar,\
134
               lib/cdmlib-ext-3.0.4-SNAPSHOT.jar
133
               lib/yjp-controller-api-redist-8.0.1.jar
135 134
jars.compile.order = cdmLibrary.jar
136 135
src.includes = lib/
137 136
jre.compilation.profile = J2SE-1.6
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
2 2
Bundle-ManifestVersion: 2
3 3
Bundle-Name: Editor Bundle
4 4
Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
5
Bundle-Version: 3.0.6.SNAPSHOT
5
Bundle-Version: 3.0.6.qualifier
6 6
Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
7 7
Bundle-Vendor: %Bundle-Vendor.0
8 8
Bundle-Localization: plugin
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
2 2
Bundle-ManifestVersion: 2
3 3
Bundle-Name: Navigation Bundle
4 4
Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
5
Bundle-Version: 3.0.6.SNAPSHOT
5
Bundle-Version: 3.0.6.qualifier
6 6
Bundle-Vendor: EDIT
7 7
Export-Package: eu.etaxonomy.cdm,
8 8
 eu.etaxonomy.taxeditor.navigation,
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
2 2
Bundle-ManifestVersion: 2
3 3
Bundle-Name: Printpublisher Bundle
4 4
Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true
5
Bundle-Version: 3.0.6.SNAPSHOT
5
Bundle-Version: 3.0.6.qualifier
6 6
Require-Bundle: org.eclipse.osgi,
7 7
 org.eclipse.ui,
8 8
 eu.etaxonomy.taxeditor.editor,
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ConversationHolderMock.java
1
package eu.etaxonomy.taxeditor.model;
2

  
3
import javax.sql.DataSource;
4

  
5
import org.hibernate.FlushMode;
6
import org.hibernate.LockMode;
7
import org.hibernate.Session;
8
import org.hibernate.SessionFactory;
9
import org.springframework.orm.hibernate3.SessionFactoryUtils;
10
import org.springframework.orm.hibernate3.SessionHolder;
11
import org.springframework.transaction.PlatformTransactionManager;
12
import org.springframework.transaction.TransactionDefinition;
13
import org.springframework.transaction.TransactionStatus;
14
import org.springframework.transaction.support.TransactionSynchronizationManager;
15

  
16
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
17
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
18
import eu.etaxonomy.cdm.persistence.hibernate.CdmPostDataChangeObservableListener;
19

  
20
public class ConversationHolderMock extends ConversationHolder {
21

  
22

  
23
	/**
24
	 * This method has to be called when starting a new unit-of-work. All required resources are
25
	 * bound so that SessionFactory.getCurrentSession() returns the right session for this conversation
26
	 */
27
	public void bind() {
28
		
29
	}
30
//	
31
//	public SessionHolder getSessionHolder(){
32
//		return null;
33
//	}
34
//	
35
//	/**
36
//	 * @return
37
//	 */
38
//	private DataSource getDataSource() {
39
//		return null;
40
//	}
41
//
42
//	/**
43
//	 * @return true if this longSession is bound to the session factory.
44
//	 */
45
//	public boolean isBound(){
46
//		return false;
47
//	}
48
//	
49
	/**
50
	 * Creates an instance of TransactionStatus and binds it to this conversation manager.
51
	 * At the moment we allow only on transaction per conversation holder.
52
	 * 
53
	 * @return the transaction status bound to this conversation holder
54
	 */
55
	public TransactionStatus startTransaction(){
56
		return null;
57
	}
58
//	
59
//	/** 
60
//	 * @return if there is a running transaction
61
//	 */
62
//	public boolean isTransactionActive(){
63
//		return false;
64
//	}
65
//	
66
//	/* (non-Javadoc)
67
//	 * @see org.hibernate.Session#evict(java.lang.Object object)
68
//	 */
69
//	public void evict(Object object){
70
//
71
//	}
72
//	
73
//	/* (non-Javadoc)
74
//	 * @see org.hibernate.Session#refresh(java.lang.Object object)
75
//	 */
76
//	public void refresh(Object object){
77
//		
78
//	}
79
//	
80
//	/* (non-Javadoc)
81
//	 * @see org.hibernate.Session#clear()
82
//	 */
83
//	public void clear(){
84
//		
85
//	}
86
//	
87
	/**
88
	 * Commit the running transaction.
89
	 */
90
	public void commit(){
91
		
92
	}
93
	
94
	/**
95
	 * Commit the running transaction but optionally start a
96
	 * new one right away.
97
	 * 
98
	 * @param restartTransaction whether to start a new transaction
99
	 */
100
	public TransactionStatus commit(boolean restartTransaction){
101
		return null;
102
	}
103

  
104
	/**
105
	 * @return the session associated with this conversation manager 
106
	 */
107
	private Session getSession() {
108
		return null;
109
	}
110
//	
111
//	/** 
112
//	 * @return the session factory that is bound to this conversation manager
113
//	 */
114
//	private SessionFactory getSessionFactory() {
115
//		return null;
116
//	}
117
//
118
//	public void delete(Object object){
119
//
120
//	}
121
//	
122
//	/**
123
//	 * Facades Session.lock()
124
//	 */
125
//	public void lock(Object persistentObject, LockMode lockMode) {
126
//		
127
//	}
128
//	
129
//	public void lock(String entityName, Object persistentObject, LockMode lockMode){
130
//		getSession().lock(entityName, persistentObject, lockMode);
131
//	}
132
//
133
//	/**
134
//	 * @return the definition
135
//	 */
136
//	public TransactionDefinition getDefinition() {
137
//		return null;
138
//	}
139
//
140
//	/**
141
//	 * @param definition the definition to set
142
//	 */
143
//	public void setDefinition(TransactionDefinition definition) {
144
//
145
//	}
146
//	
147
//	/**
148
//	 * Register to get updated after any interaction with the datastore
149
//	 */
150
//	public void registerForDataStoreChanges(IConversationEnabled observer) {
151
//
152
//	}
153
//	
154
//	/**
155
//	 * Register to get updated after any interaction with the datastore
156
//	 */
157
//	public void unregisterForDataStoreChanges(IConversationEnabled observer) {
158
//		
159
//	}
160
//	
161
	/**
162
	 * Free resources bound to this conversationHolder
163
	 */
164
	public void close(){
165

  
166
	}
167
//	
168
//	public boolean isClosed(){
169
//		return false;
170
//	}
171

  
172
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
20 20
import org.springframework.core.io.Resource;
21 21
import org.springframework.security.authentication.ProviderManager;
22 22

  
23
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
24 23
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
25 24
import eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration;
26 25
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
......
32 31
import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository;
33 32
import eu.etaxonomy.taxeditor.io.ExportManager;
34 33
import eu.etaxonomy.taxeditor.io.ImportManager;
35
import eu.etaxonomy.taxeditor.model.ConversationHolderMock;
36 34
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
37 35
import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
38 36
import eu.etaxonomy.taxeditor.view.datasource.CdmDataSourceViewPart;

Also available in: Unified diff