diff --git a/.classpath b/.classpath
index d4c528a..cd1e29b 100644
--- a/.classpath
+++ b/.classpath
@@ -6,11 +6,6 @@
-
-
-
-
-
@@ -24,9 +19,9 @@
-
+
-
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 85e5be7..3285ecf 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,11 +1,10 @@
-
+
-
-
+
diff --git a/pom.xml b/pom.xml
index 85ee0dd..e698258 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,73 +1,45 @@
-
-
-
+
4.0.0
-
maven-parent
org.gcube.tools
1.1.0
-
org.gcube.portlets.user
- WebFormCustom
+ email-contactform-portlet
war
- WebFormCustom Portlet
- 1.0.0-SNAPSHOT
+ email contact form Portlet
+ 1.1.0-SNAPSHOT
+
+ scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git
+ scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git
+ https://code-repo.d4science.org/gCubeSystem/${project.artifactId}
+
+
+ 2.8.2
+ distro
+ 6.2.5
+ 6.2.10.12
+ ${system.CATALINA_HOME}/../deploy
+ ${system.CATALINA_HOME}/webapps
+ ${system.CATALINA_HOME}/lib/ext
+ ${system.CATALINA_HOME}/webapps/ROOT
+
org.gcube.distribution
maven-portal-bom
- 3.6.0-SNAPSHOT
+ 3.6.0
pom
import
-
-
-
- com.liferay.maven.plugins
- liferay-maven-plugin
- ${liferay.maven.plugin.version}
-
-
- generate-sources
-
- build-css
-
-
-
-
- ${liferay.auto.deploy.dir}
- ${liferay.app.server.deploy.dir}
- ${liferay.app.server.lib.global.dir}
- ${liferay.app.server.portal.dir}
- ${liferay.version}
- portlet
-
-
-
- maven-compiler-plugin
- 2.5
-
- UTF-8
-
- 1.8
-
-
-
- maven-resources-plugin
- 2.5
-
- UTF-8
-
-
-
-
org.gcube.common.portal
@@ -122,17 +94,56 @@
provided
-
-
- Liferay-v6.2-CE-(Tomcat-7)-(2)
-
- 6.2.5
- 6.2.5
- /Users/massi/portal/liferay-portal-6.2-ce-ga6/deploy
- /Users/massi/portal/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/webapps
- /Users/massi/portal/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/lib/ext
- /Users/massi/portal/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/webapps/ROOT
-
-
-
-
\ No newline at end of file
+
+
+
+ org.apache.maven.plugins
+ maven-war-plugin
+
+
+ compile
+
+ exploded
+
+
+
+
+ ${webappDirectory}
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+
+ ${maven.compiler.target}
+
+
+
+ maven-resources-plugin
+ 2.5
+
+ UTF-8
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+ -Xdoclint:none
+ -Xdoclint:none
+
+ 3.1.0
+
+
+ generate-doc
+ install
+
+ jar
+
+
+
+
+
+
+
diff --git a/src/main/java/org/gcube/portlets/user/MailForm.java b/src/main/java/org/gcube/portlets/user/MailForm.java
index 089744a..b781508 100644
--- a/src/main/java/org/gcube/portlets/user/MailForm.java
+++ b/src/main/java/org/gcube/portlets/user/MailForm.java
@@ -40,7 +40,11 @@ public class MailForm extends MVCPortlet {
HttpServletRequest request = PortalUtil.getHttpServletRequest(actionRequest);
String hostname = PortalUtil.getHost(actionRequest);
- String emailAddress = "info@"+ hostname.split("www.")[1];
+ System.out.println("hostname to split:" + hostname);
+ String[] splits = hostname.split("www.");
+ String emailAddress = "info@d4science.org";
+ if (splits.length > 1)
+ emailAddress = "info@"+ hostname.split("www.")[1];
try {
/**
diff --git a/src/main/webapp/WEB-INF/liferay-display.xml b/src/main/webapp/WEB-INF/liferay-display.xml
index e8da84e..05c10e7 100644
--- a/src/main/webapp/WEB-INF/liferay-display.xml
+++ b/src/main/webapp/WEB-INF/liferay-display.xml
@@ -2,9 +2,6 @@
-
-
-
diff --git a/src/main/webapp/WEB-INF/liferay-plugin-package.properties b/src/main/webapp/WEB-INF/liferay-plugin-package.properties
index 77b81ac..2488eeb 100644
--- a/src/main/webapp/WEB-INF/liferay-plugin-package.properties
+++ b/src/main/webapp/WEB-INF/liferay-plugin-package.properties
@@ -1,9 +1,9 @@
name=WebFormCustom
module-group-id=liferay
-module-incremental-version=1
+module-incremental-version=2
tags=
short-description=
change-log=
-page-url=http://www.liferay.com
-author=Liferay, Inc.
-licenses=LGPL
\ No newline at end of file
+page-url=http://www.gcube-system.org
+author=M. Assante
+licenses=EUPL
diff --git a/src/main/webapp/WEB-INF/liferay-portlet.xml b/src/main/webapp/WEB-INF/liferay-portlet.xml
index 6229095..cb890be 100644
--- a/src/main/webapp/WEB-INF/liferay-portlet.xml
+++ b/src/main/webapp/WEB-INF/liferay-portlet.xml
@@ -2,12 +2,6 @@
-
- WebFormCustom
- /icon.png
- /css/main.css
- /js/main.js
-
mail-form
/icon.png
diff --git a/src/main/webapp/WEB-INF/portlet.xml b/src/main/webapp/WEB-INF/portlet.xml
index 0be3bac..74df0c2 100644
--- a/src/main/webapp/WEB-INF/portlet.xml
+++ b/src/main/webapp/WEB-INF/portlet.xml
@@ -1,36 +1,6 @@
-
- WebFormCustom
- WebFormCustom
- com.liferay.util.bridges.mvc.MVCPortlet
-
- view-template
- /view.jsp
-
- 0
-
- text/html
-
-
- WebFormCustom
- WebFormCustom
- WebFormCustom
-
-
- administrator
-
-
- guest
-
-
- power-user
-
-
- user
-
-
mail-form
Mail Form
diff --git a/src/main/webapp/view.jsp b/src/main/webapp/view.jsp
deleted file mode 100644
index a933d2b..0000000
--- a/src/main/webapp/view.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<%
-/**
- * Copyright (c) 2000-2013 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-%>
-
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
-
-
-
-This is the Captcha Demo portlet.
\ No newline at end of file