diff --git a/liferay-plugins-sdk-6.2/.ivy/ivy-2.4.0.jar b/liferay-plugins-sdk-6.2/.ivy/ivy-2.4.0.jar new file mode 100644 index 00000000..14ff88e2 Binary files /dev/null and b/liferay-plugins-sdk-6.2/.ivy/ivy-2.4.0.jar differ diff --git a/liferay-plugins-sdk-6.2/build.portos.properties b/liferay-plugins-sdk-6.2/build.portos.properties index c7ef7abd..1fde6a4c 100644 --- a/liferay-plugins-sdk-6.2/build.portos.properties +++ b/liferay-plugins-sdk-6.2/build.portos.properties @@ -1,5 +1,7 @@ # Managed by Liferay IDE (remove this comment to prevent future updates) +#required.portal.jars=commons-logging.jar,log4j.jar,util-bridges.jar,util-taglib.jar + app.server.tomcat.lib.global.dir = /home/portos/bin/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/lib/ext app.server.tomcat.deploy.dir = /home/portos/bin/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/webapps app.server.parent.dir = /home/portos/bin/liferay-portal-6.2-ce-ga6 diff --git a/liferay-plugins-sdk-6.2/build.properties b/liferay-plugins-sdk-6.2/build.properties index 037bc22d..d766664c 100644 --- a/liferay-plugins-sdk-6.2/build.properties +++ b/liferay-plugins-sdk-6.2/build.properties @@ -337,7 +337,7 @@ ivy.custom.settings.file=${sdk.dir}/ivy-settings.xml ivy.home=${sdk.dir}/.ivy - #ivy.jar.url=http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar + #ivy.jar.url=https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar ivy.jar.url=https://cdn.lfrs.sl/repository.liferay.com/nexus/content/repositories/liferay-public-snapshots/com/liferay/org.apache.ivy/${ivy.version}/org.apache.ivy-${ivy.version}.jar ivy.log.level=quiet @@ -391,7 +391,8 @@ ## Libraries ## - required.portal.jars=commons-logging.jar,log4j.jar,util-bridges.jar,util-java.jar,util-taglib.jar + #required.portal.jars=commons-logging.jar,log4j.jar,util-bridges.jar,util-java.jar,util-taglib.jar + required.portal.jars=commons-logging.jar,log4j.jar,util-bridges.jar,util-taglib.jar ## ## Liferay Home diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/commons-csv.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/commons-csv.jar new file mode 100644 index 00000000..e9eb0bd3 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/commons-csv.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jettison.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jettison.jar new file mode 100644 index 00000000..915b6cff Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jettison.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-plugin-package.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-plugin-package.properties index 6b23a5c5..7c7658ac 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-plugin-package.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-plugin-package.properties @@ -11,14 +11,9 @@ licenses=LGPL liferay-versions=6.2.0+ portal-dependency-jars=\ axis.jar,\ - commons-discovery.jar,\ - commons-io.jar,\ - commons-lang.jar,\ - httpclient.jar,\ jaxrpc.jar,\ jstl-api.jar,\ jstl-impl.jar,\ - util-java.jar,\ wsdl4j.jar,\ xml-apis.jar portal-dependency-tlds=\ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/mwg/sismica/bo/util/HttpServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/mwg/sismica/bo/util/HttpServiceUtil.java index 16e5a27a..c5128939 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/mwg/sismica/bo/util/HttpServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/mwg/sismica/bo/util/HttpServiceUtil.java @@ -1,7 +1,5 @@ package it.mwg.sismica.bo.util; -import java.io.IOException; - import flexjson.JSONSerializer; import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil; import it.tref.liferay.portos.bo.shared.protocollo.model.Protocollo; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java index e5b7b0af..12f74ca7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java @@ -117,7 +117,7 @@ public class SismicaUtil { public static Date[] getWeekInterval(int dow) { return getWeekInterval(dow, Calendar.getInstance().getTime()); } - + public static Date[] getWeekInterval(int dow, Date base) { Calendar reference = Calendar.getInstance(); reference.setTime(base); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index 5df24a5a..3de522e6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_bo - build.number=2489 - build.date=1603181114662 + build.number=2503 + build.date=1603196576566 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml index f53f85ff..a1178fa6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml @@ -15,6 +15,13 @@ - + + + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml.MD5 index bbee5340..dfda30f8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml.MD5 @@ -1 +1 @@ -cbfd9c1238d270cd34364cf64600e5a4 +291fbe4be1f094ebfa7c95b6381ba6af diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/bcmail-jdk14.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/bcmail-jdk14.jar new file mode 100644 index 00000000..ab606b5f Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/bcmail-jdk14.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/bcprov-jdk14.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/bcprov-jdk14.jar new file mode 100644 index 00000000..d1befb7f Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/bcprov-jdk14.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/bctsp-jdk14.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/bctsp-jdk14.jar new file mode 100644 index 00000000..058fde1e Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/bctsp-jdk14.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/castor.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/castor.jar new file mode 100644 index 00000000..5a8d7a66 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/castor.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/commons-beanutils.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/commons-beanutils.jar deleted file mode 100644 index 6baf5ecb..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/commons-beanutils.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/commons-digester.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/commons-digester.jar deleted file mode 100644 index 1110f0aa..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/commons-digester.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/dom4j.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/dom4j.jar new file mode 100644 index 00000000..c8c4dbb9 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/dom4j.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/geronimo-stax-api_1.0_spec.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/geronimo-stax-api_1.0_spec.jar new file mode 100644 index 00000000..0d6d3742 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/geronimo-stax-api_1.0_spec.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/iText-2.1.7.js1.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/itext.jar similarity index 100% rename from liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/iText-2.1.7.js1.jar rename to liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/itext.jar diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jOpenDocument-1.3.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jOpenDocument.jar similarity index 100% rename from liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jOpenDocument-1.3.jar rename to liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jOpenDocument.jar diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jackson-annotations.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jackson-annotations.jar new file mode 100644 index 00000000..88064d07 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jackson-annotations.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jackson-core.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jackson-core.jar new file mode 100644 index 00000000..51d1fdeb Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jackson-core.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jackson-databind.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jackson-databind.jar new file mode 100644 index 00000000..20f98992 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jackson-databind.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-fonts-5.0.0.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-fonts.jar similarity index 99% rename from liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-fonts-5.0.0.jar rename to liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-fonts.jar index 63d40a66..c778df33 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-fonts-5.0.0.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-fonts.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-5.0.0.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports.jar similarity index 91% rename from liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-5.0.0.jar rename to liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports.jar index f03768ad..fcc8f8e7 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-5.0.0.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jcommon.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jcommon.jar new file mode 100644 index 00000000..d0dc26de Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jcommon.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jdtcore.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jdtcore.jar new file mode 100644 index 00000000..d9207382 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jdtcore.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jfreechart.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jfreechart.jar new file mode 100644 index 00000000..73be90fd Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jfreechart.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/poi-ooxml-schemas.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/poi-ooxml-schemas.jar new file mode 100644 index 00000000..82282b54 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/poi-ooxml-schemas.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/poi-ooxml.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/poi-ooxml.jar new file mode 100644 index 00000000..5f36eb4e Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/poi-ooxml.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/poi.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/poi.jar new file mode 100644 index 00000000..a08d9535 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/poi.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/stax-api.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/stax-api.jar new file mode 100644 index 00000000..d9a16651 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/stax-api.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/util-java.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/util-java.jar new file mode 100644 index 00000000..6b5d95f8 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/util-java.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/xml-apis.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/xml-apis.jar new file mode 100644 index 00000000..243eaeae Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/xml-apis.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/xmlbeans.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/xmlbeans.jar new file mode 100644 index 00000000..ccd81634 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/xmlbeans.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/liferay-plugin-package.properties b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/liferay-plugin-package.properties index 0fd0bbea..aff29036 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/liferay-plugin-package.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/liferay-plugin-package.properties @@ -12,8 +12,10 @@ liferay-versions=6.2.0+ portal-dependency-jars=\ jstl-api.jar,\ jstl-impl.jar,\ - commons-io.jar,\ + commons-beanutils.jar,\ commons-codec.jar,\ + commons-digester.jar,\ + commons-io.jar,\ commons-lang.jar,\ commons-collections.jar portal-dependency-tlds=\ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml index cca38d16..0494954f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml @@ -11,8 +11,14 @@ - - - + + + + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml.MD5 index 4b52827d..6c98f10f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml.MD5 @@ -1 +1 @@ -e06b82dc0c33b2acbc1b260acdbf8b8c +8ac2501ca718b6e57f0038572748dfb3