bbcc
/
paesaggistica
5
0
Forka 0
Codice Problemi Pull Requests Progetti Rilasci Wiki Attività
Sfoglia il codice sorgente

Merge branch 'develop' of https://gitea.lavoripubblici.sicilia.it/bbcc/paesaggistica into develop 

# Conflicts:
#	.gitignore
#	liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar
#	liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar
#	liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar
#	liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar
#	liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar
#	liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar
#	liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar
#	liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar
#	liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar
#	liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar
develop
E-A 2 anni fa
parent
f5998d0724 753c925ec6
commit
bee6ef4b81
19 ha cambiato i file con 24 aggiunte e 111 eliminazioni
Spazi bianchi
Visualizza tutti i cambiamenti Ignora spazi bianchi quando confronti le linee Ignora cambiamenti di quantità di spazi bianchi Ignora cambiamenti di spazi bianchi alla fine delle linee
Visualizzazione unificata
Opzioni Diff
Mostra statistiche Scarica il file Patch Scarica il file Diff
  1. 1
      .gitignore
  2. 10
      liferay-plugins-sdk-6.2/build.marco.properties
  3. 8
      liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.component
  4. BIN
      liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar
  5. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath
  6. 12
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component
  7. BIN
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar
  8. 12
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java
  9. 5
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraProtocollo.java
  10. 4
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
  11. 8
      liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.wst.common.component
  12. 11
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component
  13. 8
      liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.component
  14. 8
      liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.component
  15. 11
      liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.wst.common.component
  16. 8
      liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.component
  17. 8
      liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.component
  18. 18
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.component
  19. 1
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/.gitignore

1
.gitignore vendored
Unescape Vedi File

@ -9,3 +9,4 @@
.DS_Store .DS_Store
._* ._*
liferay-plugins-sdk-6.2/sonar-scanner-4.8.0.2856-windows/ liferay-plugins-sdk-6.2/sonar-scanner-4.8.0.2856-windows/
.settings

10
liferay-plugins-sdk-6.2/build.marco.properties
Unescape Vedi File

@ -0,0 +1,10 @@
# Managed by Liferay IDE (remove this comment to prevent future updates)
#Managed by Liferay IDE (remove this comment to prevent future updates)
#Fri Feb 10 15:41:28 CET 2023
app.server.tomcat.lib.global.dir = C:\\liferay-sviluppo\\sicilia\\paesaggistica\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\lib\\ext
app.server.tomcat.deploy.dir = C:\\liferay-sviluppo\\sicilia\\paesaggistica\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\webapps
app.server.parent.dir = C:\\liferay-sviluppo\\sicilia\\paesaggistica\\liferay-portal-6.2-ce-ga6-patched6.2.5
app.server.tomcat.dir = C:\\liferay-sviluppo\\sicilia\\paesaggistica\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62
app.server.type = tomcat
app.server.tomcat.portal.dir = C:\\liferay-sviluppo\\sicilia\\paesaggistica\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\webapps\\ROOT

8
liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.component
Unescape Vedi File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="portos-accesso-atti-portlet">
<wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
<property name="context-root" value="portos-accesso-atti-portlet"/>
<property name="java-output-path" value="/portos-accesso-atti-portlet/docroot/WEB-INF/classes"/>
</wb-module>
</project-modules>

BIN
liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar
Vedi File

File binario non mostrato.

2
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath
Unescape Vedi File

@ -2,7 +2,7 @@
<classpath> <classpath>
<classpathentry kind="src" path="docroot/WEB-INF/src"/> <classpathentry kind="src" path="docroot/WEB-INF/src"/>
<classpathentry kind="src" output="docroot/WEB-INF/classes-service" path="docroot/WEB-INF/service"/> <classpathentry kind="src" output="docroot/WEB-INF/classes-service" path="docroot/WEB-INF/service"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="owner.project.facets" value="java"/>
</attributes> </attributes>

12
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component
Unescape Vedi File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="portos-bo-portlet">
<wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/service"/>
<dependent-module archiveName="hms-taglib-hook-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/hms-taglib-hook/docroot/WEB-INF/lib/hms-taglib-hook-service.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="portos-bo-portlet"/>
<property name="java-output-path" value="/portos-bo-portlet/docroot/WEB-INF/classes"/>
</wb-module>
</project-modules>

BIN
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar
Vedi File

File binario non mostrato.

12
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java
Unescape Vedi File

@ -408,17 +408,17 @@ public class SismicaUtil {
} }
public static List<String> riparaWorkflow(long companyId, long userId) { public static List<String> riparaWorkflow(long companyId, long userId) {
_log.info("avvio riparaWorkflow");
List<String> esito = new ArrayList<>(); List<String> esito = new ArrayList<>();
esito.addAll(riparaControlli(companyId)); esito.addAll(riparaControlli(companyId));
esito.addAll(riparaAssegnazioniAlRuolo(companyId, userId)); esito.addAll(riparaAssegnazioniAlRuolo(companyId, userId));
esito.addAll(creaWorkflowMancanti(companyId)); esito.addAll(creaWorkflowMancanti(companyId));
esito.addAll(riparaContextWorkflow(companyId)); esito.addAll(riparaContextWorkflow(companyId));
try { // try {
esito.addAll(riparaDocumenti(companyId)); // esito.addAll(riparaDocumenti(companyId));
} catch (SystemException | PortalException e) { // } catch (SystemException | PortalException e) {
esitoLog(esito, "Errore durante l'elaborazione: " + e.getMessage()); // esitoLog(esito, "Errore durante l'elaborazione: " + e.getMessage());
} // }
return esito; return esito;
} }

5
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraProtocollo.java
Unescape Vedi File

@ -33,7 +33,7 @@ public class SchedulerGeneraProtocollo implements MessageListener {
private static final Lock lock = new ReentrantLock(); private static final Lock lock = new ReentrantLock();
private static final int SIZE = 10; private static final int SIZE = 20;
@Override @Override
public void receive(Message message) throws MessageListenerException { public void receive(Message message) throws MessageListenerException {
@ -52,7 +52,8 @@ public class SchedulerGeneraProtocollo implements MessageListener {
if (Validator.isNotNull(fileEntryBase)) { if (Validator.isNotNull(fileEntryBase)) {
generaProtocollo(avviso, fileEntryBase); generaProtocollo(avviso, fileEntryBase);
} }
} catch (PortalException e) { } catch (Exception e) {
_log.error(e,e);
if (_log.isDebugEnabled()) { if (_log.isDebugEnabled()) {
_log.debug("SchedulerGeneraProtocollo - non esiste file base | avvisoId=" + avvisoId); _log.debug("SchedulerGeneraProtocollo - non esiste file base | avvisoId=" + avvisoId);
} }

4
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
Unescape Vedi File

@ -13,8 +13,8 @@
## ##
build.namespace=portos_bo build.namespace=portos_bo
build.number=3614 build.number=3615
build.date=1675846543921 build.date=1676387649056
build.auto.upgrade=true build.auto.upgrade=true
## ##

8
liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.wst.common.component
Unescape Vedi File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="portos-comunicazioni-portlet">
<wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
<property name="context-root" value="portos-comunicazioni-portlet"/>
<property name="java-output-path" value="/portos-comunicazioni-portlet/docroot/WEB-INF/classes"/>
</wb-module>
</project-modules>

11
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component
Unescape Vedi File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="portos-fe-portlet">
<wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
<dependent-module archiveName="hms-taglib-hook-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/hms-taglib-hook/docroot/WEB-INF/lib/hms-taglib-hook-service.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="portos-fe-portlet"/>
<property name="java-output-path" value="/portos-fe-portlet/docroot/WEB-INF/classes"/>
</wb-module>
</project-modules>

8
liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.component
Unescape Vedi File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="portos-firma-portlet">
<wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
<property name="context-root" value="portos-firma-portlet"/>
<property name="java-output-path" value="/portos-firma-portlet/docroot/WEB-INF/classes"/>
</wb-module>
</project-modules>

8
liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.component
Unescape Vedi File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="portos-kaleo-controller-portlet">
<wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
<property name="context-root" value="portos-kaleo-controller-portlet"/>
<property name="java-output-path" value="/portos-kaleo-controller-portlet/docroot/WEB-INF/classes"/>
</wb-module>
</project-modules>

11
liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.wst.common.component
Unescape Vedi File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="portos-notification-portlet">
<wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
<dependent-module archiveName="portos-kaleo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="portos-notification-portlet"/>
<property name="java-output-path" value="/portos-notification-portlet/docroot/WEB-INF/classes"/>
</wb-module>
</project-modules>

8
liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.component
Unescape Vedi File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="portos-report-engine-portlet">
<wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
<property name="context-root" value="portos-report-engine-portlet"/>
<property name="java-output-path" value="/portos-report-engine-portlet/docroot/WEB-INF/classes"/>
</wb-module>
</project-modules>

8
liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.component
Unescape Vedi File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="sicilia-sue-connector-portlet">
<wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
<property name="context-root" value="sicilia-sue-connector-portlet"/>
<property name="java-output-path" value="/sicilia-sue-connector-portlet/docroot/WEB-INF/classes"/>
</wb-module>
</project-modules>

18
liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.component
Unescape Vedi File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="portos-kaleo-web">
<wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/service"/>
<dependent-module archiveName="portos-kaleo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="portos-kaleo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="portos-kaleo-web"/>
<property name="java-output-path" value="/portos-kaleo-web/docroot/WEB-INF/classes"/>
</wb-module>
</project-modules>

1
liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/.gitignore vendored
Unescape Vedi File

@ -0,0 +1 @@
/classes/
Scrivi Anteprima
Caricamento…
Annulla
Salva