BugID: 558 - Firma digitale alle Variazioni al Piano di Gestione

consiglionazionaledellericerche · Mar 2, 2011 · 2f2cbd6 · 2f2cbd6
1 parent 0630a64
commit 2f2cbd6
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 40 deletions.
diff --git a/SIGLA/pom.xml b/SIGLA/pom.xml
@@ -206,7 +206,7 @@
     </dependency>
    </dependencies>
   <properties>
-  	<cmisdl.version>1.4</cmisdl.version>
+  	<cmisdl.version>1.5</cmisdl.version>
   	<spring.version>2.5.6</spring.version>
   	<jada.version>2.0.0</jada.version>
   	<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>

diff --git a/SIGLA/src/main/application/META-INF/services/javax.xml.bind.JAXBContext b/SIGLA/src/main/application/META-INF/services/javax.xml.bind.JAXBContext
diff --git a/sigla-ejb/pom.xml b/sigla-ejb/pom.xml
@@ -153,7 +153,7 @@
     </dependency>
   </dependencies>
   <properties>
-  	<cmisdl.version>1.4</cmisdl.version>
+  	<cmisdl.version>1.5</cmisdl.version>
   	<spring.version>2.5.6</spring.version>
   	<jada.version>2.0.0</jada.version>
   	<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>

diff --git a/sigla-ejb/src/main/java/it/cnr/contab/cmis/converter/PropertyDefinitionBulk.java b/sigla-ejb/src/main/java/it/cnr/contab/cmis/converter/PropertyDefinitionBulk.java
@@ -11,9 +11,9 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Arrays;
 
 import org.apache.chemistry.opencmis.client.api.Property;
-import org.apache.chemistry.opencmis.client.runtime.PersistentPropertyImpl;
 import org.apache.chemistry.opencmis.commons.definitions.PropertyDefinition;
 import org.apache.commons.httpclient.Credentials;
 
@@ -44,6 +44,6 @@ public Property<T> createProperty(Credentials systemCredentials, OggettoBulk ogg
 			value = (T)Introspector.invoke(oggettoBulk, method);
 		if (value == null)
 			throw new PropertyNullValueException();		
-		return SpringUtil.getBean("dictionaryService", DictionaryService.class).createProperty(systemCredentials, propertyDefinition, value);
+		return SpringUtil.getBean("dictionaryService", DictionaryService.class).createProperty(systemCredentials, propertyDefinition, Arrays.asList(value));
 	}
 }
diff --git a/sigla-ejb/src/main/java/it/cnr/contab/cmis/service/CMISBulkInfo.java b/sigla-ejb/src/main/java/it/cnr/contab/cmis/service/CMISBulkInfo.java
@@ -1,35 +1,18 @@
 package it.cnr.contab.cmis.service;
 
-import it.cnr.cmisdl.model.Node;
-import it.cnr.cmisdl.model.paging.ListNodePage;
-import it.cnr.cmisdl.model.property.AspectMetdata;
-import it.cnr.cmisdl.service.AuthenticationService;
-import it.cnr.cmisdl.service.ContentService;
 import it.cnr.cmisdl.service.DictionaryService;
-import it.cnr.cmisdl.service.NodeService;
-import it.cnr.cmisdl.service.SearchService;
-import it.cnr.contab.cmis.CMISRelationship;
-import it.cnr.contab.cmis.acl.Permission;
 import it.cnr.contab.cmis.annotation.CMISPolicy;
 import it.cnr.contab.cmis.annotation.CMISProperties;
 import it.cnr.contab.cmis.annotation.CMISProperty;
 import it.cnr.contab.cmis.annotation.CMISType;
-import it.cnr.contab.cmis.converter.Converter;
 import it.cnr.contab.cmis.converter.PropertyDefinitionBulk;
-import it.cnr.contab.reports.bulk.Report;
-import it.cnr.contab.service.SpringUtil;
 import it.cnr.jada.bulk.OggettoBulk;
-import it.cnr.jada.util.Introspector;
 
-import java.beans.IntrospectionException;
-import java.io.InputStream;
 import java.io.Serializable;
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -39,13 +22,8 @@
 
 import org.apache.chemistry.opencmis.client.api.ObjectType;
 import org.apache.chemistry.opencmis.client.api.Property;
-import org.apache.chemistry.opencmis.client.runtime.PersistentPropertyImpl;
-import org.apache.chemistry.opencmis.commons.PropertyIds;
 import org.apache.chemistry.opencmis.commons.definitions.PropertyDefinition;
-import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
-import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
 import org.apache.commons.httpclient.Credentials;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

diff --git a/sigla-ejb/src/main/java/it/cnr/contab/cmis/service/CMISService.java b/sigla-ejb/src/main/java/it/cnr/contab/cmis/service/CMISService.java
@@ -102,20 +102,20 @@ public CMISPath createFolderIfNotPresent(CMISPath cmisPath, String folderName, S
 			metadataProperties.add(
 					nodeService.getDictionaryService().createProperty(systemCredentials, 
 							BaseTypeId.CMIS_FOLDER.value(), 
-							PropertyIds.NAME, folderName));
+							PropertyIds.NAME, Arrays.asList(folderName)));
 			aspectsToAdd.add(AspectMetdata.getCmisAspectName(AspectMetdata.ASPECT_TITLED));
 			if (title != null)
 				aspectProperties.add(
 					nodeService.getDictionaryService().createProperty(systemCredentials, 
 							AspectMetdata.getCmisAspectName(AspectMetdata.ASPECT_TITLED), 
 							AspectMetdata.getPrefixLocalPart(AspectMetdata.PROPERTY_TITLE), 
-							title));
+							Arrays.asList(title)));
 			if (description != null)
 				aspectProperties.add(
 					nodeService.getDictionaryService().createProperty(systemCredentials, 
 							AspectMetdata.getCmisAspectName(AspectMetdata.ASPECT_TITLED), 
 							AspectMetdata.getPrefixLocalPart(AspectMetdata.PROPERTY_DESCRIPTION), 
-							description));			
+							Arrays.asList(description)));			
 			Node folder = nodeService.createFolder(systemCredentials, node, metadataProperties, aspectsToAdd, aspectProperties);
 			return CMISPath.construct(folder.getPath());
 		}catch(CmisConstraintException _ex){

diff --git a/sigla-ejb/src/main/java/it/cnr/contab/config00/bulk/Parametri_cdsBase.java b/sigla-ejb/src/main/java/it/cnr/contab/config00/bulk/Parametri_cdsBase.java
@@ -1,11 +1,9 @@
 package it.cnr.contab.config00.bulk;
 
-import java.math.BigDecimal;
-
-import it.cnr.contab.config00.sto.bulk.CdrBulk;
-import it.cnr.contab.doccont00.core.bulk.Linea_attivitaBulk;
 import it.cnr.jada.persistency.Keyed;
 
+import java.math.BigDecimal;
+
 /**
  * Creation date: (12/11/2004)
  * @author Aurelio D'Amico
@@ -31,6 +29,7 @@ public class Parametri_cdsBase extends Parametri_cdsKey implements Keyed {
 	private String cd_cdr_linea_pgiro_s;
 	private String cd_linea_pgiro_s;
 	private Boolean fl_blocco_iban;
+	private Boolean fl_kit_firma_digitale;
 	// IM_SOGLIA_CONTRATTO_S NUMBER(15,2) NULL
 	private BigDecimal im_soglia_contratto_s;
 
@@ -264,5 +263,10 @@ public Boolean getFl_blocco_iban() {
 	public void setFl_blocco_iban(Boolean fl_blocco_iban) {
 		this.fl_blocco_iban = fl_blocco_iban;
 	}
-
+	public Boolean getFl_kit_firma_digitale() {
+		return fl_kit_firma_digitale;
+	}
+	public void setFl_kit_firma_digitale(Boolean fl_kit_firma_digitale) {
+		this.fl_kit_firma_digitale = fl_kit_firma_digitale;
+	}
 }
diff --git a/sigla-ejb/src/main/java/it/cnr/contab/pdg00/bp/FirmaDigitalePdgVariazioniBP.java b/sigla-ejb/src/main/java/it/cnr/contab/pdg00/bp/FirmaDigitalePdgVariazioniBP.java
@@ -5,6 +5,7 @@
 import it.cnr.contab.cmis.CMISAspect;
 import it.cnr.contab.cmis.CMISRelationship;
 import it.cnr.contab.cmis.service.CMISPath;
+import it.cnr.contab.config00.bulk.Parametri_cdsBulk;
 import it.cnr.contab.config00.bulk.Parametri_enteBulk;
 import it.cnr.contab.config00.bulk.ServizioPecBulk;
 import it.cnr.contab.config00.sto.bulk.CdrBulk;
@@ -319,9 +320,21 @@ public Node getNodeFileFirmato(Node nodePdf) {
 	public void sign(ActionContext context) throws BusinessProcessException {
 		try {
 			ArchiviaStampaPdgVariazioneBulk archiviaStampaPdgVariazioneBulk = (ArchiviaStampaPdgVariazioneBulk) getFocusedElement();
-			caricaDatiPEC(context);
-			setSignEnabled(true);
-			setSignFile(true);
+			Parametri_cdsBulk  parametriCds = Utility.createParametriCdsComponentSession().
+				getParametriCds(context.getUserContext(), 
+								CNRUserContext.getCd_cds(context.getUserContext()), 
+								CNRUserContext.getEsercizio(context.getUserContext()));
+			if (parametriCds.getFl_kit_firma_digitale()){
+				caricaDatiPEC(context);
+				setSignEnabled(true);
+				setSignFile(true);
+			}else{
+				pdgVariazioniService.addAspect(archiviaStampaPdgVariazioneBulk
+						.getPdgVariazioneDocument().getNode(),
+						CMISAspect.CNR_SIGNEDDOCUMENT.value());
+				setFocusedElement(context, null);
+				refresh(context);
+			}
 		} catch (Throwable e) {
 			throw new BusinessProcessException(e);
 		}

diff --git a/sigla-ejb/src/main/resources/it/cnr/contab/config00/bulk/Parametri_cdsBasePersistentInfo.xml b/sigla-ejb/src/main/resources/it/cnr/contab/config00/bulk/Parametri_cdsBasePersistentInfo.xml
@@ -180,6 +180,14 @@
 			columnSize="1"
 			nullable="true"
 			converterClassName="it.cnr.jada.persistency.sql.CHARToBooleanConverter" />	
+		<columnMapping
+			columnName="FL_KIT_FIRMA_DIGITALE"
+			propertyName="fl_kit_firma_digitale"
+			sqlTypeName="CHAR"
+			columnSize="1"
+			nullable="true"
+			converterClassName="it.cnr.jada.persistency.sql.CHARToBooleanConverter" />						
+
 	</defaultColumnMap>
 	<persistentProperty
 		name="blocco_impegni_cdr_gae" />	
@@ -236,5 +244,7 @@
 	<persistentProperty
 		name="cd_linea_pgiro_s" /> 
 	<persistentProperty
-		name="fl_blocco_iban" />	
+		name="fl_blocco_iban" />
+	<persistentProperty
+		name="fl_kit_firma_digitale" />	
 </SQLPersistentInfo>
diff --git a/sigla-ejb/src/main/resources/it/cnr/contab/config00/bulk/Parametri_cdsBulkInfo.xml b/sigla-ejb/src/main/resources/it/cnr/contab/config00/bulk/Parametri_cdsBulkInfo.xml
@@ -193,6 +193,12 @@
 		property="fl_blocco_iban"
 		inputType="CHECKBOX" 
 		label="Messaggio bloccante mancanza Iban"/>					
+	<fieldProperty
+		name="fl_kit_firma_digitale"
+		property="fl_kit_firma_digitale"
+		inputType="CHECKBOX" 
+		label="In possesso del Kit di Firma Digitale"/>					
+
 	<formFieldProperty name="esercizio" />
 	<formFieldProperty name="centro_spesa" />		
 	<formFieldProperty name="fl_commessa_obbligatoria" />
@@ -219,6 +225,7 @@
  	<formFieldProperty name="cd_cdr_linea_pgiro_s" />  
 	<formFieldProperty name="cd_linea_pgiro_s" /> 
 	<formFieldProperty name="fl_blocco_iban" />
+	<formFieldProperty name="fl_kit_firma_digitale" />
 
 	<columnFieldProperty name="esercizio" />
 	<columnFieldProperty name="cd_unita_organizzativa" />
@@ -249,6 +256,7 @@
  	<columnFieldProperty name="cd_cdr_linea_pgiro_s" /> 
 	<columnFieldProperty name="cd_linea_pgiro_s" />   
 	<columnFieldProperty name="fl_blocco_iban" />
+	<columnFieldProperty name="fl_kit_firma_digitale" />
 
 	<findFieldProperty name="cd_unita_organizzativa" />
 	<findFieldProperty name="fl_commessa_obbligatoria" />
@@ -277,4 +285,5 @@
 	<findFieldProperty name="cd_cdr_linea_pgiro_s" /> 
 	<findFieldProperty name="cd_linea_pgiro_s" />  
 	<findFieldProperty name="fl_blocco_iban" />
+	<findFieldProperty name="fl_kit_firma_digitale" />
 </bulkInfo>
diff --git a/sigla-web/pom.xml b/sigla-web/pom.xml
@@ -110,7 +110,7 @@
     </dependency>
   </dependencies>
   <properties>
-  	<cmisdl.version>1.4</cmisdl.version>
+  	<cmisdl.version>1.5</cmisdl.version>
   	<jada.version>2.0.0</jada.version>
   	<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
   </properties>