diff --git a/liferay-plugins-sdk-6.2/.idea/.gitignore b/liferay-plugins-sdk-6.2/.idea/.gitignore new file mode 100644 index 00000000..0a8642fa --- /dev/null +++ b/liferay-plugins-sdk-6.2/.idea/.gitignore @@ -0,0 +1,10 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Zeppelin ignored files +/ZeppelinRemoteNotebooks/ diff --git a/liferay-plugins-sdk-6.2/.idea/ant.xml b/liferay-plugins-sdk-6.2/.idea/ant.xml new file mode 100644 index 00000000..a2a47698 --- /dev/null +++ b/liferay-plugins-sdk-6.2/.idea/ant.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/.idea/jpa-buddy.xml b/liferay-plugins-sdk-6.2/.idea/jpa-buddy.xml new file mode 100644 index 00000000..966d5f56 --- /dev/null +++ b/liferay-plugins-sdk-6.2/.idea/jpa-buddy.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/.idea/misc.xml b/liferay-plugins-sdk-6.2/.idea/misc.xml new file mode 100644 index 00000000..d33591e1 --- /dev/null +++ b/liferay-plugins-sdk-6.2/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/.idea/vcs.xml b/liferay-plugins-sdk-6.2/.idea/vcs.xml new file mode 100644 index 00000000..6c0b8635 --- /dev/null +++ b/liferay-plugins-sdk-6.2/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/build.ebusu.properties b/liferay-plugins-sdk-6.2/build.ebusu.properties new file mode 100644 index 00000000..1308417d --- /dev/null +++ b/liferay-plugins-sdk-6.2/build.ebusu.properties @@ -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) +#Tue Feb 07 14:49:02 CET 2023 +app.server.tomcat.lib.global.dir = C:\\progetti\\paesaggistica\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\lib\\ext +app.server.tomcat.deploy.dir = C:\\progetti\\paesaggistica\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\webapps +app.server.parent.dir = C:\\progetti\\paesaggistica\\liferay-portal-6.2-ce-ga6-patched6.2.5 +app.server.tomcat.dir = C:\\progetti\\paesaggistica\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62 +app.server.type = tomcat +app.server.tomcat.portal.dir = C:\\progetti\\paesaggistica\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\webapps\\ROOT diff --git a/liferay-plugins-sdk-6.2/dependencies/aQute.bnd/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/dependencies/aQute.bnd/ivy.xml.MD5 index 42e42084..ccd674b0 100644 --- a/liferay-plugins-sdk-6.2/dependencies/aQute.bnd/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/dependencies/aQute.bnd/ivy.xml.MD5 @@ -1 +1 @@ -45b38289274e4397c600a212c5477afa +b2996cd58c16b53d0e5cba6f59304ace diff --git a/liferay-plugins-sdk-6.2/dependencies/com.liferay.ant.bnd/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/dependencies/com.liferay.ant.bnd/ivy.xml.MD5 index 0bfa3aa2..c2efd29f 100644 --- a/liferay-plugins-sdk-6.2/dependencies/com.liferay.ant.bnd/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/dependencies/com.liferay.ant.bnd/ivy.xml.MD5 @@ -1 +1 @@ -9e586203944d7fe5baccd02ed7bf20c1 +edfd9cc2944faf63dd7d39e25283a4b6 diff --git a/liferay-plugins-sdk-6.2/dependencies/com.liferay.jasper.jspc/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/dependencies/com.liferay.jasper.jspc/ivy.xml.MD5 index d5ec36d5..158f1a5d 100644 --- a/liferay-plugins-sdk-6.2/dependencies/com.liferay.jasper.jspc/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/dependencies/com.liferay.jasper.jspc/ivy.xml.MD5 @@ -1 +1 @@ -cf39082434c04fdd3a9563acce7cb551 +a7d8aaa34b7d1028a4d449b5ab8f767e diff --git a/liferay-plugins-sdk-6.2/dependencies/net.sourceforge.pmd/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/dependencies/net.sourceforge.pmd/ivy.xml.MD5 index e312ada4..3cbade7b 100644 --- a/liferay-plugins-sdk-6.2/dependencies/net.sourceforge.pmd/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/dependencies/net.sourceforge.pmd/ivy.xml.MD5 @@ -1 +1 @@ -6ad0549f4c64b52b40d871393d72f9aa +4b40da73b53b5860b9adbb52cde18473 diff --git a/liferay-plugins-sdk-6.2/dependencies/net.sourceforge.pmd/lib/commons-io.jar b/liferay-plugins-sdk-6.2/dependencies/net.sourceforge.pmd/lib/commons-io.jar index 00556b11..90035a4f 100644 Binary files a/liferay-plugins-sdk-6.2/dependencies/net.sourceforge.pmd/lib/commons-io.jar and b/liferay-plugins-sdk-6.2/dependencies/net.sourceforge.pmd/lib/commons-io.jar differ diff --git a/liferay-plugins-sdk-6.2/dependencies/org.apache.maven.maven.ant.tasks/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/dependencies/org.apache.maven.maven.ant.tasks/ivy.xml.MD5 index eac6c7a9..348d2b3f 100644 --- a/liferay-plugins-sdk-6.2/dependencies/org.apache.maven.maven.ant.tasks/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/dependencies/org.apache.maven.maven.ant.tasks/ivy.xml.MD5 @@ -1 +1 @@ -2aae42c5c43b993944b8c0fe9e31d5fb +0b9e4199159f29548166ac11ab8d12c0 diff --git a/liferay-plugins-sdk-6.2/dependencies/org.codehaus.groovy/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/dependencies/org.codehaus.groovy/ivy.xml.MD5 index 3c011ccf..c928e5f7 100644 --- a/liferay-plugins-sdk-6.2/dependencies/org.codehaus.groovy/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/dependencies/org.codehaus.groovy/ivy.xml.MD5 @@ -1 +1 @@ -e1a7d560dfc36faf61c7d7da67bb03df +8f22881d5bfb74c587681be94ad54598 diff --git a/liferay-plugins-sdk-6.2/dependencies/org.freemarker/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/dependencies/org.freemarker/ivy.xml.MD5 index 5dff026e..81034da7 100644 --- a/liferay-plugins-sdk-6.2/dependencies/org.freemarker/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/dependencies/org.freemarker/ivy.xml.MD5 @@ -1 +1 @@ -f6d028f89713fdbf3004b38da2b16dcf +4102c750f16136e66085045251a34292 diff --git a/liferay-plugins-sdk-6.2/dependencies/org.sonar.ant/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/dependencies/org.sonar.ant/ivy.xml.MD5 index 6d913802..7ac73185 100644 --- a/liferay-plugins-sdk-6.2/dependencies/org.sonar.ant/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/dependencies/org.sonar.ant/ivy.xml.MD5 @@ -1 +1 @@ -3325db6f628a33488c6c832368b134e4 +f6d022d60b1ed1cc45a21c61c21c8f22 diff --git a/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.classpath b/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.classpath index e0ca4766..cc87ab46 100644 --- a/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.classpath +++ b/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.classpath @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.settings/org.eclipse.wst.common.project.facet.core.xml index 92ef9c01..81e6d2f5 100644 --- a/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.classpath b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.classpath index 991a105e..cc87ab46 100644 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.classpath +++ b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.classpath @@ -1,7 +1,7 @@ - + @@ -18,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.project b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.project index c3a8b7b2..3b0bb4f1 100644 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.project +++ b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.project @@ -32,6 +32,5 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.common.project.facet.core.xml index 92ef9c01..81e6d2f5 100644 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/ivy.xml.MD5 index 65d421b8..4b259b98 100644 --- a/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/ivy.xml.MD5 @@ -1 +1 @@ -2c267788e15963b22e4e720e12f5611c +db650d63ad964c1897f8af97aac0e727 diff --git a/liferay-plugins-sdk-6.2/ivy-settings.xml b/liferay-plugins-sdk-6.2/ivy-settings.xml index 30a41fe2..db0e651c 100644 --- a/liferay-plugins-sdk-6.2/ivy-settings.xml +++ b/liferay-plugins-sdk-6.2/ivy-settings.xml @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/ivy.xml.MD5 index feae7b2a..d88ae605 100644 --- a/liferay-plugins-sdk-6.2/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/ivy.xml.MD5 @@ -1 +1 @@ -ae2292c03b059802eec34967b7e85b8a +8e943594b3e1f97e457b967864997dc5 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.classpath index 6de1aafe..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.classpath @@ -1,8 +1,7 @@ - - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.component index f8d0fffc..89175b1f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.component @@ -2,10 +2,6 @@ - - - uses - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/service/persistence/RichiestaAccessoAttiPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/service/persistence/RichiestaAccessoAttiPersistenceImpl.java index afe4e541..a6795a84 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/service/persistence/RichiestaAccessoAttiPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/accesso/atti/service/persistence/RichiestaAccessoAttiPersistenceImpl.java @@ -43,7 +43,6 @@ import it.tref.liferay.portos.accesso.atti.NoSuchRichiestaAccessoAttiException; import it.tref.liferay.portos.accesso.atti.model.RichiestaAccessoAtti; import it.tref.liferay.portos.accesso.atti.model.impl.RichiestaAccessoAttiImpl; import it.tref.liferay.portos.accesso.atti.model.impl.RichiestaAccessoAttiModelImpl; -import it.tref.liferay.portos.accesso.atti.service.persistence.RichiestaAccessoAttiPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties index c4168251..4b93f1c2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_atti - build.number=30 - build.date=1632921863898 + build.number=31 + build.date=1675846169523 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/ivy.xml.MD5 index 81f1995e..d86c8a39 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/ivy.xml.MD5 @@ -1 +1 @@ -987c468ab803b131a7ff0c2ece8911b3 +c730f302e3c8f650a807fe624894d9ea diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.classpath index 9975372f..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.classpath @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/commons-logging.jar b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/commons-logging.jar deleted file mode 100644 index 8758a96b..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/commons-logging.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/jstl-api.jar b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/jstl-api.jar deleted file mode 100644 index 80a5737f..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/jstl-api.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/jstl-impl.jar b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/jstl-impl.jar deleted file mode 100644 index e5a9342f..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/jstl-impl.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/log4j.jar b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/log4j.jar deleted file mode 100644 index 068867eb..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/log4j.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/util-bridges.jar b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/util-bridges.jar deleted file mode 100644 index 7d7435fe..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/util-bridges.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/util-taglib.jar deleted file mode 100644 index fbba5f0a..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/lib/util-taglib.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/liferay-hook.xml b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/liferay-hook.xml index a7be6d90..d7167b8e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/liferay-hook.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/liferay-hook.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/service.xml index 26746469..3b654a43 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/service.xml @@ -1,4 +1,4 @@ - + Marco diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/audit/NoSuchAuditEventException.java b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/audit/NoSuchAuditEventException.java new file mode 100644 index 00000000..0b1a088b --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/audit/NoSuchAuditEventException.java @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2000-2013 Liferay, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. + */ + +package it.tref.liferay.portos.audit; + +import com.liferay.portal.NoSuchModelException; + +/** + * @author Marco + */ +public class NoSuchAuditEventException extends NoSuchModelException { + + public NoSuchAuditEventException() { + super(); + } + + public NoSuchAuditEventException(String msg) { + super(msg); + } + + public NoSuchAuditEventException(String msg, Throwable cause) { + super(msg, cause); + } + + public NoSuchAuditEventException(Throwable cause) { + super(cause); + } + +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/audit/service/persistence/AuditEventPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/audit/service/persistence/AuditEventPersistenceImpl.java index 8436cb5b..14a029f4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/audit/service/persistence/AuditEventPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/audit/service/persistence/AuditEventPersistenceImpl.java @@ -43,7 +43,6 @@ import it.tref.liferay.portos.audit.NoSuchAuditEventException; import it.tref.liferay.portos.audit.model.AuditEvent; import it.tref.liferay.portos.audit.model.impl.AuditEventImpl; import it.tref.liferay.portos.audit.model.impl.AuditEventModelImpl; -import it.tref.liferay.portos.audit.service.persistence.AuditEventPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/src/service.properties index 82b8c24f..1c71764f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_AUDIT - build.number=17 - build.date=1606300425089 + build.number=19 + build.date=1675846283103 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/common/details_column.jsp b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/common/details_column.jsp index 3b091aab..851b5a30 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/common/details_column.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/common/details_column.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.util.TextFormatter"%> <%@page import="com.liferay.portal.kernel.json.JSONArray"%> <%@page import="it.tref.liferay.portos.audit.model.AuditEvent"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/common/relations_column.jsp b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/common/relations_column.jsp index 72b2cb90..f5287023 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/common/relations_column.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/common/relations_column.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.util.TextFormatter"%> <%@page import="com.liferay.portal.kernel.json.JSONArray"%> <%@page import="it.tref.liferay.portos.audit.model.AuditEvent"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/detail.jsp b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/detail.jsp index 94e694cc..ffc929c3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/detail.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/detail.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.audit.shared.permission.HistoryPermission"%> <%@page import="com.liferay.portal.security.permission.ActionKeys"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/view.jsp index 3c18f252..3d6b7058 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.audit.shared.permission.HistoryPermission"%> <%@page import="com.liferay.portal.security.permission.ActionKeys"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/view_list.jsp b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/view_list.jsp index ff21f2e4..f77b3e2e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/view_list.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/view_list.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.audit.shared.permission.HistoryPermission"%> <%@page import="com.liferay.portal.security.permission.ActionKeys"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/init.jsp index 71379d79..f6d6d4c6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/storicizzazione/edit.jsp b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/storicizzazione/edit.jsp index 646951b9..cb89ae81 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/storicizzazione/edit.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/storicizzazione/edit.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/storicizzazione/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/storicizzazione/view.jsp index ff47f72b..8447c350 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/storicizzazione/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/storicizzazione/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath index 8a8be4f4..eb2a23ce 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath @@ -1,23 +1,22 @@ - - - - + + - + - - + + + - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.idea/.gitignore b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.idea/.gitignore new file mode 100644 index 00000000..0a8642fa --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.idea/.gitignore @@ -0,0 +1,10 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Zeppelin ignored files +/ZeppelinRemoteNotebooks/ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.idea/jpa-buddy.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.idea/jpa-buddy.xml new file mode 100644 index 00000000..966d5f56 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.idea/jpa-buddy.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.idea/misc.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.idea/misc.xml new file mode 100644 index 00000000..1b540b26 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.idea/vcs.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.idea/vcs.xml new file mode 100644 index 00000000..c2365ab1 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project index 43d3ec29..57bd417e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project @@ -32,6 +32,5 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.apache.ivyde.eclipse.prefs b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.apache.ivyde.eclipse.prefs deleted file mode 100644 index a95f7447..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.apache.ivyde.eclipse.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.apache.ivyde.eclipse.standaloneretrieve= diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.core.resources.prefs b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 5d72a74b..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,9 +0,0 @@ -eclipse.preferences.version=1 -encoding//docroot/html/amministrazione/tabs/territori/view.jsp=UTF-8 -encoding//docroot/html/common/import_window.jsp=UTF-8 -encoding//docroot/html/fascicolo/actions/action_toggle_sospensione.jsp=UTF-8 -encoding//docroot/html/fascicolo/navigator/header.jsp=UTF-8 -encoding//docroot/html/fascicolo/soggetto_details.jsp=UTF-8 -encoding//docroot/html/gestioneattivita/search.jsp=UTF-8 -encoding//docroot/html/paesaggistica_administration/init.jsp=UTF-8 -encoding//docroot/html/paesaggistica_administration/view.jsp=UTF-8 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.ltk.core.refactoring.prefs b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.ltk.core.refactoring.prefs deleted file mode 100644 index b196c64a..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.ltk.core.refactoring.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component index e68706c1..7b7aa635 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component @@ -2,17 +2,10 @@ - uses - - uses - - - uses - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index f4beb943..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -2,8 +2,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore index 840e7d31..4e474f1e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/.gitignore @@ -1 +1,2 @@ /classes/ +/classes-service/ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar index d0baea9d..b33acdec 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-hook.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-hook.xml index 8234053b..5dc0d86c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-hook.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-hook.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml index 1ea70d2e..71c87d03 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml @@ -1,6 +1,6 @@ - - + + + Davide Barbagallo, 3F Consulting + Manifattura Web Group s.r.l. portos_bo diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java index 0ef33164..392af44e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchAllegatoManualeException; import it.tref.liferay.portos.bo.model.AllegatoManuale; import it.tref.liferay.portos.bo.model.impl.AllegatoManualeImpl; import it.tref.liferay.portos.bo.model.impl.AllegatoManualeModelImpl; -import it.tref.liferay.portos.bo.service.persistence.AllegatoManualePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java index e86c49f7..1dd062fd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java @@ -46,7 +46,6 @@ import it.tref.liferay.portos.bo.NoSuchAsseverazioneException; import it.tref.liferay.portos.bo.model.Asseverazione; import it.tref.liferay.portos.bo.model.impl.AsseverazioneImpl; import it.tref.liferay.portos.bo.model.impl.AsseverazioneModelImpl; -import it.tref.liferay.portos.bo.service.persistence.AsseverazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java index 39126b3b..6d670b4e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java @@ -46,7 +46,6 @@ import it.tref.liferay.portos.bo.NoSuchAvvisoException; import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.impl.AvvisoImpl; import it.tref.liferay.portos.bo.model.impl.AvvisoModelImpl; -import it.tref.liferay.portos.bo.service.persistence.AvvisoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java index 1c9ee855..a676849e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchCollaudoException; import it.tref.liferay.portos.bo.model.Collaudo; import it.tref.liferay.portos.bo.model.impl.CollaudoImpl; import it.tref.liferay.portos.bo.model.impl.CollaudoModelImpl; -import it.tref.liferay.portos.bo.service.persistence.CollaudoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java index b5054e85..691776e7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java @@ -46,7 +46,6 @@ import it.tref.liferay.portos.bo.NoSuchComuneException; import it.tref.liferay.portos.bo.model.Comune; import it.tref.liferay.portos.bo.model.impl.ComuneImpl; import it.tref.liferay.portos.bo.model.impl.ComuneModelImpl; -import it.tref.liferay.portos.bo.service.persistence.ComunePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java index b8d76564..b88225f1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchComunicazioneException; import it.tref.liferay.portos.bo.model.Comunicazione; import it.tref.liferay.portos.bo.model.impl.ComunicazioneImpl; import it.tref.liferay.portos.bo.model.impl.ComunicazioneModelImpl; -import it.tref.liferay.portos.bo.service.persistence.ComunicazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java index 4a0e9a11..66d67c23 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchConfigurazioneException; import it.tref.liferay.portos.bo.model.Configurazione; import it.tref.liferay.portos.bo.model.impl.ConfigurazioneImpl; import it.tref.liferay.portos.bo.model.impl.ConfigurazioneModelImpl; -import it.tref.liferay.portos.bo.service.persistence.ConfigurazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java index 7c1fa3f1..0cc84b84 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchControlloPraticaException; import it.tref.liferay.portos.bo.model.ControlloPratica; import it.tref.liferay.portos.bo.model.impl.ControlloPraticaImpl; import it.tref.liferay.portos.bo.model.impl.ControlloPraticaModelImpl; -import it.tref.liferay.portos.bo.service.persistence.ControlloPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java index a2090464..bbf7e7de 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java @@ -46,7 +46,6 @@ import it.tref.liferay.portos.bo.NoSuchDelegaException; import it.tref.liferay.portos.bo.model.Delega; import it.tref.liferay.portos.bo.model.impl.DelegaImpl; import it.tref.liferay.portos.bo.model.impl.DelegaModelImpl; -import it.tref.liferay.portos.bo.service.persistence.DelegaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java index c11f11fb..8c254e2b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchDettPraticaException; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.impl.DettPraticaImpl; import it.tref.liferay.portos.bo.model.impl.DettPraticaModelImpl; -import it.tref.liferay.portos.bo.service.persistence.DettPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DiocesiPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DiocesiPersistenceImpl.java index a7160077..491ebf9f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DiocesiPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DiocesiPersistenceImpl.java @@ -47,8 +47,6 @@ import it.tref.liferay.portos.bo.NoSuchDiocesiException; import it.tref.liferay.portos.bo.model.Diocesi; import it.tref.liferay.portos.bo.model.impl.DiocesiImpl; import it.tref.liferay.portos.bo.model.impl.DiocesiModelImpl; -import it.tref.liferay.portos.bo.service.persistence.DiocesiPersistence; -import it.tref.liferay.portos.bo.service.persistence.ProvinciaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java index 13626ed5..91ed3905 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchDocAggiuntivaException; import it.tref.liferay.portos.bo.model.DocAggiuntiva; import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaImpl; import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaModelImpl; -import it.tref.liferay.portos.bo.service.persistence.DocAggiuntivaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java index 3e71e802..d521d3f1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java @@ -46,7 +46,6 @@ import it.tref.liferay.portos.bo.NoSuchDocPraticaException; import it.tref.liferay.portos.bo.model.DocPratica; import it.tref.liferay.portos.bo.model.impl.DocPraticaImpl; import it.tref.liferay.portos.bo.model.impl.DocPraticaModelImpl; -import it.tref.liferay.portos.bo.service.persistence.DocPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java index e2a7716d..908947c5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchFineLavoriException; import it.tref.liferay.portos.bo.model.FineLavori; import it.tref.liferay.portos.bo.model.impl.FineLavoriImpl; import it.tref.liferay.portos.bo.model.impl.FineLavoriModelImpl; -import it.tref.liferay.portos.bo.service.persistence.FineLavoriPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java index 7b45230e..b1f93960 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java @@ -42,7 +42,6 @@ import it.tref.liferay.portos.bo.NoSuchHistoryWorkflowActionException; import it.tref.liferay.portos.bo.model.HistoryWorkflowAction; import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionImpl; import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionModelImpl; -import it.tref.liferay.portos.bo.service.persistence.HistoryWorkflowActionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java index 2a9673dd..bdaf914f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java @@ -48,7 +48,6 @@ import it.tref.liferay.portos.bo.NoSuchIntPraticaException; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.impl.IntPraticaImpl; import it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl; -import it.tref.liferay.portos.bo.service.persistence.IntPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java index fc11289b..fa8c2ebd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java @@ -46,7 +46,6 @@ import it.tref.liferay.portos.bo.NoSuchPagamentoException; import it.tref.liferay.portos.bo.model.Pagamento; import it.tref.liferay.portos.bo.model.impl.PagamentoImpl; import it.tref.liferay.portos.bo.model.impl.PagamentoModelImpl; -import it.tref.liferay.portos.bo.service.persistence.PagamentoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java index b750d9b1..7ccfc052 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java @@ -47,7 +47,6 @@ import it.tref.liferay.portos.bo.NoSuchParereGeologoException; import it.tref.liferay.portos.bo.model.ParereGeologo; import it.tref.liferay.portos.bo.model.impl.ParereGeologoImpl; import it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl; -import it.tref.liferay.portos.bo.service.persistence.ParereGeologoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java index 986dcd3e..fedc632c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java @@ -47,8 +47,6 @@ import it.tref.liferay.portos.bo.NoSuchProvinciaException; import it.tref.liferay.portos.bo.model.Provincia; import it.tref.liferay.portos.bo.model.impl.ProvinciaImpl; import it.tref.liferay.portos.bo.model.impl.ProvinciaModelImpl; -import it.tref.liferay.portos.bo.service.persistence.DiocesiPersistence; -import it.tref.liferay.portos.bo.service.persistence.ProvinciaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java index bbf346c5..98681e47 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.bo.NoSuchSoggettoException; import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.model.impl.SoggettoImpl; import it.tref.liferay.portos.bo.model.impl.SoggettoModelImpl; -import it.tref.liferay.portos.bo.service.persistence.SoggettoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java index 4aec658e..14d6996c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java @@ -42,7 +42,6 @@ import it.tref.liferay.portos.bo.NoSuchStoricoSoggettoPraticaException; import it.tref.liferay.portos.bo.model.StoricoSoggettoPratica; import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaImpl; import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaModelImpl; -import it.tref.liferay.portos.bo.service.persistence.StoricoSoggettoPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java index c41df113..ecea7d65 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java @@ -44,7 +44,6 @@ import it.tref.liferay.portos.bo.NoSuchTerritorioException; import it.tref.liferay.portos.bo.model.Territorio; import it.tref.liferay.portos.bo.model.impl.TerritorioImpl; import it.tref.liferay.portos.bo.model.impl.TerritorioModelImpl; -import it.tref.liferay.portos.bo.service.persistence.TerritorioPersistence; import java.io.Serializable; 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 35a46aff..90c7eed5 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=3611 - build.date=1659531879936 + build.number=3614 + build.date=1675846543921 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 888d0c08..0101065a 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 @@ -11,10 +11,7 @@ - - - - + 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 0ab3f4ac..88bfdf70 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 @@ -b4706b93723ae9407536bf048d125586 +30b06262b749a3d1553865d3eb08ea92 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.classpath index 329e4ccb..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.classpath @@ -1,8 +1,7 @@ - - + @@ -19,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.project index 14074ed1..20a4cf30 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.project @@ -32,6 +32,5 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.wst.common.component index fdec0d03..9a27a472 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.wst.common.component @@ -2,7 +2,6 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service.xml index e19fc1c3..a2779281 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service.xml @@ -1,4 +1,4 @@ - + 3F Consulting + Manifattura Web Group s.r.l. diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicateFunzionarioException.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicateFunzionarioException.java index 6a9e1899..0eb7de10 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicateFunzionarioException.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicateFunzionarioException.java @@ -13,7 +13,6 @@ import com.liferay.portal.kernel.exception.PortalException; /** * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class DuplicateFunzionarioException extends PortalException { public DuplicateFunzionarioException() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicatePrenotazioneException.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicatePrenotazioneException.java index 8ddd98e0..f36f0237 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicatePrenotazioneException.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicatePrenotazioneException.java @@ -13,7 +13,6 @@ import com.liferay.portal.kernel.exception.PortalException; /** * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class DuplicatePrenotazioneException extends PortalException { public DuplicatePrenotazioneException() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicateProfessionistaException.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicateProfessionistaException.java index a6ed4a53..15346fde 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicateProfessionistaException.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicateProfessionistaException.java @@ -13,7 +13,6 @@ import com.liferay.portal.kernel.exception.PortalException; /** * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class DuplicateProfessionistaException extends PortalException { public DuplicateProfessionistaException() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchDisponibilitaException.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchDisponibilitaException.java index 1a9c7f25..767cb4f0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchDisponibilitaException.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchDisponibilitaException.java @@ -13,7 +13,6 @@ import com.liferay.portal.NoSuchModelException; /** * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class NoSuchDisponibilitaException extends NoSuchModelException { public NoSuchDisponibilitaException() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchFunzionarioException.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchFunzionarioException.java index ca5c71de..7cb3399a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchFunzionarioException.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchFunzionarioException.java @@ -13,7 +13,6 @@ import com.liferay.portal.NoSuchModelException; /** * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class NoSuchFunzionarioException extends NoSuchModelException { public NoSuchFunzionarioException() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchPrenotazioneException.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchPrenotazioneException.java index 9a831064..77e4c805 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchPrenotazioneException.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchPrenotazioneException.java @@ -13,7 +13,6 @@ import com.liferay.portal.NoSuchModelException; /** * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class NoSuchPrenotazioneException extends NoSuchModelException { public NoSuchPrenotazioneException() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchProfessionistaException.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchProfessionistaException.java index 24e17d50..7314eb85 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchProfessionistaException.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchProfessionistaException.java @@ -13,7 +13,6 @@ import com.liferay.portal.NoSuchModelException; /** * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class NoSuchProfessionistaException extends NoSuchModelException { public NoSuchProfessionistaException() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/SlotNotAvailableException.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/SlotNotAvailableException.java index 58a65b67..d1db8c58 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/SlotNotAvailableException.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/SlotNotAvailableException.java @@ -13,7 +13,6 @@ import com.liferay.portal.kernel.exception.PortalException; /** * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class SlotNotAvailableException extends PortalException { public SlotNotAvailableException() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/DisponibilitaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/DisponibilitaImpl.java index f6278f0c..eeed0fd5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/DisponibilitaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/DisponibilitaImpl.java @@ -20,7 +20,6 @@ package it.tref.portos.calendar.appointments.model.impl; * * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class DisponibilitaImpl extends DisponibilitaBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a disponibilita model instance diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/FunzionarioImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/FunzionarioImpl.java index eddb1e39..8bdec5dd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/FunzionarioImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/FunzionarioImpl.java @@ -22,7 +22,6 @@ import com.liferay.portal.kernel.util.StringPool; * * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class FunzionarioImpl extends FunzionarioBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a funzionario model instance @@ -30,8 +29,7 @@ public class FunzionarioImpl extends FunzionarioBaseImpl { */ public FunzionarioImpl() {} - @Override - public String getFullDescription() { - return getNome() + StringPool.SPACE + getCognome(); - } + public String getFullDescription() { + return getNome() + StringPool.SPACE + getCognome(); + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/PrenotazioneImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/PrenotazioneImpl.java index a1cec9bd..73c6cce8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/PrenotazioneImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/PrenotazioneImpl.java @@ -24,7 +24,6 @@ import org.apache.commons.lang.time.DateUtils; * * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class PrenotazioneImpl extends PrenotazioneBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a prenotazione model instance @@ -32,9 +31,17 @@ public class PrenotazioneImpl extends PrenotazioneBaseImpl { */ public PrenotazioneImpl() {} - @Override - public boolean isExpired(Date now) { + public boolean isExpired(Date now) { - return now.after(getStartDate()) || DateUtils.isSameDay(now, getStartDate()); - } + if (now.after(getStartDate())) { + return true; + } + + if (DateUtils.isSameDay(now, getStartDate())) { + return true; + + } + + return false; + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/ProfessionistaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/ProfessionistaImpl.java index ae04c853..dce6ea28 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/ProfessionistaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/ProfessionistaImpl.java @@ -20,7 +20,6 @@ package it.tref.portos.calendar.appointments.model.impl; * * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class ProfessionistaImpl extends ProfessionistaBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a professionista model instance diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaLocalServiceImpl.java index 36dbee16..3855217a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaLocalServiceImpl.java @@ -1,9 +1,13 @@ /** - * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software - * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in - * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * Copyright (c) 2000-present Liferay, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or modify it under the terms of the + * GNU Lesser General Public License as published by the Free Software Foundation; either version + * 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without + * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. */ package it.tref.portos.calendar.appointments.service.impl; @@ -26,13 +30,11 @@ import com.liferay.portal.kernel.dao.orm.DynamicQuery; import com.liferay.portal.kernel.dao.orm.Order; import com.liferay.portal.kernel.dao.orm.OrderFactoryUtil; import com.liferay.portal.kernel.dao.orm.PropertyFactoryUtil; -import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.dao.orm.RestrictionsFactoryUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; -import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.model.Organization; import com.liferay.portal.model.Role; import com.liferay.portal.model.User; @@ -40,508 +42,650 @@ import com.liferay.portal.service.OrganizationLocalServiceUtil; import com.liferay.portal.service.RoleLocalServiceUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserGroupRoleLocalServiceUtil; +import com.liferay.portal.service.UserLocalServiceUtil; /** * The implementation of the disponibilita local service. + * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy - * their definitions into the {@link it.tref.portos.calendar.appointments.service.DisponibilitaLocalService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun + * ServiceBuilder to copy their definitions into the + * {@link it.tref.portos.calendar.appointments.service.DisponibilitaLocalService} interface. + * *

- * This is a local service. Methods of this service will not have security checks based on the propagated JAAS - * credentials because this service can only be accessed from within the same VM. + * This is a local service. Methods of this service will not have security checks based on the + * propagated JAAS credentials because this service can only be accessed from within the same VM. *

* - * @author 3F Consulting + Manifattura Web Group s.r.l. + * @author 3F Consulting * @see it.tref.portos.calendar.appointments.service.base.DisponibilitaLocalServiceBaseImpl * @see it.tref.portos.calendar.appointments.service.DisponibilitaLocalServiceUtil */ public class DisponibilitaLocalServiceImpl extends DisponibilitaLocalServiceBaseImpl { /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link - * it.tref.portos.calendar.appointments.service.DisponibilitaLocalServiceUtil} to access the disponibilita local - * service. + * NOTE FOR DEVELOPERS: + * + * Never reference this interface directly. Always use {@link + * it.tref.portos.calendar.appointments.service.DisponibilitaLocalServiceUtil} to access the + * disponibilita local service. */ private static Log _log = LogFactoryUtil.getLog(DisponibilitaLocalServiceImpl.class); - @Override - public long checkDisponibilitaExist(long funzionarioId, Date startDate, Date endDate) throws SystemException { + //Bug 32935 + public long checkDisponibilitaExist(long funzionarioId, Date startDate, Date endDate) throws SystemException{ long exist = 0L; + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); dynamicQuery.add(RestrictionsFactoryUtil.eq("exactDate", sdf.format(startDate))); - dynamicQuery.add(RestrictionsFactoryUtil.eq("startDate", startDate)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("endDate", endDate)); - @SuppressWarnings("unchecked") + + //Bug 32935 + dynamicQuery.add(RestrictionsFactoryUtil.eq("startDate",startDate)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("endDate",endDate)); + List results = disponibilitaPersistence.findWithDynamicQuery(dynamicQuery); - if (!results.isEmpty()) { + if(!results.isEmpty()){ exist = results.get(0).getDisponibilitaId(); } + return exist; } - @Override - public long checkDisponibilitaExist(long funzionarioId, Date startDate, Date endDate, long presidio) - throws SystemException { + public long checkDisponibilitaExist(long funzionarioId, Date startDate, Date endDate, long presidio) throws SystemException{ long exist = 0L; + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); dynamicQuery.add(RestrictionsFactoryUtil.eq("exactDate", sdf.format(startDate))); - dynamicQuery.add(RestrictionsFactoryUtil.eq("presidio", presidio)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("startDate", startDate)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("endDate", endDate)); - @SuppressWarnings("unchecked") + dynamicQuery.add(RestrictionsFactoryUtil.eq("presidio",presidio)); + + //Bug 32935 + dynamicQuery.add(RestrictionsFactoryUtil.eq("startDate",startDate)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("endDate",endDate)); + List results = disponibilitaPersistence.findWithDynamicQuery(dynamicQuery); - if (!results.isEmpty()) { + if(!results.isEmpty()){ exist = results.get(0).getDisponibilitaId(); } + return exist; } - @Override public Disponibilita addDisponibilita(long userId, long funzionarioId, Date startDate, Date endDate, long presidio, ServiceContext serviceContext) throws SystemException, PortalException { Organization organization = OrganizationLocalServiceUtil.fetchOrganization(presidio); + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + Disponibilita disponibilita = disponibilitaPersistence.create(counterLocalService.increment(Disponibilita.class.getName())); + User user = userPersistence.findByPrimaryKey(userId); + Date now = new Date(); + disponibilita.setCompanyId(serviceContext.getCompanyId()); disponibilita.setUserId(user.getUserId()); disponibilita.setUserName(user.getFullName()); disponibilita.setCreateDate(serviceContext.getCreateDate(now)); disponibilita.setModifiedDate(serviceContext.getModifiedDate(now)); disponibilita.setGroupId(organization.getGroupId()); + disponibilita.setFunzionarioId(funzionarioId); disponibilita.setStartDate(startDate); disponibilita.setEndDate(endDate); disponibilita.setPresidio(presidio); disponibilita.setExactDate(sdf.format(startDate)); disponibilita.setDisponibile(true); - disponibilita = updateDisponibilita(disponibilita); + + disponibilita = disponibilitaLocalService.updateDisponibilita(disponibilita); + + return disponibilita; } - @Override - public Disponibilita addIndisponibilita(long userId, long funzionarioId, Date startDate, Date endDate, - long presidio, ServiceContext serviceContext) throws SystemException, PortalException { + public Disponibilita addIndisponibilita(long userId, long funzionarioId, Date startDate, Date endDate, long presidio, + ServiceContext serviceContext) throws SystemException, PortalException { Organization organization = OrganizationLocalServiceUtil.fetchOrganization(presidio); + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + Disponibilita disponibilita = disponibilitaPersistence.create(counterLocalService.increment(Disponibilita.class.getName())); + User user = userPersistence.findByPrimaryKey(userId); + Date now = new Date(); + disponibilita.setCompanyId(serviceContext.getCompanyId()); disponibilita.setUserId(user.getUserId()); disponibilita.setUserName(user.getFullName()); disponibilita.setCreateDate(serviceContext.getCreateDate(now)); disponibilita.setModifiedDate(serviceContext.getModifiedDate(now)); disponibilita.setGroupId(organization.getGroupId()); + disponibilita.setFunzionarioId(funzionarioId); disponibilita.setStartDate(startDate); disponibilita.setEndDate(endDate); disponibilita.setPresidio(presidio); disponibilita.setExactDate(sdf.format(startDate)); disponibilita.setDisponibile(false); - disponibilita = updateDisponibilita(disponibilita); + + disponibilita = disponibilitaLocalService.updateDisponibilita(disponibilita); + + return disponibilita; } - @Override - public void addDisponibilitaGenerale(long userId, Date startDate, Date endDate, long presidioId, String oraInizio, - String oraFine, int giornoSettimana, ServiceContext serviceContext) throws SystemException, - PortalException, ParseException { + public void addDisponibilitaGenerale(long userId, Date startDate, Date endDate, long presidioId, + String oraInizio, String oraFine, int giornoSettimana, ServiceContext serviceContext) throws SystemException, PortalException, ParseException{ Organization organization = OrganizationLocalServiceUtil.fetchOrganization(presidioId); + List userDefinitivo = new ArrayList(); + try { - if (organization != null) { - List users = userLocalService.getOrganizationUsers(presidioId); + + if(organization != null){ + List users = UserLocalServiceUtil.getOrganizationUsers(presidioId); + for (User user : users) { + Role portosSupporto = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_supporto"); - Role portosIstruttore = - RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_calendario"); - if (!userLocalService.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())) { - boolean isIstruttore = - UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), - organization.getGroupId(), portosIstruttore.getRoleId()); - if (isIstruttore) { + + Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_calendario"); + + if(!UserLocalServiceUtil.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())){ + + boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole( + user.getUserId(), organization.getGroupId(), portosIstruttore.getRoleId()); + + + if(isIstruttore){ userDefinitivo.add(user); } } } + } + } catch (NumberFormatException | SystemException e) { - _log.error(e, e); + _log.error(e,e); } catch (PortalException e) { - _log.error(e, e); + _log.error(e,e); } + Calendar calendarStartDate = Calendar.getInstance(); calendarStartDate.setTime(startDate); - if (calendarStartDate.get(Calendar.DAY_OF_WEEK) == giornoSettimana) { + + if(calendarStartDate.get(Calendar.DAY_OF_WEEK) == giornoSettimana){ + Date startDateToInsert = formatDateTime(oraInizio, startDate); Date endDateToInsert = formatDateTime(oraFine, startDate); + for (User user : userDefinitivo) { + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", user.getUserId())); dynamicQuery.add(RestrictionsFactoryUtil.eq("exactDate", sdf.format(startDateToInsert))); dynamicQuery.add(RestrictionsFactoryUtil.eq("groupId", organization.getGroupId())); - dynamicQuery.add(RestrictionsFactoryUtil.eq("startDate", startDateToInsert)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("endDate", endDateToInsert)); - @SuppressWarnings("unchecked") + + //Bug 32935 + dynamicQuery.add(RestrictionsFactoryUtil.eq("startDate",startDateToInsert)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("endDate",endDateToInsert)); + List results = disponibilitaPersistence.findWithDynamicQuery(dynamicQuery); - if (results.isEmpty()) { + if(results.isEmpty()){ addDisponibilita(serviceContext.getUserId(), user.getUserId(), startDateToInsert, endDateToInsert, organization.getOrganizationId(), serviceContext); - } else { - for (Iterator iterator = results.iterator(); iterator.hasNext();) { - Disponibilita disponibilita = iterator.next(); + } + //Bug 32935 + else{ + for (Iterator iterator = results.iterator(); iterator.hasNext();) { + Disponibilita disponibilita = (Disponibilita) iterator.next(); disponibilita.setDisponibile(true); - updateDisponibilita(disponibilita); + disponibilitaLocalService.updateDisponibilita(disponibilita); } } } } - addDayForDisponibilita(startDate, endDate, oraInizio, oraFine, giornoSettimana, userDefinitivo, - organization.getOrganizationId(), serviceContext); + + addDayForDisponibilita(startDate, endDate, oraInizio, oraFine, giornoSettimana, + userDefinitivo, organization.getOrganizationId(), serviceContext); + } - private void addDayForDisponibilita(Date date, Date endDate, String oraInizio, String oraFine, int giornoSettimana, - List users, long presidioId, ServiceContext serviceContext) throws ParseException, SystemException, - PortalException { + private void addDayForDisponibilita(Date date, Date endDate, String oraInizio, String oraFine,int giornoSettimana,List users, + long presidioId, ServiceContext serviceContext) + throws ParseException, SystemException, PortalException{ Organization org = OrganizationLocalServiceUtil.fetchOrganization(presidioId); + Date datePlus = datePlusOneDay(date); - if (date.before(datePlus) && (endDate.after(datePlus) || isSameDate(endDate, datePlus))) { + if(date.before(datePlus) && (endDate.after(datePlus) || isSameDate(endDate, datePlus))){ + Calendar calendarStartDate = Calendar.getInstance(); calendarStartDate.setTime(datePlus); - if (calendarStartDate.get(Calendar.DAY_OF_WEEK) == giornoSettimana) { + + if(calendarStartDate.get(Calendar.DAY_OF_WEEK) == giornoSettimana){ + Date startDateToInsert = formatDateTime(oraInizio, datePlus); Date endDateToInsert = formatDateTime(oraFine, datePlus); + for (User user : users) { + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", user.getUserId())); dynamicQuery.add(RestrictionsFactoryUtil.eq("exactDate", sdf.format(startDateToInsert))); dynamicQuery.add(RestrictionsFactoryUtil.eq("groupId", org.getGroupId())); - dynamicQuery.add(RestrictionsFactoryUtil.eq("startDate", startDateToInsert)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("endDate", endDateToInsert)); - @SuppressWarnings("unchecked") + + //Bug 32935 + dynamicQuery.add(RestrictionsFactoryUtil.eq("startDate",startDateToInsert)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("endDate",endDateToInsert)); + List results = disponibilitaPersistence.findWithDynamicQuery(dynamicQuery); - if (results.isEmpty()) { - addDisponibilita(serviceContext.getUserId(), user.getUserId(), startDateToInsert, - endDateToInsert, presidioId, serviceContext); - } else { - for (Iterator iterator = results.iterator(); iterator.hasNext();) { - Disponibilita disponibilita = iterator.next(); + if(results.isEmpty()){ + addDisponibilita(serviceContext.getUserId(), user.getUserId(), startDateToInsert, endDateToInsert, + presidioId, serviceContext); + } + //Bug 32935 + else{ + for (Iterator iterator = results.iterator(); iterator.hasNext();) { + Disponibilita disponibilita = (Disponibilita) iterator.next(); disponibilita.setDisponibile(true); - updateDisponibilita(disponibilita); + disponibilitaLocalService.updateDisponibilita(disponibilita); } } + } - addDayForDisponibilita(datePlus, endDate, oraInizio, oraFine, giornoSettimana, users, presidioId, - serviceContext); + + addDayForDisponibilita(datePlus, endDate, oraInizio, oraFine, giornoSettimana, users, + presidioId, serviceContext); + } else { - addDayForDisponibilita(datePlus, endDate, oraInizio, oraFine, giornoSettimana, users, presidioId, - serviceContext); + addDayForDisponibilita(datePlus, endDate, oraInizio, oraFine, giornoSettimana, users, + presidioId, serviceContext); } } } - private Date datePlusOneDay(Date date) { + private Date datePlusOneDay(Date date){ Calendar calendar = Calendar.getInstance(); calendar.setTime(date); + calendar.add(Calendar.DATE, 1); + return calendar.getTime(); } - private boolean isSameDate(Date date1, Date date2) { + private boolean isSameDate(Date date1 , Date date2){ Calendar cal1 = Calendar.getInstance(); Calendar cal2 = Calendar.getInstance(); cal1.setTime(date1); cal2.setTime(date2); - boolean sameDay = - cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) - && cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR); + + boolean sameDay = cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) && + cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR); + return sameDay; + } - @SuppressWarnings("unchecked") - @Override public List findByStartDate(Date date) throws SystemException { - Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); Date end = DateUtils.addDays(start, 1); + DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.between("startDate", start, end)); dynamicQuery.addOrder(OrderFactoryUtil.desc("funzionarioId")); + return disponibilitaPersistence.findWithDynamicQuery(dynamicQuery); - } - @Override - public List findByFunzionarioStartAndPresidio(long funzionarioId, Date date, long presidio) - throws SystemException { + } + public List findByFunzionarioStartAndPresidio(long funzionarioId, Date date, long presidio) throws SystemException { Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); Date end = DateUtils.addHours(start, 22); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); dynamicQuery.add(RestrictionsFactoryUtil.ge("startDate", start)); dynamicQuery.add(RestrictionsFactoryUtil.lt("endDate", end)); dynamicQuery.add(RestrictionsFactoryUtil.eq("groupId", presidio)); - @SuppressWarnings("unchecked") + List results = disponibilitaPersistence.findWithDynamicQuery(dynamicQuery); return results; - } - @SuppressWarnings("unchecked") - @Override - public List findByFunzionario_StartDate(long funzionarioId, Date date, long presidio) - throws SystemException { + } + public List findByFunzionario_StartDate(long funzionarioId, Date date, long presidio) throws SystemException { Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); Date end = DateUtils.addHours(start, 22); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); dynamicQuery.add(RestrictionsFactoryUtil.ge("startDate", start)); dynamicQuery.add(RestrictionsFactoryUtil.lt("endDate", end)); dynamicQuery.add(RestrictionsFactoryUtil.eq("groupId", presidio)); - return disponibilitaPersistence.findWithDynamicQuery(dynamicQuery); + + List results = disponibilitaPersistence.findWithDynamicQuery(dynamicQuery); + return results; + } - @SuppressWarnings("unchecked") - @Override - public List findByFunzionarioStartDate(long funzionarioId, Date date, int startRow, int endRow) - throws SystemException { + public List findByFunzionarioStartDate(long funzionarioId, Date date, int startRow, int endRow) throws SystemException { Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); + Date end = DateUtils.addHours(start, 22); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); dynamicQuery.add(RestrictionsFactoryUtil.ge("startDate", start)); + Order defaultOrder = OrderFactoryUtil.asc("startDate"); dynamicQuery.addOrder(defaultOrder); - return dynamicQuery(dynamicQuery, startRow, endRow); + + List results = disponibilitaLocalService.dynamicQuery(dynamicQuery, startRow, endRow); + return results; + } - @Override public int countByFunzionarioStartDate(long funzionarioId, Date date) throws SystemException { Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); dynamicQuery.add(RestrictionsFactoryUtil.ge("startDate", start)); + Order defaultOrder = OrderFactoryUtil.asc("startDate"); dynamicQuery.addOrder(defaultOrder); - return dynamicQuery(dynamicQuery, QueryUtil.ALL_POS, QueryUtil.ALL_POS).size(); + + List results = disponibilitaLocalService.dynamicQuery(dynamicQuery, -1, -1); + return results.size(); + } - @SuppressWarnings("unchecked") - @Override - public List findByPOStartDateAndFilters(long funzionarioId, Date date, int startRow, int endRow, - String provinciaFilter, String funzionarioIdFilter) throws SystemException { + public List findByPOStartDateAndFilters(long funzionarioId, Date date, int startRow, int endRow, String provinciaFilter, String funzionarioIdFilter) throws SystemException { + + User user = UserLocalServiceUtil.fetchUser(funzionarioId); - User user = userLocalService.fetchUser(funzionarioId); List orgIds = new ArrayList(); + try { + Role dirigenteGenerale = RoleLocalServiceUtil.getRole(user.getCompanyId(), "dirigente_generale"); - boolean isDirigenteGenerale = - RoleLocalServiceUtil.hasUserRole(user.getUserId(), dirigenteGenerale.getRoleId()); - if (isDirigenteGenerale) { - List orgs = - OrganizationLocalServiceUtil.getOrganizations(QueryUtil.ALL_POS, QueryUtil.ALL_POS); + boolean isDirigenteGenerale = RoleLocalServiceUtil.hasUserRole(user.getUserId(), dirigenteGenerale.getRoleId()); + + if(isDirigenteGenerale){ + + List orgs = OrganizationLocalServiceUtil.getOrganizations(-1, -1); for (Organization organization : orgs) { - if (organization.getParentOrganization() != null) { + if(organization.getParentOrganization() != null){ orgIds.add(organization.getOrganizationId()); } } + } else { + List orgs = OrganizationLocalServiceUtil.getUserOrganizations(funzionarioId); for (Organization organization : orgs) { + Role portosPO = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_po"); - boolean isPO = - UserGroupRoleLocalServiceUtil.hasUserGroupRole(funzionarioId, organization.getGroupId(), - portosPO.getRoleId()); - if (isPO) { + + boolean isPO = UserGroupRoleLocalServiceUtil.hasUserGroupRole( + funzionarioId, organization.getGroupId(), portosPO.getRoleId()); + + if(isPO){ orgIds.add(organization.getOrganizationId()); } } + } + } catch (PortalException e) { - _log.error(e, e); + _log.error(e,e); } + Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); + DynamicQuery dynamicQuery = dynamicQuery(); - if (provinciaFilter.equals("-1") || provinciaFilter.equals(StringPool.BLANK)) { - dynamicQuery.add(PropertyFactoryUtil.forName("presidio").in(orgIds.toArray())); - } else { + + if(!provinciaFilter.equals("-1") && !provinciaFilter.equals("")){ dynamicQuery.add(RestrictionsFactoryUtil.eq("presidio", Long.valueOf(provinciaFilter))); - } - if (funzionarioIdFilter.equals("-1") || funzionarioIdFilter.equals(StringPool.BLANK)) { - dynamicQuery.add(RestrictionsFactoryUtil.ne("funzionarioId", funzionarioId)); } else { + dynamicQuery.add(PropertyFactoryUtil.forName("presidio").in(orgIds.toArray())); + } + + if(!funzionarioIdFilter.equals("-1") && !funzionarioIdFilter.equals("")){ dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", Long.valueOf(funzionarioIdFilter))); + } else { + dynamicQuery.add(RestrictionsFactoryUtil.ne("funzionarioId", funzionarioId)); } + dynamicQuery.add(RestrictionsFactoryUtil.ge("startDate", start)); + Order defaultOrder = OrderFactoryUtil.asc("startDate"); dynamicQuery.addOrder(defaultOrder); - return dynamicQuery(dynamicQuery, startRow, endRow); + + List results = disponibilitaLocalService.dynamicQuery(dynamicQuery, startRow, endRow); + return results; + } - @Override - public int countByPOStartDateAndFilters(long funzionarioId, Date date, String provinciaFilter, - String funzionarioIdFilter) throws SystemException { + public int countByPOStartDateAndFilters(long funzionarioId, Date date, String provinciaFilter, String funzionarioIdFilter) throws SystemException { + + User user = UserLocalServiceUtil.fetchUser(funzionarioId); - User user = userLocalService.fetchUser(funzionarioId); List orgIds = new ArrayList(); + try { + Role dirigenteGenerale = RoleLocalServiceUtil.getRole(user.getCompanyId(), "dirigente_generale"); - boolean isDirigenteGenerale = - RoleLocalServiceUtil.hasUserRole(user.getUserId(), dirigenteGenerale.getRoleId()); - if (isDirigenteGenerale) { - List orgs = - OrganizationLocalServiceUtil.getOrganizations(QueryUtil.ALL_POS, QueryUtil.ALL_POS); + boolean isDirigenteGenerale = RoleLocalServiceUtil.hasUserRole(user.getUserId(), dirigenteGenerale.getRoleId()); + + if(isDirigenteGenerale){ + + List orgs = OrganizationLocalServiceUtil.getOrganizations(-1, -1); for (Organization organization : orgs) { - if (organization.getParentOrganization() != null) { + if(organization.getParentOrganization() != null){ orgIds.add(organization.getOrganizationId()); } } + } else { + List orgs = OrganizationLocalServiceUtil.getUserOrganizations(funzionarioId); for (Organization organization : orgs) { + Role portosPO = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_po"); - boolean isPO = - UserGroupRoleLocalServiceUtil.hasUserGroupRole(funzionarioId, organization.getGroupId(), - portosPO.getRoleId()); - if (isPO) { + + boolean isPO = UserGroupRoleLocalServiceUtil.hasUserGroupRole( + funzionarioId, organization.getGroupId(), portosPO.getRoleId()); + + if(isPO){ orgIds.add(organization.getOrganizationId()); } } + } + } catch (PortalException e) { - _log.error(e, e); + _log.error(e,e); } + Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); + DynamicQuery dynamicQuery = dynamicQuery(); - if (provinciaFilter.equals("-1") || provinciaFilter.equals(StringPool.BLANK)) { - dynamicQuery.add(PropertyFactoryUtil.forName("presidio").in(orgIds.toArray())); - } else { + + if(!provinciaFilter.equals("-1") && !provinciaFilter.equals("")){ dynamicQuery.add(RestrictionsFactoryUtil.eq("presidio", Long.valueOf(provinciaFilter))); - } - if (funzionarioIdFilter.equals("-1") || funzionarioIdFilter.equals(StringPool.BLANK)) { - dynamicQuery.add(RestrictionsFactoryUtil.ne("funzionarioId", funzionarioId)); } else { + dynamicQuery.add(PropertyFactoryUtil.forName("presidio").in(orgIds.toArray())); + } + + if(!funzionarioIdFilter.equals("-1") && !funzionarioIdFilter.equals("")){ dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", Long.valueOf(funzionarioIdFilter))); + } else { + dynamicQuery.add(RestrictionsFactoryUtil.ne("funzionarioId", funzionarioId)); } + dynamicQuery.add(RestrictionsFactoryUtil.ge("startDate", start)); + Order defaultOrder = OrderFactoryUtil.asc("startDate"); dynamicQuery.addOrder(defaultOrder); - return dynamicQuery(dynamicQuery, QueryUtil.ALL_POS, QueryUtil.ALL_POS).size(); + + List results = disponibilitaLocalService.dynamicQuery(dynamicQuery, -1, -1); + return results.size(); + } - @SuppressWarnings("unchecked") - @Override - public List findByPOStartDate(long funzionarioId, Date date, int startRow, int endRow) - throws SystemException { + public List findByPOStartDate(long funzionarioId, Date date, int startRow, int endRow) throws SystemException { + + User user = UserLocalServiceUtil.fetchUser(funzionarioId); - User user = userLocalService.fetchUser(funzionarioId); List orgIds = new ArrayList(); + try { + Role dirigenteGenerale = RoleLocalServiceUtil.getRole(user.getCompanyId(), "dirigente_generale"); - boolean isDirigenteGenerale = - RoleLocalServiceUtil.hasUserRole(user.getUserId(), dirigenteGenerale.getRoleId()); - if (isDirigenteGenerale) { - List orgs = - OrganizationLocalServiceUtil.getOrganizations(QueryUtil.ALL_POS, QueryUtil.ALL_POS); + boolean isDirigenteGenerale = RoleLocalServiceUtil.hasUserRole(user.getUserId(), dirigenteGenerale.getRoleId()); + + if(isDirigenteGenerale){ + + List orgs = OrganizationLocalServiceUtil.getOrganizations(-1, -1); for (Organization organization : orgs) { - if (organization.getParentOrganization() != null) { + if(organization.getParentOrganization() != null){ orgIds.add(organization.getOrganizationId()); } } + } else { + List orgs = OrganizationLocalServiceUtil.getUserOrganizations(funzionarioId); for (Organization organization : orgs) { + Role portosPO = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_po"); - boolean isPO = - UserGroupRoleLocalServiceUtil.hasUserGroupRole(funzionarioId, organization.getGroupId(), - portosPO.getRoleId()); - if (isPO) { + + boolean isPO = UserGroupRoleLocalServiceUtil.hasUserGroupRole( + funzionarioId, organization.getGroupId(), portosPO.getRoleId()); + + if(isPO){ orgIds.add(organization.getOrganizationId()); } } + } + } catch (PortalException e) { - _log.error(e, e); + _log.error(e,e); } + Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(PropertyFactoryUtil.forName("presidio").in(orgIds.toArray())); dynamicQuery.add(RestrictionsFactoryUtil.ne("funzionarioId", funzionarioId)); dynamicQuery.add(RestrictionsFactoryUtil.ge("startDate", start)); + Order defaultOrder = OrderFactoryUtil.asc("startDate"); dynamicQuery.addOrder(defaultOrder); - return dynamicQuery(dynamicQuery, startRow, endRow); + + List results = disponibilitaLocalService.dynamicQuery(dynamicQuery, startRow, endRow); + return results; + } - @Override public int countByPOStartDate(long funzionarioId, Date date) throws SystemException { - User user = userLocalService.fetchUser(funzionarioId); + User user = UserLocalServiceUtil.fetchUser(funzionarioId); + List orgIds = new ArrayList(); + try { + Role dirigenteGenerale = RoleLocalServiceUtil.getRole(user.getCompanyId(), "dirigente_generale"); - boolean isDirigenteGenerale = - RoleLocalServiceUtil.hasUserRole(user.getUserId(), dirigenteGenerale.getRoleId()); - if (isDirigenteGenerale) { - List orgs = - OrganizationLocalServiceUtil.getOrganizations(QueryUtil.ALL_POS, QueryUtil.ALL_POS); + boolean isDirigenteGenerale = RoleLocalServiceUtil.hasUserRole(user.getUserId(), dirigenteGenerale.getRoleId()); + + if(isDirigenteGenerale){ + + List orgs = OrganizationLocalServiceUtil.getOrganizations(-1, -1); for (Organization organization : orgs) { - if (organization.getParentOrganization() != null) { + if(organization.getParentOrganization() != null){ orgIds.add(organization.getOrganizationId()); } } + } else { + List orgs = OrganizationLocalServiceUtil.getUserOrganizations(funzionarioId); for (Organization organization : orgs) { + Role portosPO = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_po"); - boolean isPO = - UserGroupRoleLocalServiceUtil.hasUserGroupRole(funzionarioId, organization.getGroupId(), - portosPO.getRoleId()); - if (isPO) { + + boolean isPO = UserGroupRoleLocalServiceUtil.hasUserGroupRole( + funzionarioId, organization.getGroupId(), portosPO.getRoleId()); + + if(isPO){ orgIds.add(organization.getOrganizationId()); } } + } + } catch (PortalException e) { - _log.error(e, e); + _log.error(e,e); } + Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(PropertyFactoryUtil.forName("presidio").in(orgIds.toArray())); dynamicQuery.add(RestrictionsFactoryUtil.ne("funzionarioId", funzionarioId)); dynamicQuery.add(RestrictionsFactoryUtil.ge("startDate", start)); + Order defaultOrder = OrderFactoryUtil.asc("startDate"); dynamicQuery.addOrder(defaultOrder); - return dynamicQuery(dynamicQuery, QueryUtil.ALL_POS, QueryUtil.ALL_POS).size(); + + List results = disponibilitaLocalService.dynamicQuery(dynamicQuery, -1, -1); + return results.size(); + } private Date formatDateTime(String orario, Date day) throws ParseException { - SimpleDateFormat sdf = new SimpleDateFormat("HH:mm"); Date data = sdf.parse(orario); Calendar calendar = GregorianCalendar.getInstance(); calendar.setTime(data); Date date = DateUtils.addHours(day, calendar.get(Calendar.HOUR_OF_DAY)); date = DateUtils.addMinutes(date, calendar.get(Calendar.MINUTE)); + return date; } + } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaServiceImpl.java index 05497c8a..5ffdc835 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaServiceImpl.java @@ -11,6 +11,7 @@ package it.tref.portos.calendar.appointments.service.impl; import it.tref.portos.calendar.appointments.model.Disponibilita; import it.tref.portos.calendar.appointments.model.Funzionario; import it.tref.portos.calendar.appointments.model.Prenotazione; +import it.tref.portos.calendar.appointments.service.PrenotazioneLocalServiceUtil; import it.tref.portos.calendar.appointments.service.base.DisponibilitaServiceBaseImpl; import java.text.ParseException; @@ -37,6 +38,7 @@ import com.liferay.portal.service.OrganizationLocalServiceUtil; import com.liferay.portal.service.RoleLocalServiceUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserGroupRoleLocalServiceUtil; +import com.liferay.portal.service.UserLocalServiceUtil; /** * The implementation of the disponibilita remote service. @@ -61,7 +63,6 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl { private static Log _log = LogFactoryUtil.getLog(DisponibilitaServiceImpl.class); - @Override public Disponibilita addDisponibilita(long userId, long funzionarioId, Date startDate, Date endDate, long presidio, ServiceContext serviceContext) throws SystemException, PortalException { @@ -69,7 +70,6 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl { serviceContext); } - @Override public List addDisponibilitaGenerale(long presidio, long userId, Date dataInizioDisponibilita, Date dataFineDisponibilita, String giornoSettimana, String oraInizioDisponibilita, String oraFineDisponibilita, ServiceContext serviceContext) throws SystemException, PortalException { @@ -87,9 +87,7 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl { return listDisponibilita; } - @Override - public String verifyDisponibilitaByDateHour(String presidio, String date, String[] oreInizio, String idFunzionario) - throws SystemException, ParseException { + public String verifyDisponibilitaByDateHour(String presidio, String date,String[] oreInizio, String idFunzionario) throws SystemException, ParseException { JSONObject json = JSONFactoryUtil.createJSONObject(); JSONArray array = JSONFactoryUtil.createJSONArray(); @@ -101,9 +99,18 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl { String oraInizio = oreInizio[i]; jsonFiglio.put("ora", oraInizio); Date dateVerify = formatDateTime(oraInizio, dateVerifyTemp); - List lista = prenotazioneLocalService.findByDateHourFunzionario(dateVerify, - Long.parseLong(idFunzionario), org.getGroupId()); - jsonFiglio.put("disponibile", lista.isEmpty()); + + + List lista = + PrenotazioneLocalServiceUtil.findByDateHourFunzionario( + dateVerify, Long.parseLong(idFunzionario), org.getGroupId()); + + if(lista.isEmpty()){ + jsonFiglio.put("disponibile", true); + } else { + jsonFiglio.put("disponibile", false); + } + array.put(jsonFiglio); } json.put("slot", array); @@ -117,24 +124,34 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl { Organization organization = OrganizationLocalServiceUtil.fetchOrganization(Long.valueOf(presidio)); List userDefinitivo = new ArrayList(); try { - if (organization != null) { - List users = userLocalService.getOrganizationUsers(Long.valueOf(presidio)); + + if(organization != null){ + List users = UserLocalServiceUtil.getOrganizationUsers(Long.valueOf(presidio)); + for (User user : users) { Role portosSupporto = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_supporto"); - Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), - "portos_calendario"); - if (!userLocalService.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())) { - boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), - organization.getGroupId(), portosIstruttore.getRoleId()); - if (isIstruttore) { + + Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_calendario"); + + if(!UserLocalServiceUtil.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())){ + + boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole( + user.getUserId(), organization.getGroupId(), portosIstruttore.getRoleId()); + + + if(isIstruttore){ userDefinitivo.add(user); } } } } - } catch (NumberFormatException | PortalException | SystemException e) { - _log.error(e, e); + + } catch (NumberFormatException | SystemException e) { + _log.error(e,e); + } catch (PortalException e) { + _log.error(e,e); } + Date startDate = new SimpleDateFormat("dd/MM/yyyy").parse(date); SimpleDateFormat sdf = new SimpleDateFormat("HH:mm"); JSONArray json = JSONFactoryUtil.createJSONArray(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/FunzionarioLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/FunzionarioLocalServiceImpl.java index 21ca8470..3feb7d48 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/FunzionarioLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/FunzionarioLocalServiceImpl.java @@ -40,9 +40,8 @@ public class FunzionarioLocalServiceImpl extends FunzionarioLocalServiceBaseImpl * service. */ - @Override - public Funzionario addFunzionario(long userId, String nome, String cognome, String presidio, String tipologia, - ServiceContext serviceContext) throws PortalException, SystemException { + public Funzionario addFunzionario(long userId, String nome, String cognome, String presidio, String tipologia, + ServiceContext serviceContext) throws PortalException, SystemException { User user = userPersistence.findByPrimaryKey(userId); Date now = new Date(); @@ -75,9 +74,8 @@ public class FunzionarioLocalServiceImpl extends FunzionarioLocalServiceBaseImpl return this.deleteFunzionario(funzionario); } - @Override - public List findByPresidio(String presidio) throws SystemException { + public List findByPresidio(String presidio) throws SystemException { - return funzionarioPersistence.findByPresidio(presidio); - } + return funzionarioPersistence.findByPresidio(presidio); + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/FunzionarioServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/FunzionarioServiceImpl.java index 447943fe..60dfe822 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/FunzionarioServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/FunzionarioServiceImpl.java @@ -8,7 +8,6 @@ package it.tref.portos.calendar.appointments.service.impl; -import it.tref.liferay.portos.bo.shared.util.Constants; import it.tref.portos.calendar.appointments.model.Funzionario; import it.tref.portos.calendar.appointments.service.base.FunzionarioServiceBaseImpl; @@ -23,7 +22,6 @@ import com.liferay.portal.kernel.json.JSONFactoryUtil; import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; -import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.model.Organization; import com.liferay.portal.model.Role; @@ -32,6 +30,8 @@ import com.liferay.portal.service.OrganizationLocalServiceUtil; import com.liferay.portal.service.RoleLocalServiceUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserGroupRoleLocalServiceUtil; +import com.liferay.portal.service.UserLocalServiceUtil; +import it.tref.liferay.portos.bo.shared.util.Constants; /** * The implementation of the funzionario remote service. @@ -55,59 +55,67 @@ public class FunzionarioServiceImpl extends FunzionarioServiceBaseImpl { private static Log _log = LogFactoryUtil.getLog(FunzionarioServiceImpl.class); - @Override - public Funzionario addFunzionario(long userId, String nome, String cognome, String presidio, String tipologia, - ServiceContext serviceContext) throws PortalException, SystemException { + public Funzionario addFunzionario(long userId, String nome, String cognome, String presidio, String tipologia, + ServiceContext serviceContext) throws PortalException, SystemException { return funzionarioLocalService.addFunzionario(userId, nome, cognome, presidio, tipologia, serviceContext); } - @Override - public String getFunzionariByPresidio(String presidio) { - - JSONArray json = JSONFactoryUtil.createJSONArray(); - try { - Organization organization = OrganizationLocalServiceUtil.fetchOrganization(Long.valueOf(presidio)); - if (organization != null) { - List users = userLocalService.getOrganizationUsers(Long.valueOf(presidio)); - Collections.sort(users, new UserComparator()); - for (User user : users) { - Role portosSupporto = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_supporto"); - Role portosGeologo = RoleLocalServiceUtil.getRole(organization.getCompanyId(), - Constants.ROLE_NAME_GEOLOGO); - Role portosCalendario = RoleLocalServiceUtil.getRole(organization.getCompanyId(), - "portos_calendario"); - Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), - Constants.ROLE_NAME_ISTRUTTORE); - if (!userLocalService.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())) { - boolean isCalendario = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), - organization.getGroupId(), portosCalendario.getRoleId()); - boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), - organization.getGroupId(), portosIstruttore.getRoleId()); - boolean isGeologo = userLocalService.hasRoleUser(portosGeologo.getRoleId(), - user.getUserId()); - if (isCalendario) { - JSONObject jsonFunzionario = JSONFactoryUtil.createJSONObject(); - jsonFunzionario.put("id", user.getUserId()); - jsonFunzionario.put("nome", user.getFirstName()); - jsonFunzionario.put("cognome", user.getLastName()); - if (isIstruttore) { - jsonFunzionario.put("tipologia", "Istruttore"); - } else if (isGeologo) { - jsonFunzionario.put("tipologia", "Geologo"); - } else { - jsonFunzionario.put("tipologia", StringPool.BLANK); - } - json.put(jsonFunzionario); + public String getFunzionariByPresidio(String presidio) { + + JSONArray json = JSONFactoryUtil.createJSONArray(); + try { + Organization organization = OrganizationLocalServiceUtil.fetchOrganization(Long.valueOf(presidio)); + if(organization != null){ + + List users = UserLocalServiceUtil.getOrganizationUsers(Long.valueOf(presidio)); + + //Bug 32935 + Collections.sort(users, new UserComparator()); + for (User user : users) { + Role portosSupporto = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_supporto"); + + Role portosGeologo = RoleLocalServiceUtil.getRole(organization.getCompanyId(), Constants.ROLE_NAME_GEOLOGO); + + Role portosCalendario = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_calendario"); + + Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), Constants.ROLE_NAME_ISTRUTTORE); + + if(!UserLocalServiceUtil.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())){ + + boolean isCalendario = UserGroupRoleLocalServiceUtil.hasUserGroupRole( + user.getUserId(), organization.getGroupId(), portosCalendario.getRoleId()); + + boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole( + user.getUserId(), organization.getGroupId(), portosIstruttore.getRoleId()); + + boolean isGeologo = UserLocalServiceUtil.hasRoleUser(portosGeologo.getRoleId(), user.getUserId()); + + + if(isCalendario){ + JSONObject jsonFunzionario = JSONFactoryUtil.createJSONObject(); + jsonFunzionario.put("id", user.getUserId()); + jsonFunzionario.put("nome", user.getFirstName()); + jsonFunzionario.put("cognome", user.getLastName()); + if(isIstruttore){ + jsonFunzionario.put("tipologia", "Istruttore"); + } else if(isGeologo){ + jsonFunzionario.put("tipologia", "Geologo"); + } else { + jsonFunzionario.put("tipologia", ""); } + json.put(jsonFunzionario); } } } - } catch (NumberFormatException | PortalException | SystemException e) { - _log.error(e, e); } - return json.toString(); + } catch (NumberFormatException | SystemException e) { + _log.error(e,e); + } catch (PortalException e) { + _log.error(e,e); } + return json.toString(); + } } class UserComparator implements Comparator { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/PrenotazioneLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/PrenotazioneLocalServiceImpl.java index b0bb7950..b21c40ee 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/PrenotazioneLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/PrenotazioneLocalServiceImpl.java @@ -33,6 +33,7 @@ import com.liferay.portal.service.OrganizationLocalServiceUtil; import com.liferay.portal.service.RoleLocalServiceUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserGroupRoleLocalServiceUtil; +import com.liferay.portal.service.UserLocalServiceUtil; /** * The implementation of the prenotazione local service. @@ -55,45 +56,56 @@ public class PrenotazioneLocalServiceImpl extends PrenotazioneLocalServiceBaseIm * service. */ - @Override - public Prenotazione addPrenotazione(long userId, long funzionarioId, long professionistaId, Date startDate, - Date endDate, String descrizione, String telefono, String email, long presidio, - ServiceContext serviceContext) throws SystemException, PortalException { - - Prenotazione prenotazione = - prenotazionePersistence.create(counterLocalService.increment(Prenotazione.class.getName())); - User user = userPersistence.findByPrimaryKey(userId); - Date now = new Date(); - prenotazione.setCompanyId(serviceContext.getCompanyId()); - prenotazione.setUserId(user.getUserId()); - prenotazione.setUserName(user.getFullName()); - prenotazione.setCreateDate(serviceContext.getCreateDate(now)); - prenotazione.setModifiedDate(serviceContext.getModifiedDate(now)); - prenotazione.setGroupId(presidio); - prenotazione.setFunzionarioId(funzionarioId); - prenotazione.setProfessionistaId(professionistaId); - prenotazione.setStartDate(startDate); - prenotazione.setEndDate(endDate); - prenotazione.setDescLong(descrizione); - prenotazione.setTelefono(telefono); - prenotazione.setEmail(email); - prenotazione = updatePrenotazione(prenotazione); - return prenotazione; - } +//Product Backlog Item 32934 + public Prenotazione addPrenotazione(long userId, long funzionarioId, long professionistaId, Date startDate, + Date endDate, String descrizione, String telefono, String email, long presidio, ServiceContext serviceContext) throws SystemException, PortalException { - @Override - public Prenotazione updatePrenotazione(long prenotazioneId, Date startDate, Date endDate, String descrizione, - ServiceContext serviceContext) throws SystemException, PortalException { + Prenotazione prenotazione = + prenotazionePersistence.create(counterLocalService.increment(Prenotazione.class.getName())); - Prenotazione prenotazione = prenotazionePersistence.findByPrimaryKey(prenotazioneId); - Date now = new Date(); - prenotazione.setModifiedDate(serviceContext.getModifiedDate(now)); - prenotazione.setStartDate(startDate); - prenotazione.setEndDate(endDate); - prenotazione.setDescLong(descrizione); - prenotazione = updatePrenotazione(prenotazione); - return prenotazione; - } + User user = userPersistence.findByPrimaryKey(userId); + + Date now = new Date(); + + prenotazione.setCompanyId(serviceContext.getCompanyId()); + prenotazione.setUserId(user.getUserId()); + prenotazione.setUserName(user.getFullName()); + prenotazione.setCreateDate(serviceContext.getCreateDate(now)); + prenotazione.setModifiedDate(serviceContext.getModifiedDate(now)); + prenotazione.setGroupId(presidio); + + prenotazione.setFunzionarioId(funzionarioId); + prenotazione.setProfessionistaId(professionistaId); + prenotazione.setStartDate(startDate); + prenotazione.setEndDate(endDate); + prenotazione.setDescLong(descrizione); + + //Product Backlog Item 32934 + prenotazione.setTelefono(telefono); + prenotazione.setEmail(email); + + prenotazione = prenotazioneLocalService.updatePrenotazione(prenotazione); + + return prenotazione; + } + + public Prenotazione updatePrenotazione(long prenotazioneId, Date startDate, Date endDate, String descrizione, + ServiceContext serviceContext) throws SystemException, PortalException { + + Prenotazione prenotazione = prenotazionePersistence.findByPrimaryKey(prenotazioneId); + + Date now = new Date(); + + prenotazione.setModifiedDate(serviceContext.getModifiedDate(now)); + + prenotazione.setStartDate(startDate); + prenotazione.setEndDate(endDate); + prenotazione.setDescLong(descrizione); + + prenotazione = prenotazioneLocalService.updatePrenotazione(prenotazione); + + return prenotazione; + } @Override public Prenotazione deletePrenotazione(Prenotazione prenotazione) throws SystemException { @@ -108,33 +120,31 @@ public class PrenotazioneLocalServiceImpl extends PrenotazioneLocalServiceBaseIm return this.deletePrenotazione(prenotazione); } - @SuppressWarnings("unchecked") - @Override - public List findByStartDate(Date date) throws SystemException { + public List findByStartDate(Date date) throws SystemException { + Date start = DateUtils.truncate(date, java.util.Calendar.DAY_OF_MONTH); + Date end = DateUtils.addDays(start, 1); - Date start = DateUtils.truncate(date, java.util.Calendar.DAY_OF_MONTH); - Date end = DateUtils.addDays(start, 1); - DynamicQuery dynamicQuery = dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.between("startDate", start, end)); - dynamicQuery.addOrder(OrderFactoryUtil.desc("funzionarioId")); - return prenotazionePersistence.findWithDynamicQuery(dynamicQuery); - } + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.between("startDate", start, end)); + dynamicQuery.addOrder(OrderFactoryUtil.desc("funzionarioId")); + return prenotazionePersistence.findWithDynamicQuery(dynamicQuery); - @SuppressWarnings("unchecked") - @Override - public List findByDateHourFunzionario(Date date, long funzionarioId, long groupId) - throws SystemException { + } + + public List findByDateHourFunzionario(Date date, long funzionarioId, long groupId) throws SystemException { + + DynamicQuery dynamicQuery = dynamicQuery(); + + dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("startDate", date)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("groupId", groupId)); + + return prenotazionePersistence.findWithDynamicQuery(dynamicQuery); - DynamicQuery dynamicQuery = dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("startDate", date)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("groupId", groupId)); - return prenotazionePersistence.findWithDynamicQuery(dynamicQuery); } - @Override - public int getAvailableSlotByStartDate_EndDate(long funzionarioId, Date startDate, Date endDate) - throws SystemException { + public int getAvailableSlotByStartDate_EndDate(long funzionarioId, Date startDate, Date endDate) + throws SystemException { DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); @@ -151,45 +161,53 @@ public class PrenotazioneLocalServiceImpl extends PrenotazioneLocalServiceBaseIm return (int) prenotazionePersistence.countWithDynamicQuery(dynamicQuery); } - @SuppressWarnings("unchecked") - @Override - public List findByFunzionario_StartDate(long funzionarioId, Date date, long groupId) - throws SystemException { - Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); - Date end = DateUtils.addHours(start, 22); - DynamicQuery dynamicQuery = dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("groupId", groupId)); - dynamicQuery.add(RestrictionsFactoryUtil.ge("startDate", start)); - dynamicQuery.add(RestrictionsFactoryUtil.lt("endDate", end)); - return prenotazionePersistence.findWithDynamicQuery(dynamicQuery); - } + public List findByFunzionario_StartDate(long funzionarioId, Date date, long groupId) throws SystemException { + Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH); + Date end = DateUtils.addHours(start, 22); + + DynamicQuery dynamicQuery = dynamicQuery(); + + dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", funzionarioId)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("groupId", groupId)); + dynamicQuery.add(RestrictionsFactoryUtil.ge("startDate", start)); + dynamicQuery.add(RestrictionsFactoryUtil.lt("endDate", end)); + + return prenotazionePersistence.findWithDynamicQuery(dynamicQuery); + } + + public int countPrenotazioniPresidioPeriodo(long presidioId, String fromString, String toString) throws SystemException, PortalException, ParseException{ + + int count = 0; + + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + + Date from = sdf.parse(fromString); + Date to = sdf.parse(toString); + + Calendar fromCal = Calendar.getInstance(); + fromCal.setTime(from); + fromCal.set(Calendar.HOUR_OF_DAY, 2); + + Calendar toCal = Calendar.getInstance(); + toCal.setTime(to); + toCal.set(Calendar.HOUR_OF_DAY, 22); + + + Organization org = OrganizationLocalServiceUtil.fetchOrganization(presidioId); + Role portosCalendario = RoleLocalServiceUtil.getRole(org.getCompanyId(), "portos_calendario"); + + if (org != null) { + + List users = UserLocalServiceUtil.getOrganizationUsers(presidioId); + for (User user : users) { + boolean isCalendario = UserGroupRoleLocalServiceUtil.hasUserGroupRole( + user.getUserId(), org.getGroupId(), portosCalendario.getRoleId()); + + if(isCalendario){ + + DynamicQuery dynamicQuery = dynamicQuery(); - @Override - public int countPrenotazioniPresidioPeriodo(long presidioId, String fromString, String toString) - throws SystemException, PortalException, ParseException { - - int count = 0; - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - Date from = sdf.parse(fromString); - Date to = sdf.parse(toString); - Calendar fromCal = Calendar.getInstance(); - fromCal.setTime(from); - fromCal.set(Calendar.HOUR_OF_DAY, 2); - Calendar toCal = Calendar.getInstance(); - toCal.setTime(to); - toCal.set(Calendar.HOUR_OF_DAY, 22); - Organization org = OrganizationLocalServiceUtil.fetchOrganization(presidioId); - Role portosCalendario = RoleLocalServiceUtil.getRole(org.getCompanyId(), "portos_calendario"); - if (org != null) { - List users = userLocalService.getOrganizationUsers(presidioId); - for (User user : users) { - boolean isCalendario = - UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), org.getGroupId(), - portosCalendario.getRoleId()); - if (isCalendario) { - DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("funzionarioId", user.getUserId())); dynamicQuery.add(RestrictionsFactoryUtil.between("startDate", fromCal.getTime(), toCal.getTime())); dynamicQuery.add(RestrictionsFactoryUtil.eq("groupId", org.getGroupId())); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/PrenotazioneServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/PrenotazioneServiceImpl.java index b9831cea..5d27ed97 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/PrenotazioneServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/PrenotazioneServiceImpl.java @@ -10,6 +10,7 @@ package it.tref.portos.calendar.appointments.service.impl; import it.tref.portos.calendar.appointments.SlotNotAvailableException; import it.tref.portos.calendar.appointments.model.Prenotazione; +import it.tref.portos.calendar.appointments.service.PrenotazioneLocalServiceUtil; import it.tref.portos.calendar.appointments.service.base.PrenotazioneServiceBaseImpl; import java.text.ParseException; @@ -34,6 +35,7 @@ import com.liferay.portal.service.OrganizationLocalServiceUtil; import com.liferay.portal.service.RoleLocalServiceUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserGroupRoleLocalServiceUtil; +import com.liferay.portal.service.UserLocalServiceUtil; /** * The implementation of the prenotazione remote service. @@ -57,7 +59,7 @@ public class PrenotazioneServiceImpl extends PrenotazioneServiceBaseImpl { private static Log _log = LogFactoryUtil.getLog(PrenotazioneServiceImpl.class); - @Override + //Product Backlog Item 32934 public void addPrenotazione(long userId, long funzionarioId, long professionistaId, Date startDate, Date endDate, String descrizione, String telefono, String email, long presidio, ServiceContext serviceContext) throws SystemException, PortalException { @@ -69,11 +71,10 @@ public class PrenotazioneServiceImpl extends PrenotazioneServiceBaseImpl { descrizione, telefono, email, presidio, serviceContext); } - @Override public void updatePrenotazione(long prenotazioneId, long userId, Date startDate, Date endDate, String descrizione, ServiceContext serviceContext) throws SystemException, PortalException { - Prenotazione prenotazione = prenotazioneLocalService.fetchPrenotazione(prenotazioneId); + Prenotazione prenotazione = PrenotazioneLocalServiceUtil.fetchPrenotazione(prenotazioneId); if (prenotazione.getUserId() != userId) { throw new SystemException("error.calendar.appointments.prenotazione.not.allowed.update " + prenotazioneId + " user " + userId); @@ -81,38 +82,52 @@ public class PrenotazioneServiceImpl extends PrenotazioneServiceBaseImpl { prenotazioneLocalService.updatePrenotazione(prenotazioneId, startDate, endDate, descrizione, serviceContext); } - @Override public void deletePrenotazione(long prenotazioneId, long userId) throws SystemException, PortalException { + Prenotazione prenotazione = PrenotazioneLocalServiceUtil.fetchPrenotazione(prenotazioneId); + + //Product Backlog Item 32933 +// if (prenotazione.getUserId() != userId) { +// throw new SystemException("error.calendar.appointments.prenotazione.not.allowed.update " + prenotazioneId +// + " user " + userId); +// } + prenotazioneLocalService.deletePrenotazione(prenotazioneId); } - @Override - public String getPrenotazioniByDate(String presidio, String date, String userId) throws SystemException, - ParseException { + public String getPrenotazioniByDate(String presidio, String date, String userId) throws SystemException, ParseException { long loggetUserId = Long.parseLong(userId); Organization organization = OrganizationLocalServiceUtil.fetchOrganization(Long.valueOf(presidio)); List userDefinitivo = new ArrayList(); try { - if (organization != null) { - List users = userLocalService.getOrganizationUsers(Long.valueOf(presidio)); + if(organization != null){ + List users = UserLocalServiceUtil.getOrganizationUsers(Long.valueOf(presidio)); + for (User user : users) { Role portosSupporto = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_supporto"); - Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), - "portos_calendario"); - if (!userLocalService.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())) { - boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), - organization.getGroupId(), portosIstruttore.getRoleId()); - if (isIstruttore) { + + Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_calendario"); + + if(!UserLocalServiceUtil.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())){ + + boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole( + user.getUserId(), organization.getGroupId(), portosIstruttore.getRoleId()); + + + if(isIstruttore){ userDefinitivo.add(user); } } } } - } catch (NumberFormatException | PortalException | SystemException e) { - _log.error(e, e); + + } catch (NumberFormatException | SystemException e) { + _log.error(e,e); + } catch (PortalException e) { + _log.error(e,e); } + Date startDate = new SimpleDateFormat("dd/MM/yyyy").parse(date); SimpleDateFormat sdf = new SimpleDateFormat("HH:mm"); JSONArray json = JSONFactoryUtil.createJSONArray(); @@ -131,8 +146,10 @@ public class PrenotazioneServiceImpl extends PrenotazioneServiceBaseImpl { jsonPrenotazione.put("idPrenotazione", prenotazione.getPrenotazioneId()); jsonPrenotazione.put("inizio", sdf.format(prenotazione.getStartDate())); jsonPrenotazione.put("fine", sdf.format(prenotazione.getEndDate())); - User richiedente = userLocalService.fetchUser(prenotazione.getProfessionistaId()); - if (loggetUserId == prenotazione.getProfessionistaId()) { + + User richiedente = UserLocalServiceUtil.fetchUser(prenotazione.getProfessionistaId()); + + if(loggetUserId == prenotazione.getProfessionistaId()){ jsonPrenotazione.put("visible", true); } else { jsonPrenotazione.put("visible", canSeeFullInformations(loggetUserId)); @@ -153,8 +170,9 @@ public class PrenotazioneServiceImpl extends PrenotazioneServiceBaseImpl { private boolean canSeeFullInformations(long loggetUserId) throws SystemException { boolean canDo = false; - User user = userLocalService.fetchUser(loggetUserId); - if (user != null) { + + User user = UserLocalServiceUtil.fetchUser(loggetUserId); + if(user != null){ Group siteBO = GroupLocalServiceUtil.fetchGroup(user.getCompanyId(), "Portos BackOffice"); boolean isBoUser = GroupLocalServiceUtil.hasUserGroup(user.getUserId(), siteBO.getGroupId()); if (isBoUser) { @@ -164,7 +182,6 @@ public class PrenotazioneServiceImpl extends PrenotazioneServiceBaseImpl { return canDo; } - @Override public boolean isSlotAvailable(long funzionarioId, Date startDate, Date endDate) throws SystemException { return prenotazioneLocalService.getAvailableSlotByStartDate_EndDate(funzionarioId, startDate, endDate) == 0; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/DisponibilitaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/DisponibilitaPersistenceImpl.java index e3a33173..f0f76529 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/DisponibilitaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/DisponibilitaPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.portos.calendar.appointments.NoSuchDisponibilitaException; import it.tref.portos.calendar.appointments.model.Disponibilita; import it.tref.portos.calendar.appointments.model.impl.DisponibilitaImpl; import it.tref.portos.calendar.appointments.model.impl.DisponibilitaModelImpl; -import it.tref.portos.calendar.appointments.service.persistence.DisponibilitaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/FunzionarioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/FunzionarioPersistenceImpl.java index 0106fbec..aef95370 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/FunzionarioPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/FunzionarioPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.portos.calendar.appointments.NoSuchFunzionarioException; import it.tref.portos.calendar.appointments.model.Funzionario; import it.tref.portos.calendar.appointments.model.impl.FunzionarioImpl; import it.tref.portos.calendar.appointments.model.impl.FunzionarioModelImpl; -import it.tref.portos.calendar.appointments.service.persistence.FunzionarioPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/PrenotazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/PrenotazionePersistenceImpl.java index 8942c4b7..d056c031 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/PrenotazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/PrenotazionePersistenceImpl.java @@ -46,7 +46,6 @@ import it.tref.portos.calendar.appointments.NoSuchPrenotazioneException; import it.tref.portos.calendar.appointments.model.Prenotazione; import it.tref.portos.calendar.appointments.model.impl.PrenotazioneImpl; import it.tref.portos.calendar.appointments.model.impl.PrenotazioneModelImpl; -import it.tref.portos.calendar.appointments.service.persistence.PrenotazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/ProfessionistaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/ProfessionistaPersistenceImpl.java index 9cf11dd3..ca7237cc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/ProfessionistaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/persistence/ProfessionistaPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.portos.calendar.appointments.NoSuchProfessionistaException; import it.tref.portos.calendar.appointments.model.Professionista; import it.tref.portos.calendar.appointments.model.impl.ProfessionistaImpl; import it.tref.portos.calendar.appointments.model.impl.ProfessionistaModelImpl; -import it.tref.portos.calendar.appointments.service.persistence.ProfessionistaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/util/CalendarUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/util/CalendarUtil.java index 37cc5b1e..4b114261 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/util/CalendarUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/util/CalendarUtil.java @@ -5,6 +5,7 @@ import it.tref.portos.calendar.appointments.model.Prenotazione; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.regex.Matcher; @@ -13,6 +14,8 @@ import java.util.regex.Pattern; import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; +import org.apache.log4j.net.TelnetAppender; + import com.liferay.mail.service.MailServiceUtil; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.mail.MailMessage; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/service.properties index 6ee3fbbd..63499da9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_calendar_appointments - build.number=178 - build.date=1655995359988 + build.number=179 + build.date=1675853211115 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/init.jsp index 8e7e7acd..d654039d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="java.util.ArrayList"%> <%@page import="com.liferay.portal.model.Role"%> <%@page import="com.liferay.portal.service.UserGroupRoleLocalServiceUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/amministrazione.jsp b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/amministrazione.jsp index 4b1c0905..6a89a46b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/amministrazione.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/amministrazione.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.portos.calendar.appointments.service.PrenotazioneLocalServiceUtil"%> <%@page import="com.liferay.portal.service.OrganizationLocalServiceUtil"%> <%@page import="com.liferay.portal.model.Organization"%> @@ -245,11 +244,11 @@ String dataFine = ParamUtil.getString(request, "dataFineRicerca","");
- - - - - + + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/calendar.jsp b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/calendar.jsp index 2f0ab821..f373ee8e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/calendar.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/calendar.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.service.OrganizationLocalServiceUtil"%> <%@page import="com.liferay.portal.model.Organization"%> <%@page import="it.tref.portos.calendar.appointments.service.DisponibilitaLocalServiceUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/gestione_disponibilita.jsp b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/gestione_disponibilita.jsp index 9a975ce9..26ec43e6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/gestione_disponibilita.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/gestione_disponibilita.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> <%@page import="it.tref.portos.calendar.appointments.service.PrenotazioneLocalServiceUtil"%> <%@page import="it.tref.portos.calendar.appointments.service.DisponibilitaLocalServiceUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/gestione_disponibilita_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/gestione_disponibilita_action.jsp index 5815f9f3..c732457f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/gestione_disponibilita_action.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/gestione_disponibilita_action.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.portos.calendar.appointments.model.Disponibilita"%> <%@ include file="/html/calendar_appointments/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/view.jsp index b8d77306..161d8081 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.service.GroupLocalServiceUtil"%> <%@ include file="/html/calendar_appointments/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/init.jsp index 11c883c0..f3db762d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="java.text.Format"%> <%@page import="com.liferay.portal.kernel.util.FastDateFormatFactoryUtil"%> <%@page import="com.liferay.portal.kernel.util.StringUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/view.jsp index 07d5fcb0..8a21a366 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <% /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/ivy.xml.MD5 index 2e919d89..bd5d4b5b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/ivy.xml.MD5 @@ -1 +1 @@ -4c011c888941fe61afd3a1627c1f69ff +75bfb39003bc9425cfe9dbfddb78d9ab diff --git a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.classpath index 8870e168..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.classpath @@ -1,7 +1,7 @@ - + @@ -18,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.project index 484c8979..d1964315 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.project @@ -32,6 +32,5 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature diff --git a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/companyconfig/portlet/CompanyConfigurationPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/companyconfig/portlet/CompanyConfigurationPortlet.java index 1e36fa75..2ef3c8b7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/companyconfig/portlet/CompanyConfigurationPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/companyconfig/portlet/CompanyConfigurationPortlet.java @@ -1,8 +1,5 @@ package it.tref.liferay.portos.companyconfig.portlet; -import javax.portlet.ActionRequest; -import javax.portlet.ActionResponse; - import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.model.Company; @@ -11,6 +8,9 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.ServiceContextFactory; import com.liferay.util.bridges.mvc.MVCPortlet; +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; + public class CompanyConfigurationPortlet extends MVCPortlet { public void saveCustomFields(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/html/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/html/init.jsp index 0afcda91..065d3d8b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/html/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/html/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/ivy.xml.MD5 index b4753adf..9fd6310c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/ivy.xml.MD5 @@ -1 +1 @@ -fd5e412787336cba1834a2f9ea43ca38 +2558fcea11a1b513e80faab1bbcc1c41 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.classpath index 9975372f..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.classpath @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.wst.common.component index cfe958eb..74d0a01c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.wst.common.component @@ -2,9 +2,6 @@ - - uses - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/ivy.xml.MD5 index a1326e7a..c1ede356 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/ivy.xml.MD5 @@ -1 +1 @@ -95d8843f04e59c4342e21f003b5c8deb +fffd049f465a4f20c2137621362b0ef2 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.classpath index 9975372f..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.classpath @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.classpath index 26409659..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.classpath @@ -1,7 +1,7 @@ - + @@ -18,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.project index 60d50a01..cb1c05a3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.project @@ -32,6 +32,5 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.wst.common.component index 63870e17..6cba4c13 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.wst.common.component @@ -2,9 +2,6 @@ - - uses - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/commons-logging.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/commons-logging.jar deleted file mode 100644 index 8758a96b..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/commons-logging.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/jstl-api.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/jstl-api.jar deleted file mode 100644 index 80a5737f..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/jstl-api.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/jstl-impl.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/jstl-impl.jar deleted file mode 100644 index e5a9342f..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/jstl-impl.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/log4j.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/log4j.jar deleted file mode 100644 index 068867eb..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/log4j.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/util-bridges.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/util-bridges.jar deleted file mode 100644 index 7d7435fe..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/util-bridges.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/util-taglib.jar deleted file mode 100644 index fbba5f0a..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/lib/util-taglib.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/action/DeployAction.java b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/action/DeployAction.java index 5297156b..c2913866 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/action/DeployAction.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/action/DeployAction.java @@ -1,14 +1,5 @@ package it.tref.liferay.portos.deployalert.action; -import it.tref.liferay.portos.deployalert.constants.MailConstants; -import it.tref.liferay.portos.deployalert.model.NotificationMail; -import it.tref.liferay.portos.deployalert.service.NotificationLogLocalServiceUtil; -import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil; -import it.tref.liferay.portos.deployalert.util.DeployAlertUtil; -import it.tref.liferay.portos.mailmanager.shared.messaging.util.MailManagerUtil; - -import java.util.List; - import com.liferay.portal.kernel.events.ActionException; import com.liferay.portal.kernel.events.SimpleAction; import com.liferay.portal.kernel.exception.PortalException; @@ -25,6 +16,15 @@ import com.liferay.portal.model.Company; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.util.PortalUtil; +import it.tref.liferay.portos.deployalert.constants.MailConstants; +import it.tref.liferay.portos.deployalert.model.NotificationMail; +import it.tref.liferay.portos.deployalert.service.NotificationLogLocalServiceUtil; +import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil; +import it.tref.liferay.portos.deployalert.util.DeployAlertUtil; +import it.tref.liferay.portos.mailmanager.shared.messaging.util.MailManagerUtil; + +import java.util.List; + public class DeployAction extends SimpleAction { private static final Log _log = LogFactoryUtil.getLog(DeployAction.class); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/portlet/NotificatorPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/portlet/NotificatorPortlet.java index 79fcadd2..1db8998c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/portlet/NotificatorPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/portlet/NotificatorPortlet.java @@ -1,11 +1,5 @@ package it.tref.liferay.portos.deployalert.portlet; -import it.tref.liferay.portos.deployalert.model.NotificationMail; -import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil; - -import javax.portlet.ActionRequest; -import javax.portlet.ActionResponse; - import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.servlet.SessionErrors; @@ -14,6 +8,11 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.ServiceContextFactory; import com.liferay.util.bridges.mvc.MVCPortlet; +import it.tref.liferay.portos.deployalert.model.NotificationMail; +import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil; + +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; public class NotificatorPortlet extends MVCPortlet { public void addNotification(ActionRequest request, ActionResponse response) throws PortalException, SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/impl/NotificationLogLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/impl/NotificationLogLocalServiceImpl.java index f581bdc7..6b3e8ead 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/impl/NotificationLogLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/impl/NotificationLogLocalServiceImpl.java @@ -8,6 +8,10 @@ package it.tref.liferay.portos.deployalert.service.impl; +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.util.Validator; + import it.tref.liferay.portos.deployalert.NotificationNomePluginException; import it.tref.liferay.portos.deployalert.NotificationTipoException; import it.tref.liferay.portos.deployalert.model.NotificationLog; @@ -15,10 +19,6 @@ import it.tref.liferay.portos.deployalert.service.base.NotificationLogLocalServi import java.util.Date; -import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portal.kernel.util.Validator; - /** * The implementation of the notification log local service. *

diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/impl/NotificationMailLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/impl/NotificationMailLocalServiceImpl.java index 1b8d384a..ddd42548 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/impl/NotificationMailLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/impl/NotificationMailLocalServiceImpl.java @@ -8,15 +8,6 @@ package it.tref.liferay.portos.deployalert.service.impl; -import it.tref.liferay.portos.deployalert.NotificationNomePluginException; -import it.tref.liferay.portos.deployalert.NotificationNomeTemplateException; -import it.tref.liferay.portos.deployalert.model.NotificationMail; -import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil; -import it.tref.liferay.portos.deployalert.service.base.NotificationMailLocalServiceBaseImpl; - -import java.util.Date; -import java.util.List; - import com.liferay.portal.kernel.dao.orm.Disjunction; import com.liferay.portal.kernel.dao.orm.DynamicQuery; import com.liferay.portal.kernel.dao.orm.OrderFactoryUtil; @@ -28,6 +19,15 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.model.User; import com.liferay.portal.service.ServiceContext; +import it.tref.liferay.portos.deployalert.NotificationNomePluginException; +import it.tref.liferay.portos.deployalert.NotificationNomeTemplateException; +import it.tref.liferay.portos.deployalert.model.NotificationMail; +import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil; +import it.tref.liferay.portos.deployalert.service.base.NotificationMailLocalServiceBaseImpl; + +import java.util.Date; +import java.util.List; + /** * The implementation of the notification mail local service. *

diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/persistence/NotificationLogPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/persistence/NotificationLogPersistenceImpl.java index 78a471b1..c9c20815 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/persistence/NotificationLogPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/persistence/NotificationLogPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.deployalert.NoSuchNotificationLogException; import it.tref.liferay.portos.deployalert.model.NotificationLog; import it.tref.liferay.portos.deployalert.model.impl.NotificationLogImpl; import it.tref.liferay.portos.deployalert.model.impl.NotificationLogModelImpl; -import it.tref.liferay.portos.deployalert.service.persistence.NotificationLogPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/persistence/NotificationMailPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/persistence/NotificationMailPersistenceImpl.java index 9297ba1f..2940148c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/persistence/NotificationMailPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/persistence/NotificationMailPersistenceImpl.java @@ -45,7 +45,6 @@ import it.tref.liferay.portos.deployalert.NoSuchNotificationMailException; import it.tref.liferay.portos.deployalert.model.NotificationMail; import it.tref.liferay.portos.deployalert.model.impl.NotificationMailImpl; import it.tref.liferay.portos.deployalert.model.impl.NotificationMailModelImpl; -import it.tref.liferay.portos.deployalert.service.persistence.NotificationMailPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/service.properties index f2bb7f16..183fa0ca 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=DA - build.number=12 - build.date=1632922531750 + build.number=13 + build.date=1675847285435 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/ivy.xml.MD5 index 0d659d7c..7391a9a0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/ivy.xml.MD5 @@ -1 +1 @@ -5ae48f34ca95a715172797941f9c2717 +20e44765a9887ba15a07be7f690ea28b diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.classpath index b498b336..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.classpath @@ -1,6 +1,11 @@ + + + + + @@ -13,7 +18,5 @@ - - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.project index e1e8384b..b0804632 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.project @@ -32,6 +32,5 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component index 26b0e067..7cdcd139 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component @@ -2,9 +2,6 @@ - - uses - uses diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-fonts.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-fonts.jar index c778df33..7663a6fd 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-fonts.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/ivy.xml b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml index fe4214ac..0a3a154a 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 @@ -18,7 +18,7 @@ - + \ 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 487b85f1..d2167a1a 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 @@ -2b88062fbb293f8650a3e1f7d317db7f +044d954232675ea75046a771b446dacf diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.classpath index fcf44f2b..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.classpath @@ -1,7 +1,7 @@ - + @@ -18,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.project index 65a765ba..6e24c69e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.project @@ -32,6 +32,5 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.core.resources.prefs b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 584cbc00..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -encoding//docroot/html/firma/configuration.jsp=UTF-8 -encoding//docroot/html/firma/init.jsp=UTF-8 -encoding//docroot/html/firma/view.jsp=UTF-8 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.component index 7a047eaa..9fda3447 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.component @@ -2,9 +2,6 @@ - - uses - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpclient.jar b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpclient.jar index 970c9891..8af45610 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpclient.jar and b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpclient.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpcore.jar b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpcore.jar index 99715b6a..16ed0d16 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpcore.jar and b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpcore.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpmime.jar b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpmime.jar index b631ceb4..fe2cf8e3 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpmime.jar and b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/lib/httpmime.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/ivy.xml.MD5 index ddcc2b49..d2d59262 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/ivy.xml.MD5 @@ -1 +1 @@ -a15636541520cd34beccb182ca342eb1 +273d0824c78cff25a3e65a82a4794cba diff --git a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.classpath index 1d33a4b7..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.classpath @@ -1,11 +1,9 @@ - - - + - + @@ -13,9 +11,11 @@ - + + + - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index af295340..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,11 +1,11 @@ - - + + + - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/workflowweb/NoSuchInstanceException.java b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/workflowweb/NoSuchInstanceException.java new file mode 100644 index 00000000..250214c5 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/workflowweb/NoSuchInstanceException.java @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2000-2013 Liferay, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. + */ + +package it.tref.liferay.portos.workflowweb; + +import com.liferay.portal.NoSuchModelException; + +/** + * @author Brian Wing Shun Chan + */ +public class NoSuchInstanceException extends NoSuchModelException { + + public NoSuchInstanceException() { + super(); + } + + public NoSuchInstanceException(String msg) { + super(msg); + } + + public NoSuchInstanceException(String msg, Throwable cause) { + super(msg, cause); + } + + public NoSuchInstanceException(Throwable cause) { + super(cause); + } + +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/workflowweb/NoSuchLogException.java b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/workflowweb/NoSuchLogException.java new file mode 100644 index 00000000..7b474397 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/workflowweb/NoSuchLogException.java @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2000-2013 Liferay, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. + */ + +package it.tref.liferay.portos.workflowweb; + +import com.liferay.portal.NoSuchModelException; + +/** + * @author Brian Wing Shun Chan + */ +public class NoSuchLogException extends NoSuchModelException { + + public NoSuchLogException() { + super(); + } + + public NoSuchLogException(String msg) { + super(msg); + } + + public NoSuchLogException(String msg, Throwable cause) { + super(msg, cause); + } + + public NoSuchLogException(Throwable cause) { + super(cause); + } + +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/workflowweb/NoSuchTaskException.java b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/workflowweb/NoSuchTaskException.java new file mode 100644 index 00000000..f9766351 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/workflowweb/NoSuchTaskException.java @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2000-2013 Liferay, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. + */ + +package it.tref.liferay.portos.workflowweb; + +import com.liferay.portal.NoSuchModelException; + +/** + * @author Brian Wing Shun Chan + */ +public class NoSuchTaskException extends NoSuchModelException { + + public NoSuchTaskException() { + super(); + } + + public NoSuchTaskException(String msg) { + super(msg); + } + + public NoSuchTaskException(String msg, Throwable cause) { + super(msg, cause); + } + + public NoSuchTaskException(Throwable cause) { + super(cause); + } + +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/src/service.properties index 372e3658..8d9e3b3e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=WorkflowWeb - build.number=9 - build.date=1489666088972 + build.number=13 + build.date=1675936623880 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/tld/c.tld b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/tld/c.tld similarity index 100% rename from liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/tld/c.tld rename to liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/docroot/WEB-INF/tld/c.tld diff --git a/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/ivy.xml.MD5 new file mode 100644 index 00000000..92687bb3 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-jbpm-log-task-portlet/ivy.xml.MD5 @@ -0,0 +1 @@ +2ba9fdf0fa9799422d0120a5d4b9fea7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.classpath index e3868bf1..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.classpath @@ -1,7 +1,7 @@ - + @@ -18,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.project index ec7efd4d..baf165d0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.project @@ -32,6 +32,5 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.component index 2763cf33..282ada99 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.component @@ -2,21 +2,6 @@ - - uses - - - uses - - - uses - - - uses - - - uses - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/liferay-portlet.xml b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/liferay-portlet.xml index 8796c801..41b5d165 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/liferay-portlet.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/liferay-portlet.xml @@ -2,10 +2,18 @@ - 1 + + it.tref.liferay.portos.kaleo.controller.scheduler.SchedulerKaleoController + + + 240 + second + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/service.xml index 3013f16a..669d4b42 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/service.xml @@ -1,4 +1,4 @@ - + 3FC + Manifattura Web Group s.r.l. diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoInstanceTokenImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoInstanceTokenImpl.java index a4c148b8..1fbfd4ba 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoInstanceTokenImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoInstanceTokenImpl.java @@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.controller.model.impl; * * @author 3FC + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class KaleoInstanceTokenImpl extends KaleoInstanceTokenBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a kaleo instance token model diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoLogImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoLogImpl.java index 77d355a7..7b3ed9f5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoLogImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoLogImpl.java @@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.controller.model.impl; * * @author 3FC + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class KaleoLogImpl extends KaleoLogBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a kaleo log model instance diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoNodeImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoNodeImpl.java index 7a09744c..95c3ef40 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoNodeImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoNodeImpl.java @@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.controller.model.impl; * * @author 3FC + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class KaleoNodeImpl extends KaleoNodeBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a kaleo node model instance diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskAssignmentInstanceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskAssignmentInstanceImpl.java index 7964dc04..ba2c7535 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskAssignmentInstanceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskAssignmentInstanceImpl.java @@ -19,8 +19,8 @@ package it.tref.liferay.portos.kaleo.controller.model.impl; * * @author 3FC + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") -public class KaleoTaskAssignmentInstanceImpl extends KaleoTaskAssignmentInstanceBaseImpl { +public class KaleoTaskAssignmentInstanceImpl + extends KaleoTaskAssignmentInstanceBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a kaleo task assignment * instance model instance should use the {@link diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskImpl.java index 75d3958d..4f935241 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskImpl.java @@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.controller.model.impl; * * @author 3FC + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class KaleoTaskImpl extends KaleoTaskBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a kaleo task model instance diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskInstanceTokenImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskInstanceTokenImpl.java index d84351ee..f47d858a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskInstanceTokenImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskInstanceTokenImpl.java @@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.controller.model.impl; * * @author 3FC + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") public class KaleoTaskInstanceTokenImpl extends KaleoTaskInstanceTokenBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a kaleo task instance token diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/service.properties index 7f48e8e0..8d35ed8b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_kaleo_controller - build.number=14 - build.date=1633513819560 + build.number=15 + build.date=1675847554551 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/ivy.xml.MD5 index 42fe76f7..706e4a97 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/ivy.xml.MD5 @@ -1 +1 @@ -28d87e1dbe151a6703074206020c93ee +0f0b5b50a25011b4f0d632dde76fd71b diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.classpath index b600399e..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.classpath @@ -1,8 +1,7 @@ - - + @@ -19,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.project index 6ef6b9ff..59a67b56 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.project @@ -32,6 +32,5 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.wst.common.component index 52ca29e6..7788a07b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.wst.common.component @@ -2,7 +2,6 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar index d0baea9d..b33acdec 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/liferay-hook.xml b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/liferay-hook.xml index 967a6059..944195a7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/liferay-hook.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/liferay-hook.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/service.xml index 8b9a04f4..4a9d3804 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/service.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormDefinitionLinkImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormDefinitionLinkImpl.java index e0e765dd..2a3cdcaa 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormDefinitionLinkImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormDefinitionLinkImpl.java @@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.model.impl; * * @author */ -@SuppressWarnings("serial") public class FormDefinitionLinkImpl extends FormDefinitionLinkBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a form definition link model diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormLogImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormLogImpl.java index 1ba04359..bf449f81 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormLogImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormLogImpl.java @@ -18,7 +18,6 @@ package it.tref.liferay.portos.kaleo.model.impl; * * @author */ -@SuppressWarnings("serial") public class FormLogImpl extends FormLogBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a form log model instance diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormTemplateLinkImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormTemplateLinkImpl.java index caf798c6..0758a627 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormTemplateLinkImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormTemplateLinkImpl.java @@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.model.impl; * * @author */ -@SuppressWarnings("serial") public class FormTemplateLinkImpl extends FormTemplateLinkBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a form template link model diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/portlet/WorkflowFormAdminPortletControlPanelEntry.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/portlet/WorkflowFormAdminPortletControlPanelEntry.java index 06c048b2..d001cb81 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/portlet/WorkflowFormAdminPortletControlPanelEntry.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/portlet/WorkflowFormAdminPortletControlPanelEntry.java @@ -12,6 +12,11 @@ public class WorkflowFormAdminPortletControlPanelEntry extends BaseControlPanelE protected boolean hasAccessPermissionDenied(PermissionChecker permissionChecker, Group group, Portlet portlet) throws Exception { - return group.isLayoutSetPrototype() || !WorkflowEngineManagerUtil.isDeployed(); - } + if (group.isLayoutSetPrototype() || !WorkflowEngineManagerUtil.isDeployed()) { + + return true; + } + + return false; + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormDefinitionLinkLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormDefinitionLinkLocalServiceImpl.java index 567b830e..c20e3c14 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormDefinitionLinkLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormDefinitionLinkLocalServiceImpl.java @@ -48,9 +48,8 @@ public class FormDefinitionLinkLocalServiceImpl extends FormDefinitionLinkLocalS * service. */ - @Override - public FormDefinitionLink addFormDefinitionLink(String name, String definitionName, int definitionVersion, - long ddmStructureId, ServiceContext serviceContext) throws PortalException, SystemException { + public FormDefinitionLink addFormDefinitionLink(String name, String definitionName, int definitionVersion, + long ddmStructureId, ServiceContext serviceContext) throws PortalException, SystemException { User user = userLocalService.getUser(serviceContext.getUserId()); Date now = new Date(); @@ -67,10 +66,9 @@ public class FormDefinitionLinkLocalServiceImpl extends FormDefinitionLinkLocalS return addFormDefinitionLink(formDefinitionLink); } - @Override - public FormDefinitionLink updateFormDefinitionLink(long formDefinitionLinkId, String name, String definitionName, - int definitionVersion, long ddmStructureId, ServiceContext serviceContext) throws PortalException, - SystemException { + public FormDefinitionLink updateFormDefinitionLink(long formDefinitionLinkId, String name, String definitionName, + int definitionVersion, long ddmStructureId, ServiceContext serviceContext) throws PortalException, + SystemException { FormDefinitionLink formDefinitionLink = formDefinitionLinkLocalService .getFormDefinitionLink(formDefinitionLinkId); @@ -101,45 +99,40 @@ public class FormDefinitionLinkLocalServiceImpl extends FormDefinitionLinkLocalS return formDefinitionLink; } - @Override - public int countByCompany(long companyId) throws SystemException { + public int countByCompany(long companyId) throws SystemException { + return formDefinitionLinkPersistence.countByCompany(companyId); + } - return formDefinitionLinkPersistence.countByCompany(companyId); - } + public List findByCompany(long companyId) throws SystemException { + return formDefinitionLinkPersistence.findByCompany(companyId); + } - @Override - public List findByCompany(long companyId) throws SystemException { + public List findByCompany(long companyId, int start, int end) throws SystemException { + return formDefinitionLinkPersistence.findByCompany(companyId, start, end); + } - return formDefinitionLinkPersistence.findByCompany(companyId); - } + public List findByCompany(long companyId, int start, int end, OrderByComparator orderByComparator) + throws SystemException { + return formDefinitionLinkPersistence.findByCompany(companyId, start, end, orderByComparator); + } - @Override - public List findByCompany(long companyId, int start, int end) throws SystemException { + public int countByDDMStructureId(long ddmStructureId) throws SystemException { + return formDefinitionLinkPersistence.countByDDMStructureId(ddmStructureId); + } - return formDefinitionLinkPersistence.findByCompany(companyId, start, end); - } + public FormDefinitionLink fetchByC_DefinitionName_DefinitionVersion(long companyId, String definitionName, + int definitionVersion) throws SystemException { - @Override - public List findByCompany(long companyId, int start, int end, - OrderByComparator orderByComparator) throws SystemException { + List formDefinitionLinks = + formDefinitionLinkPersistence.findByC_DefinitionName_DefinitionVersion(companyId, definitionName, + definitionVersion); - return formDefinitionLinkPersistence.findByCompany(companyId, start, end, orderByComparator); - } - - @Override - public int countByDDMStructureId(long ddmStructureId) throws SystemException { - - return formDefinitionLinkPersistence.countByDDMStructureId(ddmStructureId); - } + if (formDefinitionLinks.isEmpty()) { + return null; + } - @Override - public FormDefinitionLink fetchByC_DefinitionName_DefinitionVersion(long companyId, String definitionName, - int definitionVersion) throws SystemException { - - List formDefinitionLinks = formDefinitionLinkPersistence - .findByC_DefinitionName_DefinitionVersion(companyId, definitionName, definitionVersion); - return formDefinitionLinks.isEmpty() ? null : formDefinitionLinks.get(0); - } + return formDefinitionLinks.get(0); + } private void setFormDefinitionLink(FormDefinitionLink formDefinitionLink, String name, String definitionName, int definitionVersion, long ddmStructureId) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormLogLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormLogLocalServiceImpl.java index 82c61219..1de6654d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormLogLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormLogLocalServiceImpl.java @@ -39,9 +39,8 @@ public class FormLogLocalServiceImpl extends FormLogLocalServiceBaseImpl { * it.tref.liferay.portos.kaleo.service.FormLogLocalServiceUtil} to access the form log local service. */ - @Override - public FormLog addFormLog(long workflowInstanceId, long workflowTaskId, String transitionName, - String formParameters, ServiceContext serviceContext) throws SystemException, PortalException { + public FormLog addFormLog(long workflowInstanceId, long workflowTaskId, String transitionName, String formParameters, + ServiceContext serviceContext) throws SystemException, PortalException { Date now = new Date(); User user = userLocalService.getUser(serviceContext.getUserId()); @@ -59,9 +58,8 @@ public class FormLogLocalServiceImpl extends FormLogLocalServiceBaseImpl { return addFormLog(formLog); } - @Override - public FormLog updateFormLog(long formLogId, long workflowInstanceId, long workflowTaskId, String transitionName, - String formParameters, ServiceContext serviceContext) throws SystemException, PortalException { + public FormLog updateFormLog(long formLogId, long workflowInstanceId, long workflowTaskId, String transitionName, + String formParameters, ServiceContext serviceContext) throws SystemException, PortalException { FormLog formLog = formLogLocalService.getFormLog(formLogId); formLog.setModifiedDate(serviceContext.getModifiedDate(new Date())); @@ -72,26 +70,20 @@ public class FormLogLocalServiceImpl extends FormLogLocalServiceBaseImpl { return updateFormLog(formLog); } - @Override - public List findByC_Instance(long companyId, long workflowInstanceId, int start, int end) - throws SystemException { + public List findByC_Instance(long companyId, long workflowInstanceId, int start, int end) + throws SystemException { + return formLogPersistence.findByC_Instance(companyId, workflowInstanceId, start, end); + } - return formLogPersistence.findByC_Instance(companyId, workflowInstanceId, start, end); - } - - @Override - public FormLog findByC_Task(long companyId, long workflowTaskId) throws SystemException { - - List list = formLogPersistence.findByC_Task(companyId, workflowTaskId, 0, 1); - return list.isEmpty() ? null : list.get(0); - } - - @Override - public FormLog findByC_Task_TransitionName(long companyId, long workflowTaskId, String transitionName) - throws SystemException { + public FormLog findByC_Task(long companyId, long workflowTaskId) throws SystemException { + List list = formLogPersistence.findByC_Task(companyId, workflowTaskId, 0, 1); + return list.isEmpty() ? null : list.get(0); + } - List list = formLogPersistence.findByC_Task_TransitionName(companyId, workflowTaskId, transitionName, - 0, 1); - return list.isEmpty() ? null : list.get(0); - } + public FormLog findByC_Task_TransitionName(long companyId, long workflowTaskId, String transitionName) + throws SystemException { + List list = + formLogPersistence.findByC_Task_TransitionName(companyId, workflowTaskId, transitionName, 0, 1); + return list.isEmpty() ? null : list.get(0); + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormTemplateLinkLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormTemplateLinkLocalServiceImpl.java index dbc9a2b1..8a4f45fc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormTemplateLinkLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormTemplateLinkLocalServiceImpl.java @@ -43,9 +43,8 @@ public class FormTemplateLinkLocalServiceImpl extends FormTemplateLinkLocalServi * service. */ - @Override - public FormTemplateLink addFormTemplateLink(long formDefinitionLinkId, long ddmTemplateId, long kaleoNodeId, - String transitionName) throws SystemException, PortalException { + public FormTemplateLink addFormTemplateLink(long formDefinitionLinkId, long ddmTemplateId, long kaleoNodeId, + String transitionName) throws SystemException, PortalException { validate(0, formDefinitionLinkId, ddmTemplateId, kaleoNodeId, transitionName); FormTemplateLink formTemplateLink = createFormTemplateLink(counterLocalService.increment(FormTemplateLink.class @@ -54,9 +53,8 @@ public class FormTemplateLinkLocalServiceImpl extends FormTemplateLinkLocalServi return addFormTemplateLink(formTemplateLink); } - @Override - public FormTemplateLink updateFormTemplateLink(long formTemplateLinkId, long formDefinitionLinkId, - long ddmTemplateId, long kaleoNodeId, String transitionName) throws SystemException, PortalException { + public FormTemplateLink updateFormTemplateLink(long formTemplateLinkId, long formDefinitionLinkId, + long ddmTemplateId, long kaleoNodeId, String transitionName) throws SystemException, PortalException { FormTemplateLink formTemplateLink = getFormTemplateLink(formTemplateLinkId); validate(formTemplateLinkId, formDefinitionLinkId, ddmTemplateId, kaleoNodeId, transitionName); @@ -64,34 +62,25 @@ public class FormTemplateLinkLocalServiceImpl extends FormTemplateLinkLocalServi return updateFormTemplateLink(formTemplateLink); } - @Override - public int countByFormDefinitionLinkId(long formDefinitionLinkId) throws SystemException { - - return formTemplateLinkPersistence.countByFormDefinitionLinkId(formDefinitionLinkId); - } + public int countByFormDefinitionLinkId(long formDefinitionLinkId) throws SystemException { + return formTemplateLinkPersistence.countByFormDefinitionLinkId(formDefinitionLinkId); + } - @Override - public List findByFormDefinitionLinkId(long formDefinitionLinkId) throws SystemException { - - return formTemplateLinkPersistence.findByFormDefinitionLinkId(formDefinitionLinkId); - } + public List findByFormDefinitionLinkId(long formDefinitionLinkId) throws SystemException { + return formTemplateLinkPersistence.findByFormDefinitionLinkId(formDefinitionLinkId); + } - @Override - public List findByFormDefinitionLinkId(long formDefinitionLinkId, int start, int end) - throws SystemException { + public List findByFormDefinitionLinkId(long formDefinitionLinkId, int start, int end) + throws SystemException { + return formTemplateLinkPersistence.findByFormDefinitionLinkId(formDefinitionLinkId, start, end); + } - return formTemplateLinkPersistence.findByFormDefinitionLinkId(formDefinitionLinkId, start, end); - } - - @Override - public int countByDDMTemplateId(long ddmTemplateId) throws SystemException { - - return formTemplateLinkPersistence.countByDDMTemplateId(ddmTemplateId); - } + public int countByDDMTemplateId(long ddmTemplateId) throws SystemException { + return formTemplateLinkPersistence.countByDDMTemplateId(ddmTemplateId); + } - @Override - public FormTemplateLink fetchByFormDefinitionLinkId_KaleoNodeId_TransitionName(long formDefinitionLinkId, - long kaleoNodeId, String transitionName) throws SystemException { + public FormTemplateLink fetchByFormDefinitionLinkId_KaleoNodeId_TransitionName(long formDefinitionLinkId, + long kaleoNodeId, String transitionName) throws SystemException { return formTemplateLinkPersistence.fetchByFormDefinitionLinkId_KaleoNodeId_TransitionName(formDefinitionLinkId, kaleoNodeId, transitionName); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormDefinitionLinkPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormDefinitionLinkPersistenceImpl.java index b455af46..dbedd1a7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormDefinitionLinkPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormDefinitionLinkPersistenceImpl.java @@ -43,7 +43,6 @@ import it.tref.liferay.portos.kaleo.NoSuchFormDefinitionLinkException; import it.tref.liferay.portos.kaleo.model.FormDefinitionLink; import it.tref.liferay.portos.kaleo.model.impl.FormDefinitionLinkImpl; import it.tref.liferay.portos.kaleo.model.impl.FormDefinitionLinkModelImpl; -import it.tref.liferay.portos.kaleo.service.persistence.FormDefinitionLinkPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormLogPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormLogPersistenceImpl.java index 130fab6e..b1b227fa 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormLogPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormLogPersistenceImpl.java @@ -43,7 +43,6 @@ import it.tref.liferay.portos.kaleo.NoSuchFormLogException; import it.tref.liferay.portos.kaleo.model.FormLog; import it.tref.liferay.portos.kaleo.model.impl.FormLogImpl; import it.tref.liferay.portos.kaleo.model.impl.FormLogModelImpl; -import it.tref.liferay.portos.kaleo.service.persistence.FormLogPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormTemplateLinkPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormTemplateLinkPersistenceImpl.java index d863ff1e..2b7e6a71 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormTemplateLinkPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/persistence/FormTemplateLinkPersistenceImpl.java @@ -43,7 +43,6 @@ import it.tref.liferay.portos.kaleo.NoSuchFormTemplateLinkException; import it.tref.liferay.portos.kaleo.model.FormTemplateLink; import it.tref.liferay.portos.kaleo.model.impl.FormTemplateLinkImpl; import it.tref.liferay.portos.kaleo.model.impl.FormTemplateLinkModelImpl; -import it.tref.liferay.portos.kaleo.service.persistence.FormTemplateLinkPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/service.properties index 8d10657b..5d490d12 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_Kaleo - build.number=29 - build.date=1643195718440 + build.number=31 + build.date=1675847724806 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/init.jsp index 1c412f4a..f48c6d2d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.util.StringUtil"%> <%@page import="java.util.Arrays"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/edit_form_definition_link.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/edit_form_definition_link.jsp index 7c27449c..79ab159f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/edit_form_definition_link.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/edit_form_definition_link.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.workflow.kaleo.definition.NodeType"%> <%@page import="com.liferay.portal.workflow.kaleo.model.KaleoTransition"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/form_definition_link_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/form_definition_link_action.jsp index 1df8200b..cc24d1b3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/form_definition_link_action.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/form_definition_link_action.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.kaleo.model.FormDefinitionLink"%> <%@page import="com.liferay.portal.kernel.util.Validator"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/init.jsp index 771a9225..2a47faca 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/init.jsp @@ -1,3 +1,2 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/select_workflow_definition.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/select_workflow_definition.jsp index fcdf48fb..4a484421 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/select_workflow_definition.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/select_workflow_definition.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.util.HtmlUtil"%> <%@page import="com.liferay.portal.kernel.language.LanguageUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/edit_form_template_link.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/edit_form_template_link.jsp index b299e5d0..ebdf9125 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/edit_form_template_link.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/edit_form_template_link.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.kaleo.service.FormDefinitionLinkLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.kaleo.FormTemplateLinkKaleoNodeIdException"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/form_template_link_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/form_template_link_action.jsp index bee31ed9..bf3646b2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/form_template_link_action.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/form_template_link_action.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.kaleo.model.FormTemplateLink"%> <%@page import="com.liferay.portal.kernel.util.Validator"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/template_toolbar.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/template_toolbar.jsp index 5b28a987..7ed5a235 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/template_toolbar.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/template_toolbar.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="javax.portlet.PortletRequest"%> <%@page import="com.liferay.portal.kernel.language.UnicodeLanguageUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/view_form_template_links.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/view_form_template_links.jsp index 5935af2d..d362e95f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/view_form_template_links.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/view_form_template_links.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.language.UnicodeLanguageUtil"%> <%@page import="com.liferay.portal.kernel.dao.search.RowChecker"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/toolbar.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/toolbar.jsp index 29837573..a71783d3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/toolbar.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/toolbar.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portlet.dynamicdatamapping.model.DDMStructure"%> <%@page import="javax.portlet.PortletRequest"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/view.jsp index ad2dc99a..86a69556 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portlet.dynamicdatamapping.service.DDMStructureLocalServiceUtil"%> <%@page import="com.liferay.portlet.dynamicdatamapping.model.DDMStructure"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/ivy.xml.MD5 index 4240e55c..b516fd24 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/ivy.xml.MD5 @@ -1 +1 @@ -7de40a8d6325963ff798df2ebe07ecbc +cae08a4d6200ab538326b79a73153f0b diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.classpath index 317e9542..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.classpath @@ -1,7 +1,7 @@ - + @@ -18,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.project index e106cdd8..a38c8f45 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.project @@ -32,6 +32,5 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/liferay-hook.xml b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/liferay-hook.xml index f4efe922..7ea9cf5f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/liferay-hook.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/liferay-hook.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/src/it/tref/portos/liferay/log/action/LogRequestPostAction.java b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/src/it/tref/portos/liferay/log/action/LogRequestPostAction.java index d9142b9e..6fed5397 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/src/it/tref/portos/liferay/log/action/LogRequestPostAction.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/src/it/tref/portos/liferay/log/action/LogRequestPostAction.java @@ -28,9 +28,9 @@ import com.liferay.portal.util.PortalUtil; import eu.bitwalker.useragentutils.UserAgent; import it.tref.portos.liferay.log.camel.core.CamelCoreInitializer; import it.tref.portos.liferay.log.model.LogActionDetails; +import it.tref.portos.liferay.log.utility.Constants; import it.tref.portos.liferay.log.spring.SpringContextBeanScanner; import it.tref.portos.liferay.log.utility.ClassUtils; -import it.tref.portos.liferay.log.utility.Constants; import java.lang.reflect.Field; import java.text.ParseException; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/src/it/tref/portos/liferay/log/action/LogStartupAction.java b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/src/it/tref/portos/liferay/log/action/LogStartupAction.java index 22b7df63..fbffb9e0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/src/it/tref/portos/liferay/log/action/LogStartupAction.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/src/it/tref/portos/liferay/log/action/LogStartupAction.java @@ -1,7 +1,5 @@ package it.tref.portos.liferay.log.action; -import it.tref.portos.liferay.log.utility.Constants; - import com.liferay.portal.kernel.events.ActionException; import com.liferay.portal.kernel.events.SimpleAction; import com.liferay.portal.kernel.exception.PortalException; @@ -26,6 +24,9 @@ import com.liferay.portlet.expando.model.ExpandoTableConstants; import com.liferay.portlet.expando.service.ExpandoColumnLocalServiceUtil; import com.liferay.portlet.expando.service.ExpandoTableLocalServiceUtil; +import it.tref.portos.liferay.log.utility.Constants; + + public class LogStartupAction extends SimpleAction { private static Log _log = LogFactoryUtil.getLog(LogStartupAction.class); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/html/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/html/init.jsp index d43a95e8..bce00918 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/html/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/html/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/view.jsp index 27251fd3..486845c9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <% /** * Copyright (c) 2000-2013 Liferay, Inc. All rights reserved. diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/ivy.xml.MD5 index ce0b87f8..2adf20b3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/ivy.xml.MD5 @@ -1 +1 @@ -34c76a0a5e5c00d50cd4f61ccdf0db5d +d8cadd651d191bed698cd2e918237a31 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.classpath index 502539e1..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.classpath @@ -1,8 +1,7 @@ - - + @@ -19,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.project index 88f25f07..d14485be 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.project @@ -32,6 +32,5 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.wst.common.component index d3bd6d76..04dff753 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.wst.common.component @@ -2,7 +2,6 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/liferay-hook.xml b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/liferay-hook.xml index 01e21b2d..4bc6119b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/liferay-hook.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/liferay-hook.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/service.xml index f326de8a..5e530faf 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/service.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/messaging/MailManagerMessageListener.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/messaging/MailManagerMessageListener.java index c1982e22..73479b6b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/messaging/MailManagerMessageListener.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/messaging/MailManagerMessageListener.java @@ -30,7 +30,8 @@ public class MailManagerMessageListener implements MessageListener { String mode = (String) message.get("mode"); MailMessage mailMessage = (MailMessage) message.getPayload(); ServiceContext serviceContext = (ServiceContext) message.get("serviceContext"); - boolean checkPermission = GetterUtil.getBoolean(message.get("checkPermission"), true); + boolean checkPermission = GetterUtil.getBoolean(message.get("checkPermission"), Boolean.TRUE); + String className = GetterUtil.getString(message.get("className")); long classPK = GetterUtil.getLong(message.get("classPK")); boolean sendSync = false; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailAttachmentLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailAttachmentLocalServiceImpl.java index dcf03919..e63fc4fe 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailAttachmentLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailAttachmentLocalServiceImpl.java @@ -45,14 +45,15 @@ import com.liferay.portal.service.ServiceContext; * @see it.noovle.azimut.icf.mailmanager.service.EmailAttachmentLocalServiceUtil */ public class EmailAttachmentLocalServiceImpl extends EmailAttachmentLocalServiceBaseImpl { - /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link - * it.noovle.azimut.icf.mailmanager.service.EmailAttachmentLocalServiceUtil} to access the email attachment local - * service. - */ - @Override - public EmailAttachment addEmailAttachment(long companyId, long emailId, long folderId, String fileName, File file) - throws PortalException, SystemException { + /* + * NOTE FOR DEVELOPERS: + * + * Never reference this interface directly. Always use {@link + * it.noovle.azimut.icf.mailmanager.service.EmailAttachmentLocalServiceUtil} to access the + * email attachment local service. + */ + public EmailAttachment addEmailAttachment(long companyId, long emailId, long folderId, String fileName, File file) + throws PortalException, SystemException { Company company = companyLocalService.getCompany(companyId); @@ -78,19 +79,18 @@ public class EmailAttachmentLocalServiceImpl extends EmailAttachmentLocalService dlAppLocalService.addFileEntry(defaultUser.getUserId(), folder.getRepositoryId(), folder.getFolderId(), sourceFileName, mimeType, title, StringPool.BLANK, StringPool.BLANK, file, serviceContext); - EmailAttachment emailAttachment = - createEmailAttachment(new EmailAttachmentPK(emailId, fileEntry - .getFileEntryId())); + EmailAttachment emailAttachment = + emailAttachmentLocalService.createEmailAttachment(new EmailAttachmentPK(emailId, fileEntry.getFileEntryId())); - return addEmailAttachment(emailAttachment); - } + return emailAttachmentLocalService.addEmailAttachment(emailAttachment); + } - @Override - public EmailAttachment deleteEmailAttachment(EmailAttachmentPK emailAttachmentPK) throws PortalException, - SystemException { - EmailAttachment emailAttachment = getEmailAttachment(emailAttachmentPK); - return deleteEmailAttachment(emailAttachment); - } + @Override + public EmailAttachment deleteEmailAttachment(EmailAttachmentPK emailAttachmentPK) throws PortalException, + SystemException { + EmailAttachment emailAttachment = emailAttachmentLocalService.getEmailAttachment(emailAttachmentPK); + return deleteEmailAttachment(emailAttachment); + } @Override public EmailAttachment deleteEmailAttachment(EmailAttachment emailAttachment) throws SystemException { @@ -106,25 +106,21 @@ public class EmailAttachmentLocalServiceImpl extends EmailAttachmentLocalService return emailAttachment; } - @Override - public List findByEmailId(long emailId) throws SystemException { - return emailAttachmentPersistence.findByEmailId(emailId); - } + public List findByEmailId(long emailId) throws SystemException { + return emailAttachmentPersistence.findByEmailId(emailId); + } - @Override - public List findByEmailId(long emailId, int start, int end) throws SystemException { - return emailAttachmentPersistence.findByEmailId(emailId); - } + public List findByEmailId(long emailId, int start, int end) throws SystemException { + return emailAttachmentPersistence.findByEmailId(emailId); + } - @Override - public int countByEmailId(long emailId) throws SystemException { - return emailAttachmentPersistence.countByEmailId(emailId); - } + public int countByEmailId(long emailId) throws SystemException { + return emailAttachmentPersistence.countByEmailId(emailId); + } - @Override - public EmailAttachment fetchByFileEntryId(long fileEntryId) throws SystemException { - return emailAttachmentPersistence.fetchByFileEntryId(fileEntryId); - } + public EmailAttachment fetchByFileEntryId(long fileEntryId) throws SystemException { + return emailAttachmentPersistence.fetchByFileEntryId(fileEntryId); + } private void validate(long emailId, String fileName, File file) throws PortalException, SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailLocalServiceImpl.java index 75c4fb19..e4eb1948 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailLocalServiceImpl.java @@ -7,6 +7,24 @@ package it.tref.liferay.portos.mailmanager.service.impl; +import com.liferay.mail.model.FileAttachment; +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.repository.model.Folder; +import com.liferay.portal.kernel.util.FileUtil; +import com.liferay.portal.kernel.util.OrderByComparator; +import com.liferay.portal.kernel.util.StringPool; +import com.liferay.portal.kernel.util.StringUtil; +import com.liferay.portal.kernel.util.Validator; +import com.liferay.portal.model.Company; +import com.liferay.portal.model.Group; +import com.liferay.portal.model.User; +import com.liferay.portal.security.permission.ActionKeys; +import com.liferay.portal.service.ServiceContext; +import com.liferay.portlet.documentlibrary.model.DLFolderConstants; + import it.tref.liferay.portos.mailmanager.EmailBccException; import it.tref.liferay.portos.mailmanager.EmailBulkAddressesException; import it.tref.liferay.portos.mailmanager.EmailCcException; @@ -27,24 +45,9 @@ import java.util.Collections; import java.util.Date; import java.util.List; -import com.liferay.mail.model.FileAttachment; -import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portal.kernel.repository.model.Folder; -import com.liferay.portal.kernel.util.FileUtil; -import com.liferay.portal.kernel.util.OrderByComparator; -import com.liferay.portal.kernel.util.StringPool; -import com.liferay.portal.kernel.util.StringUtil; -import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.model.Company; -import com.liferay.portal.model.Group; -import com.liferay.portal.model.User; -import com.liferay.portal.security.permission.ActionKeys; -import com.liferay.portal.service.ServiceContext; -import com.liferay.portlet.documentlibrary.model.DLFolderConstants; - /** * The implementation of the email local service. + * *

* All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy * their definitions into the {@link it.noovle.azimut.icf.mailmanager.service.EmailLocalService} interface. @@ -63,63 +66,61 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl { * it.noovle.azimut.icf.mailmanager.service.EmailLocalServiceUtil} to access the email local service. */ - @Override - public Email addEmail(String className, long classPK, String from, String to[], String cc[], String bcc[], - String subject, String body, boolean htmlFormat, ServiceContext serviceContext) throws Exception { + private final static Log _log = LogFactoryUtil.getLog(EmailLocalServiceImpl.class); - return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null, null, null, - 0, false, null, null, Collections. emptyList(), serviceContext); + public Email addEmail(String className, long classPK, String from, String to[], String cc[], + String bcc[], String subject, String body, boolean htmlFormat, ServiceContext serviceContext) + throws Exception { + return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null, + null, null, 0, false, null, null, Collections. emptyList(), serviceContext); } - @Override - public Email addEmail(String className, long classPK, String from, String to[], String cc[], String bcc[], - String subject, String body, boolean htmlFormat, List fileAttachments, - ServiceContext serviceContext) throws Exception { - - return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null, null, null, - 0, false, null, null, fileAttachments, false, null, serviceContext); + public Email addEmail(String className, long classPK, String from, String to[], String cc[], + String bcc[], String subject, String body, boolean htmlFormat, + List fileAttachments, ServiceContext serviceContext) throws Exception { + return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null, + null, null, 0, false, null, null, fileAttachments, false, null, serviceContext); } - @Override - public Email addEmail(String className, long classPK, String from, String to[], String cc[], String bcc[], - String[] bulkAddresses, String subject, String body, boolean htmlFormat, String[] replyTo, - String messageId, String inReplyTo, String smtpHost, int smtpPort, boolean smtpSecure, String smtpUsername, - String smtpPassword, List fileAttachments, ServiceContext serviceContext) throws Exception { - - return addEmail(className, classPK, from, to, cc, bcc, bulkAddresses, subject, body, htmlFormat, replyTo, - messageId, inReplyTo, smtpHost, smtpPort, smtpSecure, smtpUsername, smtpPassword, fileAttachments, - false, null, serviceContext); + public Email addEmail(String className, long classPK, String from, String to[], String cc[], + String bcc[], String[] bulkAddresses, String subject, String body, boolean htmlFormat, + String[] replyTo, String messageId, String inReplyTo, String smtpHost, int smtpPort, + boolean smtpSecure, String smtpUsername, String smtpPassword, + List fileAttachments, ServiceContext serviceContext) throws Exception { + return addEmail(className, classPK, from, to, cc, bcc, bulkAddresses, subject, body, htmlFormat, + replyTo, messageId, inReplyTo, smtpHost, smtpPort, smtpSecure, smtpUsername, smtpPassword, + fileAttachments, false, null, serviceContext); } - @Override - public Email addEmail(String className, long classPK, String from, String to[], String cc[], String bcc[], - String subject, String body, boolean htmlFormat, List fileAttachments, boolean sendSync, - ServiceContext serviceContext) throws Exception { - - return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null, null, null, - 0, false, null, null, fileAttachments, sendSync, null, serviceContext); + public Email addEmail(String className, long classPK, String from, String to[], String cc[], + String bcc[], String subject, String body, boolean htmlFormat, + List fileAttachments, boolean sendSync, ServiceContext serviceContext) + throws Exception { + return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null, + null, null, 0, false, null, null, fileAttachments, sendSync, null, serviceContext); } - @Override - public Email addEmail(String className, long classPK, String from, String to[], String cc[], String bcc[], - String subject, String body, boolean htmlFormat, List fileAttachments, boolean sendSync, - String templateName, ServiceContext serviceContext) throws Exception { - - return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null, null, null, - 0, false, null, null, fileAttachments, sendSync, templateName, serviceContext); + public Email addEmail(String className, long classPK, String from, String to[], String cc[], + String bcc[], String subject, String body, boolean htmlFormat, + List fileAttachments, boolean sendSync, String templateName, + ServiceContext serviceContext) throws Exception { + return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null, + null, null, 0, false, null, null, fileAttachments, sendSync, templateName, serviceContext); } - @Override - public Email addEmail(String className, long classPK, String from, String to[], String cc[], String bcc[], - String[] bulkAddresses, String subject, String body, boolean htmlFormat, String[] replyTo, - String messageId, String inReplyTo, String smtpHost, int smtpPort, boolean smtpSecure, String smtpUsername, - String smtpPassword, List fileAttachments, boolean sendSync, String templateName, + public Email addEmail(String className, long classPK, String from, String to[], String cc[], + String bcc[], String[] bulkAddresses, String subject, String body, boolean htmlFormat, + String[] replyTo, String messageId, String inReplyTo, String smtpHost, int smtpPort, + boolean smtpSecure, String smtpUsername, String smtpPassword, + List fileAttachments, boolean sendSync, String templateName, ServiceContext serviceContext) throws Exception { User user = userLocalService.getUser(serviceContext.getUserId()); Date now = new Date(); validate(from, to, cc, bcc, bulkAddresses, subject, body, replyTo); - Email email = createEmail(counterLocalService.increment(Email.class.getName())); + + Email email = emailLocalService.createEmail(counterLocalService.increment(Email.class.getName())); + email.setGroupId(serviceContext.getScopeGroupId()); email.setCompanyId(serviceContext.getCompanyId()); email.setCreateDate(serviceContext.getCreateDate(now)); @@ -171,11 +172,11 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl { return email; } - @Override - public Email updateEmail(long emailId, String from, String to[], String cc[], String bcc[], String subject, - String body, ServiceContext serviceContext) throws Exception { + public Email updateEmail(long emailId, String from, String to[], String cc[], String bcc[], + String subject, String body, ServiceContext serviceContext) throws Exception { + + Email email = emailLocalService.getEmail(emailId); - Email email = getEmail(emailId); validate(from, to, cc, bcc, null, subject, body, null); email.setModifiedDate(new Date()); email.setFrom(from); @@ -187,10 +188,10 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl { return updateEmail(email); } - @Override - public Email markAsSent(long emailId, Date sentDate, String statusMessage) throws PortalException, SystemException { + public Email markAsSent(long emailId, Date sentDate, String statusMessage) throws PortalException, + SystemException { - Email email = getEmail(emailId); + Email email = emailLocalService.getEmail(emailId); email.setModifiedDate(new Date()); email.setSent(true); email.setSentDate(sentDate); @@ -198,19 +199,18 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl { return updateEmail(email); } - @Override - public Email updateStatusMessage(long emailId, String statusMessage) throws PortalException, SystemException { + public Email updateStatusMessage(long emailId, String statusMessage) throws PortalException, + SystemException { - Email email = getEmail(emailId); + Email email = emailLocalService.getEmail(emailId); email.setModifiedDate(new Date()); email.setStatusMessage(statusMessage); return updateEmail(email); } - @Override public Email resendEmail(long emailId) throws PortalException, SystemException { - Email email = getEmail(emailId); + Email email = emailLocalService.getEmail(emailId); email.setModifiedDate(new Date()); email.setStatusMessage(""); email.setSent(false); @@ -219,10 +219,9 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl { return updateEmail(email); } - @Override public Email cancelEmail(long emailId) throws PortalException, SystemException { - Email email = getEmail(emailId); + Email email = emailLocalService.getEmail(emailId); email.setModifiedDate(new Date()); email.setCancel(true); return updateEmail(email); @@ -230,8 +229,7 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl { @Override public Email deleteEmail(long emailId) throws PortalException, SystemException { - - Email email = getEmail(emailId); + Email email = emailLocalService.getEmail(emailId); return deleteEmail(email); } @@ -247,92 +245,76 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl { return email; } - @Override public List findByCompany(long companyId) throws SystemException { return emailPersistence.findByCompany(companyId); } - @Override public List findByCompany(long companyId, int start, int end) throws SystemException { return emailPersistence.findByCompany(companyId, start, end); } - @Override public List findByCompany(long companyId, int start, int end, OrderByComparator orderByComparator) throws SystemException { return emailPersistence.findByCompany(companyId, start, end, orderByComparator); } - @Override public int countByCompany(long companyId) throws SystemException { return emailPersistence.countByCompany(companyId); } - @Override public List findByC_G(long companyId, long groupId) throws SystemException { return emailPersistence.findByC_G(companyId, groupId); } - @Override public List findByC_G(long companyId, long groupId, int start, int end) throws SystemException { return emailPersistence.findByC_G(companyId, groupId, start, end); } - @Override - public List findByC_G(long companyId, long groupId, int start, int end, OrderByComparator orderByComparator) - throws SystemException { - + public List findByC_G(long companyId, long groupId, int start, int end, + OrderByComparator orderByComparator) throws SystemException { return emailPersistence.findByC_G(companyId, groupId, start, end, orderByComparator); } - @Override public int countByC_G(long companyId, long groupId) throws SystemException { return emailPersistence.countByC_G(companyId, groupId); } - @Override public List findByC_G_T(long companyId, long groupId, String templateName) throws SystemException { return emailPersistence.findByC_G_T(companyId, groupId, templateName); } - @Override public List findByC_G_T(long companyId, long groupId, String templateName, int start, int end) throws SystemException { return emailPersistence.findByC_G_T(companyId, groupId, templateName, start, end); } - @Override public int countByC_G_T(long companyId, long groupId, String templateName) throws SystemException { return emailPersistence.countByC_G_T(companyId, groupId, templateName); } - @Override public List findByC_G_C_C(long companyId, long groupId, long classNameId, long classPK) throws SystemException { return emailPersistence.findByC_G_C_C(companyId, groupId, classNameId, classPK); } - @Override - public List findByC_G_C_C(long companyId, long groupId, long classNameId, long classPK, int start, int end) - throws SystemException { - + public List findByC_G_C_C(long companyId, long groupId, long classNameId, long classPK, int start, + int end) throws SystemException { return emailPersistence.findByC_G_C_C(companyId, groupId, classNameId, classPK, start, end); } - @Override - public int countByC_G_C_C(long companyId, long groupId, long classNameId, long classPK) throws SystemException { - + public int countByC_G_C_C(long companyId, long groupId, long classNameId, long classPK) + throws SystemException { return emailPersistence.countByC_G_C_C(companyId, groupId, classNameId, classPK); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailTemplateLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailTemplateLocalServiceImpl.java index f929eeef..ec5814cf 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailTemplateLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/impl/EmailTemplateLocalServiceImpl.java @@ -59,57 +59,71 @@ public class EmailTemplateLocalServiceImpl extends EmailTemplateLocalServiceBase String subject, String body, boolean attachmentPermitted, ServiceContext serviceContext) throws SystemException, PortalException { - User user = userLocalService.getUser(serviceContext.getUserId()); - Date now = new Date(); - validate(templateName, from, to, cc, ccn, subject, body); - EmailTemplate emailTemplate = createEmailTemplate(counterLocalService.increment(EmailTemplate.class.getName())); - emailTemplate.setCompanyId(serviceContext.getCompanyId()); - emailTemplate.setUserId(user.getUserId()); - emailTemplate.setUserName(user.getFullName()); - emailTemplate.setCreateDate(serviceContext.getCreateDate(now)); - emailTemplate.setModifiedDate(serviceContext.getModifiedDate(now)); - emailTemplate.setGroupId(serviceContext.getScopeGroupId()); - emailTemplate.setTemplateName(templateName); - emailTemplate.setFrom(from); - emailTemplate.setTo(StringUtil.merge(to, StringPool.COMMA)); - emailTemplate.setCc(StringUtil.merge(cc, StringPool.COMMA)); - emailTemplate.setCcn(StringUtil.merge(ccn, StringPool.COMMA)); - emailTemplate.setSubject(subject); - emailTemplate.setBody(body); - emailTemplate.setAttachmentPermitted(attachmentPermitted); - emailTemplate = addEmailTemplate(emailTemplate); - // Resource - resourceLocalService.addResources(emailTemplate.getCompanyId(), emailTemplate.getGroupId(), - emailTemplate.getUserId(), EmailTemplate.class.getName(), emailTemplate.getPrimaryKey(), false, true, - true); - return emailTemplate; - } + User user = userLocalService.getUser(serviceContext.getUserId()); + Date now = new Date(); + validate(templateName, from, to, cc, ccn, subject, body); + + EmailTemplate emailTemplate = + emailTemplateLocalService.createEmailTemplate(counterLocalService.increment(EmailTemplate.class.getName())); + + emailTemplate.setCompanyId(serviceContext.getCompanyId()); + emailTemplate.setUserId(user.getUserId()); + emailTemplate.setUserName(user.getFullName()); + emailTemplate.setCreateDate(serviceContext.getCreateDate(now)); + emailTemplate.setModifiedDate(serviceContext.getModifiedDate(now)); + emailTemplate.setGroupId(serviceContext.getScopeGroupId()); + + emailTemplate.setTemplateName(templateName); + + emailTemplate.setFrom(from); + emailTemplate.setTo(StringUtil.merge(to, StringPool.COMMA)); + emailTemplate.setCc(StringUtil.merge(cc, StringPool.COMMA)); + emailTemplate.setCcn(StringUtil.merge(ccn, StringPool.COMMA)); + emailTemplate.setSubject(subject); + emailTemplate.setBody(body); + + emailTemplate.setAttachmentPermitted(attachmentPermitted); + + emailTemplate = emailTemplateLocalService.addEmailTemplate(emailTemplate); + + // Resource + + resourceLocalService.addResources(emailTemplate.getCompanyId(), emailTemplate.getGroupId(), + emailTemplate.getUserId(), EmailTemplate.class.getName(), emailTemplate.getPrimaryKey(), false, true, true); + + return emailTemplate; + } @Override public EmailTemplate updateEmailTemplate(long emailTemplateId, String templateName, String from, String[] to, String[] cc, String[] ccn, String subject, String body, boolean attachmentPermitted, ServiceContext serviceContext) throws SystemException, PortalException { - EmailTemplate emailTemplate = getEmailTemplate(emailTemplateId); - validate(templateName, from, to, cc, ccn, subject, body); - emailTemplate.setModifiedDate(serviceContext.getModifiedDate(new Date())); - emailTemplate.setFrom(from); - emailTemplate.setTo(StringUtil.merge(to, StringPool.COMMA)); - emailTemplate.setCc(StringUtil.merge(cc, StringPool.COMMA)); - emailTemplate.setCcn(StringUtil.merge(ccn, StringPool.COMMA)); - emailTemplate.setSubject(subject); - emailTemplate.setBody(body); - emailTemplate.setAttachmentPermitted(attachmentPermitted); - emailTemplate = updateEmailTemplate(emailTemplate); - return emailTemplate; - } + EmailTemplate emailTemplate = emailTemplateLocalService.getEmailTemplate(emailTemplateId); - @Override - public EmailTemplate deleteEmailTemplate(long emailTemplateId) throws PortalException, SystemException { + validate(templateName, from, to, cc, ccn, subject, body); - EmailTemplate emailTemplate = getEmailTemplate(emailTemplateId); - return deleteEmailTemplate(emailTemplate); - } + emailTemplate.setModifiedDate(serviceContext.getModifiedDate(new Date())); + + emailTemplate.setFrom(from); + emailTemplate.setTo(StringUtil.merge(to, StringPool.COMMA)); + emailTemplate.setCc(StringUtil.merge(cc, StringPool.COMMA)); + emailTemplate.setCcn(StringUtil.merge(ccn, StringPool.COMMA)); + emailTemplate.setSubject(subject); + emailTemplate.setBody(body); + + emailTemplate.setAttachmentPermitted(attachmentPermitted); + + emailTemplate = emailTemplateLocalService.updateEmailTemplate(emailTemplate); + + return emailTemplate; + } + + @Override + public EmailTemplate deleteEmailTemplate(long emailTemplateId) throws PortalException, SystemException { + EmailTemplate emailTemplate = emailTemplateLocalService.getEmailTemplate(emailTemplateId); + return deleteEmailTemplate(emailTemplate); + } @Override public EmailTemplate deleteEmailTemplate(EmailTemplate emailTemplate) throws SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistenceImpl.java index 6931e006..967ba906 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistenceImpl.java @@ -42,7 +42,6 @@ import it.tref.liferay.portos.mailmanager.NoSuchEmailAttachmentException; import it.tref.liferay.portos.mailmanager.model.EmailAttachment; import it.tref.liferay.portos.mailmanager.model.impl.EmailAttachmentImpl; import it.tref.liferay.portos.mailmanager.model.impl.EmailAttachmentModelImpl; -import it.tref.liferay.portos.mailmanager.service.persistence.EmailAttachmentPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailPersistenceImpl.java index 6b806a45..12f7c61e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailPersistenceImpl.java @@ -44,7 +44,6 @@ import it.tref.liferay.portos.mailmanager.NoSuchEmailException; import it.tref.liferay.portos.mailmanager.model.Email; import it.tref.liferay.portos.mailmanager.model.impl.EmailImpl; import it.tref.liferay.portos.mailmanager.model.impl.EmailModelImpl; -import it.tref.liferay.portos.mailmanager.service.persistence.EmailPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailTemplatePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailTemplatePersistenceImpl.java index b4583674..c7944800 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailTemplatePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailTemplatePersistenceImpl.java @@ -46,7 +46,6 @@ import it.tref.liferay.portos.mailmanager.NoSuchEmailTemplateException; import it.tref.liferay.portos.mailmanager.model.EmailTemplate; import it.tref.liferay.portos.mailmanager.model.impl.EmailTemplateImpl; import it.tref.liferay.portos.mailmanager.model.impl.EmailTemplateModelImpl; -import it.tref.liferay.portos.mailmanager.service.persistence.EmailTemplatePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/util/MailEngine.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/util/MailEngine.java index e22be439..5f01e625 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/util/MailEngine.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/util/MailEngine.java @@ -64,6 +64,8 @@ import javax.mail.internet.MimeMultipart; * @author Brett Swaim */ public class MailEngine { + + private static boolean mwgDebug = false; public static Session getSession() { return getSession(false); @@ -74,7 +76,7 @@ public class MailEngine { Session session = Session.getInstance(properties); - if (_log.isDebugEnabled()) { + if (mwgDebug || _log.isDebugEnabled()) { session.setDebug(true); session.getProperties().list(System.out); @@ -89,14 +91,14 @@ public class MailEngine { try { session = MailServiceUtil.getSession(); } catch (SystemException se) { - if (_log.isWarnEnabled()) { + if (mwgDebug || _log.isWarnEnabled()) { _log.warn(se, se); } session = InfrastructureUtil.getMailSession(); } - if (_log.isDebugEnabled()) { + if (mwgDebug || _log.isDebugEnabled()) { session.setDebug(true); session.getProperties().list(System.out); @@ -151,7 +153,7 @@ public class MailEngine { long startTime = System.currentTimeMillis(); - if (_log.isDebugEnabled()) { + if (mwgDebug || _log.isDebugEnabled()) { _log.debug("From: " + from); _log.debug("To: " + Arrays.toString(to)); _log.debug("CC: " + Arrays.toString(cc)); @@ -164,7 +166,7 @@ public class MailEngine { _log.debug("Message ID: " + messageId); _log.debug("In Reply To: " + inReplyTo); - if ((fileAttachments != null) && _log.isDebugEnabled()) { + if ((fileAttachments != null) && (mwgDebug || _log.isDebugEnabled())) { for (int i = 0; i < fileAttachments.size(); i++) { FileAttachment fileAttachment = fileAttachments.get(i); @@ -326,7 +328,7 @@ public class MailEngine { throw new MailEngineException(e); } - if (_log.isDebugEnabled()) { + if (mwgDebug || _log.isDebugEnabled()) { _log.debug("Sending mail takes " + (System.currentTimeMillis() - startTime) + " ms"); } } @@ -503,7 +505,7 @@ public class MailEngine { } } catch (MessagingException me) { if (me.getNextException() instanceof SocketException) { - if (_log.isWarnEnabled()) { + if (mwgDebug || _log.isWarnEnabled()) { _log.warn("Failed to connect to a valid mail server. Please " + "make sure one is properly configured. " + me.getMessage()); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/util/MailManagerUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/util/MailManagerUtil.java index e0aeda5b..1d65582c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/util/MailManagerUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/util/MailManagerUtil.java @@ -24,6 +24,8 @@ import java.util.List; public class MailManagerUtil { + private final static Log _log = LogFactoryUtil.getLog(MailManagerUtil.class); + public static Email addEmailByTemplate(String className, long classPK, long emailTemplateId, JSONObject templateParamJSON, List fileAttachments, ServiceContext serviceContext) throws Exception { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties index 78467adf..8217d5d6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_Mail - build.number=94 - build.date=1643195697895 + build.number=96 + build.date=1675847807042 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/common/email_dialog_attachment.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/common/email_dialog_attachment.jsp index 39f77085..a4859bbe 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/common/email_dialog_attachment.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/common/email_dialog_attachment.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/edit.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/edit.jsp index 114d25d0..fdde85d0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/edit.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/edit.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/email_templates/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/email_send_popup_button.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/email_send_popup_button.jsp index 25082e4d..7e89ec84 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/email_send_popup_button.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/email_send_popup_button.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/email_templates/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/email_template_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/email_template_action.jsp index f69c6d61..d451e1e9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/email_template_action.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/email_template_action.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/email_templates/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/init.jsp index 79168c4b..291e245a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/init.jsp" %> <%@page import="org.apache.log4j.Logger"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/close_popup.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/close_popup.jsp index 67111b66..73bfc8be 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/close_popup.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/close_popup.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/email_templates/send_popup/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/init.jsp index 5ce28676..ea4e3093 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/email_templates/init.jsp" %> <% String className = ParamUtil.getString(request, "className"); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/view.jsp index 0450532b..e84a3723 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/send_popup/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/email_templates/send_popup/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/toolbar.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/toolbar.jsp index 57316f64..490715d3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/toolbar.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/toolbar.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/email_templates/init.jsp"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/view.jsp index f513b796..ca92fe43 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/email_templates/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/email_templates/init.jsp" %> <%@page import="it.tref.liferay.portos.mailmanager.service.EmailTemplateLocalServiceUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/init.jsp index f7a89418..191d09e8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.util.PortalUtil"%> <%@page import="com.liferay.portlet.PortletURLUtil"%> @@ -28,6 +27,8 @@ <%@page import="it.tref.liferay.portos.mailmanager.shared.util.MailManagerConstants"%> +<%@ page contentType="text/html; charset=UTF-8" %> + <%@page import="com.liferay.portal.kernel.util.GetterUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/edit.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/edit.jsp index 89ef8581..72c4f394 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/edit.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/edit.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/mail_manager/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_action.jsp index 43de79f2..03f22413 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_action.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_action.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/mail_manager/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_history_popup_button.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_history_popup_button.jsp index 08210e78..96e85b6f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_history_popup_button.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_history_popup_button.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/mail_manager/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/init.jsp index e1014604..8936f925 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/init.jsp" %> <%@page import="com.liferay.portal.kernel.util.TextFormatter"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/view.jsp index 5a3f7523..8057dbba 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/mail_manager/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/ivy.xml.MD5 index 144cb25b..b813789a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/ivy.xml.MD5 @@ -1 +1 @@ -0fc42888686cd86e960405746a231750 +1f8ac7aadaf94495088b42383cd9d705 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.classpath index 9975372f..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.classpath @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/liferay-hook.xml b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/liferay-hook.xml index 6141f4eb..47e9c9fa 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/liferay-hook.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/liferay-hook.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/service.xml index 88c74249..fb874c15 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/service.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/portlet/AdminMaintenancePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/portlet/AdminMaintenancePortlet.java index 56360468..5a857eb3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/portlet/AdminMaintenancePortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/portlet/AdminMaintenancePortlet.java @@ -26,6 +26,10 @@ import com.liferay.portal.service.ServiceContextFactory; import com.liferay.portal.util.PortalUtil; import com.liferay.util.bridges.mvc.MVCPortlet; + +/** + * Portlet implementation class AdminMaintenancePortlet + */ public class AdminMaintenancePortlet extends MVCPortlet { private static final Log _log = LogFactoryUtil.getLog(AdminMaintenancePortlet.class); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/service/persistence/MaintenanceSchedulePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/service/persistence/MaintenanceSchedulePersistenceImpl.java index efe4a7f2..2d43c614 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/service/persistence/MaintenanceSchedulePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/maintenance/service/persistence/MaintenanceSchedulePersistenceImpl.java @@ -46,7 +46,6 @@ import it.tref.liferay.portos.maintenance.NoSuchMaintenanceScheduleException; import it.tref.liferay.portos.maintenance.model.MaintenanceSchedule; import it.tref.liferay.portos.maintenance.model.impl.MaintenanceScheduleImpl; import it.tref.liferay.portos.maintenance.model.impl.MaintenanceScheduleModelImpl; -import it.tref.liferay.portos.maintenance.service.persistence.MaintenanceSchedulePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/service.properties index d7415bae..3127ec7d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_maintenance - build.number=44 - build.date=1632922838322 + build.number=46 + build.date=1675847919564 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/custom_jsps/html/portlet/login/login.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/custom_jsps/html/portlet/login/login.jsp index 0025417d..dce6f59c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/custom_jsps/html/portlet/login/login.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/custom_jsps/html/portlet/login/login.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%-- /** * Copyright (c) 2000-2013 Liferay, Inc. All rights reserved. diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/edit.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/edit.jsp index e6211f90..828aeff3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/edit.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/edit.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.maintenance.util.MaintenanceConstants.MaintenanceType"%> <%@page import="it.tref.liferay.portos.maintenance.util.MaintenanceConstants.MaintenanceOnReboot"%> <%@include file="/html/admin_maintenance/init.jsp"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/init.jsp index eb4f843f..bc3709cb 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/init.jsp" %> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> <%@page import="it.tref.liferay.portos.maintenance.model.MaintenanceSchedule"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/login_alert.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/login_alert.jsp index 03471ada..f9fd8c27 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/login_alert.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/login_alert.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/admin_maintenance/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/maintenance_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/maintenance_action.jsp index de935915..4fe2697a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/maintenance_action.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/maintenance_action.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/admin_maintenance/init.jsp"%> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/toolbar.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/toolbar.jsp index a2ce1bd1..fc9c070f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/toolbar.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/toolbar.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@include file="/html/admin_maintenance/init.jsp"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/view.jsp index bf3879d1..9d478468 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/admin_maintenance/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/init.jsp index 62f983fd..17ee0431 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="java.text.SimpleDateFormat"%> <%@page import="com.liferay.portlet.PortletURLUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/init.jsp index fc2ebbf3..3d749f84 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/view.jsp index 64293d88..c2f4fef2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/poller_maintenance/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/poller_maintenance/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.classpath index 9975372f..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.classpath @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/tref-mapit-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/tref-mapit-shared.jar index 39c715bb..de58504c 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/tref-mapit-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/WEB-INF/lib/tref-mapit-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/fascicolomap/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/fascicolomap/view.jsp index 73846011..0d7187ac 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/fascicolomap/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/fascicolomap/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/init.jsp index 7e4b2740..0ed21100 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portlet.PortletURLUtil"%> <%@page import="javax.portlet.PortletURL"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/init.jsp index a45de3b9..f3b2be04 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/init.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.mapit.constants.WebKeys"%> <%@page import="javax.portlet.PortletPreferences"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/top.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/top.jsp index aa1f367c..3caf7e4b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/top.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/html/plugin/top.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.security.permission.ResourceActionsUtil"%> <%@page import="com.liferay.portal.util.PortalUtil"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> @@ -60,7 +59,7 @@ String verifyComune = ParamUtil.getString(request, "verifyComune", "true"); }

- +
@@ -81,7 +80,7 @@ String verifyComune = ParamUtil.getString(request, "verifyComune", "true"); var portletNamespace = "<%= portletNamespace %>", mapItMap; -var verifyComune = <%= verifyComune %>; + Liferay.on('<%= "mapItMapReady" + StringPool.PERIOD + getServletContext().getServletContextName() %>', function(event) { AUI().use('liferay-mapit-map', 'aui-io-request', function(A) { @@ -93,9 +92,8 @@ Liferay.on('<%= "mapItMapReady" + StringPool.PERIOD + getServletContext().getSer mapItMap = Liferay.MapItMap.get(portletId); var latitude = AUI().one("#"+portletNamespace+"lat"), - longitude = AUI().one("#"+portletNamespace+"long"); - var isEditable = AUI().one("#"+portletNamespace+"geoIsEditable"); - isEditable = (undefined == isEditable) || (isEditable.val() == "true"); + longitude = AUI().one("#"+portletNamespace+"long"), + isEditable = AUI().one("#"+portletNamespace+"geoIsEditable").val() == "true"; var editableLatitude = AUI().one("#"+portletNamespace+"lat_hidden"), editableLongitude = AUI().one("#"+portletNamespace+"long_hidden"), @@ -108,7 +106,87 @@ Liferay.on('<%= "mapItMapReady" + StringPool.PERIOD + getServletContext().getSer var geographic = new OpenLayers.Projection("EPSG:4326"); var mercator = new OpenLayers.Projection( "EPSG:3857"); extent.transform(geographic,mercator ); - + //mapItMap.addOption({restrictedExtent: extent}); + + /* var boxes = new OpenLayers.Layer.Boxes("boxes"); + var box = new OpenLayers.Marker.Box(extent); + boxes.addMarker(box); + mapItMap.addWMSLayer(boxes); */ + + + var civici = new OpenLayers.Layer.WMS( + 'Numeri Civici', + 'http://www502.regione.toscana.it/wmsraster/com.rt.wms.RTmap/wms?map=wmsosm_d&map_resolution=91&', { + styles: 'etichette_blu', + layers: 'rt_osm.civici.point', transparent: true}, + {isBaseLayer: false, visibility : false} + ); + //mapItMap.addWMSLayer(civici); + + var comuni = new OpenLayers.Layer.WMS( + 'Comuni', + 'http://www502.regione.toscana.it/wmsraster/com.rt.wms.RTmap/wms?map=wmsambamm&map_resolution=91', { + styles: 'contorno_senza_etichette', + layers: 'rt_ambamm.idcomuni.rt.poly', transparent: true}, + {isBaseLayer: false} + ); + //mapItMap.addWMSLayer(comuni); + + var topografico = new OpenLayers.Layer.WMS( + 'Topografico', + 'http://www502.regione.toscana.it/wmsraster/com.rt.wms.RTmap/wms?map=wmscartoteca&map_resolution=91&', { + styles: 'senza_etichette', + layers: 'rt_cartoteca.dbt.2k', transparent: true}, + {isBaseLayer: false, visibility : false} + ); + //mapItMap.addWMSLayer(topografico); + + var rischio_bacini_regionali = new OpenLayers.Layer.WMS( + 'Rischio Idrogeologico', + 'http://www502.regione.toscana.it/wmsraster/com.rt.wms.RTmap/wms?map=wmsperidr&map_resolution=91&language=ita&', { + styles: 'default', + layers: 'rt_peridr.rischio_bacini_regionali', transparent: true}, + {isBaseLayer: false, visibility : false} + ); + //mapItMap.addWMSLayer(rischio_bacini_regionali); + + var catasto_strade = new OpenLayers.Layer.WMS( + 'Strade', + 'http://www502.regione.toscana.it/wmsraster/com.rt.wms.RTmap/wms?map=wmscatasto&map_resolution=91&language=ita&', { + styles: 'terra_di_siena_bruciata', + layers: 'rt_cat.idcatstrade.rt', transparent: true}, + {isBaseLayer: false, visibility : false} + ); + //mapItMap.addWMSLayer(catasto_strade); + + var catasto_fabbricati = new OpenLayers.Layer.WMS( + 'Fabbricati', + 'http://www502.regione.toscana.it/wmsraster/com.rt.wms.RTmap/wms?map=wmscatasto&map_resolution=91&language=ita&', { + styles: 'carminio_chiaro', + layers: 'rt_cat.idcatfabbr.rt', transparent: true}, + {isBaseLayer: false, visibility : false} + ); + //mapItMap.addWMSLayer(catasto_fabbricati); + + var catasto_fogli = new OpenLayers.Layer.WMS( + 'Fogli Catastali', + 'http://www502.regione.toscana.it/wmsraster/com.rt.wms.RTmap/wms?map=wmscatasto&map_resolution=91&language=ita&', { + styles: 'solo_contorno_viola_fine_con_etichette', + layers: 'rt_cat.idcatbdfog.rt', transparent: true}, + {isBaseLayer: false, visibility : false} + ); + //mapItMap.addWMSLayer(catasto_fogli); + + var catasto_particelle = new OpenLayers.Layer.WMS( + 'Particelle Catastali', + 'http://www502.regione.toscana.it/wmsraster/com.rt.wms.RTmap/wms?map=wmscatasto&map_resolution=91&language=ita&', { + styles: 'contorno_rosso_mattone_con_etichette', + layers: 'rt_cat.idcatpart.rt', transparent: true}, + {isBaseLayer: false, visibility : false} + ); + //mapItMap.addWMSLayer(catasto_particelle); + + var markerStyle = { graphicHeight: 29, graphicWidth: 22, @@ -174,19 +252,44 @@ Liferay.on('<%= "mapItMapReady" + StringPool.PERIOD + getServletContext().getSer Liferay.fire('mapIt-ready'); - A.one("#map").append('
'); - var lockButton = A.one('#container_btn .bloccamap'), - lockLayer = A.one('#map .layermap'), - latValue = editableLatitude != null ? editableLatitude.val() : latitude.val(), - longValue = editableLongitude != null ? editableLongitude.val() : longitude.val(), - locked = latValue != "" && longValue != ""; - lockMap(lockButton, lockLayer, latValue, longValue, !locked) - - A.one('#container_btn .bloccamap').on('click', function(event) { - var nodeObject = event.currentTarget, - locked = event.currentTarget.hasClass('fa-lock'); - lockMap(lockButton, lockLayer, latValue, longValue, locked); - }); + + /* featurePicker = new OpenLayers.Control.WMSGetFeatureInfo({ + url: 'http://www502.regione.toscana.it/wmsraster/com.rt.wms.RTmap/wms?map=wmscatasto&map_resolution=91&language=ita&', + title: 'Identify features by clicking', + layers: [catasto_particelle, catasto_fogli], + queryVisible: false, + output:'features', + + eventListeners: { + getfeatureinfo: function(event) { + console.log(event); + console.log(event.features); + console.log(event.text); + }, + nogetfeatureinfo: function(event) { + console.err("No queriable layers found"); + } + + } + }); + + mapItMap.insertControl(featurePicker); + featurePicker.activate(); + console.log("Activated"); */ + + A.one("#map").append('
'); + var lockButton = A.one('#container_btn .bloccamap'), + lockLayer = A.one('#map .layermap'), + latValue = editableLatitude != null ? editableLatitude.val() : latitude.val(), + longValue = editableLongitude != null ? editableLongitude.val() : longitude.val(), + locked = latValue!="" && longValue!=""; + lockMap(lockButton, lockLayer, latValue, longValue, !locked) + + A.one('#container_btn .bloccamap').on('click', function(event){ + var nodeObject = event.currentTarget, + locked = event.currentTarget.hasClass('fa-lock'); + lockMap(lockButton, lockLayer, latValue, longValue, locked); + }); } }); @@ -219,7 +322,9 @@ Liferay.on('geolocation-ready',function(event) { if (latitude != "" && longitude != "") { var zoom = mapItMap.getCurrentZoom() > 8 ? mapItMap.getCurrentZoom() : 12; - if (full) { + console.log(full); + if(full){ + //zoom = 14; var markerStyle = { graphicHeight: 29, graphicWidth: 22, @@ -282,64 +387,73 @@ function updateCoords(lat_coord, long_coord, zoom_coord, fullUpdate, noTransform if (fullUpdate) { A.io.request(url, { - dataType: 'json', - on: { - success: function() { - var response = this.get('responseData'), - town = response.address.city != undefined - ? response.address.city - : (response.address.town != undefined - ? response.address.town - : response.address.village) - .replaceAll(' ', '-') - .toLowerCase(); - - if (verifyComune && city.val().toLowerCase().split(" ").join("-") != town) { - alert("Attenzione!\nHai selezionato un punto esterno al comune di riferimento..."); - address.val(""); - } else { - var fullAddress = ''; - if(response.address.road != undefined) { - fullAddress += response.address.road; - } else if (response.address.pedestrian != undefined) { - fullAddress += response.address.pedestrian; - } - if (fullAddress != '') { - fullAddress += (response.address.house_number != undefined ? " " + response.address.house_number : ""); - } - address.val(fullAddress); - if (!verifyComune) { - var provincia = response.address.county.replaceAll(' ', '-').toLowerCase(); - var province = window[portletNamespace + 'province']; - if (undefined != province[provincia]) { - AUI().use('event', 'node-event-simulate', function(A) { - A.one('#' + portletNamespace + 'provincia') - .set('value', province[provincia]) - .simulate('change'); - window[portletNamespace + 'comuneSelezionato'] = town.replaceAll(' ', '-').toLowerCase(); - }); - } - } - } - } + dataType: 'json', + on: { + success: function() { + + var response = this.get('responseData'), + town = response.address.city!=undefined ? response.address.city : (response.address.town!=undefined ? response.address.town : response.address.village); + + if(city.val().toLowerCase().split(" ").join("_") != town.toLowerCase().split(" ").join("_")){ + alert("Attenzione!\nHai selezionato un punto esterno al comune di riferimento..."); + address.val(""); + } else { + + var fullAddress = ''; + if(response.address.road != undefined) + fullAddress += response.address.road; + else if(response.address.pedestrian != undefined) + fullAddress += response.address.pedestrian; + + if(fullAddress != '') + fullAddress += (response.address.house_number != undefined ? " " + response.address.house_number : ""); + + address.val(fullAddress); + } + } + } }); } editableLatitude.val(newlonLat.lat); - latitude.val(newlonLat.lat); - editableLongitude.val(newlonLat.lon); - longitude.val(newlonLat.lon); - editableZoom.val(zoom_coord); + latitude.val(newlonLat.lat); + editableLongitude.val(newlonLat.lon); + editableZoom.val(zoom_coord); + longitude.val(newlonLat.lon); + }); } window.alert = function(msg){ - $('.customAlertMessage').text(msg); - $('.customAlert').css('animation', 'fadeIn 0.3s linear'); - $('.customAlert').css('display', 'inline'); - setTimeout(function(){ - $('.customAlert').css('animation', 'none'); - }, 100); + $('.customAlertMessage').text(msg); + $('.customAlert').css('animation', 'fadeIn 0.3s linear'); + $('.customAlert').css('display', 'inline'); + setTimeout(function(){ + $('.customAlert').css('animation', 'none'); + }, 100); +}; + +$(function(){ + $('.confirmButton').click(function(){ + $('.customAlert').css('animation', 'fadeOut 0.3s linear'); + setTimeout(function(){ + $('.customAlert').css('animation', 'none'); + $('.customAlert').css('display', 'none'); + }, 100); + }); +}); + +/* +var globalGeolocationParams; +window.confirm = function(msg, callback){ + $('.message').text(msg); + $('.customConfirm').css('animation', 'fadeIn 0.3s linear'); + $('.customConfirm').css('display', 'inline'); + setTimeout(function(){ + $('.customConfirm').css('animation', 'none'); + }, 100); + + globalGeolocationParams = callback; }; $(function() { @@ -348,7 +462,27 @@ $(function() { setTimeout(function() { $('.customAlert').css('animation', 'none'); $('.customAlert').css('display', 'none'); - }, 100); + }, 100); + }); + $('.agreeButton').click(function(){ + console.log('agree'); + $('.customConfirm').css('animation', 'fadeOut 0.3s linear'); + setTimeout(function(){ + $('.customConfirm').css('animation', 'none'); + $('.customConfirm').css('display', 'none'); + }, 100); + + updateCoords(globalGeolocationParams.x, globalGeolocationParams.y, globalGeolocationParams.z); + }); -}); + $('.refuseButton').click(function(){ + console.log('refused'); + $('.customConfirm').css('animation', 'fadeOut 0.3s linear'); + setTimeout(function(){ + $('.customConfirm').css('animation', 'none'); + $('.customConfirm').css('display', 'none'); + }, 100); + return; + }); +}); */ \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/view.jsp index e28deb24..73ccf13b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/docroot/view.jsp @@ -1,4 +1,3 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <% /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/ivy.xml.MD5 index 37a015a0..21008fec 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-mapit-plugin-portlet/ivy.xml.MD5 @@ -1 +1 @@ -2a1242d44db7e53bd980b1eb314a3f21 +741392c57d2aef67bc950613f3fdcdaa diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.classpath index e2e2522a..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.classpath @@ -1,7 +1,7 @@ - + @@ -18,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.project index b4246e62..19381343 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.project @@ -32,6 +32,5 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.wst.common.component index 40a16c0a..b29c76de 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.wst.common.component @@ -2,12 +2,6 @@ - - uses - - - uses - uses diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar index d0baea9d..b33acdec 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/liferay-hook.xml b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/liferay-hook.xml index f4efe922..7ea9cf5f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/liferay-hook.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/docroot/WEB-INF/liferay-hook.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/ivy.xml.MD5 index ec4fd47b..798e1b5d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-notification-portlet/ivy.xml.MD5 @@ -1 +1 @@ -135a537b937200127d08ecde3d9a7757 +93e662066f3920536858fa4147b8a2b0 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.classpath index 20efb31a..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.classpath @@ -1,7 +1,11 @@ - + + + + + @@ -9,8 +13,10 @@ - - - + + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.project index 7d7b8912..502693f3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.project @@ -32,6 +32,5 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.component index 656a29b6..be2aff22 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.component @@ -2,10 +2,6 @@ - - - uses - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index f4beb943..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -2,8 +2,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/service.xml index b5718e1c..def90ed4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/service.xml @@ -1,4 +1,4 @@ - + 3F Consulting + Manifattura Web Group s.r.l. diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/model/impl/KaleoTaskAssignmentInstanceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/model/impl/KaleoTaskAssignmentInstanceImpl.java index 29882b7a..9740e498 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/model/impl/KaleoTaskAssignmentInstanceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/model/impl/KaleoTaskAssignmentInstanceImpl.java @@ -19,8 +19,8 @@ package it.tref.liferay.portos.report.model.impl; * * @author 3F Consulting + Manifattura Web Group s.r.l. */ -@SuppressWarnings("serial") -public class KaleoTaskAssignmentInstanceImpl extends KaleoTaskAssignmentInstanceBaseImpl { +public class KaleoTaskAssignmentInstanceImpl + extends KaleoTaskAssignmentInstanceBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a kaleo task assignment * instance model instance should use the {@link it.tref.liferay.portos.report.model.KaleoTaskAssignmentInstance} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/KaleoTaskAssignmentInstanceLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/KaleoTaskAssignmentInstanceLocalServiceImpl.java index eb7dc52c..19cd1f96 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/KaleoTaskAssignmentInstanceLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/KaleoTaskAssignmentInstanceLocalServiceImpl.java @@ -32,20 +32,17 @@ import com.liferay.portal.kernel.exception.SystemException; * @see it.tref.liferay.portos.report.service.KaleoTaskAssignmentInstanceLocalServiceUtil */ public class KaleoTaskAssignmentInstanceLocalServiceImpl extends KaleoTaskAssignmentInstanceLocalServiceBaseImpl { - /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link - * it.tref.liferay.portos.report.service.KaleoTaskAssignmentInstanceLocalServiceUtil} to access the kaleo task - * assignment instance local service. - */ - - @Override - public List distinctKaleoAssignee() throws SystemException { + /* + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.report.service.KaleoTaskAssignmentInstanceLocalServiceUtil} to access + * the kaleo task assignment instance local service. + */ + public List distinctKaleoAssignee() throws SystemException { return KaleoTaskAssignmentInstanceFinderUtil.distinctKaleoAssignee(); } - @Override - public List distinctKaleoAssigneeId(long userId) throws SystemException { + public List distinctKaleoAssigneeId(long userId) throws SystemException { return KaleoTaskAssignmentInstanceFinderUtil.distinctKaleoAssigneeId(userId); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoInstancePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoInstancePersistenceImpl.java index c81fb9dd..eddf8b3f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoInstancePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoInstancePersistenceImpl.java @@ -42,7 +42,6 @@ import it.tref.liferay.portos.report.NoSuchKaleoInstanceException; import it.tref.liferay.portos.report.model.KaleoInstance; import it.tref.liferay.portos.report.model.impl.KaleoInstanceImpl; import it.tref.liferay.portos.report.model.impl.KaleoInstanceModelImpl; -import it.tref.liferay.portos.report.service.persistence.KaleoInstancePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoTaskAssignmentInstanceFinderImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoTaskAssignmentInstanceFinderImpl.java index c4b09bab..ddadcd0e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoTaskAssignmentInstanceFinderImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoTaskAssignmentInstanceFinderImpl.java @@ -23,8 +23,7 @@ public class KaleoTaskAssignmentInstanceFinderImpl extends BasePersistenceImpl distinctKaleoAssignee() throws SystemException { + public List distinctKaleoAssignee() throws SystemException { Session session = null; try { @@ -45,8 +44,7 @@ public class KaleoTaskAssignmentInstanceFinderImpl extends BasePersistenceImpl distinctKaleoAssigneeId(long userId) throws SystemException { + public List distinctKaleoAssigneeId(long userId) throws SystemException { Session session = null; try { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java index da9a4e7c..2187ba72 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java @@ -43,7 +43,6 @@ import it.tref.liferay.portos.report.NoSuchKaleoTaskAssignmentInstanceException; import it.tref.liferay.portos.report.model.KaleoTaskAssignmentInstance; import it.tref.liferay.portos.report.model.impl.KaleoTaskAssignmentInstanceImpl; import it.tref.liferay.portos.report.model.impl.KaleoTaskAssignmentInstanceModelImpl; -import it.tref.liferay.portos.report.service.persistence.KaleoTaskAssignmentInstancePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/ReportScadenzarioIstruttorie.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/ReportScadenzarioIstruttorie.java index fe3c0cad..419f295a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/ReportScadenzarioIstruttorie.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/ReportScadenzarioIstruttorie.java @@ -31,7 +31,6 @@ import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.util.ParamUtil; -import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.model.Organization; import com.liferay.portal.service.OrganizationLocalServiceUtil; @@ -42,8 +41,8 @@ public class ReportScadenzarioIstruttorie implements PortosReportInterface { @Override public String generateHTML(HttpServletRequest httpServletRequest) { + String html = ""; - String html = StringPool.BLANK; try { ByteArrayOutputStream bos = new ByteArrayOutputStream(); JasperHtmlExporterBuilder htmlExporter = DynamicReports.export.htmlExporter(bos).setIgnoreHyperLink(true); @@ -62,62 +61,45 @@ public class ReportScadenzarioIstruttorie implements PortosReportInterface { public JasperReportBuilder generateReport(HttpServletRequest request) { String tipoPraticaSelected = ParamUtil.getString(request, "tipologiaPratica", null); - TextColumnBuilder presidioColumn = DynamicReports.col.column("Ufficio", "presidioColumn", - DynamicReports.type.stringType()); - TextColumnBuilder numeroPraticheDaAssegnareColumn = DynamicReports.col.column( - "N° pratiche da assegnare da parte delle PO", "numeroPraticheDaAssegnareColumn", - DynamicReports.type.integerType()); - TextColumnBuilder numeroPraticheDaApprovareColumn = DynamicReports.col.column( - "N° pratiche da approvare da parte delle PO", "numeroPraticheDaApprovareColumn", - DynamicReports.type.integerType()); - TextColumnBuilder numeroPraticheInIstruttoriaOrdinarieColumn = DynamicReports.col.column( - "N° pratiche In Istruttoria", "numeroPraticheInIstruttoriaOrdinarieColumn", - DynamicReports.type.integerType()); - TextColumnBuilder numeroPraticheConIntegrazOrdinarieColumn = DynamicReports.col.column( - "N° pratiche con Int.Richieste", "numeroPraticheConIntegrazOrdinarieColumn", - DynamicReports.type.integerType()); - TextColumnBuilder numeroPraticheInIstruttoriaInScadenzaColumn = DynamicReports.col.column( - "N° pratiche In Istruttoria", "numeroPraticheInIstruttoriaInScadenzaColumn", - DynamicReports.type.integerType()); - TextColumnBuilder numeroPraticheConIntegrazInScadenzaColumn = DynamicReports.col.column( - "N° pratiche con Int.Richieste", "numeroPraticheConIntegrazInScadenzaColumn", - DynamicReports.type.integerType()); - TextColumnBuilder numeroPraticheInIstruttoriaScaduteColumn = DynamicReports.col.column( - "N° pratiche In Istruttoria", "numeroPraticheInIstruttoriaScaduteColumn", - DynamicReports.type.integerType()); - TextColumnBuilder numeroPraticheConIntegrazScaduteColumn = DynamicReports.col.column( - "N° pratiche con Int.Richieste", "numeroPraticheConIntegrazScaduteColumn", - DynamicReports.type.integerType()); - ColumnTitleGroupBuilder titleGroupOrdinarie = DynamicReports.grid.titleGroup(tipoPraticaSelected - + " Ordinarie ( 0-39 gg) ", numeroPraticheInIstruttoriaOrdinarieColumn, - numeroPraticheConIntegrazOrdinarieColumn); - ColumnTitleGroupBuilder titleGroupInScadenza = DynamicReports.grid.titleGroup(tipoPraticaSelected - + " In Scadenza ( 40-60 gg) ", numeroPraticheInIstruttoriaInScadenzaColumn, - numeroPraticheConIntegrazInScadenzaColumn); - ColumnTitleGroupBuilder titleGroupScadute = DynamicReports.grid.titleGroup(tipoPraticaSelected - + " Scadute ( oltre 60 gg) ", numeroPraticheInIstruttoriaScaduteColumn, - numeroPraticheConIntegrazScaduteColumn); + + TextColumnBuilder presidioColumn = DynamicReports.col.column("Ufficio", "presidioColumn", DynamicReports.type.stringType()); + TextColumnBuilder numeroPraticheDaAssegnareColumn = DynamicReports.col.column("N�pratiche da assegnare da parte delle PO", "numeroPraticheDaAssegnareColumn", DynamicReports.type.integerType()); + + TextColumnBuilder numeroPraticheDaApprovareColumn = DynamicReports.col.column("N� pratiche da approvare da parte delle PO", "numeroPraticheDaApprovareColumn", DynamicReports.type.integerType()); + + // + TextColumnBuilder numeroPraticheInIstruttoriaOrdinarieColumn = DynamicReports.col.column("N�pratiche In Istruttoria", "numeroPraticheInIstruttoriaOrdinarieColumn", DynamicReports.type.integerType()); + + TextColumnBuilder numeroPraticheConIntegrazOrdinarieColumn = DynamicReports.col.column("N� pratiche con Int.Richieste", "numeroPraticheConIntegrazOrdinarieColumn", DynamicReports.type.integerType()); + + // + TextColumnBuilder numeroPraticheInIstruttoriaInScadenzaColumn = DynamicReports.col.column("N� pratiche In Istruttoria", "numeroPraticheInIstruttoriaInScadenzaColumn", DynamicReports.type.integerType()); + + TextColumnBuilder numeroPraticheConIntegrazInScadenzaColumn = DynamicReports.col.column("N� pratiche con Int.Richieste", "numeroPraticheConIntegrazInScadenzaColumn", DynamicReports.type.integerType()); + // + TextColumnBuilder numeroPraticheInIstruttoriaScaduteColumn = DynamicReports.col.column("N� pratiche In Istruttoria", "numeroPraticheInIstruttoriaScaduteColumn", DynamicReports.type.integerType()); + TextColumnBuilder numeroPraticheConIntegrazScaduteColumn = DynamicReports.col.column("N� pratiche con Int.Richieste", "numeroPraticheConIntegrazScaduteColumn", DynamicReports.type.integerType()); + + ColumnTitleGroupBuilder titleGroupOrdinarie = DynamicReports.grid.titleGroup(tipoPraticaSelected + " Ordinarie ( 0-39gg) ", numeroPraticheInIstruttoriaOrdinarieColumn, numeroPraticheConIntegrazOrdinarieColumn); + + ColumnTitleGroupBuilder titleGroupInScadenza = DynamicReports.grid.titleGroup(tipoPraticaSelected + " In Scadenza ( 40-60 gg) ", numeroPraticheInIstruttoriaInScadenzaColumn, numeroPraticheConIntegrazInScadenzaColumn); + + ColumnTitleGroupBuilder titleGroupScadute = DynamicReports.grid.titleGroup(tipoPraticaSelected + " Scadute ( oltre 60 gg) ", numeroPraticheInIstruttoriaScaduteColumn, numeroPraticheConIntegrazScaduteColumn); + JasperReportBuilder builder = DynamicReports .report() .setTemplate(TemplatesADV.reportTemplate) - .columnGrid(presidioColumn, numeroPraticheDaAssegnareColumn, numeroPraticheDaApprovareColumn, - titleGroupOrdinarie, titleGroupInScadenza, titleGroupScadute) - .columns(presidioColumn, numeroPraticheDaAssegnareColumn, numeroPraticheDaApprovareColumn, - numeroPraticheInIstruttoriaOrdinarieColumn, numeroPraticheConIntegrazOrdinarieColumn, - numeroPraticheInIstruttoriaInScadenzaColumn, numeroPraticheConIntegrazInScadenzaColumn, - numeroPraticheInIstruttoriaScaduteColumn, numeroPraticheConIntegrazScaduteColumn) - .setDataSource(createDataSource(request)) + .columnGrid(presidioColumn, numeroPraticheDaAssegnareColumn, numeroPraticheDaApprovareColumn, titleGroupOrdinarie, titleGroupInScadenza, titleGroupScadute) + .columns(presidioColumn, numeroPraticheDaAssegnareColumn, numeroPraticheDaApprovareColumn, numeroPraticheInIstruttoriaOrdinarieColumn, numeroPraticheConIntegrazOrdinarieColumn, numeroPraticheInIstruttoriaInScadenzaColumn, + numeroPraticheConIntegrazInScadenzaColumn, numeroPraticheInIstruttoriaScaduteColumn, numeroPraticheConIntegrazScaduteColumn).setDataSource(createDataSource(request)) .addProperty("net.sf.jasperreports.export.xls.detect.cell.type", "true"); return builder; } private JRDataSource createDataSource(HttpServletRequest request) { + DRDataSource dataSource = new DRDataSource("presidioColumn", "numeroPraticheDaAssegnareColumn", "numeroPraticheDaApprovareColumn", "numeroPraticheInIstruttoriaOrdinarieColumn", "numeroPraticheConIntegrazOrdinarieColumn", + "numeroPraticheInIstruttoriaInScadenzaColumn", "numeroPraticheConIntegrazInScadenzaColumn", "numeroPraticheInIstruttoriaScaduteColumn", "numeroPraticheConIntegrazScaduteColumn"); - DRDataSource dataSource = new DRDataSource("presidioColumn", "numeroPraticheDaAssegnareColumn", - "numeroPraticheDaApprovareColumn", "numeroPraticheInIstruttoriaOrdinarieColumn", - "numeroPraticheConIntegrazOrdinarieColumn", "numeroPraticheInIstruttoriaInScadenzaColumn", - "numeroPraticheConIntegrazInScadenzaColumn", "numeroPraticheInIstruttoriaScaduteColumn", - "numeroPraticheConIntegrazScaduteColumn"); try { String dateMaxString = ParamUtil.getString(request, "dateMax", null); String tipoPraticaSelected = ParamUtil.getString(request, "tipologiaPratica", null); @@ -149,16 +131,19 @@ public class ReportScadenzarioIstruttorie implements PortosReportInterface { for (Organization org : orgs) { if (org.getParentOrganization() != null) { long groupId = org.getGroup().getGroupId(); - Map dbResult = ReportEngineServiceUtil.praticheAperte(dateMax, groupId, - tipoPraticaSelected); - numPraticheOrdInIstruttoriaTecnico = dbResult.get("numPraticheOrdInIstruttoriaTecnico"); - numPraticheOrdInAttesaIntegrazione = dbResult.get("numPraticheOrdInAttesaIntegrazione"); + + Map dbResult=ReportEngineServiceUtil.praticheAperte(dateMax,groupId,tipoPraticaSelected); + + numPraticheOrdInIstruttoriaTecnico=dbResult.get("numPraticheOrdInIstruttoriaTecnico"); + numPraticheOrdInAttesaIntegrazione=dbResult.get("numPraticheOrdInAttesaIntegrazione"); numPraticheInScadenzaInIstruttoriaTecnico = dbResult .get("numPraticheInScadenzaInIstruttoriaTecnico"); numPraticheInScadenzaInAttesaIntegrazione = dbResult .get("numPraticheInScadenzaInAttesaIntegrazione"); - numPraticheScaduteInIstruttoriaTecnico = dbResult.get("numPraticheScaduteInIstruttoriaTecnico"); - numPraticheScaduteInAttesaIntegrazione = dbResult.get("numPraticheScaduteInAttesaIntegrazione"); + numPraticheScaduteInIstruttoriaTecnico=dbResult.get("numPraticheScaduteInIstruttoriaTecnico"); + numPraticheScaduteInAttesaIntegrazione=dbResult.get("numPraticheScaduteInAttesaIntegrazione"); + + totPraticheAperteFinePeriodo += dbResult.get("totPraticheAperteFinePeriodo"); numeroPraticheDaAssegnareColumnTOTALE += numeroPraticheDaAssegnareColumn; numeroPraticheDaApprovareColumnTOTALE += numeroPraticheDaApprovareColumn; @@ -181,7 +166,11 @@ public class ReportScadenzarioIstruttorie implements PortosReportInterface { numPraticheInScadenzaInAttesaIntegrazioneTOTALE, numPraticheScaduteInIstruttoriaTecnicoTOTALE, numPraticheScaduteInAttesaIntegrazioneTOTALE); } - } catch (ParseException | PortalException | SystemException e) { + } catch (SystemException e) { + _log.error(e, e); + } catch (PortalException e) { + _log.error(e, e); + } catch (ParseException e) { _log.error(e, e); } return dataSource; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/ReportTempisticheIstruttorie.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/ReportTempisticheIstruttorie.java index 4948b61f..29b41712 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/ReportTempisticheIstruttorie.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/ReportTempisticheIstruttorie.java @@ -1,9 +1,11 @@ package it.tref.portos.report.engine; +import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.portos.report.engine.PortosSearchTermsReport.FieldType; import it.tref.portos.report.engine.annotation.PortosReport; import it.tref.portos.report.engine.template.TemplatesADV; import it.tref.portos.report.engine.util.ReportEngineServiceUtil; +import it.tref.portos.report.engine.util.ReportTempisticheBean; import java.io.ByteArrayOutputStream; import java.text.ParseException; @@ -11,8 +13,10 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.TimeUnit; import javax.servlet.http.HttpServletRequest; @@ -32,7 +36,6 @@ import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.util.ParamUtil; -import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.model.Organization; import com.liferay.portal.service.OrganizationLocalServiceUtil; @@ -47,20 +50,26 @@ public class ReportTempisticheIstruttorie implements PortosReportInterface { @Override public String generateHTML(HttpServletRequest httpServletRequest) { + String html = ""; - String html = StringPool.BLANK; - try { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - JasperHtmlExporterBuilder htmlExporter = DynamicReports.export.htmlExporter(bos).setIgnoreHyperLink(true); - JasperReportBuilder builder = generateReport(httpServletRequest); - builder.pageFooter(DynamicReports.cmp.pageNumber().setStyle(TemplatesADV.boldCenteredStyle)); - builder.toHtml(htmlExporter); - byte[] byteArray = bos.toByteArray(); - html = new String(byteArray); - } catch (DRException e) { - _log.error(e, e); - } - return html; + try { + + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + + JasperHtmlExporterBuilder htmlExporter = DynamicReports.export.htmlExporter(bos).setIgnoreHyperLink(true); + + JasperReportBuilder builder = generateReport(httpServletRequest); + builder.pageFooter(DynamicReports.cmp.pageNumber().setStyle(TemplatesADV.boldCenteredStyle)); + builder.toHtml(htmlExporter); + + byte[] byteArray = bos.toByteArray(); + html = new String(byteArray); + + } catch (DRException e) { + _log.error(e, e); + } + + return html; } @Override @@ -96,16 +105,16 @@ public class ReportTempisticheIstruttorie implements PortosReportInterface { TextFieldBuilder note2 = DynamicReports.cmp.text(nota2); note1.setStyle(DynamicReports.stl.style(TemplatesADV.rootStyle).setFontSize(6)); note2.setStyle(DynamicReports.stl.style(TemplatesADV.rootStyle).setFontSize(6)); - JasperReportBuilder builder = DynamicReports - .report() - .setTemplate(TemplatesADV.reportTemplate) - .pageFooter(note1, note2) - .columnGrid(presidioColumn, numeroPraticheTotaliColumn, titleGroupInScadenza, titleGroupScadute) - .columns(presidioColumn, numeroPraticheTotaliColumn, numeroTotaleAutorizzateInScadenzaColumn, - durataMediaIstruttorieInScadenzaColumn, durataMediaApprovazionePraticaInScadenzaColumn, - numeroTotaleAutorizzateScaduteColumn, durataMediaIstruttorieScaduteColumn, - durataMediaApprovazionePraticaScaduteColumn).setDataSource(createDataSource(request)) - .addProperty("net.sf.jasperreports.export.xls.detect.cell.type", "true"); + + JasperReportBuilder builder = + DynamicReports.report().setTemplate(TemplatesADV.reportTemplate) + .pageFooter(note1, note2) + .columnGrid(presidioColumn, numeroPraticheTotaliColumn, titleGroupInScadenza, titleGroupScadute) + .columns(presidioColumn, numeroPraticheTotaliColumn + , numeroTotaleAutorizzateInScadenzaColumn, durataMediaIstruttorieInScadenzaColumn, durataMediaApprovazionePraticaInScadenzaColumn + , numeroTotaleAutorizzateScaduteColumn, durataMediaIstruttorieScaduteColumn, durataMediaApprovazionePraticaScaduteColumn) + .setDataSource(createDataSource(request)).addProperty("net.sf.jasperreports.export.xls.detect.cell.type", "true");; + return builder; } @@ -132,48 +141,57 @@ public class ReportTempisticheIstruttorie implements PortosReportInterface { dateMax = calendarMax.getTime(); List orgs = new ArrayList(); orgs = OrganizationLocalServiceUtil.getOrganizations(QueryUtil.ALL_POS, QueryUtil.ALL_POS); - int numeroPraticheTotaliTotale = 0; - int numeroTotaleAutorizzateInScadenzaTotale = 0; - float durataMediaIstruttorieInScadenzaTotale = 0; - float durataMediaApprovazionePraticaInScadenzaTotale = 0; - int numeroTotaleAutorizzateScaduteTotale = 0; - float durataMediaIstruttorieScaduteTotale = 0; - float durataMediaApprovazionePraticaScaduteTotale = 0; + + int numeroPraticheTotaliTotale = 0; + int numeroTotaleAutorizzateInScadenzaTotale = 0; + float durataMediaIstruttorieInScadenzaTotale = 0; + float durataMediaApprovazionePraticaInScadenzaTotale = 0; + int numeroTotaleAutorizzateScaduteTotale = 0; + float durataMediaIstruttorieScaduteTotale = 0; + float durataMediaApprovazionePraticaScaduteTotale = 0; + int countOrganization = 0; int countOrganizationPraticheInScadenza = 0; int countOrganizationPraticheScadute = 0; for (Organization org : orgs) { if (org.getParentOrganization() != null) { long groupId = org.getGroup().getGroupId(); - Map dbResult = ReportEngineServiceUtil.praticheChiuse(dateMin, dateMax, groupId, - tipoPraticaSelected); - int numeroPraticheTotali = dbResult.get("count").intValue(); + + + //Retrieve data from DB + //Map dbResult=elaboraAutorizzazioniNew(dateMin,dateMax,groupId,tipoPraticaSelected); + Map dbResult=ReportEngineServiceUtil.praticheChiuse(dateMin, dateMax, groupId, tipoPraticaSelected); + + + int numeroPraticheTotali =dbResult.get("count").intValue(); int numeroTotaleAutorizzateInScadenza = dbResult.get("countOrdinarie").intValue(); int numeroTotaleAutorizzateScadute = dbResult.get("countScadute").intValue(); - float durataMediaIstruttorieInScadenza = dbResult.get("countOrdinarie") > 0 ? dbResult - .get("giorniTotOrdinarieIstruttorie") / dbResult.get("countOrdinarie") : 0; - float durataMediaApprovazionePraticaInScadenza = dbResult.get("countOrdinarie") > 0 ? dbResult - .get("giorniTotOrdinarieApprovazioni") / dbResult.get("countOrdinarie") : 0; - float durataMediaIstruttorieScadute = dbResult.get("countScadute") > 0 ? dbResult - .get("giorniTotScaduteIstruttorie") / dbResult.get("countScadute") : 0; - float durataMediaApprovazionePraticaScadute = dbResult.get("countScadute") > 0 ? dbResult - .get("giorniTotScaduteApprovazioni") / dbResult.get("countScadute") : 0; - dataSource.add(org.getName(), numeroPraticheTotali, numeroTotaleAutorizzateInScadenza, - durataMediaIstruttorieInScadenza, durataMediaApprovazionePraticaInScadenza, - numeroTotaleAutorizzateScadute, durataMediaIstruttorieScadute, - durataMediaApprovazionePraticaScadute); - numeroPraticheTotaliTotale += numeroPraticheTotali; - numeroTotaleAutorizzateInScadenzaTotale += numeroTotaleAutorizzateInScadenza; - numeroTotaleAutorizzateScaduteTotale += numeroTotaleAutorizzateScadute; - durataMediaApprovazionePraticaInScadenzaTotale += durataMediaApprovazionePraticaInScadenza; - durataMediaApprovazionePraticaScaduteTotale += durataMediaApprovazionePraticaScadute; - durataMediaIstruttorieInScadenzaTotale += durataMediaIstruttorieInScadenza; - durataMediaIstruttorieScaduteTotale += durataMediaIstruttorieScadute; - if (numeroTotaleAutorizzateInScadenza > 0) { - countOrganizationPraticheInScadenza++; - } - if (numeroTotaleAutorizzateScadute > 0) { - countOrganizationPraticheScadute++; - } + + float durataMediaIstruttorieInScadenza =dbResult.get("countOrdinarie")>0? dbResult.get("giorniTotOrdinarieIstruttorie")/dbResult.get("countOrdinarie"):0; + float durataMediaApprovazionePraticaInScadenza =dbResult.get("countOrdinarie")>0? dbResult.get("giorniTotOrdinarieApprovazioni")/dbResult.get("countOrdinarie"):0; + + float durataMediaIstruttorieScadute = dbResult.get("countScadute")>0?dbResult.get("giorniTotScaduteIstruttorie")/dbResult.get("countScadute"):0; + float durataMediaApprovazionePraticaScadute =dbResult.get("countScadute")>0?dbResult.get("giorniTotScaduteApprovazioni")/dbResult.get("countScadute"):0; + + dataSource.add(org.getName(), numeroPraticheTotali + , numeroTotaleAutorizzateInScadenza, durataMediaIstruttorieInScadenza, durataMediaApprovazionePraticaInScadenza + , numeroTotaleAutorizzateScadute, durataMediaIstruttorieScadute, durataMediaApprovazionePraticaScadute); + + numeroPraticheTotaliTotale+=numeroPraticheTotali; + numeroTotaleAutorizzateInScadenzaTotale+=numeroTotaleAutorizzateInScadenza; + numeroTotaleAutorizzateScaduteTotale+=numeroTotaleAutorizzateScadute; + durataMediaApprovazionePraticaInScadenzaTotale+=durataMediaApprovazionePraticaInScadenza; + durataMediaApprovazionePraticaScaduteTotale+=durataMediaApprovazionePraticaScadute; + durataMediaIstruttorieInScadenzaTotale+=durataMediaIstruttorieInScadenza; + durataMediaIstruttorieScaduteTotale+=durataMediaIstruttorieScadute; + + + if (numeroTotaleAutorizzateInScadenza>0) + countOrganizationPraticheInScadenza++; + if (numeroTotaleAutorizzateScadute>0) + countOrganizationPraticheScadute++; + + + countOrganization++; } } dataSource.add("TOTALI", numeroPraticheTotaliTotale, numeroTotaleAutorizzateInScadenzaTotale, @@ -186,7 +204,11 @@ public class ReportTempisticheIstruttorie implements PortosReportInterface { countOrganizationPraticheScadute > 0 ? durataMediaApprovazionePraticaScaduteTotale / countOrganizationPraticheScadute : 0); } - } catch (ParseException | PortalException | SystemException e) { + } catch (SystemException e) { + _log.error(e, e); + } catch (PortalException e) { + _log.error(e, e); + } catch (ParseException e) { _log.error(e, e); } return dataSource; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/template/TemplatesADV.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/template/TemplatesADV.java index a6e4d87f..4358503d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/template/TemplatesADV.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/template/TemplatesADV.java @@ -12,6 +12,8 @@ import java.util.Locale; import javax.servlet.http.HttpServletRequest; +import com.liferay.portal.kernel.util.ParamUtil; + import net.sf.dynamicreports.report.base.expression.AbstractValueFormatter; import net.sf.dynamicreports.report.builder.HyperLinkBuilder; import net.sf.dynamicreports.report.builder.ReportTemplateBuilder; @@ -26,9 +28,6 @@ import net.sf.dynamicreports.report.constant.SplitType; import net.sf.dynamicreports.report.constant.VerticalTextAlignment; import net.sf.dynamicreports.report.definition.ReportParameters; -import com.liferay.portal.kernel.util.ParamUtil; -import com.liferay.portal.kernel.util.StringPool; - public class TemplatesADV { public static final StyleBuilder rootStyle; @@ -90,54 +89,76 @@ public class TemplatesADV { .setDetailSplitType(SplitType.PREVENT); currencyType = new CurrencyType(); - HyperLinkBuilder link = hyperLink(StringPool.BLANK); - - dynamicReportsComponent = cmp.horizontalList( - cmp.verticalList( - cmp.text("GENIO CIVILE").setStyle(bold15CenteredStyle) - .setHorizontalTextAlignment(HorizontalTextAlignment.LEFT), cmp.text(StringPool.BLANK) - .setStyle(italicStyle).setHyperLink(link))).setFixedWidth(300); - footerComponent = cmp.pageXofY().setStyle(stl.style(boldCenteredStyle).setTopBorder(stl.pen1Point())); - } - - // Creates custom component which is possible to add to any report band component - public static ComponentBuilder createTitleComponent(String label) { - - HorizontalListBuilder horizontalListBuilder = cmp.horizontalList(); - horizontalListBuilder.add(dynamicReportsComponent, cmp.text(label).setStyle(bold15CenteredStyle) - .setHorizontalTextAlignment(HorizontalTextAlignment.RIGHT)); - horizontalListBuilder.newRow(); - return horizontalListBuilder; - } - - // ADT: BUG BO ID=34 - REPORT PRATICHE VIDIMATE - public static ComponentBuilder createTitleComponentNew(String label, String className, - HttpServletRequest request) { - - if (className.equalsIgnoreCase(ReportPraticheVidimate.class.getName())) { - HorizontalListBuilder horizontalListBuilder = cmp.horizontalList(); - HyperLinkBuilder link = hyperLink(StringPool.BLANK); - StringBuilder stBuilder = new StringBuilder(); - if (className.equalsIgnoreCase(ReportPraticheVidimate.class.getName())) { - String dateMinString = ParamUtil.getString(request, "dateMin", null); - String dateMaxString = ParamUtil.getString(request, "dateMax", null); - stBuilder.append("Periodo di Osservazione: dal "); - stBuilder.append(dateMinString); - stBuilder.append(" al "); - stBuilder.append(dateMaxString); - } - ComponentBuilder dynamicReportsComponentNew = cmp.horizontalList( - cmp.verticalList(cmp.text(stBuilder.toString()).setStyle(bold15CenteredStyle) - .setHorizontalTextAlignment(HorizontalTextAlignment.LEFT), cmp.text(StringPool.BLANK) - .setStyle(italicStyle).setHyperLink(link))).setFixedWidth(300); - horizontalListBuilder.add(dynamicReportsComponentNew, cmp.text(label).setStyle(bold15CenteredStyle) - .setHorizontalTextAlignment(HorizontalTextAlignment.RIGHT)); - horizontalListBuilder.newRow(); - return horizontalListBuilder; - } else { - return null; - } - } + HyperLinkBuilder link = hyperLink(""); + + dynamicReportsComponent = + cmp.horizontalList( + // cmp.image(TemplatesADV.class.getResource("images/aaa.png")).setFixedDimension(60, 60), + cmp.verticalList( + cmp.text("GENIO CIVILE").setStyle(bold15CenteredStyle) + .setHorizontalTextAlignment(HorizontalTextAlignment.LEFT), cmp.text("").setStyle(italicStyle) + .setHyperLink(link))).setFixedWidth(300); + footerComponent = cmp.pageXofY().setStyle(stl.style(boldCenteredStyle).setTopBorder(stl.pen1Point())); + + } + + /** + * + * Creates custom component which is possible to add to any report band component + */ + + public static ComponentBuilder createTitleComponent(String label) { + HorizontalListBuilder horizontalListBuilder = cmp.horizontalList(); + horizontalListBuilder.add(dynamicReportsComponent, cmp.text(label).setStyle(bold15CenteredStyle) + .setHorizontalTextAlignment(HorizontalTextAlignment.RIGHT)); + horizontalListBuilder.newRow(); + return horizontalListBuilder; + + } + + + /** + * ADT: BUG BO ID=34 � REPORT PRATICHE VIDIMATE + * + * @param label + * @param className + * @param request + * @return + */ + public static ComponentBuilder createTitleComponentNew(String label,String className,HttpServletRequest request) { + + + if (className.equalsIgnoreCase(ReportPraticheVidimate.class.getName())){ + HorizontalListBuilder horizontalListBuilder = cmp.horizontalList(); + HyperLinkBuilder link = hyperLink(""); + StringBuilder stBuilder=new StringBuilder(); + if (className.equalsIgnoreCase(ReportPraticheVidimate.class.getName())){ + String dateMinString = ParamUtil.getString(request, "dateMin", null); + String dateMaxString = ParamUtil.getString(request, "dateMax", null); + stBuilder.append("Periodo di Osservazione: dal "); + stBuilder.append(dateMinString); + stBuilder.append(" al "); + stBuilder.append(dateMaxString); + } + ComponentBuilder dynamicReportsComponentNew = + cmp.horizontalList( + // cmp.image(TemplatesADV.class.getResource("images/aaa.png")).setFixedDimension(60, 60), + cmp.verticalList( + cmp.text(stBuilder.toString()).setStyle(bold15CenteredStyle) + .setHorizontalTextAlignment(HorizontalTextAlignment.LEFT), cmp.text("").setStyle(italicStyle) + .setHyperLink(link))).setFixedWidth(300); + + + horizontalListBuilder.add(dynamicReportsComponentNew, cmp.text(label).setStyle(bold15CenteredStyle) + .setHorizontalTextAlignment(HorizontalTextAlignment.RIGHT)); + horizontalListBuilder.newRow(); + return horizontalListBuilder; + + }else{ + return null; + } + + } public static CurrencyValueFormatter createCurrencyValueFormatter(String label) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/.gitignore b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/.gitignore new file mode 100644 index 00000000..0a8642fa --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/.gitignore @@ -0,0 +1,10 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Zeppelin ignored files +/ZeppelinRemoteNotebooks/ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/.name b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/.name new file mode 100644 index 00000000..df0d44e6 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/.name @@ -0,0 +1 @@ +ReportEngineServiceUtil.java \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/jpa-buddy.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/jpa-buddy.xml new file mode 100644 index 00000000..966d5f56 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/jpa-buddy.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/misc.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/misc.xml new file mode 100644 index 00000000..d79bd4e1 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/modules.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/modules.xml new file mode 100644 index 00000000..345f9096 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/util.iml b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/util.iml new file mode 100644 index 00000000..d6ebd480 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/util.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/vcs.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/vcs.xml new file mode 100644 index 00000000..cf49fc8c --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/ReportEngineServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/ReportEngineServiceUtil.java index 04a92f4a..6447c3d5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/ReportEngineServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/ReportEngineServiceUtil.java @@ -1,5 +1,7 @@ package it.tref.portos.report.engine.util; +import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; + import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -11,8 +13,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.omg.CORBA.SystemException; - +import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -30,6 +31,7 @@ public class ReportEngineServiceUtil { } /** + * * Pratiche aperte alla data in input * * @param dateMax @@ -52,9 +54,8 @@ public class ReportEngineServiceUtil { String tipoDocumentoApprovato = co ? "CO" : "AU"; try { - // returnedList = IntPraticaLocalServiceUtil.reportPraticheVidimate(calendarStart.getTime(), dateMax, - // groupId, - // type); + //returnedList = IntPraticaLocalServiceUtil.reportPraticheVidimate(calendarStart.getTime(), dateMax, groupId, + //type); for (Object[] tmp : returnedList) { if (tmp.length == 8) { Long avvisoid = (Long) tmp[0]; @@ -143,7 +144,7 @@ public class ReportEngineServiceUtil { returnedMap.put("totPraticheAperteFinePeriodo", praticheAperteFinePeriodo.size()); - } catch (SystemException e) { + } catch (Exception e) { _log.error("Errore in ReportPraticheVidimate - ", e); } return returnedMap; @@ -155,10 +156,11 @@ public class ReportEngineServiceUtil { Map returnedMap = new HashMap(); List returnedList = new ArrayList<>(); boolean co = type.equalsIgnoreCase("Depositi a controllo obbligatorio"); + String tipoDocumentoApprovato = co ? "CO" : "AU"; try { - // returnedList = IntPraticaLocalServiceUtil.reportTempisticheIstruttorieAvvisiAutorizzazioni(dateMin, - // dateMax, groupId, type); + //returnedList = IntPraticaLocalServiceUtil.reportTempisticheIstruttorieAvvisiAutorizzazioni(dateMin, + //dateMax, groupId, type); for (Object[] tmp : returnedList) { if (tmp.length == 7) { Long avvisoid = (Long) tmp[0]; @@ -341,7 +343,7 @@ public class ReportEngineServiceUtil { returnedMap.put("giorniTotTrasmissioneIntegrazioniFEIntegrazioniMultiple", giorniTotTrasmissioneIntegrazioniFEIntegrazioniMultiple); - } catch (SystemException e) { + } catch (Exception e) { _log.error("Errore in ReportTempisticheIstruttorie - ", e); } return returnedMap; @@ -492,6 +494,7 @@ public class ReportEngineServiceUtil { } /** + * * @param dataEnd * @param dataStart * @return diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/util.iml b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/util.iml new file mode 100644 index 00000000..2c23df85 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/util.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/service.properties index dfaf62c7..d696374f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_report - build.number=27 - build.date=1632924679303 + build.number=31 + build.date=1675936189149 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/ivy.xml.MD5 index 4bf212dc..332a3243 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/ivy.xml.MD5 @@ -1 +1 @@ -5c7079f092c74ee1765720cef73ee501 +8afa694bc6dcd4521395feebec7a44ec diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.classpath index 13ef5107..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.classpath @@ -1,8 +1,7 @@ - - + @@ -19,6 +18,5 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.project index 2bcf3cc7..3dd2e6a6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.project @@ -32,6 +32,5 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.wst.common.component index 453ec811..50111eec 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.wst.common.component @@ -2,7 +2,6 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/service.xml index eb52e37b..d16aa930 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/service.xml @@ -1,4 +1,4 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/html/core/HeaderFooterPageEvent.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/html/core/HeaderFooterPageEvent.java index 0cd178cd..63d14518 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/html/core/HeaderFooterPageEvent.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/html/core/HeaderFooterPageEvent.java @@ -1,7 +1,5 @@ package it.tref.liferay.portos.report.html.core; -import java.io.IOException; - import com.itextpdf.text.Document; import com.itextpdf.text.DocumentException; import com.itextpdf.text.Element; @@ -14,6 +12,8 @@ import com.itextpdf.tool.xml.ElementList; import com.itextpdf.tool.xml.XMLWorkerHelper; import com.liferay.portal.kernel.util.Validator; +import java.io.IOException; + public class HeaderFooterPageEvent extends PdfPageEventHelper { private ElementList header; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/jasper/core/provider/AbstractReportProvider.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/jasper/core/provider/AbstractReportProvider.java index 409411a8..3702fb04 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/jasper/core/provider/AbstractReportProvider.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/jasper/core/provider/AbstractReportProvider.java @@ -175,12 +175,22 @@ public abstract class AbstractReportProvider { exporter.setParameter(JRPdfExporterParameter.METADATA_AUTHOR, getMetadataAuthor()); exporter.setParameter(JRPdfExporterParameter.METADATA_CREATOR, getMetadataCreator()); exporter.setParameter(JRPdfExporterParameter.IS_TAGGED, true); - if (getPermission() != null) { - exporter.setParameter(JRPdfExporterParameter.PERMISSIONS, getPermission()); - } - } else if (exportType == ReportEngine.EXPORT_TO_DOC || exportType == ReportEngine.EXPORT_TO_RTF) { - } else if (exportType == ReportEngine.EXPORT_TO_DOCX) {} else if (exportType == ReportEngine.EXPORT_TO_HTML - || exportType == ReportEngine.EXPORT_TO_HTM) {} else if (exportType == ReportEngine.EXPORT_TO_CSV) { + if (getPermission() != null) + exporter.setParameter( + JRPdfExporterParameter.PERMISSIONS, getPermission()); + } + else if (exportType == ReportEngine.EXPORT_TO_DOC || + exportType == ReportEngine.EXPORT_TO_RTF) { + + } + else if (exportType == ReportEngine.EXPORT_TO_DOCX) { + + } + else if (exportType == ReportEngine.EXPORT_TO_HTML || + exportType == ReportEngine.EXPORT_TO_HTM) { + + } + else if (exportType == ReportEngine.EXPORT_TO_CSV) { exporter = null; } return exporter; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/jasper/core/report/BeanReport.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/jasper/core/report/BeanReport.java index ea83560c..cabf6af1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/jasper/core/report/BeanReport.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/jasper/core/report/BeanReport.java @@ -16,13 +16,11 @@ public class BeanReport implements ReportInterface { this.bean = bean; } - @Override public boolean isValido() { return true; } - @Override public JRDataSource generaDataSource() { JRDataSource ds = null; @@ -36,10 +34,10 @@ public class BeanReport implements ReportInterface { return ds; } - @Override - public void closeDataSource() {} + public void closeDataSource() { + + } - @Override public byte[] getCSVBytes() { return null; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ProtocolloMessageListener.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ProtocolloMessageListener.java index 69e16e5a..e4336442 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ProtocolloMessageListener.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ProtocolloMessageListener.java @@ -131,26 +131,16 @@ public class ProtocolloMessageListener extends BaseMessageListener { ServiceContext serviceContext = new ServiceContext(); serviceContext.setUserId(userId); serviceContext.setCompanyId(companyId); - long repositoryId = fileEntry.getRepositoryId(); - long folderId = fileEntry.getFolderId(); - String sourceFileName = reportDto.getFileName() + ".pdf"; - String mimeType = ContentTypes.APPLICATION_PDF; - String title = reportDto.getFileName(); - String description = StringPool.BLANK; - String changeLog = StringPool.BLANK; - FileEntry newFileEntry; + FileEntry newFileEntry = null; try { - newFileEntry = - DLAppLocalServiceUtil.addFileEntry(userId, repositoryId, folderId, sourceFileName, - mimeType, title, description, changeLog, outputBytes, serviceContext); + newFileEntry = DLAppLocalServiceUtil.addFileEntry(userId, fileEntry.getRepositoryId(), + fileEntry.getFolderId(), reportDto.getFileName() + ".pdf", ContentTypes.APPLICATION_PDF, + reportDto.getFileName(), StringPool.BLANK, StringPool.BLANK, outputBytes, serviceContext); } catch (DuplicateFileException e) { - FileEntry fe = - DLAppServiceUtil.getFileEntry(fileEntry.getGroupId(), fileEntry.getFolderId(), - reportDto.getFileName()); - DLAppLocalServiceUtil.deleteFileEntry(fe.getFileEntryId()); - newFileEntry = - DLAppLocalServiceUtil.addFileEntry(userId, repositoryId, folderId, sourceFileName, - mimeType, title, description, changeLog, outputBytes, serviceContext); + FileEntry fe = DLAppServiceUtil.getFileEntry(fileEntry.getGroupId(), fileEntry.getFolderId(), + reportDto.getFileName()); + _log.info("File duplicato : " + fe.getFileEntryId()); + return; } if (Validator.isNotNull(newFileEntry)) { long[] fileEntryIds = new long[0]; @@ -176,15 +166,18 @@ public class ProtocolloMessageListener extends BaseMessageListener { Company company = CompanyLocalServiceUtil.fetchCompany(companyId); StringBuilder sb = new StringBuilder(); - sb.append( - (String) company.getExpandoBridge().getAttribute( - Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_INIZIALE_LABEL, false)) - .append(StringPool.SLASH) - .append(protocollo) - .append(StringPool.SLASH) - .append((String) company.getExpandoBridge().getAttribute( - Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_SEGUENTE_LABEL, false)).append(" del ") - .append(sdf.format(dtProtocollo)); + + sb.append((String) company.getExpandoBridge().getAttribute( + Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_INIZIALE_LABEL, false)); + sb.append(StringPool.SLASH); + sb.append(protocollo); + sb.append(StringPool.SLASH); + sb.append((String) company.getExpandoBridge().getAttribute( + Constants.COMPANY_CUSTOM_FIELD_PROTOCOLLO_CODICE_SEGUENTE_LABEL, false)); + + sb.append(" del "); + sb.append(sdf.format(dtProtocollo)); + return sb.toString(); } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ReportMessageListener.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ReportMessageListener.java index a126a417..1ad1fa8e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ReportMessageListener.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ReportMessageListener.java @@ -29,9 +29,9 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.service.ServiceContext; public class ReportMessageListener extends BaseMessageListener { + private final static Log _log = LogFactoryUtil.getLog(ReportTaskMessageListener.class); - private static final Log _log = LogFactoryUtil.getLog(ReportTaskMessageListener.class); - + @SuppressWarnings("unchecked") @Override protected void doReceive(Message message) throws Exception { @@ -39,7 +39,6 @@ public class ReportMessageListener extends BaseMessageListener { long companyId = message.getLong(ReportConstants.COMPANY_ID); long userId = message.getLong(ReportConstants.USER_ID); Object dataSouce = message.get(ReportConstants.REPORT_DATASOURCE); - @SuppressWarnings("unchecked") Map taskContextMap = (Map) message .get(ReportConstants.PARAMATERS); if (taskContextMap == null) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ReportTaskMessageListener.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ReportTaskMessageListener.java index 7d0fcb12..1512433d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ReportTaskMessageListener.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/messaging/ReportTaskMessageListener.java @@ -19,6 +19,8 @@ import com.liferay.portal.kernel.dao.orm.PropertyFactoryUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.json.JSONFactoryUtil; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.messaging.BaseMessageListener; import com.liferay.portal.kernel.messaging.Message; import com.liferay.portal.kernel.messaging.MessageBusUtil; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/ReportTaskLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/ReportTaskLocalServiceImpl.java index f5a8f1ae..ff8d32c2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/ReportTaskLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/ReportTaskLocalServiceImpl.java @@ -40,13 +40,16 @@ public class ReportTaskLocalServiceImpl extends ReportTaskLocalServiceBaseImpl { * it.tref.liferay.portos.report.service.ReportTaskLocalServiceUtil} to access the report task local service. */ - @Override - public ReportTask addReportTask(Map taskContextMap, ServiceContext serviceContext) - throws PortalException, SystemException { + public ReportTask addReportTask( + Map taskContextMap, ServiceContext serviceContext) + throws PortalException, SystemException { User user = userLocalService.getUser(serviceContext.getUserId()); Date now = new Date(); - ReportTask reportTask = createReportTask(counterLocalService.increment(ReportTask.class.getName())); + + ReportTask reportTask = + reportTaskLocalService.createReportTask(counterLocalService.increment(ReportTask.class.getName())); + reportTask.setCompanyId(serviceContext.getCompanyId()); reportTask.setUserId(user.getUserId()); reportTask.setUserName(user.getFullName()); @@ -56,16 +59,20 @@ public class ReportTaskLocalServiceImpl extends ReportTaskLocalServiceBaseImpl { String taskContext = JSONFactoryUtil.looseSerializeDeep(taskContextMap); reportTask.setTaskContext(taskContext); } - return addReportTask(reportTask); + + return reportTaskLocalService.addReportTask(reportTask); } - @Override - public ReportTask markAsCompleted(long reportTaskId, Date completionDate) throws PortalException, SystemException { + public ReportTask markAsCompleted(long reportTaskId, Date completionDate) + throws PortalException, SystemException { + + ReportTask reportTask = + reportTaskLocalService.getReportTask(reportTaskId); - ReportTask reportTask = getReportTask(reportTaskId); reportTask.setModifiedDate(new Date()); reportTask.setCompleted(true); reportTask.setCompletionDate(completionDate); - return updateReportTask(reportTask); + + return reportTaskLocalService.updateReportTask(reportTask); } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/ReportTaskManagerServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/ReportTaskManagerServiceImpl.java index 4fb530c6..f0d88ea9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/ReportTaskManagerServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/impl/ReportTaskManagerServiceImpl.java @@ -143,8 +143,9 @@ public class ReportTaskManagerServiceImpl extends ReportTaskManagerServiceBaseIm serviceContext.setUserId(userId); serviceContext.setGroupPermissions(new String[] { ActionKeys.VIEW }); _log.info("addFileEntry userId=" + serviceContext.getUserId() + ", repositoryId=" - + folder.getRepositoryId() + ", folderId=" + folder.getFolderId() + ", sourceFileName=" - + sourceFileName + ", mimeType=" + mimeType + ", title=" + title); + + folder.getRepositoryId() + ", folderId=" + folder.getFolderId() + + ", sourceFileName=" + sourceFileName + ", mimeType=" + mimeType + ", title=" + + title); FileEntry fileEntry = dlAppLocalService.addFileEntry(serviceContext.getUserId(), folder.getRepositoryId(), folder.getFolderId(), sourceFileName, mimeType, title, StringPool.BLANK, StringPool.BLANK, bytes, serviceContext); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/ReportTaskPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/ReportTaskPersistenceImpl.java index fc05c5d9..264e8d9e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/ReportTaskPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/ReportTaskPersistenceImpl.java @@ -42,7 +42,6 @@ import it.tref.liferay.portos.report.NoSuchReportTaskException; import it.tref.liferay.portos.report.model.ReportTask; import it.tref.liferay.portos.report.model.impl.ReportTaskImpl; import it.tref.liferay.portos.report.model.impl.ReportTaskModelImpl; -import it.tref.liferay.portos.report.service.persistence.ReportTaskPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties index 7b73e20d..116ea687 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_rep - build.number=36 - build.date=1645093778756 + build.number=37 + build.date=1675935929684 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml index 89aa194f..f5152293 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml @@ -18,7 +18,7 @@ - + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml.MD5 index c8cd60e8..56f82136 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml.MD5 @@ -1 +1 @@ -3983ec64257638ed926baedf51077cc9 +c79836c5d79b7c9cfc4251cfa456028c diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.classpath index 24ab6033..df4ad34a 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.classpath @@ -1,8 +1,7 @@ - - + @@ -19,10 +18,5 @@ - - - - - diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.project b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.project index bcb5181d..b9730198 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.project @@ -32,17 +32,5 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature - org.apache.ivyde.eclipse.ivynature - - - 1647533317507 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/com.liferay.ide.project.core.prefs b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/com.liferay.ide.project.core.prefs deleted file mode 100644 index 8eee3c30..00000000 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/com.liferay.ide.project.core.prefs +++ /dev/null @@ -1,33 +0,0 @@ -eclipse.preferences.version=1 -liferay-display-xml-reference-not-found=2 -liferay-display-xml-resource-not-found=2 -liferay-display-xml-syntax-invalid=2 -liferay-display-xml-type-hierarchy-incorrect=2 -liferay-display-xml-type-not-found=2 -liferay-hook-xml-reference-not-found=2 -liferay-hook-xml-resource-not-found=2 -liferay-hook-xml-syntax-invalid=2 -liferay-hook-xml-type-hierarchy-incorrect=2 -liferay-hook-xml-type-not-found=2 -liferay-jsp-files-java-method-not-found=2 -liferay-jsp-files-resource-property-not-found=2 -liferay-layout-templates-xml-reference-not-found=2 -liferay-layout-templates-xml-resource-not-found=2 -liferay-layout-templates-xml-syntax-invalid=2 -liferay-layout-templates-xml-type-hierarchy-incorrect=2 -liferay-layout-templates-xml-type-not-found=2 -liferay-portlet-xml-reference-not-found=2 -liferay-portlet-xml-resource-not-found=2 -liferay-portlet-xml-syntax-invalid=2 -liferay-portlet-xml-type-hierarchy-incorrect=2 -liferay-portlet-xml-type-not-found=2 -portlet-xml-reference-not-found=2 -portlet-xml-resource-not-found=2 -portlet-xml-syntax-invalid=2 -portlet-xml-type-hierarchy-incorrect=2 -portlet-xml-type-not-found=2 -service-xml-reference-not-found=2 -service-xml-resource-not-found=2 -service-xml-syntax-invalid=2 -service-xml-type-hierarchy-incorrect=2 -service-xml-type-not-found=2 diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/com.liferay.ide.sdk.core.prefs b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/com.liferay.ide.sdk.core.prefs deleted file mode 100644 index 720d213b..00000000 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/com.liferay.ide.sdk.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -sdk-name=liferay-plugins-sdk-6.2 diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.ltk.core.refactoring.prefs b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.ltk.core.refactoring.prefs deleted file mode 100644 index b196c64a..00000000 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.ltk.core.refactoring.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.component index 26ffb99f..6a9e6419 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.component @@ -2,10 +2,6 @@ - - - uses - diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml index fe24cce9..62fdb9a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.ws.service.policy.prefs b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.ws.service.policy.prefs deleted file mode 100644 index 9cfcabe1..00000000 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.ws.service.policy.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.wst.ws.service.policy.projectEnabled=false diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/sicilia-sue-connector-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/sicilia-sue-connector-portlet-service.jar index a02cdd97..6b9e7227 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/sicilia-sue-connector-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/sicilia-sue-connector-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/service/persistence/ApiSettingPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/service/persistence/ApiSettingPersistenceImpl.java index 2d332caf..1b4201fd 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/service/persistence/ApiSettingPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/service/persistence/ApiSettingPersistenceImpl.java @@ -43,7 +43,6 @@ import it.mwg.sicilia.sue.NoSuchApiSettingException; import it.mwg.sicilia.sue.model.ApiSetting; import it.mwg.sicilia.sue.model.impl.ApiSettingImpl; import it.mwg.sicilia.sue.model.impl.ApiSettingModelImpl; -import it.mwg.sicilia.sue.service.persistence.ApiSettingPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/service/persistence/SportelloPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/service/persistence/SportelloPersistenceImpl.java index 5d8bbd46..744787f0 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/service/persistence/SportelloPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/service/persistence/SportelloPersistenceImpl.java @@ -44,7 +44,6 @@ import it.mwg.sicilia.sue.NoSuchSportelloException; import it.mwg.sicilia.sue.model.Sportello; import it.mwg.sicilia.sue.model.impl.SportelloImpl; import it.mwg.sicilia.sue.model.impl.SportelloModelImpl; -import it.mwg.sicilia.sue.service.persistence.SportelloPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/service.properties index 91474332..0fcaaa88 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=sicilia_sue - build.number=66 - build.date=1635416035127 + build.number=71 + build.date=1675934857198 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/tld/c.tld b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/tld/c.tld similarity index 100% rename from liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/tld/c.tld rename to liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/tld/c.tld diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/ivy.xml.MD5 index cabe985a..a35dfb5e 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/ivy.xml.MD5 @@ -1 +1 @@ -2ca84fda03feca53b6ee9dc91aeed605 +8b2b544951ac6b80b795a561c755d6a1 diff --git a/liferay-plugins-sdk-6.2/shared/portal-http-service/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/shared/portal-http-service/ivy.xml.MD5 new file mode 100644 index 00000000..8f6bd95f --- /dev/null +++ b/liferay-plugins-sdk-6.2/shared/portal-http-service/ivy.xml.MD5 @@ -0,0 +1 @@ +3f277a547f29d4308131add11b753eec diff --git a/liferay-plugins-sdk-6.2/shared/portos-audit-shared/.classpath b/liferay-plugins-sdk-6.2/shared/portos-audit-shared/.classpath index 9db89fb5..6e0e0766 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-audit-shared/.classpath +++ b/liferay-plugins-sdk-6.2/shared/portos-audit-shared/.classpath @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/shared/portos-audit-shared/.gitignore b/liferay-plugins-sdk-6.2/shared/portos-audit-shared/.gitignore new file mode 100644 index 00000000..840e7d31 --- /dev/null +++ b/liferay-plugins-sdk-6.2/shared/portos-audit-shared/.gitignore @@ -0,0 +1 @@ +/classes/ diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath index 154a9659..6e0e0766 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath @@ -2,10 +2,6 @@ - - - - - + diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.gitignore b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.gitignore index ae3c1726..2a6d1626 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.gitignore +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.gitignore @@ -1 +1,2 @@ /bin/ +/classes/ diff --git a/liferay-plugins-sdk-6.2/shared/portos-firma-shared/.classpath b/liferay-plugins-sdk-6.2/shared/portos-firma-shared/.classpath index 107701f9..6e0e0766 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-firma-shared/.classpath +++ b/liferay-plugins-sdk-6.2/shared/portos-firma-shared/.classpath @@ -1,7 +1,7 @@ - - + + diff --git a/liferay-plugins-sdk-6.2/shared/portos-kaleo-shared/.classpath b/liferay-plugins-sdk-6.2/shared/portos-kaleo-shared/.classpath index 38992c7f..6e0e0766 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-kaleo-shared/.classpath +++ b/liferay-plugins-sdk-6.2/shared/portos-kaleo-shared/.classpath @@ -2,6 +2,6 @@ - + diff --git a/liferay-plugins-sdk-6.2/shared/portos-kaleo-shared/.gitignore b/liferay-plugins-sdk-6.2/shared/portos-kaleo-shared/.gitignore new file mode 100644 index 00000000..840e7d31 --- /dev/null +++ b/liferay-plugins-sdk-6.2/shared/portos-kaleo-shared/.gitignore @@ -0,0 +1 @@ +/classes/ diff --git a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.classpath b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.classpath index 193b7fe1..6e0e0766 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.classpath +++ b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.classpath @@ -2,7 +2,6 @@ - - + diff --git a/liferay-plugins-sdk-6.2/shared/portos-report-shared/.classpath b/liferay-plugins-sdk-6.2/shared/portos-report-shared/.classpath index de872e86..dba4c53e 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-report-shared/.classpath +++ b/liferay-plugins-sdk-6.2/shared/portos-report-shared/.classpath @@ -5,7 +5,7 @@ - - + + diff --git a/liferay-plugins-sdk-6.2/shared/tref-mapit-shared/.classpath b/liferay-plugins-sdk-6.2/shared/tref-mapit-shared/.classpath index 2ac08420..deb041ed 100644 --- a/liferay-plugins-sdk-6.2/shared/tref-mapit-shared/.classpath +++ b/liferay-plugins-sdk-6.2/shared/tref-mapit-shared/.classpath @@ -1,18 +1,8 @@ - - - - - - - - - - - - - + + + diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.classpath b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.classpath index cfbd58dd..88e342cf 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.classpath +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.classpath @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.settings/org.eclipse.wst.common.project.facet.core.xml index db080717..9bbc4736 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/WEB-INF/lib/util-taglib.jar index fbba5f0a..6d182ade 100644 Binary files a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/WEB-INF/lib/util-taglib.jar and b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/WEB-INF/lib/util-taglib.jar differ diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-theme/.classpath b/liferay-plugins-sdk-6.2/themes/portos-private-theme/.classpath index cfbd58dd..88e342cf 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-theme/.classpath +++ b/liferay-plugins-sdk-6.2/themes/portos-private-theme/.classpath @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-theme/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/themes/portos-private-theme/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/themes/portos-private-theme/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-theme/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/themes/portos-private-theme/.settings/org.eclipse.wst.common.project.facet.core.xml index db080717..9bbc4736 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-theme/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/themes/portos-private-theme/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/WEB-INF/lib/util-taglib.jar index fbba5f0a..6d182ade 100644 Binary files a/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/WEB-INF/lib/util-taglib.jar and b/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/WEB-INF/lib/util-taglib.jar differ diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/.classpath b/liferay-plugins-sdk-6.2/themes/portos-public-theme/.classpath index cfbd58dd..88e342cf 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/.classpath +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/.classpath @@ -1,7 +1,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/themes/portos-public-theme/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f42de363 --- /dev/null +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/themes/portos-public-theme/.settings/org.eclipse.wst.common.project.facet.core.xml index db080717..9bbc4736 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/WEB-INF/lib/util-taglib.jar index fbba5f0a..6d182ade 100644 Binary files a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/WEB-INF/lib/util-taglib.jar and b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/WEB-INF/lib/util-taglib.jar differ diff --git a/liferay-plugins-sdk-6.2/webs/elasticray-web/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/webs/elasticray-web/ivy.xml.MD5 index 666324a8..ed7ff943 100644 --- a/liferay-plugins-sdk-6.2/webs/elasticray-web/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/webs/elasticray-web/ivy.xml.MD5 @@ -1 +1 @@ -349605b488d054b6791b928de85f1e0c +6b77cff24775c2e999f05b9b92ee4026 diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.classpath b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.classpath index 491f947b..08bf06f4 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.classpath +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.classpath @@ -2,7 +2,7 @@ - + diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.component index cfa57ce4..84d15b89 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.component @@ -9,6 +9,9 @@ uses + + uses + diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_instances/workflow_logs.jspf b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_instances/workflow_logs.jspf index 011c8696..a0f7d78b 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_instances/workflow_logs.jspf +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_instances/workflow_logs.jspf @@ -139,7 +139,6 @@ details. -
diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar index d0baea9d..b33acdec 100644 Binary files a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar and b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoActionPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoActionPersistenceImpl.java index b821dc6a..d7ba9d57 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoActionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoActionPersistenceImpl.java @@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchActionException; import com.liferay.portal.workflow.kaleo.model.KaleoAction; import com.liferay.portal.workflow.kaleo.model.impl.KaleoActionImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoActionModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoActionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoConditionPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoConditionPersistenceImpl.java index 67825a03..8a53a412 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoConditionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoConditionPersistenceImpl.java @@ -41,7 +41,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchConditionException; import com.liferay.portal.workflow.kaleo.model.KaleoCondition; import com.liferay.portal.workflow.kaleo.model.impl.KaleoConditionImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoConditionModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoConditionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoDefinitionPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoDefinitionPersistenceImpl.java index 7b518a17..ec133caa 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoDefinitionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoDefinitionPersistenceImpl.java @@ -43,7 +43,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchDefinitionException; import com.liferay.portal.workflow.kaleo.model.KaleoDefinition; import com.liferay.portal.workflow.kaleo.model.impl.KaleoDefinitionImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoDefinitionModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoDefinitionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstancePersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstancePersistenceImpl.java index 0ac20c87..7a81a480 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstancePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstancePersistenceImpl.java @@ -43,7 +43,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchInstanceException; import com.liferay.portal.workflow.kaleo.model.KaleoInstance; import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoInstancePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstanceTokenPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstanceTokenPersistenceImpl.java index b0115dda..6c526317 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstanceTokenPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstanceTokenPersistenceImpl.java @@ -43,7 +43,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchInstanceTokenException; import com.liferay.portal.workflow.kaleo.model.KaleoInstanceToken; import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceTokenImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceTokenModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoInstanceTokenPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoLogPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoLogPersistenceImpl.java index 9ade21a4..e9e4c818 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoLogPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoLogPersistenceImpl.java @@ -43,7 +43,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchLogException; import com.liferay.portal.workflow.kaleo.model.KaleoLog; import com.liferay.portal.workflow.kaleo.model.impl.KaleoLogImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoLogModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoLogPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNodePersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNodePersistenceImpl.java index 005b6749..dfad2b8c 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNodePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNodePersistenceImpl.java @@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchNodeException; import com.liferay.portal.workflow.kaleo.model.KaleoNode; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNodeImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNodeModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNodePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationPersistenceImpl.java index 02168960..0932f643 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationPersistenceImpl.java @@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchNotificationException; import com.liferay.portal.workflow.kaleo.model.KaleoNotification; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNotificationPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationRecipientPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationRecipientPersistenceImpl.java index 0cd7db55..d8c0fb51 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationRecipientPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationRecipientPersistenceImpl.java @@ -41,7 +41,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchNotificationRecipientException; import com.liferay.portal.workflow.kaleo.model.KaleoNotificationRecipient; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationRecipientImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationRecipientModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNotificationRecipientPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java index eb7c922f..fd427cf1 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java @@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTaskAssignmentInstanceException; import com.liferay.portal.workflow.kaleo.model.KaleoTaskAssignmentInstance; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentInstanceImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentInstanceModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskAssignmentInstancePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentPersistenceImpl.java index a2a99f9b..8e52911f 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentPersistenceImpl.java @@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTaskAssignmentException; import com.liferay.portal.workflow.kaleo.model.KaleoTaskAssignment; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskAssignmentPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskInstanceTokenPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskInstanceTokenPersistenceImpl.java index 8ab6fafe..032e8512 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskInstanceTokenPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskInstanceTokenPersistenceImpl.java @@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTaskInstanceTokenException; import com.liferay.portal.workflow.kaleo.model.KaleoTaskInstanceToken; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskInstanceTokenImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskInstanceTokenModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskInstanceTokenPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskPersistenceImpl.java index 2749e5fe..9a339c6a 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskPersistenceImpl.java @@ -41,7 +41,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTaskException; import com.liferay.portal.workflow.kaleo.model.KaleoTask; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerInstanceTokenPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerInstanceTokenPersistenceImpl.java index 725af5ed..1400f6a2 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerInstanceTokenPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerInstanceTokenPersistenceImpl.java @@ -41,7 +41,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTimerInstanceTokenException; import com.liferay.portal.workflow.kaleo.model.KaleoTimerInstanceToken; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerInstanceTokenImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerInstanceTokenModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTimerInstanceTokenPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerPersistenceImpl.java index 653aca47..a2e69d22 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerPersistenceImpl.java @@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTimerException; import com.liferay.portal.workflow.kaleo.model.KaleoTimer; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTimerPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTransitionPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTransitionPersistenceImpl.java index 79172e1a..5c157fbc 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTransitionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTransitionPersistenceImpl.java @@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTransitionException; import com.liferay.portal.workflow.kaleo.model.KaleoTransition; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTransitionImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTransitionModelImpl; -import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTransitionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language.properties index dbbd2bff..39af8759 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language.properties +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language.properties @@ -10,5 +10,6 @@ error-portos-kaleo-required = {0} is required ## HOOK +x-assigned-the-task-to-x = Task assigned to {1} x-completed-the-task-x-y={0} completed the task {1} ({2}). x-sent-signal-x=System sent a signal {1}. \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language_it.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language_it.properties index 83228c65..1f5d2523 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language_it.properties +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language_it.properties @@ -10,5 +10,6 @@ error-portos-kaleo-required = {0} campo obbligatorio ## HOOK +x-assigned-the-task-to-x = L'attività è stata assegnata a {1} x-completed-the-task-x-y={0} ha completato l'attività {1} ({2}). x-sent-signal-x=Il sistema ha inviato un segnale {1}. diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties index c72b1baf..d792bf79 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=Kaleo - build.number=71 - build.date=1643195903376 + build.number=73 + build.date=1675849381256 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/webs/resources-importer-web/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/webs/resources-importer-web/docroot/WEB-INF/lib/util-taglib.jar index fbba5f0a..6d182ade 100644 Binary files a/liferay-plugins-sdk-6.2/webs/resources-importer-web/docroot/WEB-INF/lib/util-taglib.jar and b/liferay-plugins-sdk-6.2/webs/resources-importer-web/docroot/WEB-INF/lib/util-taglib.jar differ