diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java index 1fd24592..7ec2bd85 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java @@ -116,7 +116,7 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase folder = dlAppLocalService.addFolder(serviceContext.getUserId(), defaultFolder.getRepositoryId(), defaultFolder.getFolderId(), folderName, StringPool.BLANK, serviceContext); } - String title = now.getTime() + "_parere_geologo_" + parereGeologoId + StringPool.UNDERLINE + fileName; + String title = now.getTime() + "_parere_" + parereGeologoId + StringPool.UNDERLINE + fileName; String description = StringPool.BLANK; String mimeType = MimeTypesUtil.getContentType(fileName); String changeLog = StringPool.BLANK; 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 908cf9fe..44a59678 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 @@ -31,7 +31,7 @@ org.eclipse.wst.common.modulecore.ModuleCoreNature org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature - org.apache.ivyde.eclipse.ivynature org.eclipse.wst.jsdt.core.jsNature + org.apache.ivyde.eclipse.ivynature 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 new file mode 100644 index 00000000..8eee3c30 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/com.liferay.ide.project.core.prefs @@ -0,0 +1,33 @@ +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 new file mode 100644 index 00000000..720d213b --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/com.liferay.ide.sdk.core.prefs @@ -0,0 +1,2 @@ +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.ltk.core.refactoring.prefs b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.ltk.core.refactoring.prefs new file mode 100644 index 00000000..b196c64a --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.ltk.core.refactoring.prefs @@ -0,0 +1,2 @@ +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.ws.service.policy.prefs b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.ws.service.policy.prefs new file mode 100644 index 00000000..9cfcabe1 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.ws.service.policy.prefs @@ -0,0 +1,2 @@ +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/build.xml b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/build.xml index d3e59d66..8ef8e198 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/build.xml +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/build.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/.gitignore deleted file mode 100644 index 840e7d31..00000000 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/classes/ 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 3d4b9e6a..b48d4900 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/lib/util-java.jar b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/util-java.jar new file mode 100644 index 00000000..6b5d95f8 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/lib/util-java.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/liferay-display.xml b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/liferay-display.xml index 8a467561..79d2513c 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/liferay-display.xml +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/liferay-display.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/liferay-hook.xml b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/liferay-hook.xml deleted file mode 100644 index 421429b9..00000000 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/liferay-hook.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - portal.properties - diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/liferay-plugin-package.properties b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/liferay-plugin-package.properties index 862b5413..066b9eef 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/liferay-plugin-package.properties +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/liferay-plugin-package.properties @@ -9,6 +9,4 @@ page-url=http://www.liferay.com author=Liferay, Inc. licenses=LGPL liferay-versions=6.2.0+ -#portal-dependency-jars= -#portal-dependency-tlds=c.tld required-deployment-contexts=portos-bo-portlet \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/liferay-portlet.xml b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/liferay-portlet.xml index e6cad072..93887f16 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/liferay-portlet.xml +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/liferay-portlet.xml @@ -7,7 +7,7 @@ /icon.png /css/main.css /js/main.js - sicilia-sue-connector-portlet + sicilia-sue-connector administrator diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/service.xml index 3563b233..9f7dbf0f 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/service.xml @@ -3,7 +3,6 @@ Manifattura Web Group Srl sicilia_sue - diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/sql/tables.sql b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/sql/tables.sql index 307c2a1d..bb349f0f 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/sql/tables.sql +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/sql/tables.sql @@ -1,13 +1,3 @@ -create table sicilia_sue_SUE ( - sueId LONG not null primary key, - groupId LONG, - companyId LONG, - userId LONG, - userName VARCHAR(75) null, - createDate DATE null, - modifiedDate DATE null -); - create table sicilia_sue_Sportello ( sportelloId LONG not null primary key, groupId LONG, diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/common/Action.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/common/Action.java new file mode 100644 index 00000000..1336daa7 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/common/Action.java @@ -0,0 +1,40 @@ +package it.mwg.sicilia.sue.api.common; + + +public class Action { + + private String name; + private String description; + private String method; + + public Action(String name, String description, String method) { + + this.name = name; + this.description = description; + this.method = method; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getMethod() { + return method; + } + + public void setMethod(String method) { + this.method = method; + } +} diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/common/ApiResponse.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/common/ApiResponse.java new file mode 100644 index 00000000..03892ab5 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/common/ApiResponse.java @@ -0,0 +1,39 @@ +package it.mwg.sicilia.sue.api.common; + +import com.liferay.portal.kernel.json.JSONFactoryUtil; +import com.liferay.portal.kernel.json.JSONSerializer; + +public class ApiResponse { + + private int code; + private String message; + + private static final JSONSerializer serializer = JSONFactoryUtil.createJSONSerializer().exclude("class"); + + public ApiResponse(int code, String message) { + + this.setCode(code); + this.setMessage(message); + } + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + @Override + public String toString() { + return serializer.serialize(this); + } +} diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/Actions.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/Actions.java new file mode 100644 index 00000000..fcbfb4fc --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/Actions.java @@ -0,0 +1,22 @@ +package it.mwg.sicilia.sue.api.v1; + +import it.mwg.sicilia.sue.api.common.Action; + +import java.util.ArrayList; +import java.util.List; + +import com.liferay.portal.kernel.servlet.HttpMethods; + +public class Actions { + + @SuppressWarnings("serial") + private static final List ACTIONS = new ArrayList() { + { + add(new Action("login", "Login", HttpMethods.POST)); + } + }; + + public static List getActions() { + return ACTIONS; + } +} diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/ApiServlet.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/ApiServlet.java index 8bbab84a..ea256770 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/ApiServlet.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/api/v1/ApiServlet.java @@ -1,8 +1,7 @@ -/** - * - */ package it.mwg.sicilia.sue.api.v1; +import it.mwg.sicilia.sue.api.common.ApiResponse; + import java.io.IOException; import javax.servlet.ServletException; @@ -20,11 +19,25 @@ public class ApiServlet extends HttpServlet { @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - ServletResponseUtil.write(response, "API V1 " + this.getServletContext().getContextPath()); + + String path = request.getPathInfo().substring(1); + switch (path) { + case "login": + ServletResponseUtil.write(response, new ApiResponse(0, "Ok").toString()); + break; + default: + response.sendError(HttpServletResponse.SC_NOT_FOUND, request.getRequestURI()); + } } @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + String path = request.getPathInfo().substring(1); + switch (path) { + default: + response.sendError(HttpServletResponse.SC_NOT_FOUND, request.getRequestURI()); + } } } diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/model/impl/SportelloImpl.java b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/model/impl/SportelloImpl.java index 78edc306..395857db 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/model/impl/SportelloImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/it/mwg/sicilia/sue/model/impl/SportelloImpl.java @@ -23,6 +23,7 @@ package it.mwg.sicilia.sue.model.impl; * * @author Manifattura Web Group Srl */ +@SuppressWarnings("serial") public class SportelloImpl extends SportelloBaseImpl { /* * NOTE FOR DEVELOPERS: diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/portal.properties b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/portal.properties deleted file mode 100644 index 1c6a1a9e..00000000 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/portal.properties +++ /dev/null @@ -1 +0,0 @@ -a=b \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/service-ext.properties b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/service-ext.properties deleted file mode 100644 index 7c1dea1a..00000000 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/src/service-ext.properties +++ /dev/null @@ -1 +0,0 @@ -build.auto.upgrade=false \ No newline at end of file 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 344f6118..a546194e 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=3 - build.date=1620398647281 + build.number=4 + build.date=1621344885196 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/web.xml b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/web.xml index 1d930bcb..1728ee0b 100644 --- a/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/web.xml +++ b/liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/docroot/WEB-INF/web.xml @@ -2,13 +2,12 @@ - - ApiServlet + ApiServletV1 it.mwg.sicilia.sue.api.v1.ApiServlet - ApiServlet + ApiServletV1 /api/v1/* \ No newline at end of file