Author: julien(a)jboss.com Date: 2008-04-17 08:48:35 -0400 (Thu, 17 Apr 2008) New Revision: 10617 Added: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/client/ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/ajax/ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/ajax/entry/ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/ajax/entry/GWTClientFilter.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/ajax/entry/PortalEntryPoint.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model/ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/AjaxRequest.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/AjaxResponse.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/ClientController.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/PresentationInvocation.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/PresentationInvocationContext.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/PresentationInvocationHandler.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/server/ Removed: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/client/ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/impl/ajax/entry/ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/impl/model/ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/server/ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/ajax/entry/GWTClientFilter.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/ajax/entry/PortalEntryPoint.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/AjaxRequest.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/AjaxResponse.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/ClientController.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/PresentationInvocation.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/PresentationInvocationContext.java modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/PresentationInvocationHandler.java Modified: modules/presentation/trunk/ajax/src/main/config/war/WEB-INF/web.xml 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/plugin/MainProcessor.java modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/PresentationServerImpl.java Log: move toremove stuff to a toremove package Modified: modules/presentation/trunk/ajax/src/main/config/war/WEB-INF/web.xml =================================================================== --- modules/presentation/trunk/ajax/src/main/config/war/WEB-INF/web.xml 2008-04-17 12:44:09 UTC (rev 10616) +++ modules/presentation/trunk/ajax/src/main/config/war/WEB-INF/web.xml 2008-04-17 12:48:35 UTC (rev 10617) @@ -37,7 +37,7 @@ <!-- Add the GWT Client Filter to run the Portal in full Web 2.0 Ajax Mode. In turn, to run in Classic Html Mode, turn this filter off --> <filter> <filter-name>GWTClientFilter</filter-name> - <filter-class>org.jboss.portal.presentation.impl.ajax.entry.GWTClientFilter</filter-class> + <filter-class>org.jboss.portal.presentation.toremove.impl.ajax.entry.GWTClientFilter</filter-class> </filter> <filter-mapping> <filter-name>GWTClientFilter</filter-name> @@ -51,7 +51,7 @@ <!-- Asynchronous service request processor --> <servlet> <servlet-name>AjaxPortalEntryPoint</servlet-name> - <servlet-class>org.jboss.portal.presentation.impl.ajax.entry.PortalEntryPoint</servlet-class> + <servlet-class>org.jboss.portal.presentation.toremove.impl.ajax.entry.PortalEntryPoint</servlet-class> <load-on-startup>0</load-on-startup> </servlet> <servlet-mapping> Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/client (from rev 10616, modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/client) Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/ajax/entry (from rev 10614, modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/impl/ajax/entry) Deleted: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/ajax/entry/GWTClientFilter.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/impl/ajax/entry/GWTClientFilter.java 2008-04-17 05:58:26 UTC (rev 10614) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/ajax/entry/GWTClientFilter.java 2008-04-17 12:48:35 UTC (rev 10617) @@ -1,211 +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.ajax.entry; - -import java.util.Map; -import java.util.Enumeration; -import java.util.HashMap; -import java.io.IOException; -import java.io.InputStream; -import java.io.ByteArrayOutputStream; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.jboss.portal.presentation.protocol.GetActivation; -import org.jboss.portal.presentation.protocol.PostActivation; - -/** - * This filter is activated or deactivated depending on whether the Portal needs to runs in Ajax mode or Classic Html mode - * - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - * - */ -public class GWTClientFilter implements Filter -{ - /** - * - */ - public void init(FilterConfig arg0) throws ServletException - { - } - - /** - * - */ - public void destroy() - { - } - - /** - * - */ - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException - { - HttpServletRequest request = (HttpServletRequest)servletRequest; - HttpServletResponse response = (HttpServletResponse)servletResponse; - String contextPath = request.getContextPath(); - - //Extract the resource that is being accessed - String resource = request.getRequestURI().replaceFirst(contextPath, ""); - while(resource.startsWith("/")) - { - if(resource.length() > 1) - { - resource = resource.substring(1); - } - else - { - resource = ""; - } - } - - if(resource == null || resource.trim().length() == 0) - { - response.sendRedirect("index.html"); - return; - } - - //Now make sure the resource requested is a GWT resource - if( resource.equals("index.html") || - resource.equals("portal.css") || - resource.equals("mygwt-all.css") || - resource.equals("mygwt-all-gray.css") || - resource.equals("gwt.js") || - resource.equals("prototype.js") || - resource.contains(".cache.") || - resource.contains(".nocache.") || - resource.contains(".gwt.rpc") || - resource.contains("images/default") || - resource.contains("images/gray") - ) - { - byte[] gwtResource = this.readContent(resource); - response.getOutputStream().write(gwtResource); - response.getOutputStream().flush(); - return; - } - - - String method = request.getMethod(); - String url = request.getRequestURL().toString(); - String targetId = this.parseTargetId(url); - Map queryParameters = new HashMap(); - Enumeration paramNames = request.getParameterNames(); - if(paramNames != null) - { - while(paramNames.hasMoreElements()) - { - String name = (String)paramNames.nextElement(); - String value = (String)request.getParameter(name); - queryParameters.put(name, new String[]{value}); - } - } - if(method.equalsIgnoreCase("get")) - { - GetActivation get = new GetActivation(targetId, null, queryParameters); - request.getSession().setAttribute("serverAction", get); - } - else - { - PostActivation post = new PostActivation(targetId, null, queryParameters, null); - request.getSession().setAttribute("serverAction", post); - } - - - response.sendRedirect(contextPath+"/"+"index.html"); - } - - /** - * - * @param path - * @return - */ - private byte[] readContent(String path) - { - byte[] content = null; - - InputStream is = null; - ByteArrayOutputStream bos = null; - try - { - bos = new ByteArrayOutputStream(); - is = Thread.currentThread().getContextClassLoader().getResourceAsStream(path); - int bytesRead = 0; - byte[] data = new byte[1024]; - while((bytesRead=is.read(data)) != -1) - { - byte[] cour = new byte[bytesRead]; - System.arraycopy(data, 0, cour, 0, bytesRead); - bos.write(cour); - bos.flush(); - } - } - catch(Exception e) - { - throw new RuntimeException(e); - } - finally - { - if(is != null) - { - try{is.close();}catch(Exception e){} - } - if(bos != null) - { - content = bos.toByteArray(); - try{bos.close();}catch(Exception e){} - } - } - - return content; - } - - /** - * - * @param url - * @return - */ - private String parseTargetId(String url) - { - String targetId = null; - - int fromIndex = 0; //hard coding the portal deployment context for now - fromIndex = url.indexOf("presentation") != -1 ? url.indexOf("presentation") + "presentation".length() : 0; - targetId = url.indexOf('?') != -1 ? url.substring(fromIndex, url.indexOf('?')):url.substring(fromIndex); - - //Removes the PATH data if any found - if(targetId.indexOf(';')!=-1) - { - targetId = targetId.substring(0, targetId.indexOf(';')); - } - - return targetId; - } -} Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/ajax/entry/GWTClientFilter.java (from rev 10616, modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/impl/ajax/entry/GWTClientFilter.java) =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/ajax/entry/GWTClientFilter.java (rev 0) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/ajax/entry/GWTClientFilter.java 2008-04-17 12:48:35 UTC (rev 10617) @@ -0,0 +1,211 @@ +/****************************************************************************** + * 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.toremove.impl.ajax.entry; + +import java.util.Map; +import java.util.Enumeration; +import java.util.HashMap; +import java.io.IOException; +import java.io.InputStream; +import java.io.ByteArrayOutputStream; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.jboss.portal.presentation.protocol.GetActivation; +import org.jboss.portal.presentation.protocol.PostActivation; + +/** + * This filter is activated or deactivated depending on whether the Portal needs to runs in Ajax mode or Classic Html mode + * + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public class GWTClientFilter implements Filter +{ + /** + * + */ + public void init(FilterConfig arg0) throws ServletException + { + } + + /** + * + */ + public void destroy() + { + } + + /** + * + */ + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException + { + HttpServletRequest request = (HttpServletRequest)servletRequest; + HttpServletResponse response = (HttpServletResponse)servletResponse; + String contextPath = request.getContextPath(); + + //Extract the resource that is being accessed + String resource = request.getRequestURI().replaceFirst(contextPath, ""); + while(resource.startsWith("/")) + { + if(resource.length() > 1) + { + resource = resource.substring(1); + } + else + { + resource = ""; + } + } + + if(resource == null || resource.trim().length() == 0) + { + response.sendRedirect("index.html"); + return; + } + + //Now make sure the resource requested is a GWT resource + if( resource.equals("index.html") || + resource.equals("portal.css") || + resource.equals("mygwt-all.css") || + resource.equals("mygwt-all-gray.css") || + resource.equals("gwt.js") || + resource.equals("prototype.js") || + resource.contains(".cache.") || + resource.contains(".nocache.") || + resource.contains(".gwt.rpc") || + resource.contains("images/default") || + resource.contains("images/gray") + ) + { + byte[] gwtResource = this.readContent(resource); + response.getOutputStream().write(gwtResource); + response.getOutputStream().flush(); + return; + } + + + String method = request.getMethod(); + String url = request.getRequestURL().toString(); + String targetId = this.parseTargetId(url); + Map queryParameters = new HashMap(); + Enumeration paramNames = request.getParameterNames(); + if(paramNames != null) + { + while(paramNames.hasMoreElements()) + { + String name = (String)paramNames.nextElement(); + String value = (String)request.getParameter(name); + queryParameters.put(name, new String[]{value}); + } + } + if(method.equalsIgnoreCase("get")) + { + GetActivation get = new GetActivation(targetId, null, queryParameters); + request.getSession().setAttribute("serverAction", get); + } + else + { + PostActivation post = new PostActivation(targetId, null, queryParameters, null); + request.getSession().setAttribute("serverAction", post); + } + + + response.sendRedirect(contextPath+"/"+"index.html"); + } + + /** + * + * @param path + * @return + */ + private byte[] readContent(String path) + { + byte[] content = null; + + InputStream is = null; + ByteArrayOutputStream bos = null; + try + { + bos = new ByteArrayOutputStream(); + is = Thread.currentThread().getContextClassLoader().getResourceAsStream(path); + int bytesRead = 0; + byte[] data = new byte[1024]; + while((bytesRead=is.read(data)) != -1) + { + byte[] cour = new byte[bytesRead]; + System.arraycopy(data, 0, cour, 0, bytesRead); + bos.write(cour); + bos.flush(); + } + } + catch(Exception e) + { + throw new RuntimeException(e); + } + finally + { + if(is != null) + { + try{is.close();}catch(Exception e){} + } + if(bos != null) + { + content = bos.toByteArray(); + try{bos.close();}catch(Exception e){} + } + } + + return content; + } + + /** + * + * @param url + * @return + */ + private String parseTargetId(String url) + { + String targetId = null; + + int fromIndex = 0; //hard coding the portal deployment context for now + fromIndex = url.indexOf("presentation") != -1 ? url.indexOf("presentation") + "presentation".length() : 0; + targetId = url.indexOf('?') != -1 ? url.substring(fromIndex, url.indexOf('?')):url.substring(fromIndex); + + //Removes the PATH data if any found + if(targetId.indexOf(';')!=-1) + { + targetId = targetId.substring(0, targetId.indexOf(';')); + } + + return targetId; + } +} Deleted: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/ajax/entry/PortalEntryPoint.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/impl/ajax/entry/PortalEntryPoint.java 2008-04-17 05:58:26 UTC (rev 10614) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/ajax/entry/PortalEntryPoint.java 2008-04-17 12:48:35 UTC (rev 10617) @@ -1,290 +0,0 @@ -package org.jboss.portal.presentation.impl.ajax.entry; - - -import java.util.Map; -import java.util.StringTokenizer; -import java.util.HashMap; -import java.io.InputStream; -import java.net.URLDecoder; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; - -import org.jboss.portal.web.WebRequest; -import org.jboss.portal.web.WebResponse; - -import org.jboss.portal.common.io.IOTools; -import org.jboss.portal.presentation.PresentationServerImpl; -import org.jboss.portal.presentation.ajax.client.service.PortalRPC; -import org.jboss.portal.presentation.ajax.client.model.AjaxUIObject; -import org.jboss.portal.presentation.ajax.client.protocol.ClientResponse; -import org.jboss.portal.presentation.ajax.client.protocol.AjaxShowUIObjectResponse; -import org.jboss.portal.presentation.ajax.AjaxPresentationClient; -import org.jboss.portal.presentation.protocol.GetActivation; -import org.jboss.portal.presentation.protocol.PostActivation; -import org.jboss.portal.presentation.server2.PresentationServer; -import org.jboss.portal.presentation.impl.state.structural.ContextNode; -import org.jboss.portal.presentation.impl.state.structural.NodeImporter; -import org.jboss.portal.presentation.impl.state.structural.StructuralStateContextImpl; - -import com.google.gwt.user.client.rpc.SerializationException; -import com.google.gwt.user.server.rpc.RemoteServiceServlet; - - -/** - * This serves as the Portal Entry Point for AJAX (Asynchronous) RPC calls being made by the - * client-side Ajax agent of the Presentation Framework - * - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - * - */ -public class PortalEntryPoint extends RemoteServiceServlet implements PortalRPC -{ - /** The logger. */ - private Logger log = Logger.getLogger(getClass()); - - /** - * - */ - private PresentationServer server; - - - /** Configure the as default servlet. */ - public void init() throws ServletException - { - StructuralStateContextImpl structuralStateContext = (StructuralStateContextImpl)this.getServletContext().getAttribute("StructuralStateContext"); - - // - InputStream in = getServletContext().getResourceAsStream("/WEB-INF/page-structure.xml"); - try - { - ContextNode root = structuralStateContext.getRoot(); - new NodeImporter(root).importDocument(in); - } - catch (Exception e) - { - throw new ServletException(e); - } - finally - { - IOTools.safeClose(in); - } - - // - this.server = (PresentationServer)this.getServletContext().getAttribute("PresentationServer"); - } - //--------------------------------------------------------------------------------------------------------------------------------------------------------------------- - /** - * - */ - public String processCall(String payload) throws SerializationException - { - //Perform the remote procedure call - String returnVal = super.processCall(payload); - - //Perform any post-processing after calling the actual remote method that will perform - //the functionality for this particular remote procedure call - - return returnVal; - } - // ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - /** - * Asynchronously loads the specified object from the server - * - * @return The Initial Portal Page - */ - public ClientResponse loadObject(String objectId) - { - try - { - ClientResponse clientResponse = null; - - HttpServletRequest request = this.getThreadLocalRequest(); - - Object pendingServerAction = request.getSession().getAttribute("serverAction"); - if(pendingServerAction != null) - { - request.setAttribute("serverAction", pendingServerAction); - request.getSession().removeAttribute("serverAction"); - } - - //execute the call on the Portal - this.callPortalServer(); - - //Setup the initial UIContext for the client session - AjaxUIObject uiObject = (AjaxUIObject)request.getAttribute("uiObject"); - if(uiObject != null) - { - clientResponse = new AjaxShowUIObjectResponse(uiObject); - } - - return clientResponse; - } - catch(Exception e) - { - throw new RuntimeException(e); - } - } - - /** - * - * @param url - * @return - */ - public ClientResponse asyncGet(String url) - { - try - { - ClientResponse clientResponse = null; - - HttpServletRequest request = this.getThreadLocalRequest(); - - //Parse the query parameters into a Map of name value pairs - Map queryParams = this.parseQueryParams(url); - - //Parse the UIObject target id - String targetId = this.parseTargetId(url); - - - GetActivation get = new GetActivation(targetId, null, queryParams); - - request.setAttribute("serverAction", get); - - //execute the call on the Portal - this.callPortalServer(); - - //Setup the initial UIContext for the client session - AjaxUIObject uiObject = (AjaxUIObject)request.getAttribute("uiObject"); - if(uiObject != null) - { - clientResponse = new AjaxShowUIObjectResponse(uiObject); - } - - return clientResponse; - } - catch(Exception e) - { - throw new RuntimeException(e); - } - } - - /** - * - * @param url - * @param body - * @return - */ - public ClientResponse asyncPost(String url, String body) - { - try - { - ClientResponse clientResponse = null; - - HttpServletRequest request = this.getThreadLocalRequest(); - - //Parse the query parameters into a Map of name value pairs - Map queryParams = this.parseQueryParams(url); - - //Parse the UIObject target id - String targetId = this.parseTargetId(url); - - //Parse the serialized post body into parameters - StringTokenizer st = new StringTokenizer(body, "&"); - while(st.hasMoreTokens()) - { - String token = st.nextToken(); - int equalIndex = token.indexOf('='); - String name = token.substring(0, equalIndex); - String value = token.substring(equalIndex+1); - - queryParams.put(URLDecoder.decode(name, "UTF-8"), new String[]{URLDecoder.decode(value, "UTF-8")}); - } - - PostActivation post = new PostActivation(targetId, null, queryParams, null); - - request.setAttribute("serverAction", post); - - //execute the call on the Portal - this.callPortalServer(); - - //Setup the initial UIContext for the client session - AjaxUIObject uiObject = (AjaxUIObject)request.getAttribute("uiObject"); - if(uiObject != null) - { - clientResponse = new AjaxShowUIObjectResponse(uiObject); - } - - return clientResponse; - } - catch(Exception e) - { - throw new RuntimeException(e); - } - } - //------------------------------------------------------------------------------------------------------------------------------------------------------------------- - /** - * - */ - private Map parseQueryParams(String url) throws Exception - { - Map queryParams = new HashMap(); - - if(url.indexOf('?') != -1) - { - String queryString = url.substring(url.indexOf('?')+1); - StringTokenizer st = new StringTokenizer(queryString, "&"); - while(st.hasMoreTokens()) - { - String token = st.nextToken(); - int equalIndex = token.indexOf('='); - String name = token.substring(0, equalIndex); - String value = token.substring(equalIndex+1); - - queryParams.put(name, new String[]{URLDecoder.decode(value, "UTF-8")}); - } - } - - return queryParams; - } - - /** - * - * @param url - * @return - */ - private String parseTargetId(String url) - { - String targetId = null; - - int fromIndex = 0; //hard coding the portal deployment context for now - fromIndex = url.indexOf("presentation") != -1 ? url.indexOf("presentation") + "presentation".length() : 0; - targetId = url.indexOf('?') != -1 ? url.substring(fromIndex, url.indexOf('?')):url.substring(fromIndex); - - //Removes the PATH data if any found - if(targetId.indexOf(';')!=-1) - { - targetId = targetId.substring(0, targetId.indexOf(';')); - } - - return targetId; - } - - /** - * - * - */ - private void callPortalServer() throws Exception - { - HttpServletRequest req = this.getThreadLocalRequest(); - HttpServletResponse resp = this.getThreadLocalResponse(); - - WebRequest webReq = new WebRequest(req); - WebResponse webResp = new WebResponse(resp); - - AjaxPresentationClient client = new AjaxPresentationClient(webReq, webResp, this.server); - client.process(); - } -} Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/ajax/entry/PortalEntryPoint.java (from rev 10616, modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/impl/ajax/entry/PortalEntryPoint.java) =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/ajax/entry/PortalEntryPoint.java (rev 0) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/ajax/entry/PortalEntryPoint.java 2008-04-17 12:48:35 UTC (rev 10617) @@ -0,0 +1,288 @@ +package org.jboss.portal.presentation.toremove.impl.ajax.entry; + + +import java.util.Map; +import java.util.StringTokenizer; +import java.util.HashMap; +import java.io.InputStream; +import java.net.URLDecoder; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.log4j.Logger; + +import org.jboss.portal.common.io.IOTools; +import org.jboss.portal.presentation.toremove.invocation.AjaxRequest; +import org.jboss.portal.presentation.toremove.invocation.AjaxResponse; +import org.jboss.portal.presentation.ajax.client.service.PortalRPC; +import org.jboss.portal.presentation.ajax.client.model.AjaxUIObject; +import org.jboss.portal.presentation.ajax.client.protocol.ClientResponse; +import org.jboss.portal.presentation.ajax.client.protocol.AjaxShowUIObjectResponse; +import org.jboss.portal.presentation.ajax.AjaxPresentationClient; +import org.jboss.portal.presentation.protocol.GetActivation; +import org.jboss.portal.presentation.protocol.PostActivation; +import org.jboss.portal.presentation.server2.PresentationServer; +import org.jboss.portal.presentation.impl.state.structural.ContextNode; +import org.jboss.portal.presentation.impl.state.structural.NodeImporter; +import org.jboss.portal.presentation.impl.state.structural.StructuralStateContextImpl; + +import com.google.gwt.user.client.rpc.SerializationException; +import com.google.gwt.user.server.rpc.RemoteServiceServlet; + + +/** + * This serves as the Portal Entry Point for AJAX (Asynchronous) RPC calls being made by the + * client-side Ajax agent of the Presentation Framework + * + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public class PortalEntryPoint extends RemoteServiceServlet implements PortalRPC +{ + /** The logger. */ + private Logger log = Logger.getLogger(getClass()); + + /** + * + */ + private PresentationServer server; + + + /** Configure the as default servlet. */ + public void init() throws ServletException + { + StructuralStateContextImpl structuralStateContext = (StructuralStateContextImpl)this.getServletContext().getAttribute("StructuralStateContext"); + + // + InputStream in = getServletContext().getResourceAsStream("/WEB-INF/page-structure.xml"); + try + { + ContextNode root = structuralStateContext.getRoot(); + new NodeImporter(root).importDocument(in); + } + catch (Exception e) + { + throw new ServletException(e); + } + finally + { + IOTools.safeClose(in); + } + + // + this.server = (PresentationServer)this.getServletContext().getAttribute("PresentationServer"); + } + //--------------------------------------------------------------------------------------------------------------------------------------------------------------------- + /** + * + */ + public String processCall(String payload) throws SerializationException + { + //Perform the remote procedure call + String returnVal = super.processCall(payload); + + //Perform any post-processing after calling the actual remote method that will perform + //the functionality for this particular remote procedure call + + return returnVal; + } + // ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + /** + * Asynchronously loads the specified object from the server + * + * @return The Initial Portal Page + */ + public ClientResponse loadObject(String objectId) + { + try + { + ClientResponse clientResponse = null; + + HttpServletRequest request = this.getThreadLocalRequest(); + + Object pendingServerAction = request.getSession().getAttribute("serverAction"); + if(pendingServerAction != null) + { + request.setAttribute("serverAction", pendingServerAction); + request.getSession().removeAttribute("serverAction"); + } + + //execute the call on the Portal + this.callPortalServer(); + + //Setup the initial UIContext for the client session + AjaxUIObject uiObject = (AjaxUIObject)request.getAttribute("uiObject"); + if(uiObject != null) + { + clientResponse = new AjaxShowUIObjectResponse(uiObject); + } + + return clientResponse; + } + catch(Exception e) + { + throw new RuntimeException(e); + } + } + + /** + * + * @param url + * @return + */ + public ClientResponse asyncGet(String url) + { + try + { + ClientResponse clientResponse = null; + + HttpServletRequest request = this.getThreadLocalRequest(); + + //Parse the query parameters into a Map of name value pairs + Map queryParams = this.parseQueryParams(url); + + //Parse the UIObject target id + String targetId = this.parseTargetId(url); + + + GetActivation get = new GetActivation(targetId, null, queryParams); + + request.setAttribute("serverAction", get); + + //execute the call on the Portal + this.callPortalServer(); + + //Setup the initial UIContext for the client session + AjaxUIObject uiObject = (AjaxUIObject)request.getAttribute("uiObject"); + if(uiObject != null) + { + clientResponse = new AjaxShowUIObjectResponse(uiObject); + } + + return clientResponse; + } + catch(Exception e) + { + throw new RuntimeException(e); + } + } + + /** + * + * @param url + * @param body + * @return + */ + public ClientResponse asyncPost(String url, String body) + { + try + { + ClientResponse clientResponse = null; + + HttpServletRequest request = this.getThreadLocalRequest(); + + //Parse the query parameters into a Map of name value pairs + Map queryParams = this.parseQueryParams(url); + + //Parse the UIObject target id + String targetId = this.parseTargetId(url); + + //Parse the serialized post body into parameters + StringTokenizer st = new StringTokenizer(body, "&"); + while(st.hasMoreTokens()) + { + String token = st.nextToken(); + int equalIndex = token.indexOf('='); + String name = token.substring(0, equalIndex); + String value = token.substring(equalIndex+1); + + queryParams.put(URLDecoder.decode(name, "UTF-8"), new String[]{URLDecoder.decode(value, "UTF-8")}); + } + + PostActivation post = new PostActivation(targetId, null, queryParams, null); + + request.setAttribute("serverAction", post); + + //execute the call on the Portal + this.callPortalServer(); + + //Setup the initial UIContext for the client session + AjaxUIObject uiObject = (AjaxUIObject)request.getAttribute("uiObject"); + if(uiObject != null) + { + clientResponse = new AjaxShowUIObjectResponse(uiObject); + } + + return clientResponse; + } + catch(Exception e) + { + throw new RuntimeException(e); + } + } + //------------------------------------------------------------------------------------------------------------------------------------------------------------------- + /** + * + */ + private Map parseQueryParams(String url) throws Exception + { + Map queryParams = new HashMap(); + + if(url.indexOf('?') != -1) + { + String queryString = url.substring(url.indexOf('?')+1); + StringTokenizer st = new StringTokenizer(queryString, "&"); + while(st.hasMoreTokens()) + { + String token = st.nextToken(); + int equalIndex = token.indexOf('='); + String name = token.substring(0, equalIndex); + String value = token.substring(equalIndex+1); + + queryParams.put(name, new String[]{URLDecoder.decode(value, "UTF-8")}); + } + } + + return queryParams; + } + + /** + * + * @param url + * @return + */ + private String parseTargetId(String url) + { + String targetId = null; + + int fromIndex = 0; //hard coding the portal deployment context for now + fromIndex = url.indexOf("presentation") != -1 ? url.indexOf("presentation") + "presentation".length() : 0; + targetId = url.indexOf('?') != -1 ? url.substring(fromIndex, url.indexOf('?')):url.substring(fromIndex); + + //Removes the PATH data if any found + if(targetId.indexOf(';')!=-1) + { + targetId = targetId.substring(0, targetId.indexOf(';')); + } + + return targetId; + } + + /** + * + * + */ + private void callPortalServer() throws Exception + { + HttpServletRequest req = this.getThreadLocalRequest(); + HttpServletResponse resp = this.getThreadLocalResponse(); + +// WebRequest webReq = new WebRequest(req); +// WebResponse webResp = new WebResponse(resp); + + AjaxPresentationClient client = new AjaxPresentationClient(new AjaxRequest(req), new AjaxResponse(resp), this.server); + client.process(); + } +} Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/impl/model (from rev 10616, modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/impl/model) Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation (from rev 10615, modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation) Deleted: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/AjaxRequest.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/AjaxRequest.java 2008-04-17 12:40:29 UTC (rev 10615) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/AjaxRequest.java 2008-04-17 12:48:35 UTC (rev 10617) @@ -1,74 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2008, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.presentation.invocation; - -import org.jboss.portal.web.WebRequest; -import org.jboss.portal.web.Body; -import org.jboss.portal.common.net.media.MediaType; - -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletRequest; -import java.util.Map; - -/** - * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class AjaxRequest extends HttpServletRequestWrapper implements WebRequest -{ - - public AjaxRequest(HttpServletRequest request) - { - super(request); - } - - public Verb getVerb() - { - throw new UnsupportedOperationException(); - } - - public Map<String, String[]> getQueryParameterMap() - { - throw new UnsupportedOperationException(); - } - - public Body getBody() - { - throw new UnsupportedOperationException(); - } - - public MediaType getMediaType() - { - throw new UnsupportedOperationException(); - } - - public String getWebRequestPath() - { - throw new UnsupportedOperationException(); - } - - public String getWebContextPath() - { - throw new UnsupportedOperationException(); - } -} Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/AjaxRequest.java (from rev 10616, modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/AjaxRequest.java) =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/AjaxRequest.java (rev 0) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/AjaxRequest.java 2008-04-17 12:48:35 UTC (rev 10617) @@ -0,0 +1,74 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.presentation.invocation; + +import org.jboss.portal.web.WebRequest; +import org.jboss.portal.web.Body; +import org.jboss.portal.common.net.media.MediaType; + +import javax.servlet.http.HttpServletRequestWrapper; +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + +/** + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class AjaxRequest extends HttpServletRequestWrapper implements WebRequest +{ + + public AjaxRequest(HttpServletRequest request) + { + super(request); + } + + public Verb getVerb() + { + throw new UnsupportedOperationException(); + } + + public Map<String, String[]> getQueryParameterMap() + { + throw new UnsupportedOperationException(); + } + + public Body getBody() + { + throw new UnsupportedOperationException(); + } + + public MediaType getMediaType() + { + throw new UnsupportedOperationException(); + } + + public String getWebRequestPath() + { + throw new UnsupportedOperationException(); + } + + public String getWebContextPath() + { + throw new UnsupportedOperationException(); + } +} Deleted: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/AjaxResponse.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/AjaxResponse.java 2008-04-17 12:40:29 UTC (rev 10615) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/AjaxResponse.java 2008-04-17 12:48:35 UTC (rev 10617) @@ -1,54 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2008, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.presentation.invocation; - -import org.jboss.portal.web.WebResponse; -import org.jboss.portal.common.servlet.URLFormat; - -import javax.servlet.http.HttpServletResponseWrapper; -import javax.servlet.http.HttpServletResponse; -import java.util.Map; -import java.io.Writer; -import java.io.IOException; - -/** - * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class AjaxResponse extends HttpServletResponseWrapper implements WebResponse -{ - public AjaxResponse(HttpServletResponse response) - { - super(response); - } - - public String renderURL(String path, Map<String, String[]> parameters, URLFormat wantedURLFormat) throws IllegalArgumentException - { - throw new UnsupportedOperationException(); - } - - public void renderURL(Writer writer, String path, Map<String, String[]> parameters, URLFormat wantedURLFormat) throws IllegalArgumentException, IOException - { - throw new UnsupportedOperationException(); - } -} Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/AjaxResponse.java (from rev 10616, modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/AjaxResponse.java) =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/AjaxResponse.java (rev 0) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/AjaxResponse.java 2008-04-17 12:48:35 UTC (rev 10617) @@ -0,0 +1,54 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.presentation.invocation; + +import org.jboss.portal.web.WebResponse; +import org.jboss.portal.common.servlet.URLFormat; + +import javax.servlet.http.HttpServletResponseWrapper; +import javax.servlet.http.HttpServletResponse; +import java.util.Map; +import java.io.Writer; +import java.io.IOException; + +/** + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class AjaxResponse extends HttpServletResponseWrapper implements WebResponse +{ + public AjaxResponse(HttpServletResponse response) + { + super(response); + } + + public String renderURL(String path, Map<String, String[]> parameters, URLFormat wantedURLFormat) throws IllegalArgumentException + { + throw new UnsupportedOperationException(); + } + + public void renderURL(Writer writer, String path, Map<String, String[]> parameters, URLFormat wantedURLFormat) throws IllegalArgumentException, IOException + { + throw new UnsupportedOperationException(); + } +} Deleted: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/ClientController.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/ClientController.java 2008-04-17 12:40:29 UTC (rev 10615) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/ClientController.java 2008-04-17 12:48:35 UTC (rev 10617) @@ -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; -} Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/ClientController.java (from rev 10616, 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/toremove/invocation/ClientController.java (rev 0) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/ClientController.java 2008-04-17 12:48:35 UTC (rev 10617) @@ -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.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/toremove/invocation/PresentationInvocation.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/PresentationInvocation.java 2008-04-17 12:40:29 UTC (rev 10615) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/PresentationInvocation.java 2008-04-17 12:48:35 UTC (rev 10617) @@ -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; - } -} Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/PresentationInvocation.java (from rev 10616, 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/toremove/invocation/PresentationInvocation.java (rev 0) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/PresentationInvocation.java 2008-04-17 12:48:35 UTC (rev 10617) @@ -0,0 +1,117 @@ +/****************************************************************************** + * 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/toremove/invocation/PresentationInvocationContext.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/PresentationInvocationContext.java 2008-04-17 12:40:29 UTC (rev 10615) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/PresentationInvocationContext.java 2008-04-17 12:48:35 UTC (rev 10617) @@ -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 -{ - -} Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/PresentationInvocationContext.java (from rev 10616, 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/toremove/invocation/PresentationInvocationContext.java (rev 0) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/PresentationInvocationContext.java 2008-04-17 12:48:35 UTC (rev 10617) @@ -0,0 +1,34 @@ +/****************************************************************************** + * 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/toremove/invocation/PresentationInvocationHandler.java =================================================================== --- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/invocation/PresentationInvocationHandler.java 2008-04-17 12:40:29 UTC (rev 10615) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/PresentationInvocationHandler.java 2008-04-17 12:48:35 UTC (rev 10617) @@ -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; - } -} Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/PresentationInvocationHandler.java (from rev 10616, 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/toremove/invocation/PresentationInvocationHandler.java (rev 0) +++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/invocation/PresentationInvocationHandler.java 2008-04-17 12:48:35 UTC (rev 10617) @@ -0,0 +1,58 @@ +/****************************************************************************** + * 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; + } +} Copied: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/toremove/server (from rev 10616, modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/server) 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 12:44:09 UTC (rev 10616) +++ modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/MockPortalEntryPoint.java 2008-04-17 12:48:35 UTC (rev 10617) @@ -16,18 +16,15 @@ 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; import org.jboss.portal.presentation.ajax.client.protocol.ClientResponse; 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; +import org.jboss.portal.presentation.toremove.invocation.PresentationInvocation; +import org.jboss.portal.presentation.toremove.invocation.AjaxRequest; +import org.jboss.portal.presentation.toremove.invocation.AjaxResponse; import com.google.gwt.user.client.rpc.SerializationException; import com.google.gwt.user.server.rpc.RemoteServiceServlet; Modified: 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 12:44:09 UTC (rev 10616) +++ modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/MainProcessor.java 2008-04-17 12:48:35 UTC (rev 10617) @@ -29,13 +29,13 @@ import org.jboss.portal.web.Body; -import org.jboss.portal.presentation.server.ServerException; +import org.jboss.portal.presentation.toremove.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.toremove.server.Processor; +import org.jboss.portal.presentation.toremove.server.ProcessorRequest; +import org.jboss.portal.presentation.toremove.server.ProcessorResponse; -import org.jboss.portal.presentation.client.PresentationContext; +import org.jboss.portal.presentation.toremove.client.PresentationContext; import org.jboss.portal.presentation.model.StateType; import org.jboss.portal.presentation.model.UIWindow; Modified: 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 12:44:09 UTC (rev 10616) +++ modules/presentation/trunk/ajax/src/test/java/org/jboss/portal/presentation/test/portal/plugin/PresentationServerImpl.java 2008-04-17 12:48:35 UTC (rev 10617) @@ -22,9 +22,9 @@ ******************************************************************************/ 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.toremove.client.PresentationContext; +import org.jboss.portal.presentation.toremove.server.Processor; +import org.jboss.portal.presentation.toremove.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;