diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5154fba..3c4f100 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,11 +4,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [v2.1.3-SNAPSHOT] - 2023-07-25
+## [v2.2.0-SNAPSHOT] - 2024-02-02
 
 **Enhancement**
 
-- [#25433] Added spinner during resource creation
+- Implemented the Edit facility [#26640]
+- Added spinner during resource creation [#25433]
 
 ## [v2.1.2] - 2023-03-10
 
diff --git a/pom.xml b/pom.xml
index 36790ff..37f6994 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
 	<groupId>org.gcube.portlets.widgets</groupId>
 	<artifactId>ckan-metadata-publisher-widget</artifactId>
-	<version>2.1.3-SNAPSHOT</version>
+	<version>2.2.0-SNAPSHOT</version>
 	<name>gCube Ckan metadata publisher widget</name>
 
 	<description>
@@ -94,6 +94,11 @@
 			<artifactId>portal-manager</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.gcube.portlets.widgets</groupId>
+			<artifactId>metadata-profile-form-builder-widget</artifactId>
+			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
+		</dependency>
 		<dependency>
 			<groupId>org.gcube.data-catalogue</groupId>
 			<artifactId>gcubedatacatalogue-metadata-discovery</artifactId>
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/CKanMetadataPublisher.gwt.xml b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/CKanMetadataPublisher.gwt.xml
index 55363b4..cf4f3cf 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/CKanMetadataPublisher.gwt.xml
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/CKanMetadataPublisher.gwt.xml
@@ -6,17 +6,26 @@
 	<!-- Other module inherits -->
 	<inherits name="com.github.gwtbootstrap.Bootstrap" />
 	<!-- Responsive design -->
-	<set-property name="bootstrap.responsiveDesign" value="true" />
-	<inherits name='com.github.gwtbootstrap.datetimepicker.Datetimepicker' />
+	<set-property name="bootstrap.responsiveDesign"
+		value="true" />
+	<inherits
+		name='com.github.gwtbootstrap.datetimepicker.Datetimepicker' />
 	<inherits name='com.github.gwtbootstrap.datepicker.Datepicker' />
-	<inherits name='org.gcube.datacatalogue.utillibrary.CkanUtilLibrary' />
-	<inherits name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' />
-	
-	<inherits name='com.google.gwt.json.JSON'/>
+	<inherits
+		name='org.gcube.datacatalogue.utillibrary.CkanUtilLibrary' />
+	<inherits
+		name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' />
 
-	<inherits name='org.gcube.portlets.widgets.openlayerbasicwidgets.olbasicwidgets' />
+	<inherits name='com.google.gwt.json.JSON' />
 
-	<inherits name='org.gcube.portlets.widgets.wsexplorer.WorkspaceExplorer' />
+	<inherits
+		name='org.gcube.portlets.widgets.openlayerbasicwidgets.olbasicwidgets' />
+
+	<inherits
+		name='org.gcube.portlets.widgets.wsexplorer.WorkspaceExplorer' />
+
+	<inherits
+		name='org.gcube.portlets.widgets.mpformbuilder.MetadataProfileFormBuilder' />
 
 	<!-- Specify the app entry point class. -->
 	<entry-point
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanMetadataPublisher.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanMetadataPublisher.java
index fd128dd..b6b6ba1 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanMetadataPublisher.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanMetadataPublisher.java
@@ -5,11 +5,12 @@ import java.util.List;
 
 import org.gcube.portlets.widgets.ckandatapublisherwidget.client.openlayerwidget.GeoJsonAreaSelectionDialog;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.form.CreateDatasetForm;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.metadata.MetaDataFieldSkeleton;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.workspace.SelectResourceByWEMainPanel;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.ResourceElementBean;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.DataTypeWrapper;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.MetadataFieldWrapper;
+import org.gcube.portlets.widgets.mpformbuilder.client.form.generic.CreateMetadataForm.OPERATION;
+import org.gcube.portlets.widgets.mpformbuilder.client.ui.metadata.MetaDataFieldSkeleton;
+import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.DataTypeWrapper;
+import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.MetadataFieldWrapper;
 import org.gcube.portlets.widgets.openlayerbasicwidgets.client.widgets.GeometryType;
 
 import com.github.gwtbootstrap.client.ui.Button;
@@ -165,10 +166,10 @@ public class CKanMetadataPublisher implements EntryPoint {
 
 
 		// spatial
-	    fields.add(new MetadataFieldWrapper("GeoJson", true, DataTypeWrapper.GeoJSON, "", "", null, null, null));
+	    fields.add(new MetadataFieldWrapper("FieldId", "GeoJson", true, DataTypeWrapper.GeoJSON, "", "", null, null, null));
 
 		// number
-		fields.add(new MetadataFieldWrapper("Number", true, DataTypeWrapper.Number, "52", "Number example", null, null, null));
+		fields.add(new MetadataFieldWrapper(null, "Number", true, DataTypeWrapper.Number, "52", "Number example", null, null, null));
 
 		// other number
 		//fields.add(new MetadataFieldWrapper("Number2", true, DataType.Number, null, "Number example 2", null, "[0-9]+"));
@@ -207,7 +208,7 @@ public class CKanMetadataPublisher implements EntryPoint {
 		for (MetadataFieldWrapper metadataFieldWrapper : fields) {
 			MetaDataFieldSkeleton widget;
 			try {
-				widget = new MetaDataFieldSkeleton(metadataFieldWrapper, eventBus);
+				widget = new MetaDataFieldSkeleton(metadataFieldWrapper, eventBus, OPERATION.NEW);
 				widgetsList.add(widget);
 				panel.add(widget);
 			} catch (Exception e) {
@@ -242,7 +243,7 @@ public class CKanMetadataPublisher implements EntryPoint {
 			@Override
 			public void onClick(ClickEvent event) {
 				for (MetaDataFieldSkeleton field : widgetsList)
-					field.freeze();
+					field.freeze(true);
 			}
 		});
 
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanPublisherService.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanPublisherService.java
index f9d42e4..bc46f98 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanPublisherService.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanPublisherService.java
@@ -5,8 +5,8 @@ import java.util.List;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.DatasetBean;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.OrganizationBean;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.ResourceElementBean;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.licenses.LicenseBean;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.MetaDataProfileBean;
+import org.gcube.portlets.widgets.mpformbuilder.shared.license.LicenseBean;
+import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.MetaDataProfileBean;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanPublisherServiceAsync.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanPublisherServiceAsync.java
index 7d2dffb..71440ab 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanPublisherServiceAsync.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanPublisherServiceAsync.java
@@ -5,8 +5,8 @@ import java.util.List;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.DatasetBean;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.OrganizationBean;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.ResourceElementBean;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.licenses.LicenseBean;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.MetaDataProfileBean;
+import org.gcube.portlets.widgets.mpformbuilder.shared.license.LicenseBean;
+import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.MetaDataProfileBean;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.java
index 2317ead..0fd3c3a 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.java
@@ -17,22 +17,24 @@ import org.gcube.portlets.widgets.ckandatapublisherwidget.client.events.CloseCre
 import org.gcube.portlets.widgets.ckandatapublisherwidget.client.events.CloseCreationFormEventHandler;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.client.events.DeleteCustomFieldEvent;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.client.events.DeleteCustomFieldEventHandler;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.metadata.CategoryPanel;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.metadata.CustomFieldEntry;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.metadata.MetaDataFieldSkeleton;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.resources.AddResourceContainer;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.resources.AddResourceToDataset;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.resources.AddedResourcesSummary;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.tags.TagsPanel;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.utils.InfoIconsLabels;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.utils.WizardCreator;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.workspace.SelectResourceByWEMainPanel;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.DatasetBean;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.OrganizationBean;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.licenses.LicenseBean;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.CategoryWrapper;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.MetaDataProfileBean;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.MetadataFieldWrapper;
+import org.gcube.portlets.widgets.mpformbuilder.client.form.MetaDataField;
+import org.gcube.portlets.widgets.mpformbuilder.client.form.generic.CreateMetadataForm.OPERATION;
+import org.gcube.portlets.widgets.mpformbuilder.client.ui.metadata.CategoryPanel;
+import org.gcube.portlets.widgets.mpformbuilder.client.ui.metadata.MetaDataFieldSkeleton;
+import org.gcube.portlets.widgets.mpformbuilder.client.ui.resources.AddResourceContainer;
+import org.gcube.portlets.widgets.mpformbuilder.client.ui.resources.AddedResourcesSummary;
+import org.gcube.portlets.widgets.mpformbuilder.client.ui.tags.TagsPanel;
+import org.gcube.portlets.widgets.mpformbuilder.shared.license.LicenseBean;
+import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.CategoryWrapper;
+import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.MetaDataProfileBean;
+import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.MetadataFieldWrapper;
 
 import com.github.gwtbootstrap.client.ui.AlertBlock;
 import com.github.gwtbootstrap.client.ui.Button;
@@ -312,7 +314,16 @@ public class CreateDatasetForm extends Composite {
 	 * @param eventBus the event bus
 	 */
 	public CreateDatasetForm(HandlerManager eventBus) {
-		createDatasetFormBody(false, null, eventBus);
+		createDatasetFormBody(false, null, eventBus, OPERATION.NEW);
+	}
+
+	/**
+	 * Invoked in the most general case
+	 * 
+	 * @param eventBus the event bus
+	 */
+	public CreateDatasetForm(HandlerManager eventBus, OPERATION operation) {
+		createDatasetFormBody(false, null, eventBus, operation);
 	}
 
 	/**
@@ -322,7 +333,7 @@ public class CreateDatasetForm extends Composite {
 	 * @param eventBus          the event bus
 	 */
 	public CreateDatasetForm(String idFolderOrFileWorkspace, HandlerManager eventBus) {
-		createDatasetFormBody(true, idFolderOrFileWorkspace, eventBus);
+		createDatasetFormBody(true, idFolderOrFileWorkspace, eventBus, OPERATION.NEW);
 	}
 
 	/**
@@ -357,7 +368,7 @@ public class CreateDatasetForm extends Composite {
 	 * @param eventBus
 	 */
 	private void createDatasetFormBody(final boolean isWorkspaceRequest, final String idFolderOrFileWorkspace,
-			final HandlerManager eventBus) {
+			final HandlerManager eventBus, final OPERATION operation) {
 
 		initWidget(uiBinder.createAndBindUi(this));
 		this.eventBus = eventBus;
@@ -499,7 +510,7 @@ public class CreateDatasetForm extends Composite {
 									@Override
 									public void onChange(ChangeEvent event) {
 										event.preventDefault();
-										organizationsListboxChangeHandlerBody();
+										organizationsListboxChangeHandlerBody(operation);
 									}
 								});
 
@@ -557,7 +568,7 @@ public class CreateDatasetForm extends Composite {
 											}
 
 											receivedBean.setMetadataList(profiles);
-											prepareMetadataList(receivedBean);
+											prepareMetadataList(receivedBean, operation);
 											organizationsListbox.setEnabled(true);
 											metadataTypeListbox.setEnabled(true);
 
@@ -658,7 +669,7 @@ public class CreateDatasetForm extends Composite {
 	 * When the organization name is changed we need to retrieve the list of
 	 * profiles and groups
 	 */
-	private void organizationsListboxChangeHandlerBody() {
+	private void organizationsListboxChangeHandlerBody(OPERATION operation) {
 
 		// remove any other product profiles
 		metadataTypeListbox.clear();
@@ -693,7 +704,7 @@ public class CreateDatasetForm extends Composite {
 				if (profiles != null) {
 
 					receivedBean.setMetadataList(profiles);
-					prepareMetadataList(receivedBean);
+					prepareMetadataList(receivedBean, operation);
 					organizationsListbox.setEnabled(true);
 					metadataTypeListbox.setEnabled(true);
 
@@ -775,7 +786,7 @@ public class CreateDatasetForm extends Composite {
 	 * 
 	 * @param receivedBean
 	 */
-	private void prepareMetadataList(final DatasetBean receivedBean) {
+	private void prepareMetadataList(final DatasetBean receivedBean, OPERATION operation) {
 
 		List<MetaDataProfileBean> profiles = receivedBean.getMetadataList();
 
@@ -797,7 +808,7 @@ public class CreateDatasetForm extends Composite {
 							receivedBean.setChosenType(null);
 						} else {
 							receivedBean.setChosenType(selectedItemText);
-							addFields(selectedItemText);
+							addFields(selectedItemText, operation);
 						}
 					}
 				});
@@ -835,7 +846,7 @@ public class CreateDatasetForm extends Composite {
 	 * 
 	 * @param selectedItem
 	 */
-	protected void addFields(String selectedItem) {
+	protected void addFields(String selectedItem, OPERATION operation) {
 
 		for (MetaDataProfileBean bean : receivedBean.getMetadataList()) {
 			if (bean.getType().equals(selectedItem)) {
@@ -860,7 +871,7 @@ public class CreateDatasetForm extends Composite {
 
 						MetaDataField fieldWidget;
 						try {
-							fieldWidget = new MetaDataField(field, eventBus);
+							fieldWidget = new MetaDataField(field, eventBus, operation);
 							metadataFieldsPanel.add(fieldWidget);
 							listOfMetadataFields.add(fieldWidget);
 						} catch (Exception e) {
@@ -891,7 +902,7 @@ public class CreateDatasetForm extends Composite {
 
 								MetaDataField fieldWidget;
 								try {
-									fieldWidget = new MetaDataField(metadataFieldWrapper, eventBus);
+									fieldWidget = new MetaDataField(metadataFieldWrapper, eventBus, operation);
 									cp.addField(fieldWidget);
 									listOfMetadataFields.add(fieldWidget);
 								} catch (Exception e) {
@@ -915,7 +926,7 @@ public class CreateDatasetForm extends Composite {
 
 						MetaDataField fieldWidget;
 						try {
-							fieldWidget = new MetaDataField(field, eventBus);
+							fieldWidget = new MetaDataField(field, eventBus, operation);
 							extrasCategory.addField(fieldWidget);
 							listOfMetadataFields.add(fieldWidget);
 						} catch (Exception e) {
@@ -1273,6 +1284,7 @@ public class CreateDatasetForm extends Composite {
 										tabPanel.setWidth("100%");
 
 										// add the form
+
 										resourceForm = new AddResourceToDataset(eventBus, createdDatasetBean.getId(),
 												createdDatasetBean.getTitle(),
 												createdDatasetBean.getSelectedOrganization(), owner, datasetUrl);
@@ -1615,7 +1627,7 @@ public class CreateDatasetForm extends Composite {
 		// disable profile fields
 		for (MetaDataField metaField : listOfMetadataFields) {
 			for (MetaDataFieldSkeleton field : metaField.getListOfMetadataFields()) {
-				field.freeze();
+				field.freeze(true);
 			}
 
 		}
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/MetaDataField.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/MetaDataField.java
index 69015ca..24c4bfc 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/MetaDataField.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/MetaDataField.java
@@ -1,162 +1,162 @@
-package org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.form;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.metadata.MetaDataFieldSkeleton;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.MetadataFieldWrapper;
-
-import com.github.gwtbootstrap.client.ui.Button;
-import com.github.gwtbootstrap.client.ui.Label;
-import com.github.gwtbootstrap.client.ui.constants.LabelType;
-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.event.shared.HandlerManager;
-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.VerticalPanel;
-import com.google.gwt.user.client.ui.Widget;
-
-
-/**
- * The Class MetaDataField.
- *
- * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
- * 
- * Jun 10, 2019
- */
-public class MetaDataField extends Composite {
-
-	private static MetaDataFieldUiBinder uiBinder = GWT.create(MetaDataFieldUiBinder.class);
-	
-	@UiField VerticalPanel panelMetaDataFieldsSkeleton;
-	
-	@UiField Label repeatabilityLabel;
-	
-	//@UiField ControlGroup cgMetaDataFieldSkeletonFields;
-
-	@UiField Button addFieldButton;
-	
-	@UiField Button removeFieldButton;
-	
-	private List<MetaDataFieldSkeleton> listOfMetadataFields = new ArrayList<MetaDataFieldSkeleton>();
-
-	private MetadataFieldWrapper fieldWrapper;
-
-	private HandlerManager eventBus;
-
-	/**
-	 * The Interface MetaDataFieldUiBinder.
-	 *
-	 * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
-	 * 
-	 * Jun 10, 2019
-	 */
-	interface MetaDataFieldUiBinder extends UiBinder<Widget, MetaDataField> {
-	}
-
-
-	/**
-	 * Instantiates a new meta data field.
-	 *
-	 * @param field the field
-	 * @param eventBus the event bus
-	 * @throws Exception the exception
-	 */
-	public MetaDataField(final MetadataFieldWrapper field, HandlerManager eventBus) throws Exception {
-		initWidget(uiBinder.createAndBindUi(this));
-		this.fieldWrapper = field;
-		this.eventBus = eventBus;
-		addNewOccurrenceOfField();
-		checkAllowedAddField();
-		checkAllowedRemoveField();
-		
-		addFieldButton.addClickHandler(new ClickHandler() {
-			
-			@Override
-			public void onClick(ClickEvent event) {
-				addNewOccurrenceOfField();
-				checkAllowedAddField();
-				checkAllowedRemoveField();
-			}
-		});
-		
-		removeFieldButton.addClickHandler(new ClickHandler() {
-			
-			@Override
-			public void onClick(ClickEvent event) {
-				removeLatestOccurrenceOfFiled();
-				checkAllowedAddField();
-				checkAllowedRemoveField();
-			}
-		});
-		
-		//The field is repeatable
-		if(field.getMaxOccurs()>1) {
-			repeatabilityLabel.setVisible(true);
-			repeatabilityLabel.setType(LabelType.INFO);
-			addFieldButton.setTitle("Add another "+field.getFieldName());
-			removeFieldButton.setTitle("Remove latest "+field.getFieldName());
-//			String maxTxt = field.getMaxOccurs()==Integer.MAX_VALUE?"":"(max occurs declared are "+field.getMaxOccurs()+" times)";
-		}
-	}
-
-
-	/**
-	 * Check allowed remove field.
-	 */
-	private void checkAllowedRemoveField() {
-		boolean removeCond = fieldWrapper.getMaxOccurs()>1 && listOfMetadataFields.size()>1;
-		removeFieldButton.setVisible(removeCond);
-	}
-	
-	/**
-	 * Checks if is allowed add occurrence.
-	 */
-	private void checkAllowedAddField() {
-		
-		boolean repeatibilityCond = fieldWrapper.getMaxOccurs()>1 && listOfMetadataFields.size()<fieldWrapper.getMaxOccurs();
-		addFieldButton.setVisible(repeatibilityCond);
-	
-	}
-	
-	
-	/**
-	 * Removes the latest occurrence of filed.
-	 */
-	private void removeLatestOccurrenceOfFiled() {
-		int size = listOfMetadataFields.size();
-		MetaDataFieldSkeleton skeleton = listOfMetadataFields.get(size-1);
-		try {
-			panelMetaDataFieldsSkeleton.remove(skeleton);
-			listOfMetadataFields.remove(size-1);
-		}catch (Exception e) {
-			GWT.log("Error: ",e);
-		}
-	}
-	
-	/**
-	 * Adds the new occurrence of field.
-	 */
-	private void addNewOccurrenceOfField() {
-		try {
-			MetaDataFieldSkeleton fieldWidget = new MetaDataFieldSkeleton(fieldWrapper, eventBus);
-			listOfMetadataFields.add(fieldWidget);
-			panelMetaDataFieldsSkeleton.add(fieldWidget);
-		} catch (Exception e) {
-			GWT.log("Error: ",e);
-		}
-	}
-	
-	/**
-	 * Gets the list of metadata fields.
-	 *
-	 * @return the list of metadata fields
-	 */
-	public List<MetaDataFieldSkeleton> getListOfMetadataFields() {
-		return listOfMetadataFields;
-	}
-
-}
+//package org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.form;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.metadata.MetaDataFieldSkeleton;
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.MetadataFieldWrapper;
+//
+//import com.github.gwtbootstrap.client.ui.Button;
+//import com.github.gwtbootstrap.client.ui.Label;
+//import com.github.gwtbootstrap.client.ui.constants.LabelType;
+//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.event.shared.HandlerManager;
+//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.VerticalPanel;
+//import com.google.gwt.user.client.ui.Widget;
+//
+//
+///**
+// * The Class MetaDataField.
+// *
+// * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
+// * 
+// * Jun 10, 2019
+// */
+//public class MetaDataField extends Composite {
+//
+//	private static MetaDataFieldUiBinder uiBinder = GWT.create(MetaDataFieldUiBinder.class);
+//	
+//	@UiField VerticalPanel panelMetaDataFieldsSkeleton;
+//	
+//	@UiField Label repeatabilityLabel;
+//	
+//	//@UiField ControlGroup cgMetaDataFieldSkeletonFields;
+//
+//	@UiField Button addFieldButton;
+//	
+//	@UiField Button removeFieldButton;
+//	
+//	private List<MetaDataFieldSkeleton> listOfMetadataFields = new ArrayList<MetaDataFieldSkeleton>();
+//
+//	private MetadataFieldWrapper fieldWrapper;
+//
+//	private HandlerManager eventBus;
+//
+//	/**
+//	 * The Interface MetaDataFieldUiBinder.
+//	 *
+//	 * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
+//	 * 
+//	 * Jun 10, 2019
+//	 */
+//	interface MetaDataFieldUiBinder extends UiBinder<Widget, MetaDataField> {
+//	}
+//
+//
+//	/**
+//	 * Instantiates a new meta data field.
+//	 *
+//	 * @param field the field
+//	 * @param eventBus the event bus
+//	 * @throws Exception the exception
+//	 */
+//	public MetaDataField(final MetadataFieldWrapper field, HandlerManager eventBus) throws Exception {
+//		initWidget(uiBinder.createAndBindUi(this));
+//		this.fieldWrapper = field;
+//		this.eventBus = eventBus;
+//		addNewOccurrenceOfField();
+//		checkAllowedAddField();
+//		checkAllowedRemoveField();
+//		
+//		addFieldButton.addClickHandler(new ClickHandler() {
+//			
+//			@Override
+//			public void onClick(ClickEvent event) {
+//				addNewOccurrenceOfField();
+//				checkAllowedAddField();
+//				checkAllowedRemoveField();
+//			}
+//		});
+//		
+//		removeFieldButton.addClickHandler(new ClickHandler() {
+//			
+//			@Override
+//			public void onClick(ClickEvent event) {
+//				removeLatestOccurrenceOfFiled();
+//				checkAllowedAddField();
+//				checkAllowedRemoveField();
+//			}
+//		});
+//		
+//		//The field is repeatable
+//		if(field.getMaxOccurs()>1) {
+//			repeatabilityLabel.setVisible(true);
+//			repeatabilityLabel.setType(LabelType.INFO);
+//			addFieldButton.setTitle("Add another "+field.getFieldName());
+//			removeFieldButton.setTitle("Remove latest "+field.getFieldName());
+////			String maxTxt = field.getMaxOccurs()==Integer.MAX_VALUE?"":"(max occurs declared are "+field.getMaxOccurs()+" times)";
+//		}
+//	}
+//
+//
+//	/**
+//	 * Check allowed remove field.
+//	 */
+//	private void checkAllowedRemoveField() {
+//		boolean removeCond = fieldWrapper.getMaxOccurs()>1 && listOfMetadataFields.size()>1;
+//		removeFieldButton.setVisible(removeCond);
+//	}
+//	
+//	/**
+//	 * Checks if is allowed add occurrence.
+//	 */
+//	private void checkAllowedAddField() {
+//		
+//		boolean repeatibilityCond = fieldWrapper.getMaxOccurs()>1 && listOfMetadataFields.size()<fieldWrapper.getMaxOccurs();
+//		addFieldButton.setVisible(repeatibilityCond);
+//	
+//	}
+//	
+//	
+//	/**
+//	 * Removes the latest occurrence of filed.
+//	 */
+//	private void removeLatestOccurrenceOfFiled() {
+//		int size = listOfMetadataFields.size();
+//		MetaDataFieldSkeleton skeleton = listOfMetadataFields.get(size-1);
+//		try {
+//			panelMetaDataFieldsSkeleton.remove(skeleton);
+//			listOfMetadataFields.remove(size-1);
+//		}catch (Exception e) {
+//			GWT.log("Error: ",e);
+//		}
+//	}
+//	
+//	/**
+//	 * Adds the new occurrence of field.
+//	 */
+//	private void addNewOccurrenceOfField() {
+//		try {
+//			MetaDataFieldSkeleton fieldWidget = new MetaDataFieldSkeleton(fieldWrapper, eventBus);
+//			listOfMetadataFields.add(fieldWidget);
+//			panelMetaDataFieldsSkeleton.add(fieldWidget);
+//		} catch (Exception e) {
+//			GWT.log("Error: ",e);
+//		}
+//	}
+//	
+//	/**
+//	 * Gets the list of metadata fields.
+//	 *
+//	 * @return the list of metadata fields
+//	 */
+//	public List<MetaDataFieldSkeleton> getListOfMetadataFields() {
+//		return listOfMetadataFields;
+//	}
+//
+//}
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/CategoryPanel.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/CategoryPanel.java
index 4e5326b..cf34c34 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/CategoryPanel.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/CategoryPanel.java
@@ -1,80 +1,80 @@
-package org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.metadata;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.form.MetaDataField;
-
-import com.github.gwtbootstrap.client.ui.PageHeader;
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.dom.client.Style.Float;
-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.VerticalPanel;
-import com.google.gwt.user.client.ui.Widget;
-
-public class CategoryPanel extends Composite{
-
-	private static CategoryPanelUiBinder uiBinder = GWT
-			.create(CategoryPanelUiBinder.class);
-
-	interface CategoryPanelUiBinder extends UiBinder<Widget, CategoryPanel> {
-	}
-
-	@UiField VerticalPanel fieldsPanel;
-	@UiField PageHeader categoryHeader;
-	//private List<MetaDataFieldSkeleton> fieldsForThisCategory;
-	
-	private List<MetaDataField> fieldsForThisCategory;
-	
-	public CategoryPanel() {
-		initWidget(uiBinder.createAndBindUi(this));
-	}
-
-	/**
-	 * 
-	 * @param fieldsForThisCategory
-	 * @param title
-	 * @param description
-	 */
-	public CategoryPanel(String title, String description) {
-		initWidget(uiBinder.createAndBindUi(this));
-		title = title == null ? "" : title;
-		description = description == null ? "" : description;
-		categoryHeader.setTitle(title);
-		categoryHeader.setText(title);
-		categoryHeader.setSubtext(description);
-		categoryHeader.getElement().getStyle().setFloat(Float.LEFT);
-	}
-
-	/**
-	 * Add a field to this widget
-	 * @param fieldWidget
-	 */
-	/*public void addField(MetaDataFieldSkeleton fieldWidget) {
-		if(fieldsForThisCategory == null){
-			fieldsForThisCategory = new ArrayList<MetaDataFieldSkeleton>();
-			fieldWidget.setVisible(true);
-			fieldsPanel.setVisible(true);
-		}
-		fieldsForThisCategory.add(fieldWidget);
-		fieldsPanel.add(fieldWidget);
-	}*/
-	
-	
-	/**
-	 * Add a field to this widget
-	 * @param fieldWidget
-	 */
-	public void addField(MetaDataField fieldWidget) {
-		if(fieldsForThisCategory == null){
-			fieldsForThisCategory = new ArrayList<MetaDataField>();
-			fieldWidget.setVisible(true);
-			fieldsPanel.setVisible(true);
-		}
-		fieldsForThisCategory.add(fieldWidget);
-		fieldsPanel.add(fieldWidget);
-	}
-
-}
+//package org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.metadata;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.form.MetaDataField;
+//
+//import com.github.gwtbootstrap.client.ui.PageHeader;
+//import com.google.gwt.core.client.GWT;
+//import com.google.gwt.dom.client.Style.Float;
+//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.VerticalPanel;
+//import com.google.gwt.user.client.ui.Widget;
+//
+//public class CategoryPanel extends Composite{
+//
+//	private static CategoryPanelUiBinder uiBinder = GWT
+//			.create(CategoryPanelUiBinder.class);
+//
+//	interface CategoryPanelUiBinder extends UiBinder<Widget, CategoryPanel> {
+//	}
+//
+//	@UiField VerticalPanel fieldsPanel;
+//	@UiField PageHeader categoryHeader;
+//	//private List<MetaDataFieldSkeleton> fieldsForThisCategory;
+//	
+//	private List<MetaDataField> fieldsForThisCategory;
+//	
+//	public CategoryPanel() {
+//		initWidget(uiBinder.createAndBindUi(this));
+//	}
+//
+//	/**
+//	 * 
+//	 * @param fieldsForThisCategory
+//	 * @param title
+//	 * @param description
+//	 */
+//	public CategoryPanel(String title, String description) {
+//		initWidget(uiBinder.createAndBindUi(this));
+//		title = title == null ? "" : title;
+//		description = description == null ? "" : description;
+//		categoryHeader.setTitle(title);
+//		categoryHeader.setText(title);
+//		categoryHeader.setSubtext(description);
+//		categoryHeader.getElement().getStyle().setFloat(Float.LEFT);
+//	}
+//
+//	/**
+//	 * Add a field to this widget
+//	 * @param fieldWidget
+//	 */
+//	/*public void addField(MetaDataFieldSkeleton fieldWidget) {
+//		if(fieldsForThisCategory == null){
+//			fieldsForThisCategory = new ArrayList<MetaDataFieldSkeleton>();
+//			fieldWidget.setVisible(true);
+//			fieldsPanel.setVisible(true);
+//		}
+//		fieldsForThisCategory.add(fieldWidget);
+//		fieldsPanel.add(fieldWidget);
+//	}*/
+//	
+//	
+//	/**
+//	 * Add a field to this widget
+//	 * @param fieldWidget
+//	 */
+//	public void addField(MetaDataField fieldWidget) {
+//		if(fieldsForThisCategory == null){
+//			fieldsForThisCategory = new ArrayList<MetaDataField>();
+//			fieldWidget.setVisible(true);
+//			fieldsPanel.setVisible(true);
+//		}
+//		fieldsForThisCategory.add(fieldWidget);
+//		fieldsPanel.add(fieldWidget);
+//	}
+//
+//}
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/CategoryPanel.ui.xml b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/CategoryPanel.ui.xml
index 68e9845..ef8a2d0 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/CategoryPanel.ui.xml
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/CategoryPanel.ui.xml
@@ -1,12 +1,12 @@
-<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<!-- <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
 	xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:b="urn:import:com.github.gwtbootstrap.client.ui">
 	<g:HTMLPanel>
 		<g:VerticalPanel width="100%">
 			<b:PageHeader ui:field="categoryHeader"></b:PageHeader>
-			<!-- Here will be placed the metadata fields formats -->
+			Here will be placed the metadata fields formats
 			<g:VerticalPanel ui:field="fieldsPanel" visible="false"
 				width="100%"></g:VerticalPanel>
 		</g:VerticalPanel>
 	</g:HTMLPanel>
-</ui:UiBinder> 
\ No newline at end of file
+</ui:UiBinder>  -->
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/CustomFieldEntry.ui.xml b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/CustomFieldEntry.ui.xml
index 780c41a..66c05ca 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/CustomFieldEntry.ui.xml
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/CustomFieldEntry.ui.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<!-- <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
 	xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:b="urn:import:com.github.gwtbootstrap.client.ui">
 	<b:Controls>
@@ -10,4 +10,4 @@
 		</b:InputAddOn>
 		<b:Button icon="REMOVE_SIGN" title="Remove field" ui:field="removeCustomField"></b:Button>
 	</b:Controls>
-</ui:UiBinder> 
\ No newline at end of file
+</ui:UiBinder>  -->
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/MetaDataFieldSkeleton.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/MetaDataFieldSkeleton.java
index 3eb43ca..1da9a21 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/MetaDataFieldSkeleton.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/MetaDataFieldSkeleton.java
@@ -1,906 +1,906 @@
-package org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.metadata;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.events.CloseCreationFormEvent;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.events.CloseCreationFormEventHandler;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.openlayerwidget.GeoJsonAreaSelectionDialog;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.metadata.timeandreanges.DataTimeBox;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.utils.GcubeDialogExtended;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.FieldAsGroup;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.FieldAsTag;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.MetadataFieldWrapper;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.TaggingGroupingValue;
-
-import com.github.gwtbootstrap.client.ui.Alert;
-import com.github.gwtbootstrap.client.ui.Button;
-import com.github.gwtbootstrap.client.ui.CheckBox;
-import com.github.gwtbootstrap.client.ui.ControlGroup;
-import com.github.gwtbootstrap.client.ui.ControlLabel;
-import com.github.gwtbootstrap.client.ui.Controls;
-import com.github.gwtbootstrap.client.ui.Icon;
-import com.github.gwtbootstrap.client.ui.ListBox;
-import com.github.gwtbootstrap.client.ui.Popover;
-import com.github.gwtbootstrap.client.ui.TextArea;
-import com.github.gwtbootstrap.client.ui.TextBox;
-import com.github.gwtbootstrap.client.ui.constants.AlertType;
-import com.github.gwtbootstrap.client.ui.constants.ControlGroupType;
-import com.github.gwtbootstrap.client.ui.constants.IconType;
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.dom.client.Element;
-import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.Style.Cursor;
-import com.google.gwt.dom.client.Style.Display;
-import com.google.gwt.dom.client.Style.Unit;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.event.logical.shared.ResizeEvent;
-import com.google.gwt.event.logical.shared.ResizeHandler;
-import com.google.gwt.event.shared.HandlerManager;
-import com.google.gwt.uibinder.client.UiBinder;
-import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.uibinder.client.UiHandler;
-import com.google.gwt.user.client.Command;
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.FlowPanel;
-import com.google.gwt.user.client.ui.FocusPanel;
-import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.SimplePanel;
-import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwt.user.client.ui.Widget;
-
-public class MetaDataFieldSkeleton extends Composite{
-
-	private static MetaDataFieldSkeletonUiBinder uiBinder = GWT
-			.create(MetaDataFieldSkeletonUiBinder.class);
-
-	interface MetaDataFieldSkeletonUiBinder extends
-	UiBinder<Widget, MetaDataFieldSkeleton> {
-	}
-
-	@UiField Element mandatorySymbol;
-	@UiField SpanElement name;
-	@UiField SimplePanel elementPanel;
-	@UiField FlowPanel noteFieldContainer;
-	@UiField Popover noteFieldPopover;
-	@UiField ControlLabel controlLabel;
-	@UiField Controls controls;
-	@UiField Icon infoIcon;
-	@UiField FocusPanel focusPanelIconContainer;
-	@UiField ControlGroup metafieldControlGroup;
-
-	//	private static final String REGEX_IS_NUMBER = "[0-9]+[.]?[0-9]+";
-
-	// the element that holds the value (it could be a checkbox, textbox or listbox, textarea, calendar, two calendars, more calendars)
-	private Widget holder;
-
-	// the field this object represents
-	private MetadataFieldWrapper field;
-
-	// the dialog box for this metadata
-	private GcubeDialogExtended dialog;
-
-	// range list
-	private List<DataTimeBox> rangesList = new ArrayList<DataTimeBox>();
-
-	private List<TextArea> geoJsonList = new ArrayList<TextArea>();
-
-	// save event bus reference
-	private HandlerManager eventBus;
-
-	// errors
-	private static final String MANDATORY_ATTRIBUTE_MISSING = "a mandatory attribute cannot be empty";
-	private static final String MALFORMED_ATTRIBUTE = " the inserted value has a wrong format";
-	private static final String ADD_NEW_TIME_RANGE = "Add a new Time Range";
-	private static final String DELETE_TIME_RANGE = "Delete the last Time Range";
-
-	// missing range value
-	private static final String INSERT_MISSING_VALUE = " you cannot specify an end date without a start one";
-	private static final String INSERT_MISSING_VALUE_MANDATORY = " one or more range value missing in mandatory attribute";
-	private static final String UPPER_RANGE_NOT_SPECIFIED = "Not specified";
-	// time range separator
-	public static final String RANGE_SEPARATOR = ",";
-	private static final String TOOLTIP_MULTISELECTION = "Hold down the Control (CTRL) or Command (CMD) button to select multiple options";
-
-	public MetaDataFieldSkeleton(final MetadataFieldWrapper field, HandlerManager eventBus) throws Exception{
-		initWidget(uiBinder.createAndBindUi(this));
-
-		// prepare information
-		this.field = field;
-
-		// event bus
-		this.eventBus = eventBus;
-
-		// bind
-		bind();
-
-		switch(field.getType()){
-
-		case Boolean :
-
-			// its a checkbox
-			holder = new CheckBox();
-			if(field.getDefaultValue() != null)
-				((CheckBox)holder).setValue(Boolean.valueOf(field.getDefaultValue()));
-			break;
-
-		case GeoJSON:
-			//MANAGED By FRANCESCO
-			final VerticalPanel containerGeoJSON = new VerticalPanel();
-			//containerGeoJSON.setWidth("100%");
-
-			final TextArea textArea = new TextArea();
-			textArea.setWidth("100%");
-
-			if(field.getDefaultValue() != null)
-				textArea.setText(field.getDefaultValue());
-
-			containerGeoJSON.add(textArea);
-			
-			HorizontalPanel hp = new HorizontalPanel();
-			hp.getElement().getStyle().setMarginTop(10, Unit.PX);
-			final ListBox geometries = GeoJsonAreaSelectionDialog.getGeometries();
-			
-
-			Button butt = new Button();
-			butt.setIcon(IconType.MAP_MARKER);
-			butt.addClickHandler(new ClickHandler() {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					String geometrySelected = geometries.getSelectedItemText();
-					if(geometrySelected==null) {
-						 containerGeoJSON.add(new Alert("Please, select one geometry", AlertType.WARNING, true));
-					}
-					
-					final GeoJsonAreaSelectionDialog dialog=new GeoJsonAreaSelectionDialog(GeoJsonAreaSelectionDialog.toGeometry(geometrySelected));
-
-					Command fillGeoJSONArea = new Command() {
-						   public void execute() {
-
-							   try {
-								   String geoJsonGeom = dialog.getWKTToGeoJSON();
-								   if(geoJsonGeom!=null)
-									   textArea.setText(geoJsonGeom);
-								   else{
-									   textArea.setText("");
-									   containerGeoJSON.add(new Alert("Sorry, an error occurred by reading the Geometry", AlertType.ERROR, true));
-								   }
-							   }catch (Exception e) {
-								   containerGeoJSON.add(new Alert(e.getMessage(), AlertType.ERROR, true));
-							   }
-						   }
-					};
-
-					dialog.fireCommandOnResponse(fillGeoJSONArea);
-					dialog.center();
-				}
-			});
-
-			geoJsonList.add(textArea);
-			Label label = new Label("Draw a");
-			label.getElement().getStyle().setMarginRight(5, Unit.PX);
-			hp.add(label);
-			geometries.getElement().getStyle().setMarginRight(5, Unit.PX);
-			hp.add(geometries);
-			hp.add(butt);
-			geometries.setItemSelected(0, true);
-			containerGeoJSON.add(hp);
-			holder = containerGeoJSON;
-
-			break;
-
-		case Text:
-
-			holder = new TextArea();
-
-			if(field.getDefaultValue() != null)
-				((TextArea)holder).setText(field.getDefaultValue());
-			break;
-
-		case Time:
-
-			DataTimeBox ref;
-			holder = ref = new DataTimeBox(false);
-
-			// set time, if present
-			if(field.getDefaultValue() != null && !field.getDefaultValue().isEmpty()){
-				String[] dateAndTime = field.getDefaultValue().split(" ");
-				if(dateAndTime.length > 0){
-					ref.setStartDate(dateAndTime[0], dateAndTime.length > 1 ? dateAndTime[1] : null);
-				}
-			}
-			break;
-
-		case Time_Interval:
-
-			DataTimeBox rangeBox;
-			holder = rangeBox = new DataTimeBox(true);
-			setRangeTimeInTimeBox(field.getDefaultValue(), rangeBox);
-			rangesList.add(rangeBox);
-			break;
-
-		case Times_ListOf:
-
-			holder = new FlowPanel();
-
-			// start and end range date
-			final VerticalPanel containerRanges = new VerticalPanel();
-			containerRanges.setWidth("100%");
-
-			SimplePanel panelFirstRange = new SimplePanel();
-			DataTimeBox rangeBoxFirst = new DataTimeBox(true);
-			setRangeTimeInTimeBox(field.getDefaultValue(), rangeBoxFirst);
-			panelFirstRange.add(rangeBoxFirst);
-			rangesList.add(rangeBoxFirst);
-
-			// Add more button
-			Button addRangeButton = new Button();
-			addRangeButton.setIcon(IconType.PLUS_SIGN);
-			addRangeButton.setTitle(ADD_NEW_TIME_RANGE);
-
-			addRangeButton.addClickHandler(new ClickHandler() {
-
-				@Override
-				public void onClick(ClickEvent event) {
-
-					final FlowPanel newRange = new FlowPanel();
-					final DataTimeBox newRangeBox = new DataTimeBox(true);
-					setRangeTimeInTimeBox(field.getDefaultValue(), newRangeBox);
-					rangesList.add(newRangeBox);
-
-					// delete button
-					Button deleteRangeButton = new Button("", IconType.MINUS_SIGN, new ClickHandler() {
-
-						@Override
-						public void onClick(ClickEvent event) {
-
-							newRange.removeFromParent();
-							rangesList.remove(newRangeBox);
-						}
-					});
-					deleteRangeButton.setTitle(DELETE_TIME_RANGE);
-					newRange.add(newRangeBox);
-					newRange.add(deleteRangeButton);
-					containerRanges.add(newRange);
-
-				}
-			});
-
-			// add calendars and plus sign
-			containerRanges.add(panelFirstRange);
-
-			// add the vertical panel first, then the button
-			((FlowPanel)holder).add(containerRanges);
-			((FlowPanel)holder).add(addRangeButton);
-
-			break;
-
-		case Number:
-
-			holder = new TextBox();
-
-			if(field.getDefaultValue() != null)
-				((TextBox)holder).setText(field.getDefaultValue());
-
-			break;
-
-		case String:
-
-			// it could be a listbox or a textbox according to the vocabulary fields
-			if(field.getVocabulary() == null || field.getVocabulary().isEmpty()){
-
-				// textbox
-				holder = new TextBox();
-
-				if(field.getDefaultValue() != null)
-					((TextBox)holder).setText(field.getDefaultValue());
-
-			}else{
-
-				// listbox
-				ListBox tempListBox;
-				holder = tempListBox = new ListBox(field.isMultiSelection());
-
-				if(field.isMultiSelection())
-					tempListBox.setTitle(TOOLTIP_MULTISELECTION);
-
-				// if it is not mandatory and not multi-selection, add a disabled option (placeholder)
-				if(!field.getMandatory() && !field.isMultiSelection()){
-					tempListBox.addItem("Select " + field.getFieldName());
-					tempListBox.setValue(0, "");
-					tempListBox.getElement().getElementsByTagName("option").getItem(0).setAttribute("disabled", "disabled");
-					tempListBox.setSelectedValue("Select " + field.getFieldName());
-				}
-
-				// get vocabulary fields
-				List<String> vocabulary = field.getVocabulary();
-				GWT.log("Vocabulary:  "+field.getFieldName());
-				for (String term : vocabulary) {
-					GWT.log("Adding term: "+term);
-					tempListBox.addItem(term);
-				}
-
-				// set default value
-				if(field.getDefaultValue() != null)
-					tempListBox.setSelectedValue(field.getDefaultValue());
-
-			}
-
-			break;
-
-		default: return;
-
-		}
-
-		// add custom css properties
-		controls.addStyleName("form-controls-custom");
-		controlLabel.addStyleName("form-control-label-custom");
-
-		// save the name
-		name.setInnerText(field.getFieldName() + ":");
-
-		// check if it is mandatory
-		if(!field.getMandatory())
-			mandatorySymbol.getStyle().setDisplay(Display.NONE);
-
-		// add to the elementPanel
-		elementPanel.add(holder);
-
-		// set holder width
-		if(holder.getClass().equals(ListBox.class))
-			holder.setWidth("96%");
-		else
-			holder.setWidth("95%");
-
-		// set the notes, if any, and the popover
-		if(field.getNote() != null && !field.getNote().isEmpty()){
-			noteFieldPopover.setText(new HTML("<p style='color:initial'>" + field.getNote() +"</p>").getHTML());
-			noteFieldPopover.setHeading(new HTML("<b>" + field.getFieldName() +"</b>").getHTML());
-			infoIcon.getElement().getStyle().setCursor(Cursor.HELP);
-			noteFieldPopover.setHtml(true);
-			noteFieldContainer.setVisible(true);
-		}else{
-			noteFieldContainer.setVisible(false);
-		}
-
-		// add a resize handler to center the dialog box if it's not null
-		Window.addResizeHandler(new ResizeHandler() {
-
-			@Override
-			public void onResize(ResizeEvent event) {
-
-				if(dialog != null)
-					dialog.center();
-
-			}
-		});
-
-	}
-
-	/**
-	 * Bind on events
-	 */
-	private void bind() {
-
-		// on close form
-		eventBus.addHandler(CloseCreationFormEvent.TYPE, new CloseCreationFormEventHandler() {
-
-			@Override
-			public void onClose(CloseCreationFormEvent event) {
-
-				if(dialog != null)
-					dialog.hide();
-
-			}
-		});
-
-	}
-
-	@UiHandler("focusPanelIconContainer")
-	void onInfoIconClick(ClickEvent c){
-
-		if(dialog == null){
-
-			// create the dialog box
-			dialog = new GcubeDialogExtended(field.getFieldName(), field.getNote());
-
-			// set as non modal
-			dialog.setModal(false);
-		}
-
-		// else just show and center
-		dialog.center();
-		dialog.show();
-	}
-
-	/**
-	 * Check if this field has valid values
-	 * @return a string with the occurred error on error, null otherwise
-	 */
-	public String isFieldValueValid(){
-		
-//		try {
-//			//Feature #18700
-//			String value = getFieldCurrentValue().get(0);
-//			if(field.getMandatory() && value.isEmpty())
-//				return checkValidator(value, field.getValidator()) ? null : MALFORMED_ATTRIBUTE;
-//		}catch (Exception e) {
-//			//continue
+//package org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.metadata;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.client.events.CloseCreationFormEvent;
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.client.events.CloseCreationFormEventHandler;
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.client.openlayerwidget.GeoJsonAreaSelectionDialog;
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.metadata.timeandreanges.DataTimeBox;
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.utils.GcubeDialogExtended;
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.FieldAsGroup;
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.FieldAsTag;
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.MetadataFieldWrapper;
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.TaggingGroupingValue;
+//
+//import com.github.gwtbootstrap.client.ui.Alert;
+//import com.github.gwtbootstrap.client.ui.Button;
+//import com.github.gwtbootstrap.client.ui.CheckBox;
+//import com.github.gwtbootstrap.client.ui.ControlGroup;
+//import com.github.gwtbootstrap.client.ui.ControlLabel;
+//import com.github.gwtbootstrap.client.ui.Controls;
+//import com.github.gwtbootstrap.client.ui.Icon;
+//import com.github.gwtbootstrap.client.ui.ListBox;
+//import com.github.gwtbootstrap.client.ui.Popover;
+//import com.github.gwtbootstrap.client.ui.TextArea;
+//import com.github.gwtbootstrap.client.ui.TextBox;
+//import com.github.gwtbootstrap.client.ui.constants.AlertType;
+//import com.github.gwtbootstrap.client.ui.constants.ControlGroupType;
+//import com.github.gwtbootstrap.client.ui.constants.IconType;
+//import com.google.gwt.core.client.GWT;
+//import com.google.gwt.dom.client.Element;
+//import com.google.gwt.dom.client.SpanElement;
+//import com.google.gwt.dom.client.Style.Cursor;
+//import com.google.gwt.dom.client.Style.Display;
+//import com.google.gwt.dom.client.Style.Unit;
+//import com.google.gwt.event.dom.client.ClickEvent;
+//import com.google.gwt.event.dom.client.ClickHandler;
+//import com.google.gwt.event.logical.shared.ResizeEvent;
+//import com.google.gwt.event.logical.shared.ResizeHandler;
+//import com.google.gwt.event.shared.HandlerManager;
+//import com.google.gwt.uibinder.client.UiBinder;
+//import com.google.gwt.uibinder.client.UiField;
+//import com.google.gwt.uibinder.client.UiHandler;
+//import com.google.gwt.user.client.Command;
+//import com.google.gwt.user.client.Window;
+//import com.google.gwt.user.client.ui.Composite;
+//import com.google.gwt.user.client.ui.FlowPanel;
+//import com.google.gwt.user.client.ui.FocusPanel;
+//import com.google.gwt.user.client.ui.HTML;
+//import com.google.gwt.user.client.ui.HorizontalPanel;
+//import com.google.gwt.user.client.ui.Label;
+//import com.google.gwt.user.client.ui.SimplePanel;
+//import com.google.gwt.user.client.ui.VerticalPanel;
+//import com.google.gwt.user.client.ui.Widget;
+//
+//public class MetaDataFieldSkeleton extends Composite{
+//
+//	private static MetaDataFieldSkeletonUiBinder uiBinder = GWT
+//			.create(MetaDataFieldSkeletonUiBinder.class);
+//
+//	interface MetaDataFieldSkeletonUiBinder extends
+//	UiBinder<Widget, MetaDataFieldSkeleton> {
+//	}
+//
+//	@UiField Element mandatorySymbol;
+//	@UiField SpanElement name;
+//	@UiField SimplePanel elementPanel;
+//	@UiField FlowPanel noteFieldContainer;
+//	@UiField Popover noteFieldPopover;
+//	@UiField ControlLabel controlLabel;
+//	@UiField Controls controls;
+//	@UiField Icon infoIcon;
+//	@UiField FocusPanel focusPanelIconContainer;
+//	@UiField ControlGroup metafieldControlGroup;
+//
+//	//	private static final String REGEX_IS_NUMBER = "[0-9]+[.]?[0-9]+";
+//
+//	// the element that holds the value (it could be a checkbox, textbox or listbox, textarea, calendar, two calendars, more calendars)
+//	private Widget holder;
+//
+//	// the field this object represents
+//	private MetadataFieldWrapper field;
+//
+//	// the dialog box for this metadata
+//	private GcubeDialogExtended dialog;
+//
+//	// range list
+//	private List<DataTimeBox> rangesList = new ArrayList<DataTimeBox>();
+//
+//	private List<TextArea> geoJsonList = new ArrayList<TextArea>();
+//
+//	// save event bus reference
+//	private HandlerManager eventBus;
+//
+//	// errors
+//	private static final String MANDATORY_ATTRIBUTE_MISSING = "a mandatory attribute cannot be empty";
+//	private static final String MALFORMED_ATTRIBUTE = " the inserted value has a wrong format";
+//	private static final String ADD_NEW_TIME_RANGE = "Add a new Time Range";
+//	private static final String DELETE_TIME_RANGE = "Delete the last Time Range";
+//
+//	// missing range value
+//	private static final String INSERT_MISSING_VALUE = " you cannot specify an end date without a start one";
+//	private static final String INSERT_MISSING_VALUE_MANDATORY = " one or more range value missing in mandatory attribute";
+//	private static final String UPPER_RANGE_NOT_SPECIFIED = "Not specified";
+//	// time range separator
+//	public static final String RANGE_SEPARATOR = ",";
+//	private static final String TOOLTIP_MULTISELECTION = "Hold down the Control (CTRL) or Command (CMD) button to select multiple options";
+//
+//	public MetaDataFieldSkeleton(final MetadataFieldWrapper field, HandlerManager eventBus) throws Exception{
+//		initWidget(uiBinder.createAndBindUi(this));
+//
+//		// prepare information
+//		this.field = field;
+//
+//		// event bus
+//		this.eventBus = eventBus;
+//
+//		// bind
+//		bind();
+//
+//		switch(field.getType()){
+//
+//		case Boolean :
+//
+//			// its a checkbox
+//			holder = new CheckBox();
+//			if(field.getDefaultValue() != null)
+//				((CheckBox)holder).setValue(Boolean.valueOf(field.getDefaultValue()));
+//			break;
+//
+//		case GeoJSON:
+//			//MANAGED By FRANCESCO
+//			final VerticalPanel containerGeoJSON = new VerticalPanel();
+//			//containerGeoJSON.setWidth("100%");
+//
+//			final TextArea textArea = new TextArea();
+//			textArea.setWidth("100%");
+//
+//			if(field.getDefaultValue() != null)
+//				textArea.setText(field.getDefaultValue());
+//
+//			containerGeoJSON.add(textArea);
+//			
+//			HorizontalPanel hp = new HorizontalPanel();
+//			hp.getElement().getStyle().setMarginTop(10, Unit.PX);
+//			final ListBox geometries = GeoJsonAreaSelectionDialog.getGeometries();
+//			
+//
+//			Button butt = new Button();
+//			butt.setIcon(IconType.MAP_MARKER);
+//			butt.addClickHandler(new ClickHandler() {
+//
+//				@Override
+//				public void onClick(ClickEvent event) {
+//					String geometrySelected = geometries.getSelectedItemText();
+//					if(geometrySelected==null) {
+//						 containerGeoJSON.add(new Alert("Please, select one geometry", AlertType.WARNING, true));
+//					}
+//					
+//					final GeoJsonAreaSelectionDialog dialog=new GeoJsonAreaSelectionDialog(GeoJsonAreaSelectionDialog.toGeometry(geometrySelected));
+//
+//					Command fillGeoJSONArea = new Command() {
+//						   public void execute() {
+//
+//							   try {
+//								   String geoJsonGeom = dialog.getWKTToGeoJSON();
+//								   if(geoJsonGeom!=null)
+//									   textArea.setText(geoJsonGeom);
+//								   else{
+//									   textArea.setText("");
+//									   containerGeoJSON.add(new Alert("Sorry, an error occurred by reading the Geometry", AlertType.ERROR, true));
+//								   }
+//							   }catch (Exception e) {
+//								   containerGeoJSON.add(new Alert(e.getMessage(), AlertType.ERROR, true));
+//							   }
+//						   }
+//					};
+//
+//					dialog.fireCommandOnResponse(fillGeoJSONArea);
+//					dialog.center();
+//				}
+//			});
+//
+//			geoJsonList.add(textArea);
+//			Label label = new Label("Draw a");
+//			label.getElement().getStyle().setMarginRight(5, Unit.PX);
+//			hp.add(label);
+//			geometries.getElement().getStyle().setMarginRight(5, Unit.PX);
+//			hp.add(geometries);
+//			hp.add(butt);
+//			geometries.setItemSelected(0, true);
+//			containerGeoJSON.add(hp);
+//			holder = containerGeoJSON;
+//
+//			break;
+//
+//		case Text:
+//
+//			holder = new TextArea();
+//
+//			if(field.getDefaultValue() != null)
+//				((TextArea)holder).setText(field.getDefaultValue());
+//			break;
+//
+//		case Time:
+//
+//			DataTimeBox ref;
+//			holder = ref = new DataTimeBox(false);
+//
+//			// set time, if present
+//			if(field.getDefaultValue() != null && !field.getDefaultValue().isEmpty()){
+//				String[] dateAndTime = field.getDefaultValue().split(" ");
+//				if(dateAndTime.length > 0){
+//					ref.setStartDate(dateAndTime[0], dateAndTime.length > 1 ? dateAndTime[1] : null);
+//				}
+//			}
+//			break;
+//
+//		case Time_Interval:
+//
+//			DataTimeBox rangeBox;
+//			holder = rangeBox = new DataTimeBox(true);
+//			setRangeTimeInTimeBox(field.getDefaultValue(), rangeBox);
+//			rangesList.add(rangeBox);
+//			break;
+//
+//		case Times_ListOf:
+//
+//			holder = new FlowPanel();
+//
+//			// start and end range date
+//			final VerticalPanel containerRanges = new VerticalPanel();
+//			containerRanges.setWidth("100%");
+//
+//			SimplePanel panelFirstRange = new SimplePanel();
+//			DataTimeBox rangeBoxFirst = new DataTimeBox(true);
+//			setRangeTimeInTimeBox(field.getDefaultValue(), rangeBoxFirst);
+//			panelFirstRange.add(rangeBoxFirst);
+//			rangesList.add(rangeBoxFirst);
+//
+//			// Add more button
+//			Button addRangeButton = new Button();
+//			addRangeButton.setIcon(IconType.PLUS_SIGN);
+//			addRangeButton.setTitle(ADD_NEW_TIME_RANGE);
+//
+//			addRangeButton.addClickHandler(new ClickHandler() {
+//
+//				@Override
+//				public void onClick(ClickEvent event) {
+//
+//					final FlowPanel newRange = new FlowPanel();
+//					final DataTimeBox newRangeBox = new DataTimeBox(true);
+//					setRangeTimeInTimeBox(field.getDefaultValue(), newRangeBox);
+//					rangesList.add(newRangeBox);
+//
+//					// delete button
+//					Button deleteRangeButton = new Button("", IconType.MINUS_SIGN, new ClickHandler() {
+//
+//						@Override
+//						public void onClick(ClickEvent event) {
+//
+//							newRange.removeFromParent();
+//							rangesList.remove(newRangeBox);
+//						}
+//					});
+//					deleteRangeButton.setTitle(DELETE_TIME_RANGE);
+//					newRange.add(newRangeBox);
+//					newRange.add(deleteRangeButton);
+//					containerRanges.add(newRange);
+//
+//				}
+//			});
+//
+//			// add calendars and plus sign
+//			containerRanges.add(panelFirstRange);
+//
+//			// add the vertical panel first, then the button
+//			((FlowPanel)holder).add(containerRanges);
+//			((FlowPanel)holder).add(addRangeButton);
+//
+//			break;
+//
+//		case Number:
+//
+//			holder = new TextBox();
+//
+//			if(field.getDefaultValue() != null)
+//				((TextBox)holder).setText(field.getDefaultValue());
+//
+//			break;
+//
+//		case String:
+//
+//			// it could be a listbox or a textbox according to the vocabulary fields
+//			if(field.getVocabulary() == null || field.getVocabulary().isEmpty()){
+//
+//				// textbox
+//				holder = new TextBox();
+//
+//				if(field.getDefaultValue() != null)
+//					((TextBox)holder).setText(field.getDefaultValue());
+//
+//			}else{
+//
+//				// listbox
+//				ListBox tempListBox;
+//				holder = tempListBox = new ListBox(field.isMultiSelection());
+//
+//				if(field.isMultiSelection())
+//					tempListBox.setTitle(TOOLTIP_MULTISELECTION);
+//
+//				// if it is not mandatory and not multi-selection, add a disabled option (placeholder)
+//				if(!field.getMandatory() && !field.isMultiSelection()){
+//					tempListBox.addItem("Select " + field.getFieldName());
+//					tempListBox.setValue(0, "");
+//					tempListBox.getElement().getElementsByTagName("option").getItem(0).setAttribute("disabled", "disabled");
+//					tempListBox.setSelectedValue("Select " + field.getFieldName());
+//				}
+//
+//				// get vocabulary fields
+//				List<String> vocabulary = field.getVocabulary();
+//				GWT.log("Vocabulary:  "+field.getFieldName());
+//				for (String term : vocabulary) {
+//					GWT.log("Adding term: "+term);
+//					tempListBox.addItem(term);
+//				}
+//
+//				// set default value
+//				if(field.getDefaultValue() != null)
+//					tempListBox.setSelectedValue(field.getDefaultValue());
+//
+//			}
+//
+//			break;
+//
+//		default: return;
+//
 //		}
-		
-		switch(field.getType()){
-
-		case Boolean :
-
-			// nothing to validate
-			return null;
-
-		case Text:
-		case GeoJSON:
-			String textAreaValue = getFieldCurrentValue().get(0);
-
-			if(field.getMandatory()){
-
-				if(!textAreaValue.trim().isEmpty()) {
-					if(field.getValidator() == null || field.getValidator().isEmpty())
-						return null; // no further check
-					else return checkValidator(textAreaValue, field.getValidator()) ? null : MALFORMED_ATTRIBUTE;
-				}
-				else return MANDATORY_ATTRIBUTE_MISSING;
-
-			}else{
-
-				if(textAreaValue.trim().isEmpty())
-					return null;
-
-				else return checkValidator(textAreaValue, field.getValidator()) ? null : MALFORMED_ATTRIBUTE;
-
-			}
-
-		case Time:
-
-			String dateValue = getFieldCurrentValue().get(0);
-
-			if(field.getMandatory()){
-				if(dateValue.isEmpty())
-					return MANDATORY_ATTRIBUTE_MISSING;
-			}
-
-			return null;
-
-
-		case Time_Interval:
-
-			String rangeValue = rangesList.get(0).getCurrentValue();
-
-			if(field.getMandatory()){
-				if(rangeValue.contains(DataTimeBox.MISSING_RANGE_VALUE_START) || rangeValue.contains(DataTimeBox.MISSING_RANGE_VALUE_END))
-					return INSERT_MISSING_VALUE_MANDATORY;
-			}
-
-			if(rangeValue.contains(DataTimeBox.MISSING_RANGE_VALUE_START) && !rangeValue.equals(DataTimeBox.MISSING_RANGE_VALUE_START + DataTimeBox.RANGE_SEPARATOR_START_END + DataTimeBox.MISSING_RANGE_VALUE_END))
-				return INSERT_MISSING_VALUE;
-
-			return null;
-
-		case Times_ListOf:
-
-			for(DataTimeBox el: rangesList){
-
-				String currentValue = el.getCurrentValue();
-				if(field.getMandatory()){
-					if(currentValue.contains(DataTimeBox.MISSING_RANGE_VALUE_START) || currentValue.contains(DataTimeBox.MISSING_RANGE_VALUE_END))
-						return INSERT_MISSING_VALUE_MANDATORY;
-				}
-
-				GWT.log("Printing " + currentValue);
-				if(currentValue.contains(DataTimeBox.MISSING_RANGE_VALUE_START) && !currentValue.equals(DataTimeBox.MISSING_RANGE_VALUE_START + DataTimeBox.RANGE_SEPARATOR_START_END + DataTimeBox.MISSING_RANGE_VALUE_END))
-					return INSERT_MISSING_VALUE;
-
-			}
-			return null;
-
-		case Number:
-
-			String numberValue = ((TextBox)holder).getValue();
-
-			if(field.getMandatory()){
-
-				if(!numberValue.trim().isEmpty())
-					if(field.getValidator() == null || field.getValidator().isEmpty())
-						return isANumber(numberValue) ? null : MALFORMED_ATTRIBUTE;
-					else return checkValidator(numberValue, field.getValidator()) ? null : MALFORMED_ATTRIBUTE;
-				else return " a mandatory attribute cannot be empty";
-
-			}else{
-
-				if(numberValue.trim().isEmpty())
-					return null;
-				else {
-					String validatorToUse  = field.getValidator();
-					if(validatorToUse != null && !validatorToUse.isEmpty())
-						return checkValidator(numberValue, validatorToUse) ? null : MALFORMED_ATTRIBUTE;
-					else
-						return isANumber(numberValue) ? null : MALFORMED_ATTRIBUTE;
-				}
-			}
-
-		case String:
-
-			// just handle the case of textbox
-			if(holder.getClass().equals(TextBox.class)){
-
-				String textBoxValue = getFieldCurrentValue().get(0);
-				if(field.getMandatory()){
-					if(!textBoxValue.trim().isEmpty())
-						if(field.getValidator() == null || field.getValidator().isEmpty())
-							return null; // no further check
-						else return checkValidator(textBoxValue, field.getValidator()) ? null : MALFORMED_ATTRIBUTE;
-					else return MANDATORY_ATTRIBUTE_MISSING;
-
-				}else{
-					if(textBoxValue.trim().isEmpty())
-						return null;
-					else return checkValidator(textBoxValue, field.getValidator()) ? null : MALFORMED_ATTRIBUTE;
-				}
-			}
-			else{
-
-				List<String> listboxValues = getFieldCurrentValue();
-
-				if(listboxValues.isEmpty() && field.getMandatory())
-					return MANDATORY_ATTRIBUTE_MISSING;
-
-				for (String value : listboxValues) {
-					if(!field.getMandatory()){
-
-						if(field.getValidator() == null || field.getValidator().isEmpty())
-							continue;
-						else
-							if(checkValidator(value, field.getValidator()))
-								continue;
-							else return  MALFORMED_ATTRIBUTE;
-
-					}else{
-
-						if(value == null || value.isEmpty())
-							return MANDATORY_ATTRIBUTE_MISSING;
-						else
-							continue;
-
-					}
-				}
-			}
-
-			return null;
-
-		default: return null;
-
-		}
-	}
-
-	/**
-	 * Check if this string is a number
-	 * @param numberValue
-	 * @return
-	 */
-	private boolean isANumber(String numberValue) {
-		return numberValue.matches("-?\\d+(\\.\\d+)?");
-	}
-
-	/**
-	 * Check if value matches validator (regex). In case validator is null, true is returned.
-	 * @param value
-	 * @param validator
-	 * @return true if validator is null OR value.matches(reges), false otherwise
-	 */
-	private boolean checkValidator(String value, String validator) {
-		GWT.log("Value is " + value);
-		GWT.log("Validator is " + validator);
-		if(validator == null || validator.isEmpty())
-			return true;
-		else return value.matches(validator);
-	}
-
-	/**
-	 * Returns the current value of the field. In case of TimeInterval or TimeList see getTimeIntervalOrTimeListWithoutMissing()
-	 * @return
-	 */
-	public List<String> getFieldCurrentValue(){
-
-		List<String> toReturn = new ArrayList<String>();
-		String manipulatedTemp = "";
-
-		switch(field.getType()){
-
-		case Boolean :
-
-			toReturn.add(((CheckBox)holder).getValue().toString());
-			break;
-
-		case Text:
-			toReturn.add(((TextArea)holder).getText());
-			break;
-
-		case GeoJSON:
-			toReturn.add(geoJsonList.get(0).getText());
-			break;
-
-		case Time:
-
-			toReturn.add(((DataTimeBox)holder).getCurrentValue().replaceAll(DataTimeBox.MISSING_RANGE_VALUE_START, "")); // it was a noRange metadata
-			break;
-
-		case Time_Interval:
-
-			manipulatedTemp = rangesList.get(0).getCurrentValue().replaceAll(DataTimeBox.MISSING_RANGE_VALUE_START, "").replaceAll(DataTimeBox.MISSING_RANGE_VALUE_END, UPPER_RANGE_NOT_SPECIFIED);
-			
-			//fixed by Francesco, see #20663#note-12
-			if(!field.getMandatory()) {
-				if(manipulatedTemp.equals(DataTimeBox.RANGE_SEPARATOR_START_END + UPPER_RANGE_NOT_SPECIFIED))
-					manipulatedTemp = "";
-			}
-			
-			// split to check if the extreme are equals
-			//fixed by Francesco
-			if(!manipulatedTemp.isEmpty()) {
-				String[] temp = manipulatedTemp.split(DataTimeBox.RANGE_SEPARATOR_START_END);
-				if(temp[0].equals(temp[1]))
-					manipulatedTemp = temp[0];
-			}
-
-			toReturn.add(manipulatedTemp);
-			break;
-
-		case Times_ListOf:
-
-			manipulatedTemp = "";
-			for (DataTimeBox elem : rangesList) {
-
-				String currentRange = elem.getCurrentValue().replaceAll(DataTimeBox.MISSING_RANGE_VALUE_START, "").replaceAll(DataTimeBox.MISSING_RANGE_VALUE_END, UPPER_RANGE_NOT_SPECIFIED);
-				if(currentRange.equals(DataTimeBox.RANGE_SEPARATOR_START_END + UPPER_RANGE_NOT_SPECIFIED))
-					continue;
-
-				String[] splitted = currentRange.split(DataTimeBox.RANGE_SEPARATOR_START_END);
-				if(splitted[0].equals(splitted[1]))
-					manipulatedTemp += manipulatedTemp.isEmpty() ? splitted[0] : RANGE_SEPARATOR  + splitted[0];
-					else
-						manipulatedTemp += manipulatedTemp.isEmpty() ? splitted[0] + DataTimeBox.RANGE_SEPARATOR_START_END + splitted[1] :
-							RANGE_SEPARATOR + splitted[0] + DataTimeBox.RANGE_SEPARATOR_START_END + splitted[1];
-
-			}
-
-			if(manipulatedTemp.endsWith(RANGE_SEPARATOR))
-				manipulatedTemp = manipulatedTemp.substring(0, manipulatedTemp.length() - 1);
-
-			toReturn.add(manipulatedTemp);
-			break;
-
-		case Number:
-		case String:
-
-			if(holder.getClass().equals(TextBox.class))
-				toReturn.add(((TextBox)holder).getText());
-			else{
-
-				// handle single and multi-selected case
-				for(int i = 0; i < ((ListBox)holder).getItemCount(); i++){
-					if(((ListBox)holder).isItemSelected(i)){
-						toReturn.add(((ListBox)holder).getItemText(i));
-					}
-				}
-
-				// if it was not mandatory but there was no choice, returning empty string
-				if(!field.getMandatory()) {
-					//Task #20446 - bug fix. Ignoring the placeholder
-					if(toReturn.size()==1) {
-						String placeholder = "Select " + field.getFieldName();
-						if(toReturn.get(0).equals(placeholder)){
-							GWT.log("Skipping placeholder: "+placeholder);
-							toReturn.clear();
-							//toReturn.add("");
-						}
-					}
-				}
-			}
-
-			break;
-
-		default: break;
-
-		}
-
-		return toReturn;
-	}
-
-	/**
-	 * Returns the current name of the field
-	 * @return
-	 */
-	public String getFieldNameOriginal(){
-
-		return field.getFieldName();
-
-	}
-
-	/**
-	 * Returns the current name of the field
-	 * @return
-	 */
-	public String getFieldNameQualified(){
-
-		if(field.getFieldNameFromCategory() != null)
-			return field.getFieldNameFromCategory();
-		return field.getFieldName();
-
-	}
-
-	/**
-	 * Freeze this widget (after on create)
-	 */
-	public void freeze() {
-
-		switch(field.getType()){
-
-		case Boolean :
-
-			((CheckBox)holder).setEnabled(false);
-			break;
-
-		case GeoJSON:
-		case Text:
-
-			((TextArea)holder).setEnabled(false);
-			break;
-
-		case Time:
-
-			((DataTimeBox)holder).freeze();
-			break;
-
-		case Time_Interval:
-
-			rangesList.get(0).freeze();
-			break;
-
-		case Times_ListOf:
-
-			for(DataTimeBox el : rangesList)
-				el.freeze();
-
-			break;
-
-		case Number:
-
-			((TextBox)holder).setEnabled(false);
-			break;
-
-		case String:
-
-			if(holder.getClass().equals(ListBox.class))
-				((ListBox)holder).setEnabled(false);
-			else
-				((TextBox)holder).setEnabled(false);
-			break;
-
-		default: break;
-
-		}
-	}
-
-	/**
-	 * Get the original MetadataFieldWrapper object
-	 * @return
-	 */
-	public MetadataFieldWrapper getField() {
-		return field;
-	}
-
-	public void removeError() {
-
-		metafieldControlGroup.setType(ControlGroupType.NONE);
-
-	}
-
-	public void showError() {
-
-		metafieldControlGroup.setType(ControlGroupType.ERROR);
-
-	}
-
-	/**
-	 * Build the range interval
-	 * @param rangeValues
-	 * @param tb
-	 */
-	private void setRangeTimeInTimeBox(String rangeValues, DataTimeBox tb){
-		// set time, if present
-		if(rangeValues != null && !rangeValues.isEmpty()){
-			if(!rangeValues.contains(DataTimeBox.RANGE_SEPARATOR_START_END))
-				rangeValues += "/" + rangeValues;
-
-			String[] dateAndTimeRanges = rangeValues.split(DataTimeBox.RANGE_SEPARATOR_START_END);
-			if(dateAndTimeRanges.length > 0){
-				String[] firstRangeDate = dateAndTimeRanges[0].split(" ");
-				tb.setStartDate(firstRangeDate[0], firstRangeDate.length > 1 ? firstRangeDate[1] : null);
-				if(dateAndTimeRanges.length > 1){
-					String[] secondRangeDate = dateAndTimeRanges[1].split(" ");
-					tb.setEndDate(secondRangeDate[0], secondRangeDate.length > 1 ? secondRangeDate[1] : null);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Given the name and the value of this field, return a tag if it is the case.
-	 * @return a tag as string
-	 */
-	public List<String> getTagFromThisField(){
-
-		FieldAsTag asTag = field.getAsTag();
-		List<String> generatedTags = new ArrayList<String>();
-		if(asTag != null && asTag.isCreate()){
-			List<String> values = getFieldCurrentValue();
-			for (String value : values) {
-				
-				//Feature #18700
-				if(value.isEmpty()) {
-					//if the value is empty I'm adding the tag on in case of onFieldName
-					if(asTag.getTaggingValue().equals(TaggingGroupingValue.onFieldName))
-						generatedTags.add(TaggingGroupingValue.getComposedValueTag(field.getFieldName(), value, asTag.getSeparator(), asTag.getTaggingValue()));
-				}else
-					generatedTags.add(TaggingGroupingValue.getComposedValueTag(field.getFieldName(), value, asTag.getSeparator(), asTag.getTaggingValue()));
-				
-			}
-			return generatedTags;
-		}
-		return null;
-	}
-
-	/**
-	 * Given the name and the value of this field, return a group title if it is the case.
-	 * @return a tag as string
-	 */
-	public List<String> getGroupTitleFromThisGroup(){
-		FieldAsGroup asGroup = field.getAsGroup();
-		List<String> generatedGroups = new ArrayList<String>();
-		if(asGroup != null){
-			List<String> values = getFieldCurrentValue();
-			for (String value : values) {
-				generatedGroups.addAll(TaggingGroupingValue.getComposedValueGroup(field.getFieldName(), value, asGroup.getGroupingValue()));
-			}
-			return generatedGroups;
-		}
-		return null;
-	}
-
-	/**
-	 * Check if the group associated (if it exists) should be forced
-	 * @return
-	 */
-	public boolean isGroupToForce(){
-		FieldAsGroup asGroup = field.getAsGroup();
-		if(asGroup != null){
-			return asGroup.getCreate();
-		}
-		return false;
-	}
-
-	/**
-	 * Check if the propagateUp is set
-	 * @return
-	 */
-	public boolean isPropagateUp(){
-		FieldAsGroup asGroup = field.getAsGroup();
-		if(asGroup != null){
-			return asGroup.isPropagateUp();
-		}
-		return false;
-	}
-
-}
\ No newline at end of file
+//
+//		// add custom css properties
+//		controls.addStyleName("form-controls-custom");
+//		controlLabel.addStyleName("form-control-label-custom");
+//
+//		// save the name
+//		name.setInnerText(field.getFieldName() + ":");
+//
+//		// check if it is mandatory
+//		if(!field.getMandatory())
+//			mandatorySymbol.getStyle().setDisplay(Display.NONE);
+//
+//		// add to the elementPanel
+//		elementPanel.add(holder);
+//
+//		// set holder width
+//		if(holder.getClass().equals(ListBox.class))
+//			holder.setWidth("96%");
+//		else
+//			holder.setWidth("95%");
+//
+//		// set the notes, if any, and the popover
+//		if(field.getNote() != null && !field.getNote().isEmpty()){
+//			noteFieldPopover.setText(new HTML("<p style='color:initial'>" + field.getNote() +"</p>").getHTML());
+//			noteFieldPopover.setHeading(new HTML("<b>" + field.getFieldName() +"</b>").getHTML());
+//			infoIcon.getElement().getStyle().setCursor(Cursor.HELP);
+//			noteFieldPopover.setHtml(true);
+//			noteFieldContainer.setVisible(true);
+//		}else{
+//			noteFieldContainer.setVisible(false);
+//		}
+//
+//		// add a resize handler to center the dialog box if it's not null
+//		Window.addResizeHandler(new ResizeHandler() {
+//
+//			@Override
+//			public void onResize(ResizeEvent event) {
+//
+//				if(dialog != null)
+//					dialog.center();
+//
+//			}
+//		});
+//
+//	}
+//
+//	/**
+//	 * Bind on events
+//	 */
+//	private void bind() {
+//
+//		// on close form
+//		eventBus.addHandler(CloseCreationFormEvent.TYPE, new CloseCreationFormEventHandler() {
+//
+//			@Override
+//			public void onClose(CloseCreationFormEvent event) {
+//
+//				if(dialog != null)
+//					dialog.hide();
+//
+//			}
+//		});
+//
+//	}
+//
+//	@UiHandler("focusPanelIconContainer")
+//	void onInfoIconClick(ClickEvent c){
+//
+//		if(dialog == null){
+//
+//			// create the dialog box
+//			dialog = new GcubeDialogExtended(field.getFieldName(), field.getNote());
+//
+//			// set as non modal
+//			dialog.setModal(false);
+//		}
+//
+//		// else just show and center
+//		dialog.center();
+//		dialog.show();
+//	}
+//
+//	/**
+//	 * Check if this field has valid values
+//	 * @return a string with the occurred error on error, null otherwise
+//	 */
+//	public String isFieldValueValid(){
+//		
+////		try {
+////			//Feature #18700
+////			String value = getFieldCurrentValue().get(0);
+////			if(field.getMandatory() && value.isEmpty())
+////				return checkValidator(value, field.getValidator()) ? null : MALFORMED_ATTRIBUTE;
+////		}catch (Exception e) {
+////			//continue
+////		}
+//		
+//		switch(field.getType()){
+//
+//		case Boolean :
+//
+//			// nothing to validate
+//			return null;
+//
+//		case Text:
+//		case GeoJSON:
+//			String textAreaValue = getFieldCurrentValue().get(0);
+//
+//			if(field.getMandatory()){
+//
+//				if(!textAreaValue.trim().isEmpty()) {
+//					if(field.getValidator() == null || field.getValidator().isEmpty())
+//						return null; // no further check
+//					else return checkValidator(textAreaValue, field.getValidator()) ? null : MALFORMED_ATTRIBUTE;
+//				}
+//				else return MANDATORY_ATTRIBUTE_MISSING;
+//
+//			}else{
+//
+//				if(textAreaValue.trim().isEmpty())
+//					return null;
+//
+//				else return checkValidator(textAreaValue, field.getValidator()) ? null : MALFORMED_ATTRIBUTE;
+//
+//			}
+//
+//		case Time:
+//
+//			String dateValue = getFieldCurrentValue().get(0);
+//
+//			if(field.getMandatory()){
+//				if(dateValue.isEmpty())
+//					return MANDATORY_ATTRIBUTE_MISSING;
+//			}
+//
+//			return null;
+//
+//
+//		case Time_Interval:
+//
+//			String rangeValue = rangesList.get(0).getCurrentValue();
+//
+//			if(field.getMandatory()){
+//				if(rangeValue.contains(DataTimeBox.MISSING_RANGE_VALUE_START) || rangeValue.contains(DataTimeBox.MISSING_RANGE_VALUE_END))
+//					return INSERT_MISSING_VALUE_MANDATORY;
+//			}
+//
+//			if(rangeValue.contains(DataTimeBox.MISSING_RANGE_VALUE_START) && !rangeValue.equals(DataTimeBox.MISSING_RANGE_VALUE_START + DataTimeBox.RANGE_SEPARATOR_START_END + DataTimeBox.MISSING_RANGE_VALUE_END))
+//				return INSERT_MISSING_VALUE;
+//
+//			return null;
+//
+//		case Times_ListOf:
+//
+//			for(DataTimeBox el: rangesList){
+//
+//				String currentValue = el.getCurrentValue();
+//				if(field.getMandatory()){
+//					if(currentValue.contains(DataTimeBox.MISSING_RANGE_VALUE_START) || currentValue.contains(DataTimeBox.MISSING_RANGE_VALUE_END))
+//						return INSERT_MISSING_VALUE_MANDATORY;
+//				}
+//
+//				GWT.log("Printing " + currentValue);
+//				if(currentValue.contains(DataTimeBox.MISSING_RANGE_VALUE_START) && !currentValue.equals(DataTimeBox.MISSING_RANGE_VALUE_START + DataTimeBox.RANGE_SEPARATOR_START_END + DataTimeBox.MISSING_RANGE_VALUE_END))
+//					return INSERT_MISSING_VALUE;
+//
+//			}
+//			return null;
+//
+//		case Number:
+//
+//			String numberValue = ((TextBox)holder).getValue();
+//
+//			if(field.getMandatory()){
+//
+//				if(!numberValue.trim().isEmpty())
+//					if(field.getValidator() == null || field.getValidator().isEmpty())
+//						return isANumber(numberValue) ? null : MALFORMED_ATTRIBUTE;
+//					else return checkValidator(numberValue, field.getValidator()) ? null : MALFORMED_ATTRIBUTE;
+//				else return " a mandatory attribute cannot be empty";
+//
+//			}else{
+//
+//				if(numberValue.trim().isEmpty())
+//					return null;
+//				else {
+//					String validatorToUse  = field.getValidator();
+//					if(validatorToUse != null && !validatorToUse.isEmpty())
+//						return checkValidator(numberValue, validatorToUse) ? null : MALFORMED_ATTRIBUTE;
+//					else
+//						return isANumber(numberValue) ? null : MALFORMED_ATTRIBUTE;
+//				}
+//			}
+//
+//		case String:
+//
+//			// just handle the case of textbox
+//			if(holder.getClass().equals(TextBox.class)){
+//
+//				String textBoxValue = getFieldCurrentValue().get(0);
+//				if(field.getMandatory()){
+//					if(!textBoxValue.trim().isEmpty())
+//						if(field.getValidator() == null || field.getValidator().isEmpty())
+//							return null; // no further check
+//						else return checkValidator(textBoxValue, field.getValidator()) ? null : MALFORMED_ATTRIBUTE;
+//					else return MANDATORY_ATTRIBUTE_MISSING;
+//
+//				}else{
+//					if(textBoxValue.trim().isEmpty())
+//						return null;
+//					else return checkValidator(textBoxValue, field.getValidator()) ? null : MALFORMED_ATTRIBUTE;
+//				}
+//			}
+//			else{
+//
+//				List<String> listboxValues = getFieldCurrentValue();
+//
+//				if(listboxValues.isEmpty() && field.getMandatory())
+//					return MANDATORY_ATTRIBUTE_MISSING;
+//
+//				for (String value : listboxValues) {
+//					if(!field.getMandatory()){
+//
+//						if(field.getValidator() == null || field.getValidator().isEmpty())
+//							continue;
+//						else
+//							if(checkValidator(value, field.getValidator()))
+//								continue;
+//							else return  MALFORMED_ATTRIBUTE;
+//
+//					}else{
+//
+//						if(value == null || value.isEmpty())
+//							return MANDATORY_ATTRIBUTE_MISSING;
+//						else
+//							continue;
+//
+//					}
+//				}
+//			}
+//
+//			return null;
+//
+//		default: return null;
+//
+//		}
+//	}
+//
+//	/**
+//	 * Check if this string is a number
+//	 * @param numberValue
+//	 * @return
+//	 */
+//	private boolean isANumber(String numberValue) {
+//		return numberValue.matches("-?\\d+(\\.\\d+)?");
+//	}
+//
+//	/**
+//	 * Check if value matches validator (regex). In case validator is null, true is returned.
+//	 * @param value
+//	 * @param validator
+//	 * @return true if validator is null OR value.matches(reges), false otherwise
+//	 */
+//	private boolean checkValidator(String value, String validator) {
+//		GWT.log("Value is " + value);
+//		GWT.log("Validator is " + validator);
+//		if(validator == null || validator.isEmpty())
+//			return true;
+//		else return value.matches(validator);
+//	}
+//
+//	/**
+//	 * Returns the current value of the field. In case of TimeInterval or TimeList see getTimeIntervalOrTimeListWithoutMissing()
+//	 * @return
+//	 */
+//	public List<String> getFieldCurrentValue(){
+//
+//		List<String> toReturn = new ArrayList<String>();
+//		String manipulatedTemp = "";
+//
+//		switch(field.getType()){
+//
+//		case Boolean :
+//
+//			toReturn.add(((CheckBox)holder).getValue().toString());
+//			break;
+//
+//		case Text:
+//			toReturn.add(((TextArea)holder).getText());
+//			break;
+//
+//		case GeoJSON:
+//			toReturn.add(geoJsonList.get(0).getText());
+//			break;
+//
+//		case Time:
+//
+//			toReturn.add(((DataTimeBox)holder).getCurrentValue().replaceAll(DataTimeBox.MISSING_RANGE_VALUE_START, "")); // it was a noRange metadata
+//			break;
+//
+//		case Time_Interval:
+//
+//			manipulatedTemp = rangesList.get(0).getCurrentValue().replaceAll(DataTimeBox.MISSING_RANGE_VALUE_START, "").replaceAll(DataTimeBox.MISSING_RANGE_VALUE_END, UPPER_RANGE_NOT_SPECIFIED);
+//			
+//			//fixed by Francesco, see #20663#note-12
+//			if(!field.getMandatory()) {
+//				if(manipulatedTemp.equals(DataTimeBox.RANGE_SEPARATOR_START_END + UPPER_RANGE_NOT_SPECIFIED))
+//					manipulatedTemp = "";
+//			}
+//			
+//			// split to check if the extreme are equals
+//			//fixed by Francesco
+//			if(!manipulatedTemp.isEmpty()) {
+//				String[] temp = manipulatedTemp.split(DataTimeBox.RANGE_SEPARATOR_START_END);
+//				if(temp[0].equals(temp[1]))
+//					manipulatedTemp = temp[0];
+//			}
+//
+//			toReturn.add(manipulatedTemp);
+//			break;
+//
+//		case Times_ListOf:
+//
+//			manipulatedTemp = "";
+//			for (DataTimeBox elem : rangesList) {
+//
+//				String currentRange = elem.getCurrentValue().replaceAll(DataTimeBox.MISSING_RANGE_VALUE_START, "").replaceAll(DataTimeBox.MISSING_RANGE_VALUE_END, UPPER_RANGE_NOT_SPECIFIED);
+//				if(currentRange.equals(DataTimeBox.RANGE_SEPARATOR_START_END + UPPER_RANGE_NOT_SPECIFIED))
+//					continue;
+//
+//				String[] splitted = currentRange.split(DataTimeBox.RANGE_SEPARATOR_START_END);
+//				if(splitted[0].equals(splitted[1]))
+//					manipulatedTemp += manipulatedTemp.isEmpty() ? splitted[0] : RANGE_SEPARATOR  + splitted[0];
+//					else
+//						manipulatedTemp += manipulatedTemp.isEmpty() ? splitted[0] + DataTimeBox.RANGE_SEPARATOR_START_END + splitted[1] :
+//							RANGE_SEPARATOR + splitted[0] + DataTimeBox.RANGE_SEPARATOR_START_END + splitted[1];
+//
+//			}
+//
+//			if(manipulatedTemp.endsWith(RANGE_SEPARATOR))
+//				manipulatedTemp = manipulatedTemp.substring(0, manipulatedTemp.length() - 1);
+//
+//			toReturn.add(manipulatedTemp);
+//			break;
+//
+//		case Number:
+//		case String:
+//
+//			if(holder.getClass().equals(TextBox.class))
+//				toReturn.add(((TextBox)holder).getText());
+//			else{
+//
+//				// handle single and multi-selected case
+//				for(int i = 0; i < ((ListBox)holder).getItemCount(); i++){
+//					if(((ListBox)holder).isItemSelected(i)){
+//						toReturn.add(((ListBox)holder).getItemText(i));
+//					}
+//				}
+//
+//				// if it was not mandatory but there was no choice, returning empty string
+//				if(!field.getMandatory()) {
+//					//Task #20446 - bug fix. Ignoring the placeholder
+//					if(toReturn.size()==1) {
+//						String placeholder = "Select " + field.getFieldName();
+//						if(toReturn.get(0).equals(placeholder)){
+//							GWT.log("Skipping placeholder: "+placeholder);
+//							toReturn.clear();
+//							//toReturn.add("");
+//						}
+//					}
+//				}
+//			}
+//
+//			break;
+//
+//		default: break;
+//
+//		}
+//
+//		return toReturn;
+//	}
+//
+//	/**
+//	 * Returns the current name of the field
+//	 * @return
+//	 */
+//	public String getFieldNameOriginal(){
+//
+//		return field.getFieldName();
+//
+//	}
+//
+//	/**
+//	 * Returns the current name of the field
+//	 * @return
+//	 */
+//	public String getFieldNameQualified(){
+//
+//		if(field.getFieldNameFromCategory() != null)
+//			return field.getFieldNameFromCategory();
+//		return field.getFieldName();
+//
+//	}
+//
+//	/**
+//	 * Freeze this widget (after on create)
+//	 */
+//	public void freeze() {
+//
+//		switch(field.getType()){
+//
+//		case Boolean :
+//
+//			((CheckBox)holder).setEnabled(false);
+//			break;
+//
+//		case GeoJSON:
+//		case Text:
+//
+//			((TextArea)holder).setEnabled(false);
+//			break;
+//
+//		case Time:
+//
+//			((DataTimeBox)holder).freeze();
+//			break;
+//
+//		case Time_Interval:
+//
+//			rangesList.get(0).freeze();
+//			break;
+//
+//		case Times_ListOf:
+//
+//			for(DataTimeBox el : rangesList)
+//				el.freeze();
+//
+//			break;
+//
+//		case Number:
+//
+//			((TextBox)holder).setEnabled(false);
+//			break;
+//
+//		case String:
+//
+//			if(holder.getClass().equals(ListBox.class))
+//				((ListBox)holder).setEnabled(false);
+//			else
+//				((TextBox)holder).setEnabled(false);
+//			break;
+//
+//		default: break;
+//
+//		}
+//	}
+//
+//	/**
+//	 * Get the original MetadataFieldWrapper object
+//	 * @return
+//	 */
+//	public MetadataFieldWrapper getField() {
+//		return field;
+//	}
+//
+//	public void removeError() {
+//
+//		metafieldControlGroup.setType(ControlGroupType.NONE);
+//
+//	}
+//
+//	public void showError() {
+//
+//		metafieldControlGroup.setType(ControlGroupType.ERROR);
+//
+//	}
+//
+//	/**
+//	 * Build the range interval
+//	 * @param rangeValues
+//	 * @param tb
+//	 */
+//	private void setRangeTimeInTimeBox(String rangeValues, DataTimeBox tb){
+//		// set time, if present
+//		if(rangeValues != null && !rangeValues.isEmpty()){
+//			if(!rangeValues.contains(DataTimeBox.RANGE_SEPARATOR_START_END))
+//				rangeValues += "/" + rangeValues;
+//
+//			String[] dateAndTimeRanges = rangeValues.split(DataTimeBox.RANGE_SEPARATOR_START_END);
+//			if(dateAndTimeRanges.length > 0){
+//				String[] firstRangeDate = dateAndTimeRanges[0].split(" ");
+//				tb.setStartDate(firstRangeDate[0], firstRangeDate.length > 1 ? firstRangeDate[1] : null);
+//				if(dateAndTimeRanges.length > 1){
+//					String[] secondRangeDate = dateAndTimeRanges[1].split(" ");
+//					tb.setEndDate(secondRangeDate[0], secondRangeDate.length > 1 ? secondRangeDate[1] : null);
+//				}
+//			}
+//		}
+//	}
+//
+//	/**
+//	 * Given the name and the value of this field, return a tag if it is the case.
+//	 * @return a tag as string
+//	 */
+//	public List<String> getTagFromThisField(){
+//
+//		FieldAsTag asTag = field.getAsTag();
+//		List<String> generatedTags = new ArrayList<String>();
+//		if(asTag != null && asTag.isCreate()){
+//			List<String> values = getFieldCurrentValue();
+//			for (String value : values) {
+//				
+//				//Feature #18700
+//				if(value.isEmpty()) {
+//					//if the value is empty I'm adding the tag on in case of onFieldName
+//					if(asTag.getTaggingValue().equals(TaggingGroupingValue.onFieldName))
+//						generatedTags.add(TaggingGroupingValue.getComposedValueTag(field.getFieldName(), value, asTag.getSeparator(), asTag.getTaggingValue()));
+//				}else
+//					generatedTags.add(TaggingGroupingValue.getComposedValueTag(field.getFieldName(), value, asTag.getSeparator(), asTag.getTaggingValue()));
+//				
+//			}
+//			return generatedTags;
+//		}
+//		return null;
+//	}
+//
+//	/**
+//	 * Given the name and the value of this field, return a group title if it is the case.
+//	 * @return a tag as string
+//	 */
+//	public List<String> getGroupTitleFromThisGroup(){
+//		FieldAsGroup asGroup = field.getAsGroup();
+//		List<String> generatedGroups = new ArrayList<String>();
+//		if(asGroup != null){
+//			List<String> values = getFieldCurrentValue();
+//			for (String value : values) {
+//				generatedGroups.addAll(TaggingGroupingValue.getComposedValueGroup(field.getFieldName(), value, asGroup.getGroupingValue()));
+//			}
+//			return generatedGroups;
+//		}
+//		return null;
+//	}
+//
+//	/**
+//	 * Check if the group associated (if it exists) should be forced
+//	 * @return
+//	 */
+//	public boolean isGroupToForce(){
+//		FieldAsGroup asGroup = field.getAsGroup();
+//		if(asGroup != null){
+//			return asGroup.getCreate();
+//		}
+//		return false;
+//	}
+//
+//	/**
+//	 * Check if the propagateUp is set
+//	 * @return
+//	 */
+//	public boolean isPropagateUp(){
+//		FieldAsGroup asGroup = field.getAsGroup();
+//		if(asGroup != null){
+//			return asGroup.isPropagateUp();
+//		}
+//		return false;
+//	}
+//
+//}
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/MetaDataFieldSkeleton.ui.xml b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/MetaDataFieldSkeleton.ui.xml
index 136921f..fe84e5f 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/MetaDataFieldSkeleton.ui.xml
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/MetaDataFieldSkeleton.ui.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<!-- <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
 	xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:b="urn:import:com.github.gwtbootstrap.client.ui"
 	xmlns:b2="urn:import:com.github.gwtbootstrap.datetimepicker.client.ui"
@@ -33,7 +33,7 @@
 				<g:FlowPanel width="95%">
 					<g:SimplePanel ui:field="elementPanel" styleName="{style.element-panel}"
 						width="95%">
-						<!-- Listbox, Checkbox, Textbox, Calendar etc -->
+						Listbox, Checkbox, Textbox, Calendar etc
 					</g:SimplePanel>
 					<g:FlowPanel ui:field="noteFieldContainer" styleName="{style.note-container}">
 						<b:Popover ui:field="noteFieldPopover" html="true"
@@ -47,4 +47,4 @@
 			</b:Controls>
 		</b:ControlGroup>
 	</g:HTMLPanel>
-</ui:UiBinder> 
\ No newline at end of file
+</ui:UiBinder>  -->
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/timeandreanges/DataTimeBox.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/timeandreanges/DataTimeBox.java
index 4775073..547ee00 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/timeandreanges/DataTimeBox.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/timeandreanges/DataTimeBox.java
@@ -1,138 +1,138 @@
-package org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.metadata.timeandreanges;
-
-import java.util.Date;
-
-import com.github.gwtbootstrap.datepicker.client.ui.DateBox;
-import com.github.gwtbootstrap.datetimepicker.client.ui.DateTimeBox;
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.i18n.client.DateTimeFormat;
-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.FlowPanel;
-import com.google.gwt.user.client.ui.Widget;
-
-/**
- * Widget for handling date-like fields.
- * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
- */
-public class DataTimeBox extends Composite{
-
-	private static DataTimeBoxUiBinder uiBinder = GWT
-			.create(DataTimeBoxUiBinder.class);
-
-	interface DataTimeBoxUiBinder extends UiBinder<Widget, DataTimeBox> {
-	}
-
-	public static final String RANGE_SEPARATOR_START_END = "/";
-	public static final String MISSING_RANGE_VALUE_START = "MISSING_RANGE_PART_START";
-	public static final String MISSING_RANGE_VALUE_END = "MISSING_RANGE_PART_END";
-	private static final String COLON = ":";
-	private static final String INSERT_DATE_INSTANT_LABEL = "Insert a date";
-	private static final String INSERT_TIME_INSTANT_LABEL = "Hour and minutes";
-	private static final String INSERT_DATE_START_LABEL = "Insert a start date"; 
-	private static final String INSERT_DATE_END_LABEL = "Insert an end date"; 
-	private static final DateTimeFormat formatDate = DateTimeFormat.getFormat("yyyy-MM-dd");
-	private static final DateTimeFormat formatTime = DateTimeFormat.getFormat("HH:mm");
-
-	private boolean isRange;
-
-	@UiField
-	DateBox startRangeDate;
-	@UiField
-	DateTimeBox startRangeTime;
-	@UiField
-	DateBox endRangeDate;
-	@UiField
-	DateTimeBox endRangeTime;
-	@UiField
-	FlowPanel singleDataEnd;
-	@UiField
-	FlowPanel singleDataStart;
-
-	public DataTimeBox(boolean isRange) {
-		initWidget(uiBinder.createAndBindUi(this));
-		this.isRange = isRange;
-		startRangeDate.setPlaceholder(INSERT_DATE_INSTANT_LABEL);
-		startRangeTime.setPlaceholder(INSERT_TIME_INSTANT_LABEL);
-		if(isRange){
-			singleDataEnd.setVisible(true);
-			singleDataEnd.setWidth("50%");
-			singleDataStart.setWidth("50%");
-
-			startRangeTime.setWidth("30%");
-			endRangeTime.setWidth("30%");
-			startRangeDate.setWidth("60%");
-			endRangeDate.setWidth("60%");
-
-			startRangeDate.setPlaceholder(INSERT_DATE_START_LABEL);
-			endRangeDate.setPlaceholder(INSERT_DATE_END_LABEL);
-			endRangeTime.setPlaceholder(INSERT_TIME_INSTANT_LABEL);
-		}
-		startRangeDate.setValue(null);
-		startRangeTime.setValue(null);
-		endRangeDate.setValue(null);
-		endRangeTime.setValue(null);
-	}
-
-	public boolean getIsRange(){
-		return isRange;
-	}
-
-	public void setStartDate(String date, String time){
-		GWT.log("Date is " + date + " and time is " + time);
-		startRangeDate.setValue(new Date(date));
-		if(time != null && !time.isEmpty()){
-			Date completeDate = new Date();
-			completeDate.setHours(Integer.parseInt(time.split(COLON)[0]));
-			completeDate.setMinutes(Integer.parseInt(time.split(COLON)[1]));
-			startRangeTime.setValue(completeDate);
-		}
-	}
-
-	public void setEndDate(String date, String time){
-		GWT.log("Date is " + date + " and time is " + time);
-		endRangeDate.setValue(new Date(date));
-		if(time != null && !time.isEmpty()){
-			Date completeDate = new Date();
-			completeDate.setHours(Integer.parseInt(time.split(COLON)[0]));
-			completeDate.setMinutes(Integer.parseInt(time.split(COLON)[1]));
-			endRangeTime.setValue(completeDate);
-		}
-	}
-
-	/**
-	 * Return the current value, with MISSING_RANGE_VALUE in case of missing entry
-	 * @return
-	 */
-	public String getCurrentValue(){
-
-		String firstRange = MISSING_RANGE_VALUE_START;
-		String secondRange = MISSING_RANGE_VALUE_END;
-
-		if(startRangeDate.getValue() != null){
-			firstRange = formatDate.format(startRangeDate.getValue()) + " " + (startRangeTime.getValue() != null ? formatTime.format(startRangeTime.getValue()) : "");;
-		}
-		if(isRange && endRangeDate.getValue() != null){
-			secondRange = formatDate.format(endRangeDate.getValue()) + " " + (endRangeTime.getValue() != null ? formatTime.format(endRangeTime.getValue()) : "");
-		}
-
-		if(isRange){
-			GWT.log("Returning " + firstRange + RANGE_SEPARATOR_START_END + secondRange);
-			return firstRange + RANGE_SEPARATOR_START_END + secondRange;
-		}else {
-			GWT.log("Returning " + firstRange);
-			return firstRange;
-		}
-	}
-
-	/**
-	 * Freeze the inputs
-	 */
-	public void freeze(){
-		startRangeDate.setEnabled(false);
-		startRangeTime.setEnabled(false);
-		endRangeDate.setEnabled(false);
-		endRangeTime.setEnabled(false);
-	}
-}
+//package org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.metadata.timeandreanges;
+//
+//import java.util.Date;
+//
+//import com.github.gwtbootstrap.datepicker.client.ui.DateBox;
+//import com.github.gwtbootstrap.datetimepicker.client.ui.DateTimeBox;
+//import com.google.gwt.core.client.GWT;
+//import com.google.gwt.i18n.client.DateTimeFormat;
+//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.FlowPanel;
+//import com.google.gwt.user.client.ui.Widget;
+//
+///**
+// * Widget for handling date-like fields.
+// * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
+// */
+//public class DataTimeBox extends Composite{
+//
+//	private static DataTimeBoxUiBinder uiBinder = GWT
+//			.create(DataTimeBoxUiBinder.class);
+//
+//	interface DataTimeBoxUiBinder extends UiBinder<Widget, DataTimeBox> {
+//	}
+//
+//	public static final String RANGE_SEPARATOR_START_END = "/";
+//	public static final String MISSING_RANGE_VALUE_START = "MISSING_RANGE_PART_START";
+//	public static final String MISSING_RANGE_VALUE_END = "MISSING_RANGE_PART_END";
+//	private static final String COLON = ":";
+//	private static final String INSERT_DATE_INSTANT_LABEL = "Insert a date";
+//	private static final String INSERT_TIME_INSTANT_LABEL = "Hour and minutes";
+//	private static final String INSERT_DATE_START_LABEL = "Insert a start date"; 
+//	private static final String INSERT_DATE_END_LABEL = "Insert an end date"; 
+//	private static final DateTimeFormat formatDate = DateTimeFormat.getFormat("yyyy-MM-dd");
+//	private static final DateTimeFormat formatTime = DateTimeFormat.getFormat("HH:mm");
+//
+//	private boolean isRange;
+//
+//	@UiField
+//	DateBox startRangeDate;
+//	@UiField
+//	DateTimeBox startRangeTime;
+//	@UiField
+//	DateBox endRangeDate;
+//	@UiField
+//	DateTimeBox endRangeTime;
+//	@UiField
+//	FlowPanel singleDataEnd;
+//	@UiField
+//	FlowPanel singleDataStart;
+//
+//	public DataTimeBox(boolean isRange) {
+//		initWidget(uiBinder.createAndBindUi(this));
+//		this.isRange = isRange;
+//		startRangeDate.setPlaceholder(INSERT_DATE_INSTANT_LABEL);
+//		startRangeTime.setPlaceholder(INSERT_TIME_INSTANT_LABEL);
+//		if(isRange){
+//			singleDataEnd.setVisible(true);
+//			singleDataEnd.setWidth("50%");
+//			singleDataStart.setWidth("50%");
+//
+//			startRangeTime.setWidth("30%");
+//			endRangeTime.setWidth("30%");
+//			startRangeDate.setWidth("60%");
+//			endRangeDate.setWidth("60%");
+//
+//			startRangeDate.setPlaceholder(INSERT_DATE_START_LABEL);
+//			endRangeDate.setPlaceholder(INSERT_DATE_END_LABEL);
+//			endRangeTime.setPlaceholder(INSERT_TIME_INSTANT_LABEL);
+//		}
+//		startRangeDate.setValue(null);
+//		startRangeTime.setValue(null);
+//		endRangeDate.setValue(null);
+//		endRangeTime.setValue(null);
+//	}
+//
+//	public boolean getIsRange(){
+//		return isRange;
+//	}
+//
+//	public void setStartDate(String date, String time){
+//		GWT.log("Date is " + date + " and time is " + time);
+//		startRangeDate.setValue(new Date(date));
+//		if(time != null && !time.isEmpty()){
+//			Date completeDate = new Date();
+//			completeDate.setHours(Integer.parseInt(time.split(COLON)[0]));
+//			completeDate.setMinutes(Integer.parseInt(time.split(COLON)[1]));
+//			startRangeTime.setValue(completeDate);
+//		}
+//	}
+//
+//	public void setEndDate(String date, String time){
+//		GWT.log("Date is " + date + " and time is " + time);
+//		endRangeDate.setValue(new Date(date));
+//		if(time != null && !time.isEmpty()){
+//			Date completeDate = new Date();
+//			completeDate.setHours(Integer.parseInt(time.split(COLON)[0]));
+//			completeDate.setMinutes(Integer.parseInt(time.split(COLON)[1]));
+//			endRangeTime.setValue(completeDate);
+//		}
+//	}
+//
+//	/**
+//	 * Return the current value, with MISSING_RANGE_VALUE in case of missing entry
+//	 * @return
+//	 */
+//	public String getCurrentValue(){
+//
+//		String firstRange = MISSING_RANGE_VALUE_START;
+//		String secondRange = MISSING_RANGE_VALUE_END;
+//
+//		if(startRangeDate.getValue() != null){
+//			firstRange = formatDate.format(startRangeDate.getValue()) + " " + (startRangeTime.getValue() != null ? formatTime.format(startRangeTime.getValue()) : "");;
+//		}
+//		if(isRange && endRangeDate.getValue() != null){
+//			secondRange = formatDate.format(endRangeDate.getValue()) + " " + (endRangeTime.getValue() != null ? formatTime.format(endRangeTime.getValue()) : "");
+//		}
+//
+//		if(isRange){
+//			GWT.log("Returning " + firstRange + RANGE_SEPARATOR_START_END + secondRange);
+//			return firstRange + RANGE_SEPARATOR_START_END + secondRange;
+//		}else {
+//			GWT.log("Returning " + firstRange);
+//			return firstRange;
+//		}
+//	}
+//
+//	/**
+//	 * Freeze the inputs
+//	 */
+//	public void freeze(){
+//		startRangeDate.setEnabled(false);
+//		startRangeTime.setEnabled(false);
+//		endRangeDate.setEnabled(false);
+//		endRangeTime.setEnabled(false);
+//	}
+//}
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/timeandreanges/DataTimeBox.ui.xml b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/timeandreanges/DataTimeBox.ui.xml
index 0e0d40a..15de078 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/timeandreanges/DataTimeBox.ui.xml
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/timeandreanges/DataTimeBox.ui.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<!-- <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
 	xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:b2="urn:import:com.github.gwtbootstrap.datetimepicker.client.ui"
 	xmlns:b3="urn:import:com.github.gwtbootstrap.datepicker.client.ui">
@@ -27,4 +27,4 @@
 			</g:FlowPanel>
 		</g:FlowPanel>
 	</g:HTMLPanel>
-</ui:UiBinder> 
\ No newline at end of file
+</ui:UiBinder>  -->
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceContainer.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceContainer.java
index a5a72f2..8450bbd 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceContainer.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceContainer.java
@@ -1,37 +1,37 @@
-package org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.resources;
-
-import com.github.gwtbootstrap.client.ui.TabPanel;
-import com.google.gwt.core.client.GWT;
-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.VerticalPanel;
-import com.google.gwt.user.client.ui.Widget;
-
-/**
- * Container for the third phase (add resource to dataset)
- * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
- */
-public class AddResourceContainer extends Composite{
-
-	private static AddResourceContainerUiBinder uiBinder = GWT
-			.create(AddResourceContainerUiBinder.class);
-
-	interface AddResourceContainerUiBinder extends
-			UiBinder<Widget, AddResourceContainer> {
-	}
-	
-	@UiField VerticalPanel resourcesPanel;
-	
-	public AddResourceContainer(final String datasetUrl) {
-		initWidget(uiBinder.createAndBindUi(this));
-	}
-	
-	/**
-	 * Add the form to this panel
-	 * @param w
-	 */
-	public void add(TabPanel w){
-		resourcesPanel.add(w);
-	}
-}
+//package org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.resources;
+//
+//import com.github.gwtbootstrap.client.ui.TabPanel;
+//import com.google.gwt.core.client.GWT;
+//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.VerticalPanel;
+//import com.google.gwt.user.client.ui.Widget;
+//
+///**
+// * Container for the third phase (add resource to dataset)
+// * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
+// */
+//public class AddResourceContainer extends Composite{
+//
+//	private static AddResourceContainerUiBinder uiBinder = GWT
+//			.create(AddResourceContainerUiBinder.class);
+//
+//	interface AddResourceContainerUiBinder extends
+//			UiBinder<Widget, AddResourceContainer> {
+//	}
+//	
+//	@UiField VerticalPanel resourcesPanel;
+//	
+//	public AddResourceContainer(final String datasetUrl) {
+//		initWidget(uiBinder.createAndBindUi(this));
+//	}
+//	
+//	/**
+//	 * Add the form to this panel
+//	 * @param w
+//	 */
+//	public void add(TabPanel w){
+//		resourcesPanel.add(w);
+//	}
+//}
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceContainer.ui.xml b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceContainer.ui.xml
index a8d4261..1317de6 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceContainer.ui.xml
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceContainer.ui.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<!-- <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
 	xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:b="urn:import:com.github.gwtbootstrap.client.ui">
 	<g:HTMLPanel>
-		<!-- Here will be placed the form for the resources -->
+		Here will be placed the form for the resources
 		<g:VerticalPanel ui:field="resourcesPanel" width="100%"></g:VerticalPanel>
 	</g:HTMLPanel>
-</ui:UiBinder> 
\ No newline at end of file
+</ui:UiBinder>  -->
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceToDataset.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceToDataset.java
index 9052cad..f20b253 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceToDataset.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceToDataset.java
@@ -3,8 +3,8 @@ package org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.resources;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.client.CKanPublisherService;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.client.CKanPublisherServiceAsync;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.client.events.AddResourceEvent;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.utils.LoaderIcon;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.ResourceElementBean;
+import org.gcube.portlets.widgets.mpformbuilder.client.ui.utils.LoaderIcon;
 
 import com.github.gwtbootstrap.client.ui.AlertBlock;
 import com.github.gwtbootstrap.client.ui.Button;
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceToDataset.ui.xml b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceToDataset.ui.xml
index b9a2d94..f1f83d2 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceToDataset.ui.xml
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddResourceToDataset.ui.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<!-- <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
 	xmlns:b="urn:import:com.github.gwtbootstrap.client.ui"
 	xmlns:g="urn:import:com.google.gwt.user.client.ui">
@@ -101,12 +101,12 @@
 					</b:Controls>
 				</b:ControlGroup>
 
-				<!-- Alert blocks for info/errors -->
+				Alert blocks for info/errors
 				<b:AlertBlock type="INFO" animation="true"
 					visible="false" close="false" ui:field="infoBlock"
 					styleName="{style.block-alert-style}"></b:AlertBlock>
 
-				<!-- Add resource button -->
+				Add resource button
 				<b:Button title="Add resource" ui:field="addResourceButton"
 					type="PRIMARY">Add</b:Button>
 
@@ -122,4 +122,4 @@
 				type="LINK" visible="true"></b:Button>
 		</g:FlowPanel>
 	</g:HTMLPanel>
-</ui:UiBinder> 
\ No newline at end of file
+</ui:UiBinder>  -->
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddedResourcesSummary.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddedResourcesSummary.java
index 33e1ecc..c5d2e16 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddedResourcesSummary.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddedResourcesSummary.java
@@ -1,160 +1,160 @@
-package org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.resources;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.CKanPublisherService;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.CKanPublisherServiceAsync;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.events.AddResourceEvent;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.events.AddResourceEventHandler;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.events.DeleteResourceEvent;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.events.DeleteResourceEventHandler;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.ResourceElementBean;
-
-import com.github.gwtbootstrap.client.ui.Accordion;
-import com.github.gwtbootstrap.client.ui.AccordionGroup;
-import com.github.gwtbootstrap.client.ui.Button;
-import com.github.gwtbootstrap.client.ui.Paragraph;
-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.event.shared.HandlerManager;
-import com.google.gwt.uibinder.client.UiBinder;
-import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwt.user.client.ui.Widget;
-
-/**
- * A summary of the resources added by the user.
- * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
- */
-public class AddedResourcesSummary extends Composite{
-
-	private static AddedResourcesSummaryUiBinder uiBinder = GWT
-			.create(AddedResourcesSummaryUiBinder.class);
-
-	interface AddedResourcesSummaryUiBinder extends
-	UiBinder<Widget, AddedResourcesSummary> {
-	}
-
-	//Create a remote service proxy to talk to the server-side ckan service.
-	private final CKanPublisherServiceAsync ckanServices = GWT.create(CKanPublisherService.class);
-
-	// Event bus
-	private HandlerManager eventBus;
-
-	// list of added resources (beans)
-	List<ResourceElementBean> addedResources;
-
-	@UiField VerticalPanel addResourcesPanel;
-
-	public AddedResourcesSummary(HandlerManager eventBus) {
-		initWidget(uiBinder.createAndBindUi(this));
-
-		// save bus
-		this.eventBus = eventBus;
-
-		// bind on add resource event
-		bind();
-
-		// init list
-		addedResources = new ArrayList<ResourceElementBean>();
-	}
-
-	/**
-	 * Bind on add/delete resource event
-	 */
-	private void bind() {
-
-		// when a new resource is added
-		eventBus.addHandler(AddResourceEvent.TYPE, new AddResourceEventHandler() {
-
-			@Override
-			public void onAddedResource(AddResourceEvent addResourceEvent) {
-
-				// get the resource
-				final ResourceElementBean justAddedResource = addResourceEvent.getResource();
-
-				// Build an accordion to show resource info
-				Accordion accordion = new Accordion();
-				AccordionGroup accordionGroup = new AccordionGroup();
-				accordionGroup.setHeading("- " + justAddedResource.getName());
-				accordion.add(accordionGroup);
-
-				// add sub-info such as url and description
-				Paragraph pUrl = new Paragraph();
-				pUrl.setText("Url : " + justAddedResource.getUrl());
-				Paragraph pDescription = new Paragraph();
-				pDescription.setText("Description : " + justAddedResource.getDescription());
-
-				// button to delete the resource
-				Button deleteButton = new Button();
-				deleteButton.setText("Delete");
-				deleteButton.addClickHandler(new ClickHandler() {
-
-					@Override
-					public void onClick(ClickEvent event) {
-
-						eventBus.fireEvent(new DeleteResourceEvent(justAddedResource));
-
-					}
-				});
-
-				// fill accordion
-				accordionGroup.add(pUrl);
-				accordionGroup.add(pDescription);
-				accordionGroup.add(deleteButton);
-
-				// add to the list
-				addedResources.add(justAddedResource);
-
-				// add to the panel
-				addResourcesPanel.add(accordion);
-			}
-		});
-
-		// when the user wants to delete a resource
-		eventBus.addHandler(DeleteResourceEvent.TYPE, new DeleteResourceEventHandler() {
-
-			@Override
-			public void onDeletedResource(DeleteResourceEvent deleteResourceEvent) {
-
-				// to delete
-				ResourceElementBean toDelete = deleteResourceEvent.getResource();
-
-				// find it
-				for(int i = 0; i < addedResources.size(); i++){
-
-					if(addedResources.get(i).getOriginalIdInWorkspace().equals(toDelete.getOriginalIdInWorkspace())){
-						
-						// get the associated widget and remove it
-						final Widget widget = addResourcesPanel.getWidget(i);
-
-						// remote call to remove it from the dataset
-						ckanServices.deleteResourceFromDataset(toDelete, new AsyncCallback<Boolean>() {
-
-							@Override
-							public void onSuccess(Boolean result) {
-								
-								if(result)
-									widget.removeFromParent();
-							}
-
-							@Override
-							public void onFailure(Throwable caught) {
-
-							}
-						});
-						
-						break;
-					}
-				}
-				
-				// remove from the list
-				addedResources.remove(toDelete);
-			}
-		});
-	}
-}
+//package org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.resources;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.client.CKanPublisherService;
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.client.CKanPublisherServiceAsync;
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.client.events.AddResourceEvent;
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.client.events.AddResourceEventHandler;
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.client.events.DeleteResourceEvent;
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.client.events.DeleteResourceEventHandler;
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.ResourceElementBean;
+//
+//import com.github.gwtbootstrap.client.ui.Accordion;
+//import com.github.gwtbootstrap.client.ui.AccordionGroup;
+//import com.github.gwtbootstrap.client.ui.Button;
+//import com.github.gwtbootstrap.client.ui.Paragraph;
+//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.event.shared.HandlerManager;
+//import com.google.gwt.uibinder.client.UiBinder;
+//import com.google.gwt.uibinder.client.UiField;
+//import com.google.gwt.user.client.rpc.AsyncCallback;
+//import com.google.gwt.user.client.ui.Composite;
+//import com.google.gwt.user.client.ui.VerticalPanel;
+//import com.google.gwt.user.client.ui.Widget;
+//
+///**
+// * A summary of the resources added by the user.
+// * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
+// */
+//public class AddedResourcesSummary extends Composite{
+//
+//	private static AddedResourcesSummaryUiBinder uiBinder = GWT
+//			.create(AddedResourcesSummaryUiBinder.class);
+//
+//	interface AddedResourcesSummaryUiBinder extends
+//	UiBinder<Widget, AddedResourcesSummary> {
+//	}
+//
+//	//Create a remote service proxy to talk to the server-side ckan service.
+//	private final CKanPublisherServiceAsync ckanServices = GWT.create(CKanPublisherService.class);
+//
+//	// Event bus
+//	private HandlerManager eventBus;
+//
+//	// list of added resources (beans)
+//	List<ResourceElementBean> addedResources;
+//
+//	@UiField VerticalPanel addResourcesPanel;
+//
+//	public AddedResourcesSummary(HandlerManager eventBus) {
+//		initWidget(uiBinder.createAndBindUi(this));
+//
+//		// save bus
+//		this.eventBus = eventBus;
+//
+//		// bind on add resource event
+//		bind();
+//
+//		// init list
+//		addedResources = new ArrayList<ResourceElementBean>();
+//	}
+//
+//	/**
+//	 * Bind on add/delete resource event
+//	 */
+//	private void bind() {
+//
+//		// when a new resource is added
+//		eventBus.addHandler(AddResourceEvent.TYPE, new AddResourceEventHandler() {
+//
+//			@Override
+//			public void onAddedResource(AddResourceEvent addResourceEvent) {
+//
+//				// get the resource
+//				final ResourceElementBean justAddedResource = addResourceEvent.getResource();
+//
+//				// Build an accordion to show resource info
+//				Accordion accordion = new Accordion();
+//				AccordionGroup accordionGroup = new AccordionGroup();
+//				accordionGroup.setHeading("- " + justAddedResource.getName());
+//				accordion.add(accordionGroup);
+//
+//				// add sub-info such as url and description
+//				Paragraph pUrl = new Paragraph();
+//				pUrl.setText("Url : " + justAddedResource.getUrl());
+//				Paragraph pDescription = new Paragraph();
+//				pDescription.setText("Description : " + justAddedResource.getDescription());
+//
+//				// button to delete the resource
+//				Button deleteButton = new Button();
+//				deleteButton.setText("Delete");
+//				deleteButton.addClickHandler(new ClickHandler() {
+//
+//					@Override
+//					public void onClick(ClickEvent event) {
+//
+//						eventBus.fireEvent(new DeleteResourceEvent(justAddedResource));
+//
+//					}
+//				});
+//
+//				// fill accordion
+//				accordionGroup.add(pUrl);
+//				accordionGroup.add(pDescription);
+//				accordionGroup.add(deleteButton);
+//
+//				// add to the list
+//				addedResources.add(justAddedResource);
+//
+//				// add to the panel
+//				addResourcesPanel.add(accordion);
+//			}
+//		});
+//
+//		// when the user wants to delete a resource
+//		eventBus.addHandler(DeleteResourceEvent.TYPE, new DeleteResourceEventHandler() {
+//
+//			@Override
+//			public void onDeletedResource(DeleteResourceEvent deleteResourceEvent) {
+//
+//				// to delete
+//				ResourceElementBean toDelete = deleteResourceEvent.getResource();
+//
+//				// find it
+//				for(int i = 0; i < addedResources.size(); i++){
+//
+//					if(addedResources.get(i).getOriginalIdInWorkspace().equals(toDelete.getOriginalIdInWorkspace())){
+//						
+//						// get the associated widget and remove it
+//						final Widget widget = addResourcesPanel.getWidget(i);
+//
+//						// remote call to remove it from the dataset
+//						ckanServices.deleteResourceFromDataset(toDelete, new AsyncCallback<Boolean>() {
+//
+//							@Override
+//							public void onSuccess(Boolean result) {
+//								
+//								if(result)
+//									widget.removeFromParent();
+//							}
+//
+//							@Override
+//							public void onFailure(Throwable caught) {
+//
+//							}
+//						});
+//						
+//						break;
+//					}
+//				}
+//				
+//				// remove from the list
+//				addedResources.remove(toDelete);
+//			}
+//		});
+//	}
+//}
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddedResourcesSummary.ui.xml b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddedResourcesSummary.ui.xml
index fcce11a..fb38fc8 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddedResourcesSummary.ui.xml
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/resources/AddedResourcesSummary.ui.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<!-- <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
 	xmlns:g="urn:import:com.google.gwt.user.client.ui">
 	<g:HTMLPanel>
 		<h3>Added Resources</h3>
 		<g:VerticalPanel ui:field="addResourcesPanel" width="100%"></g:VerticalPanel>
 	</g:HTMLPanel>
-</ui:UiBinder> 
\ No newline at end of file
+</ui:UiBinder>  -->
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/tags/TagsPanel.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/tags/TagsPanel.java
index 8fcc5ec..1a57ec5 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/tags/TagsPanel.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/tags/TagsPanel.java
@@ -1,279 +1,279 @@
-package org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.tags;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.gcube.portlets.user.gcubewidgets.client.elements.Span;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.utils.InfoIconsLabels;
-
-import com.github.gwtbootstrap.client.ui.ControlGroup;
-import com.github.gwtbootstrap.client.ui.Icon;
-import com.github.gwtbootstrap.client.ui.ListBox;
-import com.github.gwtbootstrap.client.ui.Popover;
-import com.github.gwtbootstrap.client.ui.TextBox;
-import com.github.gwtbootstrap.client.ui.base.ListItem;
-import com.github.gwtbootstrap.client.ui.constants.ControlGroupType;
-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.event.dom.client.KeyCodes;
-import com.google.gwt.event.dom.client.KeyDownEvent;
-import com.google.gwt.uibinder.client.UiBinder;
-import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.uibinder.client.UiHandler;
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.FlowPanel;
-import com.google.gwt.user.client.ui.FocusPanel;
-import com.google.gwt.user.client.ui.Widget;
-
-/**
- * Panel for tags.
- * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
- */
-public class TagsPanel extends Composite{
-
-	private static TagsPanelUiBinder uiBinder = GWT
-			.create(TagsPanelUiBinder.class);
-
-	interface TagsPanelUiBinder extends UiBinder<Widget, TagsPanel> {
-	}
-
-	@UiField TextBox tagsEnterTextBox;
-	@UiField FlowPanel tagsPanel;
-	@UiField Icon infoIconTags;
-	@UiField FocusPanel focusPanelTags;
-	@UiField Popover popoverTags;
-	@UiField ControlGroup tagsInsertGroup;
-	@UiField ListBox tagsEnterListBox;
-
-	// regular expression for tags
-	private static final String REGEX_TAG = "^[a-zA-Z0-9._-]*$";
-
-	// tags list
-	private List<String> tagsList = new ArrayList<String>();
-
-	// vocabulary
-	private List<String> vocabulary;
-
-	public TagsPanel() {
-		initWidget(uiBinder.createAndBindUi(this));
-		tagsEnterListBox.setVisible(false);
-		tagsList.clear();
-		tagsPanel.clear();
-	}
-
-
-	/**
-	 * Since we have a controlled vocabulary, we swap to a listbox with multiple selection
-	 * @param vocabularyTags
-	 */
-	public void setVocabulary(List<String> vocabularyTags) {
-
-		GWT.log("Vocabulary of tags is " + vocabularyTags);
-
-		if(vocabularyTags == null || vocabularyTags.isEmpty()){
-			vocabulary = null;
-			tagsEnterListBox.setVisible(false);
-			tagsPanel.setVisible(true);
-			tagsEnterTextBox.setVisible(true);
-		}else{
-			vocabulary = vocabularyTags;
-			tagsEnterListBox.clear();
-			tagsPanel.clear();
-			tagsList.clear();
-			for (String vocabularyTag : vocabularyTags) {
-				tagsEnterListBox.addItem(vocabularyTag, vocabularyTag);
-			}
-			tagsPanel.setVisible(false);
-			tagsEnterTextBox.setVisible(false);
-			tagsEnterListBox.setVisible(true);
-		}
-	}
-
-	/**
-	 * Prepare icons
-	 * @param popupOpenedIds
-	 */
-	public void prepareIcon(List<String> popupOpenedIds) {
-		InfoIconsLabels.preparePopupPanelAndPopover(
-				InfoIconsLabels.TAGS_INFO_ID_POPUP,
-				InfoIconsLabels.TAGS_INFO_TEXT,
-				InfoIconsLabels.TAGS_INFO_CAPTION,
-				infoIconTags,
-				popoverTags,
-				focusPanelTags,
-				popupOpenedIds
-				);
-	}
-
-	@UiHandler("tagsEnterTextBox")
-	void onAddTag(KeyDownEvent event){
-
-		if (event.getNativeKeyCode() == KeyCodes.KEY_ENTER) {
-			if (!tagsEnterTextBox.getValue().trim().isEmpty()) {
-
-				addTagElement(tagsEnterTextBox);
-
-			}
-		}
-	}
-
-	/**
-	 * Add the tag as an element (inserted by the user)
-	 */
-	private void addTagElement(TextBox itemBox){
-
-		if (itemBox.getValue() != null && !itemBox.getValue().trim().isEmpty()) {
-
-			if(tagsList.contains(itemBox.getValue().trim())){
-				itemBox.setValue("");
-				return;
-			}
-
-			// ckan accepts only alphanumeric values
-			String[] subTags = itemBox.getValue().trim().split(" ");
-			if(subTags.length == 1){
-				if(!subTags[0].matches(REGEX_TAG))
-					return;
-				if(subTags[0].length() <= 1)
-					return;
-			}else{
-				for (int i = 0; i < subTags.length; i++) {
-					String subTag = subTags[i];
-					if(!subTag.matches(REGEX_TAG))
-						return;
-				}
-			}
-
-			final String value = itemBox.getValue().trim();
-			final ListItem displayItem = new ListItem();
-			displayItem.setStyleName("tag-style");
-			Span tagText = new Span(itemBox.getValue());
-
-			Span tagRemove = new Span("x");
-			tagRemove.setTitle("Remove this tag");
-			tagRemove.addClickHandler(new ClickHandler() {
-				public void onClick(ClickEvent clickEvent) {
-					removeTag(displayItem, value);
-				}
-			});
-
-			tagRemove.setStyleName("tag-style-x");
-			displayItem.add(tagText);
-			displayItem.add(tagRemove);
-			itemBox.setValue("");
-			itemBox.setFocus(true);
-			tagsPanel.add(displayItem);
-			tagsList.add(value);
-		}
-	}
-
-	/**
-	 * Add the tag as an element (when publishing from workspace)
-	 */
-	public void addTagElement(final String tag){
-
-		if(tagsList.contains(tag))
-			return;
-
-		// ckan accepts only alphanumeric values
-		String[] subTags = tag.trim().split(" ");
-		if(subTags.length == 1){
-			if(!subTags[0].matches(REGEX_TAG))
-				return;
-			if(subTags[0].length() <= 1)
-				return;
-		}else{
-			for (int i = 0; i < subTags.length; i++) {
-				String subTag = subTags[i];
-				if(!subTag.matches(REGEX_TAG))
-					return;
-			}
-		}
-
-		final ListItem displayItem = new ListItem();
-		displayItem.setStyleName("tag-style");
-		Span p = new Span(tag);
-
-		Span span = new Span("x");
-		span.setTitle("Remove this tag");
-		span.addClickHandler(new ClickHandler() {
-			public void onClick(ClickEvent clickEvent) {
-				removeTag(displayItem, tag);
-			}
-		});
-
-		span.setStyleName("tag-style-x");
-		displayItem.add(p);
-		displayItem.add(span);
-		tagsPanel.add(displayItem);
-		tagsList.add(tag);
-	}
-
-	/**
-	 * Remove a tag from the list
-	 * @param displayItem
-	 */
-	private void removeTag(ListItem displayItem, String value) {
-
-		tagsList.remove(value.trim());
-		tagsPanel.remove(displayItem);
-
-	}
-
-	/**
-	 * Remove all inserted tags
-	 */
-	public void removeTags(){
-
-		tagsList.clear();
-		tagsPanel.clear();
-
-	}
-
-	/**
-	 * Return the tag list
-	 * @return
-	 */
-	public List<String> getTags() {
-
-		if(vocabulary == null){
-			return tagsList;
-		}else{
-
-			List<String> selected = new ArrayList<String>();
-			for(int i = 0; i < tagsEnterListBox.getItemCount(); i++){
-				if(tagsEnterListBox.isItemSelected(i))
-					selected.add(tagsEnterListBox.getItemText(i));
-			}
-			return selected;
-		}
-
-	}
-
-	/**
-	 * Freeze tags
-	 */
-	public void freeze() {
-		tagsEnterTextBox.setEnabled(false);
-		tagsEnterListBox.setEnabled(false);
-		for(int i = 0; i < tagsList.size(); i++){
-
-			// get tag widget
-			ListItem tagWidget = (ListItem)tagsPanel.getWidget(i);
-
-			// get the "x" span
-			tagWidget.getWidget(1).removeFromParent();
-
-		}
-	}
-
-	/**
-	 * Set the tag group panel type
-	 * @param none
-	 */
-	public void setGroupPanelType(ControlGroupType type) {
-		tagsInsertGroup.setType(type);
-	}
-}
\ No newline at end of file
+//package org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.tags;
+//
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//import org.gcube.portlets.user.gcubewidgets.client.elements.Span;
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.utils.InfoIconsLabels;
+//
+//import com.github.gwtbootstrap.client.ui.ControlGroup;
+//import com.github.gwtbootstrap.client.ui.Icon;
+//import com.github.gwtbootstrap.client.ui.ListBox;
+//import com.github.gwtbootstrap.client.ui.Popover;
+//import com.github.gwtbootstrap.client.ui.TextBox;
+//import com.github.gwtbootstrap.client.ui.base.ListItem;
+//import com.github.gwtbootstrap.client.ui.constants.ControlGroupType;
+//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.event.dom.client.KeyCodes;
+//import com.google.gwt.event.dom.client.KeyDownEvent;
+//import com.google.gwt.uibinder.client.UiBinder;
+//import com.google.gwt.uibinder.client.UiField;
+//import com.google.gwt.uibinder.client.UiHandler;
+//import com.google.gwt.user.client.ui.Composite;
+//import com.google.gwt.user.client.ui.FlowPanel;
+//import com.google.gwt.user.client.ui.FocusPanel;
+//import com.google.gwt.user.client.ui.Widget;
+//
+///**
+// * Panel for tags.
+// * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
+// */
+//public class TagsPanel extends Composite{
+//
+//	private static TagsPanelUiBinder uiBinder = GWT
+//			.create(TagsPanelUiBinder.class);
+//
+//	interface TagsPanelUiBinder extends UiBinder<Widget, TagsPanel> {
+//	}
+//
+//	@UiField TextBox tagsEnterTextBox;
+//	@UiField FlowPanel tagsPanel;
+//	@UiField Icon infoIconTags;
+//	@UiField FocusPanel focusPanelTags;
+//	@UiField Popover popoverTags;
+//	@UiField ControlGroup tagsInsertGroup;
+//	@UiField ListBox tagsEnterListBox;
+//
+//	// regular expression for tags
+//	private static final String REGEX_TAG = "^[a-zA-Z0-9._-]*$";
+//
+//	// tags list
+//	private List<String> tagsList = new ArrayList<String>();
+//
+//	// vocabulary
+//	private List<String> vocabulary;
+//
+//	public TagsPanel() {
+//		initWidget(uiBinder.createAndBindUi(this));
+//		tagsEnterListBox.setVisible(false);
+//		tagsList.clear();
+//		tagsPanel.clear();
+//	}
+//
+//
+//	/**
+//	 * Since we have a controlled vocabulary, we swap to a listbox with multiple selection
+//	 * @param vocabularyTags
+//	 */
+//	public void setVocabulary(List<String> vocabularyTags) {
+//
+//		GWT.log("Vocabulary of tags is " + vocabularyTags);
+//
+//		if(vocabularyTags == null || vocabularyTags.isEmpty()){
+//			vocabulary = null;
+//			tagsEnterListBox.setVisible(false);
+//			tagsPanel.setVisible(true);
+//			tagsEnterTextBox.setVisible(true);
+//		}else{
+//			vocabulary = vocabularyTags;
+//			tagsEnterListBox.clear();
+//			tagsPanel.clear();
+//			tagsList.clear();
+//			for (String vocabularyTag : vocabularyTags) {
+//				tagsEnterListBox.addItem(vocabularyTag, vocabularyTag);
+//			}
+//			tagsPanel.setVisible(false);
+//			tagsEnterTextBox.setVisible(false);
+//			tagsEnterListBox.setVisible(true);
+//		}
+//	}
+//
+//	/**
+//	 * Prepare icons
+//	 * @param popupOpenedIds
+//	 */
+//	public void prepareIcon(List<String> popupOpenedIds) {
+//		InfoIconsLabels.preparePopupPanelAndPopover(
+//				InfoIconsLabels.TAGS_INFO_ID_POPUP,
+//				InfoIconsLabels.TAGS_INFO_TEXT,
+//				InfoIconsLabels.TAGS_INFO_CAPTION,
+//				infoIconTags,
+//				popoverTags,
+//				focusPanelTags,
+//				popupOpenedIds
+//				);
+//	}
+//
+//	@UiHandler("tagsEnterTextBox")
+//	void onAddTag(KeyDownEvent event){
+//
+//		if (event.getNativeKeyCode() == KeyCodes.KEY_ENTER) {
+//			if (!tagsEnterTextBox.getValue().trim().isEmpty()) {
+//
+//				addTagElement(tagsEnterTextBox);
+//
+//			}
+//		}
+//	}
+//
+//	/**
+//	 * Add the tag as an element (inserted by the user)
+//	 */
+//	private void addTagElement(TextBox itemBox){
+//
+//		if (itemBox.getValue() != null && !itemBox.getValue().trim().isEmpty()) {
+//
+//			if(tagsList.contains(itemBox.getValue().trim())){
+//				itemBox.setValue("");
+//				return;
+//			}
+//
+//			// ckan accepts only alphanumeric values
+//			String[] subTags = itemBox.getValue().trim().split(" ");
+//			if(subTags.length == 1){
+//				if(!subTags[0].matches(REGEX_TAG))
+//					return;
+//				if(subTags[0].length() <= 1)
+//					return;
+//			}else{
+//				for (int i = 0; i < subTags.length; i++) {
+//					String subTag = subTags[i];
+//					if(!subTag.matches(REGEX_TAG))
+//						return;
+//				}
+//			}
+//
+//			final String value = itemBox.getValue().trim();
+//			final ListItem displayItem = new ListItem();
+//			displayItem.setStyleName("tag-style");
+//			Span tagText = new Span(itemBox.getValue());
+//
+//			Span tagRemove = new Span("x");
+//			tagRemove.setTitle("Remove this tag");
+//			tagRemove.addClickHandler(new ClickHandler() {
+//				public void onClick(ClickEvent clickEvent) {
+//					removeTag(displayItem, value);
+//				}
+//			});
+//
+//			tagRemove.setStyleName("tag-style-x");
+//			displayItem.add(tagText);
+//			displayItem.add(tagRemove);
+//			itemBox.setValue("");
+//			itemBox.setFocus(true);
+//			tagsPanel.add(displayItem);
+//			tagsList.add(value);
+//		}
+//	}
+//
+//	/**
+//	 * Add the tag as an element (when publishing from workspace)
+//	 */
+//	public void addTagElement(final String tag){
+//
+//		if(tagsList.contains(tag))
+//			return;
+//
+//		// ckan accepts only alphanumeric values
+//		String[] subTags = tag.trim().split(" ");
+//		if(subTags.length == 1){
+//			if(!subTags[0].matches(REGEX_TAG))
+//				return;
+//			if(subTags[0].length() <= 1)
+//				return;
+//		}else{
+//			for (int i = 0; i < subTags.length; i++) {
+//				String subTag = subTags[i];
+//				if(!subTag.matches(REGEX_TAG))
+//					return;
+//			}
+//		}
+//
+//		final ListItem displayItem = new ListItem();
+//		displayItem.setStyleName("tag-style");
+//		Span p = new Span(tag);
+//
+//		Span span = new Span("x");
+//		span.setTitle("Remove this tag");
+//		span.addClickHandler(new ClickHandler() {
+//			public void onClick(ClickEvent clickEvent) {
+//				removeTag(displayItem, tag);
+//			}
+//		});
+//
+//		span.setStyleName("tag-style-x");
+//		displayItem.add(p);
+//		displayItem.add(span);
+//		tagsPanel.add(displayItem);
+//		tagsList.add(tag);
+//	}
+//
+//	/**
+//	 * Remove a tag from the list
+//	 * @param displayItem
+//	 */
+//	private void removeTag(ListItem displayItem, String value) {
+//
+//		tagsList.remove(value.trim());
+//		tagsPanel.remove(displayItem);
+//
+//	}
+//
+//	/**
+//	 * Remove all inserted tags
+//	 */
+//	public void removeTags(){
+//
+//		tagsList.clear();
+//		tagsPanel.clear();
+//
+//	}
+//
+//	/**
+//	 * Return the tag list
+//	 * @return
+//	 */
+//	public List<String> getTags() {
+//
+//		if(vocabulary == null){
+//			return tagsList;
+//		}else{
+//
+//			List<String> selected = new ArrayList<String>();
+//			for(int i = 0; i < tagsEnterListBox.getItemCount(); i++){
+//				if(tagsEnterListBox.isItemSelected(i))
+//					selected.add(tagsEnterListBox.getItemText(i));
+//			}
+//			return selected;
+//		}
+//
+//	}
+//
+//	/**
+//	 * Freeze tags
+//	 */
+//	public void freeze() {
+//		tagsEnterTextBox.setEnabled(false);
+//		tagsEnterListBox.setEnabled(false);
+//		for(int i = 0; i < tagsList.size(); i++){
+//
+//			// get tag widget
+//			ListItem tagWidget = (ListItem)tagsPanel.getWidget(i);
+//
+//			// get the "x" span
+//			tagWidget.getWidget(1).removeFromParent();
+//
+//		}
+//	}
+//
+//	/**
+//	 * Set the tag group panel type
+//	 * @param none
+//	 */
+//	public void setGroupPanelType(ControlGroupType type) {
+//		tagsInsertGroup.setType(type);
+//	}
+//}
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/tags/TagsPanel.ui.xml b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/tags/TagsPanel.ui.xml
index c304907..4287d21 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/tags/TagsPanel.ui.xml
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/tags/TagsPanel.ui.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<!-- <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
 	xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:b="urn:import:com.github.gwtbootstrap.client.ui">
 	<ui:style>
@@ -33,4 +33,4 @@
 			</b:Controls>
 		</b:ControlGroup>
 	</g:HTMLPanel>
-</ui:UiBinder> 
\ No newline at end of file
+</ui:UiBinder>  -->
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/utils/GcubeDialogExtended.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/utils/GcubeDialogExtended.java
index cdb67e7..5966b12 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/utils/GcubeDialogExtended.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/utils/GcubeDialogExtended.java
@@ -1,155 +1,155 @@
-package org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.utils;
-
-import org.gcube.portlets.user.gcubewidgets.client.popup.GCubeDialog;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.workspace.ResourceInfoForm;
-
-import com.github.gwtbootstrap.client.ui.Paragraph;
-import com.google.gwt.core.shared.GWT;
-import com.google.gwt.dom.client.Element;
-import com.google.gwt.dom.client.EventTarget;
-import com.google.gwt.dom.client.Style.Cursor;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.event.dom.client.DoubleClickEvent;
-import com.google.gwt.event.dom.client.DoubleClickHandler;
-import com.google.gwt.user.client.ui.Anchor;
-import com.google.gwt.user.client.ui.FlexTable;
-import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.user.client.ui.HasHorizontalAlignment;
-import com.google.gwt.user.client.ui.Widget;
-
-/**
- * Extended version of the GcubeDialog with close symbol on the caption
- * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
- */
-public class GcubeDialogExtended extends GCubeDialog {
-
-	/**
-	 * For simple information
-	 * @param captionText
-	 * @param text
-	 */
-	public GcubeDialogExtended(String captionText, String text){
-
-		// add custom style
-		addStyleName("metadata-popup-panel");
-
-		// create an anchor to close the dialogbox
-		final Anchor closeAnchor = new Anchor("x");
-		closeAnchor.setTitle("Close");
-
-		// create a panel that will be put into the caption
-		FlexTable captionLayoutTable = new FlexTable();
-		captionLayoutTable.setText(0, 0, captionText);
-		captionLayoutTable.setWidget(0, 3, closeAnchor);
-		captionLayoutTable.getCellFormatter().setHorizontalAlignment(0, 3, HasHorizontalAlignment.ALIGN_RIGHT);
-		captionLayoutTable.setWidth("100%");
-		HTML caption = (HTML) getCaption();
-		caption.getElement().getStyle().setCursor(Cursor.MOVE);
-		caption.getElement().appendChild(captionLayoutTable.getElement());
-		caption.addClickHandler(new ClickHandler() {
-			@Override
-			public void onClick(ClickEvent event) {
-				// get the event
-				EventTarget target = event.getNativeEvent().getEventTarget();
-				Element targetElement = (Element) target.cast();
-
-				// fire the event to the anchor
-				if (targetElement == closeAnchor.getElement()) {
-					closeAnchor.fireEvent(event);
-				}
-			}
-		});
-		closeAnchor.addClickHandler(new ClickHandler() {
-
-			@Override
-			public void onClick(ClickEvent event) {
-				hide();
-			}
-		});
-		add(new Paragraph(text));
-	}
-
-	/**
-	 * For simple information
-	 * @param captionText
-	 * @param text
-	 */
-	public GcubeDialogExtended(final ResourceInfoForm form){
-
-		// add custom style
-		addStyleName("metadata-popup-panel");
-
-		// create an anchor to close the dialogbox
-		final Anchor closeAnchor = new Anchor("x");
-		closeAnchor.setTitle("Close");
-		closeAnchor.addClickHandler(new ClickHandler() {
-			@Override
-			public void onClick(ClickEvent event) {
-				hide();
-			}
-		});
-
-		// create a panel that will be put into the caption
-		FlexTable captionLayoutTable = new FlexTable();
-		captionLayoutTable.setText(0, 0, "About Resource");
-		captionLayoutTable.setWidget(0, 3, closeAnchor);
-		captionLayoutTable.getCellFormatter().setHorizontalAlignment(0, 3, HasHorizontalAlignment.ALIGN_RIGHT);
-		captionLayoutTable.setWidth("100%");
-		HTML caption = (HTML) getCaption();
-		caption.getElement().getStyle().setCursor(Cursor.MOVE);
-		caption.getElement().appendChild(captionLayoutTable.getElement());
-		caption.addClickHandler(new ClickHandler() {
-			@Override
-			public void onClick(ClickEvent event) {
-				EventTarget target = event.getNativeEvent().getEventTarget();
-				Element targetElement = (Element) target.cast();
-				if (targetElement == closeAnchor.getElement()) {
-					closeAnchor.fireEvent(event);
-				}
-			}
-		});
-
-		setWidget(form);
-		Widget widget = getWidget();
-
-		ClickHandler click = new ClickHandler() {
-			@Override
-			public void onClick(ClickEvent event) {
-				EventTarget target = event.getNativeEvent().getEventTarget();
-				Element targetElement = (Element) target.cast();
-				GWT.log("Target elem is " + targetElement);
-				if (targetElement == form.resourceDescription.getElement()) {
-					GWT.log("Fired click");
-					form.resourceDescription.fireEvent(event);
-				}else if (targetElement == form.resourceName.getElement()) {
-					GWT.log("Fired click");
-					form.resourceName.fireEvent(event);
-				}else if(targetElement == form.getElement()){
-					form.fireEvent(event);
-				}
-			}
-		};
-		widget.addDomHandler(click, ClickEvent.getType());
-
-		widget.addDomHandler(new DoubleClickHandler() {
-
-			@Override
-			public void onDoubleClick(DoubleClickEvent event) {
-				EventTarget target = event.getNativeEvent().getEventTarget();
-				Element targetElement = (Element) target.cast();
-				GWT.log("Target elem is " + targetElement);
-				if (targetElement == form.resourceDescription.getElement()) {
-					GWT.log("Fired click");
-					form.resourceDescription.fireEvent(event);
-				}else if (targetElement == form.resourceName.getElement()) {
-					GWT.log("Fired click");
-					form.resourceName.fireEvent(event);
-				}else if(targetElement == form.getElement()){
-					form.fireEvent(event);
-				}
-			}
-		}, DoubleClickEvent.getType());
-	}
-
-}
+//package org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.utils;
+//
+//import org.gcube.portlets.user.gcubewidgets.client.popup.GCubeDialog;
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.workspace.ResourceInfoForm;
+//
+//import com.github.gwtbootstrap.client.ui.Paragraph;
+//import com.google.gwt.core.shared.GWT;
+//import com.google.gwt.dom.client.Element;
+//import com.google.gwt.dom.client.EventTarget;
+//import com.google.gwt.dom.client.Style.Cursor;
+//import com.google.gwt.event.dom.client.ClickEvent;
+//import com.google.gwt.event.dom.client.ClickHandler;
+//import com.google.gwt.event.dom.client.DoubleClickEvent;
+//import com.google.gwt.event.dom.client.DoubleClickHandler;
+//import com.google.gwt.user.client.ui.Anchor;
+//import com.google.gwt.user.client.ui.FlexTable;
+//import com.google.gwt.user.client.ui.HTML;
+//import com.google.gwt.user.client.ui.HasHorizontalAlignment;
+//import com.google.gwt.user.client.ui.Widget;
+//
+///**
+// * Extended version of the GcubeDialog with close symbol on the caption
+// * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
+// */
+//public class GcubeDialogExtended extends GCubeDialog {
+//
+//	/**
+//	 * For simple information
+//	 * @param captionText
+//	 * @param text
+//	 */
+//	public GcubeDialogExtended(String captionText, String text){
+//
+//		// add custom style
+//		addStyleName("metadata-popup-panel");
+//
+//		// create an anchor to close the dialogbox
+//		final Anchor closeAnchor = new Anchor("x");
+//		closeAnchor.setTitle("Close");
+//
+//		// create a panel that will be put into the caption
+//		FlexTable captionLayoutTable = new FlexTable();
+//		captionLayoutTable.setText(0, 0, captionText);
+//		captionLayoutTable.setWidget(0, 3, closeAnchor);
+//		captionLayoutTable.getCellFormatter().setHorizontalAlignment(0, 3, HasHorizontalAlignment.ALIGN_RIGHT);
+//		captionLayoutTable.setWidth("100%");
+//		HTML caption = (HTML) getCaption();
+//		caption.getElement().getStyle().setCursor(Cursor.MOVE);
+//		caption.getElement().appendChild(captionLayoutTable.getElement());
+//		caption.addClickHandler(new ClickHandler() {
+//			@Override
+//			public void onClick(ClickEvent event) {
+//				// get the event
+//				EventTarget target = event.getNativeEvent().getEventTarget();
+//				Element targetElement = (Element) target.cast();
+//
+//				// fire the event to the anchor
+//				if (targetElement == closeAnchor.getElement()) {
+//					closeAnchor.fireEvent(event);
+//				}
+//			}
+//		});
+//		closeAnchor.addClickHandler(new ClickHandler() {
+//
+//			@Override
+//			public void onClick(ClickEvent event) {
+//				hide();
+//			}
+//		});
+//		add(new Paragraph(text));
+//	}
+//
+//	/**
+//	 * For simple information
+//	 * @param captionText
+//	 * @param text
+//	 */
+//	public GcubeDialogExtended(final ResourceInfoForm form){
+//
+//		// add custom style
+//		addStyleName("metadata-popup-panel");
+//
+//		// create an anchor to close the dialogbox
+//		final Anchor closeAnchor = new Anchor("x");
+//		closeAnchor.setTitle("Close");
+//		closeAnchor.addClickHandler(new ClickHandler() {
+//			@Override
+//			public void onClick(ClickEvent event) {
+//				hide();
+//			}
+//		});
+//
+//		// create a panel that will be put into the caption
+//		FlexTable captionLayoutTable = new FlexTable();
+//		captionLayoutTable.setText(0, 0, "About Resource");
+//		captionLayoutTable.setWidget(0, 3, closeAnchor);
+//		captionLayoutTable.getCellFormatter().setHorizontalAlignment(0, 3, HasHorizontalAlignment.ALIGN_RIGHT);
+//		captionLayoutTable.setWidth("100%");
+//		HTML caption = (HTML) getCaption();
+//		caption.getElement().getStyle().setCursor(Cursor.MOVE);
+//		caption.getElement().appendChild(captionLayoutTable.getElement());
+//		caption.addClickHandler(new ClickHandler() {
+//			@Override
+//			public void onClick(ClickEvent event) {
+//				EventTarget target = event.getNativeEvent().getEventTarget();
+//				Element targetElement = (Element) target.cast();
+//				if (targetElement == closeAnchor.getElement()) {
+//					closeAnchor.fireEvent(event);
+//				}
+//			}
+//		});
+//
+//		setWidget(form);
+//		Widget widget = getWidget();
+//
+//		ClickHandler click = new ClickHandler() {
+//			@Override
+//			public void onClick(ClickEvent event) {
+//				EventTarget target = event.getNativeEvent().getEventTarget();
+//				Element targetElement = (Element) target.cast();
+//				GWT.log("Target elem is " + targetElement);
+//				if (targetElement == form.resourceDescription.getElement()) {
+//					GWT.log("Fired click");
+//					form.resourceDescription.fireEvent(event);
+//				}else if (targetElement == form.resourceName.getElement()) {
+//					GWT.log("Fired click");
+//					form.resourceName.fireEvent(event);
+//				}else if(targetElement == form.getElement()){
+//					form.fireEvent(event);
+//				}
+//			}
+//		};
+//		widget.addDomHandler(click, ClickEvent.getType());
+//
+//		widget.addDomHandler(new DoubleClickHandler() {
+//
+//			@Override
+//			public void onDoubleClick(DoubleClickEvent event) {
+//				EventTarget target = event.getNativeEvent().getEventTarget();
+//				Element targetElement = (Element) target.cast();
+//				GWT.log("Target elem is " + targetElement);
+//				if (targetElement == form.resourceDescription.getElement()) {
+//					GWT.log("Fired click");
+//					form.resourceDescription.fireEvent(event);
+//				}else if (targetElement == form.resourceName.getElement()) {
+//					GWT.log("Fired click");
+//					form.resourceName.fireEvent(event);
+//				}else if(targetElement == form.getElement()){
+//					form.fireEvent(event);
+//				}
+//			}
+//		}, DoubleClickEvent.getType());
+//	}
+//
+//}
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/utils/InfoIconsLabels.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/utils/InfoIconsLabels.java
index ebe779f..2151d85 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/utils/InfoIconsLabels.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/utils/InfoIconsLabels.java
@@ -2,6 +2,8 @@ package org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.utils;
 
 import java.util.List;
 
+import org.gcube.portlets.widgets.mpformbuilder.client.ui.utils.GcubeDialogExtended;
+
 import com.github.gwtbootstrap.client.ui.Icon;
 import com.github.gwtbootstrap.client.ui.Popover;
 import com.google.gwt.core.client.GWT;
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/utils/LoaderIcon.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/utils/LoaderIcon.java
index fd0ad9c..baaaf7f 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/utils/LoaderIcon.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/utils/LoaderIcon.java
@@ -1,62 +1,62 @@
-/**
- * 
- */
-package org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.utils;
-
-
-import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.icons.Images;
-
-import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.Image;
-
-/**
- * The Class LoaderIcon.
- *
- * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
- * Feb 19, 2015
- */
-public class LoaderIcon extends HorizontalPanel{
-	
-
-	private Image imgLoading = new Image(Images.ICONS.loading());
-	private HTML txtLoading = new HTML("");
-	
-	/**
-	 * Instantiates a new loader icon.
-	 *
-	 * @param txtHTML the txt html
-	 */
-	public LoaderIcon(String txtHTML) {
-		this();
-		setText(txtHTML);
-	}
-	
-	/**
-	 * Instantiates a new loader icon.
-	 */
-	public LoaderIcon() {
-		setStyleName("marginTop20");
-		add(imgLoading);
-		add(txtLoading);
-	}
-	
-	/**
-	 * Sets the text.
-	 *
-	 * @param txtHTML the new text
-	 */
-	public void setText(String txtHTML){
-		txtLoading.setHTML("<span style=\"margin-left:5px; vertical-align:middle;\">"+txtHTML+"</span>");
-	}
-	
-	/**
-	 * Show.
-	 *
-	 * @param bool the bool
-	 */
-	public void show(boolean bool){
-		this.setVisible(bool);
-	}
-
-}
+///**
+// * 
+// */
+//package org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.utils;
+//
+//
+//import org.gcube.portlets.widgets.ckandatapublisherwidget.client.ui.icons.Images;
+//
+//import com.google.gwt.user.client.ui.HTML;
+//import com.google.gwt.user.client.ui.HorizontalPanel;
+//import com.google.gwt.user.client.ui.Image;
+//
+///**
+// * The Class LoaderIcon.
+// *
+// * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
+// * Feb 19, 2015
+// */
+//public class LoaderIcon extends HorizontalPanel{
+//	
+//
+//	private Image imgLoading = new Image(Images.ICONS.loading());
+//	private HTML txtLoading = new HTML("");
+//	
+//	/**
+//	 * Instantiates a new loader icon.
+//	 *
+//	 * @param txtHTML the txt html
+//	 */
+//	public LoaderIcon(String txtHTML) {
+//		this();
+//		setText(txtHTML);
+//	}
+//	
+//	/**
+//	 * Instantiates a new loader icon.
+//	 */
+//	public LoaderIcon() {
+//		setStyleName("marginTop20");
+//		add(imgLoading);
+//		add(txtLoading);
+//	}
+//	
+//	/**
+//	 * Sets the text.
+//	 *
+//	 * @param txtHTML the new text
+//	 */
+//	public void setText(String txtHTML){
+//		txtLoading.setHTML("<span style=\"margin-left:5px; vertical-align:middle;\">"+txtHTML+"</span>");
+//	}
+//	
+//	/**
+//	 * Show.
+//	 *
+//	 * @param bool the bool
+//	 */
+//	public void show(boolean bool){
+//		this.setVisible(bool);
+//	}
+//
+//}
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java
index b2f1658..f9ef26c 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java
@@ -33,8 +33,8 @@ import org.gcube.portlets.widgets.ckandatapublisherwidget.server.utils.Workspace
 import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.DatasetBean;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.OrganizationBean;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.ResourceElementBean;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.licenses.LicenseBean;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.MetaDataProfileBean;
+import org.gcube.portlets.widgets.mpformbuilder.shared.license.LicenseBean;
+import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.MetaDataProfileBean;
 import org.gcube.vomanagement.usermanagement.GroupManager;
 import org.gcube.vomanagement.usermanagement.UserManager;
 import org.gcube.vomanagement.usermanagement.exception.GroupRetrievalFault;
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/MetadataDiscovery.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/MetadataDiscovery.java
index 1830ebf..fb92e3f 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/MetadataDiscovery.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/MetadataDiscovery.java
@@ -21,13 +21,13 @@ import org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.MetadataVocabulary;
 import org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.NamespaceCategory;
 import org.gcube.datacatalogue.utillibrary.server.utils.CatalogueUtilMethods;
 import org.gcube.datacatalogue.utillibrary.server.utils.SessionCatalogueAttributes;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.CategoryWrapper;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.DataTypeWrapper;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.FieldAsGroup;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.FieldAsTag;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.MetaDataProfileBean;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.MetadataFieldWrapper;
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.TaggingGroupingValue;
+import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.CategoryWrapper;
+import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.DataTypeWrapper;
+import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.FieldAsGroup;
+import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.FieldAsTag;
+import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.MetaDataProfileBean;
+import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.MetadataFieldWrapper;
+import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.TaggingGroupingValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/DatasetBean.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/DatasetBean.java
index 8c6652c..f6c3fd1 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/DatasetBean.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/DatasetBean.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
-import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata.MetaDataProfileBean;
+import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.MetaDataProfileBean;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
 
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/licenses/LicenseBean.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/licenses/LicenseBean.java
index 2b368ed..56c85f7 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/licenses/LicenseBean.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/licenses/LicenseBean.java
@@ -1,52 +1,52 @@
-package org.gcube.portlets.widgets.ckandatapublisherwidget.shared.licenses;
-
-import java.io.Serializable;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * A license bean like the ckan's one.
- * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
- */
-public class LicenseBean implements Serializable, IsSerializable{
-
-	private static final long serialVersionUID = -2079275598877326206L;
-	private String title;
-	private String url;
-	
-	public LicenseBean() {
-		super();
-	}
-
-	public LicenseBean(String title, String url) {
-		super();
-		this.title = title;
-		this.url = url;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public String getUrl() {
-		return url;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-	
-	@Override
-	public boolean equals(Object obj) {
-		return obj.getClass().equals(this.getClass()) && ((LicenseBean)obj).getTitle().equals(this.title);
-	}
-
-	@Override
-	public String toString() {
-		return "LicenseBean [title=" + title + ", url=" + url + "]";
-	}
-}
+//package org.gcube.portlets.widgets.ckandatapublisherwidget.shared.licenses;
+//
+//import java.io.Serializable;
+//
+//import com.google.gwt.user.client.rpc.IsSerializable;
+//
+///**
+// * A license bean like the ckan's one.
+// * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
+// */
+//public class LicenseBean implements Serializable, IsSerializable{
+//
+//	private static final long serialVersionUID = -2079275598877326206L;
+//	private String title;
+//	private String url;
+//	
+//	public LicenseBean() {
+//		super();
+//	}
+//
+//	public LicenseBean(String title, String url) {
+//		super();
+//		this.title = title;
+//		this.url = url;
+//	}
+//
+//	public String getTitle() {
+//		return title;
+//	}
+//
+//	public void setTitle(String title) {
+//		this.title = title;
+//	}
+//
+//	public String getUrl() {
+//		return url;
+//	}
+//
+//	public void setUrl(String url) {
+//		this.url = url;
+//	}
+//	
+//	@Override
+//	public boolean equals(Object obj) {
+//		return obj.getClass().equals(this.getClass()) && ((LicenseBean)obj).getTitle().equals(this.title);
+//	}
+//
+//	@Override
+//	public String toString() {
+//		return "LicenseBean [title=" + title + ", url=" + url + "]";
+//	}
+//}
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/CategoryWrapper.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/CategoryWrapper.java
index ad42404..701675f 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/CategoryWrapper.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/CategoryWrapper.java
@@ -1,77 +1,77 @@
-package org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata;
-
-import java.io.Serializable;
-import java.util.List;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * A wrapper for the MetadataCategory class.
- * @see org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.MetadataCategory
- * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
- */
-public class CategoryWrapper implements Serializable, IsSerializable{
-
-	private static final long serialVersionUID = -1949961285656672831L;
-	private String id;
-	private String title;
-	private String description;
-	private List<MetadataFieldWrapper> fieldsForThisCategory;
-
-	public CategoryWrapper() {
-		super();
-	}
-
-	public CategoryWrapper(String id, String title, String description) {
-		super();
-		this.id = id;
-		this.title = title;
-		this.description = description;
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public List<MetadataFieldWrapper> getFieldsForThisCategory() {
-		return fieldsForThisCategory;
-	}
-
-	public void setFieldsForThisCategory(
-			List<MetadataFieldWrapper> fieldsForThisCategory) {
-		this.fieldsForThisCategory = fieldsForThisCategory;
-	}
-
-	@Override
-	public String toString() {
-		return "CategoryWrapper ["
-				+ (id != null ? "id=" + id + ", " : "")
-				+ (title != null ? "title=" + title + ", " : "")
-				+ (description != null ? "description=" + description + ", "
-						: "")
-				+ (fieldsForThisCategory != null ? "fieldsForThisCategory="
-						+ fieldsForThisCategory.size() : "") + "]";
-	}
-
-
-}
+//package org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata;
+//
+//import java.io.Serializable;
+//import java.util.List;
+//
+//import com.google.gwt.user.client.rpc.IsSerializable;
+//
+///**
+// * A wrapper for the MetadataCategory class.
+// * @see org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.MetadataCategory
+// * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
+// */
+//public class CategoryWrapper implements Serializable, IsSerializable{
+//
+//	private static final long serialVersionUID = -1949961285656672831L;
+//	private String id;
+//	private String title;
+//	private String description;
+//	private List<MetadataFieldWrapper> fieldsForThisCategory;
+//
+//	public CategoryWrapper() {
+//		super();
+//	}
+//
+//	public CategoryWrapper(String id, String title, String description) {
+//		super();
+//		this.id = id;
+//		this.title = title;
+//		this.description = description;
+//	}
+//
+//	public String getId() {
+//		return id;
+//	}
+//
+//	public void setId(String id) {
+//		this.id = id;
+//	}
+//
+//	public String getTitle() {
+//		return title;
+//	}
+//
+//	public void setTitle(String title) {
+//		this.title = title;
+//	}
+//
+//	public String getDescription() {
+//		return description;
+//	}
+//
+//	public void setDescription(String description) {
+//		this.description = description;
+//	}
+//
+//	public List<MetadataFieldWrapper> getFieldsForThisCategory() {
+//		return fieldsForThisCategory;
+//	}
+//
+//	public void setFieldsForThisCategory(
+//			List<MetadataFieldWrapper> fieldsForThisCategory) {
+//		this.fieldsForThisCategory = fieldsForThisCategory;
+//	}
+//
+//	@Override
+//	public String toString() {
+//		return "CategoryWrapper ["
+//				+ (id != null ? "id=" + id + ", " : "")
+//				+ (title != null ? "title=" + title + ", " : "")
+//				+ (description != null ? "description=" + description + ", "
+//						: "")
+//				+ (fieldsForThisCategory != null ? "fieldsForThisCategory="
+//						+ fieldsForThisCategory.size() : "") + "]";
+//	}
+//
+//
+//}
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/DataTypeWrapper.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/DataTypeWrapper.java
index 528022f..e748288 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/DataTypeWrapper.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/DataTypeWrapper.java
@@ -1,26 +1,26 @@
-package org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata;
-
-/**
- * Data type.
- * @see org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.DataType
- * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
- */
-public enum DataTypeWrapper {
-
-	String,
-	Time,
-	Time_Interval,
-	Times_ListOf,
-	Text,
-	Boolean,
-	Number,
-	GeoJSON;
-
-	/**
-	 * Value as String.
-	 * @return the string
-	 */
-	public String value() {
-		return name();
-	}
-}
+//package org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata;
+//
+///**
+// * Data type.
+// * @see org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.DataType
+// * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
+// */
+//public enum DataTypeWrapper {
+//
+//	String,
+//	Time,
+//	Time_Interval,
+//	Times_ListOf,
+//	Text,
+//	Boolean,
+//	Number,
+//	GeoJSON;
+//
+//	/**
+//	 * Value as String.
+//	 * @return the string
+//	 */
+//	public String value() {
+//		return name();
+//	}
+//}
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/FieldAsGroup.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/FieldAsGroup.java
index 311c745..ff5be6f 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/FieldAsGroup.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/FieldAsGroup.java
@@ -1,62 +1,62 @@
-/**
- *
- */
-package org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata;
-
-import java.io.Serializable;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * To be used when a field must be used to create a group.
- * @see org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.MetadataGrouping
- * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
- */
-public class FieldAsGroup implements Serializable, IsSerializable{
-
-	private static final long serialVersionUID = 8096886403417944385L;
-	private boolean create;
-	private boolean isPropagateUp;
-	private TaggingGroupingValue groupingValue;
-
-	public FieldAsGroup() {
-		super();
-	}
-
-	public FieldAsGroup(boolean create, TaggingGroupingValue groupingValue, boolean isPropagateUp) {
-		this.isPropagateUp = isPropagateUp;
-		this.create = create;
-		this.groupingValue = groupingValue;
-	}
-
-	public boolean getCreate() {
-		return create;
-	}
-
-	public void setCreate(Boolean create) {
-		this.create = create;
-	}
-
-	public TaggingGroupingValue getGroupingValue() {
-		return groupingValue;
-	}
-
-	public void setGroupingValue(TaggingGroupingValue groupingValue) {
-		this.groupingValue = groupingValue;
-	}
-
-	public boolean isPropagateUp() {
-		return isPropagateUp;
-	}
-
-	public void setPropagateUp(boolean isPropagateUp) {
-		this.isPropagateUp = isPropagateUp;
-	}
-
-	@Override
-	public String toString() {
-		return "FieldAsGroup [create=" + create + ", isPropagateUp="
-				+ isPropagateUp + ", groupingValue=" + groupingValue + "]";
-	}
-
-}
+///**
+// *
+// */
+//package org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata;
+//
+//import java.io.Serializable;
+//
+//import com.google.gwt.user.client.rpc.IsSerializable;
+//
+///**
+// * To be used when a field must be used to create a group.
+// * @see org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.MetadataGrouping
+// * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
+// */
+//public class FieldAsGroup implements Serializable, IsSerializable{
+//
+//	private static final long serialVersionUID = 8096886403417944385L;
+//	private boolean create;
+//	private boolean isPropagateUp;
+//	private TaggingGroupingValue groupingValue;
+//
+//	public FieldAsGroup() {
+//		super();
+//	}
+//
+//	public FieldAsGroup(boolean create, TaggingGroupingValue groupingValue, boolean isPropagateUp) {
+//		this.isPropagateUp = isPropagateUp;
+//		this.create = create;
+//		this.groupingValue = groupingValue;
+//	}
+//
+//	public boolean getCreate() {
+//		return create;
+//	}
+//
+//	public void setCreate(Boolean create) {
+//		this.create = create;
+//	}
+//
+//	public TaggingGroupingValue getGroupingValue() {
+//		return groupingValue;
+//	}
+//
+//	public void setGroupingValue(TaggingGroupingValue groupingValue) {
+//		this.groupingValue = groupingValue;
+//	}
+//
+//	public boolean isPropagateUp() {
+//		return isPropagateUp;
+//	}
+//
+//	public void setPropagateUp(boolean isPropagateUp) {
+//		this.isPropagateUp = isPropagateUp;
+//	}
+//
+//	@Override
+//	public String toString() {
+//		return "FieldAsGroup [create=" + create + ", isPropagateUp="
+//				+ isPropagateUp + ", groupingValue=" + groupingValue + "]";
+//	}
+//
+//}
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/FieldAsTag.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/FieldAsTag.java
index 243982b..27840ca 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/FieldAsTag.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/FieldAsTag.java
@@ -1,62 +1,62 @@
-
-package org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata;
-
-import java.io.Serializable;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/** 
- * To be used when a field must be used to create a tag.
- * @see org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.MetadataTagging
- * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
- */
-public class FieldAsTag implements Serializable, IsSerializable{
-
-	private static final long serialVersionUID = 5414077853964288094L;
-	public static final String DEFAULT_SEPARATOR = "-";
-	private boolean create;
-	private String separator = DEFAULT_SEPARATOR;
-	private TaggingGroupingValue taggingValue;
-
-	public FieldAsTag() {
-		super();
-	}
-
-	public FieldAsTag(Boolean create, String separator, TaggingGroupingValue taggingValue) {
-		super();
-		this.create = create;
-		this.separator = separator;
-		this.taggingValue = taggingValue;
-	}
-
-	public boolean isCreate() {
-		return create;
-	}
-
-	public void setCreate(boolean create) {
-		this.create = create;
-	}
-
-	public String getSeparator() {
-		return separator;
-	}
-
-	public void setSeparator(String separator) {
-		this.separator = separator;
-	}
-
-	public TaggingGroupingValue getTaggingValue() {
-		return taggingValue;
-	}
-
-	public void setTaggingValue(TaggingGroupingValue taggingValue) {
-		this.taggingValue = taggingValue;
-	}
-
-	@Override
-	public String toString() {
-		return "FieldAsTag [create=" + create + ", separator=" + separator
-				+ ", taggingValue=" + taggingValue + "]";
-	}
-
-}
+//
+//package org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata;
+//
+//import java.io.Serializable;
+//
+//import com.google.gwt.user.client.rpc.IsSerializable;
+//
+///** 
+// * To be used when a field must be used to create a tag.
+// * @see org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.MetadataTagging
+// * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
+// */
+//public class FieldAsTag implements Serializable, IsSerializable{
+//
+//	private static final long serialVersionUID = 5414077853964288094L;
+//	public static final String DEFAULT_SEPARATOR = "-";
+//	private boolean create;
+//	private String separator = DEFAULT_SEPARATOR;
+//	private TaggingGroupingValue taggingValue;
+//
+//	public FieldAsTag() {
+//		super();
+//	}
+//
+//	public FieldAsTag(Boolean create, String separator, TaggingGroupingValue taggingValue) {
+//		super();
+//		this.create = create;
+//		this.separator = separator;
+//		this.taggingValue = taggingValue;
+//	}
+//
+//	public boolean isCreate() {
+//		return create;
+//	}
+//
+//	public void setCreate(boolean create) {
+//		this.create = create;
+//	}
+//
+//	public String getSeparator() {
+//		return separator;
+//	}
+//
+//	public void setSeparator(String separator) {
+//		this.separator = separator;
+//	}
+//
+//	public TaggingGroupingValue getTaggingValue() {
+//		return taggingValue;
+//	}
+//
+//	public void setTaggingValue(TaggingGroupingValue taggingValue) {
+//		this.taggingValue = taggingValue;
+//	}
+//
+//	@Override
+//	public String toString() {
+//		return "FieldAsTag [create=" + create + ", separator=" + separator
+//				+ ", taggingValue=" + taggingValue + "]";
+//	}
+//
+//}
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/MetaDataProfileBean.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/MetaDataProfileBean.java
index bad04db..aebf2bf 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/MetaDataProfileBean.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/MetaDataProfileBean.java
@@ -1,88 +1,88 @@
-package org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata;
-
-import java.io.Serializable;
-import java.util.List;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * A MetaDataProfileBean with its children (MetaDataType, MetaDataFields, Categories)
- * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
- */
-public class MetaDataProfileBean implements Serializable, IsSerializable{
-
-	private static final long serialVersionUID = -7377022025375553568L;
-
-	private String type;
-	private String title;
-	private List<CategoryWrapper> categories;
-	private List<MetadataFieldWrapper> metadataFields;
-
-	public MetaDataProfileBean(){
-		super();
-	}
-	public MetaDataProfileBean(String type,
-			String title,
-			List<MetadataFieldWrapper> metadataFields,
-			List<CategoryWrapper> categories) {
-		super();
-		this.type = type;
-		this.title = title;
-		this.categories = categories;
-		this.metadataFields = metadataFields;
-	}
-
-	/**
-	 * @return the type
-	 */
-	public String getType() {
-		return type;
-	}
-	/**
-	 * @param type the type to set
-	 */
-	public void setType(String type) {
-		this.type = type;
-	}
-	/**
-	 * @return the metadataFields
-	 */
-	public List<MetadataFieldWrapper> getMetadataFields() {
-		return metadataFields;
-	}
-	/**
-	 * @param metadataFields the metadataFields to set
-	 */
-	public void setMetadataFields(List<MetadataFieldWrapper> metadataFields) {
-		this.metadataFields = metadataFields;
-	}
-
-	public List<CategoryWrapper> getCategories() {
-		return categories;
-	}
-
-	public void setCategories(List<CategoryWrapper> categories) {
-		this.categories = categories;
-	}
-	public String getTitle() {
-		return title;
-	}
-	public void setTitle(String title) {
-		this.title = title;
-	}
-	@Override
-	public String toString() {
-		final int maxLen = 10;
-		return "MetaDataProfileBean [type="
-				+ type
-				+ ", title="
-				+ title
-				+ ", categories="
-				+ (categories != null ? categories.subList(0,
-						Math.min(categories.size(), maxLen)) : null)
-				+ ", metadataFields="
-				+ (metadataFields != null ? metadataFields.subList(0,
-						Math.min(metadataFields.size(), maxLen)) : null) + "]";
-	}
-	
-}
+//package org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata;
+//
+//import java.io.Serializable;
+//import java.util.List;
+//
+//import com.google.gwt.user.client.rpc.IsSerializable;
+//
+///**
+// * A MetaDataProfileBean with its children (MetaDataType, MetaDataFields, Categories)
+// * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
+// */
+//public class MetaDataProfileBean implements Serializable, IsSerializable{
+//
+//	private static final long serialVersionUID = -7377022025375553568L;
+//
+//	private String type;
+//	private String title;
+//	private List<CategoryWrapper> categories;
+//	private List<MetadataFieldWrapper> metadataFields;
+//
+//	public MetaDataProfileBean(){
+//		super();
+//	}
+//	public MetaDataProfileBean(String type,
+//			String title,
+//			List<MetadataFieldWrapper> metadataFields,
+//			List<CategoryWrapper> categories) {
+//		super();
+//		this.type = type;
+//		this.title = title;
+//		this.categories = categories;
+//		this.metadataFields = metadataFields;
+//	}
+//
+//	/**
+//	 * @return the type
+//	 */
+//	public String getType() {
+//		return type;
+//	}
+//	/**
+//	 * @param type the type to set
+//	 */
+//	public void setType(String type) {
+//		this.type = type;
+//	}
+//	/**
+//	 * @return the metadataFields
+//	 */
+//	public List<MetadataFieldWrapper> getMetadataFields() {
+//		return metadataFields;
+//	}
+//	/**
+//	 * @param metadataFields the metadataFields to set
+//	 */
+//	public void setMetadataFields(List<MetadataFieldWrapper> metadataFields) {
+//		this.metadataFields = metadataFields;
+//	}
+//
+//	public List<CategoryWrapper> getCategories() {
+//		return categories;
+//	}
+//
+//	public void setCategories(List<CategoryWrapper> categories) {
+//		this.categories = categories;
+//	}
+//	public String getTitle() {
+//		return title;
+//	}
+//	public void setTitle(String title) {
+//		this.title = title;
+//	}
+//	@Override
+//	public String toString() {
+//		final int maxLen = 10;
+//		return "MetaDataProfileBean [type="
+//				+ type
+//				+ ", title="
+//				+ title
+//				+ ", categories="
+//				+ (categories != null ? categories.subList(0,
+//						Math.min(categories.size(), maxLen)) : null)
+//				+ ", metadataFields="
+//				+ (metadataFields != null ? metadataFields.subList(0,
+//						Math.min(metadataFields.size(), maxLen)) : null) + "]";
+//	}
+//	
+//}
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/MetadataFieldWrapper.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/MetadataFieldWrapper.java
index c789a68..5d87f39 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/MetadataFieldWrapper.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/MetadataFieldWrapper.java
@@ -1,341 +1,341 @@
-package org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata;
-
-
-import java.io.Serializable;
-import java.util.List;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * The Class MetadataFieldWrapper.
- * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
- * 
- * @author francesco-mangiacrapa at ISTI-CNR (costantino.perciante@isti.cnr.it)
- */
-public class MetadataFieldWrapper implements Serializable, IsSerializable{
-
-	private static final long serialVersionUID = -8476731365884466698L;
-	private String fieldName;
-	private String fieldNameFromCategory;
-	private Boolean mandatory = false;
-	private DataTypeWrapper type;
-	private String defaultValue;
-	private String note;
-	private List<String> vocabulary;
-	private boolean multiSelection;
-	private String validator;
-	private CategoryWrapper ownerCategory;
-	private FieldAsGroup asGroup;
-	private FieldAsTag asTag;
-	
-	private Integer maxOccurs = 1;
-
-	/**
-	 * Instantiates a new metadata field.
-	 */
-	public MetadataFieldWrapper() {
-		super();
-	}
-
-	/**
-	 * Instantiates a new metadata field.
-	 *
-	 * @param fieldName the field name
-	 * @param mandatory the mandatory
-	 * @param type the type
-	 * @param defaultValue the default value
-	 * @param note the note
-	 * @param vocabulary the vocabulary
-	 * @param validator the validator
-	 * @param category the category
-	 */
-	public MetadataFieldWrapper(
-			String fieldName, Boolean mandatory, DataTypeWrapper type,
-			String defaultValue, String note, List<String> vocabulary,
-			String validator, CategoryWrapper category) {
-		super();
-		this.fieldName = fieldName;
-		this.mandatory = mandatory;
-		this.type = type;
-		this.defaultValue = defaultValue;
-		this.note = note;
-		this.vocabulary = vocabulary;
-		this.validator = validator;
-		this.ownerCategory = category;
-	}
-	
-	
-
-	/**
-	 * Gets the max occurs.
-	 *
-	 * @return the max occurs
-	 */
-	public Integer getMaxOccurs() {
-		return maxOccurs;
-	}
-
-	/**
-	 * Sets the max occurs.
-	 *
-	 * @param maxOccurs the new max occurs
-	 */
-	public void setMaxOccurs(Integer maxOccurs) {
-		this.maxOccurs = maxOccurs;
-	}
-
-	/**
-	 * Gets the field name.
-	 *
-	 * @return the fieldName
-	 */
-	public String getFieldName() {
-
-		return fieldName;
-	}
-
-	/**
-	 * Gets the mandatory.
-	 *
-	 * @return the mandatory
-	 */
-	public Boolean getMandatory() {
-
-		return mandatory;
-	}
-
-	/**
-	 * Gets the defaul value.
-	 *
-	 * @return the defaulValue
-	 */
-	public String getDefaultValue() {
-
-		return defaultValue;
-	}
-
-	/**
-	 * Gets the note.
-	 *
-	 * @return the note
-	 */
-	public String getNote() {
-
-		return note;
-	}
-
-	/**
-	 * Gets the vocabulary.
-	 *
-	 * @return the vocabulary
-	 */
-	public List<String> getVocabulary() {
-
-		return vocabulary;
-	}
-
-	/**
-	 * Gets the validator.
-	 *
-	 * @return the validator
-	 */
-	public String getValidator() {
-
-		return validator;
-	}
-
-	/**
-	 * Sets the field name.
-	 *
-	 * @param fieldName the fieldName to set
-	 */
-	public void setFieldName(String fieldName) {
-
-		this.fieldName = fieldName;
-	}
-
-	/**
-	 * Sets the mandatory.
-	 *
-	 * @param mandatory the mandatory to set
-	 */
-	public void setMandatory(Boolean mandatory) {
-
-		this.mandatory = mandatory;
-	}
-
-	/**
-	 * Sets the defaul value.
-	 *
-	 * @param defaultValue the new default value
-	 */
-	public void setDefaultValue(String defaultValue) {
-
-		this.defaultValue = defaultValue;
-	}
-
-	/**
-	 * Sets the note.
-	 *
-	 * @param note the note to set
-	 */
-	public void setNote(String note) {
-
-		this.note = note;
-	}
-
-	/**
-	 * Sets the vocabulary.
-	 *
-	 * @param vocabulary the vocabulary to set
-	 */
-	public void setVocabulary(List<String> vocabulary) {
-
-		this.vocabulary = vocabulary;
-	}
-
-	/**
-	 * Sets the validator.
-	 *
-	 * @param validator the validator to set
-	 */
-	public void setValidator(String validator) {
-
-		this.validator = validator;
-	}
-
-	/**
-	 * Gets the type.
-	 *
-	 * @return the type
-	 */
-	public DataTypeWrapper getType() {
-		return type;
-	}
-
-	/**
-	 * Sets the type.
-	 *
-	 * @param type the new type
-	 */
-	public void setType(DataTypeWrapper type) {
-		this.type = type;
-	}
-
-	/**
-	 * Checks if is multi selection.
-	 *
-	 * @return true, if is multi selection
-	 */
-	public boolean isMultiSelection() {
-		return multiSelection;
-	}
-
-	/**
-	 * Sets the multi selection.
-	 *
-	 * @param multiSelection the new multi selection
-	 */
-	public void setMultiSelection(boolean multiSelection) {
-		this.multiSelection = multiSelection;
-	}
-
-	/**
-	 * Gets the owner category.
-	 *
-	 * @return the owner category
-	 */
-	public CategoryWrapper getOwnerCategory() {
-		return ownerCategory;
-	}
-
-	/**
-	 * Sets the owner category.
-	 *
-	 * @param ownerCategory the new owner category
-	 */
-	public void setOwnerCategory(CategoryWrapper ownerCategory) {
-		this.ownerCategory = ownerCategory;
-	}
-
-	/**
-	 * Gets the field name from category.
-	 *
-	 * @return the field name from category
-	 */
-	public String getFieldNameFromCategory() {
-		return fieldNameFromCategory;
-	}
-
-	/**
-	 * Sets the field name from category.
-	 *
-	 * @param fieldNameFromCategory the new field name from category
-	 */
-	public void setFieldNameFromCategory(String fieldNameFromCategory) {
-		this.fieldNameFromCategory = fieldNameFromCategory;
-	}
-
-	/**
-	 * Gets the as group.
-	 *
-	 * @return the as group
-	 */
-	public FieldAsGroup getAsGroup() {
-		return asGroup;
-	}
-
-	/**
-	 * Sets the as group.
-	 *
-	 * @param asGroup the new as group
-	 */
-	public void setAsGroup(FieldAsGroup asGroup) {
-		this.asGroup = asGroup;
-	}
-
-	/**
-	 * Gets the as tag.
-	 *
-	 * @return the as tag
-	 */
-	public FieldAsTag getAsTag() {
-		return asTag;
-	}
-
-	/**
-	 * Sets the as tag.
-	 *
-	 * @param asTag the new as tag
-	 */
-	public void setAsTag(FieldAsTag asTag) {
-		this.asTag = asTag;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return "MetadataFieldWrapper ["
-				+ (fieldName != null ? "fieldName=" + fieldName + ", " : "")
-				+ (fieldNameFromCategory != null ? "fieldNameFromCategory="
-						+ fieldNameFromCategory + ", " : "")
-				+ (mandatory != null ? "mandatory=" + mandatory + ", " : "")
-				+ (maxOccurs != null ? "maxOccurs=" + maxOccurs + ", " : "")
-				+ (type != null ? "type=" + type + ", " : "")
-				+ (defaultValue != null ? "defaultValue=" + defaultValue + ", "
-						: "")
-				+ (note != null ? "note=" + note + ", " : "")
-				+ (vocabulary != null ? "vocabulary=" + vocabulary + ", " : "")
-				+ "multiSelection="
-				+ multiSelection
-				+ ", "
-				+ (validator != null ? "validator=" + validator + ", " : "")
-				+ (ownerCategory != null ? "ownerCategory=" + ownerCategory.getId()
-						+ ", " : "")
-				+ (asGroup != null ? "asGroup=" + asGroup + ", " : "")
-				+ (asTag != null ? "asTag=" + asTag : "") + "]";
-	}
-
-}
+//package org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata;
+//
+//
+//import java.io.Serializable;
+//import java.util.List;
+//
+//import com.google.gwt.user.client.rpc.IsSerializable;
+//
+///**
+// * The Class MetadataFieldWrapper.
+// * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
+// * 
+// * @author francesco-mangiacrapa at ISTI-CNR (costantino.perciante@isti.cnr.it)
+// */
+//public class MetadataFieldWrapper implements Serializable, IsSerializable{
+//
+//	private static final long serialVersionUID = -8476731365884466698L;
+//	private String fieldName;
+//	private String fieldNameFromCategory;
+//	private Boolean mandatory = false;
+//	private DataTypeWrapper type;
+//	private String defaultValue;
+//	private String note;
+//	private List<String> vocabulary;
+//	private boolean multiSelection;
+//	private String validator;
+//	private CategoryWrapper ownerCategory;
+//	private FieldAsGroup asGroup;
+//	private FieldAsTag asTag;
+//	
+//	private Integer maxOccurs = 1;
+//
+//	/**
+//	 * Instantiates a new metadata field.
+//	 */
+//	public MetadataFieldWrapper() {
+//		super();
+//	}
+//
+//	/**
+//	 * Instantiates a new metadata field.
+//	 *
+//	 * @param fieldName the field name
+//	 * @param mandatory the mandatory
+//	 * @param type the type
+//	 * @param defaultValue the default value
+//	 * @param note the note
+//	 * @param vocabulary the vocabulary
+//	 * @param validator the validator
+//	 * @param category the category
+//	 */
+//	public MetadataFieldWrapper(
+//			String fieldName, Boolean mandatory, DataTypeWrapper type,
+//			String defaultValue, String note, List<String> vocabulary,
+//			String validator, CategoryWrapper category) {
+//		super();
+//		this.fieldName = fieldName;
+//		this.mandatory = mandatory;
+//		this.type = type;
+//		this.defaultValue = defaultValue;
+//		this.note = note;
+//		this.vocabulary = vocabulary;
+//		this.validator = validator;
+//		this.ownerCategory = category;
+//	}
+//	
+//	
+//
+//	/**
+//	 * Gets the max occurs.
+//	 *
+//	 * @return the max occurs
+//	 */
+//	public Integer getMaxOccurs() {
+//		return maxOccurs;
+//	}
+//
+//	/**
+//	 * Sets the max occurs.
+//	 *
+//	 * @param maxOccurs the new max occurs
+//	 */
+//	public void setMaxOccurs(Integer maxOccurs) {
+//		this.maxOccurs = maxOccurs;
+//	}
+//
+//	/**
+//	 * Gets the field name.
+//	 *
+//	 * @return the fieldName
+//	 */
+//	public String getFieldName() {
+//
+//		return fieldName;
+//	}
+//
+//	/**
+//	 * Gets the mandatory.
+//	 *
+//	 * @return the mandatory
+//	 */
+//	public Boolean getMandatory() {
+//
+//		return mandatory;
+//	}
+//
+//	/**
+//	 * Gets the defaul value.
+//	 *
+//	 * @return the defaulValue
+//	 */
+//	public String getDefaultValue() {
+//
+//		return defaultValue;
+//	}
+//
+//	/**
+//	 * Gets the note.
+//	 *
+//	 * @return the note
+//	 */
+//	public String getNote() {
+//
+//		return note;
+//	}
+//
+//	/**
+//	 * Gets the vocabulary.
+//	 *
+//	 * @return the vocabulary
+//	 */
+//	public List<String> getVocabulary() {
+//
+//		return vocabulary;
+//	}
+//
+//	/**
+//	 * Gets the validator.
+//	 *
+//	 * @return the validator
+//	 */
+//	public String getValidator() {
+//
+//		return validator;
+//	}
+//
+//	/**
+//	 * Sets the field name.
+//	 *
+//	 * @param fieldName the fieldName to set
+//	 */
+//	public void setFieldName(String fieldName) {
+//
+//		this.fieldName = fieldName;
+//	}
+//
+//	/**
+//	 * Sets the mandatory.
+//	 *
+//	 * @param mandatory the mandatory to set
+//	 */
+//	public void setMandatory(Boolean mandatory) {
+//
+//		this.mandatory = mandatory;
+//	}
+//
+//	/**
+//	 * Sets the defaul value.
+//	 *
+//	 * @param defaultValue the new default value
+//	 */
+//	public void setDefaultValue(String defaultValue) {
+//
+//		this.defaultValue = defaultValue;
+//	}
+//
+//	/**
+//	 * Sets the note.
+//	 *
+//	 * @param note the note to set
+//	 */
+//	public void setNote(String note) {
+//
+//		this.note = note;
+//	}
+//
+//	/**
+//	 * Sets the vocabulary.
+//	 *
+//	 * @param vocabulary the vocabulary to set
+//	 */
+//	public void setVocabulary(List<String> vocabulary) {
+//
+//		this.vocabulary = vocabulary;
+//	}
+//
+//	/**
+//	 * Sets the validator.
+//	 *
+//	 * @param validator the validator to set
+//	 */
+//	public void setValidator(String validator) {
+//
+//		this.validator = validator;
+//	}
+//
+//	/**
+//	 * Gets the type.
+//	 *
+//	 * @return the type
+//	 */
+//	public DataTypeWrapper getType() {
+//		return type;
+//	}
+//
+//	/**
+//	 * Sets the type.
+//	 *
+//	 * @param type the new type
+//	 */
+//	public void setType(DataTypeWrapper type) {
+//		this.type = type;
+//	}
+//
+//	/**
+//	 * Checks if is multi selection.
+//	 *
+//	 * @return true, if is multi selection
+//	 */
+//	public boolean isMultiSelection() {
+//		return multiSelection;
+//	}
+//
+//	/**
+//	 * Sets the multi selection.
+//	 *
+//	 * @param multiSelection the new multi selection
+//	 */
+//	public void setMultiSelection(boolean multiSelection) {
+//		this.multiSelection = multiSelection;
+//	}
+//
+//	/**
+//	 * Gets the owner category.
+//	 *
+//	 * @return the owner category
+//	 */
+//	public CategoryWrapper getOwnerCategory() {
+//		return ownerCategory;
+//	}
+//
+//	/**
+//	 * Sets the owner category.
+//	 *
+//	 * @param ownerCategory the new owner category
+//	 */
+//	public void setOwnerCategory(CategoryWrapper ownerCategory) {
+//		this.ownerCategory = ownerCategory;
+//	}
+//
+//	/**
+//	 * Gets the field name from category.
+//	 *
+//	 * @return the field name from category
+//	 */
+//	public String getFieldNameFromCategory() {
+//		return fieldNameFromCategory;
+//	}
+//
+//	/**
+//	 * Sets the field name from category.
+//	 *
+//	 * @param fieldNameFromCategory the new field name from category
+//	 */
+//	public void setFieldNameFromCategory(String fieldNameFromCategory) {
+//		this.fieldNameFromCategory = fieldNameFromCategory;
+//	}
+//
+//	/**
+//	 * Gets the as group.
+//	 *
+//	 * @return the as group
+//	 */
+//	public FieldAsGroup getAsGroup() {
+//		return asGroup;
+//	}
+//
+//	/**
+//	 * Sets the as group.
+//	 *
+//	 * @param asGroup the new as group
+//	 */
+//	public void setAsGroup(FieldAsGroup asGroup) {
+//		this.asGroup = asGroup;
+//	}
+//
+//	/**
+//	 * Gets the as tag.
+//	 *
+//	 * @return the as tag
+//	 */
+//	public FieldAsTag getAsTag() {
+//		return asTag;
+//	}
+//
+//	/**
+//	 * Sets the as tag.
+//	 *
+//	 * @param asTag the new as tag
+//	 */
+//	public void setAsTag(FieldAsTag asTag) {
+//		this.asTag = asTag;
+//	}
+//
+//	/* (non-Javadoc)
+//	 * @see java.lang.Object#toString()
+//	 */
+//	@Override
+//	public String toString() {
+//		return "MetadataFieldWrapper ["
+//				+ (fieldName != null ? "fieldName=" + fieldName + ", " : "")
+//				+ (fieldNameFromCategory != null ? "fieldNameFromCategory="
+//						+ fieldNameFromCategory + ", " : "")
+//				+ (mandatory != null ? "mandatory=" + mandatory + ", " : "")
+//				+ (maxOccurs != null ? "maxOccurs=" + maxOccurs + ", " : "")
+//				+ (type != null ? "type=" + type + ", " : "")
+//				+ (defaultValue != null ? "defaultValue=" + defaultValue + ", "
+//						: "")
+//				+ (note != null ? "note=" + note + ", " : "")
+//				+ (vocabulary != null ? "vocabulary=" + vocabulary + ", " : "")
+//				+ "multiSelection="
+//				+ multiSelection
+//				+ ", "
+//				+ (validator != null ? "validator=" + validator + ", " : "")
+//				+ (ownerCategory != null ? "ownerCategory=" + ownerCategory.getId()
+//						+ ", " : "")
+//				+ (asGroup != null ? "asGroup=" + asGroup + ", " : "")
+//				+ (asTag != null ? "asTag=" + asTag : "") + "]";
+//	}
+//
+//}
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/TaggingGroupingValue.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/TaggingGroupingValue.java
index 24de09c..b95e162 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/TaggingGroupingValue.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/shared/metadata/TaggingGroupingValue.java
@@ -1,66 +1,66 @@
-package org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata;
-
-import java.util.Arrays;
-import java.util.List;
-
-
-/**
- * Specifies the action to take when a tag or a group must be created from a field.
- * @see org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.TaggingGroupingValue
- * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
- */
-public enum TaggingGroupingValue {
-
-	onFieldName,
-	onValue,
-	onFieldName_onValue,
-	onValue_onFieldName;
-
-	/**
-	 * Returns the composed value in case of tag
-	 * @param name
-	 * @param value
-	 * @param separator
-	 * @param action
-	 * @return
-	 */
-	public static String getComposedValueTag(String name, String value, String separator, TaggingGroupingValue action){
-
-		switch(action){
-		case onFieldName:
-			return name;
-		case onValue:
-			return value;
-		case onFieldName_onValue:
-			return name + separator + value;
-		case onValue_onFieldName:
-			return value + separator + name;
-		default: return null;
-		}
-
-	}
-	
-	/**
-	 * Returns the composed value in case of group
-	 * @param name
-	 * @param value
-	 * @param separator
-	 * @param action
-	 * @return a list of group names
-	 */
-	public static List<String> getComposedValueGroup(String name, String value, TaggingGroupingValue action){
-
-		switch(action){
-		case onFieldName:
-			return Arrays.asList(name);
-		case onValue:
-			return Arrays.asList(value);
-		case onFieldName_onValue:
-		case onValue_onFieldName:
-			return Arrays.asList(value, name);
-		default: return null;
-		}
-
-	}
-
-}
+//package org.gcube.portlets.widgets.ckandatapublisherwidget.shared.metadata;
+//
+//import java.util.Arrays;
+//import java.util.List;
+//
+//
+///**
+// * Specifies the action to take when a tag or a group must be created from a field.
+// * @see org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.TaggingGroupingValue
+// * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
+// */
+//public enum TaggingGroupingValue {
+//
+//	onFieldName,
+//	onValue,
+//	onFieldName_onValue,
+//	onValue_onFieldName;
+//
+//	/**
+//	 * Returns the composed value in case of tag
+//	 * @param name
+//	 * @param value
+//	 * @param separator
+//	 * @param action
+//	 * @return
+//	 */
+//	public static String getComposedValueTag(String name, String value, String separator, TaggingGroupingValue action){
+//
+//		switch(action){
+//		case onFieldName:
+//			return name;
+//		case onValue:
+//			return value;
+//		case onFieldName_onValue:
+//			return name + separator + value;
+//		case onValue_onFieldName:
+//			return value + separator + name;
+//		default: return null;
+//		}
+//
+//	}
+//	
+//	/**
+//	 * Returns the composed value in case of group
+//	 * @param name
+//	 * @param value
+//	 * @param separator
+//	 * @param action
+//	 * @return a list of group names
+//	 */
+//	public static List<String> getComposedValueGroup(String name, String value, TaggingGroupingValue action){
+//
+//		switch(action){
+//		case onFieldName:
+//			return Arrays.asList(name);
+//		case onValue:
+//			return Arrays.asList(value);
+//		case onFieldName_onValue:
+//		case onValue_onFieldName:
+//			return Arrays.asList(value, name);
+//		default: return null;
+//		}
+//
+//	}
+//
+//}
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 79df877..b029aba 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -16,6 +16,12 @@
 		<servlet-class>org.gcube.portlets.widgets.wsexplorer.server.WorkspaceExplorerServiceImpl</servlet-class>
 	</servlet>
 
+	<servlet>
+		<servlet-name>metadataProfileFormBuilderUploadServlet</servlet-name>
+		<servlet-class>org.gcube.portlets.widgets.mpformbuilder.server.MetadataProfileFormBuilderUploadServlet</servlet-class>
+	</servlet>
+
+
 	<servlet-mapping>
 		<servlet-name>ckanpublisherservices</servlet-name>
 		<url-pattern>/CKanMetadataPublisher/ckanservices</url-pattern>
@@ -27,6 +33,12 @@
 	</servlet-mapping>
 
 
+	<servlet-mapping>
+		<servlet-name>metadataProfileFormBuilderUploadServlet</servlet-name>
+		<url-pattern>/CKanMetadataPublisher/metadataProfileFormBuilderUploadServlet</url-pattern>
+	</servlet-mapping>
+
+
 	<!-- Default page to serve -->
 	<welcome-file-list>
 		<welcome-file>CKanMetadataPublisher.html</welcome-file>
diff --git a/src/test/java/org/gcube/portlets/widgets/ckandatapublisherwidget/TestPublishingWidget.java b/src/test/java/org/gcube/portlets/widgets/ckandatapublisherwidget/TestPublishingWidget.java
index 0e85a4e..3244f73 100644
--- a/src/test/java/org/gcube/portlets/widgets/ckandatapublisherwidget/TestPublishingWidget.java
+++ b/src/test/java/org/gcube/portlets/widgets/ckandatapublisherwidget/TestPublishingWidget.java
@@ -10,7 +10,6 @@ import org.gcube.datacatalogue.utillibrary.server.DataCatalogueFactory;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.server.utils.WorkspaceUtils;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.DatasetBean;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.OrganizationBean;
-import org.junit.Test;
 import org.slf4j.LoggerFactory;