Project

General

Profile

« Previous | Next » 

Revision 27225

InformationService interface moved into cnr-rmi-api. Cleanup

View differences:

applicationContext-services.xml
22 22
	</bean>
23 23

  
24 24
	<!-- service locators: TODO: parameterize via properties -->
25
	<bean id="storeLocator" class="eu.dnetlib.enabling.tools.StaticServiceLocator"
26
		p:service-ref="isStoreService" />
25
	<bean id="isLocator" class="eu.dnetlib.enabling.tools.StaticServiceLocator"
26
		p:service-ref="informationService" />
27

  
27 28
	<bean id="registryLocator" class="eu.dnetlib.enabling.tools.StaticServiceLocator"
28 29
		p:service-ref="isRegistryService" />
30

  
29 31
	<bean id="snLocator" class="eu.dnetlib.enabling.tools.StaticServiceLocator"
30 32
		p:service-ref="isSNService" />
33

  
31 34
	<bean id="lookupLocator" class="eu.dnetlib.enabling.tools.StaticServiceLocator"
32 35
		p:service-ref="isLookUpService" />
33
	<!-- <bean id="msroLocator" class="eu.dnetlib.enabling.tools.StaticServiceLocator" 
34
		p:service-ref="msroService" /> <bean id="anyIndexLocatorDynamic" class="eu.dnetlib.enabling.tools.DynamicServiceLocator" 
35
		p:clazz="eu.dnetlib.data.index.IIndexService" p:lookUpLocator-ref="lookupLocator" 
36
		p:serviceResolver-ref="serviceResolver" /> -->
36

  
37 37
	<!-- common service resolution chain -->
38 38
	<bean id="serviceResolver" class="eu.dnetlib.enabling.tools.ServiceResolverChain">
39 39
		<property name="resolvers">
......
53 53

  
54 54
	<!-- beans -->
55 55
	<bean id="informationService" class="eu.dnetlib.enabling.is.InformationServiceImpl"
56
		init-method="start" destroy-method="stop" p:storeLocator-ref="storeLocator"
56
		init-method="start" destroy-method="stop" p:isStore-ref="isStore"
57 57
		p:xqueryUtils-ref="xqueryUtils" p:pendingManager-ref="pendingManager"
58 58
		p:resourceValidator-ref="resourceValidator" p:endpoint-ref="isSNServiceEndpoint"
59
		p:core-ref="isSNServiceCore" />
59
		p:core-ref="isSNServiceCore" p:contentInitializerJob-ref="embeddedContentLoaderJob" />
60 60
		
61 61
	<!-- endpoints -->
62 62
	<jaxws:endpoint id="informationServiceEndpoint" implementor="#informationService"
63
		implementorClass="eu.dnetlib.enabling.is.InformationService" address="/is" />
63
		implementorClass="eu.dnetlib.enabling.is.rmi.InformationService" address="/is" />
64 64

  
65 65
	<template:instance name="serviceRegistrationManager"
66 66
		t:serviceRegistrationManagerClass="eu.dnetlib.enabling.tools.registration.ValidatingServiceRegistrationManagerImpl"
......
80 80
	<template:instance name="serviceRegistrationManager"
81 81
		t:serviceRegistrationManagerClass="eu.dnetlib.enabling.tools.registration.ValidatingServiceRegistrationManagerImpl"
82 82
		t:name="isLookUpServiceRegistrationManager" t:service="isLookUpService"
83
		t:endpoint="isLookUpServiceEndpoint" t:jobScheduler="jobScheduler" />
83
		t:endpoint="isLookUpServiceEndpoint" t:jobScheduler="jobScheduler" 
84
		t:serviceRegistrator="isLookupServiceRegistrator" />
85
		
86
	<bean id="isLookupServiceRegistrator"
87
		class="eu.dnetlib.enabling.tools.registration.BlackboardServiceRegistrator"
88
		p:registryLocator-ref="registryLocator" p:lookupLocator-ref="lookupLocator"
89
		p:hnmLocator-ref="${services.registration.default.hnmlocator}"
90
		p:eprBuilder-ref="jaxwsEndpointReferenceBuilder" p:snLocator-ref="snLocator">
91
		<property name="serviceNameGen">
92
			<bean class="eu.dnetlib.enabling.tools.registration.StaticServiceNameResolver" p:name="IS_LookUpService"/>
93
		</property>
94
	</bean>		
84 95

  
85 96
	<!-- endpoints -->
86 97
	<jaxws:endpoint id="isRegistryServiceEndpoint"
......
90 101
	<template:instance name="serviceRegistrationManager"
91 102
		t:serviceRegistrationManagerClass="eu.dnetlib.enabling.tools.registration.ValidatingServiceRegistrationManagerImpl"
92 103
		t:name="isRegistryServiceRegistrationManager" t:service="isRegistryService"
93
		t:endpoint="isRegistryServiceEndpoint" t:jobScheduler="jobScheduler" />
104
		t:endpoint="isRegistryServiceEndpoint" t:jobScheduler="jobScheduler" 
105
		t:serviceRegistrator="isRegistryServiceRegistrator" />
106
		
107
	<bean id="isRegistryServiceRegistrator"
108
		class="eu.dnetlib.enabling.tools.registration.BlackboardServiceRegistrator"
109
		p:registryLocator-ref="registryLocator" p:lookupLocator-ref="lookupLocator"
110
		p:hnmLocator-ref="${services.registration.default.hnmlocator}"
111
		p:eprBuilder-ref="jaxwsEndpointReferenceBuilder" p:snLocator-ref="snLocator">
112
		<property name="serviceNameGen">
113
			<bean class="eu.dnetlib.enabling.tools.registration.StaticServiceNameResolver" p:name="IS_RegistryService"/>
114
		</property>
115
	</bean>				
94 116

  
95 117
	<!-- endpoints -->
96 118
	<jaxws:endpoint id="isSNServiceEndpoint" implementor="#isSNService"
......
99 121
	<template:instance name="serviceRegistrationManager"
100 122
		t:serviceRegistrationManagerClass="eu.dnetlib.enabling.tools.registration.ValidatingServiceRegistrationManagerImpl"
101 123
		t:name="isSNServiceRegistrationManager" t:service="isSNService"
102
		t:endpoint="isSNServiceEndpoint" t:jobScheduler="jobScheduler" />
124
		t:endpoint="isSNServiceEndpoint" t:jobScheduler="jobScheduler"
125
		t:serviceRegistrator="isSNServiceRegistrator" />
126
		
127
	<bean id="isSNServiceRegistrator"
128
		class="eu.dnetlib.enabling.tools.registration.BlackboardServiceRegistrator"
129
		p:registryLocator-ref="registryLocator" p:lookupLocator-ref="lookupLocator"
130
		p:hnmLocator-ref="${services.registration.default.hnmlocator}"
131
		p:eprBuilder-ref="jaxwsEndpointReferenceBuilder" p:snLocator-ref="snLocator">
132
		<property name="serviceNameGen">
133
			<bean class="eu.dnetlib.enabling.tools.registration.StaticServiceNameResolver" p:name="IS_SNService"/>
134
		</property>
135
	</bean>		
103 136

  
104 137
</beans>

Also available in: Unified diff