removing old and obsolte configurations

diff --git a/.gitattributes b/.gitattributes
index 1fbcdb386a8225b0478819c61d30992741cecab5..b075e474ea9a8a1e4c1538fafbaab9621acfb9f3 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1397,7 +1397,6 @@ cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/hibernate/replace/
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/Datasource.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/TestCdmApplicationUtils.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/TestPersistence.java -text
-cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/TestSessionFactory.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/integration/CdmIntegrationTest.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/integration/CdmTransactionalIntegrationTest.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/integration/CdmTransactionalIntegrationTestWithSecurity.java -text
@@ -1417,13 +1416,11 @@ cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-securi
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-testPersistentDataSource.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-testWithConfigurableNameCacheStrategyGenerators.xml -text
-cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/cdm.datasources.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/ClearDBDataSet.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml -text
-cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/jdbc-datasource.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/BeanInitializerIntegration.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/FreeTextSearchIntegration.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/FreeTextSearchIntegration.xml.backup -text
@@ -1466,6 +1463,7 @@ cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/media/MediaRepresentationPartDaoImplTest.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/media/OregonScientificDS6639-DSC_0307-small.jpg -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/media/OregonScientificDS6639-DSC_0307-small.tif -text
+cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/name/Blank.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImplTest.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TypeDesignationDaoHibernateImplTest.testSaveTypeDesignations-result.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TypeDesignationDaoHibernateImplTest.testSaveTypeDesignationsBidirectionalCascade-result.xml -text

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/TestSessionFactory.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/TestSessionFactory.java
deleted file mode 100644 (file)
index d76bdfc..0000000
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/TestSessionFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**\r
-* Copyright (C) 2009 EDIT\r
-* European Distributed Institute of Taxonomy\r
-* http://www.e-taxonomy.eu\r
-*\r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/ \r
-\r
-package eu.etaxonomy.cdm.test.function;\r
-\r
-\r
-import org.apache.log4j.Logger;\r
-import org.springframework.context.support.ClassPathXmlApplicationContext;\r
-\r
-\r
-\r
-\r
-public class TestSessionFactory {\r
-       @SuppressWarnings("unused")\r
-       private static final Logger logger = Logger.getLogger(TestSessionFactory.class);\r
-\r
-\r
-       \r
-       \r
-       private boolean testFromApplication(){\r
-               String appContextString = "applicationContext.xml";\r
-               ClassPathXmlApplicationContext appContext = new ClassPathXmlApplicationContext(appContextString);\r
-               appContext.close();\r
-               return true;\r
-       }\r
-       \r
-               \r
-       \r
-       private void test(){\r
-               System.out.println("Start Datasource");\r
-               testFromApplication();\r
-               System.out.println("\nEnd Datasource");\r
-       }\r
-       \r
-       /**\r
-        * @param args\r
-        */\r
-       public static void  main(String[] args) {\r
-               TestSessionFactory cc = new TestSessionFactory();\r
-       cc.test();\r
-       }\r
-\r
-}\r

diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext.xml
deleted file mode 100644 (file)
index 43031dd..0000000
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xmlns:context="http://www.springframework.org/schema/context"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/beans 
-    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-    http://www.springframework.org/schema/context
-    http://www.springframework.org/schema/context/spring-context-2.5.xsd">
-
-
-    <import resource="classpath:/eu/etaxonomy/cdm/persistence.xml" />
-    <import resource="classpath:/eu/etaxonomy/cdm/h2-datasource.xml" />
-    
-<!--
-     <bean id="dataSource"  lazy-init="true" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="url" value="jdbc:mysql://192.168.2.10/cdm_1_1"/>
-        <property name="username" value="edit"/>
-        <property name="password" value="wp5"/>
-    </bean>
-
-<bean id="hibernateProperties" 
-class="org.springframework.beans.factory.config.PropertiesFactoryBean">
-<property name="properties">
-<props>
-<prop key="hibernate.hbm2ddl.auto">create</prop>
-<prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop>
-<prop key="hibernate.cache.provider_class">org.hibernate.cache.NoCacheProvider</prop>
-<prop key="hibernate.show_sql">false</prop>
-<prop key="hibernate.format_sql">false</prop>
-</props>
-</property>
-</bean>
--->
-        
-    <!--  
-        hibernate.dialect=org.hibernate.dialect.MySQLDialect
-        db.driver_class=com.mysql.jdbc.Driver
-        db.url=jdbc:mysql://192.168.2.10/cdm_1_1
-        db.username=edit
-        db.password=wp5
-        
-        hibernate.dialect=org.hibernate.dialect.SQLServerDialect
-        db.driver_class=com.microsoft.jdbc.sqlserver.SQLServerDriver
-        db.url=jdbc:microsoft:sqlserver://Paddie:1433;DataBase=edit_test;SelectMethod=direct
-        db.username=andreas
-        db.password=r56    
-    -->
-        
-</beans>
\ No newline at end of file

diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/jdbc-datasource.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/jdbc-datasource.xml
deleted file mode 100644 (file)
index cb76dd5..0000000
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/jdbc-datasource.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xmlns:util="http://www.springframework.org/schema/util"    
-    xsi:schemaLocation="http://www.springframework.org/schema/beans   http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-    http://www.springframework.org/schema/context    http://www.springframework.org/schema/context/spring-context-2.5.xsd
-    http://www.springframework.org/schema/util    http://www.springframework.org/schema/util/spring-util-2.5.xsd">
-    
-    <bean id="dataSource"  lazy-init="true" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-        <property name="driverClassName" value="${db.driver_class}"/>
-        <property name="url" value="${db.url}"/>
-        <property name="username" value="${db.username}"/>
-        <property name="password" value="${db.password}"/>
-    </bean>
-
-<!--  
-    hibernate.dialect=org.hibernate.dialect.MySQLDialect
-    db.driver_class=com.mysql.jdbc.Driver
-    db.url=jdbc:mysql://192.168.2.10/cdm_build
-    db.username=edit
-    db.password=wp5
-    
-    hibernate.dialect=org.hibernate.dialect.SQLServerDialect
-    db.driver_class=com.microsoft.jdbc.sqlserver.SQLServerDriver
-    db.url=jdbc:microsoft:sqlserver://Paddie:1433;DataBase=edit_test;SelectMethod=direct
-    db.username=andreas
-    db.password=r56    
--->
-    
-    <!-- This configures default properties, which can overridden with the file specified by the location property -->
-    <bean id="hibernateProperties" 
-        class="org.springframework.beans.factory.config.PropertiesFactoryBean">
-        <property name="properties">
-            <props>
-                <prop key="hibernate.hbm2ddl.auto">validate</prop>
-                <prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop>
-                <prop key="hibernate.cache.provider_class">org.hibernate.cache.NoCacheProvider</prop>
-                <prop key="hibernate.show_sql">false</prop>
-                <prop key="hibernate.format_sql">false</prop>
-            </props>
-        </property>
-    </bean>
-</beans>
-

diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/name/Blank.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/name/Blank.xml
new file mode 100644 (file)
index 0000000..43af6a9
--- /dev/null
+++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/name/Blank.xml
@@ -0,0 +1,3 @@
+<?xml version='1.0' encoding='UTF-8'?>\r
+<dataset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../dataset.xsd">\r
+ </dataset>
\ No newline at end of file