Author: julien(a)jboss.com Date: 2007-05-07 10:28:08 -0400 (Mon, 07 May 2007) New Revision: 7219 Added: trunk/core/src/main/org/jboss/portal/test/core/model/content/SimpleContent.java trunk/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentHandler.java trunk/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentProvider.java trunk/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentProviderRegistry.java Removed: trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContent.java trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContentHandler.java trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContentProvider.java Modified: trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java trunk/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/jboss-beans.xml Log: externalize service assembly of portal object container test case in MC Deleted: trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContent.java =================================================================== --- trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContent.java 2007-05-07 13:38:07 UTC (rev 7218) +++ trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContent.java 2007-05-07 14:28:08 UTC (rev 7219) @@ -1,61 +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.test.core.model.content; - -import org.jboss.portal.core.model.content.spi.handler.ContentState; -import org.jboss.portal.core.impl.model.content.AbstractContent; -import org.jboss.portal.common.i18n.LocalizedString; - -import java.util.Locale; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class NullContent extends AbstractContent -{ - - /** . */ - private final String contextId; - - public NullContent(String contextId, ContentState state) - { - super(state); - this.contextId = contextId; - } - - public String getContextId() - { - return contextId; - } - - public ContentState getState() - { - return state; - } - - public LocalizedString getDisplayName() - { - return new LocalizedString("Null content", Locale.ENGLISH); - } -} Deleted: trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContentHandler.java =================================================================== --- trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContentHandler.java 2007-05-07 13:38:07 UTC (rev 7218) +++ trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContentHandler.java 2007-05-07 14:28:08 UTC (rev 7219) @@ -1,47 +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.test.core.model.content; - -import org.jboss.portal.core.model.content.spi.handler.ContentState; -import org.jboss.portal.core.model.content.spi.handler.ContentHandler; -import org.jboss.portal.core.model.content.Content; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class NullContentHandler implements ContentHandler -{ - public Content newContent(String contextId, ContentState state) - { - return new NullContent(contextId, state); - } - - public void contentCreated(String contextId, ContentState state) - { - } - - public void contentDestroyed(String contextId, ContentState state) - { - } -} Deleted: trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContentProvider.java =================================================================== --- trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContentProvider.java 2007-05-07 13:38:07 UTC (rev 7218) +++ trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContentProvider.java 2007-05-07 14:28:08 UTC (rev 7219) @@ -1,74 +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.test.core.model.content; - -import org.jboss.portal.core.model.content.spi.ContentProvider; -import org.jboss.portal.core.model.content.ContentType; -import org.jboss.portal.core.model.content.spi.handler.ContentHandler; -import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet; -import org.jboss.portal.common.i18n.LocalizedString; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class NullContentProvider implements ContentProvider -{ - - /** . */ - private final ContentType contentType; - - /** . */ - private final NullContentHandler handler; - - public NullContentProvider(ContentType contentType) - { - this.contentType = contentType; - this.handler = new NullContentHandler(); - } - - public ContentType getContentType() - { - return contentType; - } - - public LocalizedString getDisplayName() - { - return null; - } - - public LocalizedString getDescription() - { - return null; - } - - public ContentHandler getHandler() - { - return handler; - } - - public ContentPortlet getPortletInfo() - { - return null; - } -} Copied: trunk/core/src/main/org/jboss/portal/test/core/model/content/SimpleContent.java (from rev 7199, trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContent.java) =================================================================== --- trunk/core/src/main/org/jboss/portal/test/core/model/content/SimpleContent.java (rev 0) +++ trunk/core/src/main/org/jboss/portal/test/core/model/content/SimpleContent.java 2007-05-07 14:28:08 UTC (rev 7219) @@ -0,0 +1,61 @@ +/****************************************************************************** + * 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.test.core.model.content; + +import org.jboss.portal.core.model.content.spi.handler.ContentState; +import org.jboss.portal.core.impl.model.content.AbstractContent; +import org.jboss.portal.common.i18n.LocalizedString; + +import java.util.Locale; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class SimpleContent extends AbstractContent +{ + + /** . */ + private final String contextId; + + public SimpleContent(String contextId, ContentState state) + { + super(state); + this.contextId = contextId; + } + + public String getContextId() + { + return contextId; + } + + public ContentState getState() + { + return state; + } + + public LocalizedString getDisplayName() + { + return new LocalizedString("Null content", Locale.ENGLISH); + } +} Copied: trunk/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentHandler.java (from rev 7199, trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContentHandler.java) =================================================================== --- trunk/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentHandler.java (rev 0) +++ trunk/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentHandler.java 2007-05-07 14:28:08 UTC (rev 7219) @@ -0,0 +1,47 @@ +/****************************************************************************** + * 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.test.core.model.content; + +import org.jboss.portal.core.model.content.spi.handler.ContentState; +import org.jboss.portal.core.model.content.spi.handler.ContentHandler; +import org.jboss.portal.core.model.content.Content; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class SimpleContentHandler implements ContentHandler +{ + public Content newContent(String contextId, ContentState state) + { + return new SimpleContent(contextId, state); + } + + public void contentCreated(String contextId, ContentState state) + { + } + + public void contentDestroyed(String contextId, ContentState state) + { + } +} Copied: trunk/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentProvider.java (from rev 7199, trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContentProvider.java) =================================================================== --- trunk/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentProvider.java (rev 0) +++ trunk/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentProvider.java 2007-05-07 14:28:08 UTC (rev 7219) @@ -0,0 +1,103 @@ +/****************************************************************************** + * 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.test.core.model.content; + +import org.jboss.portal.core.model.content.spi.ContentProvider; +import org.jboss.portal.core.model.content.ContentType; +import org.jboss.portal.core.model.content.spi.handler.ContentHandler; +import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet; +import org.jboss.portal.common.i18n.LocalizedString; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class SimpleContentProvider implements ContentProvider +{ + + /** . */ + private final ContentType contentType; + + /** . */ + private final SimpleContentHandler handler; + + /** . */ + private SimpleContentProviderRegistry registry; + + public SimpleContentProvider(ContentType contentType) + { + this.contentType = contentType; + this.handler = new SimpleContentHandler(); + } + + public SimpleContentProvider(String contentTypeValue) + { + this.contentType = ContentType.create(contentTypeValue); + this.handler = new SimpleContentHandler(); + } + + public SimpleContentProviderRegistry getRegistry() + { + return registry; + } + + public void setRegistry(SimpleContentProviderRegistry registry) + { + this.registry = registry; + } + + public ContentType getContentType() + { + return contentType; + } + + public LocalizedString getDisplayName() + { + return null; + } + + public LocalizedString getDescription() + { + return null; + } + + public ContentHandler getHandler() + { + return handler; + } + + public ContentPortlet getPortletInfo() + { + return null; + } + + public void start() + { + registry.addContentProvider(this); + } + + public void stop() + { + registry.removeContentProvider(contentType); + } +} Added: trunk/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentProviderRegistry.java =================================================================== --- trunk/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentProviderRegistry.java (rev 0) +++ trunk/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentProviderRegistry.java 2007-05-07 14:28:08 UTC (rev 7219) @@ -0,0 +1,61 @@ +/****************************************************************************** + * 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.test.core.model.content; + +import org.jboss.portal.core.model.content.spi.ContentProviderRegistry; +import org.jboss.portal.core.model.content.spi.ContentProvider; +import org.jboss.portal.core.model.content.ContentType; +import org.jboss.portal.common.util.CopyOnWriteRegistry; + +import java.util.Collection; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class SimpleContentProviderRegistry implements ContentProviderRegistry +{ + + /** . */ + private final CopyOnWriteRegistry registry = new CopyOnWriteRegistry(); + + public void addContentProvider(ContentProvider provider) + { + registry.register(provider.getContentType(), provider); + } + + public void removeContentProvider(ContentType contentType) + { + registry.unregister(contentType); + } + + public Collection getContentTypes() + { + return registry.getKeys(); + } + + public ContentProvider getContentProvider(ContentType contentType) + { + return (ContentProvider)registry.getRegistration(contentType); + } +} Modified: trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java =================================================================== --- trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java 2007-05-07 13:38:07 UTC (rev 7218) +++ trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java 2007-05-07 14:28:08 UTC (rev 7219) @@ -31,14 +31,9 @@ import org.jboss.portal.core.model.portal.Window; import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.content.ContentType; -import org.jboss.portal.core.model.content.spi.ContentProviderRegistry; -import org.jboss.portal.core.model.content.spi.ContentProvider; import org.jboss.portal.core.model.content.spi.handler.ContentState; -import org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl; -import org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory; import org.jboss.portal.test.core.PortalBaseTestCase; -import org.jboss.portal.test.core.model.content.NullContent; -import org.jboss.portal.test.core.model.content.NullContentProvider; +import org.jboss.portal.test.core.model.content.SimpleContent; import org.jboss.portal.test.framework.embedded.DataSourceSupport; import org.jboss.portal.common.test.TestParametrization; import org.jboss.portal.common.test.junit.JUnitAdapter; @@ -53,7 +48,6 @@ import java.util.List; import java.util.ArrayList; import java.util.Comparator; -import java.util.Collection; /** * Portal Object Container Test Cases based on the microcontainer architecture @@ -85,60 +79,25 @@ return "org/jboss/portal/test/core/model/portal/jboss-beans.xml"; } - JBossAuthorizationDomainRegistryImpl registry; - JACCPortalAuthorizationManagerFactory factory; - ContentProviderRegistry contentProviderRegistry; - ContentProvider contentProvider = new NullContentProvider(ContentType.PORTLET); -// NullContentHandler handler; + public PersistentPortalObjectContainer getPortalObjectContainer() + { + return container; + } + public void setPortalObjectContainer(PersistentPortalObjectContainer container) + { + this.container = container; + } + public void setUp() throws Exception { super.setUp(); - // - registry = new JBossAuthorizationDomainRegistryImpl(); - - // - factory = new JACCPortalAuthorizationManagerFactory(); - factory.setAuthorizationDomainRegistry(registry); - - // - contentProviderRegistry = new ContentProviderRegistry() - { - public Collection getContentTypes() - { - return Collections.singleton(ContentType.PORTLET); - } - public ContentProvider getContentProvider(ContentType contentType) - { - return ContentType.PORTLET.equals(contentType) ? contentProvider : null; - } - }; - - // - container = new PersistentPortalObjectContainer(); - container.setSessionFactoryJNDIName("java:/SessionFactory"); - container.setAuthorizationDomainRegistry(registry); - container.setPortalAuthorizationManagerFactory(factory); - container.setContentProviderRegistry(contentProviderRegistry); - - // - registry.start(); - factory.start(); - container.start(); } public void tearDown() throws Exception { super.tearDown(); - container.destroy(); - factory.destroy(); - registry.destroy(); - container = null; - registry = null; - factory = null; - contentProviderRegistry = null; - contentProvider = null; } /** todo same with a transaction wrapping the start method */ @@ -325,7 +284,7 @@ page.setDeclaredProperty("pagename", "pagevalue"); Window window = page.createWindow("window", ContentType.PORTLET, "uri"); window.setDeclaredProperty("windowname", "windowvalue"); - NullContent content = (NullContent)window.getContent(); + SimpleContent content = (SimpleContent)window.getContent(); assertNotNull(content); ContentState contentState = content.getState(); assertNotNull(contentState); @@ -349,7 +308,7 @@ assertNotNull(window); assertEquals("windowvalue", window.getDeclaredProperty("windowname")); assertEquals(ContentType.PORTLET, window.getContentType()); - content = (NullContent)window.getContent(); + content = (SimpleContent)window.getContent(); assertNotNull(content); contentState = content.getState(); assertNotNull(contentState); Modified: trunk/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/jboss-beans.xml =================================================================== --- trunk/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/jboss-beans.xml 2007-05-07 13:38:07 UTC (rev 7218) +++ trunk/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/jboss-beans.xml 2007-05-07 14:28:08 UTC (rev 7219) @@ -67,11 +67,36 @@ <property name="jNDIName">java:/SessionFactory</property> </bean> + <bean name="AuthorizationDomainRegistry" class="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl"> + </bean> + + <bean name="AuthorizationManagerFactory" class="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory"> + <property name="authorizationDomainRegistry"><inject bean="AuthorizationDomainRegistry"/></property> + </bean> + + <bean name="ContentProviderRegistry" class="org.jboss.portal.test.core.model.content.SimpleContentProviderRegistry"> + </bean> + + <bean name="PortletContentProvider" class="org.jboss.portal.test.core.model.content.SimpleContentProvider"> + <constructor> + <parameter>portlet</parameter> + </constructor> + <property name="registry"><inject bean="ContentProviderRegistry"/></property> + </bean> + + <bean name="PortalObjectContainer" class="org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer"> + <property name="sessionFactoryJNDIName">java:/SessionFactory</property> + <property name="authorizationDomainRegistry"><inject bean="AuthorizationDomainRegistry"/></property> + <property name="portalAuthorizationManagerFactory"><inject bean="AuthorizationManagerFactory"/></property> + <property name="contentProviderRegistry"><inject bean="ContentProviderRegistry"/></property> + </bean> + <bean name="TestBean" class="org.jboss.portal.test.core.model.portal.PortalObjectContainerTestCase"> <constructor factoryMethod="getBean"> <factory bean="BeanFactory"/> <parameter>TestBean</parameter> </constructor> <property name="hibernate"><inject bean="HibernateSupport"/></property> + <property name="portalObjectContainer"><inject bean="PortalObjectContainer"/></property> </bean> </deployment>