Project

General

Profile

« Previous | Next » 

Revision 74400e6b

Added by Andreas Müller over 9 years ago

merge validation2 and model 3.5 into trunk

View differences:

cdmlib-services/src/main/resources/eu/etaxonomy/cdm/defaultApplicationContext.xml
25 25

  
26 26
  <bean id="conversationHolder" class="eu.etaxonomy.cdm.api.conversation.ConversationHolder" scope="prototype"/>
27 27

  
28
<!-- 
29
  <bean id="validationManager" class="eu.etaxonomy.cdm.api.validation.ValidationManager"/>
30
  <bean id="batchValidator" class="eu.etaxonomy.cdm.api.validation.batch.BatchValidator"/>
31
 -->
32

  
28 33
  <!-- TODO move to io -->
29 34
  <context:component-scan base-package="eu/etaxonomy/cdm/io">
30 35
    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.io\.berlinModel.*" />
cdmlib-services/src/main/resources/eu/etaxonomy/cdm/httpInvokerServices.xml
243 243
    </property>
244 244
  </bean>
245 245

  
246
  <bean id="httpEntityValidationResultService"
246
  <bean id="httpEntityValidationService"
247 247
    class="org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter">
248 248
    <property name="service">
249
      <ref bean="entityValidationResultServiceImpl" />
249
      <ref bean="entityValidationServiceImpl" />
250 250
    </property>
251 251
    <property name="serviceInterface">
252
      <value>eu.etaxonomy.cdm.api.service.IEntityValidationResultService
252
      <value>eu.etaxonomy.cdm.api.service.IEntityValidationService
253 253
      </value>
254 254
    </property>
255 255
  </bean>
cdmlib-services/src/main/resources/eu/etaxonomy/cdm/remoting-services.xml
46 46
        <prop key="/remoting/taxonnode.service">httpTaxonNodeService</prop>
47 47
        <prop key="/remoting/taxon.service">httpTaxonService</prop>
48 48
        <prop key="/remoting/term.service">httpTermService</prop>
49
        <prop key="/remoting/entityvalidationresult.service">httpEntityValidationResultService</prop>
49
        <prop key="/remoting/entityvalidation.service">httpEntityValidationService</prop>
50 50
        <prop key="/remoting/entityconstraintviolation.service">httpEntityConstraintViolationService</prop>
51 51
        <prop key="/remoting-public/user.service">httpUserService</prop>
52 52
        <prop key="/remoting/vocabulary.service">httpVocabularyService</prop>

Also available in: Unified diff