From: Patric Plitzner
Date: Mon, 20 Oct 2014 11:19:09 +0000 (+0000)
Subject: merge-update from trunk
X-Git-Tag: 3.6.0~393^2~11
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/5ceb94dec4ec95034f6f657828c25c793ec18342?hp=e4428955564572cba1eb7ce59741150b719873f8
merge-update from trunk
---
diff --git a/.gitattributes b/.gitattributes
index 65aff74d8..bd49e6697 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -608,10 +608,12 @@ eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/o
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveTaxonOperationTest.java -text
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java -text
eu.etaxonomy.taxeditor.feature.platform/.project -text
+eu.etaxonomy.taxeditor.feature.platform/LICENSE.TXT -text
eu.etaxonomy.taxeditor.feature.platform/build.properties -text
eu.etaxonomy.taxeditor.feature.platform/feature.xml -text
eu.etaxonomy.taxeditor.feature.platform/pom.xml -text
eu.etaxonomy.taxeditor.feature/.project -text
+eu.etaxonomy.taxeditor.feature/LICENSE.TXT -text
eu.etaxonomy.taxeditor.feature/build.properties -text
eu.etaxonomy.taxeditor.feature/feature.xml -text
eu.etaxonomy.taxeditor.feature/pom.xml -text
@@ -1004,12 +1006,19 @@ eu.etaxonomy.taxeditor.remoting/.classpath -text
eu.etaxonomy.taxeditor.remoting/.project -text
eu.etaxonomy.taxeditor.remoting/.settings/org.eclipse.jdt.core.prefs -text
eu.etaxonomy.taxeditor.remoting/.settings/org.eclipse.pde.core.prefs -text
+eu.etaxonomy.taxeditor.remoting/.svnignore -text
eu.etaxonomy.taxeditor.remoting/META-INF/MANIFEST.MF -text
eu.etaxonomy.taxeditor.remoting/build.properties -text
+eu.etaxonomy.taxeditor.remoting/lib/.svnignore -text
eu.etaxonomy.taxeditor.remoting/pom.xml -text
eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java -text
eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteController.java -text
+eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/api/cache/CachedCommonServiceImpl.java -text
+eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/api/cache/CdmEntityCacheManager.java -text
eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java -text
+eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTransientEntityCacher.java -text
+eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/api/cache/ICachedCommonService.java -text
+eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/api/cache/LazyLoadingCachingUtils.java -text
eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/remote/CdmPersistentRemoteSource.java -text
eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/remote/CdmRemoteSource.java -text
eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/remote/CdmRemoteSourceBase.java -text
@@ -1018,6 +1027,7 @@ eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/remote/ICdmRemote
eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/RemotingTestPluginActivator.java -text
eu.etaxonomy.taxeditor.remoting/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java -text
eu.etaxonomy.taxeditor.remoting/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java -text
+eu.etaxonomy.taxeditor.remoting/src/main/resources/etc/jetty/.svnignore -text
eu.etaxonomy.taxeditor.remoting/src/main/resources/etc/jetty/jetty-runner-9.2.3.v20140905.jar -text
eu.etaxonomy.taxeditor.remoting/src/main/resources/etc/jetty/start-9.2.3.v20140905.jar -text
eu.etaxonomy.taxeditor.remoting/src/main/resources/eu/etaxonomy/cdm/config.properties -text
@@ -1026,23 +1036,30 @@ eu.etaxonomy.taxeditor.remoting/src/main/resources/eu/etaxonomy/cdm/localApplica
eu.etaxonomy.taxeditor.remoting/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml -text
eu.etaxonomy.taxeditor.remoting/src/main/resources/eu/etaxonomy/cdm/remoting_persistence_security.xml -text
eu.etaxonomy.taxeditor.remoting/src/main/resources/eu/etaxonomy/cdm/remoting_services_security.xml -text
+eu.etaxonomy.taxeditor.remoting/src/test/java/eu/etaxonomy/cdm/polytomouskey/PolytomousKeyTest.java -text
eu.etaxonomy.taxeditor.remoting/src/test/java/eu/etaxonomy/taxeditor/exception/CDMServerException.java -text
eu.etaxonomy.taxeditor.remoting/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java -text
eu.etaxonomy.taxeditor.remoting/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CDMServer.java -text
eu.etaxonomy.taxeditor.remoting/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CdmPersistentRemoteSourceTest.java -text
eu.etaxonomy.taxeditor.remoting/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CdmRemoteSourceTest.java -text
eu.etaxonomy.taxeditor.remoting/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CdmServerTest.java -text
+eu.etaxonomy.taxeditor.remoting/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CdmServerTestManager.java -text
eu.etaxonomy.taxeditor.remoting/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/HttpInvokerServicesTest.java -text
eu.etaxonomy.taxeditor.remoting/src/test/java/eu/etaxonomy/taxeditor/lazyloading/AbstractLazyInitializerTest.java -text
+eu.etaxonomy.taxeditor.remoting/src/test/java/eu/etaxonomy/taxeditor/lazyloading/CdmEntityCacherTest.java -text
eu.etaxonomy.taxeditor.remoting/src/test/java/eu/etaxonomy/taxeditor/lazyloading/CdmServiceCacherTest.java -text
eu.etaxonomy.taxeditor.remoting/src/test/java/eu/etaxonomy/taxeditor/lazyloading/RemoteLazyLoadingTest.java -text
eu.etaxonomy.taxeditor.remoting/src/test/java/eu/etaxonomy/taxeditor/lazyloading/RemotePersistentCollectionTest.java -text
eu.etaxonomy.taxeditor.remoting/src/test/resources/datasources.xml -text
eu.etaxonomy.taxeditor.remoting/src/test/resources/eu/etaxonomy/cdm/cdm.datasources.xml -text
+eu.etaxonomy.taxeditor.remoting/src/test/resources/eu/etaxonomy/cdm/polytomouskey/PolytomousKeyTest.readPolytmousKeyData.xml -text
+eu.etaxonomy.taxeditor.remoting/src/test/resources/eu/etaxonomy/cdm/polytomouskey/PolytomousKeyTest.xml -text
eu.etaxonomy.taxeditor.remoting/src/test/resources/eu/etaxonomy/cdm/testRemotingApplicationContext.xml -text
eu.etaxonomy.taxeditor.remoting/src/test/resources/eu/etaxonomy/taxeditor/lazyloading/AbstractLazyInitializerTest.xml -text
+eu.etaxonomy.taxeditor.remoting/src/test/resources/eu/etaxonomy/taxeditor/lazyloading/CdmEntityCacherTest.xml -text
eu.etaxonomy.taxeditor.remoting/src/test/resources/h2/cdmTest.h2.db -text
eu.etaxonomy.taxeditor.remoting/src/test/resources/h2/cdmTest.trace.db -text
+eu.etaxonomy.taxeditor.remoting/src/test/resources/log4j.properties -text
eu.etaxonomy.taxeditor.remoting/src/test/resources/unitils.properties -text
eu.etaxonomy.taxeditor.store/.classpath -text
eu.etaxonomy.taxeditor.store/.project -text
diff --git a/.gitignore b/.gitignore
index 15187a3bd..000adc05f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,7 +31,11 @@ eu.etaxonomy.taxeditor.navigation/.settings
eu.etaxonomy.taxeditor.navigation/target
eu.etaxonomy.taxeditor.printpublisher/.settings
eu.etaxonomy.taxeditor.printpublisher/target
-eu.etaxonomy.taxeditor.remoting/lib/*
+eu.etaxonomy.taxeditor.remoting/*.log
+eu.etaxonomy.taxeditor.remoting/.settings
+eu.etaxonomy.taxeditor.remoting/lib
+eu.etaxonomy.taxeditor.remoting/lib/*.jar
+eu.etaxonomy.taxeditor.remoting/src/main/resources/etc/jetty/cdmlib-remote-webapp.war
eu.etaxonomy.taxeditor.remoting/target
eu.etaxonomy.taxeditor.store/.settings
eu.etaxonomy.taxeditor.store/hibernate.log
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml b/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml
index 7d069767e..4da979c01 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml
@@ -195,16 +195,6 @@
id="taxeditor-bulkeditor.command.setMarkerFlag"
name="Set Marker Flag">
-
-
-
-
readSize, of " + getRole() + " with key " + getKey());
- read();
+ read();
} else {
boolean isExtraLazy = withTemporarySessionIfNeeded(
new LazyInitializationWork() {
@@ -236,7 +247,7 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers
.getTransactionContext().getTransactionEnvironment()
.getTransactionFactory()
.compatibleWithJtaSynchronization();
-
+
if ( !isJTA ) {
// Explicitly handle the transactions only if we're not in
// a JTA environment. A lazy loading temporary session can
@@ -245,7 +256,7 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers
// multiple transactions.
( ( Session) session ).beginTransaction();
}
-
+
session.getPersistenceContext().addUninitializedDetachedCollection(
session.getFactory().getCollectionPersister( getRole() ),
this
@@ -286,9 +297,9 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers
if ( !initialized ) {
// In remoting we are sure that session is null
// both when using property paths and switching off conversations
- if(session == null && remoting) {
+ if(session == null && remoting) {
log.info("--> readIndexExistence, of " + getRole() + " with key " + getKey());
- read();
+ read();
} else {
Boolean extraLazyExistenceCheck = withTemporarySessionIfNeeded(
new LazyInitializationWork() {
@@ -323,8 +334,8 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers
// both when using property paths and switching off conversations
if(session == null && remoting) {
log.info("--> readElementExistence, of " + getRole() + " with key " + getKey());
- read();
-
+ read();
+
} else {
Boolean extraLazyExistenceCheck = withTemporarySessionIfNeeded(
new LazyInitializationWork() {
@@ -359,10 +370,10 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers
if ( !initialized ) {
// In remoting we are sure that session is null
// both when using property paths and switching off conversations
- if(session == null && remoting) {
+ if(session == null && remoting) {
log.info("--> readElementByIndex, of " + getRole() + " with key " + getKey());
- read();
-
+ read();
+
} else {
class ExtraLazyElementByIndexReader implements LazyInitializationWork {
private boolean isExtraLazy;
@@ -510,7 +521,8 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers
/**
* After flushing, re-init snapshot state.
*/
- public void setSnapshot(Serializable key, String role, Serializable snapshot) {
+ @Override
+ public void setSnapshot(Serializable key, String role, Serializable snapshot) {
this.key = key;
this.role = role;
this.storedSnapshot = snapshot;
@@ -520,7 +532,8 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers
* After flushing, clear any "queued" additions, since the
* database state is now synchronized with the memory state.
*/
- public void postAction() {
+ @Override
+ public void postAction() {
operationQueue = null;
cachedSize = -1;
clearDirty();
@@ -540,14 +553,16 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers
/**
* return the user-visible collection (or array) instance
*/
- public Object getValue() {
+ @Override
+ public Object getValue() {
return this;
}
/**
* Called just before reading any rows from the JDBC result set
*/
- public void beginRead() {
+ @Override
+ public void beginRead() {
// override on some subclasses
initializing = true;
}
@@ -555,12 +570,14 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers
/**
* Called after reading all rows from the JDBC result set
*/
- public boolean endRead() {
+ @Override
+ public boolean endRead() {
//override on some subclasses
return afterInitialize();
}
- public boolean afterInitialize() {
+ @Override
+ public boolean afterInitialize() {
setInitialized();
//do this bit after setting initialized to true or it will recurse
if ( operationQueue != null ) {
@@ -586,14 +603,14 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers
// In remoting we are sure that session is null
// both when using property paths and switching off conversations
if(session == null && remoting) {
- remoteInitialize();
+ remoteInitialize();
}
-
+
if ( initialized ) {
return;
}
-
+
withTemporarySessionIfNeeded(
new LazyInitializationWork