Gestione della configurazione e delle mail

consiglionazionaledellericerche · Jul 7, 2016 · 3059e2f · 3059e2f
1 parent 9ed608f
commit 3059e2f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/SIGLA/pom.xml b/SIGLA/pom.xml
@@ -36,7 +36,8 @@
                                 org.wildfly.extension.undertow,
                                 io.undertow.core,
                                 io.undertow.servlet,
-                                org.apache.cxf
+                                org.apache.cxf,
+                                it.cnr.sigla.configuration
                             </Dependencies>
             </manifestEntries>
           </archive>

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
 		<java.version>1.8</java.version>
 		<opencmis.version>0.10.0</opencmis.version>
 		<spring.version>3.0.3.RELEASE</spring.version>
-		<jada.version>3.0.5</jada.version>
+		<jada.version>3.0.6</jada.version>
 		<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
 		<sigla.build.number>${maven.build.timestamp}</sigla.build.number>		
 		<slf4j.version>1.7.21</slf4j.version>

diff --git a/sigla-ejb/src/main/java/it/cnr/contab/doccont00/bp/FirmaDigitaleDOC1210BP.java b/sigla-ejb/src/main/java/it/cnr/contab/doccont00/bp/FirmaDigitaleDOC1210BP.java
@@ -67,7 +67,6 @@ public void openIterator(ActionContext actioncontext)
 						((CNRUserContext) actioncontext.getUserContext()).getCd_unita_organizzativa());				
 			}
 			setBaseclause(compoundfindclause);
-			EJBCommonServices.closeRemoteIterator(getIterator());		
 			Lettera_pagam_esteroBulk lettera = (Lettera_pagam_esteroBulk) getModel();
 			Lettera_pagam_esteroBulk letteraAll = new Lettera_pagam_esteroBulk();
 			letteraAll.setStato_trasmissione(null);

diff --git a/sigla-ejb/src/main/java/it/cnr/contab/doccont00/bp/FirmaDigitaleMandatiBP.java b/sigla-ejb/src/main/java/it/cnr/contab/doccont00/bp/FirmaDigitaleMandatiBP.java
@@ -117,7 +117,6 @@ public void openIterator(ActionContext actioncontext)
 			setBaseclause(compoundfindclause);
 
 			V_mandato_reversaleBulk v_mandato_reversaleBulk = (V_mandato_reversaleBulk) getModel();
-			EJBCommonServices.closeRemoteIterator(getIterator());
 			setIterator(actioncontext, find(actioncontext, compoundfindclause, v_mandato_reversaleBulk.getStato_trasmissione().equalsIgnoreCase(StatoTrasmissione.ALL) ? new V_mandato_reversaleBulk() : v_mandato_reversaleBulk));
 		} catch (RemoteException e) {
 			throw new BusinessProcessException(e);

diff --git a/sigla-ejb/src/main/java/it/cnr/contab/util00/bulk/cmis/AllegatoGenericoBulk.java b/sigla-ejb/src/main/java/it/cnr/contab/util00/bulk/cmis/AllegatoGenericoBulk.java
@@ -59,6 +59,8 @@ public boolean isNodePresent(){
 	}
 
 	public Document getDocument(SiglaCMISService service) throws ApplicationException {
+		if (!isNodePresent())
+			return null;
 		return (Document)service.getNodeByNodeRef(nodeRef);
 	}
 

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
@@ -10,8 +10,8 @@
 		<property name="locations">
 			<list>
 				<value>classpath*:META-INF/spring/*.properties</value>
-				<value>classpath*:*props/axis2.properties</value>
-				<value>classpath*:*/extension/repository.properties</value>
+				<value>classpath*:axis2.properties</value>
+				<value>classpath*:repository.properties</value>
 			</list>
 		</property>
 		<property name="ignoreUnresolvablePlaceholders" value="true" />