removed -SNAPSHOT to be released

CHANGELOG.md

@@ -4,6 +4,14 @@
 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).
 
+## [v1.1.4] - 2023-12-21
+
+- Fixing `publication_date` issue [#26166]
+
+## [v1.1.3] - 2023-07-25
+
+- Fixing `null` issue, recompiling this component [#25275]
+
 ## [v1.1.2] - 2022-10-27
 
 **Enhancements**

pom.xml

@@ -7,15 +7,14 @@
 	<parent>
 		<artifactId>maven-parent</artifactId>
 		<groupId>org.gcube.tools</groupId>
-		<version>1.1.0</version>
+		<version>1.2.0</version>
 		<relativePath />
 	</parent>
 
-
 	<groupId>org.gcube.portlets.widgets</groupId>
 	<artifactId>ckan2zenodo-publisher-widget</artifactId>
 	<packaging>jar</packaging>
-	<version>1.1.2</version>
+	<version>1.1.4</version>
 
 	<description>
 		gCube Ckan2Zenodo Publisher widget allows to publish D4Science catalogue's items on Zenodo 
@@ -31,7 +30,7 @@
 
 	<properties>
 		<!-- Convenience property to set the GWT version -->
-		<gwtVersion>2.9.0</gwtVersion>
+		<gwtVersion>2.10.0</gwtVersion>
 
 		<!-- GWT needs at least java 1.6 -->
 		<maven.compiler.source>1.8</maven.compiler.source>

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZendoPublisherWidget.java

@@ -12,6 +12,7 @@ import org.gcube.portlets.widgets.ckan2zenodopublisher.client.view.FormValidator
 import org.gcube.portlets.widgets.ckan2zenodopublisher.client.view.LoaderIcon;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.CatalogueItem;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ZenodoError;
+import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.DOI_dv;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoItem;
 
 import com.github.gwtbootstrap.client.ui.Alert;
@@ -30,6 +31,8 @@ import com.google.gwt.json.client.JSONParser;
 import com.google.gwt.json.client.JSONValue;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.ui.FlowPanel;
+import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
 
@@ -97,6 +100,7 @@ public class CkanToZendoPublisherWidget {
 
 			@Override
 			public void onSuccess(ZenodoItem result) {
+				GWT.log("Zenodo item returned is: "+result);
 				loader.setVisible(false);
 				modal.remove(loader);
 				manager = new Ckan2ZenodoViewManager();
@@ -163,7 +167,7 @@ public class CkanToZendoPublisherWidget {
 					//Submit publish on zenodo.
 					ZenodoItem zenodoItem = manager.getZenodoItemFromFieldsForm();
 					GWT.log("Publishing file:  "+zenodoItem.getFiles());
-					ckanToZenodoService.publishOnZenodo(zenodoItem, new AsyncCallback<String>() {
+					ckanToZenodoService.publishOnZenodo(zenodoItem, new AsyncCallback<DOI_dv>() {
 
 						@Override
 						public void onFailure(Throwable caught) {
@@ -179,7 +183,7 @@ public class CkanToZendoPublisherWidget {
 						}
 
 						@Override
-						public void onSuccess(String doi) {
+						public void onSuccess(DOI_dv doi_dv) {
 							buttonPublish.setEnabled(false);
 							basicTabPanel.getElement().getStyle().setOpacity(1.0);
 							try {
@@ -189,15 +193,27 @@ public class CkanToZendoPublisherWidget {
 							}
 							String msg = "The item has been uploaded to Zenodo correctly";
 					
-							if(doi!=null)
-								msg+=" "+doi;
-							
 							Alert infoLabel = new Alert();
 							infoLabel.setClose(false);
 							infoLabel.setType(AlertType.INFO);
 							infoLabel.setText(msg);
 							
-							showResults(Arrays.asList(infoLabel.asWidget()));
+							Modal modal = new Modal(true, true);
+							modal.setCloseVisible(true);
+							modal.setTitle("Item uploaded to Zenodo!");
+							modal.add(infoLabel);
+							if(doi_dv!=null) {
+								FlowPanel dF = new FlowPanel();
+								dF.add(new HTML("DOI: "+doi_dv.getDoi()));
+								FlowPanel dFU = new FlowPanel();
+								dFU.add(new HTML("DOI URL: <a href='"+doi_dv.getDoi_url()+"' target='_blank'>"+doi_dv.getDoi_url()+"</a>"));
+								modal.add(dF);
+								modal.add(dFU);
+							}
+							
+							modal.show();
+						
+							//showResults(Arrays.asList(infoLabel.asWidget()));
 						}
 					});
 				

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZenodoPublisherService.java

@@ -3,6 +3,7 @@ package org.gcube.portlets.widgets.ckan2zenodopublisher.client;
 import java.util.Map;
 
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.CatalogueItem;
+import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.DOI_dv;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoItem;
 
 import com.google.gwt.user.client.rpc.RemoteService;
@@ -34,7 +35,7 @@ public interface CkanToZenodoPublisherService extends RemoteService {
 	 * @return the DOI of published Zenodo Item
 	 * @throws Exception the exception
 	 */
-	String publishOnZenodo(ZenodoItem zenodoItem) throws Exception;
+	DOI_dv publishOnZenodo(ZenodoItem zenodoItem) throws Exception;
 
 	/**
 	 * Read fields descriptions.

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZenodoPublisherServiceAsync.java

@@ -3,6 +3,7 @@ package org.gcube.portlets.widgets.ckan2zenodopublisher.client;
 import java.util.Map;
 
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.CatalogueItem;
+import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.DOI_dv;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoItem;
 
 import com.google.gwt.core.client.GWT;
@@ -33,7 +34,7 @@ public interface CkanToZenodoPublisherServiceAsync {
 
 	void convertToZenodoItem(CatalogueItem item, AsyncCallback<ZenodoItem> callback);
 
-	void publishOnZenodo(ZenodoItem zenodoItem, AsyncCallback<String> callback);
+	void publishOnZenodo(ZenodoItem zenodoItem, AsyncCallback<DOI_dv> callback);
 
 	void readFieldsDescriptions(AsyncCallback<Map<String, String>> callback);
 

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/ui/basicinformation/BasicInformationView.java

@@ -259,6 +259,8 @@ public class BasicInformationView extends Composite implements FormValidator {
 		InfoTextAndLabels.addTooltipForFieldKey("description", cl_description);
 		field_doi.setValue(zenodoItem.getDoi());
 		
+		GWT.log("Filling form with: "+zenodoItem.getMetadata());
+
 		ZenodoMetadata zMeta = zenodoItem.getMetadata();
 		if (zMeta != null) {
 			
@@ -327,20 +329,19 @@ public class BasicInformationView extends Composite implements FormValidator {
 			InfoTextAndLabels.addTooltipForFieldKey("access_conditions", cl_access_conditions);
 
 			// License
-			if (zMeta.getLicenses() != null) {
-				List<String> listLicensesIds = null;
-				List<String> selectedLicensesId = FieldUtil.toZenodoIds(zMeta.getLicenses().getSelectedValues());
-				if(zMeta.getLicenses().getSelectableValues()!=null) {
-					listLicensesIds = FieldUtil.toZenodoIds(zMeta.getLicenses().getSelectableValues());
-					FieldUtil.addValuesToListBox(field_license, listLicensesIds);
+			if (zMeta.getLicenseIDs() != null) {
+				//List<String> listLicensesIds = null;
+				List<String> selectedLicensesId = FieldUtil.toZenodoIds(zMeta.getLicenseIDs());
+				if(selectedLicensesId!=null) {
+					FieldUtil.addValuesToListBox(field_license, selectedLicensesId);
 					field_license.setEnabled(true); 
 				}else {
 					//Exception case on missing list of selectable license ids
-					FieldUtil.addValuesToListBox(field_license, selectedLicensesId);
+					//FieldUtil.addValuesToListBox(field_license, selectedLicensesId);
 					field_license.setEnabled(false); //only one license id is available
 		
 				}
-				FieldUtil.selectValueToListBox(field_license, selectedLicensesId);
+				//FieldUtil.selectValueToListBox(field_license, selectedLicensesId);
 			}else
 				field_license.setEnabled(false); 
 

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/view/Ckan2ZenodoViewManager.java

@@ -8,7 +8,6 @@ import java.util.List;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.client.ui.BasicTabPanel;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.client.ui.basicinformation.BasicInformationView;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.SerializableEnum;
-import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.LicenseBean;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoContributor;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoCreator;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoFile;
@@ -124,6 +123,9 @@ public class Ckan2ZenodoViewManager {
 		meta.setDescription(basicForm.getField_description().getValue());
 		meta.setKeywords(basicForm.getTags()); // these are the keywords
 		
+		//Setting publication date fxing #26166
+		meta.setPublication_date(basicForm.getField_publication_date().getValue());
+		
 		List<ZenodoCreator> creators = basicForm.getListOfCreators();
 		GWT.log("Read creators from FORM: "+creators);
 		meta.setCreators(creators);
@@ -162,8 +164,11 @@ public class Ckan2ZenodoViewManager {
 		//license
 		String licenseId = basicForm.getField_license().getSelectedValue();
 		if(licenseId!=null) {
-			LicenseBean licenseBean = new LicenseBean(licenseId, null, null);
-			meta.setLicenses(new SerializableEnum<LicenseBean>(Arrays.asList(licenseBean),null));
+			//LicenseDTO licenseBean = new LicenseDTO(licenseId, null, null);
+			List<String> licenses = new ArrayList<String>();
+			licenses.add(licenseId);
+			meta.setLicenseIDs(licenses);
+			//meta.setLicenses(Arrays.asList(licenseBean));
 		}
 	
 		//embargo date

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/view/FieldUtil.java

@@ -3,9 +3,6 @@ package org.gcube.portlets.widgets.ckan2zenodopublisher.client.view;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ZenodoLicense;
-import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.LicenseBean;
-
 import com.github.gwtbootstrap.client.ui.ControlGroup;
 import com.github.gwtbootstrap.client.ui.ListBox;
 import com.github.gwtbootstrap.client.ui.TextBox;
@@ -98,17 +95,18 @@ public class FieldUtil {
 
 	/**
 	 * To zenodo ids.
+	 * TODO Must passed an object License
 	 *
 	 * @param listLicenses the list licenses
 	 * @return the list
 	 */
-	public static List<String> toZenodoIds(List<LicenseBean> listLicenses){
+	public static List<String> toZenodoIds(List<String> listLicenses){
 		if(listLicenses==null)
 			return null;
 		
 		List<String> licenses = new ArrayList<String>(listLicenses.size());
-		for (ZenodoLicense zenodoLicense : listLicenses) {
-			licenses.add(zenodoLicense.getId());
+		for (String zenodoLicense : listLicenses) {
+			licenses.add(zenodoLicense);
 		}
 		
 		return licenses;

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoPublisherServiceImpl.java

@@ -1,5 +1,6 @@
 package org.gcube.portlets.widgets.ckan2zenodopublisher.server;
 
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -25,6 +26,7 @@ import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.CatalogueItem;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ItemTranslateError;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ItemTranslateError.ERROR_TYPE;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ZenodoError;
+import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.DOI_dv;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoFile;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoItem;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoMetadata;
@@ -46,12 +48,15 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
 
 	private static Logger LOG = LoggerFactory.getLogger(CkanToZenodoPublisherServiceImpl.class);
 
-	
-	/* (non-Javadoc)
-	 * @see org.gcube.portlets.widgets.ckan2zenodopublisher.client.CkanToZenodoPublisherService#publishOnZenodo(org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoItem)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.gcube.portlets.widgets.ckan2zenodopublisher.client.
+	 * CkanToZenodoPublisherService#publishOnZenodo(org.gcube.portlets.widgets.
+	 * ckan2zenodopublisher.shared.wrapped.ZenodoItem)
 	 */
 	@Override
-	public String publishOnZenodo(ZenodoItem zenodoItem) throws Exception {
+	public DOI_dv publishOnZenodo(ZenodoItem zenodoItem) throws Exception {
 		LOG.info("publishOnZenodo called");
 		try {
 
@@ -60,6 +65,8 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
 				PortalUtils.getCurrentToken(this.getThreadLocalRequest(), true);
 			}
 			
+			LOG.debug("publishOnZenodo called with metadata: "+zenodoItem.getMetadata());
+
 			Ckan2Zenodo client = new Ckan2ZenodoImpl();
 			// Get the item representation
 			CkanItemDescriptor itemDescr = client.read(zenodoItem.getName());
@@ -79,7 +86,8 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
 			// Updating Deposition Metadata potentially changed on client-side
 			ZenodoMetadata metadata = zenodoItem.getMetadata();
 			DepositionMetadata depositionMetadata = zenodoDepositionPreview.getMetadata();
-			depositionMetadata = ItemToZenodoConverter.updateMetadataInfoOfDepositionMetadata(metadata, depositionMetadata);
+			depositionMetadata = ItemToZenodoConverter.updateMetadataInfoOfDepositionMetadata(metadata,
+					depositionMetadata);
 			zenodoDepositionPreview.setMetadata(depositionMetadata);
 
 			// Loading Filtered resources according to VRE policies
@@ -93,7 +101,8 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
 					for (CkanResource ckanResource : filteredResources) {
 						if (zf.getId().compareTo(ckanResource.getId()) == 0 && zf.getIsAlreadyPublished() == false) {
 							if (CkanToZenodoUtil.isNotEmpty(zf.getFilename())) {
-								ckanResource.setName(zf.getFilename()); //only the filename can be changed on clien-side
+								ckanResource.setName(zf.getFilename()); // only the filename can be changed on
+																		// clien-side
 								toUpload.add(ckanResource);
 							}
 						}
@@ -105,12 +114,22 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
 			// Step 1 : metadata
 			client = new Ckan2ZenodoImpl();
 			LOG.debug("Calling updatedMetadata for: " + zenodoDepositionPreview);
+			
+			//fixing issue #26166
+			Date thePublicationDate = zenodoDepositionPreview.getMetadata().getPublication_date();
+			LOG.debug("Publication_Date before update is: " + thePublicationDate);
+			
 			zenodoDepositionPreview = client.updatedMetadata(zenodoDepositionPreview);
 
 			// Step 2 : publish Resources
 			if (toUpload.size() > 0) {
 				LOG.debug("Trying to publish the set of CKAN resources: " + toUpload.toString());
+				
+				//fixing issue #26166
+				zenodoDepositionPreview.getMetadata().setPublication_date(thePublicationDate);
+				LOG.debug("Publication_Date before uploadFiles is: " + zenodoDepositionPreview.getMetadata().getPublication_date());
 				Future<ZenodoDeposition> future_Dep = client.uploadFiles(toUpload, zenodoDepositionPreview);
+				
 				while (!future_Dep.isDone()) {
 					LOG.debug("Waiting for completed future computation (publishing of resources on Zenodo)...");
 					Thread.sleep(2000);
@@ -120,10 +139,15 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
 
 			// Get the item representation
 			CkanItemDescriptor item = client.read(zenodoItem.getName());
+
+			//fixing issue #26166
+			LOG.debug("Publication_Date before publish is: " + thePublicationDate);
+			zenodoDepositionPreview.getMetadata().setPublication_date(thePublicationDate);
+			
 			// Finalize
 			LOG.debug("Calling publish on Zenodo for: " + zenodoDepositionPreview);
 			zenodoDepositionPreview = client.publish(zenodoDepositionPreview, item);
-			return zenodoDepositionPreview.getDoi();
+			return new DOI_dv(zenodoDepositionPreview.getDoi(), zenodoDepositionPreview.getDoi_url());
 
 			// throw new ZenodoException();
 
@@ -133,7 +157,8 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
 			String clientError = String.format("%s", error);
 			throw new Exception(clientError);
 		} catch (ZenodoException e) {
-			String error = ZenodoException.class.getName()+" during upload to Zenodo the catalogue item: "+zenodoItem.getName();
+			String error = ZenodoException.class.getName() + " during upload to Zenodo the catalogue item: "
+					+ zenodoItem.getName();
 			LOG.error(error, e);
 			// String clientError = String.format("%s", e.getRemoteMessage());
 			ZenodoError zenodoError = new ZenodoError(e);
@@ -149,8 +174,12 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
 
 	}
 
-	/* (non-Javadoc)
-	 * @see org.gcube.portlets.widgets.ckan2zenodopublisher.client.CkanToZenodoPublisherService#convertToZenodoItem(org.gcube.portlets.widgets.ckan2zenodopublisher.shared.CatalogueItem)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.gcube.portlets.widgets.ckan2zenodopublisher.client.
+	 * CkanToZenodoPublisherService#convertToZenodoItem(org.gcube.portlets.widgets.
+	 * ckan2zenodopublisher.shared.CatalogueItem)
 	 */
 	@Override
 	public ZenodoItem convertToZenodoItem(CatalogueItem item) throws Exception {
@@ -170,16 +199,14 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
 			ItemTranslateError itemTrError = null;
 			try {
 				zdDeposition = client.translate(itemDescr);
-			} catch (ConfigurationException e) {
+			} catch (ConfigurationException | TransformationException e) {
 				LOG.info(ConfigurationException.class.getSimpleName() + " thrown, trying to use forceTranslation for: "
 						+ itemDescr.getName());
 				itemTrError = new ItemTranslateError(e.getMessage(), ERROR_TYPE.INFO);
 				zdDeposition = client.forceTranslation(itemDescr);
 			}
 			
-			//Loading Filtered resources according to VRE policies
 			List<CkanResource> filteredResources = loadFilterResources(item.getItemId());
-			
 			LOG.debug("Loaded filtered resources: " + filteredResources);
 
 			// Converting ZenodoDeposition to ZenodoItem
@@ -192,16 +219,22 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
 			List<ZenodoFile> resources = ItemToZenodoConverter.toZenodoFiles(filteredResources, false);
 			zenodoItem.addFiles(resources);
 
-			//I'M SETTING THE ID BECAUSE THE NAME IS NULL INTO BEAN PASSED FROM PORTLET SIDE
+			// I'M SETTING THE ID BECAUSE THE NAME IS NULL INTO BEAN PASSED FROM PORTLET
+			// SIDE
 			// TODO I'M WAITING FOR itemName retrieved from ckan2zenodo library
 			zenodoItem.setName(item.getItemId());
 
+			LOG.debug("zenodoItem getLicenses as list: " + zenodoItem.getMetadata().getLicenseIDs());
+			//LOG.debug("setting licenses at null");
+			//zenodoItem.getMetadata().setLicenseIDs(null);
+			
 			LOG.debug("Returning item: " + zenodoItem);
 
 			return zenodoItem;
 
 		} catch (ZenodoException e) {
-			String error = ZenodoException.class.getName()+" on converting the catalogue item with id: "+item.getItemId();
+			String error = ZenodoException.class.getName() + " on converting the catalogue item with id: "
+					+ item.getItemId();
 			LOG.error(error, e);
 			// String clientError = String.format("%s. %s", error, e.getRemoteMessage());
 			ZenodoError zenodoError = new ZenodoError(e);
@@ -218,8 +251,12 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
 
 	}
 
-	/* (non-Javadoc)
-	 * @see org.gcube.portlets.widgets.ckan2zenodopublisher.client.CkanToZenodoPublisherService#convertToZenodoItem(org.gcube.portlets.widgets.ckan2zenodopublisher.shared.CatalogueItem)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.gcube.portlets.widgets.ckan2zenodopublisher.client.
+	 * CkanToZenodoPublisherService#convertToZenodoItem(org.gcube.portlets.widgets.
+	 * ckan2zenodopublisher.shared.CatalogueItem)
 	 */
 	@Override
 	public Map<String, String> readFieldsDescriptions() throws Exception {
@@ -276,7 +313,8 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
 	 * @throws ConfigurationException  the configuration exception
 	 * @throws TransformationException the transformation exception
 	 */
-	private List<CkanResource> loadFilterResources(String itemName) throws GcatException, ConfigurationException, TransformationException {
+	private List<CkanResource> loadFilterResources(String itemName)
+			throws GcatException, ConfigurationException, TransformationException {
 
 		Ckan2Zenodo client = new Ckan2ZenodoImpl();
 		// Get the item representation
@@ -294,8 +332,7 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
 		try {
 			UserLocalServiceUtil.getService();
 			return false;
-		}
-		catch (com.liferay.portal.kernel.bean.BeanLocatorException ex) {
+		} catch (com.liferay.portal.kernel.bean.BeanLocatorException ex) {
 			LOG.debug("Development Mode ON");
 			return true;
 		}

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoUtil.java

@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.SerializableEnum;
-import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ZenodoLicense;
 
 
 /**
@@ -48,20 +47,6 @@ public class CkanToZenodoUtil {
 		return new SerializableEnum<String>(selectedValues, values);
 	}
 	
-	
-	/**
-	 * To serializable enum.
-	 *
-	 * @param <E> the element type
-	 * @param selectedLicense the selected license
-	 * @param allLicenses the all licenses
-	 * @return the serializable enum
-	 */
-	public static <E extends ZenodoLicense> SerializableEnum<E> toSerializableEnum(List<E> selectedLicense, List<E> allLicenses) {
-
-		return new SerializableEnum<E>(selectedLicense, allLicenses);
-	}
-	
 	/**
 	 * Checks if is not empty.
 	 *

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/converter/ItemToZenodoConverter.java

@@ -1,7 +1,6 @@
 package org.gcube.portlets.widgets.ckan2zenodopublisher.server.converter;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -23,7 +22,6 @@ import org.gcube.data.publishing.ckan2zenodo.model.zenodo.Subject;
 import org.gcube.data.publishing.ckan2zenodo.model.zenodo.ZenodoDeposition;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.server.CkanToZenodoUtil;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.SerializableEnum;
-import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.LicenseBean;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoAuthor;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoCommunity;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoContributor;
@@ -37,8 +35,6 @@ import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoSubj
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
-
 /**
  * The Class ItemToZenodoConverter.
  *
@@ -49,6 +45,7 @@ import org.slf4j.LoggerFactory;
 public class ItemToZenodoConverter {
 
 	private static Logger LOG = LoggerFactory.getLogger(ItemToZenodoConverter.class);
+
 	/**
 	 * **
 	 * 
@@ -59,7 +56,6 @@ public class ItemToZenodoConverter {
 	 * @return the zenodo item
 	 */
 
-	
 	/**
 	 * To zenodo item.
 	 *
@@ -97,7 +93,6 @@ public class ItemToZenodoConverter {
 		return zi;
 	}
 
-	
 	/**
 	 * Adds the files.
 	 *
@@ -137,8 +132,6 @@ public class ItemToZenodoConverter {
 		return listOfFiles;
 	}
 
-	
-	
 	/**
 	 * To zenodo file.
 	 *
@@ -160,7 +153,6 @@ public class ItemToZenodoConverter {
 		return zf;
 	}
 
-
 	/**
 	 * To zenodo file.
 	 *
@@ -185,7 +177,6 @@ public class ItemToZenodoConverter {
 		return zf;
 	}
 
-	
 	/**
 	 * To zenodo metadata.
 	 *
@@ -201,6 +192,9 @@ public class ItemToZenodoConverter {
 		zm.setAccess_conditions(depositionMetadata.getAccess_conditions());
 		zm.setDescription(depositionMetadata.getDescription());
 
+		// fixing bug #26165 on publication_date = null
+		zm.setPublication_date(depositionMetadata.getPublication_date());
+
 		// Access Type
 		AccessRights[] accessRight = null;
 		if (depositionMetadata.getAccess_right() != null) {
@@ -235,11 +229,14 @@ public class ItemToZenodoConverter {
 		zm.setImage_type(CkanToZenodoUtil.toSerializableEnum(imageType, ImageType.values()));
 
 		// Licenses
-		List<LicenseBean> selectedLicenses = null;
+		List<String> selectedLicenses = null;
 		if (depositionMetadata.getLicense() != null) {
-			selectedLicenses = Arrays.asList(new LicenseBean(depositionMetadata.getLicense(),depositionMetadata.getLicense(), null));
+			selectedLicenses = new ArrayList<String>();
+			selectedLicenses.add(depositionMetadata.getLicense()); // NEED TO ADD ALL LICENSES
+		}
+		if (selectedLicenses != null) {
+			zm.setLicenseIDs(selectedLicenses);
 		}
-		zm.setLicenses(CkanToZenodoUtil.toSerializableEnum(selectedLicenses, null)); //NEED TO ADD ALL LICENSES 
 
 		if (depositionMetadata.getEmbargo_date() != null) {
 
@@ -274,7 +271,6 @@ public class ItemToZenodoConverter {
 		return zm;
 	}
 
-
 	/**
 	 * To zenodo subjects.
 	 *
@@ -316,7 +312,6 @@ public class ItemToZenodoConverter {
 		return list;
 	}
 
-
 	/**
 	 * To zenodo date intervals.
 	 *
@@ -336,7 +331,8 @@ public class ItemToZenodoConverter {
 				types = CkanToZenodoUtil.toSerializableEnum(rel, DateInterval.Type.values());
 			}
 
-			list.add(new ZenodoDateInterval(dateInterval.getStart(), dateInterval.getEnd(), types, dateInterval.getDescription()));
+			list.add(new ZenodoDateInterval(dateInterval.getStart(), dateInterval.getEnd(), types,
+					dateInterval.getDescription()));
 		}
 
 		return list;
@@ -415,7 +411,6 @@ public class ItemToZenodoConverter {
 		return list;
 	}
 
-	
 	/**
 	 * To service file deposition.
 	 *
@@ -439,7 +434,6 @@ public class ItemToZenodoConverter {
 		return fileDep;
 	}
 
-	
 	/**
 	 * Update metadata info of deposition metadata.
 	 *
@@ -447,7 +441,8 @@ public class ItemToZenodoConverter {
 	 * @param depositionMetadata the deposition metadata
 	 * @return the deposition metadata
 	 */
-	public static DepositionMetadata updateMetadataInfoOfDepositionMetadata(ZenodoMetadata metadata, DepositionMetadata depositionMetadata) {
+	public static DepositionMetadata updateMetadataInfoOfDepositionMetadata(ZenodoMetadata metadata,
+			DepositionMetadata depositionMetadata) {
 
 		// description
 		String description = metadata.getDescription();
@@ -525,13 +520,13 @@ public class ItemToZenodoConverter {
 		}
 
 		// license
-		SerializableEnum<LicenseBean> licenses = metadata.getLicenses();
+		List<String> licenses = metadata.getLicenseIDs();
 		LOG.debug("Read licenses: " + licenses);
-		if(licenses!=null) {
+		if (licenses != null && licenses.size() > 0) {
 			try {
-				LicenseBean lB = licenses.getSelectedValues().get(0);
+				String lB = licenses.get(0);
 				LOG.debug("Set license: " + lB);
-				depositionMetadata.setLicense(lB.getId());
+				depositionMetadata.setLicense(lB);
 			} catch (Exception e) {
 				LOG.warn("Set license error: ", e);
 			}
@@ -568,7 +563,6 @@ public class ItemToZenodoConverter {
 		return depositionMetadata;
 	}
 
-	
 	/**
 	 * To creators.
 	 *
@@ -638,6 +632,4 @@ public class ItemToZenodoConverter {
 		return listOfContributors;
 	}
 
-
-
 }

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/ItemTranslateError.java

@@ -32,7 +32,7 @@ public class ItemTranslateError implements Serializable {
 	/**
 	 * Instantiates a new zenodo translate error.
 	 */
-	ItemTranslateError() {
+	public ItemTranslateError() {
 	}
 
 	/**

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/ZenodoLicense.java

@@ -1,34 +0,0 @@
-package org.gcube.portlets.widgets.ckan2zenodopublisher.shared;
-
-
-/**
- * The Interface ZenodoLicense.
- *
- * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
- * 
- * Jan 21, 2020
- */
-public interface ZenodoLicense {
-	
-	/**
-	 * Gets the id.
-	 *
-	 * @return the id
-	 */
-	String getId();
-	
-	/**
-	 * Gets the title.
-	 *
-	 * @return the title
-	 */
-	String getTitle();
-	
-	/**
-	 * Gets the url.
-	 *
-	 * @return the url
-	 */
-	String getUrl();
-
-}

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/DOI_dv.java

@@ -0,0 +1,92 @@
+package org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped;
+
+import java.io.Serializable;
+
+
+/**
+ * The Class DOI_dv.
+ *
+ * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
+ * 
+ * Jul 28, 2023
+ */
+public class DOI_dv implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String doi;
+	private String doi_url;
+
+	/**
+	 * Instantiates a new DO I dv.
+	 */
+	public DOI_dv() {
+	}
+
+	/**
+	 * Instantiates a new DO I dv.
+	 *
+	 * @param doi the doi
+	 * @param doi_url the doi url
+	 */
+	public DOI_dv(String doi, String doi_url) {
+		super();
+		this.doi = doi;
+		this.doi_url = doi_url;
+	}
+
+	/**
+	 * Gets the doi.
+	 *
+	 * @return the doi
+	 */
+	public String getDoi() {
+		return doi;
+	}
+
+	/**
+	 * Gets the doi url.
+	 *
+	 * @return the doi url
+	 */
+	public String getDoi_url() {
+		return doi_url;
+	}
+
+	/**
+	 * Sets the doi.
+	 *
+	 * @param doi the new doi
+	 */
+	public void setDoi(String doi) {
+		this.doi = doi;
+	}
+
+	/**
+	 * Sets the doi url.
+	 *
+	 * @param doi_url the new doi url
+	 */
+	public void setDoi_url(String doi_url) {
+		this.doi_url = doi_url;
+	}
+
+	/**
+	 * To string.
+	 *
+	 * @return the string
+	 */
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("DOI_dv [doi=");
+		builder.append(doi);
+		builder.append(", doi_url=");
+		builder.append(doi_url);
+		builder.append("]");
+		return builder.toString();
+	}
+
+}

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/LicenseBean.java

@@ -1,98 +0,0 @@
-package org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped;
-
-import java.io.Serializable;
-
-import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ZenodoLicense;
-
-/**
- * A license bean like the ckan's one.
- *
- * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
- * 
- * Jan 13, 2020
- */
-public class LicenseBean implements Serializable, ZenodoLicense{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 6618784269251750489L;
-	private String id;
-	private String title;
-	private String url;
-	
-	/**
-	 * Instantiates a new license bean.
-	 */
-	public LicenseBean() {
-		super();
-	}
-
-
-	/**
-	 * Instantiates a new license bean.
-	 *
-	 * @param id the id
-	 * @param title the title
-	 * @param url the url
-	 */
-	public LicenseBean(String id, String title, String url) {
-		super();
-		this.id = id;
-		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;
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object obj) {
-		return obj.getClass().equals(this.getClass()) && ((LicenseBean)obj).getTitle().equals(this.title);
-	}
-
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("LicenseBean [id=");
-		builder.append(id);
-		builder.append(", title=");
-		builder.append(title);
-		builder.append(", url=");
-		builder.append(url);
-		builder.append("]");
-		return builder.toString();
-	}
-
-}

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/LicenseDTO.java

@@ -0,0 +1,71 @@
+//package org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped;
+//
+//import java.io.Serializable;
+//
+///**
+// * A license bean like the ckan's one.
+// *
+// * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
+// * 
+// *         Jan 13, 2020
+// */
+//public class LicenseDTO implements Serializable {
+//
+//	/**
+//	 * 
+//	 */
+//	private static final long serialVersionUID = 8796338619448833841L;
+//	private String id;
+//	private String title;
+//	private String url;
+//
+//	/**
+//	 * Instantiates a new license bean.
+//	 */
+//	public LicenseDTO() {
+//	}
+//
+//	public LicenseDTO(String id, String title, String url) {
+//		this.id = id;
+//		this.title = title;
+//		this.url = url;
+//	}
+//
+//	public String getId() {
+//		return id;
+//	}
+//
+//	public String getTitle() {
+//		return title;
+//	}
+//
+//	public String getUrl() {
+//		return url;
+//	}
+//
+//	public void setId(String id) {
+//		this.id = id;
+//	}
+//
+//	public void setTitle(String title) {
+//		this.title = title;
+//	}
+//
+//	public void setUrl(String url) {
+//		this.url = url;
+//	}
+//
+//	@Override
+//	public String toString() {
+//		StringBuilder builder = new StringBuilder();
+//		builder.append("LicenseDTO [id=");
+//		builder.append(id);
+//		builder.append(", title=");
+//		builder.append(title);
+//		builder.append(", url=");
+//		builder.append(url);
+//		builder.append("]");
+//		return builder.toString();
+//	}
+//
+//}

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/ZenodoContributor.java

@@ -1,5 +1,7 @@
 package org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped;
 
+import java.io.Serializable;
+
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.SerializableEnum;
 
 
@@ -10,7 +12,7 @@ import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.SerializableEnum;
  * 
  * Jan 15, 2020
  */
-public class ZenodoContributor extends ZenodoCreator{
+public class ZenodoContributor extends ZenodoCreator implements Serializable {
 	
 	/**
 	 * 

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/ZenodoDateInterval.java

@@ -28,7 +28,7 @@ public class ZenodoDateInterval implements Serializable {
 	/**
 	 * Instantiates a new zenodo date interval.
 	 */
-	ZenodoDateInterval() {
+	public ZenodoDateInterval() {
 	}
 
 	/**

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/ZenodoLicense.java

@@ -0,0 +1,34 @@
+//package org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped;
+//
+//
+///**
+// * The Interface ZenodoLicense.
+// *
+// * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
+// * 
+// * Jan 21, 2020
+// */
+//public interface ZenodoLicense {
+//	
+//	/**
+//	 * Gets the id.
+//	 *
+//	 * @return the id
+//	 */
+//	String getId();
+//	
+//	/**
+//	 * Gets the title.
+//	 *
+//	 * @return the title
+//	 */
+//	String getTitle();
+//	
+//	/**
+//	 * Gets the url.
+//	 *
+//	 * @return the url
+//	 */
+//	String getUrl();
+//
+//}

src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/ZenodoMetadata.java

@@ -77,7 +77,9 @@ public class ZenodoMetadata implements Serializable {
 	private List<ZenodoDateInterval> dates;
 	private String method; // TODO html
 
-	private SerializableEnum<LicenseBean> licenses;
+	// private SerializableEnum<String> licenseIDs;
+
+	private List<String> licenseIDs;
 
 	/**
 	 * Instantiates a new zenodo metadata.
@@ -103,10 +105,20 @@ public class ZenodoMetadata implements Serializable {
 		this.upload_type = upload_type;
 	}
 
+	/**
+	 * Gets the contributors types.
+	 *
+	 * @return the contributors types
+	 */
 	public SerializableEnum<String> getContributorsTypes() {
 		return contributorsTypes;
 	}
 
+	/**
+	 * Sets the contributors types.
+	 *
+	 * @param contributorsTypes the new contributors types
+	 */
 	public void setContributorsTypes(SerializableEnum<String> contributorsTypes) {
 		this.contributorsTypes = contributorsTypes;
 	}
@@ -868,23 +880,28 @@ public class ZenodoMetadata implements Serializable {
 	}
 
 	/**
-	 * Sets the licenses.
+	 * Sets the license IDs.
 	 *
-	 * @param licenses the new licenses
+	 * @param licensesIDs the new license IDs
 	 */
-	public void setLicenses(SerializableEnum<LicenseBean> licenses) {
-		this.licenses = licenses;
+	public void setLicenseIDs(List<String> licensesIDs) {
+		this.licenseIDs = licensesIDs;
 	}
 
 	/**
-	 * Gets the licenses.
+	 * Gets the license IDs.
 	 *
-	 * @return the licenses
+	 * @return the license IDs
 	 */
-	public SerializableEnum<LicenseBean> getLicenses() {
-		return licenses;
+	public List<String> getLicenseIDs() {
+		return licenseIDs;
 	}
 
+	/**
+	 * To string.
+	 *
+	 * @return the string
+	 */
 	@Override
 	public String toString() {
 		StringBuilder builder = new StringBuilder();
@@ -974,8 +991,8 @@ public class ZenodoMetadata implements Serializable {
 		builder.append(dates);
 		builder.append(", method=");
 		builder.append(method);
-		builder.append(", licenses=");
-		builder.append(licenses);
+		builder.append(", licenseIDs=");
+		builder.append(licenseIDs);
 		builder.append("]");
 		return builder.toString();
 	}

src/test/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/Tester.java

@@ -1,19 +1,101 @@
 package org.gcube.portlets.widgets.ckan2zenodopublisher.client;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.time.Instant;
+import java.util.Date;
+
+import javax.ws.rs.client.Entity;
+
+import org.gcube.data.publishing.ckan2zenodo.Fixer;
+import org.gcube.data.publishing.ckan2zenodo.model.faults.ZenodoException;
+import org.gcube.data.publishing.ckan2zenodo.model.zenodo.DepositionMetadata;
+import org.gcube.data.publishing.ckan2zenodo.model.zenodo.ZenodoDeposition;
+
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 
 public class Tester {
 
 	public static String expression = "^\\/dataset(\\?([a-zA-Z0-9_.-]*.+))*";
 	public static String toMatch = "/dataset?systemtype=E39_Actor&groups=huma_num___nakala";
 	
+	private static ObjectMapper mapper = new ObjectMapper();
+
+	static {
+		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,false);
+		mapper.configure(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false);
+		mapper.setSerializationInclusion(Include.NON_NULL);
+		//		mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+	}
+
+//	public static void main(String[] args) {
+//		Pattern p = Pattern.compile(expression);
+//		Matcher m = p.matcher(toMatch);
+//		boolean b = m.matches();
+//		
+//		System.out.println(b);
+//
+//	}
+	
+	
 	public static void main(String[] args) {
-		Pattern p = Pattern.compile(expression);
-		Matcher m = p.matcher(toMatch);
-		boolean b = m.matches();
 		
-		System.out.println(b);
+		//ObjectMapper mapper = new ObjectMapper();
+		ZenodoDeposition zed = new ZenodoDeposition();
+		DepositionMetadata metadata = new DepositionMetadata();
+		metadata.setPublication_date(Date.from(Instant.now()));
+		//zed.setMetadata(metadata);
+		
+		String serialized;
+		try {
+			System.out.println("init json: "+mapper.writeValueAsString(metadata));
+			
+			serialized = "{\"metadata\":"+Fixer.fixIncoming(mapper.writeValueAsString(metadata))+"}";
+			System.out.println("serialized: "+serialized);
+			
+			Entity<String> JSON = Entity.json(serialized);
+			System.out.println("JSON: "+JSON);
+			ZenodoDeposition object = mapper.readValue(Fixer.fixIncoming(serialized), ZenodoDeposition.class);
+			System.out.println("ZenodoDeposition: "+object);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		//System.out.println(metadata.getPublication_date());
+		
+//		try {
+//			updateMetadata(metadata);
+//		} catch (ZenodoException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+	}
+	
+	private static ZenodoDeposition updateMetadata(DepositionMetadata meta) throws ZenodoException {		
+		try{
+			String serialized="{\"metadata\":"+Fixer.fixIncoming(mapper.writeValueAsString(meta))+"}";
+			System.out.println("serialized: "+serialized);
+		try {
+//			Response resp = getWebClient().target(credentials.getBaseUrl()).
+//					path(DEPOSITION_BASE_URL).path(depositionId+"").
+//					queryParam(ACCESS_TOKEN, credentials.getKey()).request(CONTENT_TYPE)
+//					.put(Entity.json(serialized));
+//			return check(resp,ZenodoDeposition.class);
+			
+			Entity<String> JSON = Entity.json(serialized);
+			System.out.println("JSON: "+JSON);
+			return mapper.readValue(Fixer.fixIncoming(serialized), ZenodoDeposition.class);
+		}catch(Throwable t) {
+			System.out.println("Error while tryin to update "+serialized);
+			return null;
+		}		
+		}catch(JsonProcessingException e) {
+			System.out.println("Error while parsing "+meta + " " +e);
+			throw new ZenodoException("Internal error.",e);
+		}
 		
 	}