From 53df376b96831d74b33699a7253de42c1897b139 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 1 Jun 2021 18:36:18 +0200 Subject: [PATCH] configurating the gwt service impl --- .classpath | 13 +- .../com.gwtplugins.gwt.eclipse.core.prefs | 2 + .settings/org.eclipse.wst.common.component | 44 ++- ....eclipse.wst.common.project.facet.core.xml | 1 + pom.xml | 63 +++- .../CkanContentModeratorWidget.gwt.xml | 3 +- .../client/CkanContentModeratorService.java | 5 +- .../CkanContentModeratorServiceAsync.java | 5 +- .../client/CkanContentModeratorWidget.java | 58 ++-- .../client/material/table/CustomizedView.java | 67 ++-- .../client/material/table/DataGenerator.java | 27 -- .../CkanContentModeratorServiceAImpl.java | 43 ++- .../server/ContentModeratorSystem.java | 6 +- .../ckancontentmoderator/server/WsUtil.java | 75 +++++ .../shared/CkanDataset.java | 299 ++++++++++++++++++ .../shared/FieldVerifier.java | 42 --- .../ckancontentmoderator/shared/User.java | 52 --- .../CkanContentModeratorWidget.gwt.xml | 3 +- src/main/webapp/WEB-INF/web.xml | 35 +- src/main/webapp/js/jquery.autosize.js | 187 ----------- src/main/webapp/js/jquery.min.js | 6 - 21 files changed, 598 insertions(+), 438 deletions(-) create mode 100644 .settings/com.gwtplugins.gwt.eclipse.core.prefs delete mode 100644 src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/material/table/DataGenerator.java create mode 100644 src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/server/WsUtil.java create mode 100644 src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/shared/CkanDataset.java delete mode 100644 src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/shared/FieldVerifier.java delete mode 100644 src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/shared/User.java delete mode 100644 src/main/webapp/js/jquery.autosize.js delete mode 100644 src/main/webapp/js/jquery.min.js diff --git a/.classpath b/.classpath index 2ca9373..982611e 100644 --- a/.classpath +++ b/.classpath @@ -18,10 +18,15 @@ + + + + + + - @@ -30,11 +35,5 @@ - - - - - - diff --git a/.settings/com.gwtplugins.gwt.eclipse.core.prefs b/.settings/com.gwtplugins.gwt.eclipse.core.prefs new file mode 100644 index 0000000..f23a752 --- /dev/null +++ b/.settings/com.gwtplugins.gwt.eclipse.core.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +entryPointModules= diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index ae8c322..85bfe32 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,21 +1,31 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index e32ffb2..8867594 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -5,4 +5,5 @@ + diff --git a/pom.xml b/pom.xml index 880322d..860b492 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,6 @@ 2.9.0 - distro UTF-8 UTF-8 @@ -132,12 +131,56 @@ ${gwt-material.version} - - - - - - + + + org.gcube.resources.discovery + ic-client + provided + + + org.gcube.core + common-scope-maps + compile + + + + org.gcube.portal + custom-portal-handler + provided + + + + javax.portlet + portlet-api + provided + + + + org.gcube.datacatalogue + catalogue-util-library + [1.0.0-SNAPSHOT, 2.0.0) + compile + + + + + org.gcube.common.portal + portal-manager + provided + + + + com.liferay.portal + portal-service + provided + + + + + org.gcube.dvos + usermanagement-core + provided + org.slf4j @@ -183,7 +226,6 @@ ${webappDirectory} - org.apache.maven.plugins @@ -203,11 +245,16 @@ org.apache.maven.plugins maven-compiler-plugin + + ${maven.compiler.source} + ${maven.compiler.target} + org.apache.maven.plugins maven-assembly-plugin + 2.2 descriptor.xml diff --git a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/CkanContentModeratorWidget.gwt.xml b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/CkanContentModeratorWidget.gwt.xml index 8de8555..18c6f09 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/CkanContentModeratorWidget.gwt.xml +++ b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/CkanContentModeratorWidget.gwt.xml @@ -5,7 +5,8 @@ - + diff --git a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorService.java b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorService.java index fea7138..f0cb05c 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorService.java +++ b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorService.java @@ -1,5 +1,8 @@ package org.gcube.portlets.widgets.ckancontentmoderator.client; +import java.util.List; + +import org.gcube.portlets.widgets.ckancontentmoderator.shared.CkanDataset; import org.gcube.portlets.widgets.ckancontentmoderator.shared.ItemStatus; import com.google.gwt.user.client.rpc.RemoteService; @@ -15,7 +18,7 @@ public interface CkanContentModeratorService extends RemoteService { public void setStatus(String itemId, ItemStatus theStatus); - //public List getListItemsForStatus(ItemStatus theStatus); + public List getListItemsForStatus(ItemStatus theStatus); public void approveItem(String itemId); diff --git a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorServiceAsync.java b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorServiceAsync.java index b4a40bc..21857a2 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorServiceAsync.java +++ b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorServiceAsync.java @@ -1,5 +1,8 @@ package org.gcube.portlets.widgets.ckancontentmoderator.client; +import java.util.List; + +import org.gcube.portlets.widgets.ckancontentmoderator.shared.CkanDataset; import org.gcube.portlets.widgets.ckancontentmoderator.shared.ItemStatus; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -10,7 +13,7 @@ public interface CkanContentModeratorServiceAsync { void approveItem(String itemId, AsyncCallback callback); - //void getListItemsForStatus(ItemStatus theStatus, AsyncCallback> callback); + void getListItemsForStatus(ItemStatus theStatus, AsyncCallback> callback); void permanentlyDelete(String itemId, AsyncCallback callback); diff --git a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorWidget.java b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorWidget.java index d60338c..ae97fc8 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorWidget.java +++ b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorWidget.java @@ -1,21 +1,18 @@ package org.gcube.portlets.widgets.ckancontentmoderator.client; -import java.util.ArrayList; import java.util.List; import org.gcube.portlets.widgets.ckancontentmoderator.client.material.table.CustomizedView; -import org.gcube.portlets.widgets.ckancontentmoderator.client.material.table.DataGenerator; import org.gcube.portlets.widgets.ckancontentmoderator.client.resources.DataTableClientBundle; +import org.gcube.portlets.widgets.ckancontentmoderator.shared.CkanDataset; +import org.gcube.portlets.widgets.ckancontentmoderator.shared.ItemStatus; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.StyleInjector; -import com.google.gwt.user.client.ui.HTML; +import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.RootPanel; -import gwt.material.design.client.ui.table.MaterialDataTable; - - /** * Entry point classes define onModuleLoad(). */ @@ -37,34 +34,47 @@ public class CkanContentModeratorWidget implements EntryPoint { */ public void onModuleLoad() { StyleInjector.inject(DataTableClientBundle.INSTANCE.dataTable().getText()); - + // MaterialDataTable table = new MaterialDataTable(); // table.getTableTitle().setText("Customers"); // List users = new ArrayList(); // users.add("Pippo"); // table.setRowData(0, users); - CustomizedView cvTable = new CustomizedView(); - cvTable.setData(DataGenerator.generateUsers(10)); - + final CustomizedView cvTable = new CustomizedView(); RootPanel.get().add(cvTable); // table.getView().refresh(); + greetingService.getListItemsForStatus(ItemStatus.PENDING, new AsyncCallback>() { -// greetingService.getListItemsForStatus(ItemStatus.PENDING, new AsyncCallback>() { -// -// @Override -// public void onSuccess(List result) { -// // TODO Auto-generated method stub -// -// } -// -// @Override -// public void onFailure(Throwable caught) { -// // TODO Auto-generated method stub -// -// } -// }); + @Override + public void onSuccess(List result) { + cvTable.setData(result); + + } + + @Override + public void onFailure(Throwable caught) { + // TODO Auto-generated method stub + + } + }); + + + greetingService.approveItem("ciao", new AsyncCallback() { + + @Override + public void onFailure(Throwable caught) { + // TODO Auto-generated method stub + + } + + @Override + public void onSuccess(Void result) { + GWT.log("OK"); + + } + }); } } diff --git a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/material/table/CustomizedView.java b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/material/table/CustomizedView.java index d4d2eaa..f3fd49c 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/material/table/CustomizedView.java +++ b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/material/table/CustomizedView.java @@ -2,27 +2,18 @@ package org.gcube.portlets.widgets.ckancontentmoderator.client.material.table; import java.util.List; -import org.gcube.portlets.widgets.ckancontentmoderator.shared.User; +import org.gcube.portlets.widgets.ckancontentmoderator.shared.CkanDataset; import com.google.gwt.core.client.GWT; -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; -import gwt.material.design.client.base.Waves; -import gwt.material.design.client.constants.IconType; import gwt.material.design.client.data.events.ColumnSortHandler; import gwt.material.design.client.data.events.RowSelectEvent; import gwt.material.design.client.data.events.RowSelectHandler; -import gwt.material.design.client.ui.MaterialIcon; -import gwt.material.design.client.ui.MaterialImage; -import gwt.material.design.client.ui.MaterialListBox; -import gwt.material.design.client.ui.MaterialPanel; import gwt.material.design.client.ui.table.MaterialDataTable; -import gwt.material.design.client.ui.table.cell.WidgetColumn; public class CustomizedView extends Composite { @@ -30,10 +21,10 @@ public class CustomizedView extends Composite { } private static CustomizedViewUiBinder uiBinder = GWT.create(CustomizedViewUiBinder.class); - private List users; + private List users; @UiField - MaterialDataTable table; + MaterialDataTable table; public CustomizedView() { @@ -43,21 +34,21 @@ public class CustomizedView extends Composite { public void setupTable() { - MaterialIcon icon = new MaterialIcon(); - icon.setPadding(4); - icon.setIconType(IconType.ADD_CIRCLE_OUTLINE); - - icon.addClickHandler(new ClickHandler() { - - @Override - public void onClick(ClickEvent event) { - users.add(0, new DataGenerator().generateUsers(1).get(0)); - setData(users); - - } - }); - table.setWaves(null); - table.setUseStickyHeader(false); +// MaterialIcon icon = new MaterialIcon(); +// icon.setPadding(4); +// icon.setIconType(IconType.ADD_CIRCLE_OUTLINE); +// +// icon.addClickHandler(new ClickHandler() { +// +// @Override +// public void onClick(ClickEvent event) { +// users.add(0, new DataGenerator().generateUsers(1).get(0)); +// setData(users); +// +// } +// }); +// table.setWaves(null); +// table.setUseStickyHeader(false); //table.getScaffolding().getToolPanel().add(icon); // MaterialIcon delete = new MaterialIcon(); @@ -90,10 +81,10 @@ public class CustomizedView extends Composite { // } // }); - table.addColumn("First Name", new gwt.material.design.client.ui.table.cell.TextColumn() { + table.addColumn("Title", new gwt.material.design.client.ui.table.cell.TextColumn() { @Override - public String getValue(User object) { - return object.getName(); + public String getValue(CkanDataset object) { + return object.getTitle(); } @Override @@ -113,10 +104,10 @@ public class CustomizedView extends Composite { // } // }).width(200); - table.addColumn("City", new gwt.material.design.client.ui.table.cell.TextColumn() { + table.addColumn("Author", new gwt.material.design.client.ui.table.cell.TextColumn() { @Override - public String getValue(User object) { - return object.getCity(); + public String getValue(CkanDataset object) { + return object.getAuthor(); } @Override public boolean sortable() { @@ -124,19 +115,19 @@ public class CustomizedView extends Composite { } }); - table.addRowSelectHandler(new RowSelectHandler() { + table.addRowSelectHandler(new RowSelectHandler() { @Override - public void onRowSelect(RowSelectEvent event) { + public void onRowSelect(RowSelectEvent event) { log("RowSelectEvent", event.getModel().getName() + ": " + event.isSelected()); } }); - table.addColumnSortHandler(new ColumnSortHandler() { + table.addColumnSortHandler(new ColumnSortHandler() { @Override - public void onColumnSort(gwt.material.design.client.data.events.ColumnSortEvent event) { + public void onColumnSort(gwt.material.design.client.data.events.ColumnSortEvent event) { log("ColumnSortEvent", "Sorted: " + event.getSortContext().getSortDir() + ", columnIndex: " + event.getColumnIndex()); table.getView().refresh(); @@ -192,7 +183,7 @@ public class CustomizedView extends Composite { } - public void setData(List users) { + public void setData(List users) { this.users = users; // Customized Table Scaffolding elements table.getTableTitle().setText("Customers"); diff --git a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/material/table/DataGenerator.java b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/material/table/DataGenerator.java deleted file mode 100644 index 165f7a7..0000000 --- a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/material/table/DataGenerator.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.gcube.portlets.widgets.ckancontentmoderator.client.material.table; - -import java.util.ArrayList; -import java.util.List; - -import org.gcube.portlets.widgets.ckancontentmoderator.shared.User; - -public class DataGenerator { - -// static { -// MaterialDesign.injectJs(AppResources.INSTANCE.fakerJs()); -// } - - public static List generateUsers(int total) { - return generateUsers(total, null); - } - - public static List generateUsers(int total, String category) { - List users = new ArrayList<>(); - for (int i = 0; i < total; i++) { - User user = new User("name "+i, "city "+i); - users.add(user); - } - return users; - } - -} diff --git a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/server/CkanContentModeratorServiceAImpl.java b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/server/CkanContentModeratorServiceAImpl.java index 6acf26f..e3685a5 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/server/CkanContentModeratorServiceAImpl.java +++ b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/server/CkanContentModeratorServiceAImpl.java @@ -1,7 +1,16 @@ package org.gcube.portlets.widgets.ckancontentmoderator.server; +import java.util.List; + +import org.gcube.common.authorization.library.provider.SecurityTokenProvider; +import org.gcube.common.scope.api.ScopeProvider; +import org.gcube.gcat.client.Item; import org.gcube.portlets.widgets.ckancontentmoderator.client.CkanContentModeratorService; +import org.gcube.portlets.widgets.ckancontentmoderator.shared.CkanDataset; import org.gcube.portlets.widgets.ckancontentmoderator.shared.ItemStatus; +import org.gcube.vomanagement.usermanagement.model.GCubeUser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -11,6 +20,8 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet; @SuppressWarnings("serial") public class CkanContentModeratorServiceAImpl extends RemoteServiceServlet implements CkanContentModeratorService, ContentModeratorSystem { + + private static Logger LOG = LoggerFactory.getLogger(CkanContentModeratorServiceAImpl.class); @Override public boolean isContentModeratorEnabled() { @@ -24,15 +35,35 @@ public class CkanContentModeratorServiceAImpl extends RemoteServiceServlet imple } -// @Override -// public List getListItemsForStatus(ItemStatus theStatus) { -// // TODO Auto-generated method stub -// return null; -// } + @Override + public List getListItemsForStatus(ItemStatus theStatus) { + LOG.info("Called getListItemsForStatus: "+theStatus); + + try { + //DataCatalogueImpl catalogue = DataCatalogueFactory.getFactory().getUtilsPerScope(scope); + String scope = WsUtil.getCurrentScope(getThreadLocalRequest()); + GCubeUser user = WsUtil.getCurrentUser(getThreadLocalRequest()); + + String token = WsUtil.getCurrentToken(scope, user.getUsername()); + LOG.info("Setting scope: "+scope); + ScopeProvider.instance.set(scope); + LOG.info("Setting token: "+token); + SecurityTokenProvider.instance.set(token); + String datasetId = new Item().list(10, 0); + System.out.println("the datasetId: " +datasetId); + + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + LOG.error(e.getMessage(),e); + } + + return null; + } @Override public void approveItem(String itemId) { - // TODO Auto-generated method stub + LOG.info("Called approve Item: "+itemId); } diff --git a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/server/ContentModeratorSystem.java b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/server/ContentModeratorSystem.java index 798e785..47de32c 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/server/ContentModeratorSystem.java +++ b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/server/ContentModeratorSystem.java @@ -1,8 +1,10 @@ package org.gcube.portlets.widgets.ckancontentmoderator.server; +import java.util.List; + +import org.gcube.portlets.widgets.ckancontentmoderator.shared.CkanDataset; import org.gcube.portlets.widgets.ckancontentmoderator.shared.ItemStatus; -// TODO: Auto-generated Javadoc /** * The Interface ContentModeratorSystem. * @@ -34,7 +36,7 @@ public interface ContentModeratorSystem { * @param theStatus the the status * @return the list items for status */ - //List getListItemsForStatus(ItemStatus theStatus); + List getListItemsForStatus(ItemStatus theStatus); /** * Approve item. diff --git a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/server/WsUtil.java b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/server/WsUtil.java new file mode 100644 index 0000000..0381160 --- /dev/null +++ b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/server/WsUtil.java @@ -0,0 +1,75 @@ +/** + * + */ +package org.gcube.portlets.widgets.ckancontentmoderator.server; + +import javax.servlet.http.HttpServletRequest; + +import org.gcube.common.portal.PortalContext; +import org.gcube.vomanagement.usermanagement.model.GCubeUser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.liferay.portal.service.UserLocalServiceUtil; + + +// TODO: Auto-generated Javadoc +/** + * The Class WsUtil. + * + * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it + * + * Jun 1, 2021 + */ +public class WsUtil { + + protected static Logger logger = LoggerFactory.getLogger(WsUtil.class); + + /** + * Checks if is within portal. + * + * @return true if you're running into the portal, false if in development + */ + public static boolean isWithinPortal() { + try { + UserLocalServiceUtil.getService(); + return true; + } catch (Exception ex) { + logger.trace("Development Mode ON"); + return false; + } + } + + /** + * Gets the current user. + * + * @param httpServletRequest the http servlet request + * @return the current user + */ + public static GCubeUser getCurrentUser(HttpServletRequest httpServletRequest){ + return PortalContext.getConfiguration().getCurrentUser(httpServletRequest); + } + + /** + * Gets the current scope. + * + * @param httpServletRequest the http servlet request + * @return the current scope + */ + public static String getCurrentScope(HttpServletRequest httpServletRequest){ + return PortalContext.getConfiguration().getCurrentScope(httpServletRequest); + } + + + /** + * Gets the current token. + * + * @param scope the scope + * @param username the username + * @return the current token + */ + public static String getCurrentToken(String scope, String username){ + return PortalContext.getConfiguration().getCurrentUserToken(scope,username); + } + +} diff --git a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/shared/CkanDataset.java b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/shared/CkanDataset.java new file mode 100644 index 0000000..198b733 --- /dev/null +++ b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/shared/CkanDataset.java @@ -0,0 +1,299 @@ +package org.gcube.portlets.widgets.ckancontentmoderator.shared; + +import java.io.Serializable; + +import com.google.gwt.user.client.rpc.IsSerializable; + +/** + * The Class CkanDataset. + * + * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it + * + * Jun 1, 2021 + */ +public class CkanDataset implements Serializable, IsSerializable{ + + /** + * + */ + private static final long serialVersionUID = 566645830900736239L; + private String author; + private String authorEmail; + private String id; + private String licenseId; + private String maintainer; + private String maintainerEmail; + private String name; + private String notes; + private String ownerOrg; + //private ItemStatus state; + private String title; + private String type; + private String url; + private String version; + private String ckanDatasetURL; + + + /** + * Instantiates a new ckan dataset base. + */ + public CkanDataset() { + } + + /** + * Gets the author. + * + * @return the author + */ + public String getAuthor() { + return author; + } + + /** + * Gets the author email. + * + * @return the author email + */ + public String getAuthorEmail() { + return authorEmail; + } + + /** + * Gets the id. + * + * @return the id + */ + public String getId() { + return id; + } + + /** + * Gets the license id. + * + * @return the license id + */ + public String getLicenseId() { + return licenseId; + } + + /** + * Gets the maintainer. + * + * @return the maintainer + */ + public String getMaintainer() { + return maintainer; + } + + /** + * Gets the maintainer email. + * + * @return the maintainer email + */ + public String getMaintainerEmail() { + return maintainerEmail; + } + + /** + * Gets the name. + * + * @return the name + */ + public String getName() { + return name; + } + + /** + * Gets the notes. + * + * @return the notes + */ + public String getNotes() { + return notes; + } + + /** + * Gets the owner org. + * + * @return the owner org + */ + public String getOwnerOrg() { + return ownerOrg; + } + + + /** + * Gets the title. + * + * @return the title + */ + public String getTitle() { + return title; + } + + /** + * Gets the type. + * + * @return the type + */ + public String getType() { + return type; + } + + /** + * Gets the url. + * + * @return the url + */ + public String getUrl() { + return url; + } + + /** + * Gets the version. + * + * @return the version + */ + public String getVersion() { + return version; + } + + /** + * Gets the ckan dataset URL. + * + * @return the ckan dataset URL + */ + public String getCkanDatasetURL() { + return ckanDatasetURL; + } + + /** + * Sets the author. + * + * @param author the new author + */ + public void setAuthor(String author) { + this.author = author; + } + + /** + * Sets the author email. + * + * @param authorEmail the new author email + */ + public void setAuthorEmail(String authorEmail) { + this.authorEmail = authorEmail; + } + + /** + * Sets the id. + * + * @param id the new id + */ + public void setId(String id) { + this.id = id; + } + + /** + * Sets the license id. + * + * @param licenseId the new license id + */ + public void setLicenseId(String licenseId) { + this.licenseId = licenseId; + } + + /** + * Sets the maintainer. + * + * @param maintainer the new maintainer + */ + public void setMaintainer(String maintainer) { + this.maintainer = maintainer; + } + + /** + * Sets the maintainer email. + * + * @param maintainerEmail the new maintainer email + */ + public void setMaintainerEmail(String maintainerEmail) { + this.maintainerEmail = maintainerEmail; + } + + /** + * Sets the name. + * + * @param name the new name + */ + public void setName(String name) { + this.name = name; + } + + /** + * Sets the notes. + * + * @param notes the new notes + */ + public void setNotes(String notes) { + this.notes = notes; + } + + /** + * Sets the owner org. + * + * @param ownerOrg the new owner org + */ + public void setOwnerOrg(String ownerOrg) { + this.ownerOrg = ownerOrg; + } + + + + /** + * Sets the title. + * + * @param title the new title + */ + public void setTitle(String title) { + this.title = title; + } + + /** + * Sets the type. + * + * @param type the new type + */ + public void setType(String type) { + this.type = type; + } + + /** + * Sets the url. + * + * @param url the new url + */ + public void setUrl(String url) { + this.url = url; + } + + /** + * Sets the version. + * + * @param version the new version + */ + public void setVersion(String version) { + this.version = version; + } + + /** + * Sets the ckan dataset URL. + * + * @param ckanDatasetURL the new ckan dataset URL + */ + public void setCkanDatasetURL(String ckanDatasetURL) { + this.ckanDatasetURL = ckanDatasetURL; + } + + +} \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/shared/FieldVerifier.java b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/shared/FieldVerifier.java deleted file mode 100644 index 5143953..0000000 --- a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/shared/FieldVerifier.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.gcube.portlets.widgets.ckancontentmoderator.shared; - -/** - *

- * FieldVerifier validates that the name the user enters is valid. - *

- *

- * This class is in the shared packing because we use it in both - * the client code and on the server. On the client, we verify that the name is - * valid before sending an RPC request so the user doesn't have to wait for a - * network round trip to get feedback. On the server, we verify that the name is - * correct to ensure that the input is correct regardless of where the RPC - * originates. - *

- *

- * When creating a class that is used on both the client and the server, be sure - * that all code is translatable and does not use native JavaScript. Code that - * is note translatable (such as code that interacts with a database or the file - * system) cannot be compiled into client side JavaScript. Code that uses native - * JavaScript (such as Widgets) cannot be run on the server. - *

- */ -public class FieldVerifier { - - /** - * Verifies that the specified name is valid for our service. - * - * In this example, we only require that the name is at least four - * characters. In your application, you can use more complex checks to ensure - * that usernames, passwords, email addresses, URLs, and other fields have the - * proper syntax. - * - * @param name the name to validate - * @return true if valid, false if invalid - */ - public static boolean isValidName(String name) { - if (name == null) { - return false; - } - return name.length() > 3; - } -} diff --git a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/shared/User.java b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/shared/User.java deleted file mode 100644 index 82307d2..0000000 --- a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/shared/User.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.gcube.portlets.widgets.ckancontentmoderator.shared; - -import java.io.Serializable; - -// TODO: Auto-generated Javadoc -/** - * The Class User. - * - * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) - * - * May 26, 2021 - */ -public class User implements Serializable { - - String name; - - String city; - /** - * - */ - private static final long serialVersionUID = 1L; - - /** - * Instantiates a new user. - */ - public User() { - - } - - public User(String name, String city) { - super(); - this.name = name; - this.city = city; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - -} diff --git a/src/main/resources/org/gcube/portlets/widgets/ckancontentmoderator/CkanContentModeratorWidget.gwt.xml b/src/main/resources/org/gcube/portlets/widgets/ckancontentmoderator/CkanContentModeratorWidget.gwt.xml index 8de8555..18c6f09 100644 --- a/src/main/resources/org/gcube/portlets/widgets/ckancontentmoderator/CkanContentModeratorWidget.gwt.xml +++ b/src/main/resources/org/gcube/portlets/widgets/ckancontentmoderator/CkanContentModeratorWidget.gwt.xml @@ -5,7 +5,8 @@ - + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index d786614..f025bef 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,24 +1,23 @@ - + - + + greetServlet + org.gcube.portlets.widgets.ckancontentmoderator.server.CkanContentModeratorServiceAImpl + - - - greetServlet - org.gcube.portlets.widgets.ckancontentmoderator.server.CkanContentModeratorServiceAImpl - + + greetServlet + /CkanContentModeratorWidget/greet + - - greetServlet - /CkanContentModeratorWidget/greet - - - - - CkanContentModeratorWidget.html - + + + CkanContentModeratorWidget.html + diff --git a/src/main/webapp/js/jquery.autosize.js b/src/main/webapp/js/jquery.autosize.js deleted file mode 100644 index 370279e..0000000 --- a/src/main/webapp/js/jquery.autosize.js +++ /dev/null @@ -1,187 +0,0 @@ -/*! - jQuery Autosize v1.16.12 - (c) 2013 Jack Moore - jacklmoore.com - updated: 2013-05-31 - license: http://www.opensource.org/licenses/mit-license.php -*/ - -(function ($) { - var - defaults = { - className: 'autosizejs', - append: '', - callback: false - }, - hidden = 'hidden', - borderBox = 'border-box', - lineHeight = 'lineHeight', - - // border:0 is unnecessary, but avoids a bug in FireFox on OSX - copy = '