Author: julien(a)jboss.com Date: 2008-01-09 10:46:12 -0500 (Wed, 09 Jan 2008) New Revision: 9465 Added: modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/ValueTrimmingFilter.java Removed: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/metadata/ Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/spi/PortletInfoFactory.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/ContentTypesTestCase.java modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/PortletApplicationDeployer.java modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/AbstractMetaDataTestCase.java Log: - remove old meta data classes - added back ValueTrimmingFilter which should not have been removed in previous commit Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/spi/PortletInfoFactory.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/spi/PortletInfoFactory.java 2008-01-09 15:28:51 UTC (rev 9464) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/spi/PortletInfoFactory.java 2008-01-09 15:46:12 UTC (rev 9465) @@ -24,7 +24,7 @@ import org.jboss.portal.portlet.container.PortletApplicationContext; import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData; +import org.jboss.portal.portlet.impl.metadata.portlet.PortletMetaData; import org.jboss.portal.portlet.metadata.JBossPortletMetaData; import org.jboss.portal.common.i18n.ResourceBundleManager; Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/ContentTypesTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/ContentTypesTestCase.java 2008-01-09 15:28:51 UTC (rev 9464) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/ContentTypesTestCase.java 2008-01-09 15:46:12 UTC (rev 9465) @@ -24,8 +24,6 @@ package org.jboss.portal.test.portlet; import org.jboss.portal.Mode; -import org.jboss.portal.portlet.impl.jsr168.metadata.ContentTypeMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.ContentTypesMetaData; import org.jboss.portal.portlet.impl.info.ContainerCapabilitiesInfo; import java.util.Collection; @@ -46,15 +44,17 @@ public ContentTypesTestCase() { contentTypes = new ContainerCapabilitiesInfo(); - ContentTypesMetaData md = new ContentTypesMetaData(); - md.addContentType(new ContentTypeMetaData("text/html", new Mode[]{Mode.EDIT, Mode.HELP, Mode.VIEW})); - md.addContentType(new ContentTypeMetaData("text/xml", new Mode[]{Mode.VIEW})); - md.addContentType(new ContentTypeMetaData("*", new Mode[]{Mode.VIEW})); - md.addContentType(new ContentTypeMetaData("*/*", new Mode[]{})); - md.addContentType(new ContentTypeMetaData("text/*", new Mode[]{})); + ContainerCapabilitiesInfo md = new ContainerCapabilitiesInfo(); + md.add("text/html", Mode.EDIT); + md.add("text/html", Mode.HELP ); + md.add("text/html", Mode.VIEW); + md.add("text/xml", Mode.VIEW); + md.add("*", Mode.VIEW); +// md.add("*/*", new Mode[]{}); +// md.add("text/*", new Mode[]{}); // should this be allowed? - md.addContentType(new ContentTypeMetaData("pipo/pipo", new Mode[]{})); +// md.add(new ContentTypeMetaData("pipo/pipo", new Mode[]{})); } @Test Modified: modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/PortletApplicationDeployer.java =================================================================== --- modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/PortletApplicationDeployer.java 2008-01-09 15:28:51 UTC (rev 9464) +++ modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/PortletApplicationDeployer.java 2008-01-09 15:46:12 UTC (rev 9465) @@ -32,8 +32,8 @@ import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; import org.jboss.portal.portlet.test.metadata.impl.AnnotationPortletApplication20MetaData; import org.jboss.portal.portlet.test.metadata.impl.AnnotationPortletApplication10MetaData; +import org.jboss.portal.portlet.test.metadata.impl.ValueTrimmingFilter; import org.jboss.portal.portlet.test.metadata.factory.PortletApplicationModelFactory; -import org.jboss.portal.portlet.test.deployment.ValueTrimmingFilter; import org.jboss.portal.portlet.container.PortletApplication; import org.jboss.portal.portlet.container.PortletContainer; import org.jboss.portal.portlet.container.PortletApplicationRegistry; Modified: modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/AbstractMetaDataTestCase.java =================================================================== --- modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/AbstractMetaDataTestCase.java 2008-01-09 15:28:51 UTC (rev 9464) +++ modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/AbstractMetaDataTestCase.java 2008-01-09 15:46:12 UTC (rev 9465) @@ -26,10 +26,10 @@ import java.io.InputStream; import java.net.URL; -import org.jboss.portal.portlet.test.deployment.ValueTrimmingFilter; import org.jboss.portal.portlet.test.metadata.factory.PortletApplicationModelFactory; import org.jboss.portal.portlet.test.metadata.impl.AnnotationPortletApplication10MetaData; import org.jboss.portal.portlet.test.metadata.impl.AnnotationPortletApplication20MetaData; +import org.jboss.portal.portlet.test.metadata.impl.ValueTrimmingFilter; import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData; Added: modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/ValueTrimmingFilter.java =================================================================== --- modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/ValueTrimmingFilter.java (rev 0) +++ modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/ValueTrimmingFilter.java 2008-01-09 15:46:12 UTC (rev 9465) @@ -0,0 +1,75 @@ +/****************************************************************************** + * 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.test.metadata.impl; + +import org.jboss.xb.binding.GenericObjectModelFactory; +import org.jboss.xb.binding.UnmarshallingContext; +import org.xml.sax.Attributes; + +/** + * Filter <code>setValue</code> method by doing a trimming before calling the next model. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision$ + */ +public class ValueTrimmingFilter implements GenericObjectModelFactory +{ + + private final GenericObjectModelFactory next; + + public ValueTrimmingFilter(GenericObjectModelFactory next) throws IllegalArgumentException + { + if (next == null) + { + throw new IllegalArgumentException("Cannot be null"); + } + this.next = next; + } + + public Object newChild(Object object, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs) + { + return next.newChild(object, nav, nsURI, localName, attrs); + } + + public void addChild(Object parent, Object child, UnmarshallingContext nav, String nsURI, String localName) + { + next.addChild(parent, child, nav, nsURI, localName); + } + + public void setValue(Object object, UnmarshallingContext nav, String nsURI, String localName, String value) + { + value = value.trim(); + next.setValue(object, nav, nsURI, localName, value); + } + + public Object newRoot(Object root, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs) + { + return next.newRoot(root, nav, nsURI, localName, attrs); + } + + public Object completeRoot(Object root, UnmarshallingContext nav, String nsURI, String localName) + { + return next.completeRoot(root, nav, nsURI, localName); + } + +} \ No newline at end of file