BugID: 1359 Risolta Anomalia sulla gestione dei trovati. Una property…

… SPRING non veniva instanziata correttamente e sbagliava il recupero della URL dell'applicativo dei trovati
consiglionazionaledellericerche · Jan 29, 2015 · 3d4ca05 · 3d4ca05
1 parent 1b0b6f9
commit 3d4ca05
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 20 deletions.
diff --git a/sigla-ejb/src/main/resources/it/cnr/contab/cmis/service/cmis-service-context.xml b/sigla-ejb/src/main/resources/it/cnr/contab/cmis/service/cmis-service-context.xml
@@ -7,17 +7,6 @@
 		within your classpath, provided they fall under the META-INF/spring directory.
 		The located property files are parsed and their values can then be used within
 		application context files in the form of ${propertyKey}. -->
-	<bean
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="locations">
-			<list>
-				<value>classpath*:META-INF/spring/*.properties</value>
-				<value>classpath*:*/extension/repository.properties</value>
-			</list>
-		</property>
-		<property name="ignoreUnresolvablePlaceholders" value="true" />
-	</bean>
-
 
     <bean id="cmis.converter.defaultConverter" class="it.cnr.contab.cmis.converter.DefaultConverter"/>
     <bean id="cmis.converter.timestampToCalendarConverter" class="it.cnr.contab.cmis.converter.TimestampToCalendarConverter"/>

diff --git a/sigla-ejb/src/main/resources/it/cnr/contab/service/sigla-service-context.xml b/sigla-ejb/src/main/resources/it/cnr/contab/service/sigla-service-context.xml
@@ -4,6 +4,19 @@
 	xmlns:jee="http://www.springframework.org/schema/jee"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 						http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-2.5.xsd">
+
+
+	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="locations">
+			<list>
+				<value>classpath*:META-INF/spring/*.properties</value>
+				<value>classpath*:*props/axis2.properties</value>
+				<value>classpath*:*/extension/repository.properties</value>
+
+			</list>
+		</property>
+		<property name="ignoreUnresolvablePlaceholders" value="true" />
+	</bean>    
     <import resource="classpath*:it/cnr/contab/cmis/service/cmis-service-context.xml"/>
 
 	<jee:jndi-lookup id="offlineReportComponent"
@@ -15,15 +28,6 @@
    			resource-ref="false">
    	</jee:jndi-lookup>
 
-	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="locations">
-			<list>
-				<value>classpath*:META-INF/spring/*.properties</value>
-				<value>classpath*:*props/axis2.properties</value>
-			</list>
-		</property>
-		<property name="ignoreUnresolvablePlaceholders" value="true" />
-	</bean>
 
 	<bean id="trovatoProperties" class="it.cnr.contab.docamm00.client.TrovatoProperties">
 		<property name="trovatoTargetEndpoint" value="${TrovatoTargetEndpoint}" />