cdmlib-services/LICENSE.TXT -text
cdmlib-services/README.TXT -text
cdmlib-services/pom.xml -text
-cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationConfiguration.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationController.java -text
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationDefaultConfiguration.java -text
-cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationDefaultController.java -text
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/FirstDataInserter.java -text
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/ICdmApplicationConfiguration.java -text
-cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/ICdmApplicationDefaultConfiguration.java -text
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/MonitoredGenericApplicationContext.java -text
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/MonitoredListableBeanFactory.java -text
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/conversation/ConversationHolder.java -text
\r
import com.ibm.lsid.MalformedLSIDException;\r
\r
-import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.ext.common.SchemaAdapterBase;\r
import eu.etaxonomy.cdm.ext.common.ServiceWrapperBase;\r
* @return\r
*/\r
@Override\r
- public List<Collection> getCollectionsByCode(String code, ICdmApplicationDefaultConfiguration appConfig){\r
+ public List<Collection> getCollectionsByCode(String code, ICdmApplicationConfiguration appConfig){\r
\r
SchemaAdapterBase<Collection> schemaAdapter = schemaAdapterMap.get("recordSchema");\r
if(schemaAdapter == null){\r
* @param restRequest\r
* @return\r
*/\r
- private List<? extends IdentifiableEntity> queryService(String request, ICdmApplicationDefaultConfiguration appConfig, URL serviceUrl, ServiceType serviceType){\r
+ private List<? extends IdentifiableEntity> queryService(String request, ICdmApplicationConfiguration appConfig, URL serviceUrl, ServiceType serviceType){\r
try {\r
// create the request url\r
URL newUrl = new URL(serviceUrl.getProtocol(),\r
}\r
\r
\r
- private List<Collection> buildCollectionList(InputStream content, ICdmApplicationDefaultConfiguration appConfig) throws IOException {\r
+ private List<Collection> buildCollectionList(InputStream content, ICdmApplicationConfiguration appConfig) throws IOException {\r
List<Collection> result = new ArrayList<Collection>();\r
BufferedReader reader = new BufferedReader (new InputStreamReader(content));\r
\r
}\r
\r
\r
- private Collection getCollectionFromLine(String line, ICdmApplicationDefaultConfiguration appConfig) {\r
+ private Collection getCollectionFromLine(String line, ICdmApplicationConfiguration appConfig) {\r
//urn:lsid:biocol.org:col:15727 http://biocol.org/urn:lsid:biocol.org:col:15727 University of Bergen Herbarium\r
String[] splits = line.split("\t");\r
if (splits.length != 3){\r
}\r
\r
\r
- private Reference getBciCitation(ICdmApplicationDefaultConfiguration appConfig) {\r
+ private Reference getBciCitation(ICdmApplicationConfiguration appConfig) {\r
Reference bciReference;\r
if (appConfig != null){\r
bciReference = appConfig.getReferenceService().find(uuidBci);\r
import java.util.List;\r
import java.util.UUID;\r
\r
-import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
import eu.etaxonomy.cdm.model.occurrence.Collection;\r
\r
\r
* @param appConfig\r
* @return\r
*/\r
- public List<Collection> getCollectionsByCode(String code, ICdmApplicationDefaultConfiguration appConfig);\r
+ public List<Collection> getCollectionsByCode(String code, ICdmApplicationConfiguration appConfig);\r
\r
public URL getServiceUrl(String url);\r
\r
import java.util.List;\r
import java.util.UUID;\r
\r
-import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
import eu.etaxonomy.cdm.ext.ipni.IpniService.IpniRank;\r
import eu.etaxonomy.cdm.model.agent.Person;\r
import eu.etaxonomy.cdm.model.common.ExtensionType;\r
* @param appConfig\r
* @return\r
*/\r
- public List<Person> getAuthors(String abbreviation, String surname, String forename, String isoCountry, ICdmApplicationDefaultConfiguration appConfig, IpniServiceAuthorConfigurator config);\r
+ public List<Person> getAuthors(String abbreviation, String surname, String forename, String isoCountry, ICdmApplicationConfiguration appConfig, IpniServiceAuthorConfigurator config);\r
\r
\r
/**\r
* @param appConfig\r
* @return\r
*/\r
- public List<BotanicalName> getNamesSimple(String wholeName, ICdmApplicationDefaultConfiguration services, IpniServiceNamesConfigurator config);\r
+ public List<BotanicalName> getNamesSimple(String wholeName, ICdmApplicationConfiguration services, IpniServiceNamesConfigurator config);\r
\r
\r
/**\r
IpniRank ipniRankToReturn,\r
Boolean sortByFamily,\r
IpniServiceNamesConfigurator config,\r
- ICdmApplicationDefaultConfiguration appConfig);\r
+ ICdmApplicationConfiguration appConfig);\r
\r
/**\r
- * As {@link #getNamesAdvanced(String, String, String, String, String, String, String, Boolean, Boolean, String, Boolean, Boolean, Boolean, IpniRank, Boolean, IpniServiceNamesConfigurator, ICdmApplicationDefaultConfiguration)}\r
+ * As {@link #getNamesAdvanced(String, String, String, String, String, String, String, Boolean, Boolean, String, Boolean, Boolean, Boolean, IpniRank, Boolean, IpniServiceNamesConfigurator, ICdmApplicationConfiguration)}\r
* but using CDM Rank instead of IpniRank. The CDM Rank is transformed into an IpniRank so it returns all\r
* names that are in the same IpniRange as the CDM rank. Therefore when using CDM rank 'variety' also a \r
* 'subspecies' may be returned as 'variety' and 'subspecies' are within the same IpniRange 'Infraspecific'. \r
Rank rankRangeToReturn,\r
Boolean sortByFamily,\r
IpniServiceNamesConfigurator config,\r
- ICdmApplicationDefaultConfiguration appConfig);\r
+ ICdmApplicationConfiguration appConfig);\r
\r
/**\r
* Returns a list of publications matching the title and/or the abbreviation parameter according to the IPNI Publication search function.\r
* @param config for finetuning, maybe null\r
* @return\r
*/\r
- public List<Reference> getPublications(String title, String abbreviation, ICdmApplicationDefaultConfiguration services, IpniServicePublicationConfigurator config);\r
+ public List<Reference> getPublications(String title, String abbreviation, ICdmApplicationConfiguration services, IpniServicePublicationConfigurator config);\r
\r
public URL getServiceUrl(String url);\r
}
\ No newline at end of file
import org.apache.log4j.Logger;\r
import org.springframework.stereotype.Component;\r
\r
-import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.common.UriUtils;\r
\r
\r
/* (non-Javadoc)\r
- * @see eu.etaxonomy.cdm.ext.ipni.IIpniService#getAuthors(java.lang.String, java.lang.String, java.lang.String, java.lang.String, eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration, eu.etaxonomy.cdm.ext.ipni.IpniServiceAuthorConfigurator)\r
+ * @see eu.etaxonomy.cdm.ext.ipni.IIpniService#getAuthors(java.lang.String, java.lang.String, java.lang.String, java.lang.String, eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration, eu.etaxonomy.cdm.ext.ipni.IpniServiceAuthorConfigurator)\r
*/\r
- public List<Person> getAuthors(String abbreviation, String surname, String forename, String isoCountry, ICdmApplicationDefaultConfiguration services, IpniServiceAuthorConfigurator config){\r
+ public List<Person> getAuthors(String abbreviation, String surname, String forename, String isoCountry, ICdmApplicationConfiguration services, IpniServiceAuthorConfigurator config){\r
//config\r
if (config == null){\r
config = new IpniServiceAuthorConfigurator();\r
* @param restRequest\r
* @return\r
*/\r
- private List<? extends IdentifiableEntity> queryService(String request, ICdmApplicationDefaultConfiguration services, URL serviceUrl, IIpniServiceConfigurator config, ServiceType serviceType){\r
+ private List<? extends IdentifiableEntity> queryService(String request, ICdmApplicationConfiguration services, URL serviceUrl, IIpniServiceConfigurator config, ServiceType serviceType){\r
if (config == null){\r
throw new NullPointerException("Ipni service configurator should not be null");\r
}\r
return null;\r
}\r
\r
- private List<Reference> buildPublicationList( InputStream content, ICdmApplicationDefaultConfiguration services, IIpniServiceConfigurator iConfig) throws IOException {\r
+ private List<Reference> buildPublicationList( InputStream content, ICdmApplicationConfiguration services, IIpniServiceConfigurator iConfig) throws IOException {\r
IpniServicePublicationConfigurator config = (IpniServicePublicationConfigurator)iConfig;\r
\r
List<Reference> result = new ArrayList<Reference>(); \r
* @param config\r
* @return\r
*/\r
- private Reference getPublicationFromLine(String line, Map<Integer, String> parameterMap, ICdmApplicationDefaultConfiguration appConfig, IpniServicePublicationConfigurator config) {\r
+ private Reference getPublicationFromLine(String line, Map<Integer, String> parameterMap, ICdmApplicationConfiguration appConfig, IpniServicePublicationConfigurator config) {\r
//fill value map\r
String[] splits = line.split("%");\r
\r
}\r
\r
\r
- private List<BotanicalName> buildNameList( InputStream content, ICdmApplicationDefaultConfiguration appConfig, IIpniServiceConfigurator iConfig) throws IOException {\r
+ private List<BotanicalName> buildNameList( InputStream content, ICdmApplicationConfiguration appConfig, IIpniServiceConfigurator iConfig) throws IOException {\r
IpniServiceNamesConfigurator config = (IpniServiceNamesConfigurator)iConfig;\r
List<BotanicalName> result = new ArrayList<BotanicalName>(); \r
BufferedReader reader = new BufferedReader (new InputStreamReader(content));\r
}\r
\r
\r
- private BotanicalName getNameFromLine(String line, Map<Integer, String> parameterMap, ICdmApplicationDefaultConfiguration appConfig) {\r
+ private BotanicalName getNameFromLine(String line, Map<Integer, String> parameterMap, ICdmApplicationConfiguration appConfig) {\r
//Id%Version%Standard form%Default author forename%Default author surname%Taxon groups%Dates%Alternative names\r
String[] splits = line.split("%");\r
Map<String, String> valueMap = new HashMap<String, String>();\r
}\r
\r
\r
- private List<Person> buildAuthorList(InputStream content, ICdmApplicationDefaultConfiguration services, IIpniServiceConfigurator iConfig) throws IOException {\r
+ private List<Person> buildAuthorList(InputStream content, ICdmApplicationConfiguration services, IIpniServiceConfigurator iConfig) throws IOException {\r
IpniServiceAuthorConfigurator config = (IpniServiceAuthorConfigurator)iConfig;\r
List<Person> result = new ArrayList<Person>(); \r
BufferedReader reader = new BufferedReader (new InputStreamReader(content));\r
}\r
\r
\r
- private Person getAuthorFromLine(String line, Map<Integer, String> categoryMap, ICdmApplicationDefaultConfiguration appConfig, IpniServiceAuthorConfigurator config) {\r
+ private Person getAuthorFromLine(String line, Map<Integer, String> categoryMap, ICdmApplicationConfiguration appConfig, IpniServiceAuthorConfigurator config) {\r
//Id%Version%Standard form%Default author forename%Default author surname%Taxon groups%Dates%Alternative names\r
String[] splits = line.split("%");\r
Map<String, String> valueMap = new HashMap<String, String>();\r
}\r
\r
\r
- private Reference getIpniCitation(ICdmApplicationDefaultConfiguration appConfig) {\r
+ private Reference getIpniCitation(ICdmApplicationConfiguration appConfig) {\r
Reference<?> ipniReference;\r
if (appConfig != null){\r
ipniReference = appConfig.getReferenceService().find(uuidIpni);\r
Rank rankInRangeToReturn,\r
Boolean sortByFamily,\r
IpniServiceNamesConfigurator config,\r
- ICdmApplicationDefaultConfiguration services){\r
+ ICdmApplicationConfiguration services){\r
IpniRank ipniRank = IpniRank.valueOf(rankInRangeToReturn);\r
return getNamesAdvanced(family, genus, species, infraFamily, infraGenus, infraSpecies, authorAbbrev, includePublicationAuthors, includeBasionymAuthors, publicationTitle, isAPNIRecord, isGCIRecord, isIKRecord, ipniRank, sortByFamily, config, services);\r
}\r
IpniRank rankToReturn,\r
Boolean sortByFamily,\r
IpniServiceNamesConfigurator config,\r
- ICdmApplicationDefaultConfiguration services) {\r
+ ICdmApplicationConfiguration services) {\r
\r
// find_rankToReturn=all&output_format=normal&find_sortByFamily=on&find_sortByFamily=off&query_type=by_query&back_page=plantsearch\r
\r
\r
\r
/* (non-Javadoc)\r
- * @see eu.etaxonomy.cdm.ext.IIpniService#getNamesSimple(java.lang.String, eu.etaxonomy.cdm.ext.IIpniService.DelimitedFormat, eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration)\r
+ * @see eu.etaxonomy.cdm.ext.IIpniService#getNamesSimple(java.lang.String, eu.etaxonomy.cdm.ext.IIpniService.DelimitedFormat, eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration)\r
*/\r
- public List<BotanicalName> getNamesSimple(String wholeName, ICdmApplicationDefaultConfiguration services, IpniServiceNamesConfigurator config){\r
+ public List<BotanicalName> getNamesSimple(String wholeName, ICdmApplicationConfiguration services, IpniServiceNamesConfigurator config){\r
if (config == null){\r
config = new IpniServiceNamesConfigurator();\r
}\r
}\r
\r
/* (non-Javadoc)\r
- * @see eu.etaxonomy.cdm.ext.IIpniService#getPublications(java.lang.String, java.lang.String, boolean, eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration)\r
+ * @see eu.etaxonomy.cdm.ext.IIpniService#getPublications(java.lang.String, java.lang.String, boolean, eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration)\r
*/\r
- public List<Reference> getPublications(String title, String abbreviation, ICdmApplicationDefaultConfiguration services, IpniServicePublicationConfigurator config){\r
+ public List<Reference> getPublications(String title, String abbreviation, ICdmApplicationConfiguration services, IpniServicePublicationConfigurator config){\r
// http://www.uk.ipni.org/ipni/advPublicationSearch.do?find_title=Spe*plant*&find_abbreviation=&output_format=normal&query_type=by_query&back_page=publicationsearch\r
// http://www.uk.ipni.org/ipni/advPublicationSearch.do?find_title=*Hortus+Britannicus*&find_abbreviation=&output_format=delimited-classic&output_format=delimited\r
\r
import org.junit.Ignore;\r
import org.junit.Test;\r
\r
-import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
import eu.etaxonomy.cdm.ext.ipni.IIpniService;\r
import eu.etaxonomy.cdm.model.occurrence.Collection;\r
\r
@Test\r
@Ignore // service is under refactoring \r
public void testGetCollectionsByCode(){\r
- ICdmApplicationDefaultConfiguration config = null;\r
+ ICdmApplicationConfiguration config = null;\r
List<Collection> collectionList = service1.getCollectionsByCode("BG", config);\r
//expected web service result: urn:lsid:biocol.org:col:15727 http://biocol.org/urn:lsid:biocol.org:col:15727 University of Bergen Herbarium\r
\r
import org.junit.BeforeClass;\r
import org.junit.Test;\r
\r
-import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
import eu.etaxonomy.cdm.common.UriUtils;\r
import eu.etaxonomy.cdm.ext.ipni.IIpniService;\r
import eu.etaxonomy.cdm.ext.ipni.IpniService;\r
\r
@Test\r
public void testGetAuthors(){\r
- ICdmApplicationDefaultConfiguration services = null;\r
+ ICdmApplicationConfiguration services = null;\r
IpniServiceAuthorConfigurator config = new IpniServiceAuthorConfigurator();\r
config.setFormat(DelimitedFormat.EXTENDED);\r
List<Person> authorList = service1.getAuthors(null, "Greuter", null, null, services, config);\r
\r
@Test\r
public void testGetNamesSimple(){\r
- ICdmApplicationDefaultConfiguration services = null;\r
+ ICdmApplicationConfiguration services = null;\r
IpniServiceNamesConfigurator config = null;\r
List<BotanicalName> nameList = service1.getNamesSimple("Abies albertiana", services, config);\r
//expected web service result: 3379-1%1.1%Greuter%Werner Rodolfo%Greuter%PS%1938-%>Greuter, Werner Rodolfo\r
\r
@Test\r
public void testGetNamesAdvanced(){\r
- ICdmApplicationDefaultConfiguration services = null;\r
+ ICdmApplicationConfiguration services = null;\r
IpniServiceNamesConfigurator config = new IpniServiceNamesConfigurator();\r
\r
//http://www.uk.ipni.org/ipni/advPlantNameSearch.do?find_family=&find_genus=Abies&find_species=alba&find_infrafamily=&find_infragenus=&find_infraspecies=&find_authorAbbrev=B*&find_includePublicationAuthors=on&find_includePublicationAuthors=off&find_includeBasionymAuthors=on&find_includeBasionymAuthors=off&find_publicationTitle=&find_isAPNIRecord=on&find_isAPNIRecord=false&find_isGCIRecord=on&find_isGCIRecord=false&find_isIKRecord=on&find_isIKRecord=false&find_rankToReturn=infraspec&output_format=normal&find_sortByFamily=on&find_sortByFamily=off&query_type=by_query&back_page=plantsearch\r
\r
@Test\r
public void testPublications(){\r
- ICdmApplicationDefaultConfiguration services = null;\r
+ ICdmApplicationConfiguration services = null;\r
IpniServicePublicationConfigurator config = null;\r
List<Reference> refList = service1.getPublications("Species Plantarum, Edition 3", "Sp. Pl.", services, config);\r
//20009158-1%1.2%Pinaceae%%N%Abies%%N%alba%apennina%subsp.%Brullo, Scelsi & Spamp.%%Brullo, Scelsi & Spamp.%Abies alba subsp. apennina%Vegetaz. Aspromonte%41 (2001)%2001%%%%%%Italy%tax. nov.\r
import org.springframework.core.io.ClassPathResource;\r
import org.springframework.core.io.Resource;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
import eu.etaxonomy.cdm.database.DataSourceNotFoundException;\r
import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
\r
-public class CdmIoApplicationController extends CdmApplicationDefaultController {\r
+public class CdmIoApplicationController extends CdmApplicationController {\r
@SuppressWarnings("unused")\r
private static final Logger logger = Logger.getLogger(CdmIoApplicationController.class);\r
\r
import org.apache.log4j.Logger;\r
import org.springframework.core.io.ClassPathResource;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
-import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;\r
-import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
\r
public static final String DEFAULT_IO_APPLICATION_CONTEXT_RESOURCE = "/eu/etaxonomy/cdm/defaultIoApplicationContext.xml";\r
\r
\r
- protected ICdmApplicationDefaultConfiguration cdmApp = null;\r
+ protected ICdmApplicationConfiguration cdmApp = null;\r
\r
/**\r
- * Creates a new {@link CdmApplicationDefaultController} if it does not exist yet\r
+ * Creates a new {@link CdmApplicationController} if it does not exist yet\r
* or if createNew is <ocde>true</code>\r
*\r
* @param config\r
\r
if (createNew == true || cdmApp == null) {\r
ClassPathResource applicationContextResource = new ClassPathResource(DEFAULT_IO_APPLICATION_CONTEXT_RESOURCE);\r
- cdmApp = CdmApplicationDefaultController.NewInstance(applicationContextResource, cdmSource,schemaValidation, omitTermLoading);\r
+ cdmApp = CdmApplicationController.NewInstance(applicationContextResource, cdmSource,schemaValidation, omitTermLoading);\r
if (cdmApp != null) {\r
return true;\r
} else {\r
}\r
\r
/**\r
- * Returns the {@link CdmApplicationDefaultController}. This is null if invoke()\r
+ * Returns the {@link CdmApplicationController}. This is null if invoke()\r
* has not been called yet and if the controller has not been set manually\r
* by setCdmApp() yet.\r
*\r
* @return the cdmApp\r
*/\r
- public ICdmApplicationDefaultConfiguration getCdmAppController() {\r
+ public ICdmApplicationConfiguration getCdmAppController() {\r
return this.cdmApp;\r
}\r
\r
* @param cdmApp\r
* the cdmApp to set\r
*/\r
- public void setCdmAppController(ICdmApplicationDefaultConfiguration cdmApp) {\r
+ public void setCdmAppController(ICdmApplicationConfiguration cdmApp) {\r
this.cdmApp = cdmApp;\r
}\r
\r
\r
import org.apache.log4j.Logger;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
-import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
import eu.etaxonomy.cdm.io.common.mapping.out.IExportTransformer;\r
import eu.etaxonomy.cdm.model.reference.IDatabase;\r
* Returns a new instance of <code>CdmApplicationController</code> created by the values of this configuration.\r
* @return\r
*/\r
- public ICdmApplicationDefaultConfiguration getNewCdmAppController(){\r
+ public ICdmApplicationConfiguration getNewCdmAppController(){\r
return getCdmAppController(true, false);\r
}\r
\r
* been created before a new controller is returned.\r
* @return\r
*/\r
- public ICdmApplicationDefaultConfiguration getCdmAppController(boolean createNew){\r
+ public ICdmApplicationConfiguration getCdmAppController(boolean createNew){\r
return getCdmAppController(createNew, false);\r
}\r
\r
* been created before a new controller is returned.\r
* @return\r
*/\r
- public ICdmApplicationDefaultConfiguration getCdmAppController(boolean createNew, boolean omitTermLoading){\r
+ public ICdmApplicationConfiguration getCdmAppController(boolean createNew, boolean omitTermLoading){\r
if (cdmApp == null || createNew == true){\r
- cdmApp = CdmApplicationDefaultController.NewInstance(this.getSource(), this.getDbSchemaValidation(), omitTermLoading);\r
+ cdmApp = CdmApplicationController.NewInstance(this.getSource(), this.getDbSchemaValidation(), omitTermLoading);\r
}\r
return cdmApp;\r
}\r
\r
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
-import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;\r
-import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
import eu.etaxonomy.cdm.config.Configuration;\r
import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
* Returns the CdmApplicationController\r
* @return\r
*/\r
- public ICdmApplicationDefaultConfiguration getCdmAppController();\r
+ public ICdmApplicationConfiguration getCdmAppController();\r
\r
\r
/**\r
* Sets the CdmApplicationController\r
* @param cdmApp the cdmApp to set\r
*/\r
- public void setCdmAppController(ICdmApplicationDefaultConfiguration cdmApp);\r
+ public void setCdmAppController(ICdmApplicationConfiguration cdmApp);\r
\r
/**\r
* Get the way how the CDM schema is validated\r
import org.apache.log4j.Logger;\r
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;\r
\r
-import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;\r
-import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
import eu.etaxonomy.cdm.common.monitor.NullProgressMonitor;\r
import eu.etaxonomy.cdm.config.Configuration;\r
// protected Class<ICdmIO>[] ioClassList;\r
private DbSchemaValidation dbSchemaValidation = DbSchemaValidation.VALIDATE;\r
\r
- protected ICdmApplicationDefaultConfiguration cdmApp = null;\r
+ protected ICdmApplicationConfiguration cdmApp = null;\r
\r
//authentification token\r
UsernamePasswordAuthenticationToken authenticationToken;\r
this.dbSchemaValidation = dbSchemaValidation;\r
}\r
\r
- public ICdmApplicationDefaultConfiguration getCdmAppController(){\r
+ public ICdmApplicationConfiguration getCdmAppController(){\r
return this.cdmApp;\r
}\r
\r
/**\r
* @param cdmApp the cdmApp to set\r
*/\r
- public void setCdmAppController(ICdmApplicationDefaultConfiguration cdmApp) {\r
+ public void setCdmAppController(ICdmApplicationConfiguration cdmApp) {\r
this.cdmApp = cdmApp;\r
}\r
\r
import org.apache.log4j.Logger;\r
import org.springframework.transaction.TransactionStatus;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.common.ExcelUtils;\r
import eu.etaxonomy.cdm.io.common.CdmImportBase;\r
\r
ArrayList<HashMap<String, String>> recordList = null;\r
\r
- private CdmApplicationDefaultController appCtr = null;\r
+ private CdmApplicationController appCtr = null;\r
private ExcelImportConfiguratorBase configurator = null;\r
\r
\r
}\r
\r
\r
- public CdmApplicationDefaultController getApplicationController() {\r
+ public CdmApplicationController getApplicationController() {\r
return appCtr;\r
}\r
\r
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
import eu.etaxonomy.cdm.common.UriUtils;
import eu.etaxonomy.cdm.io.specimen.SpecimenImportBase;
* @param state
*/
private void save(CdmBase cdmBase, Abcd206ImportState state) {
- ICdmApplicationDefaultConfiguration cdmRepository = state.getConfig().getCdmAppController();
+ ICdmApplicationConfiguration cdmRepository = state.getConfig().getCdmAppController();
if (cdmRepository == null){
cdmRepository = this;
}
import org.apache.log4j.Logger;\r
import org.springframework.transaction.TransactionStatus;\r
\r
-import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
import eu.etaxonomy.cdm.io.common.CdmImportBase;\r
import eu.etaxonomy.cdm.io.common.ImportStateBase;\r
\r
\r
private TransactionStatus tx;\r
\r
- private ICdmApplicationDefaultConfiguration cdmRepository; \r
+ private ICdmApplicationConfiguration cdmRepository; \r
\r
//****************** CONSTRUCTOR ***************************************************/ \r
\r
this.tx = tx;\r
}\r
\r
- public ICdmApplicationDefaultConfiguration getCdmRepository() {\r
+ public ICdmApplicationConfiguration getCdmRepository() {\r
return cdmRepository;\r
}\r
\r
- public void setCdmRepository(ICdmApplicationDefaultConfiguration cdmRepository) {\r
+ public void setCdmRepository(ICdmApplicationConfiguration cdmRepository) {\r
this.cdmRepository = cdmRepository;\r
}\r
\r
import org.jdom.Text;\r
import org.springframework.stereotype.Component;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
import eu.etaxonomy.cdm.api.service.ICommonService;\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.io.common.CdmIoBase;\r
return result;\r
}\r
\r
- public Map<Integer, Feature> fillFactCategories(IImportConfigurator config, CdmApplicationDefaultController cdmApp){\r
+ public Map<Integer, Feature> fillFactCategories(IImportConfigurator config, CdmApplicationController cdmApp){\r
logger.warn("not yet implemented");\r
Map<Integer, Feature> featureMap = new HashMap<Integer, Feature>();\r
// IDescriptionService descriptionService = cdmApp.getDescriptionService();\r
import org.apache.log4j.Logger;\r
import org.springframework.transaction.TransactionStatus;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
import eu.etaxonomy.cdm.common.AccountStore;\r
import eu.etaxonomy.cdm.database.CdmDataSource;\r
import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
return datasource;\r
}\r
\r
- public static CdmApplicationDefaultController\r
+ public static CdmApplicationController\r
initDb(ICdmDataSource db, DbSchemaValidation dbSchemaValidation, boolean omitTermLoading) {\r
\r
logger.info("Initializing database '" + db.getName() + "'");\r
\r
- CdmApplicationDefaultController appCtrInit =\r
- CdmApplicationDefaultController.NewInstance(db, dbSchemaValidation, omitTermLoading);\r
+ CdmApplicationController appCtrInit =\r
+ CdmApplicationController.NewInstance(db, dbSchemaValidation, omitTermLoading);\r
\r
return appCtrInit;\r
}\r
\r
- public static void loadTestData(String dbname, CdmApplicationDefaultController appCtr) {\r
+ public static void loadTestData(String dbname, CdmApplicationController appCtr) {\r
\r
logger.info("Loading test data into " + dbname);\r
\r
import org.apache.log4j.Logger;\r
import org.springframework.transaction.TransactionStatus;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
import eu.etaxonomy.cdm.common.AccountStore;\r
import eu.etaxonomy.cdm.database.CdmDataSource;\r
import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
\r
logger.info("Loading data from DB " + dbname);\r
\r
- CdmApplicationDefaultController appCtr = null;\r
+ CdmApplicationController appCtr = null;\r
\r
\r
String password = AccountStore.readOrStorePassword(dbname, server, username, null);\r
\r
DbSchemaValidation dbSchemaValidation = DbSchemaValidation.VALIDATE;\r
ICdmDataSource datasource = CdmDataSource.NewMySqlInstance(server, dbname, username, password);\r
- appCtr = CdmApplicationDefaultController.NewInstance(datasource, dbSchemaValidation, true);\r
+ appCtr = CdmApplicationController.NewInstance(datasource, dbSchemaValidation, true);\r
\r
\r
TransactionStatus txStatus = appCtr.startTransaction(true);\r
\r
logger.info("Loading data from DB " + dbname);\r
\r
- CdmApplicationDefaultController appCtr = null;\r
+ CdmApplicationController appCtr = null;\r
\r
\r
String password = AccountStore.readOrStorePassword(dbname, server, username, null);\r
\r
DbSchemaValidation dbSchemaValidation = DbSchemaValidation.VALIDATE;\r
ICdmDataSource datasource = CdmDataSource.NewMySqlInstance(server, dbname, username, password);\r
- appCtr = CdmApplicationDefaultController.NewInstance(datasource, dbSchemaValidation, true);\r
+ appCtr = CdmApplicationController.NewInstance(datasource, dbSchemaValidation, true);\r
\r
\r
TransactionStatus txStatus = appCtr.startTransaction(true);\r
\r
}\r
\r
- private Map<String, List<CdmBase>> retrieveAllTables_(CdmApplicationDefaultController appCtr) {\r
+ private Map<String, List<CdmBase>> retrieveAllTables_(CdmApplicationController appCtr) {\r
\r
Map<String, List<CdmBase>> tables_ = new HashMap<String, List<CdmBase>>(table_list.length);\r
\r
return tables;\r
}\r
\r
- private Map<String, List<String>> retrieveAllTables(CdmApplicationDefaultController appCtr) {\r
+ private Map<String, List<String>> retrieveAllTables(CdmApplicationController appCtr) {\r
\r
Map<String, List<String>> tables = new HashMap<String, List<String>>(table_list.length);\r
\r
\r
private void test(){\r
\r
- CdmApplicationDefaultController appCtrOne = null;\r
- CdmApplicationDefaultController appCtrTwo = null;\r
+ CdmApplicationController appCtrOne = null;\r
+ CdmApplicationController appCtrTwo = null;\r
logger.info("Comparing '" + sourceDbOne + "' and '" + sourceDbTwo + "'");\r
\r
try {\r
- appCtrOne = CdmApplicationDefaultController.NewInstance(sourceOne, DbSchemaValidation.VALIDATE, true);\r
- appCtrTwo = CdmApplicationDefaultController.NewInstance(sourceTwo, DbSchemaValidation.VALIDATE, true);\r
+ appCtrOne = CdmApplicationController.NewInstance(sourceOne, DbSchemaValidation.VALIDATE, true);\r
+ appCtrTwo = CdmApplicationController.NewInstance(sourceTwo, DbSchemaValidation.VALIDATE, true);\r
\r
} catch (Exception e) {\r
logger.error("Error creating application controller");\r
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.ModelAndView;
-import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.print.XMLHelper.EntityType;
private final JsonView xmlView;
@Autowired
- private final ICdmApplicationDefaultConfiguration applicationConfiguration;
+ private final ICdmApplicationConfiguration applicationConfiguration;
@Autowired
private JsonConfig jsonConfig;
* @param monitor
*/
protected LocalXMLEntityFactory(
- ICdmApplicationDefaultConfiguration applicationConfiguration,
+ ICdmApplicationConfiguration applicationConfiguration,
IProgressMonitor monitor) {
this.applicationConfiguration = applicationConfiguration;
this.monitor = monitor;
import org.apache.log4j.Logger;
import org.jdom.Element;
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;
-import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.common.monitor.NullProgressMonitor;
import eu.etaxonomy.cdm.print.out.IPublishOutputModule;
private static final long serialVersionUID = 4896190792717383839L;
- private ICdmApplicationDefaultConfiguration applicationConfiguration;
+ private ICdmApplicationConfiguration applicationConfiguration;
private URL webserviceUrl;
* @return
*/
public static PublishConfigurator NewLocalInstance(
- ICdmApplicationDefaultConfiguration applicationConfiguration) {
+ ICdmApplicationConfiguration applicationConfiguration) {
PublishConfigurator configurator = new PublishConfigurator();
configurator.setLocal();
configurator.setApplicationConfiguration(applicationConfiguration);
}
/**
- * The {@linkplain CdmApplicationDefaultController application controller}
+ * The {@linkplain CdmApplicationController application controller}
* associated with this instance
*
- * @return the {@link CdmApplicationDefaultController} or null if <code>this</code>
+ * @return the {@link CdmApplicationController} or null if <code>this</code>
* is a {@linkplain #isRemote() remote} instance
*/
- public ICdmApplicationDefaultConfiguration getApplicationConfiguration() {
+ public ICdmApplicationConfiguration getApplicationConfiguration() {
return applicationConfiguration;
}
* @param applicationConfiguration
*/
private void setApplicationConfiguration(
- ICdmApplicationDefaultConfiguration applicationConfiguration) {
+ ICdmApplicationConfiguration applicationConfiguration) {
this.applicationConfiguration = applicationConfiguration;
}
import org.springframework.core.io.ClassPathResource;\r
import org.springframework.core.io.Resource;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
-import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
import eu.etaxonomy.cdm.common.AccountStore;\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.common.monitor.DefaultProgressMonitor;\r
//Connecting to a CDMDataSource\r
///Resource resource = new ClassPathResource(CdmDefaultIOBase.DEFAULT_IO_APPLICATION_CONTEXT_RESOURCE);\r
Resource resource = new ClassPathResource(DEFAULT_PRINT_APPLICATION_CONTEXT_RESOURCE);\r
- ICdmApplicationDefaultConfiguration app = CdmIoApplicationController.NewInstance(resource, dataSource, DbSchemaValidation.VALIDATE, false, progressMonitor);\r
- //ICdmApplicationDefaultConfiguration app = CdmApplicationController.NewInstance(resource, dataSource, DbSchemaValidation.VALIDATE, false, progressMonitor);\r
+ ICdmApplicationConfiguration app = CdmIoApplicationController.NewInstance(resource, dataSource, DbSchemaValidation.VALIDATE, false, progressMonitor);\r
+ //ICdmApplicationConfiguration app = CdmApplicationController.NewInstance(resource, dataSource, DbSchemaValidation.VALIDATE, false, progressMonitor);\r
//configurator = PublishConfigurator.NewLocalInstance(CdmStore.getCurrentApplicationConfiguration());//from taxeditor GeneratePdfHandler\r
configurator = PublishConfigurator.NewLocalInstance(app);\r
\r
import org.apache.log4j.Logger;\r
import org.springframework.core.io.ClassPathResource;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
import eu.etaxonomy.cdm.api.service.DistributionTree;\r
import eu.etaxonomy.cdm.common.AccountStore;\r
import eu.etaxonomy.cdm.database.CdmDataSource;\r
\r
String resourceStr = "/eu/etaxonomy/cdm/remote.xml";\r
ClassPathResource applicationContextResource = new ClassPathResource(resourceStr);\r
- CdmApplicationDefaultController appCtr = CdmApplicationDefaultController.NewInstance(applicationContextResource, dataSource, schema, false);\r
+ CdmApplicationController appCtr = CdmApplicationController.NewInstance(applicationContextResource, dataSource, schema, false);\r
\r
// insertSomeData(appCtr);\r
// deleteHighLevelNode(appCtr); //->problem with Duplicate Key in Classification_TaxonNode\r
appCtr.close();\r
}\r
\r
- private void testDistributionTree(CdmApplicationDefaultController appCtr) {\r
+ private void testDistributionTree(CdmApplicationController appCtr) {\r
DescriptionPortalController ctl = (DescriptionPortalController)appCtr.getBean("descriptionPortalController");\r
HttpServletRequest request = null;\r
HttpServletResponse response = new HttpServletResponseWrapper(null);\r
+++ /dev/null
-// $Id: CdmApplicationDefaultConfiguration.java 19705 2013-12-12 14:38:11Z c.mathew $
-/**
-* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-
-package eu.etaxonomy.cdm.api.application;
-
-import org.apache.log4j.Logger;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.security.authentication.ProviderManager;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Component;
-
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolderMock;
-import eu.etaxonomy.cdm.api.service.IAgentService;
-import eu.etaxonomy.cdm.api.service.IClassificationService;
-import eu.etaxonomy.cdm.api.service.ICollectionService;
-import eu.etaxonomy.cdm.api.service.ICommonService;
-import eu.etaxonomy.cdm.api.service.IDatabaseService;
-import eu.etaxonomy.cdm.api.service.IDescriptionService;
-import eu.etaxonomy.cdm.api.service.IFeatureNodeService;
-import eu.etaxonomy.cdm.api.service.IFeatureTreeService;
-import eu.etaxonomy.cdm.api.service.IGrantedAuthorityService;
-import eu.etaxonomy.cdm.api.service.IGroupService;
-import eu.etaxonomy.cdm.api.service.IIdentificationKeyService;
-import eu.etaxonomy.cdm.api.service.ILocationService;
-import eu.etaxonomy.cdm.api.service.IMediaService;
-import eu.etaxonomy.cdm.api.service.INameService;
-import eu.etaxonomy.cdm.api.service.IOccurrenceService;
-import eu.etaxonomy.cdm.api.service.IPolytomousKeyNodeService;
-import eu.etaxonomy.cdm.api.service.IPolytomousKeyService;
-import eu.etaxonomy.cdm.api.service.IReferenceService;
-import eu.etaxonomy.cdm.api.service.IService;
-import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
-import eu.etaxonomy.cdm.api.service.ITaxonService;
-import eu.etaxonomy.cdm.api.service.ITermService;
-import eu.etaxonomy.cdm.api.service.IUserService;
-import eu.etaxonomy.cdm.api.service.IVocabularyService;
-import eu.etaxonomy.cdm.api.service.IWorkingSetService;
-import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.persistence.hibernate.permission.ICdmPermissionEvaluator;
-
-
-/**
- * @author a.mueller
- * @created 21.05.2008
- * @version 1.0
- */
-@Component
-public class CdmApplicationConfiguration implements ICdmApplicationConfiguration, ApplicationContextAware {
- @SuppressWarnings("unused")
- private static final Logger logger = Logger.getLogger(CdmApplicationConfiguration.class);
-
- @Autowired
- private INameService nameService;
- @Autowired
- private ITaxonService taxonService;
- @Autowired
- private IClassificationService classificationService;
- @Autowired
- private IReferenceService referenceService;
- @Autowired
- private IAgentService agentService;
- @Autowired
- private ITermService termService;
- @Autowired
- private IDescriptionService descriptionService;
- @Autowired
- private IOccurrenceService occurrenceService;
- @Autowired
- private IMediaService mediaService;
- @Autowired
- private ICommonService commonService;
- @Autowired
- private ILocationService locationService;
- @Autowired
- private IUserService userService;
- @Autowired
- private IGroupService groupService;
- @Autowired
- private ICollectionService collectionService;
- @Autowired
- private IFeatureTreeService featureTreeService;
- @Autowired
- private IFeatureNodeService featureNodeService;
- @Autowired
- private IVocabularyService vocabularyService;
- @Autowired
- private ITaxonNodeService taxonNodeService;
- @Autowired
- private IIdentificationKeyService identificationKeyService;
- @Autowired
- private IPolytomousKeyService polytomousKeyService;
- @Autowired
- private IPolytomousKeyNodeService polytomousKeyNodeService;
- @Autowired
- private IGrantedAuthorityService grantedAuthorityService;
-
- private IService<CdmBase> mainService;
-
- @Autowired
- private IWorkingSetService workingSetService;
- @Autowired
- private ProviderManager authenticationManager;
- @Autowired
- private ICdmPermissionEvaluator permissionEvaluator;
-
- protected ApplicationContext applicationContext;
-
- /**
- *
- */
- public CdmApplicationConfiguration() {
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getAgentService()
- */
- public IAgentService getAgentService() {
- return this.agentService;
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getNameService()
- */
- public INameService getNameService() {
- return this.nameService;
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getReferenceService()
- */
- public IReferenceService getReferenceService() {
- return this.referenceService;
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getTaxonService()
- */
- public ITaxonService getTaxonService() {
- return this.taxonService;
- }
-
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getClassificationService()
- */
- public IClassificationService getClassificationService() {
- return this.classificationService;
- }
-
- public ITaxonNodeService getTaxonNodeService(){
- return this.taxonNodeService;
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getDescriptionService()
- */
- public IDescriptionService getDescriptionService(){
- return this.descriptionService;
- }
-
- /*
- * (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getOccurrenceService()
- */
- public IOccurrenceService getOccurrenceService(){
- return this.occurrenceService;
- }
-
- /*
- * (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getMediaService()
- */
- public IMediaService getMediaService(){
- return this.mediaService;
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getTermService()
- */
- public ITermService getTermService() {
- return this.termService;
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getCommonService()
- */
- public ICommonService getCommonService(){
- return this.commonService;
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getLocationService()
- */
- public ILocationService getLocationService() {
- return this.locationService;
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getUserService()
- */
- public IUserService getUserService() {
- return this.userService;
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getCommonService()
- */
- public IService<CdmBase> getMainService(){
- return this.mainService;
- }
-
- /*
- * (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getCollectionService()
- */
- public ICollectionService getCollectionService() {
- return collectionService;
- }
-
- /*
- * (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getFeatureTreeService()
- */
- public IFeatureTreeService getFeatureTreeService() {
- return featureTreeService;
- }
-
- /*
- * (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getFeatureNodeService()
- */
- public IFeatureNodeService getFeatureNodeService(){
- return featureNodeService;
- }
-
- /*
- * (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getVocabularyService()
- */
- public IVocabularyService getVocabularyService() {
- return vocabularyService;
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getIdentificationKeyService()
- */
- public IIdentificationKeyService getIdentificationKeyService(){
- return identificationKeyService;
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getPolytomousKeyService()
- */
- public IPolytomousKeyService getPolytomousKeyService(){
- return polytomousKeyService;
- }
-
- public IPolytomousKeyNodeService getPolytomousKeyNodeService(){
- return polytomousKeyNodeService;
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getWorkingSetService()
- */
- @Override
- public IWorkingSetService getWorkingSetService() {
- return workingSetService;
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getGroupService()
- */
- @Override
- public IGroupService getGroupService() {
- return groupService;
- }
-
-
- @Override
- public ProviderManager getAuthenticationManager() {
- return authenticationManager;
- }
-
- /* (non-Javadoc)
- * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
- */
- @Override
- public void setApplicationContext(ApplicationContext applicationContext)
- throws BeansException {
- this.applicationContext = applicationContext;
- }
-
-
- @Override
- public final Object getBean(String name){
- return this.applicationContext.getBean(name);
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#authenticate(java.lang.String, java.lang.String)
- */
- @Override
- public void authenticate(String username, String password){
- UsernamePasswordAuthenticationToken tokenForUser = new UsernamePasswordAuthenticationToken(username, password);
- Authentication authentication = this.getAuthenticationManager().authenticate(tokenForUser);
- SecurityContext context = SecurityContextHolder.getContext();
- context.setAuthentication(authentication);
- }
-
- @Override
- public IGrantedAuthorityService getGrantedAuthorityService() {
- return this.grantedAuthorityService;
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getPermissionEvaluator()
- */
- @Override
- public ICdmPermissionEvaluator getPermissionEvaluator() {
- return permissionEvaluator;
- }
-
- @Override
- public ConversationHolder NewConversation() {
- // TODO Auto-generated method stub
- return null;
- }
-}
* @author a.mueller\r
*\r
*/\r
-public class CdmApplicationDefaultController implements ICdmApplicationDefaultConfiguration {\r
- private static final Logger logger = Logger.getLogger(CdmApplicationDefaultController.class);\r
+public class CdmApplicationController implements ICdmApplicationConfiguration{\r
+ private static final Logger logger = Logger.getLogger(CdmApplicationController.class);\r
\r
public static final String DEFAULT_APPLICATION_CONTEXT_RESOURCE = "/eu/etaxonomy/cdm/defaultApplicationContext.xml";\r
\r
public AbstractApplicationContext applicationContext;\r
- private ICdmApplicationDefaultConfiguration configuration;\r
+ private ICdmApplicationConfiguration configuration;\r
private Resource applicationContextResource;\r
\r
private IProgressMonitor progressMonitor;\r
* Constructor, opens a spring ApplicationContext by using the default data source\r
* @throws DataSourceNotFoundException\r
*/\r
- public static CdmApplicationDefaultController NewInstance() throws DataSourceNotFoundException {\r
+ public static CdmApplicationController NewInstance() throws DataSourceNotFoundException {\r
logger.info("Start CdmApplicationController with default data source");\r
CdmPersistentDataSource dataSource = getDefaultDatasource();\r
DbSchemaValidation dbSchemaValidation = defaultDbSchemaValidation;\r
- return CdmApplicationDefaultController.NewInstance(null, dataSource, dbSchemaValidation, false);\r
+ return CdmApplicationController.NewInstance(null, dataSource, dbSchemaValidation, false);\r
}\r
\r
/**\r
* @param dbSchemaValidation validation type for database schema\r
* @throws DataSourceNotFoundException\r
*/\r
- public static CdmApplicationDefaultController NewInstance(DbSchemaValidation dbSchemaValidation) throws DataSourceNotFoundException {\r
+ public static CdmApplicationController NewInstance(DbSchemaValidation dbSchemaValidation) throws DataSourceNotFoundException {\r
logger.info("Start CdmApplicationController with default data source");\r
CdmPersistentDataSource dataSource = getDefaultDatasource();\r
- return CdmApplicationDefaultController.NewInstance(null, dataSource, dbSchemaValidation, false);\r
+ return CdmApplicationController.NewInstance(null, dataSource, dbSchemaValidation, false);\r
}\r
\r
\r
* default database schema validation type\r
* @param dataSource\r
*/\r
- public static CdmApplicationDefaultController NewInstance(ICdmDataSource dataSource) {\r
- return CdmApplicationDefaultController.NewInstance(null, dataSource, defaultDbSchemaValidation, false);\r
+ public static CdmApplicationController NewInstance(ICdmDataSource dataSource) {\r
+ return CdmApplicationController.NewInstance(null, dataSource, defaultDbSchemaValidation, false);\r
}\r
\r
- public static CdmApplicationDefaultController NewInstance(ICdmDataSource dataSource, DbSchemaValidation dbSchemaValidation) {\r
- return CdmApplicationDefaultController.NewInstance(null, dataSource, dbSchemaValidation, false);\r
+ public static CdmApplicationController NewInstance(ICdmDataSource dataSource, DbSchemaValidation dbSchemaValidation) {\r
+ return CdmApplicationController.NewInstance(null, dataSource, dbSchemaValidation, false);\r
}\r
\r
- public static CdmApplicationDefaultController NewInstance(ICdmDataSource dataSource, DbSchemaValidation dbSchemaValidation, boolean omitTermLoading) {\r
- return CdmApplicationDefaultController.NewInstance(null, dataSource, dbSchemaValidation, omitTermLoading);\r
+ public static CdmApplicationController NewInstance(ICdmDataSource dataSource, DbSchemaValidation dbSchemaValidation, boolean omitTermLoading) {\r
+ return CdmApplicationController.NewInstance(null, dataSource, dbSchemaValidation, omitTermLoading);\r
}\r
\r
- public static CdmApplicationDefaultController NewInstance(Resource applicationContextResource, ICdmDataSource dataSource, DbSchemaValidation dbSchemaValidation, boolean omitTermLoading) {\r
- return CdmApplicationDefaultController.NewInstance(applicationContextResource, dataSource, dbSchemaValidation, omitTermLoading, null);\r
+ public static CdmApplicationController NewInstance(Resource applicationContextResource, ICdmDataSource dataSource, DbSchemaValidation dbSchemaValidation, boolean omitTermLoading) {\r
+ return CdmApplicationController.NewInstance(applicationContextResource, dataSource, dbSchemaValidation, omitTermLoading, null);\r
}\r
\r
- public static CdmApplicationDefaultController NewInstance(Resource applicationContextResource, ICdmDataSource dataSource, DbSchemaValidation dbSchemaValidation, boolean omitTermLoading, IProgressMonitor progressMonitor) {\r
- return new CdmApplicationDefaultController(applicationContextResource, dataSource, dbSchemaValidation, omitTermLoading, progressMonitor, null);\r
+ public static CdmApplicationController NewInstance(Resource applicationContextResource, ICdmDataSource dataSource, DbSchemaValidation dbSchemaValidation, boolean omitTermLoading, IProgressMonitor progressMonitor) {\r
+ return new CdmApplicationController(applicationContextResource, dataSource, dbSchemaValidation, omitTermLoading, progressMonitor, null);\r
}\r
\r
//TODO discuss need for listeners before commit to trunk\r
* @param dbSchemaValidation\r
* @param omitTermLoading\r
*/\r
- protected CdmApplication
DefaultController(Resource applicationContextResource, ICdmDataSource dataSource, DbSchemaValidation dbSchemaValidation, boolean omitTermLoading, IProgressMonitor progressMonitor, List<ApplicationListener> listeners){
\r+ protected CdmApplicationController(Resource applicationContextResource, ICdmDataSource dataSource, DbSchemaValidation dbSchemaValidation, boolean omitTermLoading, IProgressMonitor progressMonitor, List<ApplicationListener> listeners){\r
logger.info("Start CdmApplicationController with datasource: " + dataSource.getName());\r
\r
if (dbSchemaValidation == null){\r
logger.info(beanName);\r
}\r
}\r
- configuration = (ICdmApplicationDefaultConfiguration) applicationContext.getBean("cdmApplicationDefaultConfiguration");\r
+ configuration = (ICdmApplicationConfiguration)applicationContext.getBean("cdmApplicationDefaultConfiguration");\r
getDatabaseService().setApplicationController(this);\r
}\r
\r
\r
import org.apache.log4j.Logger;\r
import org.hibernate.SessionFactory;\r
+import org.springframework.beans.BeansException;\r
import org.springframework.beans.factory.annotation.Autowired;\r
+import org.springframework.context.ApplicationContext;\r
import org.springframework.context.ApplicationContextAware;\r
import org.springframework.orm.hibernate4.HibernateTransactionManager;\r
+import org.springframework.security.authentication.ProviderManager;\r
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;\r
+import org.springframework.security.core.Authentication;\r
+import org.springframework.security.core.context.SecurityContext;\r
+import org.springframework.security.core.context.SecurityContextHolder;\r
import org.springframework.stereotype.Component;\r
import org.springframework.transaction.PlatformTransactionManager;\r
import org.springframework.transaction.TransactionDefinition;\r
import org.springframework.transaction.support.DefaultTransactionDefinition;\r
\r
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
+import eu.etaxonomy.cdm.api.service.IAgentService;\r
+import eu.etaxonomy.cdm.api.service.IClassificationService;\r
+import eu.etaxonomy.cdm.api.service.ICollectionService;\r
+import eu.etaxonomy.cdm.api.service.ICommonService;\r
import eu.etaxonomy.cdm.api.service.IDatabaseService;\r
+import eu.etaxonomy.cdm.api.service.IDescriptionService;\r
+import eu.etaxonomy.cdm.api.service.IFeatureNodeService;\r
+import eu.etaxonomy.cdm.api.service.IFeatureTreeService;\r
+import eu.etaxonomy.cdm.api.service.IGrantedAuthorityService;\r
+import eu.etaxonomy.cdm.api.service.IGroupService;\r
+import eu.etaxonomy.cdm.api.service.IIdentificationKeyService;\r
+import eu.etaxonomy.cdm.api.service.ILocationService;\r
+import eu.etaxonomy.cdm.api.service.IMediaService;\r
import eu.etaxonomy.cdm.api.service.INameService;\r
+import eu.etaxonomy.cdm.api.service.IOccurrenceService;\r
+import eu.etaxonomy.cdm.api.service.IPolytomousKeyNodeService;\r
+import eu.etaxonomy.cdm.api.service.IPolytomousKeyService;\r
+import eu.etaxonomy.cdm.api.service.IReferenceService;\r
+import eu.etaxonomy.cdm.api.service.IService;\r
+import eu.etaxonomy.cdm.api.service.ITaxonNodeService;\r
+import eu.etaxonomy.cdm.api.service.ITaxonService;\r
+import eu.etaxonomy.cdm.api.service.ITermService;\r
+import eu.etaxonomy.cdm.api.service.IUserService;\r
+import eu.etaxonomy.cdm.api.service.IVocabularyService;\r
+import eu.etaxonomy.cdm.api.service.IWorkingSetService;\r
+import eu.etaxonomy.cdm.model.common.CdmBase;\r
+import eu.etaxonomy.cdm.persistence.hibernate.permission.ICdmPermissionEvaluator;\r
\r
/**\r
* @author a.mueller\r
* @version 1.0\r
*/\r
@Component\r
-public class CdmApplicationDefaultConfiguration extends CdmApplicationConfiguration implements ICdmApplicationDefaultConfiguration, ApplicationContextAware {\r
+public class CdmApplicationDefaultConfiguration implements ICdmApplicationConfiguration, ApplicationContextAware {\r
private static final Logger logger = Logger.getLogger(CdmApplicationDefaultConfiguration.class);\r
\r
- @Autowired\r
- private IDatabaseService databaseService;\r
- \r
+ protected ApplicationContext applicationContext;\r
+\r
+\r
+ @Autowired\r
+ //@Qualifier("nameService")\r
+ private INameService nameService;\r
+ @Autowired\r
+ //@Qualifier("taxonService")\r
+ private ITaxonService taxonService;\r
+ @Autowired\r
+ //@Qualifier("classificationService")\r
+ private IClassificationService classificationService;\r
+ @Autowired\r
+ //@Qualifier("referenceService")\r
+ private IReferenceService referenceService;\r
+ @Autowired\r
+ //@Qualifier("agentService")\r
+ private IAgentService agentService;\r
+ @Autowired\r
+ //@Qualifier("databaseService")\r
+ private IDatabaseService databaseService;\r
+ @Autowired\r
+ //@Qualifier("termService")\r
+ private ITermService termService;\r
+ @Autowired\r
+ private HibernateTransactionManager transactionManager;\r
+ @Autowired\r
+ //@Qualifier("descriptionService")\r
+ private IDescriptionService descriptionService;\r
+ @Autowired\r
+ //@Qualifier("occurrenceService")\r
+ private IOccurrenceService occurrenceService;\r
+ @Autowired\r
+ //@Qualifier("mediaService")\r
+ private IMediaService mediaService;\r
+ @Autowired\r
+ //@Qualifier("commonService")\r
+ private ICommonService commonService;\r
+ @Autowired\r
+ private ILocationService locationService;\r
@Autowired\r
private SessionFactory sessionFactory;\r
-\r
@Autowired\r
private DataSource dataSource;\r
+ @Autowired\r
+ private ProviderManager authenticationManager;\r
+ @Autowired\r
+ private IUserService userService;\r
+ @Autowired\r
+ private IGrantedAuthorityService grantedAuthorityService;\r
+ @Autowired\r
+ private IGroupService groupService;\r
+ @Autowired\r
+ private ICollectionService collectionService;\r
+ @Autowired\r
+ private IFeatureTreeService featureTreeService;\r
+ @Autowired\r
+ private IFeatureNodeService featureNodeService;\r
+ @Autowired\r
+ private IVocabularyService vocabularyService;\r
+ @Autowired\r
+ private ITaxonNodeService taxonNodeService;\r
+ @Autowired\r
+ private IIdentificationKeyService identificationKeyService;\r
+ @Autowired\r
+ private IPolytomousKeyService polytomousKeyService;\r
+ @Autowired\r
+ private IPolytomousKeyNodeService polytomousKeyNodeService;\r
+ @Autowired\r
+ private ICdmPermissionEvaluator permissionEvaluator;\r
+\r
+\r
+// @Autowired\r
+ //@Qualifier("mainService")\r
+ private IService<CdmBase> mainService;\r
\r
@Autowired\r
- private HibernateTransactionManager transactionManager;\r
+ private IWorkingSetService workingSetService;\r
\r
- \r
- /**\r
- * \r
- */\r
- public CdmApplicationDefaultConfiguration() {\r
- }\r
- \r
- \r
+//********************** CONSTRUCTOR *********************************************************/\r
+\r
+ /**\r
+ * Constructor\r
+ */\r
+ protected CdmApplicationDefaultConfiguration() {\r
+ }\r
\r
- @Override\r
- public IDatabaseService getDatabaseService() {\r
- return this.databaseService;\r
- }\r
+// ****************************** APPLICATION CONTEXT *************************************************/\r
\r
- \r
+\r
+ /* (non-Javadoc)\r
+ * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)\r
+ */\r
+ @Override\r
+ public void setApplicationContext(ApplicationContext applicationContext)\r
+ throws BeansException {\r
+ this.applicationContext = applicationContext;\r
+ }\r
+\r
+// ****************************** GETTER *************************************************/\r
+\r
+\r
+ @Override\r
+ public final Object getBean(String name){\r
+ return this.applicationContext.getBean(name);\r
+ }\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getAgentService()\r
+ */\r
+ @Override\r
+ public IAgentService getAgentService() {\r
+ return this.agentService;\r
+ }\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getDatabaseService()\r
+ */\r
+ @Override\r
+ public IDatabaseService getDatabaseService() {\r
+ return this.databaseService;\r
+ }\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getNameService()\r
+ */\r
+ @Override\r
+ public INameService getNameService() {\r
+ return this.nameService;\r
+ }\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getReferenceService()\r
+ */\r
+ @Override\r
+ public IReferenceService getReferenceService() {\r
+ return this.referenceService;\r
+ }\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getTaxonService()\r
+ */\r
+ @Override\r
+ public ITaxonService getTaxonService() {\r
+ return this.taxonService;\r
+ }\r
+\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getClassificationService()\r
+ */\r
+ @Override\r
+ public IClassificationService getClassificationService() {\r
+ return this.classificationService;\r
+ }\r
+\r
+ @Override\r
+ public ITaxonNodeService getTaxonNodeService(){\r
+ return this.taxonNodeService;\r
+ }\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getDescriptionService()\r
+ */\r
+ @Override\r
+ public IDescriptionService getDescriptionService(){\r
+ return this.descriptionService;\r
+ }\r
+\r
+ /*\r
+ * (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getOccurrenceService()\r
+ */\r
+ @Override\r
+ public IOccurrenceService getOccurrenceService(){\r
+ return this.occurrenceService;\r
+ }\r
+\r
+ /*\r
+ * (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getMediaService()\r
+ */\r
+ @Override\r
+ public IMediaService getMediaService(){\r
+ return this.mediaService;\r
+ }\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getTermService()\r
+ */\r
+ @Override\r
+ public ITermService getTermService() {\r
+ return this.termService;\r
+ }\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getCommonService()\r
+ */\r
+ @Override\r
+ public ICommonService getCommonService(){\r
+ return this.commonService;\r
+ }\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getLocationService()\r
+ */\r
+ @Override\r
+ public ILocationService getLocationService() {\r
+ return this.locationService;\r
+ }\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getUserService()\r
+ */\r
+ @Override\r
+ public IUserService getUserService() {\r
+ return this.userService;\r
+ }\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getUserService()\r
+ */\r
+ @Override\r
+ public IGrantedAuthorityService getGrantedAuthorityService() {\r
+ return this.grantedAuthorityService;\r
+ }\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getCommonService()\r
+ */\r
+ @Override\r
+ public IService<CdmBase> getMainService(){\r
+ return this.mainService;\r
+ }\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getTransactionManager()\r
+ */\r
@Override\r
public PlatformTransactionManager getTransactionManager() {\r
return this.transactionManager;\r
}\r
\r
+ /*\r
+ * (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getAuthenticationManager()\r
+ */\r
+ @Override\r
+ public ProviderManager getAuthenticationManager() {\r
+ return this.authenticationManager;\r
+ }\r
+\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#NewConversation()\r
+ */\r
+ @Override\r
+ public ConversationHolder NewConversation() {\r
+ // TODO make this a prototype\r
+ return new ConversationHolder(dataSource, sessionFactory, transactionManager);\r
+ }\r
+\r
+ /*\r
+ * (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getCollectionService()\r
+ */\r
+ @Override\r
+ public ICollectionService getCollectionService() {\r
+ return collectionService;\r
+ }\r
+\r
+ /*\r
+ * (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getFeatureTreeService()\r
+ */\r
+ @Override\r
+ public IFeatureTreeService getFeatureTreeService() {\r
+ return featureTreeService;\r
+ }\r
+\r
+ /*\r
+ * (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getFeatureNodeService()\r
+ */\r
+ @Override\r
+ public IFeatureNodeService getFeatureNodeService(){\r
+ return featureNodeService;\r
+ }\r
+\r
+ /*\r
+ * (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getVocabularyService()\r
+ */\r
+ @Override\r
+ public IVocabularyService getVocabularyService() {\r
+ return vocabularyService;\r
+ }\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getIdentificationKeyService()\r
+ */\r
+ @Override\r
+ public IIdentificationKeyService getIdentificationKeyService(){\r
+ return identificationKeyService;\r
+ }\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getPolytomousKeyService()\r
+ */\r
+ @Override\r
+ public IPolytomousKeyService getPolytomousKeyService(){\r
+ return polytomousKeyService;\r
+ }\r
+\r
+ @Override\r
+ public IPolytomousKeyNodeService getPolytomousKeyNodeService(){\r
+ return polytomousKeyNodeService;\r
+ }\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getWorkingSetService()\r
+ */\r
+ @Override\r
+ public IWorkingSetService getWorkingSetService() {\r
+ return workingSetService;\r
+ }\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getGroupService()\r
+ */\r
+ @Override\r
+ public IGroupService getGroupService() {\r
+ return groupService;\r
+ }\r
+\r
+\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getPermissionEvaluator()\r
+ */\r
+ @Override\r
+ public ICdmPermissionEvaluator getPermissionEvaluator() {\r
+ return permissionEvaluator;\r
+ }\r
\r
/* (non-Javadoc)\r
* @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#startTransaction()\r
return;\r
}\r
\r
- @Override\r
- public ConversationHolder NewConversation() {\r
- return new ConversationHolder(dataSource, sessionFactory, transactionManager);\r
\r
- }\r
+ /* (non-Javadoc)\r
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#authenticate(java.lang.String, java.lang.String)\r
+ */\r
+ @Override\r
+ public void authenticate(String username, String password){\r
+ UsernamePasswordAuthenticationToken tokenForUser = new UsernamePasswordAuthenticationToken(username, password);\r
+ Authentication authentication = this.getAuthenticationManager().authenticate(tokenForUser);\r
+ SecurityContext context = SecurityContextHolder.getContext();\r
+ context.setAuthentication(authentication);\r
+ }\r
+\r
\r
\r
}\r
package eu.etaxonomy.cdm.api.application;\r
\r
import org.springframework.security.authentication.ProviderManager;\r
+import org.springframework.transaction.PlatformTransactionManager;\r
+import org.springframework.transaction.TransactionStatus;\r
\r
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
import eu.etaxonomy.cdm.api.service.IAgentService;\r
*/\r
public interface ICdmApplicationConfiguration {\r
\r
+ public TransactionStatus startTransaction();\r
\r
+ public TransactionStatus startTransaction(Boolean readOnly);\r
+\r
+ public void commitTransaction(TransactionStatus tx);\r
\r
public Object getBean(String string);\r
\r
*/\r
public IMediaService getMediaService();\r
\r
-\r
+ /**\r
+ * @return\r
+ */\r
+ public IDatabaseService getDatabaseService();\r
\r
/**\r
* @return\r
*/\r
public IWorkingSetService getWorkingSetService();\r
\r
+ /**\r
+ * @return\r
+ */\r
+ public PlatformTransactionManager getTransactionManager();\r
+\r
\r
/**\r
*\r
*/\r
public ProviderManager getAuthenticationManager();\r
\r
+ /**\r
+ * @return\r
+ */\r
+ public ConversationHolder NewConversation();\r
+\r
/**\r
*\r
* @return\r
*/\r
public ICdmPermissionEvaluator getPermissionEvaluator();\r
\r
- void authenticate(String username, String password);\r
+ void authenticate(String username, String password);\r
\r
\r
- public ConversationHolder NewConversation();\r
\r
}\r
+++ /dev/null
-/**\r
- * \r
- */\r
-package eu.etaxonomy.cdm.api.application;\r
-\r
-import org.springframework.transaction.PlatformTransactionManager;\r
-import org.springframework.transaction.TransactionStatus;\r
-\r
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
-import eu.etaxonomy.cdm.api.service.IDatabaseService;\r
-\r
-/**\r
- * @author j.koch\r
- *\r
- */\r
-public interface ICdmApplicationDefaultConfiguration extends ICdmApplicationConfiguration {\r
-\r
- \r
- public IDatabaseService getDatabaseService();\r
- \r
- public TransactionStatus startTransaction();\r
-\r
- public TransactionStatus startTransaction(Boolean readOnly);\r
-\r
- public void commitTransaction(TransactionStatus tx);\r
- \r
- public PlatformTransactionManager getTransactionManager();\r
-\r
- public ConversationHolder NewConversation();\r
-}\r
*/\r
public class MonitoredGenericApplicationContext extends GenericApplicationContext{\r
@SuppressWarnings("unused")\r
- private static final Logger logger = Logger.getLogger(CdmApplicationDefaultController.class);\r
+ private static final Logger logger = Logger.getLogger(CdmApplicationController.class);\r
\r
final int countInvokeBeanFactoryPostProcessors = 10;\r
final int countFinishBeanFactoryInitialization = 90;\r
import org.springframework.stereotype.Service;\r
import org.springframework.transaction.annotation.Transactional;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
import eu.etaxonomy.cdm.database.CdmDataSource;\r
import eu.etaxonomy.cdm.database.CdmPersistentDataSource;\r
import eu.etaxonomy.cdm.database.DataSourceNotFoundException;\r
@Autowired\r
protected ApplicationContext appContext;\r
\r
- private CdmApplicationDefaultController application;\r
- public void setApplicationController(CdmApplicationDefaultController cdmApplicationController){\r
+ private CdmApplicationController application;\r
+ public void setApplicationController(CdmApplicationController cdmApplicationController){\r
this.application = cdmApplicationController;\r
}\r
\r
\r
package eu.etaxonomy.cdm.api.service;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
import eu.etaxonomy.cdm.database.CdmPersistentDataSource;\r
import eu.etaxonomy.cdm.database.DataSourceNotFoundException;\r
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;\r
*/\r
public CdmPersistentDataSource updateDataSource(String strDataSourceName, CdmPersistentDataSource dataSource) throws DataSourceNotFoundException;\r
\r
- public void setApplicationController(CdmApplicationDefaultController cdmApplicationController);\r
+ public void setApplicationController(CdmApplicationController cdmApplicationController);\r
}
\ No newline at end of file
import org.apache.log4j.Logger;
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IDescriptionService;
import eu.etaxonomy.cdm.common.AccountStore;
*/
public static void main(String[] args) throws DataSourceNotFoundException, TermNotFoundException {
- CdmApplicationDefaultController applicationController = CdmApplicationDefaultController.NewInstance(dataSource());
+ CdmApplicationController applicationController = CdmApplicationController.NewInstance(dataSource());
ConversationHolder conversation = applicationController.NewConversation();
conversation.startTransaction();
*/\r
package eu.etaxonomy.cdm.test.example;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
import eu.etaxonomy.cdm.common.AccountStore;\r
import eu.etaxonomy.cdm.database.CdmDataSource;\r
\r
/**\r
* This is an example class to show how to connect to a CDM Database via a\r
- * {@link CdmApplicationDefaultController}. Please don't change this file. Rather\r
+ * {@link CdmApplicationController}. Please don't change this file. Rather\r
* copy&paste it to use it for your own purposes.\r
* \r
* @author a.mueller\r
String username = "sa";\r
ICdmDataSource dataSource = CdmDataSource.NewH2EmbeddedInstance(database, username, "sa", NomenclaturalCode.ICNAFP);\r
\r
- ICdmApplicationConfiguration app = CdmApplicationDefaultController.NewInstance(dataSource, schemaValidation);\r
+ ICdmApplicationConfiguration app = CdmApplicationController.NewInstance(dataSource, schemaValidation);\r
Taxon taxon = Taxon.NewInstance(null, null);\r
app.getTaxonService().save(taxon);\r
}\r
//password will be asked for in console and stored in your home directory\r
ICdmDataSource dataSource = CdmDataSource.NewMySqlInstance(server, database, username, AccountStore.readOrStorePassword(server, database, username, null));\r
\r
- ICdmApplicationConfiguration app = CdmApplicationDefaultController.NewInstance(dataSource, schemaValidation);\r
+ ICdmApplicationConfiguration app = CdmApplicationController.NewInstance(dataSource, schemaValidation);\r
Taxon taxon = Taxon.NewInstance(null, null);\r
app.getTaxonService().save(taxon);\r
}\r
import org.hibernate.Session;\r
import org.springframework.transaction.TransactionStatus;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
import eu.etaxonomy.cdm.api.application.CdmApplicationUtils;\r
import eu.etaxonomy.cdm.api.service.ITaxonNodeService;\r
import eu.etaxonomy.cdm.api.service.ITaxonService;\r
}\r
\r
//CdmPersistentDataSource.save(dataSource.getName(), dataSource);\r
- CdmApplicationDefaultController appCtr;\r
- appCtr = CdmApplicationDefaultController.NewInstance(dataSource,schema);\r
+ CdmApplicationController appCtr;\r
+ appCtr = CdmApplicationController.NewInstance(dataSource,schema);\r
\r
// insertSomeData(appCtr);\r
// deleteHighLevelNode(appCtr); //->problem with Duplicate Key in Classification_TaxonNode \r
}\r
\r
\r
- private void deleteHighLevelNode(CdmApplicationDefaultController appCtr) {\r
+ private void deleteHighLevelNode(CdmApplicationController appCtr) {\r
TransactionStatus tx = appCtr.startTransaction();\r
ITaxonNodeService service = appCtr.getTaxonNodeService();\r
TaxonNode node = service.find(60554);\r
\r
}\r
\r
- private void insertSomeData(CdmApplicationDefaultController appCtr) {\r
+ private void insertSomeData(CdmApplicationController appCtr) {\r
Classification cl = Classification.NewInstance("myClass");\r
TaxonNode node1 = cl.addChildTaxon(Taxon.NewInstance(BotanicalName.NewInstance(null), null), null, null);\r
appCtr.getClassificationService().save(cl);\r
}\r
\r
private void testDatabaseChange() throws DataSourceNotFoundException{\r
- CdmApplicationDefaultController appCtr;\r
- appCtr = CdmApplicationDefaultController.NewInstance();\r
+ CdmApplicationController appCtr;\r
+ appCtr = CdmApplicationController.NewInstance();\r
\r
// DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;\r
// String server = "192.168.2.10";\r
\r
CdmPersistentDataSource ds = CdmPersistentDataSource.save("testSqlServer", dataSource);\r
\r
- CdmApplicationDefaultController appCtr = CdmApplicationDefaultController.NewInstance(ds);\r
+ CdmApplicationController appCtr = CdmApplicationController.NewInstance(ds);\r
Person agent = Person.NewInstance();\r
appCtr.getAgentService().save(agent);\r
TaxonNameBase<?,?> tn = BotanicalName.NewInstance(null);\r
\r
CdmPersistentDataSource ds = CdmPersistentDataSource.save("PostgreTest", dataSource);\r
\r
- CdmApplicationDefaultController appCtr = CdmApplicationDefaultController.NewInstance(ds);\r
+ CdmApplicationController appCtr = CdmApplicationController.NewInstance(ds);\r
Person agent = Person.NewInstance();\r
appCtr.getAgentService().save(agent);\r
TaxonNameBase<?,?> tn = BotanicalName.NewInstance(null);\r
}\r
\r
private void testLocalHsql() throws DataSourceNotFoundException{\r
- CdmApplicationDefaultController appCtr = null;\r
+ CdmApplicationController appCtr = null;\r
try {\r
CdmPersistentDataSource ds = CdmPersistentDataSource.NewLocalHsqlInstance();\r
- appCtr = CdmApplicationDefaultController.NewInstance(ds);\r
+ appCtr = CdmApplicationController.NewInstance(ds);\r
List<?> l = appCtr.getNameService().list(null,5, 1,null,null);\r
System.out.println(l);\r
//Agent agent = new Agent();\r
CdmDataSource.NewH2EmbeddedInstance("cdm", "sa", "", null);\r
// ds =\r
// CdmPersistentDataSource.NewInstance("localH2");\r
- CdmApplicationDefaultController appCtr = CdmApplicationDefaultController.NewInstance(ds, validation);\r
+ CdmApplicationController appCtr = CdmApplicationController.NewInstance(ds, validation);\r
\r
boolean exists = appCtr.getUserService().userExists("admin");\r
try {\r
//CdmDataSource.NewH2EmbeddedInstance("cdm", "sa", "");\r
// ds =\r
// CdmPersistentDataSource.NewInstance("localH2");\r
- CdmApplicationDefaultController appCtr = CdmApplicationDefaultController.NewInstance(ds, validation);\r
+ CdmApplicationController appCtr = CdmApplicationController.NewInstance(ds, validation);\r
try {\r
BotanicalName botName1 = BotanicalName.NewInstance(Rank.SPECIES());\r
BotanicalName botName2 = BotanicalName.NewInstance(Rank.SPECIES());\r
import org.junit.Ignore;
import org.junit.Test;
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;
import eu.etaxonomy.cdm.database.CdmDataSource;
import eu.etaxonomy.cdm.database.DbSchemaValidation;
import eu.etaxonomy.cdm.model.agent.Person;
@Ignore /* IGNORE in Suite */
public class TestAgentService {
- static CdmApplicationDefaultController appController;
+ static CdmApplicationController appController;
/**
* @throws java.lang.Exception
public static void setUpBeforeClass() throws Exception {
// CdmDataSource dataSource = CdmDataSource.NewMySqlInstance("localhost", "test", -1, "", "", NomenclaturalCode.ICBN);
CdmDataSource dataSource = CdmDataSource.NewH2EmbeddedInstance("TestAgentService", "sa", "");
- appController = CdmApplicationDefaultController.NewInstance(dataSource, DbSchemaValidation.UPDATE);
+ appController = CdmApplicationController.NewInstance(dataSource, DbSchemaValidation.UPDATE);
}
@AfterClass
import org.junit.Ignore;
import org.junit.Test;
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.database.CdmDataSource;
import eu.etaxonomy.cdm.database.DataSourceNotFoundException;
public class TestC3P0Configuration{
private static final Logger logger = Logger.getLogger(TestC3P0Configuration.class);
- CdmApplicationDefaultController appController;
+ CdmApplicationController appController;
@Before
public void setup() throws DataSourceNotFoundException, TermNotFoundException{
CdmDataSource dataSource = CdmDataSource.NewMySqlInstance("localhost", "test", -1, "edit", "wp5", NomenclaturalCode.ICNAFP);
- appController = CdmApplicationDefaultController.NewInstance(dataSource, DbSchemaValidation.CREATE);
+ appController = CdmApplicationController.NewInstance(dataSource, DbSchemaValidation.CREATE);
}
@Test
import org.springframework.core.io.ClassPathResource;\r
import org.springframework.core.io.Resource;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
import eu.etaxonomy.cdm.common.AccountStore;\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
\r
Column coL;\r
boolean omitTermLoading = false;\r
- Resource applicationContextResource = new ClassPathResource(CdmApplicationDefaultController.DEFAULT_APPLICATION_CONTEXT_RESOURCE);\r
+ Resource applicationContextResource = new ClassPathResource(CdmApplicationController.DEFAULT_APPLICATION_CONTEXT_RESOURCE);\r
CdmPersistentDataSource dataSource = CdmPersistentDataSource.NewDefaultInstance();\r
- CdmApplicationDefaultController appCtr = CdmApplicationDefaultController.NewInstance(applicationContextResource, dataSource, DbSchemaValidation.CREATE, omitTermLoading);\r
+ CdmApplicationController appCtr = CdmApplicationController.NewInstance(applicationContextResource, dataSource, DbSchemaValidation.CREATE, omitTermLoading);\r
appCtr.NewConversation();\r
appCtr.NewConversation();\r
\r
\r
// ICdmDataSource datasource = CdmDataSource.NewMySqlInstance(server, database, username, password);\r
ICdmDataSource datasource = CdmDataSource.NewH2EmbeddedInstance("CDM", "sa", "", null);\r
- CdmApplicationDefaultController appCtr = CdmApplicationDefaultController.NewInstance(datasource, dbSchemaValidation);\r
+ CdmApplicationController appCtr = CdmApplicationController.NewInstance(datasource, dbSchemaValidation);\r
\r
Rank genus = Rank.GENUS();\r
BotanicalName botanicalName = BotanicalName.NewInstance(genus);\r
String password = CdmUtils.readInputLine("Password: ");\r
DbSchemaValidation dbSchemaValidation = DbSchemaValidation.CREATE;\r
ICdmDataSource datasource = CdmDataSource.NewMySqlInstance(server, database, username, password);\r
- CdmApplicationDefaultController appCtr = CdmApplicationDefaultController.NewInstance(datasource, dbSchemaValidation);\r
+ CdmApplicationController appCtr = CdmApplicationController.NewInstance(datasource, dbSchemaValidation);\r
\r
Rank genus = Rank.GENUS();\r
BotanicalName parentName = BotanicalName.NewInstance(genus);\r
String password = CdmUtils.readInputLine("Password: ");\r
DbSchemaValidation validation = DbSchemaValidation.VALIDATE;\r
ICdmDataSource datasource = CdmDataSource.NewSqlServer2005Instance(server, database, -1, username, password, null);\r
- CdmApplicationDefaultController appCtr = CdmApplicationDefaultController.NewInstance(datasource, validation);\r
+ CdmApplicationController appCtr = CdmApplicationController.NewInstance(datasource, validation);\r
\r
Rank genus = Rank.GENUS();\r
BotanicalName botanicalName = BotanicalName.NewInstance(genus);\r
// ICdmDataSource datasource = CdmDataSource.NewMySqlInstance(server, database, username, password);\r
//ICdmDataSource datasource = CdmDataSource.NewH2EmbeddedInstance("CDM", "sa", "");\r
ICdmDataSource datasource = cdm_test_anahit2();\r
- CdmApplicationDefaultController appCtr = CdmApplicationDefaultController.NewInstance(datasource, dbSchemaValidation);\r
+ CdmApplicationController appCtr = CdmApplicationController.NewInstance(datasource, dbSchemaValidation);\r
Person person = Person.NewTitledInstance("TestPerson");\r
Contact contact1 = new Contact();\r
Set<String> set = new HashSet<String>();\r
\r
// ICdmDataSource datasource = CdmDataSource.NewMySqlInstance(server, database, username, password);\r
ICdmDataSource datasource = CdmDataSource.NewH2EmbeddedInstance("CDM", "sa", "", null);\r
- CdmApplicationDefaultController appCtr = CdmApplicationDefaultController.NewInstance(datasource, dbSchemaValidation);\r
+ CdmApplicationController appCtr = CdmApplicationController.NewInstance(datasource, dbSchemaValidation);\r
BotanicalName botName = BotanicalName.NewInstance(Rank.SPECIES());\r
botName.setGenusOrUninomial("Genus");\r
botName.setSpecificEpithet("species");\r
String password = CdmUtils.readInputLine("Password: ");\r
ICdmDataSource dataSource = CdmDataSource.NewMySqlInstance("192.168.2.10", "cdm_test_niels2", 3306, "edit", password, NomenclaturalCode.ICNAFP);\r
\r
- CdmApplicationDefaultController appCtr = CdmApplicationDefaultController.NewInstance(dataSource, DbSchemaValidation.UPDATE);\r
+ CdmApplicationController appCtr = CdmApplicationController.NewInstance(dataSource, DbSchemaValidation.UPDATE);\r
\r
ConversationHolder conversation = appCtr.NewConversation();\r
\r
import org.junit.Test;
import org.unitils.spring.annotation.SpringBeanByType;
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.ILocationService;
import eu.etaxonomy.cdm.api.service.ILocationService.NamedAreaVocabularyType;
// ICdmDataSource datasource = CdmDataSource.NewMySqlInstance(server, database, username, password);
ICdmDataSource datasource = CdmDataSource.NewH2EmbeddedInstance("test", "sa", "", null);
- CdmApplicationDefaultController appCtr = CdmApplicationDefaultController.NewInstance(datasource, dbSchemaValidation);
+ CdmApplicationController appCtr = CdmApplicationController.NewInstance(datasource, dbSchemaValidation);
ConversationHolder conversation = appCtr.NewConversation();
conversation.bind();
import org.junit.Ignore;\r
import org.springframework.transaction.TransactionStatus;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
import eu.etaxonomy.cdm.api.service.IDescriptionService;\r
import eu.etaxonomy.cdm.api.service.ITaxonService;\r
import eu.etaxonomy.cdm.api.service.ITermService;\r
static Logger logger = Logger.getLogger(TestService.class);\r
\r
private static final UUID TEST_TAXON_UUID = UUID.fromString("b3084573-343d-4279-ba92-4ab01bb47db5");\r
- private static CdmApplicationDefaultController appCtr;\r
+ private static CdmApplicationController appCtr;\r
\r
public void testAppController() {\r
logger.info("Create name objects...");\r
try {\r
DbSchemaValidation dbSchemaValidation = DbSchemaValidation.CREATE;\r
//appCtr = CdmApplicationController.NewInstance(CdmPersistentDataSource.NewInstance("defaultMySql") , dbSchemaValidation);\r
- appCtr = CdmApplicationDefaultController.NewInstance(dbSchemaValidation);\r
+ appCtr = CdmApplicationController.NewInstance(dbSchemaValidation);\r
\r
\r
TaxonNameBase<?,?> name = NonViralName.NewInstance(null);\r
import org.apache.log4j.Logger;\r
import org.junit.Ignore;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
import eu.etaxonomy.cdm.database.CdmPersistentDataSource;\r
import eu.etaxonomy.cdm.database.DataSourceNotFoundException;\r
import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
public class TestTaxonFunction {\r
private static final Logger logger = Logger.getLogger(TestTaxonFunction.class);\r
\r
- private CdmApplicationDefaultController getCdmApplicationController(String strDataSource, DbSchemaValidation hbm2dll){\r
- CdmApplicationDefaultController cdmApp= null;\r
+ private CdmApplicationController getCdmApplicationController(String strDataSource, DbSchemaValidation hbm2dll){\r
+ CdmApplicationController cdmApp= null;\r
try {\r
CdmPersistentDataSource dataSource = CdmPersistentDataSource.NewInstance(strDataSource);\r
- cdmApp = CdmApplicationDefaultController.NewInstance(dataSource, hbm2dll);\r
+ cdmApp = CdmApplicationController.NewInstance(dataSource, hbm2dll);\r
} catch (DataSourceNotFoundException e) {\r
e.printStackTrace();\r
}\r
private void initDatabase(){\r
logger.info("init Database start ...");\r
DbSchemaValidation hbm2dll = DbSchemaValidation.CREATE;\r
- CdmApplicationDefaultController cdmApp = getCdmApplicationController("defaultMySql", hbm2dll);\r
+ CdmApplicationController cdmApp = getCdmApplicationController("defaultMySql", hbm2dll);\r
\r
INonViralNameParser<?> parser = NonViralNameParserImpl.NewInstance();\r
Reference<?> sec = ReferenceFactory.newBook();\r
if (false){\r
initDatabase();\r
}\r
- CdmApplicationDefaultController cdmApp = getCdmApplicationController("defaultMySql", DbSchemaValidation.VALIDATE);\r
+ CdmApplicationController cdmApp = getCdmApplicationController("defaultMySql", DbSchemaValidation.VALIDATE);\r
Reference<?> sec = cdmApp.getReferenceService().find(getRefUuid());\r
List<Taxon> rootList = cdmApp.getTaxonService().getRootTaxa(sec, CdmFetch.NO_FETCH(), false);\r
for (Taxon taxon:rootList){\r
import org.junit.Ignore;\r
import org.junit.Test;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
import eu.etaxonomy.cdm.api.service.ITaxonService;\r
import eu.etaxonomy.cdm.common.CdmUtils;\r
import eu.etaxonomy.cdm.database.CdmDataSource;\r
private static Logger logger = Logger.getLogger(CreateDataTest.class);\r
\r
private static boolean isCreated;\r
- private CdmApplicationDefaultController app;\r
+ private CdmApplicationController app;\r
public static final String genusUuid = "c399e245-3def-427d-8502-afa0ae87e875";\r
public static final String genusNameUuid = "d399e245-3def-427d-8502-afa0ae87e875";\r
\r
dbSchemaValidation = DbSchemaValidation.CREATE;\r
}\r
ICdmDataSource dataSource = cdm_test();\r
- app = CdmApplicationDefaultController.NewInstance(dataSource, dbSchemaValidation);\r
+ app = CdmApplicationController.NewInstance(dataSource, dbSchemaValidation);\r
}\r
\r
@After\r
\r
import org.apache.log4j.Logger;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
import eu.etaxonomy.cdm.database.ICdmDataSource;\r
import eu.etaxonomy.cdm.model.common.Language;\r
public class CreateDataTestNoUnit {\r
private static Logger logger = Logger.getLogger(CreateDataTestNoUnit.class);\r
\r
- private CdmApplicationDefaultController app;\r
+ private CdmApplicationController app;\r
\r
\r
public void test(){\r
dbSchemaValidation = DbSchemaValidation.CREATE;\r
}\r
ICdmDataSource dataSource = CreateDataTest.cdm_test();\r
- app = CdmApplicationDefaultController.NewInstance(dataSource, dbSchemaValidation);\r
+ app = CdmApplicationController.NewInstance(dataSource, dbSchemaValidation);\r
\r
TaxonNameBase<?,?> genusName2 = (TaxonNameBase<?,?>)app.getNameService().find(UUID.fromString(CreateDataTest.genusNameUuid));\r
Set<TaxonBase> set = (Set<TaxonBase>)genusName2.getTaxonBases();\r
import org.apache.log4j.Logger;\r
import org.springframework.transaction.TransactionStatus;\r
\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
import eu.etaxonomy.cdm.common.AccountStore;\r
import eu.etaxonomy.cdm.database.CdmDataSource;\r
import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
\r
private static final ICdmDataSource db = TestTaxonServices.CDM_DB(dbName);\r
\r
- private static CdmApplicationDefaultController \r
+ private static CdmApplicationController \r
getCdmApplicationController(\r
ICdmDataSource db, DbSchemaValidation dbSchemaValidation, boolean omitTermLoading) {\r
\r
- CdmApplicationDefaultController appCtr = CdmApplicationDefaultController.NewInstance(db, dbSchemaValidation, omitTermLoading);\r
+ CdmApplicationController appCtr = CdmApplicationController.NewInstance(db, dbSchemaValidation, omitTermLoading);\r
\r
return appCtr;\r
}\r
\r
\r
- private void testMakeTaxonSynonym(CdmApplicationDefaultController appCtr) {\r
+ private void testMakeTaxonSynonym(CdmApplicationController appCtr) {\r
\r
// logger.info("Testing makeTaxonSynonym()");\r
// TransactionStatus txStatus = appCtr.startTransaction();\r
}\r
\r
\r
- private void testRemoveNameRelationship(CdmApplicationDefaultController appCtr) {\r
+ private void testRemoveNameRelationship(CdmApplicationController appCtr) {\r
\r
logger.info("Testing testRemoveNameRelationship()");\r
TransactionStatus txStatus = appCtr.startTransaction();\r
appCtr.commitTransaction(txStatus);\r
}\r
\r
- private void createNamedArea(CdmApplicationDefaultController appCtr) {\r
+ private void createNamedArea(CdmApplicationController appCtr) {\r
\r
logger.info("Start testing createNamedArea()");\r
TransactionStatus txStatus = appCtr.startTransaction();\r
public static void main(String[] args) {\r
\r
TestTaxonServices testClass = new TestTaxonServices();\r
- CdmApplicationDefaultController cdmApp = \r
+ CdmApplicationController cdmApp = \r
getCdmApplicationController(db, DbSchemaValidation.VALIDATE, false);\r
\r
testClass.createNamedArea(cdmApp);\r
BGBM BDI Projects / cdmlib.git / commitdiff