diff --git a/.classpath b/.classpath index 0f4a4c2..04023d0 100644 --- a/.classpath +++ b/.classpath @@ -15,11 +15,7 @@ - - - - - + @@ -28,5 +24,10 @@ + + + + + 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.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 69c31cd..4e4a3ad 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index cc86943..834a6a2 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,10 +1,10 @@ - + - + uses diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index 1e1fabd..a2e86a5 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - + diff --git a/pom.xml b/pom.xml index 001454e..fba2333 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,12 @@ - 4.0.0 - maven-parent org.gcube.tools - 1.0.0 + maven-parent + 1.1.0 org.gcube.portal.plugins @@ -13,19 +14,22 @@ war landing-page-hook Hook 6.4.0-SNAPSHOT - - - 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 - - - + + scm:git:https://code-repo.d4science.org/gCubeSystem/landing-page-hook.git + scm:git:https://code-repo.d4science.org/gCubeSystem/landing-page-hook.git + https://code-repo.d4science.org/gCubeSystem/landing-page-hook + + + distro + 1.8 + 1.8 + 6.2.5 + 6.2.10.12 + /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 + org.gcube.portal @@ -62,39 +66,15 @@ 2.0 provided - - org.slf4j - slf4j-log4j12 - 1.6.4 - - - org.slf4j - slf4j-api - 1.6.4 - - - com.liferay.maven.plugins - liferay-maven-plugin - ${liferay.maven.plugin.version} - - ${liferay.auto.deploy.dir} - ${liferay.app.server.deploy.dir} - ${liferay.app.server.lib.global.dir} - ${liferay.app.server.portal.dir} - ${liferay.version} - hook - - maven-compiler-plugin - 2.5 UTF-8 - 1.6 - 1.6 + 1.8 + 1.8 @@ -104,6 +84,24 @@ UTF-8 + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + -Xdoclint:none + + 3.1.0 + + + generate-doc + install + + jar + + + + \ No newline at end of file diff --git a/src/main/java/org/gcube/portal/events/LandingPageAction.java b/src/main/java/org/gcube/portal/events/LandingPageAction.java index a44eff8..5fc8af0 100644 --- a/src/main/java/org/gcube/portal/events/LandingPageAction.java +++ b/src/main/java/org/gcube/portal/events/LandingPageAction.java @@ -5,20 +5,20 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.gcube.portal.landingpage.LandingPageManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.liferay.portal.kernel.events.Action; import com.liferay.portal.kernel.events.ActionException; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.struts.LastPath; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.WebKeys; public class LandingPageAction extends Action { - - private static final Logger _log = LoggerFactory.getLogger(LandingPageAction.class); + private static Log _log = LogFactoryUtil.getLog(LandingPageAction.class); + private static final String VHOST_TO_SKIP = "dev.d4science.org"; @Override public void run(HttpServletRequest request, HttpServletResponse response) throws ActionException {