Project

General

Profile

Revision 716825dd

ID716825ddb1680237f908705964c2e657c7d1b67f
Parent 68a8023a
Child a4a47802

Added by Andreas Müller over 1 year ago

minor

View differences:

src/test/java/eu/etaxonomy/cdm/service/SpecimenTypeDesignationWorkingSetServiceImplTest.java
122 122

  
123 123
       service.save(workingset);
124 124

  
125
       SpecimenOrObservationBase baseEntity = cdmRepository.getOccurrenceService().load(workingset.getFieldUnit().getUuid());
125
       SpecimenOrObservationBase<?> baseEntity = cdmRepository.getOccurrenceService().load(workingset.getFieldUnit().getUuid());
126 126

  
127 127

  
128 128
       printDataSetWithNull(System.err, new String[]{"TYPEDESIGNATIONBASE", "SPECIMENOROBSERVATIONBASE"});
src/test/resources/eu/etaxonomy/cdm/applicationContext-service-integration.xml
42 42
   <context:component-scan base-package="eu/etaxonomy/cdm/ext" />
43 43

  
44 44
  <!--   <import resource="classpath:/eu/etaxonomy/cdm/remote.xml"/> -->
45
  <!--   <context:component-scan base-package="eu/etaxonomy/cdm/io">
46
        <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.io\.pesi.*" />
47
        <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.io\.faunaEuropaea.*" />
48
        <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.io\.erms.*" />
49
        <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.io\.eflora.*" />
50
        <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.io\.berlinModel.*" />
51
    </context:component-scan> -->
45
  <!--   <context:component-scan base-package="eu/etaxonomy/cdm/io"/> -->
52 46

  
53 47
    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
54 48
      <property name="properties">
src/test/resources/webapp/WEB-INF/applicationContext-alternative.xml
3 3
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
    xmlns:tx="http://www.springframework.org/schema/tx"
5 5
    xmlns:context="http://www.springframework.org/schema/context"
6
    xsi:schemaLocation="http://www.springframework.org/schema/beans   http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
7
    http://www.springframework.org/schema/context   http://www.springframework.org/schema/context/spring-context-2.5.xsd
8
    http://www.springframework.org/schema/tx   http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
6
    xsi:schemaLocation="http://www.springframework.org/schema/beans   http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
7
    http://www.springframework.org/schema/context   http://www.springframework.org/schema/context/spring-context-3.0.xsd
8
    http://www.springframework.org/schema/tx   http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
9 9
    ">
10 10

  
11 11
  <!-- 
......
33 33
   <context:component-scan base-package="eu/etaxonomy/cdm/ext" />
34 34

  
35 35
  <import resource="classpath:/eu/etaxonomy/cdm/remote.xml"/>
36
  <!--   <context:component-scan base-package="eu/etaxonomy/cdm/io">
37
        <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.io\.pesi.*" />
38
        <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.io\.faunaEuropaea.*" />
39
        <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.io\.erms.*" />
40
        <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.io\.eflora.*" />
41
        <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.io\.berlinModel.*" />
42
    </context:component-scan> -->
43

  
36
  <!--   <context:component-scan base-package="eu/etaxonomy/cdm/io"/> -->
37
 
44 38
    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
45 39
      <property name="properties">
46 40
        <props>

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)