Project

General

Profile

« Previous | Next » 

Revision 80de230c

Added by Cherian Mathew about 8 years ago

updated manifest for deleted test dir
removed unnecessary commit root entity methods in session and session manager

View differences:

.gitattributes
351 351
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmClientSessionException.java -text
352 352
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java -text
353 353
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManager.java -text
354
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySession.java -text
354 355
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySessionManager.java -text
355 356
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ISessionEventListener.java -text
356 357
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySessionManager.java -text
eu.etaxonomy.taxeditor.cdmlib/.classpath
2 2
<classpath>
3 3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
4 4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5
	<classpathentry kind="src" path="src/main/java"/>
6
	<classpathentry kind="src" path="src/test/java"/>
7
	<classpathentry kind="src" path="src/main/resources"/>
8
	<classpathentry kind="src" path="src/test/resources"/>
5
	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
6
	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
9 7
	<classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
10 8
	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
11 9
	<classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
......
204 202
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.0-SNAPSHOT-sources.jar"/>
205 203
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.0-SNAPSHOT.jar"/>
206 204
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.0-SNAPSHOT-sources.jar"/>
207
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.0-SNAPSHOT.jar" />
205
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.0-SNAPSHOT.jar"/>
208 206
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.0-SNAPSHOT-sources.jar"/>
209 207
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.0-SNAPSHOT.jar"/>
210 208
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.4.0-SNAPSHOT-sources.jar"/>
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
314 314
 org.joda.time.format;uses:="org.joda.time",
315 315
 org.joda.time.tz;uses:="org.joda.time",
316 316
 org.junit;uses:="org.hamcrest",
317
 org.junit.runner,
317 318
 org.odftoolkit.odfdom,
318 319
 org.odftoolkit.odfdom.doc,
319 320
 org.odftoolkit.odfdom.doc.office,
eu.etaxonomy.taxeditor.cdmlib/build.properties
209 209
jars.compile.order = .
210 210
output.. = bin/
211 211
source.. = src/main/java/,\
212
           src/main/resources/,\
213
           src/test/java/
212
           src/main/resources/
214 213
src.includes = src/
215 214

  
eu.etaxonomy.taxeditor.cdmlib/pom.xml
1 1
<?xml version="1.0" encoding="UTF-8"?>
2
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3
  <parent>
4
    <groupId>eu.etaxonomy</groupId>
5
    <artifactId>taxeditor-parent</artifactId>
6
    <version>3.4.0-SNAPSHOT</version>
7
  </parent>
8
  <modelVersion>4.0.0</modelVersion>
9
  <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>
10
  <packaging>eclipse-plugin</packaging>
11
  <name>CDM Library Dependencies Plugin</name>
12
  <description>CDM Library and dependencies as a plugin</description>
13
  <build>
14
    <plugins>      
15
      <plugin>
16
	<groupId>org.apache.maven.plugins</groupId>
17
	<artifactId>maven-dependency-plugin</artifactId>
18
	<version>2.4</version>
19
	<executions>
20
	  <execution>
21
	    <id>copy-dependencies</id>
22
	    <phase>validate</phase>
23
	    <goals>
24
	      <goal>copy-dependencies</goal>
25
	    </goals>
26
	    <configuration>
27
	      <excludeArtifactIds>junit,log4j,unitils</excludeArtifactIds>
28
	      <outputDirectory>lib</outputDirectory>
29
	      <overWriteReleases>true</overWriteReleases>
30
	      <overWriteSnapshots>true</overWriteSnapshots>
31
	      <excludeTransitive>true</excludeTransitive>	      
32
	    </configuration>
33
	  </execution>
34
	  <execution>
35
	    <id>copy-dependencies-sources</id>
36
	    <phase>validate</phase>
37
	    <goals>
38
	      <goal>copy-dependencies</goal>
39
	    </goals>
40
	    <configuration>
41
	      <classifier>sources</classifier>
42
	      <excludeArtifactIds>junit,log4j,unitils</excludeArtifactIds>
43
	      <outputDirectory>lib</outputDirectory>
44
	      <overWriteReleases>true</overWriteReleases>
45
	      <overWriteSnapshots>true</overWriteSnapshots>
46
	      <excludeTransitive>true</excludeTransitive>
47
	      <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
48
	    </configuration>
49
	  </execution>
50
	</executions>
51
      </plugin>
52
      <plugin>
53
	<groupId>org.apache.maven.plugins</groupId>
54
	<artifactId>maven-antrun-plugin</artifactId>
55
	<version>1.7</version>
56
	<executions>
57
	  <execution>
58
	    <id>remove-existing-jars</id>
59
	    <phase>clean</phase>
60
	    <goals>
61
	      <goal>run</goal>
62
	    </goals>
63
	    <configuration>
64
	      <target>
65
		<echo>Remove all cdmlib jars</echo>
66
		<delete>
67
		  <fileset dir="./lib" includes="cdmlib-*"/>
68
		</delete>
69
	      </target>	
70
	    </configuration>
71
	  </execution>
72
	  <execution>
73
	    <id>update-snapshot-jar-names</id>
74
	    <phase>validate</phase>
75
	    <goals>
76
	      <goal>run</goal>
77
	    </goals>
78
	    <configuration>	      
79
	      <target>
80
		<echo>Update cdmlib jars to SNAPSHOT when build with timestamp</echo>
81
		<move todir="./lib">
82
		  <fileset dir="./lib" />
83
		  <mapper type="regexp"
84
			  from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\.jar)" to="\1SNAPSHOT\2" />
85
		</move>				  
86
		<move todir="./lib">
87
		  <fileset dir="./lib" />
88
		  <mapper type="regexp"
89
			  from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)" to="\1SNAPSHOT\2" />
90
		</move>				  
91
	      </target>	
92
	    </configuration>
93
	  </execution>
94
	</executions>
95
      </plugin>
96
    </plugins>
97
  </build>
98
  <dependencies>
99
    <dependency>
100
      <groupId>identificationKeyAPI</groupId>
101
      <artifactId>identificationKeyAPI</artifactId>
102
      <version>1.0-SNAPSHOT</version>
103
    </dependency>
2
<project>
3

  
4
	<parent>
5
		<groupId>eu.etaxonomy</groupId>
6
		<artifactId>taxeditor-parent</artifactId>
7
		<version>3.4.0-SNAPSHOT</version>
8
	</parent>
9
	<modelVersion>4.0.0</modelVersion>
10
	<artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>
11
	<packaging>eclipse-plugin</packaging>
12
	<name>CDM Library Bundle</name>
13
	<description>Cdm Library Plugin Taxonomic Editor</description>
14

  
15
	<build>
16
		<pluginManagement>
17
			<plugins>
18
				<plugin>
19
					<groupId>org.apache.maven.plugins</groupId>
20
					<artifactId>maven-surefire-plugin</artifactId>
21
					<version>2.7</version>
22
				</plugin>
23
			</plugins>
24
		</pluginManagement>
25
		<plugins>
26
			<plugin>
27
				<groupId>org.apache.maven.plugins</groupId>
28
				<artifactId>maven-dependency-plugin</artifactId>
29
				<version>2.4</version>
30
				<executions>
31
					<execution>
32
						<id>copy-dependencies</id>
33
						<phase>validate</phase>
34
						<goals>
35
							<goal>copy-dependencies</goal>
36
						</goals>
37
						<configuration>
38
							<excludeArtifactIds>
39
								cdmlib-remote-webapp
40
							</excludeArtifactIds>
41
							<includeArtifactIds>
42
								cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote
43
							</includeArtifactIds>
44
							<outputDirectory>${basedir}/lib</outputDirectory>
45
							<overWriteReleases>true</overWriteReleases>
46
							<overWriteSnapshots>true</overWriteSnapshots>
47
							<excludeTransitive>true</excludeTransitive>
48
						</configuration>
49
					</execution>
50
					<execution>
51
						<id>copy-dependency-war</id>
52
						<phase>validate</phase>
53
						<goals>
54
							<goal>copy-dependencies</goal>
55
						</goals>
56
						<configuration>
57
							<includeArtifactIds>
58
								cdmlib-remote-webapp
59
							</includeArtifactIds>
60
							<outputDirectory>
61
								${basedir}/src/main/resources/etc/jetty
62
							</outputDirectory>
63
							<overWriteReleases>true</overWriteReleases>
64
							<overWriteSnapshots>true</overWriteSnapshots>
65
							<excludeTransitive>true</excludeTransitive>
66
						</configuration>
67
					</execution>
68
				</executions>
69
			</plugin>
70
			<plugin>
71
				<groupId>org.apache.maven.plugins</groupId>
72
				<artifactId>maven-antrun-plugin</artifactId>
73
				<version>1.7</version>
74
				<executions>
75
					<execution>
76
						<id>update-snapshot-jar-names</id>
77
						<phase>validate</phase>
78
						<goals>
79
							<goal>run</goal>
80
						</goals>
81
						<configuration>
82
							<target>
83
								<echo>Anonymizing war</echo>
84
								<move todir="./src/main/resources/etc/jetty">
85
									<fileset dir="./src/main/resources/etc/jetty" />
86
									<mapper type="regexp"
87
										from="(^cdmlib\-.*)\-[0-9]\.[0-9]\.[0-9]\-SNAPSHOT(\.war)" to="\1\2" />
88
								</move>
89
								<move todir="./src/main/resources/etc/jetty">
90
									<fileset dir="./src/main/resources/etc/jetty" />
91
									<mapper type="regexp"
92
										from="(^cdmlib\-.*)\-[0-9]\.[0-9]\.[0-9]\-[0-9.-]+(\.war)" to="\1\2" />
93
								</move>
94
								<echo>Update cdmlib jars to SNAPSHOT when build with
95
									timestamp
96
								</echo>
97
								<move todir="./lib">
98
									<fileset dir="./lib" />
99
									<mapper type="regexp"
100
										from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\.jar)" to="\1SNAPSHOT\2" />
101
								</move>
102
								<move todir="./lib">
103
									<fileset dir="./lib" />
104
									<mapper type="regexp"
105
										from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)"
106
										to="\1SNAPSHOT\2" />
107
								</move>
108
							</target>
109
						</configuration>
110
					</execution>
111
				</executions>
112
			</plugin>
113
		</plugins>
114
	</build>
115
	<profiles>
116
		<profile>
117
			<id>cleanCdmlibJars</id>
118
			<build>
119
				<plugins>
120
					<plugin>
121
						<artifactId>maven-clean-plugin</artifactId>
122
						<version>2.3</version>
123
						<configuration>
124
							<filesets>
125
								<fileset>
126
									<directory>${basedir}/lib</directory>
127
									<includes>
128
										<include>cdmlib-*</include>
129
									</includes>
130
									<followSymlinks>false</followSymlinks>
131
								</fileset>
132
							</filesets>
133
						</configuration>
134
					</plugin>
135
				</plugins>
136
			</build>
137
		</profile>
138
		<profile>
139
			<id>cleanAllJars</id>
140
			<build>
141
				<plugins>
142
					<plugin>
143
						<artifactId>maven-clean-plugin</artifactId>
144
						<version>2.3</version>
145
						<configuration>
146
							<filesets>
147
								<fileset>
148
									<directory>${basedir}/lib</directory>
149
									<includes>
150
										<include>*</include>
151
									</includes>
152
									<followSymlinks>false</followSymlinks>
153
								</fileset>
154
							</filesets>
155
						</configuration>
156
					</plugin>
157
				</plugins>
158
			</build>
159
		</profile>
160
		<profile>
161
			<id>copyAllJars</id>
162
			<build>
163
				<plugins>
164
					<plugin>
165
						<groupId>org.apache.maven.plugins</groupId>
166
						<artifactId>maven-dependency-plugin</artifactId>
167
						<version>2.4</version>
168
						<executions>
169
							<execution>
170
								<id>copy-all-dependencies</id>
171
								<phase>validate</phase>
172
								<goals>
173
									<goal>copy-dependencies</goal>
174
								</goals>
175
								<configuration>
176
									<excludeArtifactIds>
177
										cdmlib-remote-webapp
178
									</excludeArtifactIds>
179
									<outputDirectory>${basedir}/lib</outputDirectory>
180
									<overWriteReleases>true</overWriteReleases>
181
									<overWriteSnapshots>true</overWriteSnapshots>
182
									<excludeTransitive>true</excludeTransitive>
183
								</configuration>
184
							</execution>
185
						</executions>
186
					</plugin>
187
				</plugins>
188
			</build>
189
		</profile>
190
	</profiles>
191
	<repositories>
192
		<repository>
193
			<id>SpringSource Enterprise Bundle Repository - External Bundle
194
				Milestones
195
			</id>
196
			<url>http://repository.springsource.com/maven/bundles/milestone
197
			</url>
198
		</repository>
199
		<repository>
200
			<id>SpringSource Enterprise Bundle Repository - SpringSource
201
				Bundle
202
				Releases
203
			</id>
204
			<url>http://repository.springsource.com/maven/bundles/release
205
			</url>
206
		</repository>
207
		<repository>
208
			<id>SpringSource Enterprise Bundle Repository - External Bundle
209
				Releases
210
			</id>
211
			<url>http://repository.springsource.com/maven/bundles/external
212
			</url>
213
		</repository>
214
	</repositories>
215
	<dependencies>
216
		<dependency>
217
			<groupId>eu.etaxonomy</groupId>
218
			<artifactId>cdmlib-remote-webapp</artifactId>
219
			<version>${cdmlib.version}</version>
220
			<type>war</type>
221
		</dependency>
104 222
    <dependency>
105 223
      <groupId>eu.etaxonomy</groupId>
106 224
      <artifactId>cdmlib-commons</artifactId>
......
141 259
      <artifactId>cdmlib-ext</artifactId>
142 260
      <version>${cdmlib.version}</version>
143 261
    </dependency>
144
   	<dependency>
145
      <groupId>org.aspectj</groupId>
146
      <artifactId>aspectjrt</artifactId>
147
	  <version>1.7.1</version>
148
	</dependency>
149
	  <dependency>
150
	  <groupId>org.aspectj</groupId>
151
	  <artifactId>aspectjweaver</artifactId>
152
	  <version>1.7.1</version>
153
	 </dependency>
154
	 
155
    <!--  for ikey-plus 
156
	 TODO this should not be needed but the utils class contained  in this jar 
157
	 seems to be loaded as bean by spring
158
    -->
159
  </dependencies>
160
</project>
262

  
263
		<dependency>
264
			<groupId>org.unitils</groupId>
265
			<artifactId>unitils-core</artifactId>
266
			<version>3.4.2</version>
267
		</dependency>
268
		<!-- <dependency> -->
269
		<!-- <groupId>org.eclipse.jetty</groupId> -->
270
		<!-- <artifactId>jetty-server</artifactId> -->
271
		<!-- <version>9.1.3.v20140225</version> -->
272
		<!-- </dependency> -->
273
		<!-- <dependency> -->
274
		<!-- <groupId>org.eclipse.jetty</groupId> -->
275
		<!-- <artifactId>jetty-util</artifactId> -->
276
		<!-- <version>9.1.3.v20140225</version> -->
277
		<!-- </dependency> -->
278
		<!-- <dependency> -->
279
		<!-- <groupId>org.eclipse.jetty</groupId> -->
280
		<!-- <artifactId>jetty-xml</artifactId> -->
281
		<!-- <version>9.1.3.v20140225</version> -->
282
		<!-- </dependency> -->
283
		<!-- <dependency> -->
284
		<!-- <groupId>org.eclipse.jetty</groupId> -->
285
		<!-- <artifactId>jetty-servlet</artifactId> -->
286
		<!-- <version>9.1.3.v20140225</version> -->
287
		<!-- </dependency> -->
288
		<!-- <dependency> -->
289
		<!-- <groupId>org.eclipse.jetty</groupId> -->
290
		<!-- <artifactId>jetty-webapp</artifactId> -->
291
		<!-- <version>9.1.3.v20140225</version> -->
292
		<!-- </dependency> -->
293
		<!-- <dependency> -->
294
		<!-- <groupId>org.eclipse.jetty</groupId> -->
295
		<!-- <artifactId>jetty-security</artifactId> -->
296
		<!-- <version>9.1.3.v20140225</version> -->
297
		<!-- </dependency> -->
298
		<!-- <dependency> -->
299
		<!-- <groupId>org.eclipse.jetty</groupId> -->
300
		<!-- <artifactId>jetty-http</artifactId> -->
301
		<!-- <version>${jetty.version}</version> -->
302
		<!-- </dependency> -->
303
		<!-- <dependency> -->
304
		<!-- <groupId>org.eclipse.jetty</groupId> -->
305
		<!-- <artifactId>jetty-io</artifactId> -->
306
		<!-- <version>${jetty.version}</version> -->
307
		<!-- </dependency> -->
308
		<!-- <dependency> -->
309
		<!-- <groupId>javax.servlet</groupId> -->
310
		<!-- <artifactId>javax.servlet-api</artifactId> -->
311
		<!-- <version>3.1.0</version> -->
312
		<!-- </dependency> -->
313

  
314
		<!-- <dependency> -->
315
		<!-- <groupId>javax.servlet</groupId> -->
316
		<!-- <artifactId>jsp-api</artifactId> -->
317
		<!-- <version>2.0</version> -->
318
		<!-- </dependency> -->
319

  
320
		<dependency>
321
			<groupId>net.sf.ehcache</groupId>
322
			<artifactId>ehcache-core</artifactId>
323
			<version>2.4.3</version>
324
		</dependency>
325
		<dependency>
326
			<groupId>org.hibernate</groupId>
327
			<artifactId>hibernate-core</artifactId>
328
			<version>4.1.10.Final</version>
329
		</dependency>
330
		<dependency>
331
			<groupId>org.hibernate.common</groupId>
332
			<artifactId>hibernate-commons-annotations</artifactId>
333
			<version>4.0.1.Final</version>
334
		</dependency>
335
		<dependency>
336
			<groupId>org.hibernate</groupId>
337
			<artifactId>hibernate-search-engine</artifactId>
338
			<version>4.2.0.Final</version>
339
		</dependency>
340
		<dependency>
341
			<groupId>org.hibernate.javax.persistence</groupId>
342
			<artifactId>hibernate-jpa-2.0-api</artifactId>
343
			<version>1.0.1.Final</version>
344
		</dependency>
345
		<dependency>
346
			<groupId>org.hibernate</groupId>
347
			<artifactId>hibernate-envers</artifactId>
348
			<version>4.1.10.Final</version>
349
		</dependency>
350
		<dependency>
351
			<groupId>org.hibernate</groupId>
352
			<artifactId>hibernate-entitymanager</artifactId>
353
			<version>4.1.10.Final</version>
354
		</dependency>
355
		<dependency>
356
			<groupId>dom4j</groupId>
357
			<artifactId>dom4j</artifactId>
358
			<version>1.6</version>
359
		</dependency>
360
		<dependency>
361
			<groupId>org.jadira.usertype</groupId>
362
			<artifactId>usertype.jodatime</artifactId>
363
			<version>2.0.1</version>
364
		</dependency>
365
		<dependency>
366
			<groupId>org.jadira.usertype</groupId>
367
			<artifactId>usertype.spi</artifactId>
368
			<version>2.0.1</version>
369
		</dependency>
370

  
371
		<dependency>
372
			<groupId>junit</groupId>
373
			<artifactId>junit</artifactId>
374
			<version>4.11</version>
375
			<scope>test</scope>
376
		</dependency>
377
		<dependency>
378
			<groupId>log4j</groupId>
379
			<artifactId>log4j</artifactId>
380
			<version>1.2.17</version>
381
		</dependency>
382
		<dependency>
383
			<groupId>org.jdom</groupId>
384
			<artifactId>jdom</artifactId>
385
			<version>1.1.3</version>
386
		</dependency>
387
		<dependency>
388
			<groupId>org.springframework</groupId>
389
			<artifactId>org.springframework.context</artifactId>
390
			<version>3.2.2.RELEASE</version>
391
		</dependency>
392
		<dependency>
393
			<groupId>org.springframework</groupId>
394
			<artifactId>org.springframework.context.support</artifactId>
395
			<version>3.2.2.RELEASE</version>
396
		</dependency>
397
		<dependency>
398
			<groupId>org.springframework</groupId>
399
			<artifactId>org.springframework.aspects</artifactId>
400
			<version>3.2.2.RELEASE</version>
401
		</dependency>
402
		<dependency>
403
			<groupId>org.springframework</groupId>
404
			<artifactId>org.springframework.test</artifactId>
405
			<version>3.2.2.RELEASE</version>
406
		</dependency>
407
		<dependency>
408
			<groupId>org.springframework</groupId>
409
			<artifactId>org.springframework.beans</artifactId>
410
			<version>3.2.2.RELEASE</version>
411
		</dependency>
412
		<dependency>
413
			<groupId>org.springframework</groupId>
414
			<artifactId>org.springframework.transaction</artifactId>
415
			<version>3.2.2.RELEASE</version>
416
		</dependency>
417
		<dependency>
418
			<groupId>org.springframework</groupId>
419
			<artifactId>org.springframework.web</artifactId>
420
			<version>3.2.2.RELEASE</version>
421
		</dependency>
422
		<dependency>
423
			<groupId>org.springframework</groupId>
424
			<artifactId>org.springframework.core</artifactId>
425
			<version>3.2.2.RELEASE</version>
426
		</dependency>
427
		<dependency>
428
			<groupId>org.springframework</groupId>
429
			<artifactId>org.springframework.aop</artifactId>
430
			<version>3.2.2.RELEASE</version>
431
		</dependency>
432
		<dependency>
433
			<groupId>org.springframework</groupId>
434
			<artifactId>org.springframework.expression</artifactId>
435
			<version>3.2.2.RELEASE</version>
436
		</dependency>
437
		<dependency>
438
			<groupId>org.springframework</groupId>
439
			<artifactId>org.springframework.orm</artifactId>
440
			<version>3.2.2.RELEASE</version>
441
		</dependency>
442
		<dependency>
443
			<groupId>org.springframework</groupId>
444
			<artifactId>org.springframework.jdbc</artifactId>
445
			<version>3.2.2.RELEASE</version>
446
		</dependency>
447
		<dependency>
448
			<groupId>org.springframework.security</groupId>
449
			<artifactId>spring-security-core</artifactId>
450
			<version>3.1.3.RELEASE</version>
451
		</dependency>
452
		<dependency>
453
			<groupId>org.springframework.security</groupId>
454
			<artifactId>spring-security-config</artifactId>
455
			<version>3.1.3.RELEASE</version>
456
		</dependency>
457
		<dependency>
458
			<groupId>org.springframework.security</groupId>
459
			<artifactId>spring-security-remoting</artifactId>
460
			<version>3.1.3.RELEASE</version>
461
		</dependency>
462
		<dependency>
463
			<groupId>org.jboss.logging</groupId>
464
			<artifactId>jboss-logging</artifactId>
465
			<version>3.1.3.GA</version>
466
		</dependency>
467
		<dependency>
468
			<groupId>org.hamcrest</groupId>
469
			<artifactId>hamcrest-core</artifactId>
470
			<version>1.3</version>
471
		</dependency>
472
		<dependency>
473
			<groupId>com.mchange</groupId>
474
			<artifactId>c3p0</artifactId>
475
			<version>0.9.2</version>
476
		</dependency>
477
		<dependency>
478
			<groupId>org.jboss.spec.javax.transaction</groupId>
479
			<artifactId>jboss-transaction-api_1.1_spec</artifactId>
480
			<version>1.0.0.Final</version>
481
		</dependency>
482
		<dependency>
483
			<groupId>org.aspectj</groupId>
484
			<artifactId>aspectjrt</artifactId>
485
			<version>1.7.1</version>
486
		</dependency>
487
		<dependency>
488
			<groupId>commons-logging</groupId>
489
			<artifactId>commons-logging</artifactId>
490
			<version>1.1.1</version>
491
		</dependency>
492
		<dependency>
493
			<groupId>commons-lang</groupId>
494
			<artifactId>commons-lang</artifactId>
495
			<version>2.6</version>
496
		</dependency>
497
		<dependency>
498
			<groupId>aopalliance</groupId>
499
			<artifactId>aopalliance</artifactId>
500
			<version>1.0</version>
501
		</dependency>
502
		<dependency>
503
			<groupId>joda-time</groupId>
504
			<artifactId>joda-time</artifactId>
505
			<version>2.1</version>
506
		</dependency>
507
		<dependency>
508
			<groupId>com.ibm.lsid</groupId>
509
			<artifactId>lsid-client</artifactId>
510
			<version>1.1.2</version>
511
		</dependency>
512
		<dependency>
513
			<groupId>com.ibm.lsid</groupId>
514
			<artifactId>lsid-server</artifactId>
515
			<version>1.1.2</version>
516
		</dependency>
517
		<dependency>
518
			<groupId>org.apache.lucene</groupId>
519
			<artifactId>lucene-core</artifactId>
520
			<version>3.6.2</version>
521
		</dependency>
522
		<dependency>
523
			<groupId>org.slf4j</groupId>
524
			<artifactId>slf4j-api</artifactId>
525
			<version>1.7.2</version>
526
		</dependency>
527
		<dependency>
528
			<groupId>org.javassist</groupId>
529
			<artifactId>javassist</artifactId>
530
			<version>3.17.1-GA</version>
531
		</dependency>
532
		<dependency>
533
			<groupId>au.com.bytecode</groupId>
534
			<artifactId>opencsv</artifactId>
535
			<version>2.4</version>
536
		</dependency>
537

  
538

  
539
		<!-- For Unit Tests Start -->
540
		<dependency>
541
			<groupId>org.unitils</groupId>
542
			<artifactId>unitils-spring</artifactId>
543
			<version>3.4.2</version>
544
		</dependency>
545
		<dependency>
546
			<groupId>org.unitils</groupId>
547
			<artifactId>unitils-database</artifactId>
548
			<version>3.4.2</version>
549
		</dependency>
550
		<dependency>
551
			<groupId>commons-dbcp</groupId>
552
			<artifactId>commons-dbcp</artifactId>
553
			<version>1.4</version>
554
		</dependency>
555
		<dependency>
556
			<groupId>commons-pool</groupId>
557
			<artifactId>commons-pool</artifactId>
558
			<version>1.5.4</version>
559
		</dependency>
560
		<dependency>
561
			<groupId>org.unitils</groupId>
562
			<artifactId>unitils-dbmaintainer</artifactId>
563
			<version>3.4.2</version>
564
		</dependency>
565
		<dependency>
566
			<groupId>com.h2database</groupId>
567
			<artifactId>h2</artifactId>
568
			<version>1.4.181</version>
569
		</dependency>
570
		<dependency>
571
			<groupId>org.unitils</groupId>
572
			<artifactId>unitils-dbunit</artifactId>
573
			<version>3.4.2</version>
574
		</dependency>
575
		<dependency>
576
			<groupId>org.dbunit</groupId>
577
			<artifactId>dbunit</artifactId>
578
			<version>2.4.9</version>
579
		</dependency>
580
		<!-- For Unit Tests End -->
581

  
582
		<!-- For Hibernate Mapping Start -->
583
		<dependency>
584
			<groupId>wsdl4j</groupId>
585
			<artifactId>wsdl4j</artifactId>
586
			<version>1.6.3</version>
587
		</dependency>
588
		<dependency>
589
			<groupId>javax.validation</groupId>
590
			<artifactId>validation-api</artifactId>
591
			<version>1.1.0.Final</version>
592
		</dependency>
593
		<!-- For Hibernate Mapping End -->
594
	</dependencies>
595
</project>
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTransientEntityCacher.java
215 215
			loadedCollection = cachedCollection;
216 216
		} else {
217 217
			loadedCollection = load(collection, null);
218
		}
219
		cdmEntitySessionManager.addRootEntities(loadedCollection);
218
		}		
220 219
		return loadedCollection;
221 220
	}
222 221
	
......
264 263
			loadedCdmBase =  cb;
265 264
		} else {
266 265
			loadedCdmBase = load(cdmEntity);
267
		}
268
		cdmEntitySessionManager.addRootEntity(loadedCdmBase);
266
		}		
269 267
		return loadedCdmBase;
270 268
		
271 269
	}
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java
29 29
 *
30 30
 */
31 31

  
32
public class CdmEntitySession<T extends CdmBase>  {
32
public class CdmEntitySession<T extends CdmBase> implements ICdmEntitySession<T>  {
33 33

  
34 34
    
35 35
	private CdmEntitySessionManager cdmEntitySessionManager;
36 36
	
37 37
	private ISessionEventListener sessionOwner;
38 38
		
39
	private CdmTransientEntityCacher cdmTransientEntityCacher;
40
	
41
	private IService<T> service;
39
	private CdmTransientEntityCacher cdmTransientEntityCacher;	
42 40
	
43 41
	private List<T> rootEntities;
44 42
	
......
49 47
		
50 48
		cdmEntitySessionManager.addToOwnerSessionMap(sessionOwner, this);
51 49
	}
50

  
52 51
	
53
	CdmEntitySession(ISessionEventListener sessionOwner, IService<T> service, CdmEntitySessionManager cdmEntitySessionManager) {
54
		this.sessionOwner = sessionOwner;
55
		this.cdmTransientEntityCacher = new CdmTransientEntityCacher(sessionOwner, cdmEntitySessionManager);
56
		this.rootEntities = new ArrayList<T>();
57
		this.service = service;
58
		cdmEntitySessionManager.addToOwnerSessionMap(sessionOwner, this);
59
	}
60
//	
61
//	public CdmTransientEntityCacher getCdmTransientEntityCacher() {
62
//		return cdmTransientEntityCacher;
63
//	}
64
	
52
	/* (non-Javadoc)
53
	 * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(T)
54
	 */
55
	@Override
65 56
	public <T extends Object> T load(T obj) {		
66 57
		return (T) cdmTransientEntityCacher.load(obj,true);
67 58
	}
68 59

  
69 60

  
61
	/* (non-Javadoc)
62
	 * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(T)
63
	 */
64
	@Override
70 65
	public <T extends CdmBase> T load(T cdmBase) {		
71 66
		return (T)cdmTransientEntityCacher.load(cdmBase,true);
72 67
	}
73 68

  
69
	/* (non-Javadoc)
70
	 * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(java.util.Collection)
71
	 */
72
	@Override
74 73
	public <T extends CdmBase> Collection<T> load(Collection<T> cdmBaseList) {
75 74
		
76 75
		return cdmTransientEntityCacher.load(cdmBaseList,true);
77 76
	}
78 77
	
78
	/* (non-Javadoc)
79
	 * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#setEntitiesAsLatest()
80
	 */
81
	@Override
79 82
	public void setEntitiesAsLatest() {
80 83
		List<CdmBase> entities = cdmTransientEntityCacher.getAllEntities();
81 84
		for(CdmBase entity : entities) {
......
83 86
		}
84 87
	}
85 88
	
86
	public  void addRootEntity(T cdmBase) {
87
		rootEntities.add(cdmBase);
88
	}
89
	
90
	public void addRootEntities(Collection<T> objectList) {
91
		for(T obj : objectList) {			
92
			addRootEntity(obj);			
93
		}
94
	}
95
	
96
	public  void commit() {
97
		for(T rootEntity : rootEntities) {			
98
			service.merge( rootEntity);
99
		}
100
	}
101
	
102
	public void commit(IService<T> service,T cdmBase) {
103
		service.merge(cdmBase);
104
	}
105 89
	
90
	/* (non-Javadoc)
91
	 * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#dispose()
92
	 */
93
	@Override
106 94
	public void dispose() {
107 95
		rootEntities.clear();
108 96
		cdmTransientEntityCacher.dispose();
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManager.java
11 11

  
12 12
import java.util.Collection;
13 13
import java.util.HashMap;
14
import java.util.HashSet;
15
import java.util.List;
16 14
import java.util.Map;
17 15

  
18 16
import org.apache.log4j.Logger;
19 17
import org.springframework.stereotype.Component;
20 18

  
21
import eu.etaxonomy.cdm.api.cache.CachedCommonServiceImpl;
22
import eu.etaxonomy.cdm.api.cache.CdmClientCacheException;
23
import eu.etaxonomy.cdm.api.cache.CdmClientCachingTest;
24 19
import eu.etaxonomy.cdm.api.cache.CdmTransientEntityCacher;
25
import eu.etaxonomy.cdm.api.service.IService;
26 20
import eu.etaxonomy.cdm.model.common.CdmBase;
27 21

  
28 22
/**
......
43 37
    private CdmTransientEntityCacher latestEntityCacher =
44 38
    		new CdmTransientEntityCacher("latestEntityCacher", this);
45 39
    
46
    private CdmEntitySession activeSession;
40
    private ICdmEntitySession activeSession;
41

  
47 42
    
48 43
    /* (non-Javadoc)
49 44
	 * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager#getActiveSession()
50 45
	 */
51 46
    @Override
52
	public CdmEntitySession getActiveSession() {
47
	public ICdmEntitySession getActiveSession() {
53 48
		return activeSession;
54 49
	}
55 50
    
......
57 52
	 * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager#getSession(eu.etaxonomy.taxeditor.session.ISessionEventListener)
58 53
	 */
59 54
    @Override
60
	public CdmEntitySession getSession(ISessionEventListener sessionOwner) {
55
	public ICdmEntitySession getSession(ISessionEventListener sessionOwner) {
61 56
    	if(sessionOwner == null) {
62 57
    		return null;
63 58
    	}
64 59
    	
65
		CdmEntitySession session = ownerSessionMap.get(sessionOwner);
60
		ICdmEntitySession session = ownerSessionMap.get(sessionOwner);
66 61
		if(session == null) {
67 62
			logger.info("No session exists for session owner with class : " + sessionOwner.getClass().getName());			
68 63
		}
69 64
		return session;
70 65
	}
71 66
	
72
	private CdmEntitySession newSession(ISessionEventListener sessionOwner, boolean setAsActive) {
67
	private ICdmEntitySession newSession(ISessionEventListener sessionOwner, boolean setAsActive) {
73 68
		CdmEntitySession session = ownerSessionMap.get(sessionOwner);
74 69
		if(session == null) {		
75 70
			session = new CdmEntitySession(sessionOwner, this);
......
87 82
	 */
88 83
	@Override
89 84
	public void bind(ISessionEventListener sessionOwner) {
90
		CdmEntitySession session  = ownerSessionMap.get(sessionOwner);
85
		if(sessionOwner == null) {
86
			activeSession = null;
87
			return;
88
		}
89
		ICdmEntitySession session  = ownerSessionMap.get(sessionOwner);
91 90
		if(session == null) {
92 91
			session = newSession(sessionOwner,true);
93 92
		}
......
99 98
	 */
100 99
	@Override
101 100
	public <T extends Object> T load(ISessionEventListener sessionOwner, T obj) {
102
		CdmEntitySession session = newSession(sessionOwner,true);
101
		ICdmEntitySession session = newSession(sessionOwner,true);		
103 102
		return (T) session.load(obj);
104 103
	}
105 104
	
......
109 108
	@Override
110 109
	public <T extends Object> T load(T obj) {
111 110
		if(activeSession == null) {
112
			throw new CdmClientSessionException("No active session has been bound, cannot load cdm entity");			
111
			return obj;
112
		} else {
113
			return (T)activeSession.load(obj);
113 114
		}
114
		return (T)activeSession.load(obj);
115 115
	}
116 116

  
117 117
	/* (non-Javadoc)
......
119 119
	 */
120 120
	@Override
121 121
	public <T extends CdmBase> T load(ISessionEventListener sessionOwner, T cdmBase) {
122
		CdmEntitySession session = newSession(sessionOwner,true);
122
		ICdmEntitySession session = newSession(sessionOwner,true);
123 123
		return (T)session.load(cdmBase);
124 124
	}
125 125
	
......
129 129
	@Override
130 130
	public <T extends CdmBase> T load(T cdmBase) {
131 131
		if(activeSession == null) {
132
			throw new CdmClientSessionException("No active session has been bound, cannot load cdm entity");			
132
			return cdmBase;
133 133
		}
134 134
		return (T)activeSession.load(cdmBase);
135 135
	}
......
140 140
	 */
141 141
	@Override
142 142
	public <T extends CdmBase> Collection<T> load(ISessionEventListener sessionOwner, Collection<T> cdmBaseList) {
143
		CdmEntitySession session = newSession(sessionOwner,true);
143
		ICdmEntitySession session = newSession(sessionOwner,true);
144 144
		return session.load(cdmBaseList);
145 145
	}
146 146
	
......
151 151
	@Override
152 152
	public <T extends CdmBase> Collection<T> load(Collection<T> cdmBaseList) {
153 153
		if(activeSession == null) {
154
			throw new CdmClientSessionException("No active session has been bound, cannot load cdm entity list");			
154
			return cdmBaseList;
155 155
		}
156 156
		return activeSession.load(cdmBaseList);
157 157
	}
158
	
159
	/* (non-Javadoc)
160
	 * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager#addRootEntity(T)
161
	 */
162
	@Override
163
	@SuppressWarnings("unchecked")
164
	public <T extends CdmBase> void addRootEntity(T cdmBase) {
165
		if(activeSession == null) {
166
			throw new CdmClientSessionException("No active session has been bound, cannot add root cdm entity");			
167
		}
168
		activeSession.addRootEntity(cdmBase);
169
	}
170
	
171
	/* (non-Javadoc)
172
	 * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager#addRootEntities(java.util.Collection)
173
	 */
174
	@Override
175
	@SuppressWarnings("unchecked")
176
	public <T extends Object> void addRootEntities(Collection<T> cdmBaseList) {
177
		if(activeSession == null) {
178
			throw new CdmClientSessionException("No active session has been bound, cannot add root cdm entity");			
179
		}
180
		activeSession.addRootEntities(cdmBaseList);
181
	}
182 158

  
183
//	/* (non-Javadoc)
184
//	 * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager#commit()
185
//	 */
186
//	@Override
187
//	public void commit() {
188
//		if(activeSession == null) {
189
//			logger.info("No active session has been bound, nothing to commit");
190
//		}
191
//		activeSession.commit();
192
//	}
193
//
194
//	
195
//	/* (non-Javadoc)
196
//	 * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager#commit(eu.etaxonomy.taxeditor.session.ISessionEventListener)
197
//	 */
198
//	@Override
199
//	public void commit(ISessionEventListener sessionOwner) {
200
//		if(sessionOwner == null) {
201
//    		return ;
202
//    	}
203
//    	
204
//		CdmEntitySession session = ownerSessionMap.get(sessionOwner);
205
//		if(session == null) {
206
//			logger.info("No session exists for session owner with class : " + sessionOwner.getClass().getName());			
207
//		} else {
208
//			session.commit();
209
//		}		
210
//	}
211
		
212 159
	
213 160
	/* (non-Javadoc)
214 161
	 * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager#dispose(eu.etaxonomy.taxeditor.session.ISessionEventListener)
215 162
	 */
216 163
	@Override
217 164
	public void dispose(ISessionEventListener owner) {
218
		CdmEntitySession session = ownerSessionMap.get(owner);
165
		ICdmEntitySession session = ownerSessionMap.get(owner);
219 166
		if(session == null) {
220 167
			logger.info("No Session connected to owner, nothing to dispose");
221 168
			return;
......
227 174
		ownerSessionMap.put(owner, session);
228 175
	}
229 176
	
230
//	void addToLinkedEntities(T cdmBase) {
231
//		if(cdmBase == null) {
232
//			return;
233
//		}
234
//		String id = CdmTransientEntityCacher.generateId(cdmBase);
235
//		HashSet<CdmClientBase<T>> linkedEntities = entitiesMap.get(id);
236
//		if(linkedEntities == null) {
237
//			linkedEntities = new HashSet<CdmClientBase<T>>();			
238
//		}
239
//		linkedEntities.add(cdmBase);
240
//	}
241
	 	
242 177

  
243 178
	void setEntityAsLatest(CdmBase cdmBase) {		
244 179
		latestEntityCacher.put(cdmBase);
245 180
	}
246 181
	
247 182
	void promoteSessionEntitiesToLatest(ISessionEventListener owner) {
248
		CdmEntitySession session = ownerSessionMap.get(owner);
183
		ICdmEntitySession session = ownerSessionMap.get(owner);
249 184
		if(session != null) {
250 185
			session.setEntitiesAsLatest();
251 186
		}
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySession.java
1
package eu.etaxonomy.taxeditor.session;
2

  
3
import java.util.Collection;
4

  
5
import eu.etaxonomy.cdm.api.service.IService;
6
import eu.etaxonomy.cdm.model.common.CdmBase;
7

  
8
public interface ICdmEntitySession<T extends CdmBase> {
9

  
10
	public abstract <T extends Object> T load(T obj);
11

  
12
	public abstract <T extends CdmBase> T load(T cdmBase);
13

  
14
	public abstract <T extends CdmBase> Collection<T> load(
15
			Collection<T> cdmBaseList);
16

  
17
	public abstract void setEntitiesAsLatest();
18

  
19
	public abstract void dispose();
20

  
21
}
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySessionManager.java
7 7

  
8 8
public interface ICdmEntitySessionManager {
9 9

  
10
	public abstract CdmEntitySession getActiveSession();
10
	public abstract ICdmEntitySession getActiveSession();
11 11

  
12
	public abstract CdmEntitySession getSession(
12
	public abstract ICdmEntitySession getSession(
13 13
			ISessionEventListener sessionOwner);
14 14

  
15 15
	public abstract void bind(ISessionEventListener sessionOwner);
......
30 30
	public abstract <T extends CdmBase> Collection<T> load(
31 31
			Collection<T> cdmBaseList);
32 32

  
33
	@SuppressWarnings("unchecked")
34
	public abstract <T extends CdmBase> void addRootEntity(T cdmBase);
35

  
36
	@SuppressWarnings("unchecked")
37
	public abstract <T extends Object> void addRootEntities(
38
			Collection<T> cdmBaseList);
39

  
33
	public abstract void dispose(ISessionEventListener owner);
34
	
40 35
	//FIXME:Remoting would be nice to have these methods working,
41 36
	//      but they can only be useful if we can 'intelligently'
42 37
	//      get from a model class to the correspoding service class	
38
	
39
//	@SuppressWarnings("unchecked")
40
//	public abstract <T extends CdmBase> void addRootEntity(T cdmBase);
41
//
42
//	@SuppressWarnings("unchecked")
43
//	public abstract <T extends Object> void addRootEntities(
44
//			Collection<T> cdmBaseList);
45

  
43 46
//	public abstract void commit();
44 47
//
45 48
//	public abstract void commit(ISessionEventListener sessionOwner);
46 49
//
47 50
//	public abstract void commit(IService service, CdmBase cdmBase);
48 51

  
49
	public abstract void dispose(ISessionEventListener owner);
52

  
50 53

  
51 54
}
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySessionManager.java
6 6

  
7 7
import eu.etaxonomy.cdm.api.service.IService;
8 8
import eu.etaxonomy.cdm.model.common.CdmBase;
9
import eu.etaxonomy.taxeditor.session.CdmEntitySession;
9
import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
10 10
import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;
11 11
import eu.etaxonomy.taxeditor.session.ISessionEventListener;
12 12

  
......
14 14
public class MockCdmEntitySessionManager implements ICdmEntitySessionManager {
15 15

  
16 16
	@Override
17
	public CdmEntitySession getActiveSession() {		
17
	public ICdmEntitySession getActiveSession() {		
18 18
		return null;
19 19
	}
20 20

  
21 21
	@Override
22
	public CdmEntitySession getSession(ISessionEventListener sessionOwner) {		
22
	public ICdmEntitySession getSession(ISessionEventListener sessionOwner) {		
23 23
		return null;
24 24
	}
25 25

  
......
58 58
		return cdmBaseList;
59 59
	}
60 60

  
61
	@Override
62
	public <T extends CdmBase> void addRootEntity(T cdmBase) {
63
		
64
	}
65

  
66
	@Override
67
	public <T> void addRootEntities(Collection<T> cdmBaseList) {
68
		
69
	}
70

  
71
//	@Override
72
//	public void commit() {
73
//		
74
//	}
75
//
76
//	@Override
77
//	public void commit(ISessionEventListener sessionOwner) {
78
//		
79
//	}
80
//
81
//	@Override
82
//	public void commit(IService service, CdmBase cdmBase) {
83
//		
84
//	}
85 61

  
86 62
	@Override
87 63
	public void dispose(ISessionEventListener owner) {
eu.etaxonomy.taxeditor.cdmlib/src/main/resources/cdmlib-ehcache.xml
1 1
<ehcache name="cdmlibModelCacheManager">
2 2
	<diskStore path="ehcache.disk.store.dir/cdmlib" />
3
	<cache name="cdmModelGetMethodsCache" maxElementsInMemory="0" maxElementsOnDisk="0" eternal="true"
3
	<cache name="cdmModelGetMethodsCache" maxElementsInMemory="1" maxElementsOnDisk="0" eternal="true"
4 4
		overflowToDisk="true" diskPersistent="true" memoryStoreEvictionPolicy="LRU">
5 5
	</cache>
6 6
</ehcache>

Also available in: Unified diff