From 77bab690c3fc123e73af5e8d9b3458048db74a2f Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Mon, 2 Dec 2013 19:50:00 +0100 Subject: [PATCH] Test not passing --- .../exoplatform/commons/config/configuration.xml | 2 +- .../portal/config/model/ApplicationType.java | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/component/common/src/test/resources/org/exoplatform/commons/config/configuration.xml b/component/common/src/test/resources/org/exoplatform/commons/config/configuration.xml index 1a1262164..ba890d47d 100644 --- a/component/common/src/test/resources/org/exoplatform/commons/config/configuration.xml +++ b/component/common/src/test/resources/org/exoplatform/commons/config/configuration.xml @@ -29,7 +29,7 @@ org.gatein.common.GateInConfigurator - application.file + application.conf.file jar:/org/exoplatform/commons/config/configuration.conf diff --git a/component/portal/src/main/java/org/exoplatform/portal/config/model/ApplicationType.java b/component/portal/src/main/java/org/exoplatform/portal/config/model/ApplicationType.java index 15bbf4b6c..54736c3d3 100644 --- a/component/portal/src/main/java/org/exoplatform/portal/config/model/ApplicationType.java +++ b/component/portal/src/main/java/org/exoplatform/portal/config/model/ApplicationType.java @@ -34,7 +34,7 @@ * @version $Revision$ * @param the content state type of the application */ -public abstract class ApplicationType implements Serializable { +public class ApplicationType implements Serializable { public static ApplicationType getType(String name) { if (PORTLET.getName().equals(name)) { @@ -64,16 +64,16 @@ public static ApplicationType getType(ContentType name) { public static final ContentType UNKNOWN_CONTENT_TYPE = new ContentType("unknown", Serializable.class); /** . */ - public static final ApplicationType UNKNOWN = new ApplicationType(UNKNOWN_CONTENT_TYPE, "unknown") {}; + public static final ApplicationType UNKNOWN = new ApplicationType(UNKNOWN_CONTENT_TYPE, "unknown"); /** . */ - public static final ApplicationType PORTLET = new ApplicationType(Portlet.CONTENT_TYPE, "portlet") {}; + public static final ApplicationType PORTLET = new ApplicationType(Portlet.CONTENT_TYPE, "portlet"); /** . */ - public static final ApplicationType GADGET = new ApplicationType(Gadget.CONTENT_TYPE, "gadget") {}; + public static final ApplicationType GADGET = new ApplicationType(Gadget.CONTENT_TYPE, "gadget"); /** . */ - public static final ApplicationType WSRP_PORTLET = new ApplicationType(WSRP.CONTENT_TYPE, "wsrp") {}; + public static final ApplicationType WSRP_PORTLET = new ApplicationType(WSRP.CONTENT_TYPE, "wsrp"); /** . */ private final transient ContentType contentType; @@ -103,4 +103,9 @@ public String getName() { private Object readResolve() throws ObjectStreamException { return getType(name); } + + @Override + public String toString() { + return "ApplicationType[" + getName() + "]"; + } }