March 2008 - portal-commits - Jboss List Archives

JBoss Portal SVN: r10287 - in branches/JBoss_Portal_Branch_2_7: server/src/main/org/jboss/portal/server/impl and 1 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-03-17 08:02:54 -0400 (Mon, 17 Mar 2008) New Revision: 10287 Added: branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/SessionAttributeResolver.java Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java Log: JBPORTAL-1952: Portal navigational state replication broken JBPORTAL-1948: Render Parameters Not Replicated (Still need to check the Portlet parameters serialization) Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2008-03-17 11:26:51 UTC (rev 10286) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2008-03-17 12:02:54 UTC (rev 10287) @@ -28,6 +28,7 @@ import org.jboss.portal.core.navstate.NavigationalStateContext; import org.jboss.portal.core.navstate.NavigationalStateKey; import org.jboss.portal.core.navstate.NavigationalStateObjectChange; +import org.jboss.portal.core.model.portal.PortalObjectId; import java.util.Iterator; import java.util.LinkedHashMap; @@ -83,7 +84,8 @@ } // - return store.getAttribute(nsKey); + PortalObjectId id = (PortalObjectId)nsKey.getId(); + return store.getAttribute(id.toString()); } public void setAttribute(Object attrKey, Object attrValue) throws IllegalArgumentException @@ -198,7 +200,10 @@ maximizedKey = change.getKey(); } } - store.setAttribute(change.getKey(), change.getNewValue()); + + // + PortalObjectId id = (PortalObjectId)change.getKey().getId(); + store.setAttribute(id.toString(), change.getNewValue()); } // Unmaximize other windows if necessary Modified: branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java 2008-03-17 11:26:51 UTC (rev 10286) +++ branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java 2008-03-17 12:02:54 UTC (rev 10287) @@ -23,9 +23,7 @@ package org.jboss.portal.server.impl; import org.jboss.portal.common.invocation.AbstractInvocationContext; -import org.jboss.portal.common.invocation.resolver.PrincipalAttributeResolver; import org.jboss.portal.common.invocation.resolver.RequestAttributeResolver; -import org.jboss.portal.common.invocation.resolver.SessionAttributeResolver; import org.jboss.portal.common.text.CharBuffer; import org.jboss.portal.common.text.FastURLEncoder; import org.jboss.portal.common.util.ParameterMap; @@ -33,6 +31,7 @@ import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerInvocationContext; import org.jboss.portal.server.ServerURL; +import org.jboss.portal.server.impl.invocation.SessionAttributeResolver; import org.jboss.portal.server.request.URLContext; import org.jboss.portal.server.request.URLFormat; import org.jboss.portal.web.WebRequest; @@ -133,8 +132,8 @@ // addResolver(ServerInvocation.REQUEST_SCOPE, new RequestAttributeResolver(req)); - addResolver(ServerInvocation.SESSION_SCOPE, new SessionAttributeResolver(req, PortalConstants.PORTAL_SESSION_MAP_KEY)); - addResolver(ServerInvocation.PRINCIPAL_SCOPE, new PrincipalAttributeResolver(req)); + addResolver(ServerInvocation.SESSION_SCOPE, new SessionAttributeResolver(req, PortalConstants.PORTAL_SESSION_MAP_KEY, false)); + addResolver(ServerInvocation.PRINCIPAL_SCOPE, new SessionAttributeResolver(req, PortalConstants.PORTAL_PRINCIPAL_MAP_KEY, true)); } public WebRequest getWebRequest() Added: branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/SessionAttributeResolver.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/SessionAttributeResolver.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/SessionAttributeResolver.java 2008-03-17 12:02:54 UTC (rev 10287) @@ -0,0 +1,122 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, 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.server.impl.invocation; + +import org.jboss.portal.common.invocation.AttributeResolver; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import java.util.Set; +import java.util.HashSet; +import java.util.Enumeration; +import java.util.Collections; +import java.security.Principal; + +/** + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class SessionAttributeResolver implements AttributeResolver +{ + + /** . */ + protected final HttpServletRequest req; + + /** . */ + protected final String prefix; + + public SessionAttributeResolver( + HttpServletRequest req, + String prefix, + boolean principalScoped) + { + if (req == null) + { + throw new IllegalArgumentException(); + } + if (prefix == null) + { + throw new IllegalArgumentException(); + } + + // + if (principalScoped) + { + Principal principal = req.getUserPrincipal(); + if (principal != null) + { + prefix = prefix + principal.getName(); + } + } + + // + this.req = req; + this.prefix = prefix; + } + + public Set getKeys() + { + HttpSession session = req.getSession(false); + + // + if (session == null) + { + return Collections.EMPTY_SET; + } + + // + Set keys = new HashSet(); + for (Enumeration e = session.getAttributeNames();e.hasMoreElements();) + { + String key = (String)e.nextElement(); + + // + if (key.startsWith(prefix)) + { + keys.add(key); + } + } + + // + return keys; + } + + public Object getAttribute(Object o) throws IllegalArgumentException + { + HttpSession session = req.getSession(false); + + // + if (session == null) + { + return null; + } + + // + return session.getAttribute(prefix + o); + } + + public void setAttribute(Object o, Object o1) throws IllegalArgumentException + { + req.getSession().setAttribute(prefix + o, o1); + } +} \ No newline at end of file

16 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r10286 - branches/JBoss_Portal_Branch_2_6/build.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-03-17 07:26:51 -0400 (Mon, 17 Mar 2008) New Revision: 10286 Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml Log: Use 1.0-SNAPSHOT version of the module portlet Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2008-03-17 11:20:48 UTC (rev 10285) +++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2008-03-17 11:26:51 UTC (rev 10286) @@ -50,7 +50,7 @@ <componentref name="jboss-portal/modules/common" version="1.1.0"/> <componentref name="jboss-portal/modules/web" version="1.1.0"/> <componentref name="jboss-portal/modules/test" version="1.0.1"/> - <componentref name="jboss-portal/modules/portlet" version="1.0.2"/> + <componentref name="jboss-portal/modules/portlet" version="1.0-SNAPSHOT"/> <componentref name="jboss-portal/modules/identity" version="1.0.2"/> <componentref name="antlr" version="2.7.6.ga"/> <componentref name="apache-ant" version="1.6.5"/>

16 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r10285 - branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/impl and 3 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-03-17 07:20:48 -0400 (Mon, 17 Mar 2008) New Revision: 10285 Added: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/impl/invocation/SessionAttributeResolver.java Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/PortletParameters.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/ParametersTestCase.java Log: JBPORTAL-1952: Portal navigational state replication broken JBPORTAL-1948: Render Parameters Not Replicated Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2008-03-15 01:55:13 UTC (rev 10284) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2008-03-17 11:20:48 UTC (rev 10285) @@ -28,6 +28,7 @@ import org.jboss.portal.core.navstate.NavigationalStateContext; import org.jboss.portal.core.navstate.NavigationalStateKey; import org.jboss.portal.core.navstate.NavigationalStateObjectChange; +import org.jboss.portal.core.model.portal.PortalObjectId; import java.util.Iterator; import java.util.LinkedHashMap; @@ -83,7 +84,8 @@ } // - return store.getAttribute(nsKey); + PortalObjectId id = (PortalObjectId)nsKey.getId(); + return store.getAttribute(id.toString()); } public void setAttribute(Object attrKey, Object attrValue) throws IllegalArgumentException @@ -198,7 +200,10 @@ maximizedKey = change.getKey(); } } - store.setAttribute(change.getKey(), change.getNewValue()); + + // + PortalObjectId id = (PortalObjectId)change.getKey().getId(); + store.setAttribute(id.toString(), change.getNewValue()); } // Unmaximize other windows if necessary Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java 2008-03-15 01:55:13 UTC (rev 10284) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java 2008-03-17 11:20:48 UTC (rev 10285) @@ -23,9 +23,7 @@ package org.jboss.portal.server.impl; import org.jboss.portal.common.invocation.AbstractInvocationContext; -import org.jboss.portal.common.invocation.resolver.PrincipalAttributeResolver; import org.jboss.portal.common.invocation.resolver.RequestAttributeResolver; -import org.jboss.portal.common.invocation.resolver.SessionAttributeResolver; import org.jboss.portal.common.text.CharBuffer; import org.jboss.portal.common.text.FastURLEncoder; import org.jboss.portal.common.util.ParameterMap; @@ -33,6 +31,7 @@ import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerInvocationContext; import org.jboss.portal.server.ServerURL; +import org.jboss.portal.server.impl.invocation.SessionAttributeResolver; import org.jboss.portal.server.request.URLContext; import org.jboss.portal.server.request.URLFormat; import org.jboss.portal.web.WebRequest; @@ -133,8 +132,8 @@ // addResolver(ServerInvocation.REQUEST_SCOPE, new RequestAttributeResolver(req)); - addResolver(ServerInvocation.SESSION_SCOPE, new SessionAttributeResolver(req, PortalConstants.PORTAL_SESSION_MAP_KEY)); - addResolver(ServerInvocation.PRINCIPAL_SCOPE, new PrincipalAttributeResolver(req)); + addResolver(ServerInvocation.SESSION_SCOPE, new SessionAttributeResolver(req, PortalConstants.PORTAL_SESSION_MAP_KEY, false)); + addResolver(ServerInvocation.PRINCIPAL_SCOPE, new SessionAttributeResolver(req, PortalConstants.PORTAL_PRINCIPAL_MAP_KEY, true)); } public WebRequest getWebRequest() Added: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/impl/invocation/SessionAttributeResolver.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/impl/invocation/SessionAttributeResolver.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/impl/invocation/SessionAttributeResolver.java 2008-03-17 11:20:48 UTC (rev 10285) @@ -0,0 +1,122 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, 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.server.impl.invocation; + +import org.jboss.portal.common.invocation.AttributeResolver; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import java.util.Set; +import java.util.HashSet; +import java.util.Enumeration; +import java.util.Collections; +import java.security.Principal; + +/** + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class SessionAttributeResolver implements AttributeResolver +{ + + /** . */ + protected final HttpServletRequest req; + + /** . */ + protected final String prefix; + + public SessionAttributeResolver( + HttpServletRequest req, + String prefix, + boolean principalScoped) + { + if (req == null) + { + throw new IllegalArgumentException(); + } + if (prefix == null) + { + throw new IllegalArgumentException(); + } + + // + if (principalScoped) + { + Principal principal = req.getUserPrincipal(); + if (principal != null) + { + prefix = prefix + principal.getName(); + } + } + + // + this.req = req; + this.prefix = prefix; + } + + public Set getKeys() + { + HttpSession session = req.getSession(false); + + // + if (session == null) + { + return Collections.EMPTY_SET; + } + + // + Set keys = new HashSet(); + for (Enumeration e = session.getAttributeNames();e.hasMoreElements();) + { + String key = (String)e.nextElement(); + + // + if (key.startsWith(prefix)) + { + keys.add(key); + } + } + + // + return keys; + } + + public Object getAttribute(Object o) throws IllegalArgumentException + { + HttpSession session = req.getSession(false); + + // + if (session == null) + { + return null; + } + + // + return session.getAttribute(prefix + o); + } + + public void setAttribute(Object o, Object o1) throws IllegalArgumentException + { + req.getSession().setAttribute(prefix + o, o1); + } +} \ No newline at end of file Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/PortletParameters.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/PortletParameters.java 2008-03-15 01:55:13 UTC (rev 10284) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/PortletParameters.java 2008-03-17 11:20:48 UTC (rev 10285) @@ -25,6 +25,9 @@ import org.jboss.portal.common.util.ParameterMap; import java.io.Serializable; +import java.io.ObjectOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -149,4 +152,26 @@ return new PortletParameters(map); } } + + private void writeObject(ObjectOutputStream out) throws IOException + { + out.writeInt(size()); + for (Iterator i = entrySet().iterator();i.hasNext();) + { + Map.Entry entry = (Entry)i.next(); + out.writeObject(entry.getKey()); + out.writeObject(entry.getValue()); + } + } + + private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException + { + int size = in.readInt(); + while (size-- > 0) + { + String key = (String)in.readObject(); + String[] values = (String[])in.readObject(); + put(key, values); + } + } } Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/ParametersTestCase.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/ParametersTestCase.java 2008-03-15 01:55:13 UTC (rev 10284) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/ParametersTestCase.java 2008-03-17 11:20:48 UTC (rev 10285) @@ -23,11 +23,15 @@ package org.jboss.portal.test.portlet; import org.jboss.portal.common.junit.ExtendedAssert; +import org.jboss.portal.common.io.IOTools; import org.jboss.portal.portlet.PortletParameters; import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import java.util.Collections; +import java.util.Set; +import java.io.IOException; import junit.framework.TestCase; @@ -300,6 +304,17 @@ assertNull(param.getValue("a")); } + public void testSerialization() throws IOException + { + param.setValue("foo", "bar"); + PortletParameters clone = (PortletParameters)IOTools.clone(param); + assertNotNull(clone); + Set keys = clone.keySet(); + assertEquals(1, keys.size()); + assertTrue(keys.contains("foo")); + assertEquals("bar", clone.getValue("foo")); + } + public Class[] buildExceptionClasses() { return new Class[]

16 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r10284 - in branches/JBoss_Portal_Branch_2_7: server/src/main/org/jboss/portal/server/deployment/jboss and 9 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-03-14 21:55:13 -0400 (Fri, 14 Mar 2008) New Revision: 10284 Added: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/BasicPortalContext.java Modified: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/deployment/jboss/AbstractDeploymentFactory.java branches/JBoss_Portal_Branch_2_7/testsuite/build.xml branches/JBoss_Portal_Branch_2_7/testsuite/imports/server-config.xml branches/JBoss_Portal_Branch_2_7/wsrp/build.xml branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/NeedPortletHandleTest.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPUtils.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupRequest.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml Log: - Fixed PortletAppDeploymentFactory (AbstractDeploymentFactory was causing an infinite loop) - Started working on WSRP tests - More generification Modified: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java 2008-03-14 19:18:06 UTC (rev 10283) +++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java 2008-03-15 01:55:13 UTC (rev 10284) @@ -133,9 +133,9 @@ return matcher.matches(); } - public Deployment newInstance(URL url, PortalWebApp pwa, ManagedObjectRegistryEventListener listener, MBeanServer mbeanServer) throws DeploymentException + public Deployment newInstance(URL url, PortalWebApp pwa, MBeanServer mbeanServer) throws DeploymentException { - return new PortletAppDeployment(url, pwa, listener, mbeanServer, this); + return new PortletAppDeployment(url, pwa, bridgeToInvoker, mbeanServer, this); } public void start() throws Exception Modified: branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/deployment/jboss/AbstractDeploymentFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/deployment/jboss/AbstractDeploymentFactory.java 2008-03-14 19:18:06 UTC (rev 10283) +++ branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/deployment/jboss/AbstractDeploymentFactory.java 2008-03-15 01:55:13 UTC (rev 10284) @@ -22,17 +22,12 @@ ******************************************************************************/ package org.jboss.portal.server.deployment.jboss; -import org.jboss.deployment.DeploymentException; import org.jboss.logging.Logger; import org.jboss.portal.common.net.URLFilter; import org.jboss.portal.common.util.Tools; -import org.jboss.portal.server.deployment.PortalWebApp; -import org.jboss.portal.web.WebApp; import java.net.URL; -import javax.management.MBeanServer; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ @@ -172,14 +167,4 @@ { setupURL = null; } - - public Deployment newInstance(URL url, PortalWebApp pwa, MBeanServer mbeanServer) throws DeploymentException - { - return newInstance(url, pwa, null, mbeanServer); - } - - public Deployment newInstance(URL url, PortalWebApp pwa, WebApp webApp, MBeanServer mbeanServer) throws DeploymentException - { - return newInstance(url, pwa, null, mbeanServer); - } } Modified: branches/JBoss_Portal_Branch_2_7/testsuite/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/build.xml 2008-03-14 19:18:06 UTC (rev 10283) +++ branches/JBoss_Portal_Branch_2_7/testsuite/build.xml 2008-03-15 01:55:13 UTC (rev 10284) @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE project [ - <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> - <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> - ]> +<!DOCTYPE project [<!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"><!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">]> -<project default="tests" name="JBoss Portal Testuite" - xmlns:server="http://jboss.org/ns/test/ant/server"> +<project default="tests" name="JBoss Portal Testuite" xmlns:server="http://jboss.org/ns/test/ant/server"> <import file="imports/server-config.xml"/> @@ -40,8 +35,7 @@ <dirname property="project.root" file="${basedir}"/> <property name="project.thirdparty" value="${project.root}/thirdparty"/> - &defaults; - &libraries; + &defaults; &libraries; <path id="portal.task.classpath"> <pathelement location="${project.tools}/lib/ant.jar"/> @@ -50,14 +44,8 @@ </path> - <taskdef - name="deploy" - classname="org.jboss.portal.common.ant.Deploy" - classpathref="portal.task.classpath"/> - <taskdef - name="undeploy" - classname="org.jboss.portal.common.ant.Undeploy" - classpathref="portal.task.classpath"/> + <taskdef name="deploy" classname="org.jboss.portal.common.ant.Deploy" classpathref="portal.task.classpath"/> + <taskdef name="undeploy" classname="org.jboss.portal.common.ant.Undeploy" classpathref="portal.task.classpath"/> <target name="init"> <mkdir dir="${log.dir}"/> @@ -88,8 +76,8 @@ </target> <target name="run-tests"> - <ant antfile="../${module}/build.xml" output="output.log" dir="../${module}" target="package-tests"/> - <ant antfile="../${module}/build.xml" output="tests.log" dir="../${module}" target="tests"/> + <ant antfile="../${module}/build.xml" output="output.log" dir="../${module}" target="package-tests"/> + <ant antfile="../${module}/build.xml" output="tests.log" dir="../${module}" target="tests"/> </target> <target name="test-module" depends="clean,init"> @@ -116,7 +104,7 @@  <target name="tests" depends="init"> <server:start name="default"/> - <sequential> + <sequential> <antcall target="agent-deploy"/> <antcall target="internal-test-module"> <param name="module" value="cms"/> @@ -159,13 +147,12 @@ </target> <target name="reports"> - <junitreport todir="${reports.dir}"> - <fileset dir="${reports.dir}"> - <include name="TEST-*.xml"/> - </fileset> - <report format="frames" - todir="${reports.dir}"/> - </junitreport> + <junitreport todir="${reports.dir}"> + <fileset dir="${reports.dir}"> + <include name="TEST-*.xml"/> + </fileset> + <report format="frames" todir="${reports.dir}"/> + </junitreport> </target> <target name="clean"> @@ -198,7 +185,7 @@ </delete>  <delete includeEmptyDirs="true" quiet="true"> - <fileset dir="output"/> + <fileset dir="output"/> </delete> </target> @@ -213,8 +200,8 @@ </target> <target name="help"> - <echo message="To run individual module tests use the test-module target with -Dmodule=the module you want to test, + <echo message="To run individual module tests use the test-module target with -Dmodule=the module you want to test, e.g. ant -Dmodule=portlet test-module"/> - </target> + </target> </project> Modified: branches/JBoss_Portal_Branch_2_7/testsuite/imports/server-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/imports/server-config.xml 2008-03-14 19:18:06 UTC (rev 10283) +++ branches/JBoss_Portal_Branch_2_7/testsuite/imports/server-config.xml 2008-03-15 01:55:13 UTC (rev 10284) @@ -24,8 +24,7 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<project name="server-config" default="help" - xmlns:server="http://jboss.org/ns/test/ant/server"> +<project name="server-config" default="help" xmlns:server="http://jboss.org/ns/test/ant/server">  <property environment="env"/> @@ -72,10 +71,10 @@  <path id="jboss.test.classpath"> - <filelist dir="${project.tools}/lib"> - <file name="jboss-test.jar"/> - </filelist> - </path> + <filelist dir="${project.tools}/lib"> + <file name="jboss-test.jar"/> + </filelist> + </path> <taskdef name="config" classname="org.jboss.ant.taskdefs.server.ConfigManagerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader"> @@ -92,18 +91,17 @@ <classpath refid="server.taskdef.classpath"/> </taskdef> - <server:config javaHome="${env.JAVA_HOME}" jbossHome="${jboss.dist}" - udpGroup="${udpGroup}"> + <server:config javaHome="${env.JAVA_HOME}" jbossHome="${jboss.dist}" udpGroup="${udpGroup}"> <server name="default" host="${node0}"> <jvmarg value="${jpda.cmdline}"/> <jvmarg value="-Xmx128m"/> <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/> - </server> + </server> </server:config> -<target name="help"> + <target name="help"> <echo message="The project fragment which defines the jboss server configs"/> </target> - - + + </project> Modified: branches/JBoss_Portal_Branch_2_7/wsrp/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/build.xml 2008-03-14 19:18:06 UTC (rev 10283) +++ branches/JBoss_Portal_Branch_2_7/wsrp/build.xml 2008-03-15 01:55:13 UTC (rev 10284) @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE project [ - <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> - <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> - <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"> - <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> - <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> - <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent"> - ]> +<!DOCTYPE project [<!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"><!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"><!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"><!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"><!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"><!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">]>  - - - - - - - - - + <project default="main" name="WSRP for JBoss Portal" xmlns:server="http://jboss.org/ns/test/ant/server"> -  -  -  -  -  +  - &buildmagic; - &modules; - &defaults; - &tools; - &targets; + &buildmagic; &modules; &defaults; &tools; &targets; -  -  -  +   </target> -  -  -  -  -  -  +  <target name="configure" unless="configure.disable"> @@ -108,8 +71,7 @@  <property name="jboss.deploy.lib.dir" value="${jboss.deploy.dir}/../lib"/> -  - &libraries; +  &libraries;  <path id="library.classpath"> @@ -148,6 +110,7 @@  <path id="tests.classpath"> <path refid="library.classpath"/> + <path refid="jboss.portal/modules/portlet.classpath"/> <pathelement location="${jboss.portal/modules/test.lib}/portal-test-jboss-lib.jar"/> <path refid="jboss.microcontainer.classpath"/> <pathelement path="${jboss.deploy.lib.dir}/log4j.jar"/> @@ -174,9 +137,7 @@ <path refid="jboss.portal-faces.classpath"/> </path> -  -  -  +   <property name="build.gen" value="${module.source}"/> @@ -202,9 +163,7 @@ <call target="configure-explode"/> <call target="configure-jbossaop"/> -  -  -  +  <property name="javadoc.private" value="true"/> <property name="javadoc.protected" value="false"/> @@ -223,10 +182,7 @@ <path refid="trove.trove.classpath"/> <path refid="qdox.qdox.classpath"/> </path> - <taskdef - name="aopc" - classname="org.jboss.aop.ant.AopC" - classpathref="jbossaop.task.classpath"/> + <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jbossaop.task.classpath"/> </target> <target name="configure-explode"> @@ -234,21 +190,12 @@ <pathelement location="${project.tools}/lib/explode.jar"/> <path refid="apache.ant.classpath"/> </path> - <taskdef name="explode" - classname="org.jboss.portal.common.ant.Explode" - classpathref="explode.task.classpath"/> + <taskdef name="explode" classname="org.jboss.portal.common.ant.Explode" classpathref="explode.task.classpath"/> </target> -  -  -  -  -  -  -  +  - <target name="compile" - description="Compile all source files." + <target name="compile" description="Compile all source files." depends="_default:compile-classes,_default:compile-etc">  <mkdir dir="${build.resources}"/> @@ -285,13 +232,7 @@ <property name="compile.disable" value="true"/> </target> -  -  -  -  -  -  -  +  <target name="output" description="Generate WSRP Service archive." depends="compile"> <mkdir dir="${build.lib}"/> @@ -334,14 +275,10 @@ </target> <target name="explode" depends="init"> - <explode file="${build.lib}/portal-wsrp.sar" - todir="${build.lib}" - name="portal-wsrp-exploded.sar"/> + <explode file="${build.lib}/portal-wsrp.sar" todir="${build.lib}" name="portal-wsrp-exploded.sar"/> </target> -  -  -  +   <target name="clean" depends="_default:clean"> @@ -349,28 +286,20 @@  </target> -  -  -  -  -  +  <target name="docs" depends="_default:docs">  </target> -  -  -  +  <target name="main" depends="most"/> <target name="all" depends="_default:all, explode"/> <target name="most" depends="_default:most"/> <target name="help" depends="_default:help"/> -  -  -  +   <target name="agent-deploy" depends="init"> @@ -418,9 +347,7 @@ <undeploy file="${build.lib.test}/test-wsrp-consumer.sar" config="default"/> </target> -  -  -  +  <target name="package-deployment-test" description="Generates the deployment test artifacts" depends="compile"> <jar jarfile="${build.lib.test}/test-deployment-lib.jar"> @@ -432,8 +359,8 @@ </jar> </target> - <target name="package-producer-configuration-test" - description="Generates the producer configuration test artifacts" depends="compile"> + <target name="package-producer-configuration-test" description="Generates the producer configuration test artifacts" + depends="compile"> <jar jarfile="${build.lib.test}/test-producer-configuration-lib.jar"> <fileset dir="${build.resources.test}/test-producer-configuration-lib-jar"/> <fileset dir="${source.resources}/portal-wsrp-sar/dtd"/> @@ -572,6 +499,7 @@ <fileset dir="${build.lib.test}" includes="test-wsrp-producer-client.jar"/> <fileset dir="${jboss.portal-security.root}/lib" includes="portal-security-lib.jar"/> <fileset dir="${jboss.portal-server.lib}" includes="portal-server-test-framework-lib.jar"/> + <fileset dir="${jboss.portal-core.lib}" includes="portal-core-lib.jar"/> </copy> <jar jarfile="${build.lib.test}/test-wsrp-producer.sar"> @@ -627,8 +555,7 @@  <package-test-portlet archiveName="resource" portletName="Resource"/> -  -  +   <jar jarfile="${build.lib.test}/test-applicationscope-portlet.war"> @@ -642,13 +569,10 @@  <target name="package-tests" depends="package-protocolv1-consumer-test, package-deployment-test, package-other-test, - package-protocolv1-producer-test, package-producer-configuration-test" - description="Packages all the test-related artifacts. Does NOT compile classes so this should be done before + package-protocolv1-producer-test, package-producer-configuration-test" description="Packages all the test-related artifacts. Does NOT compile classes so this should be done before calling this task."/> -  -  -  +  <target name="clean-test">  @@ -684,26 +608,22 @@ <target name="protocolv1-producer-test" depends="deploy-producer-test"> <execute-tests> <x-test> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" + <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.wsrp.v1.producer.ServiceDescription" id="org.jboss.portal.test.wsrp.v1.producer.ServiceDescription"> <parameter name="archive" value="test-wsrp-producer-servicedescription.sar"/> </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" + <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.wsrp.v1.producer.Markup" id="org.jboss.portal.test.wsrp.v1.producer.Markup"> <parameter name="archive" value="test-wsrp-producer-markup.sar"/> </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" + <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.wsrp.v1.producer.Registration" id="org.jboss.portal.test.wsrp.v1.producer.Registration"> <parameter name="archive" value="test-wsrp-producer-registration.sar"/> </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" + <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.wsrp.v1.producer.PortletManagement" id="org.jboss.portal.test.wsrp.v1.producer.PortletManagement"> <parameter name="archive" value="test-wsrp-producer-portletmanagement.sar"/> @@ -736,20 +656,17 @@ <target name="protocolv1-consumer-test" depends="deploy-consumer-test"> <execute-tests> <x-test> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" + <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.wsrp.v1.consumer.ServiceDescription" id="org.jboss.portal.test.wsrp.v1.consumer.ServiceDescription"> <parameter name="archive" value="test-wsrp-consumer-servicedescription.sar"/> </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" + <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.wsrp.v1.consumer.Markup" id="org.jboss.portal.test.wsrp.v1.consumer.Markup"> <parameter name="archive" value="test-wsrp-consumer-markup.sar"/> </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" + <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.wsrp.v1.consumer.PortletManagement" id="org.jboss.portal.test.wsrp.v1.consumer.PortletManagement"> <parameter name="archive" value="test-wsrp-consumer-portletmanagement.sar"/> Added: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/BasicPortalContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/BasicPortalContext.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/BasicPortalContext.java 2008-03-15 01:55:13 UTC (rev 10284) @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2008, Your Corporation. All Rights Reserved. + */ + +package org.jboss.portal.test.wsrp.framework.support; + +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +import org.jboss.portal.portlet.spi.PortalContext; +import org.jboss.portal.server.PortalConstants; +import org.jboss.portal.wsrp.WSRPUtils; + +import java.util.Collections; +import java.util.Map; +import java.util.Set; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class BasicPortalContext implements PortalContext +{ + public String getInfo() + { + return PortalConstants.VERSION.toString(); + } + + public Set<WindowState> getWindowStates() + { + return WSRPUtils.DEFAULT_JSR168_WINDOWSTATES; + } + + public Set<Mode> getModes() + { + return WSRPUtils.DEFAULT_JSR168_MODES; + } + + public Map<String, String> getProperties() + { + return Collections.emptyMap(); + } +} Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java 2008-03-14 19:18:06 UTC (rev 10283) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java 2008-03-15 01:55:13 UTC (rev 10284) @@ -37,6 +37,7 @@ import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; import org.jboss.portal.portlet.spi.WindowContext; import org.jboss.portal.test.wsrp.framework.support.BasicInstanceContext; +import org.jboss.portal.test.wsrp.framework.support.BasicPortalContext; import org.jboss.portal.test.wsrp.framework.support.BasicSecurityContext; import org.jboss.portal.test.wsrp.framework.support.BasicUserContext; import org.jboss.portal.test.wsrp.framework.support.TestPortletInvocationContext; @@ -216,7 +217,10 @@ render.setTarget(PortletContext.createPortletContext(portletHandle)); render.setMode(mode); render.setWindowState(state); - render.setNavigationalState(new OpaqueStateString(navigationalState)); + if (navigationalState != null) + { + render.setNavigationalState(new OpaqueStateString(navigationalState)); + } render.setInstanceContext(new BasicInstanceContext(portletHandle)); render.setSecurityContext(new BasicSecurityContext()); @@ -228,6 +232,7 @@ return "windowcontext"; } }); + render.setPortalContext(new BasicPortalContext()); return render; } Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/NeedPortletHandleTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/NeedPortletHandleTest.java 2008-03-14 19:18:06 UTC (rev 10283) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/NeedPortletHandleTest.java 2008-03-15 01:55:13 UTC (rev 10284) @@ -115,23 +115,29 @@ GetServiceDescription getServiceDescription = WSRPTypeFactory.createGetServiceDescription(); ServiceDescription serviceDescription = serviceDescriptionService.getServiceDescription(getServiceDescription); PortletDescription[] offered = serviceDescription.getOfferedPortlets(); - for (int i = 0; i < offered.length; i++) + if (offered != null) { - PortletDescription portletDescription = offered[i]; - String handle = portletDescription.getPortletHandle(); - String warName = handle.substring(1, handle.indexOf('.')) + ".war"; - if (warName.equals(archiveName)) + for (PortletDescription portletDescription : offered) { - List<String> handles = war2Handles.get(warName); - if (handles == null) + String handle = portletDescription.getPortletHandle(); + String warName = handle.substring(1, handle.indexOf('.')) + ".war"; + if (warName.equals(archiveName)) { - handles = new ArrayList<String>(3); - war2Handles.put(warName, handles); + List<String> handles = war2Handles.get(warName); + if (handles == null) + { + handles = new ArrayList<String>(3); + war2Handles.put(warName, handles); + } + + handles.add(handle); } - - handles.add(handle); } } + else + { + throw new IllegalArgumentException(archiveName + " didn't contain any portlets..."); + } } } Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPUtils.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPUtils.java 2008-03-14 19:18:06 UTC (rev 10283) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPUtils.java 2008-03-15 01:55:13 UTC (rev 10284) @@ -44,10 +44,12 @@ import javax.servlet.http.HttpServletRequest; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Set; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> @@ -56,16 +58,19 @@ */ public class WSRPUtils { - private final static Map JSR168_WSRP_WINDOW_STATES = new HashMap(7); - private final static Map WSRP_JSR168_WINDOW_STATES = new HashMap(7); - private final static Map JSR168_WSRP_MODES = new HashMap(7); - private final static Map WSRP_JSR168_MODES = new HashMap(7); + private final static Map<String, String> JSR168_WSRP_WINDOW_STATES = new HashMap<String, String>(7); + private final static Map<String, WindowState> WSRP_JSR168_WINDOW_STATES = new HashMap<String, WindowState>(7); + private final static Map<String, String> JSR168_WSRP_MODES = new HashMap<String, String>(7); + private final static Map<String, Mode> WSRP_JSR168_MODES = new HashMap<String, Mode>(7); private static final String SET_OF_LOCALES = "set of Locales"; private static final String MODE = "Mode"; private static final String WSRP_MODE_NAME = "wsrp portlet name"; private static final String WSRP_WINDOW_STATE_NAME = "wsrp window state name"; private static final String WINDOW_STATE = "WindowState"; + public static final Set<Mode> DEFAULT_JSR168_MODES; + public static final Set<WindowState> DEFAULT_JSR168_WINDOWSTATES; + static { JSR168_WSRP_WINDOW_STATES.put(WindowState.MAXIMIZED.toString(), WSRPConstants.MAXIMIZED_WINDOW_STATE); @@ -83,6 +88,9 @@ WSRP_JSR168_MODES.put(WSRPConstants.EDIT_MODE, Mode.EDIT); WSRP_JSR168_MODES.put(WSRPConstants.HELP_MODE, Mode.HELP); WSRP_JSR168_MODES.put(WSRPConstants.VIEW_MODE, Mode.VIEW); + + DEFAULT_JSR168_MODES = new HashSet<Mode>(WSRP_JSR168_MODES.values()); + DEFAULT_JSR168_WINDOWSTATES = new HashSet<WindowState>(WSRP_JSR168_WINDOW_STATES.values()); } private WSRPUtils() @@ -92,7 +100,7 @@ public static WindowState getJSR168WindowStateFromWSRPName(String wsrpWindowStateName) { ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(wsrpWindowStateName, WSRP_WINDOW_STATE_NAME, null); - WindowState windowState = (WindowState)WSRP_JSR168_WINDOW_STATES.get(wsrpWindowStateName); + WindowState windowState = WSRP_JSR168_WINDOW_STATES.get(wsrpWindowStateName); return (windowState == null) ? WindowState.create(wsrpWindowStateName) : windowState; } @@ -105,7 +113,7 @@ // todo: how should we deal with solo? ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(jsr168WindowStateName, WSRP_WINDOW_STATE_NAME, null); - String wsrpName = (String)JSR168_WSRP_WINDOW_STATES.get(jsr168WindowStateName); + String wsrpName = JSR168_WSRP_WINDOW_STATES.get(jsr168WindowStateName); return (wsrpName == null) ? jsr168WindowStateName : wsrpName; } @@ -118,7 +126,7 @@ public static Mode getJSR168PortletModeFromWSRPName(String wsrpPortletModeName) { ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(wsrpPortletModeName, WSRP_MODE_NAME, null); - Mode mode = (Mode)WSRP_JSR168_MODES.get(wsrpPortletModeName); + Mode mode = WSRP_JSR168_MODES.get(wsrpPortletModeName); return (mode == null) ? Mode.create(wsrpPortletModeName) : mode; } @@ -131,7 +139,7 @@ // todo: how should we deal with preview? ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(jsr168PortletModeName, WSRP_MODE_NAME, null); - String wsrpName = (String)JSR168_WSRP_MODES.get(jsr168PortletModeName); + String wsrpName = JSR168_WSRP_MODES.get(jsr168PortletModeName); return (wsrpName == null) ? jsr168PortletModeName : wsrpName; } @@ -475,9 +483,8 @@ if (formParams != null) { sb.append("\n\tForm params:\n"); - for (int i = 0; i < formParams.length; i++) + for (NamedString formParam : formParams) { - NamedString formParam = formParams[i]; sb.append("\t\t").append(formParam.getName()).append("='").append(formParam.getValue()).append("'\n"); } } Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupRequest.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupRequest.java 2008-03-14 19:18:06 UTC (rev 10283) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupRequest.java 2008-03-15 01:55:13 UTC (rev 10284) @@ -23,6 +23,8 @@ package org.jboss.portal.wsrp.producer; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.wsrp.WSRPUtils; import org.jboss.portal.wsrp.core.MarkupType; @@ -103,11 +105,11 @@ return portlet; } - public Set getSupportedModes() + public Set<Mode> getSupportedModes() { String[] modes = markupType.getModes(); int length = modes.length; - Set result = new HashSet(length); + Set<Mode> result = new HashSet<Mode>(length); for (int i = 0; i < length; i++) { result.add(WSRPUtils.getJSR168PortletModeFromWSRPName(modes[i])); @@ -115,11 +117,11 @@ return result; } - public Set getSupportedWindowStates() + public Set<WindowState> getSupportedWindowStates() { String[] states = markupType.getWindowStates(); int length = states.length; - Set result = new HashSet(length); + Set<WindowState> result = new HashSet<WindowState>(length); for (int i = 0; i < length; i++) { result.add(WSRPUtils.getJSR168WindowStateFromWSRPName(states[i])); Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java 2008-03-14 19:18:06 UTC (rev 10283) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java 2008-03-15 01:55:13 UTC (rev 10284) @@ -23,6 +23,8 @@ package org.jboss.portal.wsrp.producer; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; import org.jboss.portal.common.util.MarkupInfo; import org.jboss.portal.common.util.MediaType; import org.jboss.portal.common.util.Tools; @@ -360,15 +362,14 @@ return PortalConstants.VERSION.toString(); } - public Set getWindowStates() + public Set<WindowState> getWindowStates() { String[] validNewWindowStates = params.getValidNewWindowStates(); if (validNewWindowStates != null) { - Set states = new HashSet(validNewWindowStates.length); - for (int i = 0; i < validNewWindowStates.length; i++) + Set<WindowState> states = new HashSet<WindowState>(validNewWindowStates.length); + for (String state : validNewWindowStates) { - String state = validNewWindowStates[i]; states.add(WSRPUtils.getJSR168WindowStateFromWSRPName(state)); } return states; @@ -376,15 +377,14 @@ return markupRequest.getSupportedWindowStates(); } - public Set getModes() + public Set<Mode> getModes() { String[] validNewModes = params.getValidNewModes(); if (validNewModes != null) { - Set modes = new HashSet(validNewModes.length); - for (int i = 0; i < validNewModes.length; i++) + Set<Mode> modes = new HashSet<Mode>(validNewModes.length); + for (String mode : validNewModes) { - String mode = validNewModes[i]; modes.add(WSRPUtils.getJSR168PortletModeFromWSRPName(mode)); } return modes; @@ -392,9 +392,9 @@ return markupRequest.getSupportedModes(); } - public Map getProperties() + public Map<String, String> getProperties() { - return Collections.EMPTY_MAP; + return Collections.emptyMap(); } }; } Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml 2008-03-14 19:18:06 UTC (rev 10283) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml 2008-03-15 01:55:13 UTC (rev 10284) @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> - - <mbean - code="org.jboss.portal.test.framework.driver.remote.RemoteTestDriverServer" - name="portal.test:service=TestDriverServer" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.test.framework.driver.remote.RemoteTestDriverServer" + name="portal.test:service=TestDriverServer" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <depends optional-attribute-name="Agent" proxy-type="attribute">portal.test:service=Agent</depends> </mbean> -  - <mbean - code="org.jboss.portal.portlet.impl.container.PortletApplicationRegistryImpl" - name="portal:service=WebAppRegistry" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.impl.portlet.info.CoreInfoBuilderFactory" + name="portal:service=InfoBuilderFactory,type=Core" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean>  - <mbean - code="org.jboss.portal.portlet.deployment.jboss.PortletAppDeploymentFactory" - name="portal:deploymentFactory=PortletApp" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.deployment.jboss.PortletAppDeploymentFactory" + name="portal:deploymentFactory=PortletApp" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends> - <depends - optional-attribute-name="WebAppRegistry" proxy-type="attribute">portal:service=WebAppRegistry</depends> - <depends - optional-attribute-name="Config" proxy-type="attribute">portal:service=ServerConfig</depends> + <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends> + <depends optional-attribute-name="CoreInfoBuilderFactory" proxy-type="attribute"> + portal:service=InfoBuilderFactory,type=Core + </depends> +  + <depends optional-attribute-name="Config" proxy-type="attribute">portal:service=ServerConfig</depends> </mbean>  - <mbean - code="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor" - name="portal:service=Interceptor,type=Portlet,name=ContextDispatcher" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor" + name="portal:service=Interceptor,type=Portlet,name=ContextDispatcher" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="ServletContainerFactory" - proxy-type="attribute">portal:service=ServletContainerFactory</depends> + <depends optional-attribute-name="ServletContainerFactory" proxy-type="attribute"> + portal:service=ServletContainerFactory + </depends> </mbean> - <mbean - code="org.jboss.portal.portlet.aspects.portlet.WindowStatesInterceptor" - name="portal:service=Interceptor,type=Portlet,name=WindowStates" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor" + name="portal:service=Interceptor,type=Portlet,name=ProducerCache" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.portlet.aspects.portlet.ModesInterceptor" - name="portal:service=Interceptor,type=Portlet,name=Modes" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" + name="portal:service=InterceptorStackFactory,type=Container" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - </mbean> - <mbean - code="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor" - name="portal:service=Interceptor,type=Portlet,name=ProducerCache" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> - </mbean> - <mbean - code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" - name="portal:service=InterceptorStackFactory,type=Container" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> <depends-list optional-attribute-name="InterceptorNames"> <depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextDispatcher</depends-list-element> - <depends-list-element>portal:service=Interceptor,type=Portlet,name=WindowStates</depends-list-element> - <depends-list-element>portal:service=Interceptor,type=Portlet,name=Modes</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Portlet,name=ProducerCache</depends-list-element> </depends-list> </mbean>  - <mbean - code="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService" - name="portal:service=PersistenceManager,type=Producer" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService" + name="portal:service=PersistenceManager,type=Producer" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.portlet.impl.state.StateManagementPolicyService" - name="portal:service=StateManagementPolicy,type=Producer" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.impl.state.StateManagementPolicyService" + name="portal:service=StateManagementPolicy,type=Producer" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <attribute name="PersistLocally">true</attribute> </mbean> - <mbean - code="org.jboss.portal.portlet.impl.state.StateConverterV0" - name="portal:service=StateConverter,type=Producer" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.impl.state.StateConverterV0" name="portal:service=StateConverter,type=Producer" + xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker" - name="portal:service=PortletInvoker,type=Stateful" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker" + name="portal:service=PortletInvoker,type=Stateful" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="PortletInvoker" - proxy-type="attribute">portal:service=PortletInvoker,type=Container</depends> - <depends - optional-attribute-name="PersistenceManager" proxy-type="attribute">portal:service=PersistenceManager,type=Producer</depends> - <depends - optional-attribute-name="StateManagementPolicy" proxy-type="attribute">portal:service=StateManagementPolicy,type=Producer</depends> - <depends - optional-attribute-name="StateConverter" - proxy-type="attribute">portal:service=StateConverter,type=Producer</depends> + <depends optional-attribute-name="PortletInvoker" proxy-type="attribute"> + portal:service=PortletInvoker,type=Container + </depends> + <depends optional-attribute-name="PersistenceManager" proxy-type="attribute"> + portal:service=PersistenceManager,type=Producer + </depends> + <depends optional-attribute-name="StateManagementPolicy" proxy-type="attribute"> + portal:service=StateManagementPolicy,type=Producer + </depends> + <depends optional-attribute-name="StateConverter" proxy-type="attribute"> + portal:service=StateConverter,type=Producer + </depends> </mbean>  - <mbean - code="org.jboss.portal.portlet.container.PortletContainerInvoker" - name="portal:service=PortletInvoker,type=Container" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.container.PortletContainerInvoker" + name="portal:service=PortletInvoker,type=Container" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="StackFactory" - proxy-type="attribute">portal:service=InterceptorStackFactory,type=Container</depends> - <depends - optional-attribute-name="Registry" - proxy-type="attribute">portal:service=WebAppRegistry</depends> + <depends optional-attribute-name="StackFactory" proxy-type="attribute"> + portal:service=InterceptorStackFactory,type=Container + </depends> +  </mbean>  @@ -165,7 +124,9 @@ name="portal.wsrp:service=RegistrationManager" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends optional-attribute-name="PersistenceManager" proxy-type="attribute">portal.wsrp:service=PersistenceManager</depends> + <depends optional-attribute-name="PersistenceManager" proxy-type="attribute"> + portal.wsrp:service=PersistenceManager + </depends> </mbean>  @@ -180,17 +141,18 @@ </mbean>  - <mbean - code="org.jboss.portal.wsrp.producer.WSRPProducerImpl" - name="portal.wsrp:service=WSRPProducer" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.wsrp.producer.WSRPProducerImpl" name="portal.wsrp:service=WSRPProducer" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends optional-attribute-name="Invoker" - proxy-type="attribute">portal:service=PortletInvoker,type=Stateful</depends> + <depends optional-attribute-name="Invoker" proxy-type="attribute">portal:service=PortletInvoker,type=Stateful + </depends> <attribute name="RemotableByDefault">true</attribute> - <depends optional-attribute-name="RegistrationManager" proxy-type="attribute">portal.wsrp:service=RegistrationManager</depends> - <depends optional-attribute-name="ProducerConfigurationService" proxy-type="attribute">portal.wsrp:service=ProducerConfiguration</depends> + <depends optional-attribute-name="RegistrationManager" proxy-type="attribute"> + portal.wsrp:service=RegistrationManager + </depends> + <depends optional-attribute-name="ProducerConfigurationService" proxy-type="attribute"> + portal.wsrp:service=ProducerConfiguration + </depends> </mbean>  @@ -201,11 +163,8 @@ </mbean>  - <mbean - code="org.jboss.portal.wsrp.servlet.ServletAccessService" - name="portal.wsrp:service=ServletAccess" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.wsrp.servlet.ServletAccessService" name="portal.wsrp:service=ServletAccess" + xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> </server>

16 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r10283 - in branches/JBoss_Portal_Branch_2_7: core and 1 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-03-14 15:18:06 -0400 (Fri, 14 Mar 2008) New Revision: 10283 Modified: branches/JBoss_Portal_Branch_2_7/build/build.xml branches/JBoss_Portal_Branch_2_7/core-cms/build.xml branches/JBoss_Portal_Branch_2_7/core/build.xml Log: - Re-added core-cms and cms to build - Made core-cms compile Modified: branches/JBoss_Portal_Branch_2_7/build/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/build/build.xml 2008-03-14 00:17:58 UTC (rev 10282) +++ branches/JBoss_Portal_Branch_2_7/build/build.xml 2008-03-14 19:18:06 UTC (rev 10283) @@ -139,7 +139,7 @@ <group name="portal"> <include - modules="api, jems, server, security, search, format, portlet-server, faces, theme, workflow, registration, core,core-management, core-identity, core-samples, widget"/> + modules="api, jems, server, security, search, format, portlet-server, faces, theme, workflow, registration, core, cms, wsrp, core-admin, core-management, core-identity, core-cms, core-samples, widget"/> </group> <group name="cms"> @@ -304,7 +304,7 @@  <copy file="../widget/output/lib/portal-widget.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> <copy file="../widget/output/lib/portal-widget-netvibes.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> -  + <copy file="../wsrp/output/lib/portal-wsrp.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> </target> <target name="undeploy-all" Modified: branches/JBoss_Portal_Branch_2_7/core/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-03-14 00:17:58 UTC (rev 10282) +++ branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-03-14 19:18:06 UTC (rev 10283) @@ -87,7 +87,7 @@ &libraries; <path id="library.classpath"> - <path refid="portlet.portlet.classpath"/> + <path refid="portlet.portlet.classpath"/> <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal/modules/web.classpath"/> <path refid="jboss.portal/modules/identity.classpath"/> Modified: branches/JBoss_Portal_Branch_2_7/core-cms/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/build.xml 2008-03-14 00:17:58 UTC (rev 10282) +++ branches/JBoss_Portal_Branch_2_7/core-cms/build.xml 2008-03-14 19:18:06 UTC (rev 10283) @@ -87,6 +87,7 @@ &libraries; <path id="library.classpath"> + <path refid="portlet.portlet.classpath"/> <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal/modules/test.classpath"/> <path refid="jboss.portal/modules/portlet.classpath"/>

16 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r10282 - modules/portlet/trunk.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-03-13 20:17:58 -0400 (Thu, 13 Mar 2008) New Revision: 10282 Added: modules/portlet/trunk/releaseLibs.sh Log: Added little script to make it easier to release a new version of module to repository or test it in Portal Added: modules/portlet/trunk/releaseLibs.sh =================================================================== --- modules/portlet/trunk/releaseLibs.sh (rev 0) +++ modules/portlet/trunk/releaseLibs.sh 2008-03-14 00:17:58 UTC (rev 10282) @@ -0,0 +1,29 @@ +repos=$HOME/Dev/portal-modules-respo/portlet/trunk-SNAPSHOT/lib +thirdparty=$HOME/Dev/jboss-portal-2.7/thirdparty/jboss-portal/modules/portlet/lib + +echo "Copies current version of portlet libraries either to local repository copy or Portal thirdparty to test or release purpose" +echo "Usage: '$0' to release to Portal thirdparty, '$0 repos' to release to repository local copy" +echo "Set 'repos' variable to the snapshot lib directory for the portlet module of your local repository copy" +echo "Set 'repos' variable to the lib directory for the portlet module of your local JBoss Portal 2.7 thirparty directory" +echo "" +echo "repos currently set at: $repos" +echo "thirdparty currently set at: $thirdparty" +echo "" + +if [[ $1 == "repos" ]]; then + loc=$repos + echo "Releasing to repository" +elif [[ $1 == "usage" ]]; then + echo "Usage shown, nothing was done" + exit 0 +else + loc=$thirdparty + echo "Releasing to Portal thirdparty" +fi + +cp bridge/target/portlet-bridge-2.0.0-SNAPSHOT.jar $loc/portal-portlet-bridge-lib.jar +cp controller/target/portlet-controller-2.0.0-SNAPSHOT.jar $loc/portal-portlet-controller-lib.jar +cp federation/target/portlet-federation-2.0.0-SNAPSHOT.jar $loc/portal-portlet-federation-lib.jar +cp jsr168api/target/portlet-jsr168api-2.0.0-SNAPSHOT.jar $loc/portal-portlet-jsr168api-lib.jar +cp management/target/portlet-management-2.0.0-SNAPSHOT.jar $loc/portal-portlet-management-lib.jar +cp portlet/target/portlet-portlet-2.0.0-SNAPSHOT.jar $loc/portal-portlet-lib.jar \ No newline at end of file Property changes on: modules/portlet/trunk/releaseLibs.sh ___________________________________________________________________ Name: svn:executable + *

16 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r10281 - in branches/JBoss_Portal_Branch_2_7: core/src/main/org/jboss/portal/core/impl/model/content and 6 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-03-13 19:22:28 -0400 (Thu, 13 Mar 2008) New Revision: 10281 Added: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/CorePortletInterceptor.java Removed: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/CorePortletInvoker.java Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/AjaxInterceptor.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/SignOutInterceptor.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/web/jboss/JBossWebContext.java Log: - Header injection now works - Partial refresh should now work (though I haven't tested it) - InternalContentProvider.renderWindow should now properly work - More updates related to CorePortletInfo as a PortletInfo attachment - Removed CorePortletInvoker which wasn't used after all - More generification Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/AjaxInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/AjaxInterceptor.java 2008-03-13 09:44:13 UTC (rev 10280) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/AjaxInterceptor.java 2008-03-13 23:22:28 UTC (rev 10281) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * Copyright 2008, 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. * @@ -22,15 +22,12 @@ ******************************************************************************/ package org.jboss.portal.core.aspects.portlet; -import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.core.portlet.info.AjaxInfo; import org.jboss.portal.core.portlet.info.CorePortletInfo; -import org.jboss.portal.portlet.deployment.CorePortletInvoker; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.invocation.PortletInterceptor; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.response.FragmentResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.invocation.response.ResponseProperties; /** * Look at the portlet ajax meta data. @@ -40,33 +37,31 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public class AjaxInterceptor extends PortletInterceptor +public class AjaxInterceptor extends CorePortletInterceptor { /** . */ public static final String PARTIAL_REFRESH = "partialRefresh"; - protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException + protected Object invoke(PortletInvocation invocation) throws Exception { - System.out.println("TODO: org.jboss.portal.core.aspects.portlet.AjaxInterceptor"); - PortletInvocationResponse response = (PortletInvocationResponse)invocation.invokeNext(); // if (response instanceof FragmentResponse) { - PortletInfo portletInfo = (PortletInfo)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, CorePortletInvoker.PORTLET_CORE_INFO); - if (portletInfo instanceof CorePortletInfo) + FragmentResponse fragment = (FragmentResponse)response; + CorePortletInfo corePortletInfo = getCorePortletInfo(invocation); + if (corePortletInfo != null) { - CorePortletInfo corePortletInfo = (CorePortletInfo)portletInfo; - - if (corePortletInfo != null) + AjaxInfo ajax = corePortletInfo.getAjax(); + if (ajax != null) { - AjaxInfo ajax = corePortletInfo.getAjax(); - if (ajax != null) - { -// invocation.setAttribute(PortletInvocation.RESPONSE_PROPERTIES_SCOPE, PARTIAL_REFRESH, Boolean.valueOf(ajax.getPartialRefresh())); - } + fragment = updateFragmentWithPropertiesIfNeeded(fragment); + ResponseProperties props = fragment.getProperties(); + props.getTransportHeaders().setValue(PARTIAL_REFRESH, "" + ajax.getPartialRefresh()); + + return fragment; } } } Added: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/CorePortletInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/CorePortletInterceptor.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/CorePortletInterceptor.java 2008-03-13 23:22:28 UTC (rev 10281) @@ -0,0 +1,74 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, 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.core.aspects.portlet; + +import org.jboss.portal.core.portlet.info.CorePortletInfo; +import org.jboss.portal.portlet.container.PortletContainer; +import org.jboss.portal.portlet.container.PortletContainerInvoker; +import org.jboss.portal.portlet.invocation.PortletInterceptor; +import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.invocation.response.FragmentResponse; +import org.jboss.portal.portlet.invocation.response.ResponseProperties; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public abstract class CorePortletInterceptor extends PortletInterceptor +{ + /** + * Retrieve the CorePortetInfo, if any, associated with the Portlet being invoked. + * + * @param invocation the current PortletInvocation + * @return the CorePortetInfo associated with the Portlet being invoked or <code>null</code> if no such information + * is present + */ + protected CorePortletInfo getCorePortletInfo(PortletInvocation invocation) + { + PortletContainer container = (PortletContainer)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER); + + return container.getInfo().getAttachment(CorePortletInfo.class); + } + + /** + * Create a new FragmentResponse if the current one doesn't have any properties. + * + * @param fragment the current FragmentResponse + * @return the passed FragmentResponse or a new one with properties + */ + protected FragmentResponse updateFragmentWithPropertiesIfNeeded(FragmentResponse fragment) + { + ResponseProperties props = fragment.getProperties(); + + // if we don't currently have properties, copy the current response and add properties + if (props == null) + { + props = new ResponseProperties(); + fragment = new FragmentResponse(props, fragment.getAttributes(), + fragment.getContentType(), fragment.getBytes(), fragment.getChars(), fragment.getTitle(), + fragment.getCacheControl(), fragment.getNextModes()); + } + return fragment; + } +} Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java 2008-03-13 09:44:13 UTC (rev 10280) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java 2008-03-13 23:22:28 UTC (rev 10281) @@ -26,9 +26,6 @@ import org.jboss.portal.core.metadata.portlet.MarkupElement; import org.jboss.portal.core.portlet.info.CorePortletInfo; import org.jboss.portal.core.portlet.info.MarkupHeaderInfo; -import org.jboss.portal.portlet.container.PortletContainer; -import org.jboss.portal.portlet.container.PortletContainerInvoker; -import org.jboss.portal.portlet.invocation.PortletInterceptor; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.response.FragmentResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; @@ -43,7 +40,7 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -public class HeaderInterceptor extends PortletInterceptor +public class HeaderInterceptor extends CorePortletInterceptor { protected Object invoke(PortletInvocation invocation) throws Exception @@ -55,24 +52,15 @@ { FragmentResponse fragment = (FragmentResponse)response; - // Add declaratively injected header content here if needed (get it via the component) - PortletContainer container = (PortletContainer)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER); - - // only proceed if we have JBoss Portal specific metadata - CorePortletInfo corePortletInfo = container.getInfo().getAttachment(CorePortletInfo.class); + CorePortletInfo corePortletInfo = getCorePortletInfo(invocation); if (corePortletInfo != null) { MarkupHeaderInfo headerContentInfo = corePortletInfo.getMarkupHeader(); if (headerContentInfo != null) { + fragment = updateFragmentWithPropertiesIfNeeded(fragment); ResponseProperties props = fragment.getProperties(); - // if we don't already have properties in the response, create some - if (props == null) - { - props = new ResponseProperties(); - } - // Get the context path String contextPath = (String)invocation.getDispatchedRequest().getAttribute("javax.servlet.include.context_path"); @@ -81,6 +69,8 @@ { headers.addValue(MimeResponse.MARKUP_HEAD_ELEMENT, markupElement.toElement(contextPath)); } + + return fragment; } } } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/SignOutInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/SignOutInterceptor.java 2008-03-13 09:44:13 UTC (rev 10280) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/SignOutInterceptor.java 2008-03-13 23:22:28 UTC (rev 10281) @@ -22,16 +22,14 @@ ******************************************************************************/ package org.jboss.portal.core.aspects.portlet; -import javax.portlet.Event; -import javax.xml.namespace.QName; - -import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.core.controller.portlet.SignOutResponse; import org.jboss.portal.portlet.invocation.PortletInterceptor; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; +import javax.xml.namespace.QName; + /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @version $Revision$ @@ -40,13 +38,13 @@ { @Override - protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException + protected Object invoke(PortletInvocation invocation) throws Exception { PortletInvocationResponse response = (PortletInvocationResponse)invocation.invokeNext(); if (response instanceof UpdateNavigationalStateResponse) { UpdateNavigationalStateResponse unsr = (UpdateNavigationalStateResponse)response; - for (UpdateNavigationalStateResponse.Event event: unsr.getEvents()) + for (UpdateNavigationalStateResponse.Event event : unsr.getEvents()) { if (event.getName().equals(new QName("http://www.jboss.com/portal", "signOut"))) { Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java 2008-03-13 09:44:13 UTC (rev 10280) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java 2008-03-13 23:22:28 UTC (rev 10281) @@ -25,33 +25,22 @@ import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.common.transaction.Transactions; import org.jboss.portal.core.portlet.info.CorePortletInfo; -import org.jboss.portal.portlet.deployment.CorePortletInvoker; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.invocation.PortletInterceptor; import org.jboss.portal.portlet.invocation.PortletInvocation; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public class TransactionInterceptor extends PortletInterceptor +public class TransactionInterceptor extends CorePortletInterceptor { - protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException + protected Object invoke(PortletInvocation invocation) throws Exception { - // The default type is that it does not propagate - Transactions.Type txType = Transactions.TYPE_NOT_SUPPORTED; - // Override tx type if found - PortletInfo portletInfo = (PortletInfo) invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, - CorePortletInvoker.PORTLET_CORE_INFO); - if (portletInfo instanceof CorePortletInfo) + CorePortletInfo corePortletInfo = getCorePortletInfo(invocation); + if (corePortletInfo != null) { - CorePortletInfo corePortletInfo = (CorePortletInfo) portletInfo; - if (corePortletInfo != null) - { - txType = corePortletInfo.getTxType(); - } + Transactions.Type txType = corePortletInfo.getTxType(); // if (txType == Transactions.TYPE_NOT_SUPPORTED) @@ -83,6 +72,7 @@ throw new InvocationException("Should not happen"); } } + return invocation.invokeNext(); } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-03-13 09:44:13 UTC (rev 10280) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-03-13 23:22:28 UTC (rev 10281) @@ -26,6 +26,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.util.MultiValuedPropertyMap; +import org.jboss.portal.core.aspects.portlet.AjaxInterceptor; import org.jboss.portal.core.controller.ControllerResponse; import org.jboss.portal.core.controller.command.response.SecurityErrorResponse; import org.jboss.portal.core.controller.command.response.UnavailableResourceResponse; @@ -57,13 +58,13 @@ import org.jboss.portal.portlet.invocation.response.UnavailableResponse; import org.jboss.portal.security.spi.auth.PortalAuthorizationManager; import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; +import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions; import org.w3c.dom.Element; import javax.portlet.MimeResponse; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -211,8 +212,8 @@ RenderInvocation invocation = rendererContext.createRenderInvocation(new WindowNavigationalState(windowState, mode, windowNS.getContentState())); // - List supportedWindowStates = Collections.EMPTY_LIST; - List supportedModes = Collections.EMPTY_LIST; + List<WindowState> supportedWindowStates = Collections.emptyList(); + List<Mode> supportedModes = Collections.emptyList(); PortletInvocationResponse response; // @@ -221,11 +222,10 @@ CapabilitiesInfo capabilitiesInfo = instance.getPortlet().getInfo().getCapabilities(); // - Set windowStatesInfo = capabilitiesInfo.getAllWindowStates(); - supportedWindowStates = new ArrayList(windowStatesInfo.size()); - for (Iterator i = windowStatesInfo.iterator(); i.hasNext();) + Set<WindowStateInfo> windowStatesInfo = capabilitiesInfo.getAllWindowStates(); + supportedWindowStates = new ArrayList<WindowState>(windowStatesInfo.size()); + for (WindowStateInfo windowStateInfo : windowStatesInfo) { - WindowStateInfo windowStateInfo = (WindowStateInfo)i.next(); WindowState tmp = windowStateInfo.getWindowState(); if (portal.getSupportedWindowStates().contains(tmp)) { @@ -234,11 +234,10 @@ } // - Set modesInfo = capabilitiesInfo.getAllModes(); - supportedModes = new ArrayList(modesInfo.size()); - for (Iterator i = modesInfo.iterator(); i.hasNext();) + Set<ModeInfo> modesInfo = capabilitiesInfo.getAllModes(); + supportedModes = new ArrayList<Mode>(modesInfo.size()); + for (ModeInfo modeInfo : modesInfo) { - ModeInfo modeInfo = (ModeInfo)i.next(); Mode tmp = modeInfo.getMode(); if (portal.getSupportedModes().contains(tmp)) { @@ -288,8 +287,6 @@ ControllerResponse cr; if (response instanceof FragmentResponse) { - System.out.println("TODO: org.jboss.portal.core.impl.model.content.InternalContentProvider.renderWindow()"); - FragmentResponse fragment = (FragmentResponse)response; // @@ -299,11 +296,11 @@ windowTitle = window.getName(); } - // header handling String header = ""; ResponseProperties properties = fragment.getProperties(); if (properties != null) { + // header handling MultiValuedPropertyMap<Element> headers = properties.getMarkupHeaders(); List<Element> headElements = headers.getValues(MimeResponse.MARKUP_HEAD_ELEMENT); StringBuffer buffer = new StringBuffer(124 * headElements.size()); @@ -311,8 +308,17 @@ { buffer.append(element); } - header = buffer.toString(); + + // deal with partial refresh + MultiValuedPropertyMap<String> transport = properties.getTransportHeaders(); + String partialRefreshValue = transport.getValue(AjaxInterceptor.PARTIAL_REFRESH); + Boolean partialRefresh = Boolean.parseBoolean(partialRefreshValue); + if (partialRefresh != null && Boolean.FALSE.equals(partialRefresh)) + { + DynaRenderOptions options = DynaRenderOptions.getOptions(null, partialRefresh); + options.setOptions(windowProps); + } } // Handle minimized here @@ -326,17 +332,6 @@ contentChars = fragment.getChars(); } - // Update window props after render if needed - System.out.println("TODO AJAX: org.jboss.portal.core.impl.model.content.InternalContentProvider"); - /* - Boolean partialRefresh = (Boolean)invocation.getAttribute(PortletInvocation.RESPONSE_PROPERTIES_SCOPE, AjaxInterceptor.PARTIAL_REFRESH); - if (partialRefresh != null && Boolean.FALSE.equals(partialRefresh)) - { - DynaRenderOptions options = DynaRenderOptions.getOptions(null, partialRefresh); - options.setOptions(windowProps); - } - */ - // cr = new MarkupResponse(windowTitle, contentChars, header); Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-03-13 09:44:13 UTC (rev 10280) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-03-13 23:22:28 UTC (rev 10281) @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> - - <mbean - code="org.jboss.portal.server.config.ServerConfigService" - name="portal:service=ServerConfig" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.server.config.ServerConfigService" name="portal:service=ServerConfig" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <attribute name="ConfigLocation">conf/config.xml</attribute> </mbean>  - <mbean - code="org.jboss.portal.server.impl.xml.EntityResolverService" - name="portal:service=EntityResolver" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.server.impl.xml.EntityResolverService" name="portal:service=EntityResolver" + xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <attribute name="DTDMapping"> <properties> @@ -52,113 +45,86 @@ </mbean>  - <mbean - code="org.jboss.portal.web.jboss.JBossWebContext" - name="portal:service=ServletContainerFactory" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.web.jboss.JBossWebContext" name="portal:service=ServletContainerFactory" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean>  - <mbean - code="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl" - name="portal:service=AuthorizationDomainRegistry" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl" + name="portal:service=AuthorizationDomainRegistry" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory" - name="portal:service=PortalAuthorizationManagerFactory" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory" + name="portal:service=PortalAuthorizationManagerFactory" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="AuthorizationDomainRegistry" - proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends> + <depends optional-attribute-name="AuthorizationDomainRegistry" proxy-type="attribute"> + portal:service=AuthorizationDomainRegistry + </depends> </mbean> - <mbean - code="org.jboss.portal.portlet.impl.security.JBossPortletSecurityService" - name="portal:service=PortletSecurityService" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.impl.security.JBossPortletSecurityService" + name="portal:service=PortletSecurityService" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="PortalAuthorizationManagerFactory" - proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends> - <depends - optional-attribute-name="AuthorizationDomainRegistry" - proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends> + <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute"> + portal:service=PortalAuthorizationManagerFactory + </depends> + <depends optional-attribute-name="AuthorizationDomainRegistry" proxy-type="attribute"> + portal:service=AuthorizationDomainRegistry + </depends> </mbean>  - <mbean - code="org.jboss.portal.server.aspects.server.SessionLockInterceptor" - name="portal:service=Interceptor,type=Server,name=SessionLock" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.server.aspects.server.SessionLockInterceptor" + name="portal:service=Interceptor,type=Server,name=SessionLock" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.core.aspects.server.TransactionInterceptor" - name="portal:service=Interceptor,type=Server,name=Transaction" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.aspects.server.TransactionInterceptor" + name="portal:service=Interceptor,type=Server,name=Transaction" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.core.impl.api.user.UserEventBridgeTriggerInterceptor" - name="portal:service=Interceptor,type=Server,name=UserEvent" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.impl.api.user.UserEventBridgeTriggerInterceptor" + name="portal:service=Interceptor,type=Server,name=UserEvent" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.server.aspects.server.SignOutInterceptor" - name="portal:service=Interceptor,type=Server,name=SessionInvalidator" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.server.aspects.server.SignOutInterceptor" + name="portal:service=Interceptor,type=Server,name=SessionInvalidator" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="ServletContainerFactory" - proxy-type="attribute">portal:service=ServletContainerFactory</depends> + <depends optional-attribute-name="ServletContainerFactory" proxy-type="attribute"> + portal:service=ServletContainerFactory + </depends> </mbean> - <mbean - code="org.jboss.portal.core.aspects.server.UserInterceptor" - name="portal:service=Interceptor,type=Server,name=User" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.aspects.server.UserInterceptor" + name="portal:service=Interceptor,type=Server,name=User" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <attribute name="CacheUser">true</attribute> <depends>portal:service=Module,type=IdentityServiceController</depends> </mbean> - <mbean - code="org.jboss.portal.core.aspects.server.LocaleInterceptor" - name="portal:service=Interceptor,type=Server,name=Locale" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.aspects.server.LocaleInterceptor" + name="portal:service=Interceptor,type=Server,name=Locale" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.core.aspects.server.PortalContextPathInterceptor" - name="portal:service=Interceptor,type=Server,name=PortalContextPath" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.aspects.server.PortalContextPathInterceptor" + name="portal:service=Interceptor,type=Server,name=PortalContextPath" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.server.aspects.server.ContentTypeInterceptor" - name="portal:service=Interceptor,type=Server,name=ContentType" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.server.aspects.server.ContentTypeInterceptor" + name="portal:service=Interceptor,type=Server,name=ContentType" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" - name="portal:service=InterceptorStackFactory,type=Server" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" + name="portal:service=InterceptorStackFactory,type=Server" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <depends-list optional-attribute-name="InterceptorNames"> <depends-list-element>portal:service=Interceptor,type=Server,name=SessionLock</depends-list-element> @@ -173,28 +139,22 @@ </mbean>  - <mbean - code="org.jboss.portal.core.aspects.controller.ControlInterceptor" - name="portal:service=Interceptor,type=Command,name=Control" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.aspects.controller.ControlInterceptor" + name="portal:service=Interceptor,type=Command,name=Control" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="PortalControlPolicy" - proxy-type="attribute">portal:service=ControlPolicy,type=Portal</depends> + <depends optional-attribute-name="PortalControlPolicy" proxy-type="attribute"> + portal:service=ControlPolicy,type=Portal + </depends> </mbean> - <mbean - code="org.jboss.portal.core.aspects.controller.ResourceAcquisitionInterceptor" - name="portal:service=Interceptor,type=Command,name=ResourceAcquisition" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.aspects.controller.ResourceAcquisitionInterceptor" + name="portal:service=Interceptor,type=Command,name=ResourceAcquisition" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.core.controller.ajax.AjaxInterceptor" - name="portal:service=Interceptor,type=Command,name=Ajax" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.controller.ajax.AjaxInterceptor" + name="portal:service=Interceptor,type=Command,name=Ajax" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/>  </mbean> - <mbean - code="org.jboss.portal.core.aspects.controller.NavigationalStateInterceptor" - name="portal:service=Interceptor,type=Command,name=NavigationalState" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.aspects.controller.NavigationalStateInterceptor" + name="portal:service=Interceptor,type=Command,name=NavigationalState" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.core.aspects.controller.node.PortalNodeInterceptor" - name="portal:service=Interceptor,type=Command,name=PortalNode" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.aspects.controller.node.PortalNodeInterceptor" + name="portal:service=Interceptor,type=Command,name=PortalNode" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="PortalAuthorizationManagerFactory" - proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends> + <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute"> + portal:service=PortalAuthorizationManagerFactory + </depends> </mbean> - <mbean - code="org.jboss.portal.core.aspects.controller.PolicyEnforcementInterceptor" - name="portal:service=Interceptor,type=Command,name=PolicyEnforcement" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.aspects.controller.PolicyEnforcementInterceptor" + name="portal:service=Interceptor,type=Command,name=PolicyEnforcement" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.core.aspects.controller.PageCustomizerInterceptor" - name="portal:service=Interceptor,type=Command,name=PageCustomizer" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.aspects.controller.PageCustomizerInterceptor" + name="portal:service=Interceptor,type=Command,name=PageCustomizer" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <attribute name="TargetContextPath">/portal-core</attribute> <attribute name="HeaderPath">/WEB-INF/jsp/header/header.jsp</attribute> <attribute name="TabsPath">/WEB-INF/jsp/header/tabs.jsp</attribute> -  -  - <depends - optional-attribute-name="Config" - proxy-type="attribute">portal:service=ServerConfig</depends> - <depends - optional-attribute-name="PortalAuthorizationManagerFactory" - proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends> - <depends - optional-attribute-name="PortalObjectContainer" - proxy-type="attribute">portal:container=PortalObject</depends> - +  + <depends optional-attribute-name="Config" proxy-type="attribute">portal:service=ServerConfig</depends> + <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute"> + portal:service=PortalAuthorizationManagerFactory + </depends> + <depends optional-attribute-name="PortalObjectContainer" proxy-type="attribute">portal:container=PortalObject + </depends> + </mbean> - <mbean - code="org.jboss.portal.core.aspects.controller.node.EventBroadcasterInterceptor" - name="portal:service=Interceptor,type=Command,name=EventBroadcaster" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.aspects.controller.node.EventBroadcasterInterceptor" + name="portal:service=Interceptor,type=Command,name=EventBroadcaster" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="ListenerRegistry" - proxy-type="attribute">portal:service=ListenerRegistry</depends> + <depends optional-attribute-name="ListenerRegistry" proxy-type="attribute">portal:service=ListenerRegistry + </depends> </mbean> - <mbean - code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" - name="portal:service=InterceptorStackFactory,type=Command" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" + name="portal:service=InterceptorStackFactory,type=Command" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <depends-list optional-attribute-name="InterceptorNames"> <depends-list-element>portal:service=Interceptor,type=Command,name=ResourceAcquisition</depends-list-element> @@ -277,134 +220,106 @@ </mbean>  - <mbean - code="org.jboss.portal.core.model.instance.InstanceSecurityInterceptor" - name="portal:service=Interceptor,type=Portlet,name=InstanceSecurity" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.model.instance.InstanceSecurityInterceptor" + name="portal:service=Interceptor,type=Portlet,name=InstanceSecurity" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends> + <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute"> + portal:service=PortalAuthorizationManagerFactory + </depends> </mbean> - <mbean - code="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor" - name="portal:service=Interceptor,type=Portlet,name=ConsumerCache" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor" + name="portal:service=Interceptor,type=Portlet,name=ConsumerCache" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.portlet.aspects.portlet.PortalSessionSynchronizationInterceptor" - name="portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.aspects.portlet.PortalSessionSynchronizationInterceptor" + name="portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" - name="portal:service=InterceptorStackFactory,type=Instance" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" + name="portal:service=InterceptorStackFactory,type=Instance" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <depends-list optional-attribute-name="InterceptorNames"> <depends-list-element>portal:service=Interceptor,type=Portlet,name=ConsumerCache</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Portlet,name=InstanceSecurity</depends-list-element> - <depends-list-element>portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization</depends-list-element> + <depends-list-element>portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization + </depends-list-element> </depends-list> </mbean>  - <mbean - code="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor" - name="portal:service=Interceptor,type=Portlet,name=Valve" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor" + name="portal:service=Interceptor,type=Portlet,name=Valve" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.portlet.aspects.portlet.ContextTrackerInterceptor" - name="portal:service=Interceptor,type=Portlet,name=ContextTracker" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.aspects.portlet.ContextTrackerInterceptor" + name="portal:service=Interceptor,type=Portlet,name=ContextTracker" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor" - name="portal:service=Interceptor,type=Portlet,name=SecureTransport" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor" + name="portal:service=Interceptor,type=Portlet,name=SecureTransport" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor" - name="portal:service=Interceptor,type=Portlet,name=ContextDispatcher" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor" + name="portal:service=Interceptor,type=Portlet,name=ContextDispatcher" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="ServletContainerFactory" - proxy-type="attribute">portal:service=ServletContainerFactory</depends> + <depends optional-attribute-name="ServletContainerFactory" proxy-type="attribute"> + portal:service=ServletContainerFactory + </depends> </mbean> - <mbean - code="org.jboss.portal.portlet.aspects.portlet.PortletSessionSynchronizationInterceptor" - name="portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.aspects.portlet.PortletSessionSynchronizationInterceptor" + name="portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.portlet.bridge.BridgeInterceptor" - name="portal:service=Interceptor,type=Portlet,name=Bridge" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.bridge.BridgeInterceptor" + name="portal:service=Interceptor,type=Portlet,name=Bridge" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor" - name="portal:service=Interceptor,type=Portlet,name=ProducerCache" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor" + name="portal:service=Interceptor,type=Portlet,name=ProducerCache" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.core.aspects.portlet.TransactionInterceptor" - name="portal:service=Interceptor,type=Portlet,name=Transaction" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.aspects.portlet.TransactionInterceptor" + name="portal:service=Interceptor,type=Portlet,name=Transaction" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.core.aspects.portlet.HeaderInterceptor" - name="portal:service=Interceptor,type=Portlet,name=Header" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.aspects.portlet.HeaderInterceptor" + name="portal:service=Interceptor,type=Portlet,name=Header" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.core.aspects.portlet.AjaxInterceptor" - name="portal:service=Interceptor,type=Portlet,name=Ajax" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.aspects.portlet.AjaxInterceptor" + name="portal:service=Interceptor,type=Portlet,name=Ajax" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.core.aspects.portlet.SignOutInterceptor" - name="portal:service=Interceptor,type=Portlet,name=SignOut" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.aspects.portlet.SignOutInterceptor" + name="portal:service=Interceptor,type=Portlet,name=SignOut" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" - name="portal:service=InterceptorStackFactory,type=Producer" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" + name="portal:service=InterceptorStackFactory,type=Producer" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <depends-list optional-attribute-name="InterceptorNames"> <depends-list-element>portal:service=Interceptor,type=Portlet,name=Valve</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Portlet,name=SecureTransport</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextDispatcher</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextTracker</depends-list-element> - <depends-list-element>portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization</depends-list-element> + <depends-list-element>portal:service=Interceptor,type=Portlet,name=PortletSessionSynchronization + </depends-list-element> <depends-list-element>portal:service=Interceptor,type=Portlet,name=Bridge</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Portlet,name=Ajax</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Portlet,name=SignOut</depends-list-element> @@ -415,35 +330,22 @@ </mbean>  - <mbean - code="org.jboss.portal.theme.impl.ThemeServiceImpl" - name="portal:service=ThemeService" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.theme.impl.ThemeServiceImpl" name="portal:service=ThemeService" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <attribute name="DefaultThemeName">renaissance</attribute> </mbean> - <mbean - code="org.jboss.portal.theme.impl.LayoutServiceImpl" - name="portal:service=LayoutService" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.theme.impl.LayoutServiceImpl" name="portal:service=LayoutService" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <attribute name="DefaultLayoutName">generic</attribute> <attribute name="DefaultRenderSetName">divRenderer</attribute> </mbean> - <mbean - code="org.jboss.portal.theme.impl.PageServiceImpl" - name="portal:service=PageService" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.theme.impl.PageServiceImpl" name="portal:service=PageService" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="LayoutService" - proxy-type="attribute">portal:service=LayoutService</depends> - <depends - optional-attribute-name="ThemeService" - proxy-type="attribute">portal:service=ThemeService</depends> + <depends optional-attribute-name="LayoutService" proxy-type="attribute">portal:service=LayoutService</depends> + <depends optional-attribute-name="ThemeService" proxy-type="attribute">portal:service=ThemeService</depends> </mbean>   - <mbean - code="org.jboss.portal.jems.hibernate.SessionFactoryBinder" - name="portal:service=Hibernate" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.jems.hibernate.SessionFactoryBinder" name="portal:service=Hibernate" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>  - <mbean - code="org.jboss.portal.identity.service.IdentityEventManagerService" - name="portal:service=IdentityEventManager" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.identity.service.IdentityEventManagerService" + name="portal:service=IdentityEventManager" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.core.identity.service.IdentityServiceControllerImpl" - name="portal:service=Module,type=IdentityServiceController" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.identity.service.IdentityServiceControllerImpl" + name="portal:service=Module,type=IdentityServiceController" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <depends>portal:service=Hibernate</depends> - <depends - optional-attribute-name="IdentityEventBroadcaster" - proxy-type="attribute">portal:service=IdentityEventManager</depends> + <depends optional-attribute-name="IdentityEventBroadcaster" proxy-type="attribute"> + portal:service=IdentityEventManager + </depends> <attribute name="JndiName">java:/portal/IdentityServiceController</attribute> <attribute name="RegisterMBeans">true</attribute> <attribute name="ConfigFile">conf/identity/identity-config.xml</attribute> <attribute name="DefaultConfigFile">conf/identity/standardidentity-config.xml</attribute> </mbean> - <mbean - code="org.jboss.portal.core.impl.mail.MailModuleImpl" - name="portal:service=Module,type=Mail" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.impl.mail.MailModuleImpl" name="portal:service=Module,type=Mail" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <depends>jboss:service=Mail</depends> <depends>portal:service=Module,type=IdentityServiceController</depends> @@ -641,20 +524,16 @@ <attribute name="JNDIName">java:portal/MailModule</attribute> </mbean> - <mbean - code="org.jboss.security.auth.login.DynamicLoginConfig" - name="portal:service=JAASLoginModule"> + <mbean code="org.jboss.security.auth.login.DynamicLoginConfig" name="portal:service=JAASLoginModule"> <depends optional-attribute-name="LoginConfigService">jboss.security:service=XMLLoginConfig</depends> <depends optional-attribute-name="SecurityManagerService">jboss.security:service=JaasSecurityManager</depends> <attribute name="AuthConfig">conf/login-config.xml</attribute> </mbean>  - <mbean - code="org.jboss.portal.core.identity.UsersActivityStatsServiceImpl" - name="portal:service=Module,type=UsersActivityStatsService" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.identity.UsersActivityStatsServiceImpl" + name="portal:service=Module,type=UsersActivityStatsService" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/>   - +  - +  - <mbean - code="org.jboss.portal.core.event.PortalEventListenerRegistryImpl" - name="portal:service=ListenerRegistry" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.event.PortalEventListenerRegistryImpl" name="portal:service=ListenerRegistry" + xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean>  - <mbean - code="org.jboss.portal.core.impl.model.instance.persistent.PersistentInstanceContainerContext" - name="portal:service=InstanceContainerContext" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.impl.model.instance.persistent.PersistentInstanceContainerContext" + name="portal:service=InstanceContainerContext" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <depends>portal:service=Hibernate,type=Instance</depends> <attribute name="SessionFactoryJNDIName">java:/portal/InstanceSessionFactory</attribute> <attribute name="CacheNaturalId">true</attribute> </mbean> - <mbean - code="org.jboss.portal.core.impl.model.instance.InstanceContainerImpl" - name="portal:container=Instance" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.impl.model.instance.InstanceContainerImpl" name="portal:container=Instance" + xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="ContainerContext" - proxy-type="attribute">portal:service=InstanceContainerContext</depends> - <depends - optional-attribute-name="StackFactory" - proxy-type="attribute">portal:service=InterceptorStackFactory,type=Instance</depends> - <depends - optional-attribute-name="PortletInvoker" - proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends> - <depends - optional-attribute-name="PortalAuthorizationManagerFactory" - proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends> - <depends - optional-attribute-name="AuthorizationDomainRegistry" - proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends> + <depends optional-attribute-name="ContainerContext" proxy-type="attribute">portal:service=InstanceContainerContext + </depends> + <depends optional-attribute-name="StackFactory" proxy-type="attribute"> + portal:service=InterceptorStackFactory,type=Instance + </depends> + <depends optional-attribute-name="PortletInvoker" proxy-type="attribute"> + portal:service=PortletInvoker,type=Federating + </depends> + <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute"> + portal:service=PortalAuthorizationManagerFactory + </depends> + <depends optional-attribute-name="AuthorizationDomainRegistry" proxy-type="attribute"> + portal:service=AuthorizationDomainRegistry + </depends> </mbean> - <mbean - code="org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer" - name="portal:container=PortalObject" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer" + name="portal:container=PortalObject" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <depends>portal:service=Hibernate,type=PortalObject</depends> - <depends - optional-attribute-name="PortalAuthorizationManagerFactory" - proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends> - <depends - optional-attribute-name="AuthorizationDomainRegistry" - proxy-type="attribute">portal:service=AuthorizationDomainRegistry</depends> - <depends - optional-attribute-name="ContentProviderRegistry" - proxy-type="attribute">portal:service=ContentProviderRegistry</depends> + <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute"> + portal:service=PortalAuthorizationManagerFactory + </depends> + <depends optional-attribute-name="AuthorizationDomainRegistry" proxy-type="attribute"> + portal:service=AuthorizationDomainRegistry + </depends> + <depends optional-attribute-name="ContentProviderRegistry" proxy-type="attribute"> + portal:service=ContentProviderRegistry + </depends> <attribute name="SessionFactoryJNDIName">java:/portal/PortalObjectSessionFactory</attribute> <attribute name="CacheNaturalId">true</attribute> </mbean>  - <mbean - code="org.jboss.portal.core.impl.model.CustomizationManagerService" - name="portal:service=CustomizationManager" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.impl.model.CustomizationManagerService" name="portal:service=CustomizationManager" + xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="PortalAuthorizationManagerFactory" - proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends> - <depends - optional-attribute-name="InstanceContainer" - proxy-type="attribute">portal:container=Instance</depends> - <depends - optional-attribute-name="PortalObjectContainer" - proxy-type="attribute">portal:container=PortalObject</depends> + <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute"> + portal:service=PortalAuthorizationManagerFactory + </depends> + <depends optional-attribute-name="InstanceContainer" proxy-type="attribute">portal:container=Instance</depends> + <depends optional-attribute-name="PortalObjectContainer" proxy-type="attribute">portal:container=PortalObject + </depends> <depends>portal:service=Module,type=IdentityServiceController</depends> <attribute name="DashboardContextId">dashboard</attribute> </mbean>  - <mbean - code="org.jboss.portal.core.impl.model.content.ContentProviderRegistryService" - name="portal:service=ContentProviderRegistry" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.impl.model.content.ContentProviderRegistryService" + name="portal:service=ContentProviderRegistry" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.core.impl.model.content.portlet.InternalPortletContentProvider" - name="portal:service=ContentRenderer,type=portlet" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.impl.model.content.portlet.InternalPortletContentProvider" + name="portal:service=ContentRenderer,type=portlet" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <attribute name="ContentType">portlet</attribute> - <depends - optional-attribute-name="Registry" - proxy-type="attribute">portal:service=ContentProviderRegistry</depends> - <depends - optional-attribute-name="CustomizationManager" - proxy-type="attribute">portal:service=CustomizationManager</depends> - <depends - optional-attribute-name="InstanceContainer" - proxy-type="attribute">portal:container=Instance</depends> - <depends - optional-attribute-name="PortalAuthorizationManagerFactory" - proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends> + <depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=ContentProviderRegistry + </depends> + <depends optional-attribute-name="CustomizationManager" proxy-type="attribute">portal:service=CustomizationManager + </depends> + <depends optional-attribute-name="InstanceContainer" proxy-type="attribute">portal:container=Instance</depends> + <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute"> + portal:service=PortalAuthorizationManagerFactory + </depends> </mbean>  - <mbean - code="org.jboss.portal.core.identity.DashboardBridge" - name="portal:service=IdentityDashboardBridge" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.identity.DashboardBridge" name="portal:service=IdentityDashboardBridge" + xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="IdentityEventEmitter" - proxy-type="attribute">portal:service=IdentityEventManager</depends> - <depends - optional-attribute-name="CustomizationManager" - proxy-type="attribute">portal:service=CustomizationManager</depends> + <depends optional-attribute-name="IdentityEventEmitter" proxy-type="attribute">portal:service=IdentityEventManager + </depends> + <depends optional-attribute-name="CustomizationManager" proxy-type="attribute">portal:service=CustomizationManager + </depends> </mbean> - <mbean - code="org.jboss.portal.core.identity.SecurityBridge" - name="portal:service=IdentitySecurityBridge" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.identity.SecurityBridge" name="portal:service=IdentitySecurityBridge" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="IdentityEventEmitter" - proxy-type="attribute">portal:service=IdentityEventManager</depends> - <depends - optional-attribute-name="DynamicLoginConfig" - proxy-type="attribute">portal:service=JAASLoginModule</depends> + <depends optional-attribute-name="IdentityEventEmitter" proxy-type="attribute">portal:service=IdentityEventManager + </depends> + <depends optional-attribute-name="DynamicLoginConfig" proxy-type="attribute">portal:service=JAASLoginModule + </depends> </mbean>  - <mbean - code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService" - name="portal:commandFactory=Delegating" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService" + name="portal:commandFactory=Delegating" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.core.model.portal.DefaultPortalCommandFactory" - name="portal:commandFactory=DefaultPortal" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.model.portal.DefaultPortalCommandFactory" + name="portal:commandFactory=DefaultPortal" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="NextFactory" - proxy-type="attribute">portal:commandFactory=Delegating</depends> - <depends - optional-attribute-name="Container" - proxy-type="attribute">portal:container=PortalObject</depends> + <depends optional-attribute-name="NextFactory" proxy-type="attribute">portal:commandFactory=Delegating</depends> + <depends optional-attribute-name="Container" proxy-type="attribute">portal:container=PortalObject</depends> </mbean> - <mbean - code="org.jboss.portal.core.model.portal.command.mapping.DefaultPortalObjectPathMapper" - name="portal:service=PortalObjectPathMapper,type=Default" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.model.portal.command.mapping.DefaultPortalObjectPathMapper" + name="portal:service=PortalObjectPathMapper,type=Default" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="Container" - proxy-type="attribute">portal:container=PortalObject</depends> + <depends optional-attribute-name="Container" proxy-type="attribute">portal:container=PortalObject</depends> <attribute name="Namespace"><![CDATA[]]></attribute> </mbean> - <mbean - code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory" - name="portal:commandFactory=PortalObject" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory" name="portal:commandFactory=PortalObject" + xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="Mapper" - proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Default</depends> + <depends optional-attribute-name="Mapper" proxy-type="attribute"> + portal:service=PortalObjectPathMapper,type=Default + </depends> </mbean> - <mbean - code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate" - name="portal:commandFactory=Delegate,path=portal" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate" + name="portal:commandFactory=Delegate,path=portal" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <attribute name="Path">/portal</attribute> - <depends - optional-attribute-name="DelegatingFactory" - proxy-type="attribute">portal:commandFactory=Delegating</depends> - <depends - optional-attribute-name="DelegateFactory" - proxy-type="attribute">portal:commandFactory=PortalObject</depends> + <depends optional-attribute-name="DelegatingFactory" proxy-type="attribute">portal:commandFactory=Delegating + </depends> + <depends optional-attribute-name="DelegateFactory" proxy-type="attribute">portal:commandFactory=PortalObject + </depends> </mbean> - <mbean - code="org.jboss.portal.core.controller.command.mapper.SignOutCommandFactoryService" - name="portal:commandFactory=SignOut" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.controller.command.mapper.SignOutCommandFactoryService" + name="portal:commandFactory=SignOut" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate" - name="portal:commandFactory=Delegate,path=signout" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate" + name="portal:commandFactory=Delegate,path=signout" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <attribute name="Path">/signout</attribute> - <depends - optional-attribute-name="DelegatingFactory" - proxy-type="attribute">portal:commandFactory=Delegating</depends> - <depends - optional-attribute-name="DelegateFactory" - proxy-type="attribute">portal:commandFactory=SignOut</depends> + <depends optional-attribute-name="DelegatingFactory" proxy-type="attribute">portal:commandFactory=Delegating + </depends> + <depends optional-attribute-name="DelegateFactory" proxy-type="attribute">portal:commandFactory=SignOut</depends> </mbean> - <mbean - code="org.jboss.portal.core.model.portal.command.mapping.DashboardPortalObjectPathMapper" - name="portal:service=PortalObjectPathMapper,type=Dashboard" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.model.portal.command.mapping.DashboardPortalObjectPathMapper" + name="portal:service=PortalObjectPathMapper,type=Dashboard" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="CustomizationManager" - proxy-type="attribute">portal:service=CustomizationManager</depends> - <depends - optional-attribute-name="Container" - proxy-type="attribute">portal:container=PortalObject</depends> + <depends optional-attribute-name="CustomizationManager" proxy-type="attribute">portal:service=CustomizationManager + </depends> + <depends optional-attribute-name="Container" proxy-type="attribute">portal:container=PortalObject</depends> </mbean> - <mbean - code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory" - name="portal:commandFactory=Dashboard" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.model.portal.PortalObjectCommandFactory" name="portal:commandFactory=Dashboard" + xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="Mapper" - proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Dashboard</depends> + <depends optional-attribute-name="Mapper" proxy-type="attribute"> + portal:service=PortalObjectPathMapper,type=Dashboard + </depends> </mbean> - <mbean - code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate" - name="portal:commandFactory=Delegate,path=dashboard" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate" + name="portal:commandFactory=Delegate,path=dashboard" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <attribute name="Path">/dashboard</attribute> - <depends - optional-attribute-name="DelegatingFactory" - proxy-type="attribute">portal:commandFactory=Delegating</depends> - <depends - optional-attribute-name="DelegateFactory" - proxy-type="attribute">portal:commandFactory=Dashboard</depends> + <depends optional-attribute-name="DelegatingFactory" proxy-type="attribute">portal:commandFactory=Delegating + </depends> + <depends optional-attribute-name="DelegateFactory" proxy-type="attribute">portal:commandFactory=Dashboard + </depends> </mbean> - <mbean - code="org.jboss.portal.core.controller.ajax.AjaxCommandFactory" - name="portal:commandFactory=Ajax" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.controller.ajax.AjaxCommandFactory" name="portal:commandFactory=Ajax" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate" - name="portal:commandFactory=Delegate,path=ajax" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate" + name="portal:commandFactory=Delegate,path=ajax" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <attribute name="Path">/ajax</attribute> - <depends - optional-attribute-name="DelegatingFactory" - proxy-type="attribute">portal:commandFactory=Delegating</depends> - <depends - optional-attribute-name="DelegateFactory" - proxy-type="attribute">portal:commandFactory=Ajax</depends> + <depends optional-attribute-name="DelegatingFactory" proxy-type="attribute">portal:commandFactory=Delegating + </depends> + <depends optional-attribute-name="DelegateFactory" proxy-type="attribute">portal:commandFactory=Ajax</depends> </mbean>  - <mbean - code="org.jboss.portal.core.controller.command.mapper.DelegatingURLFactoryService" - name="portal:urlFactory=Delegating" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.controller.command.mapper.DelegatingURLFactoryService" + name="portal:urlFactory=Delegating" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.core.model.portal.PortalObjectURLFactory" - name="portal:urlFactory=PortalObject,type=Default" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.model.portal.PortalObjectURLFactory" + name="portal:urlFactory=PortalObject,type=Default" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <attribute name="Namespace"><![CDATA[]]></attribute> <attribute name="Path">/portal</attribute> - <depends - optional-attribute-name="Factory" - proxy-type="attribute">portal:urlFactory=Delegating</depends> - <depends - optional-attribute-name="Mapper" - proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Default</depends> + <depends optional-attribute-name="Factory" proxy-type="attribute">portal:urlFactory=Delegating</depends> + <depends optional-attribute-name="Mapper" proxy-type="attribute"> + portal:service=PortalObjectPathMapper,type=Default + </depends> </mbean> - <mbean - code="org.jboss.portal.core.controller.command.mapper.SignOutURLFactory" - name="portal:urlFactory=SignOut" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.controller.command.mapper.SignOutURLFactory" name="portal:urlFactory=SignOut" + xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <attribute name="Path">/signout</attribute> - <depends - optional-attribute-name="Factory" - proxy-type="attribute">portal:urlFactory=Delegating</depends> + <depends optional-attribute-name="Factory" proxy-type="attribute">portal:urlFactory=Delegating</depends> </mbean> - <mbean - code="org.jboss.portal.core.model.portal.PortalObjectURLFactory" - name="portal:urlFactory=PortalObject,type=Dashboard" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.model.portal.PortalObjectURLFactory" + name="portal:urlFactory=PortalObject,type=Dashboard" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <attribute name="Namespace">dashboard</attribute> <attribute name="Path">/dashboard</attribute> - <depends - optional-attribute-name="Factory" - proxy-type="attribute">portal:urlFactory=Delegating</depends> - <depends - optional-attribute-name="Mapper" - proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Dashboard</depends> + <depends optional-attribute-name="Factory" proxy-type="attribute">portal:urlFactory=Delegating</depends> + <depends optional-attribute-name="Mapper" proxy-type="attribute"> + portal:service=PortalObjectPathMapper,type=Dashboard + </depends> </mbean>  - <mbean - code="org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService" - name="portal:service=PortletInvoker,type=Federating" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService" + name="portal:service=PortletInvoker,type=Federating" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean>  - <mbean - code="org.jboss.portal.portlet.container.PortletContainerInvoker" - name="portal:service=PortletInvoker,type=Container" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.container.PortletContainerInvoker" + name="portal:service=PortletInvoker,type=Container" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="StackFactory" - proxy-type="attribute">portal:service=InterceptorStackFactory,type=Producer</depends> + <depends optional-attribute-name="StackFactory" proxy-type="attribute"> + portal:service=InterceptorStackFactory,type=Producer + </depends> </mbean>  - <mbean - code="org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager" - name="portal:service=PersistenceManager,type=Producer" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager" + name="portal:service=PersistenceManager,type=Producer" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <depends>portal:service=Hibernate,type=Portlet</depends> <attribute name="SessionFactoryJNDIName">java:/portal/PortletSessionFactory</attribute> </mbean> - <mbean - code="org.jboss.portal.portlet.impl.state.StateManagementPolicyService" - name="portal:service=StateManagementPolicy,type=Producer" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.impl.state.StateManagementPolicyService" + name="portal:service=StateManagementPolicy,type=Producer" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <attribute name="PersistLocally">true</attribute> </mbean> - <mbean - code="org.jboss.portal.portlet.impl.state.StateConverterV0" - name="portal:service=StateConverter,type=Producer" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.impl.state.StateConverterV0" name="portal:service=StateConverter,type=Producer" + xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> - <mbean - code="org.jboss.portal.portlet.deployment.CorePortletInvoker" - name="portal:service=PortletInvoker,type=Core" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.impl.portlet.state.ProducerPortletInvoker" + name="portal:service=PortletInvoker,type=Producer" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="PortletInvoker" - proxy-type="attribute">portal:service=PortletInvoker,type=Container</depends> + <depends optional-attribute-name="PortletInvoker" proxy-type="attribute"> + portal:service=PortletInvoker,type=Container + </depends> + <depends optional-attribute-name="PersistenceManager" proxy-type="attribute"> + portal:service=PersistenceManager,type=Producer + </depends> + <depends optional-attribute-name="StateManagementPolicy" proxy-type="attribute"> + portal:service=StateManagementPolicy,type=Producer + </depends> + <depends optional-attribute-name="StateConverter" proxy-type="attribute"> + portal:service=StateConverter,type=Producer + </depends> </mbean> - <mbean - code="org.jboss.portal.core.impl.portlet.state.ProducerPortletInvoker" - name="portal:service=PortletInvoker,type=Producer" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> - <depends - optional-attribute-name="PortletInvoker" - proxy-type="attribute">portal:service=PortletInvoker,type=Core</depends> - <depends - optional-attribute-name="PersistenceManager" - proxy-type="attribute">portal:service=PersistenceManager,type=Producer</depends> - <depends - optional-attribute-name="StateManagementPolicy" - proxy-type="attribute">portal:service=StateManagementPolicy,type=Producer</depends> - <depends - optional-attribute-name="StateConverter" - proxy-type="attribute">portal:service=StateConverter,type=Producer</depends> - </mbean>  - <mbean - code="org.jboss.portal.portlet.federation.impl.PortletInvokerRegistrationService" - name="portal:service=PortletInvokerRegistration,id=local" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.portlet.federation.impl.PortletInvokerRegistrationService" + name="portal:service=PortletInvokerRegistration,id=local" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <attribute name="Id">local</attribute> - <depends - optional-attribute-name="PortletInvoker" - proxy-type="attribute">portal:service=PortletInvoker,type=Producer</depends> - <depends - optional-attribute-name="FederatingPortletInvoker" - proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends> + <depends optional-attribute-name="PortletInvoker" proxy-type="attribute"> + portal:service=PortletInvoker,type=Producer + </depends> + <depends optional-attribute-name="FederatingPortletInvoker" proxy-type="attribute"> + portal:service=PortletInvoker,type=Federating + </depends> </mbean>  - <mbean - code="org.jboss.portal.core.controller.classic.ClassicResponseHandler" - name="portal:service=ResponseHandler,type=Classic" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.controller.classic.ClassicResponseHandler" + name="portal:service=ResponseHandler,type=Classic" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean>  - <mbean - code="org.jboss.portal.core.controller.ajax.AjaxResponseHandler" - name="portal:service=ResponseHandler,type=Ajax" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.controller.ajax.AjaxResponseHandler" + name="portal:service=ResponseHandler,type=Ajax" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="PageService" - proxy-type="attribute">portal:service=PageService</depends> - <depends - optional-attribute-name="PortalObjectContainer" - proxy-type="attribute">portal:container=PortalObject</depends> + <depends optional-attribute-name="PageService" proxy-type="attribute">portal:service=PageService</depends> + <depends optional-attribute-name="PortalObjectContainer" proxy-type="attribute">portal:container=PortalObject + </depends> </mbean>  - <mbean - code="org.jboss.portal.core.controller.handler.ResponseHandlerSelector" - name="portal:service=ResponseHandler,type=Selector" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.controller.handler.ResponseHandlerSelector" + name="portal:service=ResponseHandler,type=Selector" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="ClassicResponseHandler" - proxy-type="attribute">portal:service=ResponseHandler,type=Classic</depends> - <depends - optional-attribute-name="AjaxResponseHandler" - proxy-type="attribute">portal:service=ResponseHandler,type=Ajax</depends> + <depends optional-attribute-name="ClassicResponseHandler" proxy-type="attribute"> + portal:service=ResponseHandler,type=Classic + </depends> + <depends optional-attribute-name="AjaxResponseHandler" proxy-type="attribute"> + portal:service=ResponseHandler,type=Ajax + </depends> </mbean>  - <mbean - code="org.jboss.portal.core.model.portal.control.page.DefaultPageControlPolicy" - name="portal:service=ControlPolicy,type=Page" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.model.portal.control.page.DefaultPageControlPolicy" + name="portal:service=ControlPolicy,type=Page" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="PortalObjectContainer" - proxy-type="attribute">portal:container=PortalObject</depends> + <depends optional-attribute-name="PortalObjectContainer" proxy-type="attribute">portal:container=PortalObject + </depends> </mbean> - <mbean - code="org.jboss.portal.core.model.portal.control.portal.DefaultPortalControlPolicy" - name="portal:service=ControlPolicy,type=Portal" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.model.portal.control.portal.DefaultPortalControlPolicy" + name="portal:service=ControlPolicy,type=Portal" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="PortalObjectContainer" - proxy-type="attribute">portal:container=PortalObject</depends> + <depends optional-attribute-name="PortalObjectContainer" proxy-type="attribute">portal:container=PortalObject + </depends> </mbean>  - <mbean - code="org.jboss.portal.core.controller.Controller" - name="portal:service=Controller" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.controller.Controller" name="portal:service=Controller" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="PageService" - proxy-type="attribute">portal:service=PageService</depends> - <depends - optional-attribute-name="CommandFactory" - proxy-type="attribute">portal:commandFactory=DefaultPortal</depends> - <depends - optional-attribute-name="URLFactory" - proxy-type="attribute">portal:urlFactory=Delegating</depends> - <depends - optional-attribute-name="StackFactory" - proxy-type="attribute">portal:service=InterceptorStackFactory,type=Command</depends> - <depends - optional-attribute-name="PortalObjectContainer" - proxy-type="attribute">portal:container=PortalObject</depends> - <depends - optional-attribute-name="InstanceContainer" - proxy-type="attribute">portal:container=Instance</depends> - <depends - optional-attribute-name="PortalAuthorizationManagerFactory" - proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends> - <depends - optional-attribute-name="CustomizationManager" - proxy-type="attribute">portal:service=CustomizationManager</depends> - <depends - optional-attribute-name="ContentRendererRegistry" - proxy-type="attribute">portal:service=ContentProviderRegistry</depends> - <depends - optional-attribute-name="ResponseHandler" - proxy-type="attribute">portal:service=ResponseHandler,type=Selector</depends> - <depends - optional-attribute-name="PageControlPolicy" - proxy-type="attribute">portal:service=ControlPolicy,type=Page</depends> + <depends optional-attribute-name="PageService" proxy-type="attribute">portal:service=PageService</depends> + <depends optional-attribute-name="CommandFactory" proxy-type="attribute">portal:commandFactory=DefaultPortal + </depends> + <depends optional-attribute-name="URLFactory" proxy-type="attribute">portal:urlFactory=Delegating</depends> + <depends optional-attribute-name="StackFactory" proxy-type="attribute"> + portal:service=InterceptorStackFactory,type=Command + </depends> + <depends optional-attribute-name="PortalObjectContainer" proxy-type="attribute">portal:container=PortalObject + </depends> + <depends optional-attribute-name="InstanceContainer" proxy-type="attribute">portal:container=Instance</depends> + <depends optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute"> + portal:service=PortalAuthorizationManagerFactory + </depends> + <depends optional-attribute-name="CustomizationManager" proxy-type="attribute">portal:service=CustomizationManager + </depends> + <depends optional-attribute-name="ContentRendererRegistry" proxy-type="attribute"> + portal:service=ContentProviderRegistry + </depends> + <depends optional-attribute-name="ResponseHandler" proxy-type="attribute"> + portal:service=ResponseHandler,type=Selector + </depends> + <depends optional-attribute-name="PageControlPolicy" proxy-type="attribute">portal:service=ControlPolicy,type=Page + </depends> </mbean>  - <mbean - code="org.jboss.portal.server.impl.RequestControllerFactoryImpl" - name="portal:service=ControllerFactory" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.server.impl.RequestControllerFactoryImpl" name="portal:service=ControllerFactory" + xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="Controller" - proxy-type="attribute">portal:service=Controller</depends> + <depends optional-attribute-name="Controller" proxy-type="attribute">portal:service=Controller</depends> </mbean>  - <mbean - code="org.jboss.portal.server.impl.ServerImpl" - name="portal:service=Server" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.server.impl.ServerImpl" name="portal:service=Server" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="Config" - proxy-type="attribute">portal:service=ServerConfig</depends> - <depends - optional-attribute-name="ServletContainerFactory" - proxy-type="attribute">portal:service=ServletContainerFactory</depends> + <depends optional-attribute-name="Config" proxy-type="attribute">portal:service=ServerConfig</depends> + <depends optional-attribute-name="ServletContainerFactory" proxy-type="attribute"> + portal:service=ServletContainerFactory + </depends> </mbean>  - <mbean - code="org.jboss.portal.server.deployment.jboss.ServerDeployer" - name="portal:deployer=PortalWebApp"> + <mbean code="org.jboss.portal.server.deployment.jboss.ServerDeployer" name="portal:deployer=PortalWebApp"> <depends>jboss.system:service=MainDeployer</depends> <depends>portal:container=PortalObject</depends> <depends>portal:container=Instance</depends> - <depends - optional-attribute-name="PortalServer" - proxy-type="attribute">portal:service=Server</depends> + <depends optional-attribute-name="PortalServer" proxy-type="attribute">portal:service=Server</depends> </mbean> -  -  - <mbean - code="org.jboss.portal.core.deployment.jboss.ObjectDeploymentFactory" - name="portal:deploymentFactory=Object" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.deployment.jboss.ObjectDeploymentFactory" name="portal:deploymentFactory=Object" + xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="Deployer" - proxy-type="attribute">portal:deployer=PortalWebApp</depends> - <depends - optional-attribute-name="PortalObjectContainer" - proxy-type="attribute">portal:container=PortalObject</depends> - <depends - optional-attribute-name="ContentProviderRegistry" - proxy-type="attribute">portal:service=ContentProviderRegistry</depends> - <depends - optional-attribute-name="PortalObjectEntityResolver" - proxy-type="attribute">portal:service=EntityResolver</depends> + <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends> + <depends optional-attribute-name="PortalObjectContainer" proxy-type="attribute">portal:container=PortalObject + </depends> + <depends optional-attribute-name="ContentProviderRegistry" proxy-type="attribute"> + portal:service=ContentProviderRegistry + </depends> + <depends optional-attribute-name="PortalObjectEntityResolver" proxy-type="attribute">portal:service=EntityResolver + </depends> <attribute name="SetupLocation">conf/data/default-object.xml</attribute>  <attribute name="RegistrationControlledByService">@portal.single@</attribute> </mbean> - <mbean - code="org.jboss.portal.core.impl.portlet.info.CoreInfoBuilderFactory" - name="portal:service=InfoBuilderFactory,type=Core" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.impl.portlet.info.CoreInfoBuilderFactory" + name="portal:service=InfoBuilderFactory,type=Core" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> -  -  - <mbean - code="org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory" - name="portal:deploymentFactory=PortletApp" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory" + name="portal:deploymentFactory=PortletApp" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/>  <depends>portal:service=PortletInvokerRegistration,id=local</depends> - <depends - optional-attribute-name="Deployer" - proxy-type="attribute">portal:deployer=PortalWebApp</depends> - - <depends - optional-attribute-name="CoreInfoBuilderFactory" - proxy-type="attribute">portal:service=InfoBuilderFactory,type=Core</depends> - <depends - optional-attribute-name="PortletContainerInvoker" - proxy-type="attribute">portal:service=PortletInvoker,type=Container</depends> - <depends - optional-attribute-name="CorePortletInvoker" - proxy-type="attribute">portal:service=PortletInvoker,type=Core</depends> - <depends - optional-attribute-name="Config" - proxy-type="attribute">portal:service=ServerConfig</depends> - <depends - optional-attribute-name="PortletSecurityService" - proxy-type="attribute">portal:service=PortletSecurityService</depends> - <depends - optional-attribute-name="InstanceContainer" - proxy-type="attribute">portal:container=Instance</depends> - <depends - optional-attribute-name="JBossPortletEntityResolver" - proxy-type="attribute">portal:service=EntityResolver</depends> - <depends - optional-attribute-name="PortalObjectEntityResolver" - proxy-type="attribute">portal:service=EntityResolver</depends> - <depends - optional-attribute-name="PortletInstancesEntityResolver" - proxy-type="attribute">portal:service=EntityResolver</depends> + <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends> + <depends optional-attribute-name="CoreInfoBuilderFactory" proxy-type="attribute"> + portal:service=InfoBuilderFactory,type=Core + </depends> + <depends optional-attribute-name="PortletContainerInvoker" proxy-type="attribute"> + portal:service=PortletInvoker,type=Container + </depends> + <depends optional-attribute-name="Config" proxy-type="attribute">portal:service=ServerConfig</depends> + <depends optional-attribute-name="PortletSecurityService" proxy-type="attribute"> + portal:service=PortletSecurityService + </depends> + <depends optional-attribute-name="InstanceContainer" proxy-type="attribute">portal:container=Instance</depends> + <depends optional-attribute-name="JBossPortletEntityResolver" proxy-type="attribute">portal:service=EntityResolver + </depends> + <depends optional-attribute-name="PortalObjectEntityResolver" proxy-type="attribute">portal:service=EntityResolver + </depends> + <depends optional-attribute-name="PortletInstancesEntityResolver" proxy-type="attribute"> + portal:service=EntityResolver + </depends> <attribute name="StandardJBossApplicationMetaDataLocation">conf/standardjboss-portlet.xml</attribute>  <attribute name="CreateInstances">@portal.single@</attribute> </mbean> - <mbean - code="org.jboss.portal.theme.deployment.jboss.LayoutDeploymentFactory" - name="portal:deploymentFactory=Layout" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.theme.deployment.jboss.LayoutDeploymentFactory" name="portal:deploymentFactory=Layout" + xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="Deployer" - proxy-type="attribute">portal:deployer=PortalWebApp</depends> - <depends - optional-attribute-name="LayoutService" - proxy-type="attribute">portal:service=LayoutService</depends> + <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends> + <depends optional-attribute-name="LayoutService" proxy-type="attribute">portal:service=LayoutService</depends> </mbean> - <mbean - code="org.jboss.portal.theme.deployment.jboss.LayoutFeaturesDeploymentFactory" - name="portal:deploymentFactory=LayoutFeatures" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.theme.deployment.jboss.LayoutFeaturesDeploymentFactory" + name="portal:deploymentFactory=LayoutFeatures" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="Deployer" - proxy-type="attribute">portal:deployer=PortalWebApp</depends> - <depends - optional-attribute-name="LayoutService" - proxy-type="attribute">portal:service=LayoutService</depends> + <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends> + <depends optional-attribute-name="LayoutService" proxy-type="attribute">portal:service=LayoutService</depends> </mbean> - <mbean - code="org.jboss.portal.theme.deployment.jboss.ThemeDeploymentFactory" - name="portal:deploymentFactory=Theme" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.theme.deployment.jboss.ThemeDeploymentFactory" name="portal:deploymentFactory=Theme" + xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="Deployer" - proxy-type="attribute">portal:deployer=PortalWebApp</depends> - <depends - optional-attribute-name="ThemeService" - proxy-type="attribute">portal:service=ThemeService</depends> + <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends> + <depends optional-attribute-name="ThemeService" proxy-type="attribute">portal:service=ThemeService</depends> </mbean> - <mbean - code="org.jboss.portal.server.deployment.WebAppAdapter" - name="portal:deployer=Adapter" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.server.deployment.WebAppAdapter" name="portal:deployer=Adapter" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends - optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends> - <depends - optional-attribute-name="Deployer" - proxy-type="attribute">portal:deployer=PortalWebApp</depends> - <depends - optional-attribute-name="JBossAppEntityResolver" - proxy-type="attribute">portal:service=EntityResolver</depends> + <depends optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends> + <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends> + <depends optional-attribute-name="JBossAppEntityResolver" proxy-type="attribute">portal:service=EntityResolver + </depends> </mbean> </server> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-03-13 09:44:13 UTC (rev 10280) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-03-13 23:22:28 UTC (rev 10281) @@ -1,9 +1,9 @@ <%@ page import="org.jboss.portal.common.util.IteratorStatus" %> <%@ page import="org.jboss.portal.core.model.instance.Instance" %> -<%@ page import="org.jboss.portal.portlet.Portlet" %> -<%@ page import="org.jboss.portal.portlet.PortletInvokerException" %> -<%@ page import="org.jboss.portal.portlet.info.MetaInfo" %> -<%@ page import="java.util.Collection" %> +<%@ page import="org.jboss.portal.core.portlet.info.CorePortletInfo" %> +<%@ page import="org.jboss.portal.core.portlet.info.PortletIconInfo" %> +<%@ page import="org.jboss.portal.core.portlet.info.PortletInfoInfo" %> +<%@ page import="org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet" %> <%@ page language="java" %> <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> @@ -11,11 +11,11 @@ Collection instances = (Collection)request.getAttribute("INSTANCES"); Instance selectedInstance = (Instance)request.getAttribute("SELECTED_INSTANCE"); %> -<%@page import="org.jboss.portal.portlet.info.PortletInfo"%> -<%@page import="org.jboss.portal.core.portlet.info.CorePortletInfo"%> -<%@page import="org.jboss.portal.core.portlet.info.PortletInfoInfo"%> -<%@page import="org.jboss.portal.core.portlet.info.PortletIconInfo"%> -<%@page import="org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet"%> +<%@page import="org.jboss.portal.portlet.Portlet" %> +<%@page import="org.jboss.portal.portlet.PortletInvokerException" %> +<%@page import="org.jboss.portal.portlet.info.MetaInfo" %> +<%@page import="org.jboss.portal.portlet.info.PortletInfo" %> +<%@page import="java.util.Collection" %> <portlet:defineObjects/> <script type='text/javascript' src='/portal-admin/js/domLib.js'></script> <script type="text/javascript" src="/portal-admin/js/fadomatic.js"></script> @@ -44,113 +44,121 @@ %> - <% - Portlet portlet = null; - try - { - portlet = selectedInstance.getPortlet(); - } - catch (PortletInvokerException e) - { - e.printStackTrace(); - } - if (portlet != null) - { - MetaInfo metaInfo = portlet.getInfo().getMeta(); +<% + Portlet portlet = null; + try + { + portlet = selectedInstance.getPortlet(); + } + catch (PortletInvokerException e) + { + e.printStackTrace(); + } + if (portlet != null) + { + MetaInfo metaInfo = portlet.getInfo().getMeta(); - PortletInfo info = portlet.getInfo(); + PortletInfo info = portlet.getInfo(); - String iconLocation = getIcon(info); + String iconLocation = getIcon(info); - %> +%> <tr class="portlet-section-selected"> - <td > - <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0"/> - <span><%= displayName %></span> + <td> + <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0"/> + <span><%= displayName %></span> - <div> - <span class="portlet-form-field-label">Portlet name:</span><%= metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() %> - </div> - <div> - <span class="portlet-form-field-label">Portlet description:</span><%= metaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() %> - </div> - + <div> + <span + class="portlet-form-field-label">Portlet name:</span><%= metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() %> + </div> + <div> + <span + class="portlet-form-field-label">Portlet description:</span><%= metaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() %> + </div> + </td> - </tr> - <% - } +</tr> +<% } + } - %> +%> - <tr> -<td> +<tr> + <td> -<div style="height:300px; width:500px; overflow: auto; overflow-x: hidden; border: 1px solid #333;"> - <table style="width:100%;" cellspacing="0" cellpadding="0"> - <% - for (IteratorStatus i = new IteratorStatus(instances); i.hasNext();) - { - Instance instance = (Instance)i.next(); - String rowClass = instance == selectedInstance ? "portlet-section-selected" : (i.getIndex() % 2 == 0 ? "portlet-section-body" : "portlet-section-alternate"); - String displayName = instance.getDisplayName().getString(renderRequest.getLocale(), true); - MetaInfo portletMetaInfo = instance.getPortlet().getInfo().getMeta(); + <div style="height:300px; width:500px; overflow: auto; overflow-x: hidden; border: 1px solid #333;"> + <table style="width:100%;" cellspacing="0" cellpadding="0"> + <% + for (IteratorStatus i = new IteratorStatus(instances); i.hasNext();) + { + Instance instance = (Instance)i.next(); + String rowClass = instance == selectedInstance ? "portlet-section-selected" : (i.getIndex() % 2 == 0 ? "portlet-section-body" : "portlet-section-alternate"); + String displayName = instance.getDisplayName().getString(renderRequest.getLocale(), true); + MetaInfo portletMetaInfo = instance.getPortlet().getInfo().getMeta(); - if (displayName == null) - { - displayName = instance.getId(); - } - - PortletInfo info = instance.getPortlet().getInfo(); + if (displayName == null) + { + displayName = instance.getId(); + } - String iconLocation = getIcon(info); + PortletInfo info = instance.getPortlet().getInfo(); - %> - <portlet:actionURL var="url"> - <portlet:param name="content.action.select" value="true"/> - <portlet:param name="content.uri" value="<%= instance.getId() %>"/> - </portlet:actionURL> + String iconLocation = getIcon(info); - <div style="display:none"> - <div class="darktip" id="info-container-<%= displayName %>"> - <div class="toolbar" style="width: 250px;"> - <div class="title"><%= portletMetaInfo.getMetaValue(MetaInfo.TITLE).getDefaultString() %></div> - </div> - <div class="content"> + %> + <portlet:actionURL var="url"> + <portlet:param name="content.action.select" value="true"/> + <portlet:param name="content.uri" value="<%= instance.getId() %>"/> + </portlet:actionURL> - <div> - <span class="portlet-form-field-label">Portlet name:</span><%= portletMetaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() %> - </div> - <div> - <span class="portlet-form-field-label">Portlet description:</span><%= portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() %> - </div> - </div> + <div style="display:none"> + <div class="darktip" id="info-container-<%= displayName %>"> + <div class="toolbar" style="width: 250px;"> + <div class="title"><%= portletMetaInfo.getMetaValue(MetaInfo.TITLE).getDefaultString() %> + </div> + </div> + <div class="content"> + + <div> + <span + class="portlet-form-field-label">Portlet name:</span><%= portletMetaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() %> + </div> + <div> + <span + class="portlet-form-field-label">Portlet description:</span><%= portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() %> + </div> + </div> + </div> + + </div> + + <tr class="<%= rowClass %>"> + <td> + <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0"/> + <span + onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a + href="<%= url %>" id="portlet-instance-link"><%= displayName %> + </a></span></td> + </tr> + <% + } + %> + </table> </div> - - </div> - - <tr class="<%= rowClass %>" > - <td > - <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0"/> - <span onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a href="<%= url %>" id="portlet-instance-link"><%= displayName %></a></span></td> - </tr> - <% - } - %> - </table> -</div> - </td> - </tr> + </td> +</tr> </table> <%! private String getIcon(PortletInfo info) { String iconLocation = null; - if (info instanceof CorePortletInfo) + CorePortletInfo cInfo = info.getAttachment(CorePortletInfo.class); + if (cInfo != null) { - CorePortletInfo cInfo = (CorePortletInfo)info; PortletInfoInfo portletInfo = cInfo.getPortletInfo(); if (portletInfo != null && portletInfo.getPortletIconInfo() != null && portletInfo.getPortletIconInfo().getIconLocation(PortletIconInfo.SMALL) != null) { Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2008-03-13 09:44:13 UTC (rev 10280) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2008-03-13 23:22:28 UTC (rev 10281) @@ -465,9 +465,9 @@ Portlet portlet = (Portlet)bean; PortletInfo info = portlet.getInfo(); - if (info instanceof CorePortletInfo) + CorePortletInfo cInfo = info.getAttachment(CorePortletInfo.class); + if (cInfo != null) { - CorePortletInfo cInfo = (CorePortletInfo)portlet.getInfo(); PortletInfoInfo portletInfo = cInfo.getPortletInfo(); if (portletInfo != null && portletInfo.getPortletIconInfo() != null && portletInfo.getPortletIconInfo().getIconLocation(iconType) != null) { Deleted: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/CorePortletInvoker.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/CorePortletInvoker.java 2008-03-13 09:44:13 UTC (rev 10280) +++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/CorePortletInvoker.java 2008-03-13 23:22:28 UTC (rev 10281) @@ -1,172 +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.deployment; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.jboss.logging.Logger; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.PortletInvoker; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.state.DestroyCloneFailure; -import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.portlet.state.PropertyMap; - -/** - * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision$ - */ -public class CorePortletInvoker implements PortletInvoker -{ - public static final Object PORTLET_CORE_INFO = "PORTLET_CORE_INFO"; - - /** . */ - private PortletInvoker portletInvoker; - - /** The logger. */ - protected final Logger log = Logger.getLogger(getClass()); - - private Map<String, Map<String, PortletInfo>> portletInfoMap = new HashMap<String, Map<String, PortletInfo>>(); - - public PortletInvoker getPortletInvoker() - { - return portletInvoker; - } - - public void addPortletInfo(String applicationName, String name, PortletInfo value) - { - Map<String, PortletInfo> map = portletInfoMap.get(applicationName); - if (map == null) - { - map = new HashMap<String, PortletInfo>(); - portletInfoMap.put(applicationName, map); - } - map.put(name, value); - } - - public PortletInfo getPortletInfo(String applicationName, String name) - { - Map<String, PortletInfo> map = portletInfoMap.get(applicationName); - if (map == null) - { - return null; - } - return map.get(name); - } - - public void setPortletInvoker(PortletInvoker portletInvoker) - { - this.portletInvoker = portletInvoker; - } - - public PortletContext createClone(PortletContext portletContext) throws IllegalArgumentException, - PortletInvokerException, UnsupportedOperationException - { - return portletInvoker.createClone(portletContext); - } - - public List<DestroyCloneFailure> destroyClones(List<PortletContext> portletContexts) - throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException - { - return portletInvoker.destroyClones(portletContexts); - } - - public Portlet getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException - { - return new PortletImpl(portletInvoker.getPortlet(portletContext)); - } - - public Set<Portlet> getPortlets() throws PortletInvokerException - { - return portletInvoker.getPortlets(); - } - - public PropertyMap getProperties(PortletContext portletContext) throws IllegalArgumentException, - PortletInvokerException, UnsupportedOperationException - { - return portletInvoker.getProperties(portletContext); - } - - public PropertyMap getProperties(PortletContext portletContext, Set<String> keys) throws IllegalArgumentException, - PortletInvokerException, UnsupportedOperationException - { - return portletInvoker.getProperties(portletContext, keys); - } - - public PortletInvocationResponse invoke(PortletInvocation invocation) throws IllegalArgumentException, - PortletInvokerException - { - PortletContext ctx = invocation.getTarget(); - PortletInfo info = portletInvoker.getPortlet(ctx).getInfo(); - - invocation.setAttribute(PortletInvocation.INVOCATION_SCOPE, PORTLET_CORE_INFO, getPortletInfo(info.getApplicationName(), info.getName())); - try - { - return portletInvoker.invoke(invocation); - } - finally - { - invocation.removeAttribute(PortletInvocation.INVOCATION_SCOPE, PORTLET_CORE_INFO); - } - } - - public PortletContext setProperties(PortletContext portletContext, PropertyChange[] changes) - throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException - { - return portletInvoker.setProperties(portletContext, changes); - } - - private class PortletImpl implements Portlet - { - - private Portlet delegate; - - public PortletImpl(Portlet delegate) - { - this.delegate = delegate; - } - - public PortletContext getContext() - { - return delegate.getContext(); - } - - public PortletInfo getInfo() - { - return getPortletInfo(delegate.getInfo().getApplicationName(), delegate.getInfo().getName()); - } - - public boolean isRemote() - { - return delegate.isRemote(); - } - } -} - Modified: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2008-03-13 09:44:13 UTC (rev 10280) +++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2008-03-13 23:22:28 UTC (rev 10281) @@ -32,7 +32,6 @@ import org.jboss.portal.portlet.container.object.PortletApplicationObject; import org.jboss.portal.portlet.container.object.PortletContainerObject; import org.jboss.portal.portlet.container.object.PortletFilterObject; -import org.jboss.portal.portlet.deployment.CorePortletInvoker; import org.jboss.portal.portlet.deployment.PortletApplicationModelFactory; import org.jboss.portal.portlet.deployment.jboss.metadata.JBossApplicationMetaData; import org.jboss.portal.portlet.deployment.jboss.metadata.JBossPortletMetaData; @@ -188,8 +187,6 @@ // PortletContainerLifeCycle portletContainerLifeCycle = portletApplicationLifeCycle.addPortletContainer(portletContainerContext, portletContainerObject); - ((CorePortletInvoker)factory.getCorePortletInvoker()).addPortletInfo(portletInfo.getApplicationName(), portletInfo.getName(), portletInfo); - // Now create deps for (String filterRef : cpi.getFilterRefs()) { Modified: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java 2008-03-13 09:44:13 UTC (rev 10280) +++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java 2008-03-13 23:22:28 UTC (rev 10281) @@ -22,13 +22,6 @@ ******************************************************************************/ package org.jboss.portal.portlet.deployment.jboss; -import java.io.InputStream; -import java.net.URL; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.management.MBeanServer; - import org.jboss.deployment.DeploymentException; import org.jboss.portal.common.io.IOTools; import org.jboss.portal.portlet.PortletInvoker; @@ -51,6 +44,12 @@ import org.jboss.xb.binding.UnmarshallerFactory; import org.xml.sax.EntityResolver; +import javax.management.MBeanServer; +import java.io.InputStream; +import java.net.URL; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + /** * todo : remove unused ConfigService * @@ -80,8 +79,6 @@ private PortletInvoker portletContainerInvoker; - private PortletInvoker corePortletInvoker; - private InfoBuilderFactory coreInfoBuilderFactory; public EntityResolver getJBossPortletEntityResolver() @@ -93,12 +90,12 @@ { this.jbossPortletEntityResolver = jbossPortletEntityResolver; } - + public void setCoreInfoBuilderFactory(InfoBuilderFactory coreInfoBuilderFactory) { this.coreInfoBuilderFactory = coreInfoBuilderFactory; } - + public InfoBuilderFactory getCoreInfoBuilderFactory() { return coreInfoBuilderFactory; @@ -196,7 +193,7 @@ { return new JBossApplicationMetaDataFactory(); } - + public PortletInvoker getPortletContainerInvoker() { return portletContainerInvoker; @@ -207,19 +204,7 @@ this.portletContainerInvoker = portletContainerInvoker; } - public PortletInvoker getCorePortletInvoker() - { - return corePortletInvoker; - } - - public void setCorePortletInvoker(PortletInvoker corePortletInvoker) - { - this.corePortletInvoker = corePortletInvoker; - } - - /** - * Bridge managed object event to add/remove portlet container in portlet container invoker. - */ + /** Bridge managed object event to add/remove portlet container in portlet container invoker. */ protected final ManagedObjectRegistryEventListener bridgeToInvoker = new ManagedObjectRegistryEventListener() { public void onEvent(ManagedObjectRegistryEvent event) Modified: branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/web/jboss/JBossWebContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/web/jboss/JBossWebContext.java 2008-03-13 09:44:13 UTC (rev 10280) +++ branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/web/jboss/JBossWebContext.java 2008-03-13 23:22:28 UTC (rev 10281) @@ -25,8 +25,8 @@ import org.jboss.portal.web.RequestDispatchCallback; import org.jboss.portal.web.ServletContainer; import org.jboss.portal.web.ServletContainerFactory; +import org.jboss.portal.web.command.CommandDispatcher; import org.jboss.portal.web.impl.DefaultServletContainerFactory; -import org.jboss.portal.web.command.CommandDispatcher; import org.jboss.portal.web.spi.ServletContainerContext; import javax.servlet.ServletContext; @@ -36,8 +36,8 @@ import java.io.IOException; /** - * JBossWeb implementation of the spi. It implements the <code>ServletContainerFactory</code> interface - * but it get the returned instance from the DefaultServletContainerFactory instance. + * JBossWeb implementation of the spi. It implements the <code>ServletContainerFactory</code> interface but it gets the + * returned instance from the DefaultServletContainerFactory instance. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$

16 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r10280 - modules/portlet/trunk/test/src/test/resources/test.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-03-13 05:44:13 -0400 (Thu, 13 Mar 2008) New Revision: 10280 Modified: modules/portlet/trunk/test/src/test/resources/test/servers.xml Log: added jboss 4.2.2 to portlet container test bed Modified: modules/portlet/trunk/test/src/test/resources/test/servers.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/test/servers.xml 2008-03-13 03:03:44 UTC (rev 10279) +++ modules/portlet/trunk/test/src/test/resources/test/servers.xml 2008-03-13 09:44:13 UTC (rev 10280) @@ -57,4 +57,22 @@ </deployer> </node> </server> + <server> + <server-name>RemoteJBoss_4_2_2</server-name> + <node> + <node-id>default</node-id> + <service> + <service-name>TestDriverServer</service-name> + <interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface> + <uri>socket://localhost:5400</uri> + </service> + <deployer> + <remote> + <name>jboss4x</name> + <host>localhost</host> + <port>8080</port> + </remote> + </deployer> + </node> + </server> </servers>

16 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r10279 - in branches/JBoss_Portal_Branch_2_7: core/src/main/org/jboss/portal/core/impl/portlet/info and 4 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-03-12 23:03:44 -0400 (Wed, 12 Mar 2008) New Revision: 10279 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilder.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/metadata/portlet/MarkupAttribute.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/metadata/portlet/MarkupElement.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/info/CorePortletInfo.java branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java Log: - Fixed problem with IncompatibleClassChangeError after updating modules libraries but header injection still does not work (properties set in HeaderInterceptor are lost along the way by the time the fragment, which might actually not be the same as the one processed in HeaderInterceptor but this needs to be determined, gets to InternalContentProvider)... - Adapted to use PortletInfo.getAttachment: CorePortletInfo is now an attachment on ContainerPortletInfo. - Added toString on MarkupAttribute and MarkupElement. - More generification. Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java 2008-03-13 02:51:41 UTC (rev 10278) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java 2008-03-13 03:03:44 UTC (rev 10279) @@ -28,7 +28,6 @@ import org.jboss.portal.core.portlet.info.MarkupHeaderInfo; import org.jboss.portal.portlet.container.PortletContainer; import org.jboss.portal.portlet.container.PortletContainerInvoker; -import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.invocation.PortletInterceptor; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.response.FragmentResponse; @@ -58,11 +57,11 @@ // Add declaratively injected header content here if needed (get it via the component) PortletContainer container = (PortletContainer)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER); - PortletInfo info = container.getInfo(); + // only proceed if we have JBoss Portal specific metadata - if (info instanceof CorePortletInfo) + CorePortletInfo corePortletInfo = container.getInfo().getAttachment(CorePortletInfo.class); + if (corePortletInfo != null) { - CorePortletInfo corePortletInfo = (CorePortletInfo)info; MarkupHeaderInfo headerContentInfo = corePortletInfo.getMarkupHeader(); if (headerContentInfo != null) { Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilder.java 2008-03-13 02:51:41 UTC (rev 10278) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilder.java 2008-03-13 03:03:44 UTC (rev 10279) @@ -89,13 +89,11 @@ org.jboss.portal.portlet.deployment.jboss.metadata.JBossPortletMetaData jbPortletMD = (org.jboss.portal.portlet.deployment.jboss.metadata.JBossPortletMetaData)jbossApplicationMetaData.getPortlets().get(containerInfo.getName()); if (jbPortletMD instanceof JBossPortletMetaData) { - CorePortletInfo cpi = new CorePortletInfo(containerInfo, new PortletApplicationContextImpl(builderContext.getWebApp()), (JBossPortletMetaData)jbPortletMD, containerInfo.getBundleManager()); - portlets.put(jbPortletMD.getName(), cpi); + CorePortletInfo cpi = new CorePortletInfo(new PortletApplicationContextImpl(builderContext.getWebApp()), (JBossPortletMetaData)jbPortletMD); + containerInfo.setAttachment(CorePortletInfo.class, cpi); } - else - { - portlets.put(jbPortletMD.getName(), containerInfo); - } + + portlets.put(jbPortletMD.getName(), containerInfo); } } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/metadata/portlet/MarkupAttribute.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/metadata/portlet/MarkupAttribute.java 2008-03-13 02:51:41 UTC (rev 10278) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/metadata/portlet/MarkupAttribute.java 2008-03-13 03:03:44 UTC (rev 10279) @@ -77,6 +77,12 @@ this.type = type; } + @Override + public String toString() + { + return toString(""); + } + public String getName() { return name; Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/metadata/portlet/MarkupElement.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/metadata/portlet/MarkupElement.java 2008-03-13 02:51:41 UTC (rev 10278) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/metadata/portlet/MarkupElement.java 2008-03-13 03:03:44 UTC (rev 10279) @@ -196,6 +196,12 @@ return buffer.toString(); } + @Override + public String toString() + { + return toString(""); + } + public Element toElement(String contextPath) { return new SimpleElement(contextPath); Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/info/CorePortletInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/info/CorePortletInfo.java 2008-03-13 02:51:41 UTC (rev 10278) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/info/CorePortletInfo.java 2008-03-13 03:03:44 UTC (rev 10279) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.core.portlet.info; -import org.jboss.portal.common.i18n.ResourceBundleManager; import org.jboss.portal.common.transaction.Transactions; import org.jboss.portal.core.impl.portlet.info.AjaxInfoImpl; import org.jboss.portal.core.impl.portlet.info.MarkupHeaderInfoImpl; @@ -32,13 +31,13 @@ import org.jboss.portal.core.metadata.portlet.JBossPortletMetaData; import org.jboss.portal.core.metadata.portlet.PortletInfoMetaData; import org.jboss.portal.portlet.container.PortletApplicationContext; -import org.jboss.portal.portlet.impl.info.ContainerPortletInfo; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision: 8786 $ */ -public class CorePortletInfo extends ContainerPortletInfo +public class CorePortletInfo { /** . */ private final Transactions.Type txType; @@ -52,13 +51,8 @@ /** . */ private final PortletInfoInfoImpl portletInfo; - public CorePortletInfo(ContainerPortletInfo delegate, PortletApplicationContext portletApplicationContext, JBossPortletMetaData jbossPortletMD, ResourceBundleManager bundleMgr) + public CorePortletInfo(PortletApplicationContext portletApplicationContext, JBossPortletMetaData jbossPortletMD) { - super(delegate.getCapabilities(), delegate.getPreferences(), delegate.getMeta(), delegate.getSecurity(), - delegate.getCache(), delegate.getSession(), delegate.getEventing(), delegate.getNavigation(), - delegate.getFilterRefs(), delegate.getName(), delegate.getApplicationName(), delegate.getClassName(), - delegate.getInitParameters(), delegate.isRemotable(), delegate.getBundleManager(), delegate.getOptions()); - // AjaxMetaData ajaxMD = jbossPortletMD.getAjax(); HeaderContentMetaData headerContentMD = jbossPortletMD.getHeaderContent(); Modified: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2008-03-13 02:51:41 UTC (rev 10278) +++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2008-03-13 03:03:44 UTC (rev 10279) @@ -59,7 +59,6 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.util.Iterator; import java.util.Map; /** @@ -116,9 +115,8 @@ log.debug("Found default jboss portlet meta data"); if (defaultJBossPortletMD != null) { - for (Iterator i = portletAppMD.getPortlets().values().iterator(); i.hasNext();) + for (PortletMetaData portletMD : portletAppMD.getPortlets().values()) { - PortletMetaData portletMD = (PortletMetaData)i.next(); String name = portletMD.getPortletName(); JBossPortletMetaData jbossPortletMD = (JBossPortletMetaData)jbossAppMD.getPortlets().get(name); if (jbossPortletMD != null) Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java 2008-03-13 02:51:41 UTC (rev 10278) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java 2008-03-13 03:03:44 UTC (rev 10279) @@ -213,6 +213,11 @@ return null; // todo: implement with WSRP 2.0 } + public <T> T getAttachment(Class<T> tClass) throws IllegalArgumentException + { + throw new UnsupportedOperationException("Implement if needed!"); + } + public boolean isUsesMethodGet() { return usesMethodGet;

16 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r10278 - in modules/web/trunk/web/src: main/java/org/jboss/portal/web/impl and 1 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-03-12 22:51:41 -0400 (Wed, 12 Mar 2008) New Revision: 10278 Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/ServletContainer.java modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/DefaultServletContainer.java modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/container/ServletContainerTestCase.java Log: Moved register method back to ServletContainer interface as it's needed by 2.7 Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/ServletContainer.java =================================================================== --- modules/web/trunk/web/src/main/java/org/jboss/portal/web/ServletContainer.java 2008-03-13 00:45:45 UTC (rev 10277) +++ modules/web/trunk/web/src/main/java/org/jboss/portal/web/ServletContainer.java 2008-03-13 02:51:41 UTC (rev 10278) @@ -22,6 +22,8 @@ ******************************************************************************/ package org.jboss.portal.web; +import org.jboss.portal.web.spi.ServletContainerContext; + import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -80,4 +82,13 @@ HttpServletResponse response, RequestDispatchCallback callback, Object handback) throws ServletException, IOException; + + /** + * Register a servlet container context. The registration is considered as successful if no existing context is + * already registered. + * + * @param context the servlet container context to register + * @throws IllegalArgumentException if the context is null + */ + void register(ServletContainerContext context); } Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/DefaultServletContainer.java =================================================================== --- modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/DefaultServletContainer.java 2008-03-13 00:45:45 UTC (rev 10277) +++ modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/DefaultServletContainer.java 2008-03-13 02:51:41 UTC (rev 10278) @@ -66,13 +66,6 @@ /** The callback. */ private RegistrationImpl registration; - /** - * Register a servlet container context. The registration is considered as successful if no existing context is - * already registered. - * - * @param context the servlet container context to register - * @throws IllegalArgumentException if the context is null - */ public void register(ServletContainerContext context) { synchronized (lock) Modified: modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/container/ServletContainerTestCase.java =================================================================== --- modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/container/ServletContainerTestCase.java 2008-03-13 00:45:45 UTC (rev 10277) +++ modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/container/ServletContainerTestCase.java 2008-03-13 02:51:41 UTC (rev 10278) @@ -24,6 +24,7 @@ import org.jboss.portal.web.WebAppListener; import org.jboss.portal.web.WebAppEvent; +import org.jboss.portal.web.ServletContainer; import org.jboss.portal.web.impl.DefaultServletContainer; import org.jboss.portal.web.spi.ServletContainerContext; import org.jboss.portal.common.util.Tools; @@ -44,7 +45,7 @@ @Test public void testContextRegistrationLifeCycle() { - DefaultServletContainer container = new DefaultServletContainer(); + ServletContainer container = new DefaultServletContainer(); ServletContainerContextImpl scc = new ServletContainerContextImpl(); // @@ -92,7 +93,7 @@ @Test public void testConcurrentContextRegistrations() { - DefaultServletContainer container = new DefaultServletContainer(); + ServletContainer container = new DefaultServletContainer(); ServletContainerContextImpl scc1 = new ServletContainerContextImpl(); ServletContainerContextImpl scc2 = new ServletContainerContextImpl(); @@ -121,7 +122,7 @@ @Test public void testContextRegistrationCancellationUnregistersWebApps() { - DefaultServletContainer container = new DefaultServletContainer(); + ServletContainer container = new DefaultServletContainer(); ServletContainerContextImpl scc = new ServletContainerContextImpl(); WebAppRegistry registry = new WebAppRegistry(); @@ -144,7 +145,7 @@ @Test public void testListenerDoubleRegistration() { - DefaultServletContainer container = new DefaultServletContainer(); + ServletContainer container = new DefaultServletContainer(); ServletContainerContextImpl scc = new ServletContainerContextImpl(); WebAppRegistry registry = new WebAppRegistry(); @@ -173,7 +174,7 @@ @Test public void testListenerIsNotified() { - DefaultServletContainer container = new DefaultServletContainer(); + ServletContainer container = new DefaultServletContainer(); ServletContainerContextImpl scc = new ServletContainerContextImpl(); WebAppRegistry registry = new WebAppRegistry(); @@ -218,7 +219,7 @@ @Test public void testServletContainerThrowsIAE() { - DefaultServletContainer container = new DefaultServletContainer(); + ServletContainer container = new DefaultServletContainer(); try { container.register(null); @@ -248,7 +249,7 @@ @Test public void testServletContainerThrowsISE() throws Exception { - DefaultServletContainer container = new DefaultServletContainer(); + ServletContainer container = new DefaultServletContainer(); try { container.include(null, null, null, null, null); @@ -262,7 +263,7 @@ @Test public void testListenerFailure() { - DefaultServletContainer container = new DefaultServletContainer(); + ServletContainer container = new DefaultServletContainer(); ServletContainerContextImpl scc = new ServletContainerContextImpl(); WebAppRegistry registry = new WebAppRegistry();

16 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits March 2008