Author: emuckenhuber Date: 2008-01-08 10:23:51 -0500 (Tue, 08 Jan 2008) New Revision: 9456 Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/LocaleAdapter.java Removed: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/security/TransportGuaranteeEnum.java Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/PortletApplication10MetaData.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/ContainerRuntimeAdapter.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/CustomPortletModeAdapter.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/CustomWindowStateAdapter.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/EventListAdapter.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/FilterAdapter.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/FilterMappingAdapter.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/LocalizedStringAdapter.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletListAdapter.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletPreferencesListAdapter.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/UserAttributeAdapter.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/PortletMetaData.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/SupportedLocaleMetaData.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/security/UserDataConstraintMetaData.java modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/PortletTestEverythingTestCase.java modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/SecurityConstraintTestEverythingTestCase.java modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java Log: - reference to portletApp in portletMD - use portal.TransportGuarantee - added LocaleAdapter Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/PortletApplication10MetaData.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/PortletApplication10MetaData.java 2008-01-08 10:10:28 UTC (rev 9455) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/PortletApplication10MetaData.java 2008-01-08 15:23:51 UTC (rev 9456) @@ -106,6 +106,11 @@ public void setPortlets(Map<String, PortletMetaData> portlets) { + // Adding reference to the portlet application metadata + for( PortletMetaData p : portlets.values()) + { + p.setPortletApplication(this); + } this.portlets = portlets; } @@ -125,6 +130,8 @@ { this.portlets = new LinkedHashMap<String, PortletMetaData>(); } + // Adding reference to the portlet application metadata + portlet.setPortletApplication(this); this.portlets.put(portlet.getPortletName(), portlet); } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/ContainerRuntimeAdapter.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/ContainerRuntimeAdapter.java 2008-01-08 10:10:28 UTC (rev 9455) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/ContainerRuntimeAdapter.java 2008-01-08 15:23:51 UTC (rev 9456) @@ -41,7 +41,7 @@ @Override public List<ContainerRuntimeMetaData> marshal(Map<String, ContainerRuntimeMetaData> map) throws Exception { - throw new RuntimeException("Not yet implemented."); + throw new UnsupportedOperationException(); } @Override Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/CustomPortletModeAdapter.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/CustomPortletModeAdapter.java 2008-01-08 10:10:28 UTC (rev 9455) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/CustomPortletModeAdapter.java 2008-01-08 15:23:51 UTC (rev 9456) @@ -40,8 +40,7 @@ @Override public List<CustomPortletModeMetaData> marshal(Map<String, CustomPortletModeMetaData> map) throws Exception { - // FIXME marshal - return null; + throw new UnsupportedOperationException(); } @Override Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/CustomWindowStateAdapter.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/CustomWindowStateAdapter.java 2008-01-08 10:10:28 UTC (rev 9455) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/CustomWindowStateAdapter.java 2008-01-08 15:23:51 UTC (rev 9456) @@ -40,8 +40,7 @@ @Override public List<CustomWindowStateMetaData> marshal(Map<String, CustomWindowStateMetaData> map) throws Exception { - // FIXME marshal - return null; + throw new UnsupportedOperationException(); } @Override Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/EventListAdapter.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/EventListAdapter.java 2008-01-08 10:10:28 UTC (rev 9455) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/EventListAdapter.java 2008-01-08 15:23:51 UTC (rev 9456) @@ -40,7 +40,7 @@ @Override public EventDefinitionMetaData[] marshal(Map<String, EventDefinitionMetaData> eventMap) throws Exception { - throw new RuntimeException("Not yet implemented."); + throw new UnsupportedOperationException(); } @Override Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/FilterAdapter.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/FilterAdapter.java 2008-01-08 10:10:28 UTC (rev 9455) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/FilterAdapter.java 2008-01-08 15:23:51 UTC (rev 9456) @@ -41,7 +41,7 @@ @Override public List<FilterMetaData> marshal(Map<String, FilterMetaData> map) throws Exception { - throw new RuntimeException("Not yet implemented."); + throw new UnsupportedOperationException(); } @Override Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/FilterMappingAdapter.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/FilterMappingAdapter.java 2008-01-08 10:10:28 UTC (rev 9455) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/FilterMappingAdapter.java 2008-01-08 15:23:51 UTC (rev 9456) @@ -41,7 +41,7 @@ @Override public List<FilterMappingMetaData> marshal(Map<String, FilterMappingMetaData> arg0) throws Exception { - throw new RuntimeException("Not yet implemented."); + throw new UnsupportedOperationException(); } @Override Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/LocaleAdapter.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/LocaleAdapter.java (rev 0) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/LocaleAdapter.java 2008-01-08 15:23:51 UTC (rev 9456) @@ -0,0 +1,49 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This 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 software 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. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.impl.metadata.adapter; + +import java.util.Locale; + +import javax.xml.bind.annotation.adapters.XmlAdapter; + +/** + * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> + * @version $Revision$ + */ +public class LocaleAdapter extends XmlAdapter<String, Locale> +{ + + @Override + public String marshal(Locale arg0) throws Exception + { + throw new UnsupportedOperationException(); + } + + @Override + public Locale unmarshal(String arg0) throws Exception + { + return new Locale(arg0); + } + +} + Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/LocalizedStringAdapter.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/LocalizedStringAdapter.java 2008-01-08 10:10:28 UTC (rev 9455) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/LocalizedStringAdapter.java 2008-01-08 15:23:51 UTC (rev 9456) @@ -45,7 +45,7 @@ @Override public List<LocalizedDescriptionMetaData> marshal(LocalizedString arg0) throws Exception { - throw new RuntimeException("Not yet implemented."); + throw new UnsupportedOperationException(); } @Override Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletListAdapter.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletListAdapter.java 2008-01-08 10:10:28 UTC (rev 9455) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletListAdapter.java 2008-01-08 15:23:51 UTC (rev 9456) @@ -41,7 +41,7 @@ @Override public List<PortletMetaData> marshal(Map<String, PortletMetaData> portletMap) throws Exception { - throw new RuntimeException("Not yet implemented."); + throw new UnsupportedOperationException(); } @Override Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletPreferencesListAdapter.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletPreferencesListAdapter.java 2008-01-08 10:10:28 UTC (rev 9455) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletPreferencesListAdapter.java 2008-01-08 15:23:51 UTC (rev 9456) @@ -41,7 +41,7 @@ @Override public List<PortletPreferenceMetaData> marshal(Map<String, PortletPreferenceMetaData> arg0) throws Exception { - throw new RuntimeException("Not yet implemented."); + throw new UnsupportedOperationException(); } @Override Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/UserAttributeAdapter.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/UserAttributeAdapter.java 2008-01-08 10:10:28 UTC (rev 9455) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/UserAttributeAdapter.java 2008-01-08 15:23:51 UTC (rev 9456) @@ -42,7 +42,7 @@ @Override public List<UserAttributeMetaData> marshal(Map<String, UserAttributeMetaData> arg0) throws Exception { - throw new RuntimeException("Not yet implemented."); + throw new UnsupportedOperationException(); } @Override Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/PortletMetaData.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/PortletMetaData.java 2008-01-08 10:10:28 UTC (rev 9455) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/PortletMetaData.java 2008-01-08 15:23:51 UTC (rev 9456) @@ -34,6 +34,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; import org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants; import org.jboss.portal.portlet.impl.metadata.event.EventDefinitionReferenceMetaData; import org.jboss.portal.portlet.impl.metadata.adapter.LocalizedStringAdapter; @@ -104,6 +105,9 @@ /** The portlet container runtime options */ private Map<String, ContainerRuntimeMetaData> containerRuntimeOptions; + + /** Reference to the PortletApplicationMetaData */ + private PortletApplication10MetaData portletApplication; public PortletMetaData() {} @@ -384,4 +388,15 @@ } this.containerRuntimeOptions.put(containerRuntimeOption.getName(), containerRuntimeOption); } + + /** . */ + public PortletApplication10MetaData getPortletApplication() + { + return portletApplication; + } + + public void setPortletApplication(PortletApplication10MetaData portletApplication) + { + this.portletApplication = portletApplication; + } } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/SupportedLocaleMetaData.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/SupportedLocaleMetaData.java 2008-01-08 10:10:28 UTC (rev 9455) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/SupportedLocaleMetaData.java 2008-01-08 15:23:51 UTC (rev 9456) @@ -22,9 +22,14 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.metadata.portlet; +import java.util.Locale; + import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.jboss.portal.portlet.impl.metadata.adapter.LocaleAdapter; + /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ @@ -34,15 +39,16 @@ { /** The supported locale */ - private String locale; + private Locale locale; @XmlValue - public String getLocale() + @XmlJavaTypeAdapter(LocaleAdapter.class) + public Locale getLocale() { return locale; } - public void setLocale(String locale) + public void setLocale(Locale locale) { this.locale = locale; } Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/security/TransportGuaranteeEnum.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/security/TransportGuaranteeEnum.java 2008-01-08 10:10:28 UTC (rev 9455) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/security/TransportGuaranteeEnum.java 2008-01-08 15:23:51 UTC (rev 9456) @@ -1,51 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This 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 software 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. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.impl.metadata.security; - -import javax.xml.bind.annotation.XmlEnum; - -/** - * In most cases, the presence of the INTEGRAL or CONFIDENTIAL - * flag will indicate that the use of SSL is required. - * - * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> - * @version $Revision$ - */ - -@XmlEnum -public enum TransportGuaranteeEnum { - - /** does not require any transport guarantees */ - NONE, - /** - * requires the data sent between the client and the portlet - * in such way that it can't be changed in transit - */ - INTEGRAL, - /** - * requires that the data be transmitted in a fashion that prevents - * other entities from observing the contents of the transmission - */ - CONFIDENTIAL - -} Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/security/UserDataConstraintMetaData.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/security/UserDataConstraintMetaData.java 2008-01-08 10:10:28 UTC (rev 9455) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/security/UserDataConstraintMetaData.java 2008-01-08 15:23:51 UTC (rev 9456) @@ -26,6 +26,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import org.jboss.portal.portlet.TransportGuarantee; import org.jboss.portal.portlet.impl.metadata.common.DescribableMetaData; /** @@ -40,7 +41,7 @@ private String id; /** The user transport quarantee */ - private TransportGuaranteeEnum transportQuarantee; + private TransportGuarantee transportQuarantee; public UserDataConstraintMetaData() {} @@ -61,12 +62,12 @@ } @XmlElement(name = "transport-guarantee") - public TransportGuaranteeEnum getTransportQuarantee() + public TransportGuarantee getTransportQuarantee() { return transportQuarantee; } - public void setTransportQuarantee(TransportGuaranteeEnum transportQuarantee) + public void setTransportQuarantee(TransportGuarantee transportQuarantee) { this.transportQuarantee = transportQuarantee; } Modified: modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/PortletTestEverythingTestCase.java =================================================================== --- modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/PortletTestEverythingTestCase.java 2008-01-08 10:10:28 UTC (rev 9455) +++ modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/PortletTestEverythingTestCase.java 2008-01-08 15:23:51 UTC (rev 9456) @@ -64,6 +64,7 @@ PortletMetaData p1 = md.getPortlet("Portlet1"); assertNotNull(p1); + assertEquals(md, p1.getPortletApplication()); assertEquals("fragmichnicht", p1.getId()); assertEquals("Portlet1", p1.getPortletName()); assertEquals(default_locale, p1.getDescription().getDefaultLocale()); @@ -105,8 +106,8 @@ assertEquals("MyResourceBundle", p1.getResourceBundle()); List<SupportedLocaleMetaData> localeList = p1.getSupportedLocale(); - assertEquals("en", localeList.get(0).getLocale()); - assertEquals("fr", localeList.get(1).getLocale()); + assertEquals(new Locale("en"), localeList.get(0).getLocale()); + assertEquals(new Locale("fr"), localeList.get(1).getLocale()); PortletInfoMetaData pimd = p1.getPortletInfo(); assertNotNull(pimd); @@ -144,18 +145,22 @@ PortletMetaData p2 = md.getPortlet("Portlet2"); assertNotNull(p2); + assertEquals(md, p2.getPortletApplication()); assertEquals("org.jboss.portal.test.portlet.TestSessionPortlet", p2.getPortletClass()); assertEquals("text/html", p2.getSupports().get(0).getMimeType()); assertEquals("test the portlet session", p2.getPortletInfo().getTitle()); PortletMetaData p3 = md.getPortlet("Portlet3"); assertNotNull(p3); + assertEquals(md, p3.getPortletApplication()); PortletMetaData p4 = md.getPortlet("Portlet4"); assertNotNull(p4); + assertEquals(md, p4.getPortletApplication()); PortletMetaData p5 = md.getPortlet("Portlet5"); assertNotNull(p5); + assertEquals(md, p5.getPortletApplication()); PortletPreferencesMetaData ppmd5 = p5.getPortletPreferences(); assertEquals("1", ppmd5.getPortletPreferences().get("one").getValue().get(0)); assertEquals("2", ppmd5.getPortletPreferences().get("two").getValue().get(0)); @@ -168,9 +173,10 @@ PortletMetaData p6 = md.getPortlet("Portlet6"); assertNotNull(p6); + assertEquals(md, p6.getPortletApplication()); assertEquals("Portlet6", p6.getResourceBundle()); - assertEquals("en", p6.getSupportedLocale().get(0).getLocale()); - assertEquals("fr", p6.getSupportedLocale().get(1).getLocale()); + assertEquals(new Locale("en"), p6.getSupportedLocale().get(0).getLocale()); + assertEquals(new Locale("fr"), p6.getSupportedLocale().get(1).getLocale()); PortletMetaData p7 = md.getPortlet("Portlet7"); assertNotNull(p7); @@ -261,8 +267,8 @@ assertEquals("HELP", smd2.getPortletModes().get(1).getPortletMode()); List<SupportedLocaleMetaData> localeList = p1.getSupportedLocale(); - assertEquals("en", localeList.get(0).getLocale()); - assertEquals("fr", localeList.get(1).getLocale()); + assertEquals(new Locale("en"), localeList.get(0).getLocale()); + assertEquals(new Locale("fr"), localeList.get(1).getLocale()); assertEquals("MyResourceBundle", p1.getResourceBundle()); @@ -326,8 +332,8 @@ PortletMetaData p6 = md.getPortlet("Portlet6"); assertNotNull(p6); assertEquals("Portlet6", p6.getResourceBundle()); - assertEquals("en", p6.getSupportedLocale().get(0).getLocale()); - assertEquals("fr", p6.getSupportedLocale().get(1).getLocale()); + assertEquals(new Locale("en"), p6.getSupportedLocale().get(0).getLocale()); + assertEquals(new Locale("fr"), p6.getSupportedLocale().get(1).getLocale()); PortletMetaData p7 = md.getPortlet("Portlet7"); assertNotNull(p7); @@ -421,8 +427,8 @@ assertEquals("CUSTOM", smd2.getWindowStates().get(1).getWindowState()); List<SupportedLocaleMetaData> localeList = p1.getSupportedLocale(); - assertEquals("en", localeList.get(0).getLocale()); - assertEquals("fr", localeList.get(1).getLocale()); + assertEquals(new Locale("en"), localeList.get(0).getLocale()); + assertEquals(new Locale("fr"), localeList.get(1).getLocale()); assertEquals("MyResourceBundle", p1.getResourceBundle()); Modified: modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/SecurityConstraintTestEverythingTestCase.java =================================================================== --- modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/SecurityConstraintTestEverythingTestCase.java 2008-01-08 10:10:28 UTC (rev 9455) +++ modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/SecurityConstraintTestEverythingTestCase.java 2008-01-08 15:23:51 UTC (rev 9456) @@ -24,11 +24,11 @@ import java.util.Locale; +import org.jboss.portal.portlet.TransportGuarantee; import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData; import org.jboss.portal.portlet.impl.metadata.portlet.PortletMetaData; import org.jboss.portal.portlet.impl.metadata.security.SecurityConstraintMetaData; -import org.jboss.portal.portlet.impl.metadata.security.TransportGuaranteeEnum; import org.jboss.unit.api.pojo.annotations.Test; import static org.jboss.unit.api.Assert.*; @@ -56,7 +56,7 @@ assertNotNull(scd1); assertEquals("test", scd1.getDisplayName().getDefaultString()); assertEquals("Test", scd1.getDisplayName().getString(new Locale("de"), false)); - assertEquals(TransportGuaranteeEnum.NONE, scd1.getUserDataConstraint().getTransportQuarantee()); + assertEquals(TransportGuarantee.NONE, scd1.getUserDataConstraint().getTransportQuarantee()); assertEquals("foo", scd1.getPortletList().getPortletNames().get(0)); assertEquals("foobar", scd1.getPortletList().getPortletNames().get(1)); @@ -64,11 +64,11 @@ SecurityConstraintMetaData scd2 = md.getSecurityConstraints().get(1); assertNotNull(scd2); - assertEquals(TransportGuaranteeEnum.INTEGRAL, scd2.getUserDataConstraint().getTransportQuarantee()); + assertEquals(TransportGuarantee.INTEGRAL, scd2.getUserDataConstraint().getTransportQuarantee()); assertEquals("foo", scd2.getPortletList().getPortletNames().get(0)); assertEquals("fooConstraint", scd1.getUserDataConstraint().getDescription().getDefaultString()); assertEquals("FooConstraint", scd1.getUserDataConstraint().getDescription().getString(new Locale("de"), false)); - + try { scd2.getPortletList().getPortletNames().get(1); @@ -148,14 +148,14 @@ assertEquals("Test", scd1.getDisplayName().getString(new Locale("de"), false)); assertEquals("foo", scd1.getId()); - assertEquals(TransportGuaranteeEnum.NONE, scd1.getUserDataConstraint().getTransportQuarantee()); + assertEquals(TransportGuarantee.NONE, scd1.getUserDataConstraint().getTransportQuarantee()); assertEquals("foo", scd1.getPortletList().getPortletNames().get(0)); assertEquals("foobar", scd1.getPortletList().getPortletNames().get(1)); SecurityConstraintMetaData scd2 = md.getSecurityConstraints().get(1); assertNotNull(scd2); - assertEquals(TransportGuaranteeEnum.INTEGRAL, scd2.getUserDataConstraint().getTransportQuarantee()); + assertEquals(TransportGuarantee.INTEGRAL, scd2.getUserDataConstraint().getTransportQuarantee()); assertEquals("foo", scd2.getPortletList().getPortletNames().get(0)); assertEquals("fooConstraint", scd1.getUserDataConstraint().getDescription().getDefaultString()); assertEquals("FooConstraint", scd1.getUserDataConstraint().getDescription().getString(new Locale("de"), false)); Modified: modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java =================================================================== --- modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java 2008-01-08 10:10:28 UTC (rev 9455) +++ modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java 2008-01-08 15:23:51 UTC (rev 9456) @@ -24,9 +24,11 @@ import java.net.URI; import java.net.URISyntaxException; +import java.util.Locale; import org.apache.log4j.Logger; import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.portlet.TransportGuarantee; import org.jboss.portal.portlet.impl.metadata.CustomPortletModeMetaData; import org.jboss.portal.portlet.impl.metadata.CustomWindowStateMetaData; import org.jboss.portal.portlet.impl.metadata.ListenerMetaData; @@ -56,7 +58,6 @@ import org.jboss.portal.portlet.impl.metadata.portlet.WindowStateMetaData; import org.jboss.portal.portlet.impl.metadata.security.PortletCollectionMetaData; import org.jboss.portal.portlet.impl.metadata.security.SecurityConstraintMetaData; -import org.jboss.portal.portlet.impl.metadata.security.TransportGuaranteeEnum; import org.jboss.portal.portlet.impl.metadata.security.UserDataConstraintMetaData; import org.jboss.xb.binding.GenericObjectModelFactory; import org.jboss.xb.binding.UnmarshallingContext; @@ -602,7 +603,7 @@ SupportedLocaleMetaData md = (SupportedLocaleMetaData) object; if ("supported-locale".equals(localName)) { - md.setLocale(value); + md.setLocale(new Locale(value)); } } @@ -720,7 +721,7 @@ UserDataConstraintMetaData md = (UserDataConstraintMetaData) object; if ("transport-guarantee".equals(localName)) { - md.setTransportQuarantee(TransportGuaranteeEnum.valueOf(value)); + md.setTransportQuarantee(TransportGuarantee.valueOf(value)); } }