eu.etaxonomy.taxeditor.cdmlib/lib/yjp-controller-api-redist-9.0.8.jar -text
eu.etaxonomy.taxeditor.cdmlib/pom.xml -text
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/lazyloading/CdmLazyLoader.java -text
+eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/CdmApplicationRemoteConfiguration.java -text
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/CdmApplicationRemoteController.java -text
-eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/CdmApplicationRemoteDefaultConfiguration.java -text
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/ICdmApplicationRemoteConfiguration.java -text
eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java -text
eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java -text
<classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.3.0-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.3.0-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.3.0-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.3.0-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.3.0-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.3.0-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.3.0-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.3.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.3.0-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.3.0-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.3.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-persistence-3.3.0-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.3.0-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.3.0-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.3.0-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.3.0-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.3.0-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.3.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.3.0-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.3.1-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.3.1-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.3.1-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.3.1-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.3.1-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.3.1-SNAPSHOT.jar" sourcepath="lib/cdmlib-io-3.3.1-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.3.1-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.3.1-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.3.1-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.3.1-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.3.1-SNAPSHOT.jar" sourcepath="lib/cdmlib-persistence-3.3.1-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.3.1-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.3.1-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.3.1-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.3.1-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.3.1-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.3.1-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.3.1-SNAPSHOT-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
Bundle-ManifestVersion: 2
Bundle-Name: CDM Library Dependencies Plugin
Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 3.3.1.qualifier
Eclipse-BundleShape: dir
Export-Package: com.google.api,
com.google.api.detect,
eu.etaxonomy.cdm.database.update.v25_30,
eu.etaxonomy.cdm.database.update.v30_31,
eu.etaxonomy.cdm.ext.bci,
+ eu.etaxonomy.cdm.ext.biocase,
eu.etaxonomy.cdm.ext.common,
eu.etaxonomy.cdm.ext.dc,
eu.etaxonomy.cdm.ext.geo,
org.apache.commons.lang;uses:="org.apache.commons.lang.exception",
org.apache.fop.apps,
org.apache.http,
+ org.apache.http.client,
org.apache.log4j;uses:="org.apache.log4j.helpers,org.apache.log4j.or,org.apache.log4j.spi",
org.apache.log4j.chainsaw;
uses:="org.apache.log4j,
org.apache.log4j.spi,
org.w3c.dom,
org.xml.sax",
+ org.apache.lucene.index,
+ org.apache.lucene.queryParser,
org.apache.lucene.util,
org.apache.sanselan;uses:="org.apache.sanselan.common,org.apache.sanselan.common.byteSources",
org.apache.xerces.dom,
org.hibernate.annotations.common.reflection,
org.hibernate.cache.internal,
org.hibernate.classic,
+ org.hibernate.criterion,
+ org.hibernate.envers.query.criteria,
org.hibernate.search,
+ org.hibernate.search.spatial.impl,
org.jadira.usertype.dateandtime.joda,
org.jadira.usertype.dateandtime.shared.spi,
org.jboss.logging,
lib/batik-util-1.7.jar,
lib/batik-xml-1.7.jar,
lib/c3p0-0.9.2.jar,
- lib/cdmlib-commons-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-commons-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-ext-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-ext-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-io-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-io-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-model-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-model-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-persistence-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-print-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-print-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-remote-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-remote-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-services-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-services-3.3.0-SNAPSHOT.jar,
+ lib/cdmlib-commons-3.3.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-commons-3.3.1-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.3.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-ext-3.3.1-SNAPSHOT.jar,
+ lib/cdmlib-io-3.3.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-io-3.3.1-SNAPSHOT.jar,
+ lib/cdmlib-model-3.3.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-model-3.3.1-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.3.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-persistence-3.3.1-SNAPSHOT.jar,
+ lib/cdmlib-print-3.3.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-print-3.3.1-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.3.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-remote-3.3.1-SNAPSHOT.jar,
+ lib/cdmlib-services-3.3.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-services-3.3.1-SNAPSHOT.jar,
lib/cglib-nodep-2.2.2.jar,
lib/com.springsource.org.aopalliance-1.0.0.jar,
lib/com.springsource.org.apache.commons.logging-1.1.1.jar,
lib/batik-util-1.7.jar,\\r
lib/batik-xml-1.7.jar,\\r
lib/c3p0-0.9.2.jar,\\r
- lib/cdmlib-commons-3.3.0-SNAPSHOT-sources.jar,\\r
- lib/cdmlib-commons-3.3.0-SNAPSHOT.jar,\\r
- lib/cdmlib-ext-3.3.0-SNAPSHOT-sources.jar,\\r
- lib/cdmlib-ext-3.3.0-SNAPSHOT.jar,\\r
- lib/cdmlib-io-3.3.0-SNAPSHOT-sources.jar,\\r
- lib/cdmlib-io-3.3.0-SNAPSHOT.jar,\\r
- lib/cdmlib-model-3.3.0-SNAPSHOT-sources.jar,\\r
- lib/cdmlib-model-3.3.0-SNAPSHOT.jar,\\r
- lib/cdmlib-persistence-3.3.0-SNAPSHOT-sources.jar,\\r
- lib/cdmlib-persistence-3.3.0-SNAPSHOT.jar,\\r
- lib/cdmlib-print-3.3.0-SNAPSHOT-sources.jar,\\r
- lib/cdmlib-print-3.3.0-SNAPSHOT.jar,\\r
- lib/cdmlib-remote-3.3.0-SNAPSHOT-sources.jar,\\r
- lib/cdmlib-remote-3.3.0-SNAPSHOT.jar,\\r
- lib/cdmlib-services-3.3.0-SNAPSHOT-sources.jar,\\r
- lib/cdmlib-services-3.3.0-SNAPSHOT.jar,\\r
+ lib/cdmlib-commons-3.3.1-SNAPSHOT-sources.jar,\\r
+ lib/cdmlib-commons-3.3.1-SNAPSHOT.jar,\\r
+ lib/cdmlib-ext-3.3.1-SNAPSHOT-sources.jar,\\r
+ lib/cdmlib-ext-3.3.1-SNAPSHOT.jar,\\r
+ lib/cdmlib-io-3.3.1-SNAPSHOT-sources.jar,\\r
+ lib/cdmlib-io-3.3.1-SNAPSHOT.jar,\\r
+ lib/cdmlib-model-3.3.1-SNAPSHOT-sources.jar,\\r
+ lib/cdmlib-model-3.3.1-SNAPSHOT.jar,\\r
+ lib/cdmlib-persistence-3.3.1-SNAPSHOT-sources.jar,\\r
+ lib/cdmlib-persistence-3.3.1-SNAPSHOT.jar,\\r
+ lib/cdmlib-print-3.3.1-SNAPSHOT-sources.jar,\\r
+ lib/cdmlib-print-3.3.1-SNAPSHOT.jar,\\r
+ lib/cdmlib-remote-3.3.1-SNAPSHOT-sources.jar,\\r
+ lib/cdmlib-remote-3.3.1-SNAPSHOT.jar,\\r
+ lib/cdmlib-services-3.3.1-SNAPSHOT-sources.jar,\\r
+ lib/cdmlib-services-3.3.1-SNAPSHOT.jar,\\r
lib/cglib-nodep-2.2.2.jar,\\r
lib/com.springsource.org.aopalliance-1.0.0.jar,\\r
lib/com.springsource.org.apache.commons.logging-1.1.1.jar,\\r
<parent>\r
<groupId>eu.etaxonomy</groupId>\r
<artifactId>taxeditor-parent</artifactId>\r
- <version>3.3.0-SNAPSHOT</version>\r
+ <version>3.3.1-SNAPSHOT</version>\r
</parent>\r
<modelVersion>4.0.0</modelVersion>\r
<artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
import org.springframework.context.ApplicationContextAware;\r
import org.springframework.stereotype.Component;\r
\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationConfiguration;\r
import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration;\r
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
+import eu.etaxonomy.cdm.api.conversation.ConversationHolderMock;\r
\r
/**\r
* @author a.mueller\r
* @author j.koch\r
*/\r
@Component\r
-public class CdmApplicationRemoteDefaultConfiguration extends CdmApplicationDefaultConfiguration implements ICdmApplicationRemoteConfiguration, ApplicationContextAware {\r
+public class CdmApplicationRemoteConfiguration extends CdmApplicationConfiguration implements ICdmApplicationRemoteConfiguration, ApplicationContextAware {\r
\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmApplicationRemoteDefaultConfiguration.class);\r
+ private static final Logger logger = Logger.getLogger(CdmApplicationRemoteConfiguration.class);\r
\r
- public CdmApplicationRemoteDefaultConfiguration() {\r
+ public CdmApplicationRemoteConfiguration() {\r
+ }\r
+ \r
+ @Override\r
+ public ConversationHolder NewConversation() {\r
+ // TODO Auto-generated method stub\r
+ return new ConversationHolderMock();\r
}\r
- \r
- \r
}\r
import eu.etaxonomy.cdm.common.monitor.NullProgressMonitor;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import eu.etaxonomy.cdm.persistence.hibernate.permission.ICdmPermissionEvaluator;\r
\r
\r
/**\r
logger.info(beanName);\r
}\r
}\r
- configuration = new CdmApplicationRemoteDefaultConfiguration();\r
+ configuration = new CdmApplicationRemoteConfiguration();\r
}\r
\r
\r
}\r
\r
@Override\r
- public PermissionEvaluator getPermissionEvaluator() {\r
+ public ICdmPermissionEvaluator getPermissionEvaluator() {\r
return configuration.getPermissionEvaluator();\r
}\r
\r
import java.util.Set;
import java.util.UUID;
-
-
import org.junit.Assert;
import org.junit.Test;
import org.unitils.UnitilsJUnit4;
import org.unitils.database.annotations.Transactional;
import org.unitils.database.util.TransactionMode;
-import org.unitils.dbunit.annotation.DataSet;
import org.unitils.spring.annotation.SpringApplicationContext;
import org.unitils.spring.annotation.SpringBeanByType;
import eu.etaxonomy.cdm.api.service.ITaxonService;
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.Rank;
-import eu.etaxonomy.cdm.model.reference.Reference;
-import eu.etaxonomy.cdm.model.taxon.ITaxon;
import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;
import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
/**