Change init of spring applicationContext

consiglionazionaledellericerche · Jan 31, 2018 · e97e5cf · e97e5cf
1 parent 208ba8f
commit e97e5cf
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 45 deletions.
diff --git a/sigla-ejb/src/main/java/it/cnr/contab/service/SpringUtil.java b/sigla-ejb/src/main/java/it/cnr/contab/service/SpringUtil.java
@@ -1,26 +1,29 @@
 package it.cnr.contab.service;
 
+import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.stereotype.Component;
 
-public final class SpringUtil {
-	private static BeanFactory beanFactory;
-
-	static {
-		ClassPathXmlApplicationContext appContext = new ClassPathXmlApplicationContext(
-				new String[] {"it/cnr/contab/service/sigla-service-context.xml"});
-		beanFactory =  (BeanFactory) appContext;
-	}
+@Component
+public class SpringUtil implements ApplicationContextAware{
+	private static ApplicationContext CONTEXT;
 
 	public static <T extends Object> T getBean(String beanName, Class<T> clazz){
-		return (T) beanFactory.getBean(beanName, clazz);
+		return (T) CONTEXT.getBean(beanName, clazz);
 	}
 
 	public static <T extends Object> T getBean(Class<T> clazz){
-		return (T) beanFactory.getBean(clazz);
+		return (T) CONTEXT.getBean(clazz);
 	}
 	public static boolean containsBean(String name) {
-		return beanFactory.containsBean(name);
+		return CONTEXT.containsBean(name);
 	}
 
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		CONTEXT = applicationContext;
+	}
 }
diff --git a/sigla-ejb/src/main/resources/META-INF/persistence.xml b/sigla-ejb/src/main/resources/META-INF/persistence.xml
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
@@ -21,7 +21,7 @@
 		<property name="systemPropertiesMode" value="2"/>
 	</bean>
 
-	<context:component-scan base-package="it.cnr.contab.spring" />
+	<context:component-scan base-package="it.cnr.contab.spring, it.cnr.contab.service" />
 
 	<import resource="classpath*:it/cnr/contab/storage/service/storage-service-context.xml"/>
 	<import resource="classpath*:it/cnr/contab/service/sdi-client-service-context.xml"/>

diff --git a/...cmis/src/main/java/it/cnr/contab/spring/storage/config/CMISSiglaStorageConfiguration.java b/...cmis/src/main/java/it/cnr/contab/spring/storage/config/CMISSiglaStorageConfiguration.java
@@ -83,8 +83,13 @@ public SiglaStorageService storageService() {
 
             @Override
             public void init() {
-                this.siglaSession = createSession();
-                createBindingSession();
+                try {
+                    this.siglaSession = createSession();
+                    createBindingSession();
+                } catch (CmisConnectionException _ex) {
+                    logger.error("Cannot access to CMIS repository", _ex);
+                }
+
             }
 
             public Session createSession(){

diff --git a/sigla-web/src/main/webapp/WEB-INF/web.xml b/sigla-web/src/main/webapp/WEB-INF/web.xml
@@ -11,6 +11,16 @@
 	<listener>
 		<listener-class>it.cnr.contab.util.servlet.ExpireSessionServlet</listener-class>
 	</listener>
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>classpath:it/cnr/contab/service/sigla-service-context.xml</param-value>
+	</context-param>
+
+	<listener>
+		<listener-class>
+			org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>
 	<servlet>
 		<servlet-name>ActionServlet</servlet-name>
 		<servlet-class>it.cnr.jada.action.ActionServlet</servlet-class>

diff --git a/sigla-ws-client/src/main/resources/it/cnr/contab/service/sdi-client-service-context.xml b/sigla-ws-client/src/main/resources/it/cnr/contab/service/sdi-client-service-context.xml
@@ -16,10 +16,10 @@
     	</property>
 		<property name="schemas">
 			<list>
-				<value>/xsd/TrasmissioneTypes_v1.1.xsd</value>
-				<value>/xsd/MessaggiTypes_v1.1.xsd</value>
-				<value>/xsd/RicezioneTypes_v1.0.xsd</value>
-				<value>/xsd/MonitoraggioTypes_v1.0.xsd</value>
+				<value>classpath:xsd/TrasmissioneTypes_v1.1.xsd</value>
+				<value>classpath:xsd/MessaggiTypes_v1.1.xsd</value>
+				<value>classpath:xsd/RicezioneTypes_v1.0.xsd</value>
+				<value>classpath:xsd/MonitoraggioTypes_v1.0.xsd</value>
 			</list>
 		</property>
 	</bean>

diff --git a/src/main/docker/standalone/configuration/standalone.xml b/src/main/docker/standalone/configuration/standalone.xml
@@ -189,7 +189,7 @@
                         <idle-timeout-minutes>5</idle-timeout-minutes>
                     </timeout>
                 </datasource>
-                <datasource jndi-name="java:/jdbc/GECO" pool-name="InformixDSSIGLAPool" enabled="true" use-java-context="true" statistics-enabled="true">
+                <datasource jndi-name="java:/jdbc/GECO" pool-name="InformixDSSIGLAPool" enabled="${env.SIGLA_INFORMIX_ENABLE:true}" use-java-context="true" statistics-enabled="true">
                     <connection-url>jdbc:informix-sqli://${env.INFORMIX_HOST:150.146.206.10}:1526/geco:INFORMIXSERVER=ius_dbserverdev1_tcp</connection-url>
                     <driver>informix</driver>
                     <pool>