January 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r6064 - trunk/identity.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2007-01-22 10:12:07 -0500 (Mon, 22 Jan 2007) New Revision: 6064 Modified: trunk/identity/build.xml Log: - another change to try having testsuite behave well in CC env Modified: trunk/identity/build.xml =================================================================== --- trunk/identity/build.xml 2007-01-22 14:20:16 UTC (rev 6063) +++ trunk/identity/build.xml 2007-01-22 15:12:07 UTC (rev 6064) @@ -309,13 +309,14 @@ <fileset dir="../test/output/etc/opends"/> </copy> <copy file="${build.lib}/test-identity.sar" todir="${jboss.home}/server/${portal.deploy.dir}" failonerror="false"/> - <sleep seconds="25"/> + <sleep seconds="30"/> </target>  <target name="undeploy-ldap" depends="init" if="HAVE_JDK_1.5"> <delete file="${jboss.home}/server/${portal.deploy.dir}/test-identity.sar" failonerror="false" deleteonexit="true" quiet="true"/> - <delete dir="${jboss.home}/server/default/conf/opends" failonerror="false" deleteonexit="true" quiet="true"/> + <sleep seconds="30"/> +  </target> <target name="tests" depends="init, tests15"> @@ -450,14 +451,14 @@ <x-test>  - <test todir="${test.reports}" name="org.jboss.portal.test.identity.db.DBIdentityTestCase"/> +    <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPSimpleUserModuleTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPSimpleRoleModuleTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPStaticGroupMembershipModuleTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPStaticRoleMembershipModuleTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPUserProfileModuleTestCase"/> +  +  +  +  </x-test> <x-classpath> <pathelement location="${build.lib}/portal-identity-lib.jar"/>

17 years, 5 months

1
0
0 / 0

JBoss Portal SVN: r6063 - in trunk/core/src: main/org/jboss/portal/core/aspects/controller and 4 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-01-22 09:20:16 -0500 (Mon, 22 Jan 2007) New Revision: 6063 Added: trunk/core/src/main/org/jboss/portal/core/WindowInterceptor.java trunk/core/src/main/org/jboss/portal/core/WindowManipulator.java Removed: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml Log: - added window manipulator prototype which helps to manipulate window state of a page - removed unused PageNavigationInterceptor Added: trunk/core/src/main/org/jboss/portal/core/WindowInterceptor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/WindowInterceptor.java (rev 0) +++ trunk/core/src/main/org/jboss/portal/core/WindowInterceptor.java 2007-01-22 14:20:16 UTC (rev 6063) @@ -0,0 +1,183 @@ +/****************************************************************************** + * 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.core; + +import org.jboss.portal.core.controller.ControllerInterceptor; +import org.jboss.portal.core.controller.ControllerCommand; +import org.jboss.portal.core.model.portal.command.RenderPageCommand; +import org.jboss.portal.core.model.portal.command.InvokePortletWindowRenderCommand; +import org.jboss.portal.core.model.portal.Window; +import org.jboss.portal.core.model.portal.Page; +import org.jboss.portal.core.model.portal.PortalObject; +import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.portal.theme.navigation.WindowNavigationalState; +import org.jboss.portal.WindowState; + +import java.util.Iterator; +import java.util.Collection; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class WindowInterceptor extends ControllerInterceptor +{ + public Object invoke(ControllerCommand cmd) throws Exception, InvocationException + { + if (cmd instanceof InvokePortletWindowRenderCommand) + { + // Update state + cmd.invokeNext(); + + // + InvokePortletWindowRenderCommand ipwrc = (InvokePortletWindowRenderCommand)cmd; + Window targetWindow = ipwrc.getWindow(); + Collection windows = targetWindow.getParent().getChildren(PortalObject.TYPE_WINDOW); + WindowManipulator manipulator = new WindowManipulator(cmd.getContext().getAttributeResolver(ControllerCommand.NAVIGATIONAL_STATE_SCOPE), windows); + WindowState ws = ipwrc.getWindowState(); + + // + if (WindowState.NORMAL.equals(ws)) + { + String regionName = manipulator.getRegionName(targetWindow); + if (regionName != null) + { + for (Iterator i = manipulator.getWindows(regionName).iterator();i.hasNext();) + { + Window currentWindow = (Window)i.next(); + if (currentWindow.getId().equals(targetWindow.getId())) + { + // Do nothing + } + else + { + WindowNavigationalState wns = manipulator.getNavigationalState(currentWindow); + wns.setWindowState(WindowState.MINIMIZED); + } + } + } + } + else if (WindowState.MINIMIZED.equals(ws)) + { + String regionName = manipulator.getRegionName(targetWindow); + if (regionName != null) + { + // Find the window following the minimized one + Window nextWindow = null; + for (Iterator i = manipulator.getWindows(regionName).iterator();i.hasNext();) + { + Window currentWindow = (Window)i.next(); + + // Keep a ref on the first window for later use + if (nextWindow == null) + { + nextWindow = currentWindow; + } + + // + if (currentWindow.getId().equals(targetWindow.getId())) + { + // Try to get the next window otherwise it means it's the last window + // and we'll use the window we saved at the first iteration + if (i.hasNext()) + { + nextWindow = (Window)i.next(); + } + + // + break; + } + } + + // Normalize the next window + if (nextWindow != null) + { + WindowNavigationalState wns = manipulator.getNavigationalState(nextWindow); + wns.setWindowState(WindowState.NORMAL); + } + } + } + } + if (cmd instanceof RenderPageCommand) + { + RenderPageCommand rpc = (RenderPageCommand)cmd; + WindowManipulator manipulator = new WindowManipulator(cmd.getContext().getAttributeResolver(ControllerCommand.NAVIGATIONAL_STATE_SCOPE), rpc.getWindows()); + + // Filter window state for normal and minimized + for (Iterator i = manipulator.getRegionNames().iterator();i.hasNext();) + { + boolean foundNormal = false; + Window firstWindow = null; + String regionName = (String)i.next(); + for (Iterator j = manipulator.getWindows(regionName).iterator();j.hasNext();) + { + Window window = (Window)j.next(); + + // Keep a ref on first window which can be used later + if (firstWindow == null) + { + firstWindow = window; + } + + // + WindowNavigationalState wns = manipulator.getNavigationalState(window); + WindowState ws = wns.getWindowState(); + if (WindowState.NORMAL.equals(ws)) + { + if (foundNormal) + { + wns.setWindowState(WindowState.MINIMIZED); + } + else + { + foundNormal = true; + } + } + else if (WindowState.MINIMIZED.equals(ws)) + { + // + } + else + { + ws = WindowState.MINIMIZED; + wns.setWindowState(ws); + } + } + + // + if (foundNormal == false && firstWindow != null) + { + WindowNavigationalState wns = manipulator.getNavigationalState(firstWindow); + wns.setWindowState(WindowState.NORMAL); + } + } + + // + return cmd.invokeNext(); + } + else + { + return cmd.invokeNext(); + } + } +} Added: trunk/core/src/main/org/jboss/portal/core/WindowManipulator.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/WindowManipulator.java (rev 0) +++ trunk/core/src/main/org/jboss/portal/core/WindowManipulator.java 2007-01-22 14:20:16 UTC (rev 6063) @@ -0,0 +1,122 @@ +/****************************************************************************** + * 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.core; + +import org.jboss.portal.common.invocation.AttributeResolver; +import org.jboss.portal.theme.ThemeConstants; +import org.jboss.portal.theme.navigation.WindowNavigationalState; +import org.jboss.portal.core.model.portal.Window; + +import java.util.Collection; +import java.util.Iterator; +import java.util.HashMap; +import java.util.Map; +import java.util.TreeMap; +import java.util.SortedMap; +import java.util.Set; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class WindowManipulator +{ + + private Map regionMap; + + private AttributeResolver navStateResolver; + + public WindowManipulator(AttributeResolver navStateResolver, Collection windows) + { + this.navStateResolver = navStateResolver; + + // Build appropriate structure + regionMap = new HashMap(); + for (Iterator i = windows.iterator();i.hasNext();) + { + try + { + Window window = (Window)i.next(); + String region = window.getDeclaredProperty(ThemeConstants.PORTAL_PROP_REGION); + Integer order = new Integer(window.getDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER)); + + // + SortedMap windowMap = (SortedMap)regionMap.get(region); + if (windowMap == null) + { + windowMap = new TreeMap(); + regionMap.put(region, windowMap); + } + windowMap.put(order, window); + } + catch (NumberFormatException ignore) + { + } + } + } + + public String getRegionName(Window window) + { + for (Iterator i = regionMap.entrySet().iterator();i.hasNext();) + { + Map.Entry entry = (Map.Entry)i.next(); + SortedMap windows = (SortedMap)entry.getValue(); + for (Iterator j = windows.values().iterator();j.hasNext();) + { + Window window2 = (Window)j.next(); + if (window.getId().equals(window2.getId())) + { + return (String)entry.getKey(); + } + } + } + return null; + } + + public Set getRegionNames() + { + return regionMap.keySet(); + } + + public Collection getWindows(String regionName) + { + return ((Map)regionMap.get(regionName)).values(); + } + + public WindowNavigationalState getNavigationalState(Window window) + { + WindowNavigationalState wns = (WindowNavigationalState)navStateResolver.getAttribute(window.getId() + "_window"); + if (wns == null) + { + wns = new WindowNavigationalState(); + navStateResolver.setAttribute(window.getId() + "_window", wns); + } + return wns; + } + + public void setNavigationalState(Window window, WindowNavigationalState windowNS) + { + navStateResolver.setAttribute(window.getId() + "_window", windowNS); + } + +} Deleted: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java 2007-01-22 12:57:06 UTC (rev 6062) +++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java 2007-01-22 14:20:16 UTC (rev 6063) @@ -1,61 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ - -package org.jboss.portal.core.aspects.controller; - -import org.apache.log4j.Logger; -import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.core.controller.ControllerCommand; -import org.jboss.portal.core.controller.ControllerInterceptor; - -/** - * Ensure that the page navigational state holder is present. - * - * @author <a href="mailto:mholzner@novell.com">Martin Holzner</a> - * @version $Revision$ - */ -public class PageNavigationInterceptor extends ControllerInterceptor -{ - - private static final Logger log = Logger.getLogger(PageNavigationInterceptor.class); - - public Object invoke(ControllerCommand cmd) throws Exception, InvocationException - { -// if (cmd instanceof WindowCommand || cmd instanceof PageCommand) -// { -// // -// PortalObject target = ((PortalObjectCommand)cmd).getTarget(); -// while (target != null && PortalObject.TYPE_PAGE != target.getType() && target.getParent() != null) -// { -// target = target.getParent(); -// } -// -// if (target == null || target.getType() != PortalObject.TYPE_PAGE) -// { -// throw new InvocationException("Could not determine the page of this request"); -// } -// } - - return cmd.invokeNext(); - } -} Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-01-22 12:57:06 UTC (rev 6062) +++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-01-22 14:20:16 UTC (rev 6063) @@ -27,6 +27,7 @@ import org.jboss.portal.core.model.portal.NoSuchPortalObjectException; import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.PortalObjectId; +import org.jboss.portal.common.NotYetImplemented; import java.util.ArrayList; import java.util.Collection; @@ -34,6 +35,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import java.util.NoSuchElementException; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -163,101 +165,148 @@ protected abstract PortalObjectImpl cloneObject(); + public Collection getChildren(int type) + { + return getChildren(new Integer(type)); + } + public Collection getChildren() { + return getChildren(null); + } + + public Collection getChildren(final Integer type) + { if (collection == null) { collection = new Collection() { - public int size() + public void clear() { - return objectNode.getChildren().size(); + throw new UnsupportedOperationException(); } - public void clear() + public boolean add(Object o) { throw new UnsupportedOperationException(); } - public boolean isEmpty() + public boolean remove(Object o) { - return objectNode.getChildren().isEmpty(); + throw new UnsupportedOperationException(); } - public Object[] toArray() + public boolean addAll(Collection c) { - return toArray(new Object[0]); + throw new UnsupportedOperationException(); } - public boolean add(Object o) + public boolean removeAll(Collection c) { throw new UnsupportedOperationException(); } - public boolean contains(Object o) + public boolean retainAll(Collection c) { throw new UnsupportedOperationException(); } - public boolean remove(Object o) + public boolean containsAll(Collection c) { - throw new UnsupportedOperationException(); + throw new NotYetImplemented(); } - public boolean addAll(Collection c) + public boolean contains(Object o) { - throw new UnsupportedOperationException(); + throw new NotYetImplemented(); } - public boolean containsAll(Collection c) + public boolean isEmpty() { - throw new UnsupportedOperationException(); + return objectNode.getChildren().isEmpty(); } - public boolean removeAll(Collection c) + public int size() { - throw new UnsupportedOperationException(); + if (type == null) + { + return objectNode.getChildren().size(); + } + else + { + int count = 0; + for (Iterator i = iterator();i.hasNext();) + { + i.next(); + count++; + } + return count; + } } - public boolean retainAll(Collection c) + public Object[] toArray() { - throw new UnsupportedOperationException(); + return toArray(new Object[0]); } public Iterator iterator() { - final Iterator iterator = objectNode.getChildren().values().iterator(); + return iterator(type); + } + + public Object[] toArray(Object a[]) + { + ArrayList tmp = new ArrayList(objectNode.getChildren().size()); + for (Iterator i = iterator(); i.hasNext();) + { + PortalObject child = (PortalObject)i.next(); + tmp.add(child); + } + return tmp.toArray(a); + } + + public Iterator iterator(final Integer type) + { return new Iterator() { + Iterator iterator = objectNode.getChildren().values().iterator(); + PortalObject next = null; public void remove() { throw new UnsupportedOperationException(); } - public boolean hasNext() { - return iterator.hasNext(); + if (next == null) + { + while (next == null && iterator.hasNext()) + { + ObjectNode node = (ObjectNode)iterator.next(); + PortalObject object = node.getObject(); + if (type == null || object.getType() == type.intValue()) + { + next = object; + } + } + } + return next != null; } - public Object next() { - ObjectNode next = (ObjectNode)iterator.next(); - return next.getObject(); + if (next == null) + { + hasNext(); + } + if (next == null) + { + throw new NoSuchElementException(); + } + PortalObject next = this.next; + this.next = null; + return next; } }; } - - public Object[] toArray(Object a[]) - { - ArrayList tmp = new ArrayList(objectNode.getChildren().size()); - for (Iterator i = objectNode.getChildren().values().iterator(); i.hasNext();) - { - ObjectNode childObjectNode = (ObjectNode)i.next(); - PortalObjectImpl childPortalObject = childObjectNode.getObject(); - tmp.add(childPortalObject); - } - return tmp.toArray(a); - } }; } return collection; Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java 2007-01-22 12:57:06 UTC (rev 6062) +++ trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java 2007-01-22 14:20:16 UTC (rev 6063) @@ -95,6 +95,13 @@ Collection getChildren(); /** + * Return all the children of this object filtered with a particular type. + * + * @return the children + */ + Collection getChildren(int type); + + /** * Return the parent object. * * @return the parent object. Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java 2007-01-22 12:57:06 UTC (rev 6062) +++ trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java 2007-01-22 14:20:16 UTC (rev 6063) @@ -129,7 +129,7 @@ super.create(); // All windows on the page - windows = new ArrayList(getPage().getChildren()); + windows = new ArrayList(getPage().getChildren(PortalObject.TYPE_WINDOW)); // LayoutService layoutService = context.getController().getPageService().getLayoutService(); Modified: trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-01-22 12:57:06 UTC (rev 6062) +++ trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-01-22 14:20:16 UTC (rev 6063) @@ -134,13 +134,6 @@ <xmbean/> </mbean> <mbean - code="org.jboss.portal.core.aspects.controller.PageNavigationInterceptor" - name="portal:service=Interceptor,type=Command,name=PageNavigation" - 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="" @@ -176,7 +169,6 @@ <depends-list optional-attribute-name="InterceptorNames"> <depends-list-element>portal:service=Interceptor,type=Command,name=PortalNode</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Command,name=PolicyEnforcement</depends-list-element> - <depends-list-element>portal:service=Interceptor,type=Command,name=PageNavigation</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Command,name=PageCustomizer</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Command,name=Ajax</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Command,name=EventBroadcaster</depends-list-element>

17 years, 5 months

1
0
0 / 0

JBoss Portal SVN: r6062 - trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-01-22 07:57:06 -0500 (Mon, 22 Jan 2007) New Revision: 6062 Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java Log: Make it build... Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java 2007-01-22 00:51:36 UTC (rev 6061) +++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java 2007-01-22 12:57:06 UTC (rev 6062) @@ -37,7 +37,8 @@ */ public class PortletUtils { - private static final String PREFIX = "jbp"; + public static final String PREFIX = "jbpns"; + public static final String SUFFIX = "snjbp"; /** * Check that provided map follow the constraints :

17 years, 5 months

1
0
0 / 0

JBoss Portal SVN: r6061 - in trunk: theme/src/main/org/jboss/portal/theme and 1 other directory.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-01-21 19:51:36 -0500 (Sun, 21 Jan 2007) New Revision: 6061 Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java Log: move the choice of the maximized region for the page result from the render page command to the page rendition object Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java 2007-01-21 02:11:45 UTC (rev 6060) +++ trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java 2007-01-22 00:51:36 UTC (rev 6061) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.command; -import org.jboss.portal.WindowState; import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.controller.ControllerException; @@ -63,7 +62,6 @@ import java.util.List; import java.util.StringTokenizer; import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; /** * Render a full page. @@ -270,40 +268,6 @@ } } - // Take care of maximized window HERE - for (Iterator i = pageResult.getWindowIds().iterator();i.hasNext();) - { - PortalObjectId windowId = (PortalObjectId)i.next(); - WindowResult res = pageResult.getWindowResult(windowId); - if (WindowState.MAXIMIZED.equals(res.getWindowState())) - { - PageResult newRes = new PageResult( - pageResult.getPageName(), - pageResult.getPageProperties(), - pageResult.getPortalProperties()); - - // - WindowContext ctx = pageResult.getWindowContext(windowId); - - // - newRes.setLayoutState("maximized"); - newRes.setLayoutURI(layout.getLayoutInfo().getURI("maximized")); - - // - ctx.setRegionName("maximized"); - ctx.setOrder(0); - - // - newRes.addWindowContext(ctx); - newRes.addWindowResult(windowId, res); - - // - pageResult = newRes; - - break; - } - } - // Make the theme available as servlet request attribute (needed for CM) if (theme != null) { Modified: trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java 2007-01-21 02:11:45 UTC (rev 6060) +++ trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java 2007-01-22 00:51:36 UTC (rev 6061) @@ -25,10 +25,14 @@ import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.theme.page.PageService; import org.jboss.portal.theme.page.PageResult; +import org.jboss.portal.theme.page.WindowResult; +import org.jboss.portal.theme.page.WindowContext; +import org.jboss.portal.WindowState; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import java.io.IOException; +import java.util.Iterator; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -59,6 +63,42 @@ // HttpServletRequest clientRequest = invocation.getServerContext().getClientRequest(); + // Take care of maximized window + // if one window is maximized then we do chose the maximized layout for the rendition + // and put that window on the maximized region of this layout + for (Iterator i = pageResult.getWindowIds().iterator();i.hasNext();) + { + Object windowId = i.next(); + WindowResult res = pageResult.getWindowResult(windowId); + if (WindowState.MAXIMIZED.equals(res.getWindowState())) + { + PageResult newRes = new PageResult( + pageResult.getPageName(), + pageResult.getPageProperties(), + pageResult.getPortalProperties()); + + // + WindowContext ctx = pageResult.getWindowContext(windowId); + + // + newRes.setLayoutState("maximized"); + newRes.setLayoutURI(layout.getLayoutInfo().getURI("maximized")); + + // + ctx.setRegionName("maximized"); + ctx.setOrder(0); + + // + newRes.addWindowContext(ctx); + newRes.addWindowResult(windowId, res); + + // + pageResult = newRes; + + break; + } + } + try {

17 years, 5 months

1
0
0 / 0

JBoss Portal SVN: r6060 - trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-01-20 21:11:45 -0500 (Sat, 20 Jan 2007) New Revision: 6060 Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionResponseImpl.java trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java Log: - rename PortletUtils checkRenderParameter* methods to checkPortletParameter*Validity instead - updated the javadoc of those methods to describe what they do Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionResponseImpl.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionResponseImpl.java 2007-01-21 01:48:01 UTC (rev 6059) +++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionResponseImpl.java 2007-01-21 02:11:45 UTC (rev 6060) @@ -152,7 +152,7 @@ public void setRenderParameters(Map map) { - PortletUtils.checkRenderParameterMap(map); + PortletUtils.checkPortletParameterMapValidity(map); // if (decision == WANT_NOTHING || decision == WANT_RENDER) @@ -168,7 +168,7 @@ public void setRenderParameter(String name, String value) { - PortletUtils.checkRenderParameter(name, value); + PortletUtils.checkPortletParameterValidity(name, value); // if (decision == WANT_NOTHING || decision == WANT_RENDER) @@ -184,7 +184,7 @@ public void setRenderParameter(String name, String[] values) { - PortletUtils.checkRenderParameter(name, values); + PortletUtils.checkPortletParameterValidity(name, values); // if (decision == WANT_NOTHING || decision == WANT_RENDER) Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java 2007-01-21 01:48:01 UTC (rev 6059) +++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java 2007-01-21 02:11:45 UTC (rev 6060) @@ -94,7 +94,7 @@ /** @throws IllegalArgumentException if the name is null */ public void setParameter(String name, String value) { - PortletUtils.checkRenderParameter(name, value); + PortletUtils.checkPortletParameterValidity(name, value); // url.getInternalParameters().setValue(name, value); @@ -102,7 +102,7 @@ public void setParameter(String name, String[] values) { - PortletUtils.checkRenderParameter(name, values); + PortletUtils.checkPortletParameterValidity(name, values); // url.getInternalParameters().setValues(name, values); @@ -110,7 +110,7 @@ public void setParameters(Map parameters) { - PortletUtils.checkRenderParameterMap(parameters); + PortletUtils.checkPortletParameterMapValidity(parameters); // url.getInternalParameters().replace(parameters); Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java 2007-01-21 01:48:01 UTC (rev 6059) +++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java 2007-01-21 02:11:45 UTC (rev 6060) @@ -37,10 +37,21 @@ */ public class PortletUtils { - public static final String PREFIX = "jbpns"; - public static final String SUFFIX = "snpbj"; + private static final String PREFIX = "jbp"; - public static void checkRenderParameterMap(Map map) + /** + * Check that provided map follow the constraints : + * <ul> + * <li>Not null</li> + * <li>Keys are non null string</li> + * <li>Values are non null string arrays</li> + * </ul> + * If a constraint is not respected then an IllegalArgumentException is thrown. + * + * @param map the map to check + * @throws IllegalArgumentException + */ + public static void checkPortletParameterMapValidity(Map map) throws IllegalArgumentException { if (map == null) { @@ -70,7 +81,12 @@ } } - public static void checkRenderParameter(String name, String value) + /** + * Check that the passed argument are non null otherwise throw an IllegalArgumentException. + * + * @throws IllegalArgumentException + */ + public static void checkPortletParameterValidity(String name, String value) throws IllegalArgumentException { if (name == null) { @@ -82,7 +98,12 @@ } } - public static void checkRenderParameter(String name, String[] values) + /** + * Check that the passed argument are non null otherwise throw an IllegalArgumentException. + * + * @throws IllegalArgumentException + */ + public static void checkPortletParameterValidity(String name, String[] values) throws IllegalArgumentException { if (name == null) { @@ -170,7 +191,7 @@ { StringBuffer tmp = new StringBuffer(PREFIX.length() + windowId.length() * 2); tmp.append(PREFIX); - for (int i = 0; i < windowId.length(); i++) + for (int i = 0;i < windowId.length();i++) { char c = windowId.charAt(i); if (Character.isLetterOrDigit(c)) @@ -184,7 +205,6 @@ tmp.append(Character.forDigit((((int)c) & 0X0F), 16)); } } - tmp.append(SUFFIX); return tmp.toString(); } }

17 years, 5 months

1
0
0 / 0

JBoss Portal SVN: r6059 - in trunk/core/src: resources/portal-core-war/WEB-INF/jsp/dashboard and 1 other directory.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-01-20 20:48:01 -0500 (Sat, 20 Jan 2007) New Revision: 6059 Modified: trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp Log: - fix the no propagation of current page when a cms/portlet editor was chosen causing to go back on default page when another page was selected Modified: trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java 2007-01-21 01:18:15 UTC (rev 6058) +++ trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java 2007-01-21 01:48:01 UTC (rev 6059) @@ -112,6 +112,12 @@ op = "editPage"; } + String contentType = req.getParameter("contentType"); + if (contentType == null) + { + contentType = "portlet"; + } + String errorMessage = req.getParameter("errorMsg"); // load portal + page for editting. @@ -188,6 +194,7 @@ req.setAttribute("currentLayout", currentLayout.getLayoutInfo().getName()); req.setAttribute("currentTheme", currentTheme.getThemeInfo().getName()); req.setAttribute("themes", themes); + req.setAttribute("contentType", contentType); if (errorMessage != null) { req.setAttribute("errorMsg", errorMessage); Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp 2007-01-21 01:18:15 UTC (rev 6058) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp 2007-01-21 01:48:01 UTC (rev 6059) @@ -34,7 +34,7 @@ Collection layouts = (Collection)request.getAttribute("layouts"); Collection themes = (Collection)request.getAttribute("themes"); - String contentType = request.getParameter("contentType"); + String contentType = (String)request.getAttribute("contentType"); %> <script type="text/javascript" language="JavaScript"> @@ -156,14 +156,7 @@ <input type="hidden" name="toRegion" value=""/> <input type="hidden" name="fromRegion" value=""/> <input type="hidden" name="sortRegion" value=""/> -<% - if (contentType != null) - { -%> <input type="hidden" name="contentType" value="<%= contentType %>"/> -<% - } -%> <input type="hidden" name="editPageSelect" value="<%= currentPage %>"/> <table width="100%"> <tr> @@ -241,7 +234,9 @@ { ContentType ct = (ContentType)i.next(); %> - <a href="<portlet:renderURL><portlet:param name="op" value="editPage"/><portlet:param name="contentType" value="<%= ct.toString() %>"/> + <a href="<portlet:renderURL><portlet:param name="op" value="editPage"/> + <portlet:param name="contentType" value="<%= ct.toString() %>"/> + <portlet:param name="editPageSelect" value="<%= currentPage %>"/> </portlet:renderURL>"><%= ct %></a>  <% }

17 years, 5 months

1
0
0 / 0

JBoss Portal SVN: r6058 - in trunk: core/src/main/org/jboss/portal/core/portlet/dashboard and 2 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-01-20 20:18:15 -0500 (Sat, 20 Jan 2007) New Revision: 6058 Modified: trunk/core-cms/src/main/org/jboss/portal/core/cms/editor/CMSContentEditor.java trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java trunk/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/AddWindowContext.java trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/PortletContentEditor.java trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp Log: - basic content editor for cms and dashboard is done - added a couple of argument checks in the portal object impl Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java 2007-01-20 14:59:28 UTC (rev 6057) +++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java 2007-01-21 01:18:15 UTC (rev 6058) @@ -110,7 +110,14 @@ this.object = object; } - /** Create the association. */ + /** + * Create and persist the provided child object. The object also becomes of child of this node. + * + * @param name the child name + * @param childObject the child object + * @throws DuplicatePortalObjectException if a child with such a name already exists + * @throws IllegalArgumentException if the name is null or zero length or the child object is null + */ void addChild(String name, PortalObjectImpl childObject) throws DuplicatePortalObjectException, IllegalArgumentException { if (name == null) Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java 2007-01-20 14:59:28 UTC (rev 6057) +++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java 2007-01-21 01:18:15 UTC (rev 6058) @@ -58,11 +58,23 @@ this.contentType = null; } - public WindowImpl(ContentType contentType) + /** + * Creates a new window. + * + * @param contentType the window content type + * @throws IllegalArgumentException if the content type is null + */ + public WindowImpl(ContentType contentType) throws IllegalArgumentException { super(false); // + if (contentType == null) + { + throw new IllegalArgumentException("No null content type accepted"); + } + + // this.instanceRef = null; this.contentType = contentType; Modified: trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/AddWindowContext.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/AddWindowContext.java 2007-01-20 14:59:28 UTC (rev 6057) +++ trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/AddWindowContext.java 2007-01-21 01:18:15 UTC (rev 6058) @@ -57,7 +57,7 @@ { windowName = "" + doWindowNaming(); } - Window window = page.createWindow(windowName, ContentType.PORTLET); + Window window = page.createWindow(windowName, contentType); window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_REGION, toRegion); window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + Integer.MAX_VALUE); return window.getContent(); Modified: trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java 2007-01-20 14:59:28 UTC (rev 6057) +++ trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java 2007-01-21 01:18:15 UTC (rev 6058) @@ -219,11 +219,18 @@ if ("copy".equals(op)) { String toRegion = actionRequest.getParameter("toRegion"); - - AddWindowContext ctx = new AddWindowContext(page, toRegion); - ContentEditor editor = contentEditorRegistry.getEditor(ContentType.PORTLET); - editor.add(actionRequest, ctx); - + String contentType = actionRequest.getParameter("contentType"); + ContentEditor editor = null; + if (contentType != null) + { + ContentType ct = ContentType.create(contentType); + editor = contentEditorRegistry.getEditor(ct); + } + if (editor != null) + { + AddWindowContext ctx = new AddWindowContext(page, toRegion); + editor.add(actionRequest, ctx); + } actionResponse.setRenderParameter("editPageSelect", editPage); } else if ("remove".equals(op)) Modified: trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/PortletContentEditor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/PortletContentEditor.java 2007-01-20 14:59:28 UTC (rev 6057) +++ trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/PortletContentEditor.java 2007-01-21 01:18:15 UTC (rev 6058) @@ -92,8 +92,7 @@ } catch (Exception e) { -// errorMessage = "Error adding window to region"; -// log.error(errorMessage, e); + log.error("Error adding window to region", e); } } } Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp 2007-01-20 14:59:28 UTC (rev 6057) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp 2007-01-21 01:18:15 UTC (rev 6058) @@ -8,7 +8,6 @@ <%@ page import="java.util.Map" %> <%@ page import="java.util.TreeSet" %> <%@ page import="org.jboss.portal.core.model.content.ContentType" %> -<%@ page import="org.jboss.portal.core.impl.model.content.portlet.PortletContent" %> <%@ page import="java.io.PrintWriter" %> <%@ page import="org.jboss.portal.core.portlet.dashboard.ContentEditorRegistry" %> <%@ page import="org.jboss.portal.core.portlet.dashboard.ContentEditor" %> @@ -34,6 +33,8 @@ Collection layouts = (Collection)request.getAttribute("layouts"); Collection themes = (Collection)request.getAttribute("themes"); + + String contentType = request.getParameter("contentType"); %> <script type="text/javascript" language="JavaScript"> @@ -155,6 +156,14 @@ <input type="hidden" name="toRegion" value=""/> <input type="hidden" name="fromRegion" value=""/> <input type="hidden" name="sortRegion" value=""/> +<% + if (contentType != null) + { +%> +<input type="hidden" name="contentType" value="<%= contentType %>"/> +<% + } +%> <input type="hidden" name="editPageSelect" value="<%= currentPage %>"/> <table width="100%"> <tr> @@ -225,7 +234,29 @@ <td class="portlet-section-body" valign="top" align="right"><b>Available Content</b><br/> <% ContentEditorRegistry registry = (ContentEditorRegistry)request.getAttribute("registry"); - ContentEditor editor = registry.getEditor(ContentType.PORTLET); +%> +<div> +<% + for (Iterator i = registry.getRegisteredContentTypes().iterator();i.hasNext();) + { + ContentType ct = (ContentType)i.next(); +%> + <a href="<portlet:renderURL><portlet:param name="op" value="editPage"/><portlet:param name="contentType" value="<%= ct.toString() %>"/> + </portlet:renderURL>"><%= ct %></a>  +<% + } +%> +</div> +<% + ContentEditor editor = null; + if (contentType != null) + { + editor = registry.getEditor(ContentType.create(contentType)); + } + if (editor == null) + { + editor = registry.getEditor(ContentType.PORTLET); + } PrintWriter writer = new PrintWriter(out); editor.show(renderRequest, writer); writer.flush(); @@ -252,7 +283,6 @@ for (Iterator j = windows.iterator(); j.hasNext();) { Window window = (Window)j.next(); - ContentType contentType = window.getContentType(); Content portletContent = window.getContent(); %> <option value="<%= window.getName() %>"><%= portletContent.getDisplayName().getDefaultString() %> Modified: trunk/core-cms/src/main/org/jboss/portal/core/cms/editor/CMSContentEditor.java =================================================================== --- trunk/core-cms/src/main/org/jboss/portal/core/cms/editor/CMSContentEditor.java 2007-01-20 14:59:28 UTC (rev 6057) +++ trunk/core-cms/src/main/org/jboss/portal/core/cms/editor/CMSContentEditor.java 2007-01-21 01:18:15 UTC (rev 6058) @@ -24,9 +24,12 @@ import org.jboss.portal.core.portlet.dashboard.AddWindowContext; import org.jboss.portal.core.portlet.dashboard.AbstractContentEditor; +import org.jboss.portal.core.impl.model.content.cms.CMSContent; +import org.jboss.portal.core.model.content.ContentType; import org.jboss.portal.cms.CMS; import org.jboss.portal.cms.Command; import org.jboss.portal.cms.model.File; +import org.jboss.portal.cms.model.Folder; import javax.portlet.RenderRequest; import javax.portlet.ActionRequest; @@ -55,16 +58,17 @@ public void show(RenderRequest req, PrintWriter writer) { - Command cmd = cms.getCommandFactory().createFileGetListCommand("/"); - List list = (List)cms.execute(cmd); + Command listCMD = cms.getCommandFactory().createFolderGetListCommand("/default"); + Folder folder = (Folder)cms.execute(listCMD); + List list = folder.getFiles(); writer.println("<select name=\"available_instances\" multiple=\"true\" size=\"20\">\n"); for (int i = 0; i < list.size(); i++) { - File instance = (File)list.get(i); + File file = (File)list.get(i); writer.print("<option value=\""); - writer.print(instance.getBaseUUID()); + writer.print(file.getBasePath()); writer.print("\">"); - writer.print(instance.getName()); + writer.print(file.getName()); writer.println("</option>\n"); } writer.println("</select>"); @@ -72,6 +76,19 @@ public void add(ActionRequest req, AddWindowContext ctx) { - // todo + String[] files = req.getParameterValues("available_instances"); + try + { + for (int i = 0; i < files.length; i++) + { + String file = files[i]; + CMSContent content = (CMSContent)ctx.createWindow(ContentType.CMS); + content.setURI(file); + } + } + catch (Exception e) + { + log.error("Error adding window to region", e); + } } }

17 years, 5 months

1
0
0 / 0

JBoss Portal SVN: r6057 - in trunk: core/src/main/org/jboss/portal/core/impl/model/content/portlet and 6 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-01-20 09:59:28 -0500 (Sat, 20 Jan 2007) New Revision: 6057 Added: trunk/core-cms/src/main/org/jboss/portal/core/cms/editor/ trunk/core-cms/src/main/org/jboss/portal/core/cms/editor/CMSContentEditor.java Modified: trunk/core-cms/build.xml trunk/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml trunk/core/src/main/org/jboss/portal/core/impl/model/content/cms/CMSContent.java trunk/core/src/main/org/jboss/portal/core/impl/model/content/portlet/PortletContent.java trunk/core/src/main/org/jboss/portal/core/model/content/Content.java trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp Log: now content editor can list any content type. started to do the cms content editor Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/content/cms/CMSContent.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/impl/model/content/cms/CMSContent.java 2007-01-20 12:29:35 UTC (rev 6056) +++ trunk/core/src/main/org/jboss/portal/core/impl/model/content/cms/CMSContent.java 2007-01-20 14:59:28 UTC (rev 6057) @@ -24,7 +24,10 @@ import org.jboss.portal.core.model.content.Content; import org.jboss.portal.core.model.content.spi.ContentState; +import org.jboss.portal.common.util.LocalizedString; +import java.util.Locale; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ @@ -40,6 +43,11 @@ this.state = state; } + public LocalizedString getDisplayName() + { + return new LocalizedString(state.getURI() + " cms", Locale.ENGLISH); + } + /** * * @return Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/content/portlet/PortletContent.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/impl/model/content/portlet/PortletContent.java 2007-01-20 12:29:35 UTC (rev 6056) +++ trunk/core/src/main/org/jboss/portal/core/impl/model/content/portlet/PortletContent.java 2007-01-20 14:59:28 UTC (rev 6057) @@ -24,7 +24,10 @@ import org.jboss.portal.core.model.content.Content; import org.jboss.portal.core.model.content.spi.ContentState; +import org.jboss.portal.common.util.LocalizedString; +import java.util.Locale; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ @@ -48,6 +51,11 @@ this.state = state; } + public LocalizedString getDisplayName() + { + return new LocalizedString(state.getURI() + " portlet", Locale.ENGLISH); + } + /** * * @return Modified: trunk/core/src/main/org/jboss/portal/core/model/content/Content.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/content/Content.java 2007-01-20 12:29:35 UTC (rev 6056) +++ trunk/core/src/main/org/jboss/portal/core/model/content/Content.java 2007-01-20 14:59:28 UTC (rev 6057) @@ -22,6 +22,8 @@ ******************************************************************************/ package org.jboss.portal.core.model.content; +import org.jboss.portal.common.util.LocalizedString; + /** * The content. * @@ -30,4 +32,5 @@ */ public interface Content { + LocalizedString getDisplayName(); } Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp 2007-01-20 12:29:35 UTC (rev 6056) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp 2007-01-20 14:59:28 UTC (rev 6057) @@ -12,6 +12,7 @@ <%@ page import="java.io.PrintWriter" %> <%@ page import="org.jboss.portal.core.portlet.dashboard.ContentEditorRegistry" %> <%@ page import="org.jboss.portal.core.portlet.dashboard.ContentEditor" %> +<%@ page import="org.jboss.portal.core.model.content.Content" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> @@ -252,14 +253,11 @@ { Window window = (Window)j.next(); ContentType contentType = window.getContentType(); - if (ContentType.PORTLET.equals(contentType)) - { - PortletContent portletContent = (PortletContent)window.getContent(); + Content portletContent = window.getContent(); %> - <option value="<%= window.getName() %>"><%= portletContent.getInstanceRef() %> + <option value="<%= window.getName() %>"><%= portletContent.getDisplayName().getDefaultString() %> </option> <% - } } %> </select> Modified: trunk/core-cms/build.xml =================================================================== --- trunk/core-cms/build.xml 2007-01-20 12:29:35 UTC (rev 6056) +++ trunk/core-cms/build.xml 2007-01-20 14:59:28 UTC (rev 6057) @@ -344,14 +344,14 @@ description="Deploy." depends="output"> <require file="${jboss.home}/server/${portal.deploy.dir}"/> -  + <copy file="${build.lib}/portal-cms.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> </target> <target name="deploy-ha" description="Deploy high availability." depends="output-ha"> <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> -  + <copy file="${build.lib}/portal-cms-ha.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}"/> </target>  + <delete file="${jboss.home}/server/${portal.deploy.dir}/portam-cms.sar"/> </target> <target name="undeploy-ha" description="Undeploy." depends="init"> <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> -  + <delete file="${jboss.home}/server/${portal-ha.deploy.dir}/portal-cms-ha.sar"/> </target> <target name="tests" depends="init, _buildmagic:configure:deployment"> Added: trunk/core-cms/src/main/org/jboss/portal/core/cms/editor/CMSContentEditor.java =================================================================== --- trunk/core-cms/src/main/org/jboss/portal/core/cms/editor/CMSContentEditor.java (rev 0) +++ trunk/core-cms/src/main/org/jboss/portal/core/cms/editor/CMSContentEditor.java 2007-01-20 14:59:28 UTC (rev 6057) @@ -0,0 +1,77 @@ +/****************************************************************************** + * 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.core.cms.editor; + +import org.jboss.portal.core.portlet.dashboard.AddWindowContext; +import org.jboss.portal.core.portlet.dashboard.AbstractContentEditor; +import org.jboss.portal.cms.CMS; +import org.jboss.portal.cms.Command; +import org.jboss.portal.cms.model.File; + +import javax.portlet.RenderRequest; +import javax.portlet.ActionRequest; +import java.io.PrintWriter; +import java.util.List; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class CMSContentEditor extends AbstractContentEditor +{ + + /** . */ + private CMS cms; + + public CMS getCMS() + { + return cms; + } + + public void setCMS(CMS cms) + { + this.cms = cms; + } + + public void show(RenderRequest req, PrintWriter writer) + { + Command cmd = cms.getCommandFactory().createFileGetListCommand("/"); + List list = (List)cms.execute(cmd); + writer.println("<select name=\"available_instances\" multiple=\"true\" size=\"20\">\n"); + for (int i = 0; i < list.size(); i++) + { + File instance = (File)list.get(i); + writer.print("<option value=\""); + writer.print(instance.getBaseUUID()); + writer.print("\">"); + writer.print(instance.getName()); + writer.println("</option>\n"); + } + writer.println("</select>"); + } + + public void add(ActionRequest req, AddWindowContext ctx) + { + // todo + } +} Modified: trunk/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml =================================================================== --- trunk/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2007-01-20 12:29:35 UTC (rev 6056) +++ trunk/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2007-01-20 14:59:28 UTC (rev 6057) @@ -626,4 +626,18 @@ optional-attribute-name="StackFactory">portal:service=InterceptorStackFactory,type=Server</depends> </mbean> + <mbean + code="org.jboss.portal.core.cms.editor.CMSContentEditor" + name="portal:service=ContentEditor,type=cms" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <depends + optional-attribute-name="Registry" + proxy-type="attribute">portal:registry=ContentEditor</depends> + <depends + optional-attribute-name="CMS" + proxy-type="attribute">portal:service=CMS</depends> + <attribute name="ContentType">cms</attribute> + </mbean> </server>

17 years, 5 months

1
0
0 / 0

JBoss Portal SVN: r6056 - in trunk/core/src/main/org/jboss/portal/core: impl/model and 1 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-01-20 07:29:35 -0500 (Sat, 20 Jan 2007) New Revision: 6056 Modified: trunk/core/src/main/org/jboss/portal/core/controller/classic/ClassicController.java trunk/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/PortletContentEditor.java Log: JBPORTAL_1200 : Dashboard - window operations fail Modified: trunk/core/src/main/org/jboss/portal/core/controller/classic/ClassicController.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/classic/ClassicController.java 2007-01-19 21:49:16 UTC (rev 6055) +++ trunk/core/src/main/org/jboss/portal/core/controller/classic/ClassicController.java 2007-01-20 12:29:35 UTC (rev 6056) @@ -142,6 +142,7 @@ } catch (ResourceNotFoundException e) { + log.error("Resource not found " + e.getRef(), e); AbstractResponseHandler.sendStatusCode(invocation, HttpServletResponse.SC_NOT_FOUND); } catch (ControllerException e) Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java 2007-01-19 21:49:16 UTC (rev 6055) +++ trunk/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java 2007-01-20 12:29:35 UTC (rev 6056) @@ -166,7 +166,7 @@ // Content content = window.getContent(); String instanceId = ((PortletContent)content).getInstanceRef(); - if (instanceId == null) + if (instanceId == null) { return null; } Modified: trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/PortletContentEditor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/PortletContentEditor.java 2007-01-19 21:49:16 UTC (rev 6055) +++ trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/PortletContentEditor.java 2007-01-20 12:29:35 UTC (rev 6056) @@ -60,10 +60,10 @@ for (int i = 0; i < available_instances.size(); i++) { Instance instance = (Instance)available_instances.get(i); - writer.println("<option value=\""); - writer.println(instance.getId()); - writer.println("\">"); - writer.println(instance.getId()); + writer.print("<option value=\""); + writer.print(instance.getId()); + writer.print("\">"); + writer.print(instance.getId()); writer.println("</option>\n"); } writer.println("</select>"); @@ -76,8 +76,18 @@ { for (int i = 0; i < copyInstance.length; i++) { - PortletContent content = (PortletContent)ctx.createWindow(ContentType.PORTLET); - content.setInstanceRef(copyInstance[i]); + String instanceRef = copyInstance[i]; + Instance instance = instanceContainer.getDefinition(instanceRef); + if (instance != null) + { + PortletContent content = (PortletContent)ctx.createWindow(ContentType.PORTLET); + content.setInstanceRef(instanceRef); + } + else + { + // Handle me + System.out.println("Instance not found " + instanceRef); + } } } catch (Exception e)

17 years, 5 months

1
0
0 / 0

JBoss Portal SVN: r6055 - trunk/identity.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2007-01-19 16:49:16 -0500 (Fri, 19 Jan 2007) New Revision: 6055 Modified: trunk/identity/build.xml Log: - another change to try having testsuite behave well in CC env Modified: trunk/identity/build.xml =================================================================== --- trunk/identity/build.xml 2007-01-19 21:45:47 UTC (rev 6054) +++ trunk/identity/build.xml 2007-01-19 21:49:16 UTC (rev 6055) @@ -314,8 +314,8 @@  <target name="undeploy-ldap" depends="init" if="HAVE_JDK_1.5"> - <delete file="${jboss.home}/server/${portal.deploy.dir}/test-identity.sar" failonerror="false" deleteonexit="true"/> - <delete dir="${jboss.home}/server/default/conf/opends" failonerror="false" deleteonexit="true"/> + <delete file="${jboss.home}/server/${portal.deploy.dir}/test-identity.sar" failonerror="false" deleteonexit="true" quiet="true"/> + <delete dir="${jboss.home}/server/default/conf/opends" failonerror="false" deleteonexit="true" quiet="true"/> </target> <target name="tests" depends="init, tests15">

17 years, 5 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 January 2007