Revision 1cd65199
Added by Cherian Mathew almost 9 years ago
.gitignore | ||
---|---|---|
8 | 8 |
eu.etaxonomy.taxeditor.cdmlib/cdmlib-*.jar |
9 | 9 |
eu.etaxonomy.taxeditor.cdmlib/cdmlib-*.zip |
10 | 10 |
eu.etaxonomy.taxeditor.cdmlib/dist |
11 |
eu.etaxonomy.taxeditor.cdmlib/lib/cdm-server* |
|
11 | 12 |
eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib* |
12 | 13 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.servletbridge.extensionbundle-1.2.0.v20100503.jar |
13 | 14 |
eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.transforms.hook-1.0.300.v20100719.jar |
eu.etaxonomy.taxeditor.cdmlib/.classpath | ||
---|---|---|
1 | 1 |
<?xml version="1.0" encoding="UTF-8"?> |
2 | 2 |
<classpath> |
3 |
<classpathentry exported="true" kind="lib" path="lib/cdm-server-3.5.2-SNAPSHOT.jar"/> |
|
3 | 4 |
<classpathentry exported="true" kind="lib" path="lib/unitils-spring-3.4.2.jar"/> |
4 | 5 |
<classpathentry exported="true" kind="lib" path="lib/unitils-core-3.4.2.jar"/> |
5 | 6 |
<classpathentry exported="true" kind="lib" path="lib/unitils-database-3.4.2.jar"/> |
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF | ||
---|---|---|
651 | 651 |
lib/unitils-database-3.4.2.jar, |
652 | 652 |
lib/unitils-dbmaintainer-3.4.2.jar, |
653 | 653 |
lib/unitils-dbunit-3.4.2.jar, |
654 |
lib/unitils-spring-3.4.2.jar |
|
654 |
lib/unitils-spring-3.4.2.jar, |
|
655 |
lib/cdm-server-3.5.2-SNAPSHOT.jar |
|
655 | 656 |
Import-Package: org.apache.commons.httpclient.methods |
eu.etaxonomy.taxeditor.cdmlib/build.properties | ||
---|---|---|
197 | 197 |
lib/unitils-database-3.4.2.jar,\ |
198 | 198 |
lib/unitils-dbmaintainer-3.4.2.jar,\ |
199 | 199 |
lib/unitils-dbunit-3.4.2.jar,\ |
200 |
lib/unitils-spring-3.4.2.jar |
|
200 |
lib/unitils-spring-3.4.2.jar,\ |
|
201 |
lib/cdm-server-3.5.2-SNAPSHOT.jar |
|
201 | 202 |
|
202 | 203 |
jars.compile.order = . |
203 | 204 |
output.. = bin/ |
eu.etaxonomy.taxeditor.cdmlib/pom.xml | ||
---|---|---|
39 | 39 |
cdmlib-remote-webapp |
40 | 40 |
</excludeArtifactIds> |
41 | 41 |
<includeArtifactIds> |
42 |
cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote |
|
42 |
cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote,cdm-server
|
|
43 | 43 |
</includeArtifactIds> |
44 | 44 |
<outputDirectory>${basedir}/lib</outputDirectory> |
45 | 45 |
<overWriteReleases>true</overWriteReleases> |
... | ... | |
102 | 102 |
from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\.jar)" |
103 | 103 |
to="\1SNAPSHOT\2" /> |
104 | 104 |
</move> |
105 |
<move todir="./lib"> |
|
106 |
<fileset dir="./lib" /> |
|
107 |
<mapper type="regexp" |
|
108 |
from="(^cdm\-server\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\.jar)" |
|
109 |
to="\1SNAPSHOT\2" /> |
|
110 |
</move> |
|
105 | 111 |
<move todir="./lib"> |
106 | 112 |
<fileset dir="./lib" /> |
107 | 113 |
<mapper type="regexp" |
108 | 114 |
from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)" |
109 | 115 |
to="\1SNAPSHOT\2" /> |
110 | 116 |
</move> |
117 |
<move todir="./lib"> |
|
118 |
<fileset dir="./lib" /> |
|
119 |
<mapper type="regexp" |
|
120 |
from="(^cdm\-server\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)" |
|
121 |
to="\1SNAPSHOT\2" /> |
|
122 |
</move> |
|
111 | 123 |
</target> |
112 | 124 |
</configuration> |
113 | 125 |
</execution> |
... | ... | |
222 | 234 |
<version>${cdmlib.version}</version> |
223 | 235 |
<type>war</type> |
224 | 236 |
</dependency> |
237 |
<dependency> |
|
238 |
<groupId>eu.etaxonomy</groupId> |
|
239 |
<artifactId>cdm-server</artifactId> |
|
240 |
<version>3.5.2-SNAPSHOT</version> |
|
241 |
</dependency> |
|
225 | 242 |
<dependency> |
226 | 243 |
<groupId>eu.etaxonomy</groupId> |
227 | 244 |
<artifactId>cdmlib-commons</artifactId> |
... | ... | |
534 | 551 |
</dependency> |
535 | 552 |
|
536 | 553 |
<!-- For Unit Tests Start --> |
537 |
|
|
554 |
|
|
538 | 555 |
<dependency> |
539 | 556 |
<groupId>org.unitils</groupId> |
540 | 557 |
<artifactId>unitils-core</artifactId> |
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CacheLoader.java | ||
---|---|---|
321 | 321 |
|
322 | 322 |
CdmBase cdmEntityInSubGraph = null; |
323 | 323 |
|
324 |
if(update) { |
|
325 |
// if we are in update mode we have to make the field of the cached entity |
|
326 |
// up-to-date by setting it to the value of the cdm entity being loaded |
|
327 |
// NOTE : two exceptions to this are found below |
|
328 |
field.set(cachedCdmEntity, o); |
|
329 |
|
|
330 |
} |
|
331 |
|
|
324 | 332 |
if(o != null && !ProxyUtils.isProxy(o)) { |
325 | 333 |
if(CdmBase.class.isAssignableFrom(o.getClass())) { |
326 | 334 |
logger.info("found initialised cdm entity '" + fieldName + "' in object of type " + clazz.getName() + " with id " + cdmEntity.getId()); |
327 |
if(update) { |
|
328 |
// if we are in update mode we have to make the field of the cached entity |
|
329 |
// up-to-date by setting it to the value of the cdm entity being loaded |
|
330 |
// NOTE : two exceptions to this are found below |
|
331 |
field.set(cachedCdmEntity, o); |
|
332 | 335 |
|
333 |
} |
|
334 | 336 |
cdmEntityInSubGraph = (CdmBase)o; |
335 | 337 |
CdmBase cachedCdmEntityInSubGraph = cdmCacher.getFromCache(cdmEntityInSubGraph); |
336 | 338 |
|
Also available in: Unified diff
.classpath, MANIFEST.MF, build.properties, pom.xml : added cdm-server jar to lib dir and project classpath
/lib : added ignore for cdm-server jar
CacheLoader : reverted update of cached entity field
cdmlib-remote-webapp.war : updated to latest version