Test not passing

gatein · Dec 3, 2013 · 77bab69 · 77bab69
1 parent 70ac46c
commit 77bab69
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 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
@@ -29,7 +29,7 @@
     <type>org.gatein.common.GateInConfigurator</type>
     <init-params>
       <value-param>
-        <name>application.file</name>
+        <name>application.conf.file</name>
         <value>jar:/org/exoplatform/commons/config/configuration.conf</value>
       </value-param> 
     </init-params>

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
@@ -34,7 +34,7 @@
  * @version $Revision$
  * @param <S> the content state type of the application
  */
-public abstract class ApplicationType<S> implements Serializable {
+public class ApplicationType<S> implements Serializable {
 
     public static ApplicationType<?> getType(String name) {
         if (PORTLET.getName().equals(name)) {
@@ -64,16 +64,16 @@ public static <S> ApplicationType<S> getType(ContentType<S> name) {
     public static final ContentType<Serializable> UNKNOWN_CONTENT_TYPE = new ContentType<Serializable>("unknown", Serializable.class);
 
     /** . */
-    public static final ApplicationType<Serializable> UNKNOWN = new ApplicationType<Serializable>(UNKNOWN_CONTENT_TYPE, "unknown") {};
+    public static final ApplicationType<Serializable> UNKNOWN = new ApplicationType<Serializable>(UNKNOWN_CONTENT_TYPE, "unknown");
 
     /** . */
-    public static final ApplicationType<Portlet> PORTLET = new ApplicationType<Portlet>(Portlet.CONTENT_TYPE, "portlet") {};
+    public static final ApplicationType<Portlet> PORTLET = new ApplicationType<Portlet>(Portlet.CONTENT_TYPE, "portlet");
 
     /** . */
-    public static final ApplicationType<Gadget> GADGET = new ApplicationType<Gadget>(Gadget.CONTENT_TYPE, "gadget") {};
+    public static final ApplicationType<Gadget> GADGET = new ApplicationType<Gadget>(Gadget.CONTENT_TYPE, "gadget");
 
     /** . */
-    public static final ApplicationType<WSRP> WSRP_PORTLET = new ApplicationType<WSRP>(WSRP.CONTENT_TYPE, "wsrp") {};
+    public static final ApplicationType<WSRP> WSRP_PORTLET = new ApplicationType<WSRP>(WSRP.CONTENT_TYPE, "wsrp");
 
     /** . */
     private final transient ContentType<S> contentType;
@@ -103,4 +103,9 @@ public String getName() {
     private Object readResolve() throws ObjectStreamException {
         return getType(name);
     }
+
+    @Override
+    public String toString() {
+        return "ApplicationType[" + getName() + "]";
+    }
 }