November 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r8906 - in branches/UIServer/uiserver/src/main/org/jboss/portal/presentation: model and 1 other directory.

by portal-commits＠lists.jboss.org

Author: sohil.shah(a)jboss.com Date: 2007-11-13 12:07:24 -0500 (Tue, 13 Nov 2007) New Revision: 8906 Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Component.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Container.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Page.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Portal.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/PortalObject.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Window.java Log: refactoring Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Component.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Component.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Component.java 2007-11-13 17:07:24 UTC (rev 8906) @@ -0,0 +1,53 @@ +/****************************************************************************** + * 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.presentation.model; + +import java.io.Serializable; + +/** + * Component represents a UI entity that will be rendered eventually on the client + * + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public interface Component extends Serializable +{ + /** + * + * @return + */ + public String getId(); + + /** + * + * @param id + */ + public void setId(String id); + + + /** + * + * @return + */ + public String getMarkup(); +} Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Container.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Container.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Container.java 2007-11-13 17:07:24 UTC (rev 8906) @@ -0,0 +1,134 @@ +/****************************************************************************** + * 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.presentation.model; + +import java.io.Serializable; +import java.util.List; +import java.util.ArrayList; + +/** + * Container is an organizational entity which aggregates the Components that will be rendered on the client + * + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public class Container implements Serializable +{ + /** + * required unique id of the container. uniqueness in relation to + * other containers added to the same instance of the page + */ + protected String id = null; + + + /** + * + */ + private List components = null; + + /** + * + * + */ + public Container(String id) + { + this.id = id; + this.components = new ArrayList(); + } + + /** + * + * @return + */ + public String getId() + { + return id; + } + + /** + * + * @param id + */ + public void setId(String id) + { + this.id = id; + } + + + /** + * + * @return + */ + public List getComponents() + { + return components; + } + + /** + * + * @param components + */ + public void setComponents(List components) + { + this.components = components; + } + + /** + * + * @param componentId + * @return + */ + public Component getComponent(String componentId) + { + Component component = null; + + if(this.components != null) + { + for(int i=0;i<this.components.size();i++) + { + Component cour = (Component)this.components.get(i); + if(cour.getId().equals(componentId)) + { + component = cour; + break; + } + } + } + + return component; + } + + /** + * + * @param component + */ + public void addComponent(Component component) + { + if(this.components == null) + { + this.components = new ArrayList(); + } + + this.components.add(component); + } +} Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Page.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Page.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Page.java 2007-11-13 17:07:24 UTC (rev 8906) @@ -0,0 +1,132 @@ +/****************************************************************************** + * 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.presentation.model; + +import java.util.Iterator; +import java.util.List; +import java.util.ArrayList; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public class Page extends PortalObject +{ + /** + * A page consists of multiple containers that are to be displayed/aggregated along with their corresponding + * UI components + */ + private List containers = null; + + /** + * Signifies if this page is currently being displayed on the client + */ + private boolean currentlyDisplayed = false; + + /** + * + * + */ + public Page() + { + super(); + this.containers = new ArrayList(); + } + + /** + * + */ + public String toString() + { + return "Page: "+super.toString(); + } + + /** + * + * @return + */ + public List getWindows() + { + List windows = new ArrayList(); + + if(this.children != null) + { + for(Iterator itr=this.children.iterator(); itr.hasNext();) + { + Object child = itr.next(); + + if(child instanceof Window) + { + windows.add(child); + } + } + } + + return windows; + } + + /** + * + * @return + */ + public List getContainers() + { + return containers; + } + + /** + * + * @param containers + */ + public void setContainers(List containers) + { + this.containers = containers; + } + + /** + * + * @param container + */ + public void addContainer(Container container) + { + this.getContainers().add(container); + } + + /** + * + * @return + */ + public boolean isCurrentlyDisplayed() + { + return currentlyDisplayed; + } + + /** + * + * @param currentlyDisplayed + */ + public void setCurrentlyDisplayed(boolean currentlyDisplayed) + { + this.currentlyDisplayed = currentlyDisplayed; + } +} Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Portal.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Portal.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Portal.java 2007-11-13 17:07:24 UTC (rev 8906) @@ -0,0 +1,39 @@ +/****************************************************************************** + * 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.presentation.model; + + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public class Portal extends PortalObject +{ + /** + * + */ + public String toString() + { + return "Portal: "+super.toString(); + } +} Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/PortalObject.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/PortalObject.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/PortalObject.java 2007-11-13 17:07:24 UTC (rev 8906) @@ -0,0 +1,212 @@ +/****************************************************************************** + * 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.presentation.model; + +import java.io.Serializable; +import java.util.Map; +import java.util.Collection; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.HashMap; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public abstract class PortalObject implements Serializable +{ + protected String id = null; + protected String name = null; + protected PortalObject parent = null; + protected Collection children = null; + protected Map properties = null; + + /** + * + * + */ + public PortalObject() + { + this.children = new ArrayList(); + this.properties = new HashMap(5); + } + + /** + * + * @param id + * @param name + * @param parent + * @param children + */ + public PortalObject(String id, String name, PortalObject parent, Collection children) + { + this.id = id; + this.name = name; + this.parent = parent; + this.children = children; + } + + /** + * + * @return + */ + public String getId() + { + return id; + } + + /** + * + * @param id + */ + public void setId(String id) + { + this.id = id; + } + + /** + * + * @return + */ + public String getName() + { + return name; + } + + /** + * + * @param name + */ + public void setName(String name) + { + this.name = name; + } + + /** + * + * @return + */ + public PortalObject getParent() + { + return parent; + } + + /** + * + * @param parent + */ + public void setParent(PortalObject parent) + { + this.parent = parent; + } + + /** + * + * @return + */ + public Collection getChildren() + { + if(this.children == null) + { + this.children = new ArrayList(); + } + return children; + } + + /** + * + * @param children + */ + public void setChildren(Collection children) + { + this.children = children; + } + + /** + * Recursively traverses the Portal Object's children tree to find a child registered with the + * specified id + * + * @param id + * @return + */ + public PortalObject findChild(String id) + { + PortalObject child = null; + + for(Iterator itr=this.children.iterator(); itr.hasNext();) + { + PortalObject cour = (PortalObject)itr.next(); + if(cour.id.equals(id)) + { + child = cour; + } + else + { + child = cour.findChild(id); + } + + if(child != null) + { + return child; + } + } + + return child; + } + + /** + * + * @return + */ + public Map getProperties() + { + return properties; + } + + /** + * + * @param properties + */ + public void setProperties(Map properties) + { + this.properties = properties; + } + + /** + * + */ + public String toString() + { + String rep = null; + + StringBuffer buffer = new StringBuffer(); + buffer.append("["); + buffer.append("id="+this.id+","); + buffer.append("name="+this.name); + buffer.append("]"); + + rep = buffer.toString(); + + return rep; + } +} Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Window.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Window.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model/Window.java 2007-11-13 17:07:24 UTC (rev 8906) @@ -0,0 +1,240 @@ +/****************************************************************************** + * 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.presentation.model; + +import java.util.Map; +import java.util.HashMap; + +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; + + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public class Window extends PortalObject implements Component +{ + /** + * Title for this Window + */ + private String title = null; + + /** + * Content/Markup to be displayed inside this Window + */ + private String content = null; + + /** + * Content/Markup related to the header of this Window + */ + private final String headerContent; + + /** + * The State of this Window such as Normal, Maximized, Minimized etc + */ + private final WindowState windowState; + + /** + * The Mode of this Window such as View, Edit, Help etc + */ + private final Mode mode; + + /** + * Runtime View related meta data associated with this particular window. + * + * The meta data is provided in the form of Name/Value pairs with Name being the key of the and Value being the Value + * of a Map entry + */ + private Map viewMetaData = null; + + + /** + * + * + */ + public Window() + { + super(); + this.viewMetaData = new HashMap(5); + this.headerContent = null; + this.windowState = null; + this.mode = null; + } + + /** + * + * + */ + public Window(String id,String title, String content, String headerContent, WindowState windowState, Mode mode) + { + super(); + this.viewMetaData = new HashMap(5); + this.id = id; + this.title = title; + this.content = content; + this.headerContent = headerContent; + this.windowState = windowState; + this.mode = mode; + } + + /** + * + * @param id + * @param content + */ + public Window(String id, String content) + { + super(); + this.viewMetaData = new HashMap(5); + this.id = id; + this.content = content; + this.headerContent = null; + this.windowState = null; + this.mode = null; + } + + /** + * + * @param id + * @param content + */ + public Window(String id) + { + super(); + this.viewMetaData = new HashMap(5); + this.id = id; + this.headerContent = null; + this.windowState = null; + this.mode = null; + } + + + /** + * + * @return + */ + public String getContent() + { + return content; + } + + + /** + * + * @param content + */ + public void setContent(String content) + { + this.content = content; + } + + + /** + * + * @return + */ + public String getHeaderContent() + { + return headerContent; + } + + + /** + * + * @return + */ + public Mode getMode() + { + return mode; + } + + + /** + * + * @return + */ + public String getTitle() + { + return title; + } + + + /** + * + * @param title + */ + public void setTitle(String title) + { + this.title = title; + } + + + /** + * + * @return + */ + public WindowState getWindowState() + { + return windowState; + } + + + /** + * + */ + public String toString() + { + return "Window: "+super.toString(); + } + + /** + * + */ + public String getMarkup() + { + String markup = ""; + + markup = this.content; + + return markup; + } + + /** + * + * @return + */ + public Map getViewMetaData() + { + return viewMetaData; + } + + /** + * + * @param viewMetaData + */ + public void setViewMetaData(Map viewMetaData) + { + this.viewMetaData = viewMetaData; + } +}

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r8905 - in branches/UIServer: uiserver/src/main/org/jboss/portal and 2 other directories.

by portal-commits＠lists.jboss.org

Author: sohil.shah(a)jboss.com Date: 2007-11-13 11:55:45 -0500 (Tue, 13 Nov 2007) New Revision: 8905 Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestFlexibleGrid.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestRegionLayoutManager.java Removed: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestFlexibleGrid.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestRegionLayoutManager.java branches/UIServer/uiserver/src/main/org/jboss/portal/test/ Modified: branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/PortalObjectReaderImpl.java Log: refactoring Modified: branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java =================================================================== --- branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java 2007-11-13 16:51:35 UTC (rev 8904) +++ branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java 2007-11-13 16:55:45 UTC (rev 8905) @@ -46,11 +46,11 @@ import org.jboss.portal.theme.page.WindowResult; import org.jboss.portal.presentation.RequestContext; +import org.jboss.portal.presentation.model.Page; +import org.jboss.portal.presentation.model.Window; import org.jboss.portal.presentation.server.Processor; import org.jboss.portal.presentation.server.ProcessorRequest; import org.jboss.portal.presentation.server.ProcessorResponse; -import org.jboss.portal.uiserver.protocol.Page; -import org.jboss.portal.uiserver.protocol.Window; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> Modified: branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/PortalObjectReaderImpl.java =================================================================== --- branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/PortalObjectReaderImpl.java 2007-11-13 16:51:35 UTC (rev 8904) +++ branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/PortalObjectReaderImpl.java 2007-11-13 16:55:45 UTC (rev 8905) @@ -31,10 +31,10 @@ import org.jboss.portal.core.model.portal.PortalObjectContainer; import org.jboss.portal.core.model.portal.PortalContainer; -import org.jboss.portal.uiserver.protocol.Portal; -import org.jboss.portal.uiserver.protocol.PortalObject; -import org.jboss.portal.uiserver.protocol.Page; -import org.jboss.portal.uiserver.protocol.Window; +import org.jboss.portal.presentation.model.Page; +import org.jboss.portal.presentation.model.Portal; +import org.jboss.portal.presentation.model.PortalObject; +import org.jboss.portal.presentation.model.Window; import org.jboss.portal.presentation.server.PortalObjectReader; /** Copied: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout (from rev 8903, branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout) Deleted: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestFlexibleGrid.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout/TestFlexibleGrid.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestFlexibleGrid.java 2007-11-13 16:55:45 UTC (rev 8905) @@ -1,205 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.test.uiserver.layout; - -import junit.framework.TestCase; - -import org.apache.log4j.Logger; - -import java.io.FileOutputStream; - -import org.jboss.portal.uiserver.protocol.Container; -import org.jboss.portal.uiserver.protocol.Window; -import org.jboss.portal.uiserver.protocol.Page; -import org.jboss.portal.uiserver.layout.classic.FlexibleGrid; -import org.jboss.portal.uiserver.layout.classic.FlexibleGridConstraints; -import org.jboss.portal.uiserver.layout.classic.FlexibleGridLayoutManager; - -/** - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - * - */ -public class TestFlexibleGrid extends TestCase -{ - /** - * - */ - private static Logger log = Logger.getLogger(TestFlexibleGrid.class); - - /** - * - */ - protected void setUp() throws Exception - { - } - - /** - * - */ - protected void tearDown() throws Exception - { - } - - /** - * - * @throws Exception - */ - public void testDoLayout() throws Exception - { - // Setup a Page and a container with two portlet windows... - // This part is generic with no decoupling to anything layout specific - String htmlContent = this.getHtmlContent(); - Page page = new Page(); - Container container = new Container("container-1"); - Window window1 = new Window("window-1", htmlContent); - Window window2 = new Window("window-2", htmlContent); - container.addComponent(window1); - container.addComponent(window2); - page.addContainer(container); - - Container container2 = new Container("container-2"); - container2.addComponent(window1); - container2.addComponent(window2); - page.addContainer(container2); - - - // Setup a Flexible Grid for laying out a container of portlet windows - FlexibleGrid grid1 = this.getGrid("container-1", 1, 2); - FlexibleGridConstraints constraints = this.getConstraints("window-1", "50", 0, 0, 25, 0, 0, 0); - FlexibleGridConstraints constraints2 = this.getConstraints("window-1", "50", 0, 0, 25, 0, 0, 1); - FlexibleGridConstraints[] firstGridConstraints = { constraints, constraints2 }; - grid1.setConstraints(firstGridConstraints); - - - //Setup another Grid to be added right next to the previous grid - FlexibleGrid grid2 = this.getGrid("container-2", 1, 2); - constraints = this.getConstraints("window-1", "50", 0, 0, 25, 0, 0, 0); - constraints2 = this.getConstraints("window-1", "50", 0, 0, 25, 0, 0, 1); - FlexibleGridConstraints[] secondGridConstraints = { constraints, constraints2 }; - grid2.setConstraints(secondGridConstraints); - - - // Setup the FlexibleGridLayoutManager for doing a layout and apply it - // to the Page - FlexibleGrid[] row1 = { grid1 }; - FlexibleGrid[] row2 = { grid2 }; - FlexibleGridLayoutManager layoutManager = new FlexibleGridLayoutManager(); - layoutManager.addRowOfGrids(row1); - layoutManager.addRowOfGrids(row2); - - // Perform the actual layout of the Page using the - // FlexibleGridLayoutManager - String output = layoutManager.doLayout(page); - - log.info("--------------------------------------"); - log.info(output); - log.info("--------------------------------------"); - - // Write this output to local file to test in a browser - FileOutputStream fos = new FileOutputStream( - "/home/soshah/html/layout/flexibleGrid.html"); - - StringBuffer buffer = new StringBuffer(); - - buffer - .append("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"><html xmlns=\"http://www.w3.org/1999/xhtml\"><head><base href=\"http://localhost/\"/><title>CSS Layout Strategies</title><link rel=\"stylesheet\" type=\"text/css\" href=\"file:///home/soshah/html/layout/unitTest.css\"/></head><body id=\"body\">\n"); - buffer.append(output); - buffer.append("</body></html>\n"); - - fos.write(buffer.toString().getBytes()); - fos.flush(); - fos.close(); - } - - /** - * - * @return - */ - private String getHtmlContent() - { - String markup = null; - - try - { - java.io.FileInputStream fis = new java.io.FileInputStream( - "/home/soshah/html/layout/greetings.html"); - - StringBuffer buffer = new StringBuffer(); - int read = 0; - byte[] data = new byte[1000]; - while ((read = fis.read(data)) != -1) - { - byte[] bufferData = new byte[read]; - System.arraycopy(data, 0, bufferData, 0, read); - buffer.append(new String(bufferData)); - } - - markup = buffer.toString(); - fis.close(); - } - catch (Exception e) - { - - } - - return markup; - } - - /** - * - * @param containerId - * @param rows - * @param columns - * @return - */ - private FlexibleGrid getGrid(String containerId,int rows, int columns) - { - FlexibleGrid grid = new FlexibleGrid(containerId); - grid.setRows(rows); - grid.setColumns(columns); - return grid; - } - - /** - * - * @param componentId - * @param widthPercentage - * @param top - * @param bottom - * @param left - * @param right - */ - private FlexibleGridConstraints getConstraints(String componentId, String widthPercentage, int top, int bottom, int left, int right, int row, int column) - { - FlexibleGridConstraints constraints = new FlexibleGridConstraints(); - constraints.setComponentId(componentId); - constraints.setWidthPercentage(widthPercentage); - constraints.setRow(row); - constraints.setColumn(column); - constraints.setTop(top); - constraints.setBottom(bottom); - constraints.setLeft(left); - constraints.setRight(right); - return constraints; - } -} Copied: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestFlexibleGrid.java (from rev 8904, branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout/TestFlexibleGrid.java) =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestFlexibleGrid.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestFlexibleGrid.java 2007-11-13 16:55:45 UTC (rev 8905) @@ -0,0 +1,205 @@ +/****************************************************************************** + * 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.presentation.test.layout; + +import junit.framework.TestCase; + +import org.apache.log4j.Logger; + +import java.io.FileOutputStream; + +import org.jboss.portal.presentation.model.Container; +import org.jboss.portal.presentation.model.Page; +import org.jboss.portal.presentation.model.Window; +import org.jboss.portal.uiserver.layout.classic.FlexibleGrid; +import org.jboss.portal.uiserver.layout.classic.FlexibleGridConstraints; +import org.jboss.portal.uiserver.layout.classic.FlexibleGridLayoutManager; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public class TestFlexibleGrid extends TestCase +{ + /** + * + */ + private static Logger log = Logger.getLogger(TestFlexibleGrid.class); + + /** + * + */ + protected void setUp() throws Exception + { + } + + /** + * + */ + protected void tearDown() throws Exception + { + } + + /** + * + * @throws Exception + */ + public void testDoLayout() throws Exception + { + // Setup a Page and a container with two portlet windows... + // This part is generic with no decoupling to anything layout specific + String htmlContent = this.getHtmlContent(); + Page page = new Page(); + Container container = new Container("container-1"); + Window window1 = new Window("window-1", htmlContent); + Window window2 = new Window("window-2", htmlContent); + container.addComponent(window1); + container.addComponent(window2); + page.addContainer(container); + + Container container2 = new Container("container-2"); + container2.addComponent(window1); + container2.addComponent(window2); + page.addContainer(container2); + + + // Setup a Flexible Grid for laying out a container of portlet windows + FlexibleGrid grid1 = this.getGrid("container-1", 1, 2); + FlexibleGridConstraints constraints = this.getConstraints("window-1", "50", 0, 0, 25, 0, 0, 0); + FlexibleGridConstraints constraints2 = this.getConstraints("window-1", "50", 0, 0, 25, 0, 0, 1); + FlexibleGridConstraints[] firstGridConstraints = { constraints, constraints2 }; + grid1.setConstraints(firstGridConstraints); + + + //Setup another Grid to be added right next to the previous grid + FlexibleGrid grid2 = this.getGrid("container-2", 1, 2); + constraints = this.getConstraints("window-1", "50", 0, 0, 25, 0, 0, 0); + constraints2 = this.getConstraints("window-1", "50", 0, 0, 25, 0, 0, 1); + FlexibleGridConstraints[] secondGridConstraints = { constraints, constraints2 }; + grid2.setConstraints(secondGridConstraints); + + + // Setup the FlexibleGridLayoutManager for doing a layout and apply it + // to the Page + FlexibleGrid[] row1 = { grid1 }; + FlexibleGrid[] row2 = { grid2 }; + FlexibleGridLayoutManager layoutManager = new FlexibleGridLayoutManager(); + layoutManager.addRowOfGrids(row1); + layoutManager.addRowOfGrids(row2); + + // Perform the actual layout of the Page using the + // FlexibleGridLayoutManager + String output = layoutManager.doLayout(page); + + log.info("--------------------------------------"); + log.info(output); + log.info("--------------------------------------"); + + // Write this output to local file to test in a browser + FileOutputStream fos = new FileOutputStream( + "/home/soshah/html/layout/flexibleGrid.html"); + + StringBuffer buffer = new StringBuffer(); + + buffer + .append("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"><html xmlns=\"http://www.w3.org/1999/xhtml\"><head><base href=\"http://localhost/\"/><title>CSS Layout Strategies</title><link rel=\"stylesheet\" type=\"text/css\" href=\"file:///home/soshah/html/layout/unitTest.css\"/></head><body id=\"body\">\n"); + buffer.append(output); + buffer.append("</body></html>\n"); + + fos.write(buffer.toString().getBytes()); + fos.flush(); + fos.close(); + } + + /** + * + * @return + */ + private String getHtmlContent() + { + String markup = null; + + try + { + java.io.FileInputStream fis = new java.io.FileInputStream( + "/home/soshah/html/layout/greetings.html"); + + StringBuffer buffer = new StringBuffer(); + int read = 0; + byte[] data = new byte[1000]; + while ((read = fis.read(data)) != -1) + { + byte[] bufferData = new byte[read]; + System.arraycopy(data, 0, bufferData, 0, read); + buffer.append(new String(bufferData)); + } + + markup = buffer.toString(); + fis.close(); + } + catch (Exception e) + { + + } + + return markup; + } + + /** + * + * @param containerId + * @param rows + * @param columns + * @return + */ + private FlexibleGrid getGrid(String containerId,int rows, int columns) + { + FlexibleGrid grid = new FlexibleGrid(containerId); + grid.setRows(rows); + grid.setColumns(columns); + return grid; + } + + /** + * + * @param componentId + * @param widthPercentage + * @param top + * @param bottom + * @param left + * @param right + */ + private FlexibleGridConstraints getConstraints(String componentId, String widthPercentage, int top, int bottom, int left, int right, int row, int column) + { + FlexibleGridConstraints constraints = new FlexibleGridConstraints(); + constraints.setComponentId(componentId); + constraints.setWidthPercentage(widthPercentage); + constraints.setRow(row); + constraints.setColumn(column); + constraints.setTop(top); + constraints.setBottom(bottom); + constraints.setLeft(left); + constraints.setRight(right); + return constraints; + } +} Deleted: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestRegionLayoutManager.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout/TestRegionLayoutManager.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestRegionLayoutManager.java 2007-11-13 16:55:45 UTC (rev 8905) @@ -1,151 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.test.uiserver.layout; - -import junit.framework.TestCase; - -import org.apache.log4j.Logger; - -import java.io.FileOutputStream; - -import org.jboss.portal.uiserver.protocol.Container; -import org.jboss.portal.uiserver.protocol.Window; -import org.jboss.portal.uiserver.protocol.Page; -import org.jboss.portal.uiserver.layout.classic.RegionConstraints; -import org.jboss.portal.uiserver.layout.classic.RegionLayoutManager; - -/** - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - * - */ -public class TestRegionLayoutManager extends TestCase -{ - /** - * - */ - private static Logger log = Logger.getLogger(TestRegionLayoutManager.class); - - /** - * - */ - protected void setUp() throws Exception - { - } - - /** - * - */ - protected void tearDown() throws Exception - { - } - - /** - * - * @throws Exception - */ - public void testDoLayout() throws Exception - { - // Setup a Page and a container with two portlet windows... - // This part is generic with no decoupling to anything layout specific - String htmlContent = this.getHtmlContent(); - Page page = new Page(); - Container container = new Container("container-1"); - Window window1 = new Window("window-1", htmlContent); - Window window2 = new Window("window-2", htmlContent); - container.addComponent(window1); - container.addComponent(window2); - page.addContainer(container); - - Container container2 = new Container("container-2"); - Window window3 = new Window("window-3", htmlContent); - Window window4 = new Window("window-4", htmlContent); - container2.addComponent(window3); - container2.addComponent(window4); - page.addContainer(container2); - - - // Setup a two RegionConstraints for laying out using RegionLayoutManager - RegionConstraints leftRegion = new RegionConstraints("container-1",RegionConstraints.LEFT); - RegionConstraints centerRegion = new RegionConstraints("container-2",RegionConstraints.CENTER); - RegionLayoutManager layoutManager = new RegionLayoutManager(); - layoutManager.addRegionConstraints(leftRegion); - layoutManager.addRegionConstraints(centerRegion); - - // Perform the actual layout of the Page using the - // RegionLayoutManager - String output = layoutManager.doLayout(page); - - log.info("--------------------------------------"); - log.info(output); - log.info("--------------------------------------"); - - // Write this output to local file to test in a browser - FileOutputStream fos = new FileOutputStream( - "/home/soshah/html/layout/regionLayout.html"); - - StringBuffer buffer = new StringBuffer(); - - buffer - .append("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"><html xmlns=\"http://www.w3.org/1999/xhtml\"><head><base href=\"http://localhost/\"/><title>CSS Layout Strategies</title><link rel=\"stylesheet\" type=\"text/css\" href=\"file:///home/soshah/html/layout/unitTest.css\"/></head><body id=\"body\">\n"); - buffer.append(output); - buffer.append("</body></html>\n"); - - fos.write(buffer.toString().getBytes()); - fos.flush(); - fos.close(); - } - - /** - * - * @return - */ - private String getHtmlContent() - { - String markup = null; - - try - { - java.io.FileInputStream fis = new java.io.FileInputStream( - "/home/soshah/html/layout/greetings2.html"); - - StringBuffer buffer = new StringBuffer(); - int read = 0; - byte[] data = new byte[1000]; - while ((read = fis.read(data)) != -1) - { - byte[] bufferData = new byte[read]; - System.arraycopy(data, 0, bufferData, 0, read); - buffer.append(new String(bufferData)); - } - - markup = buffer.toString(); - fis.close(); - } - catch (Exception e) - { - - } - - return markup; - } -} Copied: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestRegionLayoutManager.java (from rev 8904, branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout/TestRegionLayoutManager.java) =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestRegionLayoutManager.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/layout/TestRegionLayoutManager.java 2007-11-13 16:55:45 UTC (rev 8905) @@ -0,0 +1,151 @@ +/****************************************************************************** + * 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.presentation.test.layout; + +import junit.framework.TestCase; + +import org.apache.log4j.Logger; + +import java.io.FileOutputStream; + +import org.jboss.portal.presentation.model.Container; +import org.jboss.portal.presentation.model.Page; +import org.jboss.portal.presentation.model.Window; +import org.jboss.portal.uiserver.layout.classic.RegionConstraints; +import org.jboss.portal.uiserver.layout.classic.RegionLayoutManager; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public class TestRegionLayoutManager extends TestCase +{ + /** + * + */ + private static Logger log = Logger.getLogger(TestRegionLayoutManager.class); + + /** + * + */ + protected void setUp() throws Exception + { + } + + /** + * + */ + protected void tearDown() throws Exception + { + } + + /** + * + * @throws Exception + */ + public void testDoLayout() throws Exception + { + // Setup a Page and a container with two portlet windows... + // This part is generic with no decoupling to anything layout specific + String htmlContent = this.getHtmlContent(); + Page page = new Page(); + Container container = new Container("container-1"); + Window window1 = new Window("window-1", htmlContent); + Window window2 = new Window("window-2", htmlContent); + container.addComponent(window1); + container.addComponent(window2); + page.addContainer(container); + + Container container2 = new Container("container-2"); + Window window3 = new Window("window-3", htmlContent); + Window window4 = new Window("window-4", htmlContent); + container2.addComponent(window3); + container2.addComponent(window4); + page.addContainer(container2); + + + // Setup a two RegionConstraints for laying out using RegionLayoutManager + RegionConstraints leftRegion = new RegionConstraints("container-1",RegionConstraints.LEFT); + RegionConstraints centerRegion = new RegionConstraints("container-2",RegionConstraints.CENTER); + RegionLayoutManager layoutManager = new RegionLayoutManager(); + layoutManager.addRegionConstraints(leftRegion); + layoutManager.addRegionConstraints(centerRegion); + + // Perform the actual layout of the Page using the + // RegionLayoutManager + String output = layoutManager.doLayout(page); + + log.info("--------------------------------------"); + log.info(output); + log.info("--------------------------------------"); + + // Write this output to local file to test in a browser + FileOutputStream fos = new FileOutputStream( + "/home/soshah/html/layout/regionLayout.html"); + + StringBuffer buffer = new StringBuffer(); + + buffer + .append("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"><html xmlns=\"http://www.w3.org/1999/xhtml\"><head><base href=\"http://localhost/\"/><title>CSS Layout Strategies</title><link rel=\"stylesheet\" type=\"text/css\" href=\"file:///home/soshah/html/layout/unitTest.css\"/></head><body id=\"body\">\n"); + buffer.append(output); + buffer.append("</body></html>\n"); + + fos.write(buffer.toString().getBytes()); + fos.flush(); + fos.close(); + } + + /** + * + * @return + */ + private String getHtmlContent() + { + String markup = null; + + try + { + java.io.FileInputStream fis = new java.io.FileInputStream( + "/home/soshah/html/layout/greetings2.html"); + + StringBuffer buffer = new StringBuffer(); + int read = 0; + byte[] data = new byte[1000]; + while ((read = fis.read(data)) != -1) + { + byte[] bufferData = new byte[read]; + System.arraycopy(data, 0, bufferData, 0, read); + buffer.append(new String(bufferData)); + } + + markup = buffer.toString(); + fis.close(); + } + catch (Exception e) + { + + } + + return markup; + } +}

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r8904 - in branches/UIServer/uiserver/src/main/org/jboss/portal: presentation/server and 6 other directories.

by portal-commits＠lists.jboss.org

Author: sohil.shah(a)jboss.com Date: 2007-11-13 11:51:35 -0500 (Tue, 13 Nov 2007) New Revision: 8904 Removed: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/protocol/ Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/LinkActivation.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PortalObjectReader.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/ProcessorResponse.java branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout/TestFlexibleGrid.java branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout/TestRegionLayoutManager.java branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/LayoutManager.java branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/LayoutService.java branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/FlexibleGrid.java branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/FlexibleGridLayoutManager.java branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/RegionLayoutManager.java branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/PortalEntryPoint.java branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/UIServer.java branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/ajax/PortalEntryPoint.java Log: refactoring Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/LinkActivation.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/LinkActivation.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/LinkActivation.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -24,8 +24,8 @@ import java.util.Map; -import org.jboss.portal.uiserver.protocol.Portal; -import org.jboss.portal.uiserver.protocol.PortalObject; +import org.jboss.portal.presentation.model.Portal; +import org.jboss.portal.presentation.model.PortalObject; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PortalObjectReader.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PortalObjectReader.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PortalObjectReader.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.server; -import org.jboss.portal.uiserver.protocol.Portal; -import org.jboss.portal.uiserver.protocol.PortalObject; +import org.jboss.portal.presentation.model.Portal; +import org.jboss.portal.presentation.model.PortalObject; /** * The PortalObjectReader service is used to provide information about different Portal Objects stored in the system Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/ProcessorResponse.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/ProcessorResponse.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/ProcessorResponse.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -27,7 +27,7 @@ import org.jboss.portal.web.ServletContextDispatcher; -import org.jboss.portal.uiserver.protocol.Page; +import org.jboss.portal.presentation.model.Page; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout/TestFlexibleGrid.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout/TestFlexibleGrid.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout/TestFlexibleGrid.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -28,9 +28,9 @@ import java.io.FileOutputStream; -import org.jboss.portal.uiserver.protocol.Container; -import org.jboss.portal.uiserver.protocol.Window; -import org.jboss.portal.uiserver.protocol.Page; +import org.jboss.portal.presentation.model.Container; +import org.jboss.portal.presentation.model.Page; +import org.jboss.portal.presentation.model.Window; import org.jboss.portal.uiserver.layout.classic.FlexibleGrid; import org.jboss.portal.uiserver.layout.classic.FlexibleGridConstraints; import org.jboss.portal.uiserver.layout.classic.FlexibleGridLayoutManager; Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout/TestRegionLayoutManager.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout/TestRegionLayoutManager.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/test/uiserver/layout/TestRegionLayoutManager.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -28,9 +28,9 @@ import java.io.FileOutputStream; -import org.jboss.portal.uiserver.protocol.Container; -import org.jboss.portal.uiserver.protocol.Window; -import org.jboss.portal.uiserver.protocol.Page; +import org.jboss.portal.presentation.model.Container; +import org.jboss.portal.presentation.model.Page; +import org.jboss.portal.presentation.model.Window; import org.jboss.portal.uiserver.layout.classic.RegionConstraints; import org.jboss.portal.uiserver.layout.classic.RegionLayoutManager; Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/LayoutManager.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/LayoutManager.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/LayoutManager.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.uiserver.layout; -import org.jboss.portal.uiserver.protocol.Page; +import org.jboss.portal.presentation.model.Page; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/LayoutService.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/LayoutService.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/LayoutService.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.uiserver.layout; -import org.jboss.portal.uiserver.protocol.Page; +import org.jboss.portal.presentation.model.Page; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/FlexibleGrid.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/FlexibleGrid.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/FlexibleGrid.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -24,8 +24,8 @@ import org.apache.log4j.Logger; -import org.jboss.portal.uiserver.protocol.Container; -import org.jboss.portal.uiserver.protocol.Window; +import org.jboss.portal.presentation.model.Container; +import org.jboss.portal.presentation.model.Window; import java.io.Serializable; Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/FlexibleGridLayoutManager.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/FlexibleGridLayoutManager.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/FlexibleGridLayoutManager.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.uiserver.layout.classic; -import org.jboss.portal.uiserver.protocol.Container; -import org.jboss.portal.uiserver.protocol.Page; +import org.jboss.portal.presentation.model.Container; +import org.jboss.portal.presentation.model.Page; import org.jboss.portal.uiserver.layout.LayoutManager; Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/RegionLayoutManager.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/RegionLayoutManager.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/layout/classic/RegionLayoutManager.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -25,10 +25,10 @@ import java.util.List; import java.util.ArrayList; +import org.jboss.portal.presentation.model.Container; +import org.jboss.portal.presentation.model.Page; +import org.jboss.portal.presentation.model.Window; import org.jboss.portal.uiserver.layout.LayoutManager; -import org.jboss.portal.uiserver.protocol.Page; -import org.jboss.portal.uiserver.protocol.Container; -import org.jboss.portal.uiserver.protocol.Window; /** * This layout manager splits the page up into Regions. Containers which contain the Portlet Windows Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/PortalEntryPoint.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/PortalEntryPoint.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/PortalEntryPoint.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -66,9 +66,9 @@ import org.jboss.portal.uiserver.layout.classic.FlexibleGridLayoutManager; import org.jboss.portal.uiserver.layout.classic.RegionConstraints; import org.jboss.portal.uiserver.layout.classic.RegionLayoutManager; -import org.jboss.portal.uiserver.protocol.Container; -import org.jboss.portal.uiserver.protocol.Page; -import org.jboss.portal.uiserver.protocol.Window; +import org.jboss.portal.presentation.model.Container; +import org.jboss.portal.presentation.model.Page; +import org.jboss.portal.presentation.model.Window; import org.jboss.portal.presentation.server.ProcessorResponse; /** Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/UIServer.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/UIServer.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/UIServer.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest; -import org.jboss.portal.uiserver.protocol.PortalObject; -import org.jboss.portal.uiserver.protocol.Portal; import org.jboss.portal.presentation.RequestContext; +import org.jboss.portal.presentation.model.Portal; +import org.jboss.portal.presentation.model.PortalObject; import org.jboss.portal.presentation.server.ProcessorRequest; import org.jboss.portal.presentation.server.ProcessorResponse; import org.jboss.portal.presentation.server.PresentationServer; Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/ajax/PortalEntryPoint.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/ajax/PortalEntryPoint.java 2007-11-13 16:25:06 UTC (rev 8903) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/ajax/PortalEntryPoint.java 2007-11-13 16:51:35 UTC (rev 8904) @@ -142,7 +142,7 @@ { Page display = null; - org.jboss.portal.uiserver.protocol.Page portalPage = processorResponse + org.jboss.portal.presentation.model.Page portalPage = processorResponse .findDisplayedPage(); // Construct the ajax currentPage object from the portalPage that has been @@ -158,7 +158,7 @@ display.setWindows(windows); for(int i=0; i<pageWindows.size(); i++) { - org.jboss.portal.uiserver.protocol.Window pageWindow = (org.jboss.portal.uiserver.protocol.Window)pageWindows.get(i); + org.jboss.portal.presentation.model.Window pageWindow = (org.jboss.portal.presentation.model.Window)pageWindows.get(i); Window window = new Window(); window.setName(pageWindow.getName()); window.setContent(pageWindow.getContent());

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r8903 - in branches/UIServer: uiserver/src/main/org/jboss/portal/presentation/action/server and 2 other directories.

by portal-commits＠lists.jboss.org

Author: sohil.shah(a)jboss.com Date: 2007-11-13 11:25:06 -0500 (Tue, 13 Nov 2007) New Revision: 8903 Modified: branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/LinkActivation.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/Processor.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/ProcessorRequest.java branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/UIServer.java Log: refactoring Modified: branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java =================================================================== --- branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java 2007-11-13 15:43:48 UTC (rev 8902) +++ branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java 2007-11-13 16:25:06 UTC (rev 8903) @@ -45,6 +45,7 @@ import org.jboss.portal.theme.page.WindowContext; import org.jboss.portal.theme.page.WindowResult; +import org.jboss.portal.presentation.RequestContext; import org.jboss.portal.presentation.server.Processor; import org.jboss.portal.presentation.server.ProcessorRequest; import org.jboss.portal.presentation.server.ProcessorResponse; @@ -88,7 +89,7 @@ /** * */ - public ProcessorResponse process(ProcessorRequest request) throws ServerException + public ProcessorResponse process(RequestContext requestContext, ProcessorRequest request) throws ServerException { try { Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/LinkActivation.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/LinkActivation.java 2007-11-13 15:43:48 UTC (rev 8902) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/LinkActivation.java 2007-11-13 16:25:06 UTC (rev 8903) @@ -24,6 +24,9 @@ import java.util.Map; +import org.jboss.portal.uiserver.protocol.Portal; +import org.jboss.portal.uiserver.protocol.PortalObject; + /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> * @@ -43,7 +46,17 @@ /** * */ - protected Map queryParameters = null; + protected Map queryParameters = null; + + /** + * The Portal that the target object belongs to + */ + protected Portal portal = null; + + /** + * Target object where action needs to be performed + */ + protected PortalObject target = null; /** * @@ -98,4 +111,40 @@ { this.url = url; } + + /** + * + * @return + */ + public Portal getPortal() + { + return portal; + } + + /** + * + * @param portal + */ + public void setPortal(Portal portal) + { + this.portal = portal; + } + + /** + * + * @return + */ + public PortalObject getTarget() + { + return target; + } + + /** + * + * @param target + */ + public void setTarget(PortalObject target) + { + this.target = target; + } } Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/Processor.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/Processor.java 2007-11-13 15:43:48 UTC (rev 8902) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/Processor.java 2007-11-13 16:25:06 UTC (rev 8903) @@ -23,6 +23,7 @@ package org.jboss.portal.presentation.server; import org.jboss.portal.server.ServerException; +import org.jboss.portal.presentation.RequestContext; /** * UIServer calls the Processor to hand it @@ -39,5 +40,5 @@ * @param request * @throws ServerException */ - public ProcessorResponse process(ProcessorRequest request) throws ServerException; + public ProcessorResponse process(RequestContext requestContext,ProcessorRequest request) throws ServerException; } Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/ProcessorRequest.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/ProcessorRequest.java 2007-11-13 15:43:48 UTC (rev 8902) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/ProcessorRequest.java 2007-11-13 16:25:06 UTC (rev 8903) @@ -24,8 +24,6 @@ import java.io.Serializable; -import org.jboss.portal.uiserver.protocol.Portal; -import org.jboss.portal.uiserver.protocol.PortalObject; import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.presentation.action.server.ServerAction; @@ -39,18 +37,8 @@ * */ public class ProcessorRequest implements Serializable -{ +{ /** - * The Portal that the target object belongs to - */ - private Portal portal = null; - - /** - * Target object where action needs to be performed - */ - private PortalObject target = null; - - /** * The Portal action to be performed */ private ServerAction action = null; @@ -64,12 +52,10 @@ * * */ - public ProcessorRequest(ServerAction action, ServerInvocation serverInvocation, Portal portal, PortalObject target) + public ProcessorRequest(ServerAction action, ServerInvocation serverInvocation) { this.action = action; - this.serverInvocation = serverInvocation; - this.portal = portal; - this.target = target; + this.serverInvocation = serverInvocation; } /** @@ -94,42 +80,6 @@ * * @return */ - public Portal getPortal() - { - return portal; - } - - /** - * - * @param portal - */ - public void setPortal(Portal portal) - { - this.portal = portal; - } - - /** - * - * @return - */ - public PortalObject getTarget() - { - return target; - } - - /** - * - * @param target - */ - public void setTarget(PortalObject target) - { - this.target = target; - } - - /** - * - * @return - */ public ServerInvocation getServerInvocation() { return serverInvocation; @@ -150,7 +100,7 @@ public String toString() { StringBuffer buffer = new StringBuffer(); - buffer.append("[action="+this.action+", portal="+this.portal+", target="+this.target+"]"); + buffer.append("[action="+this.action+"]"); return buffer.toString(); } } Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/UIServer.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/UIServer.java 2007-11-13 15:43:48 UTC (rev 8902) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/UIServer.java 2007-11-13 16:25:06 UTC (rev 8903) @@ -29,10 +29,13 @@ import org.jboss.portal.uiserver.protocol.PortalObject; import org.jboss.portal.uiserver.protocol.Portal; +import org.jboss.portal.presentation.RequestContext; + import org.jboss.portal.presentation.server.ProcessorRequest; import org.jboss.portal.presentation.server.ProcessorResponse; import org.jboss.portal.presentation.server.PresentationServer; import org.jboss.portal.presentation.action.server.ServerAction; +import org.jboss.portal.presentation.action.server.LinkActivation; import org.jboss.portal.presentation.action.server.GetActivation; import org.jboss.portal.presentation.action.server.PostActivation; @@ -77,65 +80,12 @@ public void handle(ServerInvocation invocation) throws ServerException { try - { - String portalRequestPath = invocation.getServerContext().getPortalRequestPath(); - - //Process the incoming request and produce a proper ProcessorRequest to be - //processed by the core Portal component - Portal portal = null; - PortalObject target = null; - StringTokenizer st = new StringTokenizer(portalRequestPath, "/"); - StringBuffer buffer = new StringBuffer("/"); - while(st.hasMoreTokens()) - { - String token = st.nextToken(); - if(portal == null) - { - portal = this.presentationServer.getPortalObjectReader().findPortal(token); - if(portal != null) - { - buffer.append(token); - if(st.hasMoreTokens()) - { - buffer.append("/"); - } - } - } - else - { - buffer.append(token); - String id = buffer.toString(); - if(st.hasMoreTokens()) - { - buffer.append("/"); - } - - if(target == null) - { - target = portal.findChild(id); - if(target == null) - { - target = this.presentationServer.getPortalObjectReader().findPortalObject(portal, id); - } - } - else - { - PortalObject cour = target.findChild(id); - if(cour == null) - { - target = this.presentationServer.getPortalObjectReader().findPortalObject(target, id); - } - else - { - target = cour; - } - } - } - } - + { ServerAction serverAction = this.getServerAction(invocation); - ProcessorRequest processorRequest = new ProcessorRequest(serverAction, invocation, portal, target); - ProcessorResponse processorResponse = this.presentationServer.getProcessor().process(processorRequest); + ProcessorRequest processorRequest = new ProcessorRequest(serverAction, invocation); + RequestContext requestContext = null; //Just use null until proper implementation is provided + ProcessorResponse processorResponse = this.presentationServer.getProcessor().process(requestContext, + processorRequest); //Go ahead and render to the client based on ProcessorResponse received from the core Portal if(processorResponse != null) @@ -209,7 +159,75 @@ post.setQueryParameters(invocationContext.getQueryParameterMap()); post.setBodyParameters(invocationContext.getBodyParameterMap()); serverAction = post; - } + } + + //If this is a link activation, then interpret the Portal and the PortalObject that + //this link is targetted for + if(serverAction instanceof LinkActivation) + { + String portalRequestPath = invocation.getServerContext().getPortalRequestPath(); + + //Process the incoming request and produce a proper ProcessorRequest to be + //processed by the core Portal component + Portal portal = null; + PortalObject target = null; + StringTokenizer st = new StringTokenizer(portalRequestPath, "/"); + StringBuffer buffer = new StringBuffer("/"); + while(st.hasMoreTokens()) + { + String token = st.nextToken(); + if(portal == null) + { + portal = this.presentationServer.getPortalObjectReader().findPortal(token); + if(portal != null) + { + buffer.append(token); + if(st.hasMoreTokens()) + { + buffer.append("/"); + } + } + } + else + { + buffer.append(token); + String id = buffer.toString(); + if(st.hasMoreTokens()) + { + buffer.append("/"); + } + + if(target == null) + { + target = portal.findChild(id); + if(target == null) + { + target = this.presentationServer.getPortalObjectReader().findPortalObject(portal, id); + } + } + else + { + PortalObject cour = target.findChild(id); + if(cour == null) + { + target = this.presentationServer.getPortalObjectReader().findPortalObject(target, id); + } + else + { + target = cour; + } + } + } + } + + //Setting up the proper targets for this link + ((LinkActivation)serverAction).setPortal(portal); + ((LinkActivation)serverAction).setTarget(target); + } + + return serverAction; } + + }

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r8902 - in branches/UIServer: uiserver/src/main/org/jboss/portal/presentation and 1 other directory.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-11-13 10:43:48 -0500 (Tue, 13 Nov 2007) New Revision: 8902 Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/RequestContext.java Modified: branches/UIServer/build/ide/intellij/idea60/modules/web/web.iml Log: added RequestContext to be the contract of what the client provides to the server Modified: branches/UIServer/build/ide/intellij/idea60/modules/web/web.iml =================================================================== --- branches/UIServer/build/ide/intellij/idea60/modules/web/web.iml 2007-11-13 15:11:32 UTC (rev 8901) +++ branches/UIServer/build/ide/intellij/idea60/modules/web/web.iml 2007-11-13 15:43:48 UTC (rev 8902) @@ -19,6 +19,10 @@ </orderEntry> <orderEntryProperties /> </component> + <component name="VcsManagerConfiguration"> + <option name="ACTIVE_VCS_NAME" value="svn" /> + <option name="USE_PROJECT_VCS" value="false" /> + </component> <component name="copyright"> <Base> <setting name="state" value="1" /> Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/RequestContext.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/RequestContext.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/RequestContext.java 2007-11-13 15:43:48 UTC (rev 8902) @@ -0,0 +1,45 @@ +/****************************************************************************** + * 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.presentation; + +import org.jboss.portal.presentation.action.server.ServerAction; + +/** + * The contract that defines the services that the client provides to the server during a server invocation. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface RequestContext +{ + + /** + * Create a string representation of the server action. + * + * @param action the server action to render + * @return the rendition of the server action + * @throws IllegalArgumentException if the action cannot be rendered + */ + String render(ServerAction action) throws IllegalArgumentException; + +}

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r8901 - in branches/UIServer/uiserver/src/main/org/jboss/portal: presentation/action and 4 other directories.

by portal-commits＠lists.jboss.org

Author: sohil.shah(a)jboss.com Date: 2007-11-13 10:11:32 -0500 (Tue, 13 Nov 2007) New Revision: 8901 Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/GetActivation.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/LinkActivation.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/PostActivation.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/ServerAction.java Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/ProcessorRequest.java branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/UIServer.java branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/ajax/PortalEntryPoint.java Log: integrating the concept of actions Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/GetActivation.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/GetActivation.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/GetActivation.java 2007-11-13 15:11:32 UTC (rev 8901) @@ -0,0 +1,32 @@ +/****************************************************************************** + * 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.presentation.action.server; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public class GetActivation extends LinkActivation +{ + +} Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/LinkActivation.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/LinkActivation.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/LinkActivation.java 2007-11-13 15:11:32 UTC (rev 8901) @@ -0,0 +1,101 @@ +/****************************************************************************** + * 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.presentation.action.server; + +import java.util.Map; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public abstract class LinkActivation extends ServerAction +{ + /** + * + */ + protected String contentType = null; + + /** + * + */ + protected String url = null; + + /** + * + */ + protected Map queryParameters = null; + + /** + * + * @return + */ + public String getContentType() + { + return contentType; + } + + /** + * + * @param contentType + */ + public void setContentType(String contentType) + { + this.contentType = contentType; + } + + /** + * + * @return + */ + public Map getQueryParameters() + { + return queryParameters; + } + + /** + * + * @param queryParameters + */ + public void setQueryParameters(Map queryParameters) + { + this.queryParameters = queryParameters; + } + + /** + * + * @return + */ + public String getUrl() + { + return url; + } + + /** + * + * @param url + */ + public void setUrl(String url) + { + this.url = url; + } +} Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/PostActivation.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/PostActivation.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/PostActivation.java 2007-11-13 15:11:32 UTC (rev 8901) @@ -0,0 +1,52 @@ +/****************************************************************************** + * 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.presentation.action.server; + +import java.util.Map; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public class PostActivation extends LinkActivation +{ + private Map bodyParameters = null; + + /** + * + * @return + */ + public Map getBodyParameters() + { + return bodyParameters; + } + + /** + * + * @param bodyParameters + */ + public void setBodyParameters(Map bodyParameters) + { + this.bodyParameters = bodyParameters; + } +} Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/ServerAction.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/ServerAction.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/action/server/ServerAction.java 2007-11-13 15:11:32 UTC (rev 8901) @@ -0,0 +1,31 @@ +/****************************************************************************** + * 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.presentation.action.server; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public abstract class ServerAction +{ +} Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/ProcessorRequest.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/ProcessorRequest.java 2007-11-13 14:29:05 UTC (rev 8900) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/ProcessorRequest.java 2007-11-13 15:11:32 UTC (rev 8901) @@ -27,6 +27,7 @@ import org.jboss.portal.uiserver.protocol.Portal; import org.jboss.portal.uiserver.protocol.PortalObject; import org.jboss.portal.server.ServerInvocation; +import org.jboss.portal.presentation.action.server.ServerAction; /** @@ -38,32 +39,34 @@ * */ public class ProcessorRequest implements Serializable -{ +{ /** + * The Portal that the target object belongs to + */ + private Portal portal = null; + + /** * Target object where action needs to be performed */ private PortalObject target = null; /** - * The Portal that the target object belongs to + * The Portal action to be performed */ - private Portal portal = null; + private ServerAction action = null; /** - * The Portal action to be performed. For now, action and render + * */ - private String actionType = null; - - private ServerInvocation serverInvocation = null; /** * * */ - public ProcessorRequest(String actionType, ServerInvocation serverInvocation, Portal portal, PortalObject target) + public ProcessorRequest(ServerAction action, ServerInvocation serverInvocation, Portal portal, PortalObject target) { - this.actionType = actionType; + this.action = action; this.serverInvocation = serverInvocation; this.portal = portal; this.target = target; @@ -73,18 +76,18 @@ * * @return */ - public String getActionType() + public ServerAction getAction() { - return actionType; + return action; } /** * - * @param actionType + * @param action */ - public void setActionType(String actionType) + public void setAction(ServerAction action) { - this.actionType = actionType; + this.action = action; } /** @@ -147,7 +150,7 @@ public String toString() { StringBuffer buffer = new StringBuffer(); - buffer.append("[actionType="+this.actionType+", portal="+this.portal+", target="+this.target+"]"); + buffer.append("[action="+this.action+", portal="+this.portal+", target="+this.target+"]"); return buffer.toString(); } } Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/UIServer.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/UIServer.java 2007-11-13 14:29:05 UTC (rev 8900) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/UIServer.java 2007-11-13 15:11:32 UTC (rev 8901) @@ -24,18 +24,22 @@ import java.util.StringTokenizer; +import javax.servlet.http.HttpServletRequest; + import org.jboss.portal.uiserver.protocol.PortalObject; import org.jboss.portal.uiserver.protocol.Portal; -import org.jboss.portal.presentation.server.Processor; import org.jboss.portal.presentation.server.ProcessorRequest; import org.jboss.portal.presentation.server.ProcessorResponse; -import org.jboss.portal.presentation.server.PortalObjectReader; import org.jboss.portal.presentation.server.PresentationServer; +import org.jboss.portal.presentation.action.server.ServerAction; +import org.jboss.portal.presentation.action.server.GetActivation; +import org.jboss.portal.presentation.action.server.PostActivation; import org.jboss.portal.server.RequestController; import org.jboss.portal.server.ServerException; import org.jboss.portal.server.ServerInvocation; +import org.jboss.portal.server.ServerInvocationContext; /** @@ -80,7 +84,6 @@ //processed by the core Portal component Portal portal = null; PortalObject target = null; - String actionType = "render"; StringTokenizer st = new StringTokenizer(portalRequestPath, "/"); StringBuffer buffer = new StringBuffer("/"); while(st.hasMoreTokens()) @@ -129,14 +132,9 @@ } } } - - String actionParam = invocation.getServerContext().getClientRequest().getParameter("action"); - if(actionParam != null && actionParam.trim().length()>0 && actionParam.equals("1")) - { - actionType = "action"; - } - - ProcessorRequest processorRequest = new ProcessorRequest(actionType, invocation, portal, target); + + ServerAction serverAction = this.getServerAction(invocation); + ProcessorRequest processorRequest = new ProcessorRequest(serverAction, invocation, portal, target); ProcessorResponse processorResponse = this.presentationServer.getProcessor().process(processorRequest); //Go ahead and render to the client based on ProcessorResponse received from the core Portal @@ -184,5 +182,34 @@ public void setPresentationServer(PresentationServer presentationServer) { this.presentationServer = presentationServer; - } + } + //-------------------------------------------------------------------------------------------------------------------------------------------------------------- + /** + * + */ + private ServerAction getServerAction(ServerInvocation invocation) + { + ServerAction serverAction = null; + + ServerInvocationContext invocationContext = invocation.getServerContext(); + HttpServletRequest request = invocationContext.getClientRequest(); + if(request.getMethod().equals("GET")) + { + GetActivation get = new GetActivation(); + get.setUrl(request.getRequestURL().toString()); + get.setContentType(invocationContext.getMediaType()); + get.setQueryParameters(invocationContext.getQueryParameterMap()); + serverAction = get; + } + else if(request.getMethod().equals("POST")) + { + PostActivation post = new PostActivation(); + post.setUrl(request.getRequestURL().toString()); + post.setContentType(invocationContext.getMediaType()); + post.setQueryParameters(invocationContext.getQueryParameterMap()); + post.setBodyParameters(invocationContext.getBodyParameterMap()); + serverAction = post; + } + return serverAction; + } } Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/ajax/PortalEntryPoint.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/ajax/PortalEntryPoint.java 2007-11-13 14:29:05 UTC (rev 8900) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/ajax/PortalEntryPoint.java 2007-11-13 15:11:32 UTC (rev 8901) @@ -132,7 +132,7 @@ return currentPage; } - + //------------------------------------------------------------------------------------------------------------------------------------------------------------------- /** * * @param processorResponse

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r8900 - in branches/JBoss_Portal_Branch_2_6: core-identity/src/resources/portal-identity-sar/conf/bundles and 1 other directory.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-11-13 09:29:05 -0500 (Tue, 13 Nov 2007) New Revision: 8900 Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_fr.properties branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties Log: Done with correct ASCII encoding Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_fr.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_fr.properties 2007-11-13 12:55:26 UTC (rev 8899) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_fr.properties 2007-11-13 14:29:05 UTC (rev 8900) @@ -26,69 +26,69 @@ TITLE_BROWSE=Navigateur TITLE_FILEBROWSE=Explorateur de fichiers TITLE_DELETECONFIRM=Confirmer la suppression -TITLE_CREATECOLLCONFIRM=Confirmer la cr\ufffdation de r\ufffdpertoire +TITLE_CREATECOLLCONFIRM=Confirmer la cr\u00e9ation de r\u00e9pertoire TITLE_COPYCONFIRM=Confirmer la copie -TITLE_MOVECONFIRM=Confirmer le d\ufffdplacement -TITLE_VIEWFILE=Propri\ufffdt\ufffds du fichier +TITLE_MOVECONFIRM=Confirmer le d\u00e9placement +TITLE_VIEWFILE=Propri\u00e9t\u00e9s du fichier TITLE_EDIT=Modifier le fichier -TITLE_CREATE=Cr\ufffder un fichier -TITLE_UPLOAD=T\ufffdl\ufffdd\ufffdverser un fichier -TITLE_SECURECONFIRM=S\ufffdcuriser le noeud +TITLE_CREATE=Cr\u00e9er un fichier +TITLE_UPLOAD=T\u00e9l\u00e9d\u00e9verser un fichier +TITLE_SECURECONFIRM=S\u00e9curiser le noeud CMS_SEARCH=Rechercher -CMS_SEARCHNORESULT=Aucun r\ufffdsultat pour cette recherche +CMS_SEARCHNORESULT=Aucun r\u00e9sultat pour cette recherche CMS_MENU=Menu action CMS_ACTION=Action CMS_NAME=Nom CMS_TYPE=Type -CMS_CREATED=Cr\ufffdation -CMS_MODIFIED=Derni\ufffdre modification +CMS_CREATED=Cr\u00e9ation +CMS_MODIFIED=Derni\u00e8re modification CMS_DESCRIPTION=Description CMS_VIEW=Visualiser CMS_COPY=Copier -CMS_MOVE=D\ufffdplacer +CMS_MOVE=D\u00e9placer CMS_DELETE=Supprimer CMS_FOLDER=Dossier CMS_FILE=Fichier -CMS_CREATE=Cr\ufffder +CMS_CREATE=Cr\u00e9er CMS_CANCEL=Annuler CMS_EDIT=Modifier -CMS_UPLOAD=T\ufffdl\ufffdd\ufffdverser +CMS_UPLOAD=T\u00e9l\u00e9d\u00e9verser CMS_MODIFY=Modifier -CMS_CREATEFOLDER=Cr\ufffder un dossier -CMS_CREATEFILE=Cr\ufffder un fichier -CMS_UPLOADARCHIVE=T\ufffdl\ufffdd\ufffdverser une archive +CMS_CREATEFOLDER=Cr\u00e9er un dossier +CMS_CREATEFILE=Cr\u00e9er un fichier +CMS_UPLOADARCHIVE=T\u00e9l\u00e9d\u00e9verser une archive CMS_BACKTOBROWSER=Retourner au navigateur de dossiers CMS_TRANSFER=Import/Export CMS_EXPORTARCHIVE=Exporter le dossier -CMS_SECURE=S\ufffdcuriser +CMS_SECURE=S\u00e9curiser -CMS_CREATEFILEINDIR=Cr\ufffder un fichier dans le dossier +CMS_CREATEFILEINDIR=Cr\u00e9er un fichier dans le dossier CMS_FILENAME=Nom de fichier CMS_TITLE=Titre CMS_LANGUAGE=Langue CMS_DELETEPATH=Confirmer la suppression de CMS_DELETEWARN1=ATTENION ! Vous ne pourrez pas annuler cette action. -CMS_DELETEWARN2=\ufffdtes vous certain de vouloir supprimer cette ressource ? +CMS_DELETEWARN2=\u00cates vous certain de vouloir supprimer cette ressource ? CMS_DESTINATION=Destination CMS_SOURCE=Source CMS_EDITING=Modification du fichier -CMS_LIVE=Diffusion imm\ufffddiate +CMS_LIVE=Diffusion imm\u00e9diate CMS_VERSION=Version -CMS_WYSIWYG=\ufffdditeur visuel WYSIWYG +CMS_WYSIWYG=\u00c9diteur visuel WYSIWYG CMS_LIVEVERSION=Version en ligne CMS_SIZE=Taille -CMS_CONTENT_DIR=R\ufffdpertoire de contenu -CMS_CONTENT_DIR_USE=Utilisez l'arborescence des dossiers afin de parcourir la structure du r\ufffdpertoire. -CMS_MAIN_USE=Utilisez le portlet d'administration du CMS afin de modifier le contenu de votre r\ufffdpertoire. -CMS_MANAGE=G\ufffdrer le contenu +CMS_CONTENT_DIR=R\u00e9pertoire de contenu +CMS_CONTENT_DIR_USE=Utilisez l'arborescence des dossiers afin de parcourir la structure du r\u00e9pertoire. +CMS_MAIN_USE=Utilisez le portlet d'administration du CMS afin de modifier le contenu de votre r\u00e9pertoire. +CMS_MANAGE=G\u00e9rer le contenu -CMS_CREATED_BY=Cr\ufffd\ufffd par +CMS_CREATED_BY=Cr\u00e9\u00e9 par CMS_APPROVE=Approuver CMS_DENY=Refuser CMS_APPROVAL=Items en attente d'approbation Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2007-11-13 12:55:26 UTC (rev 8899) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2007-11-13 14:29:05 UTC (rev 8900) @@ -26,40 +26,40 @@ IDENTITY_WELCOME=Bienvenue IDENTITY_REGISTER=S'enregistrer IDENTITY_LOST_PASSWORD=Mot de passe perdu -IDENTITY_NOT_LOGGED_IN=Vous n'\ufffdtes pas connect\ufffd. -IDENTITY_CREATE_ACCOUNT=Vous pouvez cr\ufffder un compte. +IDENTITY_NOT_LOGGED_IN=Vous n'\u00eates pas connect\u00e9. +IDENTITY_CREATE_ACCOUNT=Vous pouvez cr\u00e9er un compte. IDENTITY_BUTTON_SUBMIT=Soumettre IDENTITY_BUTTON_EDIT=Modifier IDENTITY_BUTTON_CANCEL=Annuler -IDENTITY_REGISTER_TITLE=Informations g\ufffdn\ufffdrales +IDENTITY_REGISTER_TITLE=Informations g\u00e9n\u00e9rales IDENTITY_REGISTER_TITLE_CONFIRM=Confirmation IDENTITY_REGISTER_PASSWORD_CONFIRM=Confirmation de mot de passe IDENTITY_REGISTER_STATUS_TITLE=Statut d'enregistrement -IDENTITY_REGISTER_SUCCESS_TITLE=Votre compte a \ufffdt\ufffd cr\ufffd\ufffd avec succ\ufffds. Vous pouvez vous connecter. -IDENTITY_REGISTER_PENDING_TITLE=Un courriel a \ufffdt\ufffd envoy\ufffd \ufffd l'adresse indiqu\ufffde afin de confirmer votre enregistrement. +IDENTITY_REGISTER_SUCCESS_TITLE=Votre compte a \u00e9t\u00e9 cr\u00e9\u00e9 avec succ\u00e8s. Vous pouvez vous connecter. +IDENTITY_REGISTER_PENDING_TITLE=Un courriel a \u00e9t\u00e9 envoy\u00e9 \u00e0 l'adresse indiqu\u00e9e afin de confirmer votre enregistrement. IDENTITY_REGISTER_REQUIRED_INFORMATION=indique un champ obligatoire IDENTITY_LOST_PASSWORD_TITLE=Informations sur mon compte perdues ? -IDENTITY_LOST_PASSWORD_DESCRIPTION=Veuillez entrer votre nom d'usager afin de r\ufffdinitialiser votre mot de passe. -IDENTITY_LOST_PASSWORD_ERROR=\ufffdchec de r\ufffdinitialisation de votre mot de passe. +IDENTITY_LOST_PASSWORD_DESCRIPTION=Veuillez entrer votre nom d'usager afin de r\u00e9initialiser votre mot de passe. +IDENTITY_LOST_PASSWORD_ERROR=\u00c9chec de r\u00e9initialisation de votre mot de passe. IDENTITY_LOST_PASSWORD_STATUS_SUCCESSFUL=Vous receverez sous peu via courriel votre nouveau mot de passe. -IDENTITY_LOST_PASSWORD_STATUS_404=Aucun compte trouv\ufffd. +IDENTITY_LOST_PASSWORD_STATUS_404=Aucun compte trouv\u00e9. IDENTITY_LOST_PASSWORD_STATUS_TITLE=Mot de passe perdu -IDENTITY_EDIT_PROFILE_ERROR=Erreur lors de la mise \ufffd jour de votre profil. +IDENTITY_EDIT_PROFILE_ERROR=Erreur lors de la mise \u00e0 jour de votre profil. IDENTITY_EDIT_PASSWORD_TITLE=Changer mon mot de passe IDENTITY_EDIT_PASSWORD_CURRENT=Mot de passe courant IDENTITY_EDIT_CHANGE_PASSWORD=Changer mon mot de passe IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=Impossible de changer votre mot de passe. -IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=Votre mot de passe a \ufffdt\ufffd modifi\ufffd. +IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=Votre mot de passe a \u00e9t\u00e9 modifi\u00e9. IDENTITY_EDIT_EMAIL_TITLE=Changer mon adresse de courriel IDENTITY_EDIT_EMAIL_NEW=Nouvelle adresse courriel IDENTITY_EDIT_CHANGE_EMAIL=Changer mon adresse IDENTITY_EDIT_CHANGE_EMAIL_ERROR=Impossible de changer mon adresse de courriel. -IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING=Un courriel a \ufffdt\ufffd envoy\ufffd \ufffd l'adresse indiqu\ufffde afin de confirmer votre mise \ufffd jour. -IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED=Votre adresse de courriel a \ufffdt\ufffd mise \ufffd jour. +IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING=Un courriel a \u00e9t\u00e9 envoy\u00e9 \u00e0 l'adresse indiqu\u00e9e afin de confirmer votre mise \u00e0 jour. +IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED=Votre adresse de courriel a \u00e9t\u00e9 mise \u00e0 jour. IDENTITY_EDIT_PROFILE_TITLE=Modifier mon profil IDENTITY_VIEW_PROFILE_TITLE=Voir mon profil @@ -67,14 +67,14 @@ IDENTITY_USERNAME=Nom d'utilisateur IDENTITY_PASSWORD=Mot de passe IDENTITY_EMAIL=Courriel -IDENTITY_GIVENNAME=Pr\ufffdnom +IDENTITY_GIVENNAME=Pr\u00e9nom IDENTITY_FAMILYNAME=Nom -IDENTITY_SKYPE=Num\ufffdro Skype -IDENTITY_LOCATION=Lieu de r\ufffdsidence +IDENTITY_SKYPE=Num\u00e9ro Skype +IDENTITY_LOCATION=Lieu de r\u00e9sidence IDENTITY_OCCUPATION=Occupation IDENTITY_EXTRA=Extra IDENTITY_SIGNATURE=Signature -IDENTITY_INTERESTS=Int\ufffdr\ufffdts +IDENTITY_INTERESTS=Int\u00e9r\u00eats IDENTITY_LOCALE=Langue IDENTITY_ICQ=Icq IDENTITY_AIM=Aim @@ -83,49 +83,49 @@ IDENTITY_XMMP=Xmmp IDENTITY_HOMEPAGE=Page web IDENTITY_TIMEZONE=Fuseau horaire -IDENTITY_THEME=Th\ufffdme -IDENTITY_SECURITY_QUESTION=Question de s\ufffdcurit\ufffd -IDENTITY_SECURITY_ANSWER=R\ufffdponse \ufffd votre question de s\ufffdcurit\ufffd -IDENTITY_LAST_LOGIN=Derni\ufffdre visite -IDENTITY_REIGSTRATION_DATE=Enregistr\ufffd le +IDENTITY_THEME=Th\u00e8me +IDENTITY_SECURITY_QUESTION=Question de s\u00e9curit\u00e9 +IDENTITY_SECURITY_ANSWER=R\u00e9ponse \u00e0 votre question de s\u00e9curit\u00e9 +IDENTITY_LAST_LOGIN=Derni\u00e8re visite +IDENTITY_REIGSTRATION_DATE=Enregistr\u00e9 le IDENTITY_ENABLED=Actif -IDENTITY_CATEGORY_GENERAL=Pr\ufffdf\ufffdrences g\ufffdn\ufffdrales +IDENTITY_CATEGORY_GENERAL=Pr\u00e9f\u00e9rences g\u00e9n\u00e9rales IDENTITY_CATEGORY_PERSONAL=Informations personnelles -IDENTITY_CATEGORY_INSTANT=Comptes de messagerie instantan\ufffde -IDENTITY_CATEGORY_ADDITIONAL=Information suppl\ufffdmentaire +IDENTITY_CATEGORY_INSTANT=Comptes de messagerie instantan\u00e9e +IDENTITY_CATEGORY_ADDITIONAL=Information suppl\u00e9mentaire -IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE=(Signature de 255 caract\ufffdres max) -IDENTITY_CATEGORY_ADDITIONAL_EXTRA=(255 caract\ufffdres max.) +IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE=(Signature de 255 caract\u00e8res max) +IDENTITY_CATEGORY_ADDITIONAL_EXTRA=(255 caract\u00e8res max.) IDENTITY_MANAGEMENT_ACTION=Actions IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE=Modifier -IDENTITY_MANAGEMENT_ACTION_ROLES=R\ufffdles +IDENTITY_MANAGEMENT_ACTION_ROLES=R\u00f4les IDENTITY_MANAGEMENT_ACTION_DELETE=Supprimer IDENTITY_MANAGEMENT_USER_MANAGEMENT=Gestion des utilisateurs -IDENTITY_MANAGEMENT_ROLE_MANAGEMENT=Gestion des r\ufffdles +IDENTITY_MANAGEMENT_ROLE_MANAGEMENT=Gestion des r\u00f4les IDENTITY_MANAGEMENT_SEARCH_USER=Rechercher -IDENTITY_MANAGEMENT_CREATE_USER=Cr\ufffder un nouveau compte utilisateur -IDENTITY_MANAGEMENT_CREATE_USER_CREATED=Compte cr\ufffd\ufffd -IDENTITY_MANAGEMENT_USER_DELETED=Compte supprim\ufffd -IDENTITY_MANAGEMENT_ROLE=R\ufffdle +IDENTITY_MANAGEMENT_CREATE_USER=Cr\u00e9er un nouveau compte utilisateur +IDENTITY_MANAGEMENT_CREATE_USER_CREATED=Compte cr\u00e9\u00e9 +IDENTITY_MANAGEMENT_USER_DELETED=Compte supprim\u00e9 +IDENTITY_MANAGEMENT_ROLE=R\u00f4le IDENTITY_MANAGEMENT_ROLE_DISPLAY=Nom courant IDENTITY_MANAGEMENT_ROLE_MEMBERS=Membres -IDENTITY_MANAGEMENT_ROLE_ASSIGNED=R\ufffdles assign\ufffds -IDENTITY_MANAGEMENT_CREATE_ROLE=Cr\ufffder un nouveau r\ufffdle -IDENTITY_MANAGEMENT_EDIT_ROLE=Modifier le r\ufffdle -IDENTITY_MANAGEMENT_DISABLE=D\ufffdsactiver +IDENTITY_MANAGEMENT_ROLE_ASSIGNED=R\u00f4les assign\u00e9s +IDENTITY_MANAGEMENT_CREATE_ROLE=Cr\u00e9er un nouveau r\u00f4le +IDENTITY_MANAGEMENT_EDIT_ROLE=Modifier le r\u00f4le +IDENTITY_MANAGEMENT_DISABLE=D\u00e9sactiver IDENTITY_MANAGEMENT_ENABLE=Activer -IDENTITY_MANAGEMENT_RESET_PASSWORD=R\ufffdinitialiser le mot de passe -IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=R\ufffdinitialiser le mot de passe pour l'usager -IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=L'utilisateur recevera un nouveau mot de passe al\ufffdatoire envoy\ufffd via courriel. -IDENTITY_MANAGEMENT_ASSIGN_ROLES=Assigner un r\ufffdle +IDENTITY_MANAGEMENT_RESET_PASSWORD=R\u00e9initialiser le mot de passe +IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=R\u00e9initialiser le mot de passe pour l'usager +IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=L'utilisateur recevera un nouveau mot de passe al\u00e9atoire envoy\u00e9 via courriel. +IDENTITY_MANAGEMENT_ASSIGN_ROLES=Assigner un r\u00f4le IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Comptes en attente d'approbation -IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Utilisateurs enregistr\ufffds -IDENTITY_MANAGEMENT_APPROVE_ALL=Approuver la s\ufffdlection -IDENTITY_MANAGEMENT_REJECT_ALL=Rejeter la s\ufffdlection -IDENTITY_MANAGEMENT_SELECT_ALL=out s\ufffdlectionner -IDENTITY_MANAGEMENT_UNSELECT_ALL=Tout d\ufffds\ufffdlectionner +IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Utilisateurs enregistr\u00e9s +IDENTITY_MANAGEMENT_APPROVE_ALL=Approuver la s\u00e9lection +IDENTITY_MANAGEMENT_REJECT_ALL=Rejeter la s\u00e9lection +IDENTITY_MANAGEMENT_SELECT_ALL=out s\u00e9lectionner +IDENTITY_MANAGEMENT_UNSELECT_ALL=Tout d\u00e9s\u00e9lectionner IDENTITY_MANAGEMENT_MATRIX=Matrice IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES=Modes d'abonnement @@ -136,40 +136,40 @@ IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE=Mode d'abonnement IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE=Administrer les modes d'abonnement -IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM=Mode d'abonnement personnalis\ufffd +IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM=Mode d'abonnement personnalis\u00e9 IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC=Automatique - pas de validation courriel & pas d'approbation IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL=Validation courriel & pas d'approbation IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN=Validation courriel & approbation par un administrateur -IDENTITY_REGISTER_VERIFY_CAPTCHA=V\ufffdrification visuelle +IDENTITY_REGISTER_VERIFY_CAPTCHA=V\u00e9rification visuelle IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirmation : supprimer IDENTITY_WARNING_CONFIRM_DELETE_USER=Attention ! Vous allez supprimer le compte -IDENTITY_WARNING_CONFIRM_DELETE_ROLE=Attention ! Vous allez supprimer le r\ufffdle +IDENTITY_WARNING_CONFIRM_DELETE_ROLE=Attention ! Vous allez supprimer le r\u00f4le IDENTITY_REGISTER_CONFIRMATIONEMAIL=Confirmer votre abonnement -IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=R\ufffdinitialiser mon mot de passe +IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=R\u00e9initialiser mon mot de passe IDENTITY_MAIL_SUBJECT_REGISTER=Confirmer mon enregistrement IDENTITY_MAIL_SUBJECT_CHANGE_EMAIL=Confirmer mon courriel -IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE=Impossible d'effectuer l'op\ufffdration demand\ufffde sur ce r\ufffdle. Consultez le log syst\ufffdme pour plus de d\ufffdtails. -IDENTITY_MANAGEMENT_ERROR_ACTION_USER=Impossible d'effectuer l'op\ufffdration demand\ufffde sur ce compte. Consultez le log syst\ufffdme pour plus de d\ufffdtails. +IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE=Impossible d'effectuer l'op\u00e9ration demand\u00e9e sur ce r\u00f4le. Consultez le log syst\u00e8me pour plus de d\u00e9tails. +IDENTITY_MANAGEMENT_ERROR_ACTION_USER=Impossible d'effectuer l'op\u00e9ration demand\u00e9e sur ce compte. Consultez le log syst\u00e8me pour plus de d\u00e9tails. IDENTITY_VERIFICATION_RETURN=Retourner au portail IDENTITY_VERIFICATION_LOGIN=Connexion IDENTITY_VERIFICATION_STATUS_EROOR=Une erreur est survenue lors de la validation du courriel. IDENTITY_VERIFICATION_STATUS_FAILED=Impossible de valider cette adresse de courriel. -IDENTITY_VERIFICATION_STATUS_VALIDATED=Adresse de courriel valid\ufffde. -IDENTITY_VERIFICATION_STATUS_REGISTER_SUCCESS=Votre compte a \ufffdt\ufffd activ\ufffd. Vous pouvez vous connecter. -IDENTITY_VERIFICATION_STATUS_REGISTER_APPROVAL=Votre adresse de courriel a \ufffdt\ufffd v\ufffdrifi\ufffde, mais votre compte doit \ufffdtre approuv\ufffd par un administrateur. -IDENTITY_VERIFICATION_STATUS_REGISTER_CUSTOM=Votre compte a \ufffdt\ufffd activ\ufffd. Vous pouvez vous connecter. +IDENTITY_VERIFICATION_STATUS_VALIDATED=Adresse de courriel valid\u00e9e. +IDENTITY_VERIFICATION_STATUS_REGISTER_SUCCESS=Votre compte a \u00e9t\u00e9 activ\u00e9. Vous pouvez vous connecter. +IDENTITY_VERIFICATION_STATUS_REGISTER_APPROVAL=Votre adresse de courriel a \u00e9t\u00e9 v\u00e9rifi\u00e9e, mais votre compte doit \u00eatre approuv\u00e9 par un administrateur. +IDENTITY_VERIFICATION_STATUS_REGISTER_CUSTOM=Votre compte a \u00e9t\u00e9 activ\u00e9. Vous pouvez vous connecter. IDENTITY_VALIDATION_ERROR_REGISTRATION=Erreur lors de l'enregistrement du compte. -IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=Ce nom d'utilisateur est d\ufffdj\ufffd utilis\ufffd. +IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=Ce nom d'utilisateur est d\u00e9j\u00e0 utilis\u00e9. IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=Erreur lors de la validation du nom d'utilisateur. IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH=Vos mots de passe ne correspondent pas. IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR=Erreur lors de la validation de l'adresse de courriel. IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=Adresse de courriel invalide. -IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD=Mot de passe erron\ufffd. +IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD=Mot de passe erron\u00e9. IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=Validation visuelle incorrecte. # Example usage for dynamic values

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r8899 - in branches/UIServer/uiserver/src: main/org/jboss/portal/presentation/test and 3 other directories.

by portal-commits＠lists.jboss.org

Author: sohil.shah(a)jboss.com Date: 2007-11-13 07:55:26 -0500 (Tue, 13 Nov 2007) New Revision: 8899 Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/ajax/ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/ajax/HostedModeProxy.java Removed: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/ajax/HostedModeProxy.java Modified: branches/UIServer/uiserver/src/resources/client/ajax/src/org/jboss/portal/uiserver/ajax/Portal.gwt.xml Log: refactoring Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/ajax/HostedModeProxy.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/ajax/HostedModeProxy.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/test/ajax/HostedModeProxy.java 2007-11-13 12:55:26 UTC (rev 8899) @@ -0,0 +1,88 @@ +/****************************************************************************** + * 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.presentation.test.ajax; + +import java.io.ByteArrayInputStream; + +import javax.servlet.http.HttpServletRequest; + +import com.google.gwt.user.client.rpc.SerializationException; +import com.google.gwt.user.server.rpc.RemoteServiceServlet; + +import com.meterware.httpunit.WebConversation; +import com.meterware.httpunit.PostMethodWebRequest; +import com.meterware.httpunit.WebRequest; +import com.meterware.httpunit.WebResponse; + + +/** + * This is a RPC Proxy Service that is used only during development. This lets the GWT client-side agent integrate with the Portal server while running in + * Hosted Mode. It is very efficient to debug/develop client side GWT code in Hosted Mode. + * + * This service is never deployed in a production setting and Portal components *do not* have any compile time or run time dependency on this Proxy. + * + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public class HostedModeProxy extends RemoteServiceServlet +{ + /** + * + */ + public String processCall(String input) throws SerializationException + { + try + { + String response = null; + + HttpServletRequest request = this.getThreadLocalRequest(); + + //Setup the conversation with the portal server + WebConversation wc = null; + if(request.getSession().getAttribute("conversation") != null) + { + wc = (WebConversation)request.getSession().getAttribute("conversation"); + } + else + { + wc = new WebConversation(); + request.getSession().setAttribute("conversation", wc); + } + + //Proxy this rpc request over to the Portal server + WebRequest post = new PostMethodWebRequest( + "http://localhost:8080/portal-uiserver/portalrpc", + new ByteArrayInputStream(input.getBytes()), + "text/plain; charset=utf-8" + ); + WebResponse webResponse = wc.getResponse(post); + response = webResponse.getText(); + + return response; + } + catch(Exception e) + { + throw new SerializationException(e); + } + } +} Deleted: branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/ajax/HostedModeProxy.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/ajax/HostedModeProxy.java 2007-11-13 12:03:49 UTC (rev 8898) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/uiserver/service/ajax/HostedModeProxy.java 2007-11-13 12:55:26 UTC (rev 8899) @@ -1,88 +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.uiserver.service.ajax; - -import java.io.ByteArrayInputStream; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.server.rpc.RemoteServiceServlet; - -import com.meterware.httpunit.WebConversation; -import com.meterware.httpunit.PostMethodWebRequest; -import com.meterware.httpunit.WebRequest; -import com.meterware.httpunit.WebResponse; - - -/** - * This is a RPC Proxy Service that is used only during development. This lets the GWT client-side agent integrate with the Portal server while running in - * Hosted Mode. It is very efficient to debug/develop client side GWT code in Hosted Mode. - * - * This service is never deployed in a production setting and Portal components *do not* have any compile time or run time dependency on this Proxy. - * - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - * - */ -public class HostedModeProxy extends RemoteServiceServlet -{ - /** - * - */ - public String processCall(String input) throws SerializationException - { - try - { - String response = null; - - HttpServletRequest request = this.getThreadLocalRequest(); - - //Setup the conversation with the portal server - WebConversation wc = null; - if(request.getSession().getAttribute("conversation") != null) - { - wc = (WebConversation)request.getSession().getAttribute("conversation"); - } - else - { - wc = new WebConversation(); - request.getSession().setAttribute("conversation", wc); - } - - //Proxy this rpc request over to the Portal server - WebRequest post = new PostMethodWebRequest( - "http://localhost:8080/portal-uiserver/portalrpc", - new ByteArrayInputStream(input.getBytes()), - "text/plain; charset=utf-8" - ); - WebResponse webResponse = wc.getResponse(post); - response = webResponse.getText(); - - return response; - } - catch(Exception e) - { - throw new SerializationException(e); - } - } -} Modified: branches/UIServer/uiserver/src/resources/client/ajax/src/org/jboss/portal/uiserver/ajax/Portal.gwt.xml =================================================================== --- branches/UIServer/uiserver/src/resources/client/ajax/src/org/jboss/portal/uiserver/ajax/Portal.gwt.xml 2007-11-13 12:03:49 UTC (rev 8898) +++ branches/UIServer/uiserver/src/resources/client/ajax/src/org/jboss/portal/uiserver/ajax/Portal.gwt.xml 2007-11-13 12:55:26 UTC (rev 8899) @@ -8,5 +8,5 @@ <entry-point class="org.jboss.portal.uiserver.ajax.client.Portal"/>  - <servlet path="/portalrpc" class="org.jboss.portal.uiserver.service.ajax.HostedModeProxy"/> + <servlet path="/portalrpc" class="org.jboss.portal.presentation.test.ajax.HostedModeProxy"/> </module>

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r8898 - in modules/common/trunk: .settings and 3 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-11-13 07:03:49 -0500 (Tue, 13 Nov 2007) New Revision: 8898 Added: modules/common/trunk/.settings/org.eclipse.jdt.ui.prefs Removed: modules/common/trunk/.settings/org.eclipse.jdt.core.prefs Modified: modules/common/trunk/.classpath modules/common/trunk/common/ modules/common/trunk/mc/ modules/common/trunk/portal/ Log: minor Modified: modules/common/trunk/.classpath =================================================================== --- modules/common/trunk/.classpath 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/common/trunk/.classpath 2007-11-13 12:03:49 UTC (rev 8898) @@ -8,12 +8,12 @@ <classpathentry kind="lib" path="thirdparty/sun-servlet/lib/servlet-api.jar"/> <classpathentry kind="lib" path="thirdparty/apache-log4j/lib/log4j.jar"/> <classpathentry kind="lib" path="thirdparty/apache-ant/lib/ant.jar"/> - <classpathentry kind="lib" path="tools/lib/cargo-core-uberjar-0.8.jar"/> <classpathentry kind="lib" path="thirdparty/oswego-concurrent/lib/concurrent.jar"/> <classpathentry kind="lib" path="thirdparty/junit/lib/junit.jar"/> <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/> - <classpathentry kind="lib" path="tools/lib/ant-junit.jar"/> <classpathentry kind="lib" path="thirdparty/apache-httpclient/lib/commons-httpclient.jar"/> <classpathentry kind="lib" path="thirdparty/sun-jaf/lib/activation.jar"/> + <classpathentry kind="lib" path="/home/theute/.m2/repository/org/codehaus/cargo/cargo-core-uberjar/0.8/cargo-core-uberjar-0.8.jar"/> + <classpathentry kind="lib" path="/home/theute/.m2/repository/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Deleted: modules/common/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- modules/common/trunk/.settings/org.eclipse.jdt.core.prefs 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/common/trunk/.settings/org.eclipse.jdt.core.prefs 2007-11-13 12:03:49 UTC (rev 8898) @@ -1,12 +0,0 @@ -#Wed Aug 15 12:04:04 CEST 2007 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.source=1.3 Added: modules/common/trunk/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- modules/common/trunk/.settings/org.eclipse.jdt.ui.prefs (rev 0) +++ modules/common/trunk/.settings/org.eclipse.jdt.ui.prefs 2007-11-13 12:03:49 UTC (rev 8898) @@ -0,0 +1,3 @@ +#Tue Nov 13 13:01:47 CET 2007 +eclipse.preferences.version=1 +internal.default.compliance=default Property changes on: modules/common/trunk/common ___________________________________________________________________ Name: svn:ignore - output + output target Property changes on: modules/common/trunk/mc ___________________________________________________________________ Name: svn:ignore - output + output target Property changes on: modules/common/trunk/portal ___________________________________________________________________ Name: svn:ignore - output + output target

16 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r8897 - branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-11-13 06:13:12 -0500 (Tue, 13 Nov 2007) New Revision: 8897 Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_fr.properties Log: JBPORTAL-1797: French translation of the CMS Contribution from Luc Boudreau Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_fr.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_fr.properties 2007-11-13 11:04:28 UTC (rev 8896) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_fr.properties 2007-11-13 11:13:12 UTC (rev 8897) @@ -21,17 +21,76 @@ # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # ################################################################################ -# CMS ADMIN PORTLET +## CMS ADMIN PORTLET TITLE_HEAD=Administration CMS -TITLE_BROWSE=Navigation r\u00E9pertoires +TITLE_BROWSE=Navigateur +TITLE_FILEBROWSE=Explorateur de fichiers TITLE_DELETECONFIRM=Confirmer la suppression -TITLE_CREATECOLLCONFIRM=Confirmer la cr\u00E9ation de r\u00E9pertoire -TITLE_COPYCONFIRM=Confirmer la copie de fichier -TITLE_MOVECONFIRM=Confirmer le d\u00E9placement de fichier -TITLE_VIEWFILE=Voir les propri\u00E9t\u00E9s du fichier -TITLE_EDIT=Editer le fichier -TITLE_CREATE=Cr\u00E9er le fichier -TITLE_UPLOAD=Charger le fichier -TITLE_SECURECONFIRM=S\u00E9curiser le noeud -CMS_SEARCH=Chercher -CMS_SEARCHNORESULT=Aucun r\u00E9sultat pour cette recherche \ No newline at end of file +TITLE_CREATECOLLCONFIRM=Confirmer la cr\ufffdation de r\ufffdpertoire +TITLE_COPYCONFIRM=Confirmer la copie +TITLE_MOVECONFIRM=Confirmer le d\ufffdplacement +TITLE_VIEWFILE=Propri\ufffdt\ufffds du fichier +TITLE_EDIT=Modifier le fichier +TITLE_CREATE=Cr\ufffder un fichier +TITLE_UPLOAD=T\ufffdl\ufffdd\ufffdverser un fichier +TITLE_SECURECONFIRM=S\ufffdcuriser le noeud + +CMS_SEARCH=Rechercher +CMS_SEARCHNORESULT=Aucun r\ufffdsultat pour cette recherche +CMS_MENU=Menu action +CMS_ACTION=Action +CMS_NAME=Nom +CMS_TYPE=Type +CMS_CREATED=Cr\ufffdation +CMS_MODIFIED=Derni\ufffdre modification +CMS_DESCRIPTION=Description +CMS_VIEW=Visualiser +CMS_COPY=Copier +CMS_MOVE=D\ufffdplacer +CMS_DELETE=Supprimer +CMS_FOLDER=Dossier +CMS_FILE=Fichier +CMS_CREATE=Cr\ufffder +CMS_CANCEL=Annuler +CMS_EDIT=Modifier +CMS_UPLOAD=T\ufffdl\ufffdd\ufffdverser +CMS_MODIFY=Modifier +CMS_CREATEFOLDER=Cr\ufffder un dossier +CMS_CREATEFILE=Cr\ufffder un fichier +CMS_UPLOADARCHIVE=T\ufffdl\ufffdd\ufffdverser une archive +CMS_BACKTOBROWSER=Retourner au navigateur de dossiers +CMS_TRANSFER=Import/Export +CMS_EXPORTARCHIVE=Exporter le dossier +CMS_SECURE=S\ufffdcuriser + +CMS_CREATEFILEINDIR=Cr\ufffder un fichier dans le dossier +CMS_FILENAME=Nom de fichier +CMS_TITLE=Titre +CMS_LANGUAGE=Langue + +CMS_DELETEPATH=Confirmer la suppression de +CMS_DELETEWARN1=ATTENION ! Vous ne pourrez pas annuler cette action. +CMS_DELETEWARN2=\ufffdtes vous certain de vouloir supprimer cette ressource ? + +CMS_DESTINATION=Destination +CMS_SOURCE=Source + +CMS_EDITING=Modification du fichier +CMS_LIVE=Diffusion imm\ufffddiate +CMS_VERSION=Version +CMS_WYSIWYG=\ufffdditeur visuel WYSIWYG + +CMS_LIVEVERSION=Version en ligne +CMS_SIZE=Taille + +CMS_CONTENT_DIR=R\ufffdpertoire de contenu +CMS_CONTENT_DIR_USE=Utilisez l'arborescence des dossiers afin de parcourir la structure du r\ufffdpertoire. +CMS_MAIN_USE=Utilisez le portlet d'administration du CMS afin de modifier le contenu de votre r\ufffdpertoire. +CMS_MANAGE=G\ufffdrer le contenu + +CMS_CREATED_BY=Cr\ufffd\ufffd par +CMS_APPROVE=Approuver +CMS_DENY=Refuser +CMS_APPROVAL=Items en attente d'approbation +CMS_PATH=Emplacement +

16 years, 11 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 November 2007