Author: emuckenhuber Date: 2008-01-31 09:23:29 -0500 (Thu, 31 Jan 2008) New Revision: 9687 Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/LifeCyclePhase.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/filter/FilterMetaData.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/FilterTestEverythingTestCase.java modules/portlet/trunk/test/src/test/resources/metadata/general/portlet-app_2_0.xml Log: use LifeCyclePhase enum instead of a plain string Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/LifeCyclePhase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/LifeCyclePhase.java 2008-01-31 14:11:59 UTC (rev 9686) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/LifeCyclePhase.java 2008-01-31 14:23:29 UTC (rev 9687) @@ -22,6 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet; +import javax.xml.bind.annotation.XmlEnumValue; + /** * Enumerate the life cycle phase of a Portlet. * @@ -30,5 +32,8 @@ */ public enum LifeCyclePhase { - ACTION, EVENT, RENDER, RESOURCE + @XmlEnumValue("ACTION_PHASE") ACTION, + @XmlEnumValue("EVENT_PHASE") EVENT, + @XmlEnumValue("RENDER_PHASE") RENDER, + @XmlEnumValue("RESOURCE_PHASE") RESOURCE } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/filter/FilterMetaData.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/filter/FilterMetaData.java 2008-01-31 14:11:59 UTC (rev 9686) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/filter/FilterMetaData.java 2008-01-31 14:23:29 UTC (rev 9687) @@ -31,6 +31,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.portlet.LifeCyclePhase; import org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants; import org.jboss.portal.portlet.impl.metadata.common.InitParamMetaData; import org.jboss.portal.portlet.impl.metadata.adapter.LocalizedStringAdapter; @@ -52,7 +53,7 @@ private String filterClass; /** The filter lifecycle */ - private List<String> lifecycle; + private List<LifeCyclePhase> lifecycle; /** The filter display name */ private LocalizedString displayName; @@ -85,23 +86,21 @@ } @XmlElement(name = "lifecycle", required = true) -// @XmlJavaTypeAdapter(FilterLifeCycleAdapter.class) -// public List<LifeCycleEnumMetaData> getLifecycle() - public List<String> getLifecycle() + public List<LifeCyclePhase> getLifecycle() { return lifecycle; } - public void setLifecycle(List<String> lifecycle) + public void setLifecycle(List<LifeCyclePhase> lifecycle) { this.lifecycle = lifecycle; } - public void addLifecycle(String lifecycle) + public void addLifecycle(LifeCyclePhase lifecycle) { if( this.lifecycle == null) { - this.lifecycle = new ArrayList<String>(); + this.lifecycle = new ArrayList<LifeCyclePhase>(); } this.lifecycle.add(lifecycle); } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java 2008-01-31 14:11:59 UTC (rev 9686) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java 2008-01-31 14:23:29 UTC (rev 9687) @@ -29,6 +29,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.portlet.LifeCyclePhase; import org.jboss.portal.portlet.TransportGuarantee; import org.jboss.portal.portlet.impl.metadata.CustomPortletModeMetaData; import org.jboss.portal.portlet.impl.metadata.CustomWindowStateMetaData; @@ -750,7 +751,15 @@ } else if ("lifecycle".equals(localName)) { - md.addLifecycle(value); + String lifeCycle = value.substring(0 , value.length() - "_PHASE".length()); + try + { + md.addLifecycle(LifeCyclePhase.valueOf(lifeCycle)); + } + catch(IllegalArgumentException e) + { + throw new IllegalArgumentException("Invalid value for lifecycle. Valid values are [RENDER_PHASE, RESOURCE_PHASE, ACTION_PHASE, EVENT_PHASE]"); + } } } Modified: modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/FilterTestEverythingTestCase.java =================================================================== --- modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/FilterTestEverythingTestCase.java 2008-01-31 14:11:59 UTC (rev 9686) +++ modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/FilterTestEverythingTestCase.java 2008-01-31 14:23:29 UTC (rev 9687) @@ -24,6 +24,7 @@ import java.util.Locale; +import org.jboss.portal.portlet.LifeCyclePhase; import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData; import org.jboss.portal.portlet.impl.metadata.common.InitParamMetaData; import org.jboss.portal.portlet.impl.metadata.filter.FilterMetaData; @@ -68,8 +69,8 @@ assertNotNull(filter); assertEquals("org.jboss.portal.meta.NoExistingClass", filter.getFilterClass()); assertEquals("testFilter", filter.getFilterName()); - assertEquals("ACTION_PHASE", filter.getLifecycle().get(0)); - assertEquals("RENDER_PHASE", filter.getLifecycle().get(1)); + assertEquals(LifeCyclePhase.ACTION, filter.getLifecycle().get(0)); + assertEquals(LifeCyclePhase.RENDER, filter.getLifecycle().get(1)); assertEquals("test", filter.getDescription().getDefaultString()); assertEquals("bla", filter.getDescription().getString(new Locale("de"), false)); @@ -91,7 +92,7 @@ // FilterMetaData filter2 = md.getFilter("testFilterZwei"); assertEquals("testFilterZwei", filter2.getFilterName()); - assertEquals("ACTION_PHASE", filter2.getLifecycle().get(0)); + assertEquals(LifeCyclePhase.ACTION, filter2.getLifecycle().get(0)); // Filter mapping assertTrue(md.getFilterMapping().containsKey("testFilter")); Modified: modules/portlet/trunk/test/src/test/resources/metadata/general/portlet-app_2_0.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/metadata/general/portlet-app_2_0.xml 2008-01-31 14:11:59 UTC (rev 9686) +++ modules/portlet/trunk/test/src/test/resources/metadata/general/portlet-app_2_0.xml 2008-01-31 14:23:29 UTC (rev 9687) @@ -82,7 +82,7 @@ <display-name xml:lang="en">display-name</display-name> <filter-name>filter-name</filter-name> <filter-class>filter-class</filter-class> - <lifecycle>lifecycle</lifecycle> + <lifecycle>RENDER_PHASE</lifecycle> <init-param id=""> <description xml:lang="en">description</description> <name>name</name>