[portal-commits] JBoss Portal SVN: r10624 - in modules/presentation/trunk: ajax and 10 other directories.

Author: sohil.shah(a)jboss.com Date: 2008-04-17 16:57:03 -0400 (Thu, 17 Apr 2008) New Revision: 10624 Removed: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/ClientController.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/PresentationInvocation.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/PresentationInvocationContext.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/PresentationInvocationHandler.java modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/MainProcessor.java modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/PresentationServerImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client/ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/SessionConstants.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIContainerImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIContextImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIObjectImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIPageImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIPortalImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIWindowImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/container/ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/state/ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/lifecycle/ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/state/StateChange.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/state/StateChangeEvent.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/state/StateModification.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/state/navigational/ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/state/structural/ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/state/navigational/ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/server/ Modified: modules/presentation/trunk/.classpath modules/presentation/trunk/ajax/ modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/MockPortalEntryPoint.java modules/presentation/trunk/classic/ Log: code cleanup Modified: modules/presentation/trunk/.classpath =================================================================== --- modules/presentation/trunk/.classpath 2008-04-17 17:12:32 UTC (rev 10623) +++ modules/presentation/trunk/.classpath 2008-04-17 20:57:03 UTC (rev 10624) @@ -18,7 +18,7 @@ <classpathentry kind="var" path="M2_REPO/org/codehaus/cargo/cargo-core-uberjar/0.8/cargo-core-uberjar-0.8.jar"/> <classpathentry kind="var" path="M2_REPO/apache-tomcat/catalina/5.5.12/catalina-5.5.12.jar"/> <classpathentry kind="var" path="M2_REPO/javax/ccpp/ccpp/1.0/ccpp-1.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/portal/common/common-common/1.2.0.Beta3/common-common-1.2.0.Beta3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/portal/common/common-common/1.2.0-SNAPSHOT/common-common-1.2.0-SNAPSHOT.jar"/> <classpathentry kind="var" path="M2_REPO/org/jboss/portal/common/common-mc/1.2.0.Beta3/common-mc-1.2.0.Beta3.jar"/> <classpathentry kind="var" path="M2_REPO/org/jboss/portal/common/common-portal/1.2.0.Beta3/common-portal-1.2.0.Beta3.jar"/> <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/> @@ -100,7 +100,7 @@ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/> <classpathentry kind="var" path="M2_REPO/apache-taglibs/standard/1.1.2/standard-1.1.2.jar"/> <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/portal/web/web-web/1.2.0.Beta2/web-web-1.2.0.Beta2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/portal/web/web-web/1.2.0-SNAPSHOT/web-web-1.2.0-SNAPSHOT.jar"/> <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/> <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/> <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/> Property changes on: modules/presentation/trunk/ajax ___________________________________________________________________ Name: svn:ignore + target Deleted: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/ClientController.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/ClientController.java 2008-04-17 17:12:32 UTC (rev 10623) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/ClientController.java 2008-04-17 20:57:03 UTC (rev 10624) @@ -1,39 +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.presentation.invocation; - -import org.jboss.portal.presentation.server.ServerException; - -/** - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - * - */ -public interface ClientController -{ - /** - * - * @param invocation - * @throws ServerException - */ - public void handle(PresentationInvocation invocation) throws ServerException; -} Deleted: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/PresentationInvocation.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/PresentationInvocation.java 2008-04-17 17:12:32 UTC (rev 10623) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/PresentationInvocation.java 2008-04-17 20:57:03 UTC (rev 10624) @@ -1,117 +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.presentation.invocation; - -import org.jboss.portal.common.invocation.Invocation; -import org.jboss.portal.common.invocation.InvocationContext; - -import org.jboss.portal.web.WebRequest; -import org.jboss.portal.web.WebResponse; - - -/** - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - * - */ -public class PresentationInvocation extends Invocation -{ - private InvocationContext context = null; - private WebRequest request = null; - private WebResponse response = null; - - /** - * - * @param request - */ - public PresentationInvocation(WebRequest request, WebResponse response) - { - this.request = request; - this.response = response; - this.context = new PresentationInvocationContext(); - } - - /** - * - */ - public InvocationContext getContext() throws IllegalStateException - { - return this.context; - } - - /** - * - * @return - */ - public WebRequest getRequest() - { - return this.request; - } - - /** - * - * @return - */ - public WebResponse getResponse() - { - return this.response; - } - - /** - * - * @return - */ - public String getPortalHost() - { - return this.request.getServerName(); - } - - /** - * - * @return - */ - public String getPortalRequestPath() - { - String portalRequestPath = null; - - String requestURI = request.getRequestURI(); - String contextPath = request.getContextPath(); - portalRequestPath = requestURI.substring(contextPath.length()); - - return portalRequestPath; - } - - /** - * - * @return - */ - public String getPortalContextPath() - { - String portalContextPath = null; - - String requestURI = request.getRequestURI(); - String contextPath = request.getContextPath(); - portalContextPath = requestURI.substring(0, contextPath.length()); - - return portalContextPath; - } -} Deleted: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/PresentationInvocationContext.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/PresentationInvocationContext.java 2008-04-17 17:12:32 UTC (rev 10623) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/PresentationInvocationContext.java 2008-04-17 20:57:03 UTC (rev 10624) @@ -1,34 +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.presentation.invocation; - -import org.jboss.portal.common.invocation.AbstractInvocationContext; - -/** - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - * - */ -public class PresentationInvocationContext extends AbstractInvocationContext -{ - -} Deleted: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/PresentationInvocationHandler.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/PresentationInvocationHandler.java 2008-04-17 17:12:32 UTC (rev 10623) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/PresentationInvocationHandler.java 2008-04-17 20:57:03 UTC (rev 10624) @@ -1,58 +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.presentation.invocation; - -import org.jboss.portal.common.invocation.Invocation; -import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.common.invocation.InvocationHandler; - -/** - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - * - */ -public class PresentationInvocationHandler implements InvocationHandler -{ - /** - * - */ - private ClientController clientController = null; - - /** - * - * @param clientController - */ - public PresentationInvocationHandler(ClientController clientController) - { - this.clientController = clientController; - } - - /** - * - */ - public Object invoke(Invocation invocation) throws Exception, InvocationException - { - this.clientController.handle((PresentationInvocation)invocation); - - return null; - } -} Modified: modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/MockPortalEntryPoint.java =================================================================== --- modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/MockPortalEntryPoint.java 2008-04-17 17:12:32 UTC (rev 10623) +++ modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/MockPortalEntryPoint.java 2008-04-17 20:57:03 UTC (rev 10624) @@ -16,8 +16,6 @@ import org.apache.log4j.Logger; import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.portal.web.WebRequest; -import org.jboss.portal.web.WebResponse; import org.jboss.portal.presentation.ajax.client.service.PortalRPC; import org.jboss.portal.presentation.ajax.client.model.AjaxUIObject; @@ -25,7 +23,6 @@ import org.jboss.portal.presentation.ajax.client.protocol.AjaxShowUIObjectResponse; import org.jboss.portal.presentation.protocol.GetActivation; import org.jboss.portal.presentation.protocol.PostActivation; -import org.jboss.portal.presentation.invocation.PresentationInvocation; import org.jboss.portal.presentation.invocation.AjaxRequest; import org.jboss.portal.presentation.invocation.AjaxResponse; @@ -266,10 +263,10 @@ // WebRequest webReq = new WebRequest(req); // WebResponse webResp = new WebResponse(resp); - PresentationInvocation invocation = new PresentationInvocation(new AjaxRequest(req), new AjaxResponse(resp)); + //PresentationInvocation invocation = new PresentationInvocation(new AjaxRequest(req), new AjaxResponse(resp)); //TODO: set the proper invocation handler here - invocation.invokeNext(); + //invocation.invokeNext(); } } Deleted: modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/MainProcessor.java =================================================================== --- modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/MainProcessor.java 2008-04-17 17:12:32 UTC (rev 10623) +++ modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/MainProcessor.java 2008-04-17 20:57:03 UTC (rev 10624) @@ -1,122 +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.presentation.test.portal.plugin; - -import org.apache.log4j.Logger; - -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.impl.PortletRequestDecoder; - -import org.jboss.portal.web.Body; - -import org.jboss.portal.presentation.server.ServerException; - -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.client.PresentationContext; - -import org.jboss.portal.presentation.model.StateType; -import org.jboss.portal.presentation.model.UIWindow; - -import org.jboss.portal.presentation.protocol.LinkActivation; -import org.jboss.portal.presentation.protocol.PostActivation; -import org.jboss.portal.presentation.protocol.ProtocolAction; -import org.jboss.portal.presentation.protocol.ProtocolResponse; -import org.jboss.portal.presentation.protocol.ShowUIObjectResponse; -import org.jboss.portal.presentation.protocol.ViewUIObjectAction; - -import org.jboss.portal.presentation.test.portal.MockPortalServer; - - -import java.util.Map; - -/** - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - * - */ -public class MainProcessor implements Processor -{ - - /** . */ - private static Logger log = Logger.getLogger(MainProcessor.class); - - /** - * - */ - public ProcessorResponse process(PresentationContext presentationContext, ProcessorRequest request) throws ServerException - { - try - { - - ProtocolAction serverAction = request.getAction(); - - ProtocolResponse response = null; - - if(serverAction instanceof ViewUIObjectAction) - { - ViewUIObjectAction viewAction = (ViewUIObjectAction)serverAction; - response = new ShowUIObjectResponse(viewAction.getTargetId()); - } - else if (serverAction instanceof LinkActivation) - { - LinkActivation getActivation = (LinkActivation)serverAction; - String id = getActivation.getTargetId(); - PortletRequestDecoder decoder = new PortletRequestDecoder(); - - // Get form parameters if any - Map formParameters = null; - if (serverAction instanceof PostActivation) - { - PostActivation post = (PostActivation)serverAction; - Body body = post.getBody(); - if (body instanceof Body.Form) - { - formParameters = ((Body.Form)body).getParameters(); - } - } - - decoder.decode(getActivation.getQueryParameters(), formParameters); - StateString contentState = decoder.getNavigationalState(); - - //TODO: We assume that for now - UIWindow uiWindow = (UIWindow)presentationContext.getUIContext().getObject(id); - - - //Make an invocation on the Mock Portal Server - MockPortalServer.getInstance().invoke(id, getActivation.getQueryParameters()); - - // It means we went through a successful action or it is a render - uiWindow.setProperty(StateType.NAVIGATIONAL, "content", contentState); - response = new ShowUIObjectResponse(uiWindow.getParent().getId()); - } - - return new ProcessorResponse(response); - } - catch(Exception e) - { - throw new ServerException(e); - } - } -} Deleted: modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/PresentationServerImpl.java =================================================================== --- modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/PresentationServerImpl.java 2008-04-17 17:12:32 UTC (rev 10623) +++ modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/PresentationServerImpl.java 2008-04-17 20:57:03 UTC (rev 10624) @@ -1,122 +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.presentation.test.portal.plugin; - -import org.jboss.portal.presentation.client.PresentationContext; -import org.jboss.portal.presentation.server.Processor; -import org.jboss.portal.presentation.server.PresentationServer; -import org.jboss.portal.presentation.model.UIWindow; -import org.jboss.portal.presentation.model.content.WindowContent; -import org.jboss.portal.presentation.model.state.structural.StructuralStateContext; - -import org.jboss.portal.presentation.test.portal.MockPortalServer; -import org.jboss.portal.presentation.test.portal.MockWindow; - -/** - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - * - */ -public class PresentationServerImpl implements PresentationServer -{ - - /** - * - */ - private Processor processor; - - /** - * - */ - private StructuralStateContext structuralStateContext; - - - /** - * - * - */ - public PresentationServerImpl() - { - - } - - /** - * - * - */ - public void start() - { - this.structuralStateContext = new StructuralStateContextImpl(); - } - - /** - * - * - */ - public void stop() - { - - } - - /** - * - */ - public StructuralStateContext getStructuralStateManager() - { - return structuralStateContext; - } - - /** - * - * @param structuralStateContext - */ - public void setModelLoader(StructuralStateContext structuralStateContext) - { - this.structuralStateContext = structuralStateContext; - } - - /** - * - */ - public Processor getProcessor() - { - return this.processor; - } - - /** - * - * @param processor - */ - public void setProcessor(Processor processor) - { - this.processor = processor; - } - - /** - * - */ - public WindowContent render(PresentationContext context, UIWindow uiwindow) throws Exception - { - MockWindow window = (MockWindow)MockPortalServer.getInstance().getPortalObject(uiwindow.getId()); - return new WindowContent(-1, "Blah:", window.getMarkup()); - } -} Property changes on: modules/presentation/trunk/classic ___________________________________________________________________ Name: svn:ignore + target Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/SessionConstants.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/SessionConstants.java 2008-04-17 17:12:32 UTC (rev 10623) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/SessionConstants.java 2008-04-17 20:57:03 UTC (rev 10624) @@ -1,40 +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.presentation.impl; - -/** - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - * - */ -public interface SessionConstants -{ - /** - * Represents the session key for storing the server side UI model - */ - public final String serverModel = "serverModel"; - - /** - * Represents the session key for storing the client side UI model for the Ajax User Agent - */ - public final String ajaxModel = "ajaxModel"; -} Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIContainerImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIContainerImpl.java 2008-04-17 17:12:32 UTC (rev 10623) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIContainerImpl.java 2008-04-17 20:57:03 UTC (rev 10624) @@ -1,33 +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.presentation.impl.model; - -import org.jboss.portal.presentation.model.UIContainer; - -/** - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - * - */ -public class UIContainerImpl extends UIObjectImpl implements UIContainer -{ -} Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIContextImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIContextImpl.java 2008-04-17 17:12:32 UTC (rev 10623) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIContextImpl.java 2008-04-17 20:57:03 UTC (rev 10624) @@ -1,49 +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.presentation.impl.model; - -import org.jboss.portal.presentation.model.UIObject; -import org.jboss.portal.presentation.model.UIContext; -import org.jboss.portal.presentation.model.ModelListener; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class UIContextImpl extends UIObjectImpl implements UIContext -{ - - public UIContextImpl() - { - } - - public UIObject getObject(String id) - { - return context.getObject(id); - } - - public void addModelListener(ModelListener listener) - { - context.addModelListener(listener); - } -} Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIObjectImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIObjectImpl.java 2008-04-17 17:12:32 UTC (rev 10623) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIObjectImpl.java 2008-04-17 20:57:03 UTC (rev 10624) @@ -1,141 +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.presentation.impl.model; - -import org.jboss.portal.presentation.model.UIObject; -import org.jboss.portal.presentation.model.StateType; -import org.jboss.portal.presentation.model.state.StateException; -import org.jboss.portal.presentation.model.state.StateChangeVetoException; -import org.jboss.portal.presentation.impl.model.container.spi.UIContainerObject; -import org.jboss.portal.presentation.impl.model.container.spi.UIObjectContext; - -import java.util.Collection; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public abstract class UIObjectImpl implements UIContainerObject -{ - - /** . */ - protected UIObjectContext context; - - // - public UIObjectContext getContext() - { - return context; - } - - public void setContext(UIObjectContext context) - { - this.context = context; - } - - // - - public String getId() - { - return context.getManagedObject().getId(); - } - - public Status getStatus() - { - return context.getManagedObject().getStatus(); - } - - public void validate(Visitor scope) - { - context.getManagedObject().validate(scope); - } - - public void validate() - { - context.getManagedObject().validate(); - } - - public void refresh(Visitor scope) - { - context.getManagedObject().refresh(scope); - } - - public void refresh() - { - context.getManagedObject().refresh(); - } - - public <T> T getProperty(StateType stateType, String propertyName, Class<T> propertyType) - { - return context.getManagedObject().getProperty(stateType, propertyName, propertyType); - } - - public Object getProperty(StateType stateType, String propertyName) - { - return context.getManagedObject().getProperty(stateType, propertyName); - } - - public <T> void setProperty(StateType stateType, String propertyName, T propertyValue) throws StateChangeVetoException - { - context.getManagedObject().setProperty(stateType, propertyName, propertyValue); - } - - public UIObject getChild(String name) - { - return context.getManagedObject().getChild(name); - } - - public String getName() - { - return context.getManagedObject().getName(); - } - - public UIObject getParent() - { - return context.getManagedObject().getParent(); - } - - public Collection<? extends UIObject> getChildren() - { - return context.getManagedObject().getChildren(); - } - - public <T extends UIObject> T createChild(String name, Class<T> type) throws IllegalArgumentException - { - return context.getManagedObject().createChild(name, type); - } - - public void destroyChild(String name) throws IllegalArgumentException, StateException - { - context.getManagedObject().destroyChild(name); - } - - public void move(UIObject destination) throws IllegalArgumentException, StateException - { - context.getManagedObject().move(destination); - } - - public String toString() - { - return context.getManagedObject().toString(); - } -} Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIPageImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIPageImpl.java 2008-04-17 17:12:32 UTC (rev 10623) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIPageImpl.java 2008-04-17 20:57:03 UTC (rev 10624) @@ -1,33 +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.presentation.impl.model; - -import org.jboss.portal.presentation.model.UIPage; - -/** - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - * - */ -public class UIPageImpl extends UIObjectImpl implements UIPage -{ -} Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIPortalImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIPortalImpl.java 2008-04-17 17:12:32 UTC (rev 10623) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIPortalImpl.java 2008-04-17 20:57:03 UTC (rev 10624) @@ -1,33 +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.presentation.impl.model; - -import org.jboss.portal.presentation.model.UIPortal; - -/** - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - * - */ -public class UIPortalImpl extends UIObjectImpl implements UIPortal -{ -} Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIWindowImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIWindowImpl.java 2008-04-17 17:12:32 UTC (rev 10623) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UIWindowImpl.java 2008-04-17 20:57:03 UTC (rev 10624) @@ -1,68 +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.presentation.impl.model; - -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; -import org.jboss.portal.presentation.model.StateType; -import org.jboss.portal.presentation.model.UIWindow; - -/** - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - * - */ -public class UIWindowImpl extends UIObjectImpl implements UIWindow -{ - - /** - * - */ - public Mode getMode() - { - return getProperty(StateType.NAVIGATIONAL, "mode", Mode.class); - } - - /** - * - */ - public WindowState getWindowState() - { - return getProperty(StateType.NAVIGATIONAL, "windowstate", WindowState.class); - } - - /** - * - */ - public void setMode(Mode mode) - { - setProperty(StateType.NAVIGATIONAL, "mode", mode); - } - - /** - * - */ - public void setWindowState(WindowState windowState) - { - setProperty(StateType.NAVIGATIONAL, "windowstate", windowState); - } -} Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/state/StateChange.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/state/StateChange.java 2008-04-17 17:12:32 UTC (rev 10623) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/state/StateChange.java 2008-04-17 20:57:03 UTC (rev 10624) @@ -1,77 +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.presentation.model.event.state; - -/** - * A change in the state of the model. The change is the association of a target id and a modification. - * The target id refers to an object in the structural state context and the modification is a modification - * of its state. Note that the modification could also modify the state of other objects. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public final class StateChange<M extends StateModification> -{ - - /** . */ - private final String targetId; - - /** . */ - private final M modification; - - public StateChange(String targetId, M modification) - { - if (targetId == null) - { - throw new IllegalArgumentException(); - } - if (modification == null) - { - throw new IllegalArgumentException(); - } - - // - this.targetId = targetId; - this.modification = modification; - } - - /** - * Returns the target id of the change. - * - * @return the target id - */ - public String getTargetId() - { - return targetId; - } - - /** - * Returns the modification operated on the target id. - * - * @return the modification - */ - public M getModification() - { - return modification; - } -} Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/state/StateChangeEvent.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/state/StateChangeEvent.java 2008-04-17 17:12:32 UTC (rev 10623) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/state/StateChangeEvent.java 2008-04-17 20:57:03 UTC (rev 10624) @@ -1,60 +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.presentation.model.event.state; - -import org.jboss.portal.presentation.model.ModelEvent; -import org.jboss.portal.presentation.model.event.state.StateChange; - -/** - * Signals a state change occured. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public final class StateChangeEvent extends ModelEvent -{ - - /** . */ - private final StateChange change; - - public StateChangeEvent(StateChange change) - { - if (change == null) - { - throw new IllegalArgumentException(); - } - - // - this.change = change; - } - - /** - * Returns the state change that occured. - * - * @return the state change - */ - public StateChange getChange() - { - return change; - } -} Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/state/StateModification.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/state/StateModification.java 2008-04-17 17:12:32 UTC (rev 10623) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/event/state/StateModification.java 2008-04-17 20:57:03 UTC (rev 10624) @@ -1,33 +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.presentation.model.event.state; - -/** - * An abstract class for the modification of state. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public abstract class StateModification -{ -}