From portal-commits at lists.jboss.org Wed Mar 28 12:37:51 2007 Content-Type: multipart/mixed; boundary="===============4890674724298848501==" MIME-Version: 1.0 From: portal-commits at lists.jboss.org To: portal-commits at lists.jboss.org Subject: [portal-commits] JBoss Portal SVN: r6867 - trunk/theme/src/main/org/jboss/portal/test/theme/servlet. Date: Wed, 28 Mar 2007 12:37:50 -0400 Message-ID: --===============4890674724298848501== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: julien(a)jboss.com Date: 2007-03-28 12:37:50 -0400 (Wed, 28 Mar 2007) New Revision: 6867 Modified: trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestThemeServle= t.java Log: removed useless code in themetestservlet since the mini server env performs= the loading itself of themes Modified: trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestThem= eServlet.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestThemeServl= et.java 2007-03-28 14:48:17 UTC (rev 6866) +++ trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestThemeServl= et.java 2007-03-28 16:37:50 UTC (rev 6867) @@ -33,23 +33,14 @@ import org.jboss.portal.theme.LayoutService; import org.jboss.portal.theme.PortalLayout; import org.jboss.portal.theme.PortalTheme; -import org.jboss.portal.theme.RuntimeContext; import org.jboss.portal.theme.ThemeConstants; import org.jboss.portal.theme.ThemeService; -import org.jboss.portal.theme.deployment.jboss.PortalLayoutMetaDataFactory; -import org.jboss.portal.theme.deployment.jboss.PortalThemeMetaDataFactory; -import org.jboss.portal.theme.deployment.jboss.RenderSetMetaDataFactory; -import org.jboss.portal.theme.metadata.PortalLayoutMetaData; -import org.jboss.portal.theme.metadata.PortalThemeMetaData; -import org.jboss.portal.theme.metadata.RenderSetMetaData; import org.jboss.portal.theme.page.PageService; import org.jboss.portal.theme.page.WindowContext; import org.jboss.portal.theme.page.WindowResult; import org.jboss.portal.theme.page.PageResult; import org.jboss.portal.theme.render.PortalRenderSet; import org.jboss.portal.theme.render.RenderContext; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; = import javax.management.MBeanServer; import javax.management.ObjectName; @@ -58,21 +49,16 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.io.InputStream; import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; -import java.util.List; import java.util.Map; = /** @author Roy Russo */ = public class TestThemeServlet extends HttpServlet { - private PortalRenderSet renderSet; - private PortalLayout layout; - private PortalTheme theme; = + private static final String TEST_PAGE_NAME =3D "TestPage"; = /** How many windows to create on left region * */ @@ -81,69 +67,34 @@ /** How many windows to create on center region * */ private static final int CENTER_WINDOWS =3D 3; = - /** Set theme api services */ - public void init() + /** + * Generates a portal page with windows, using the theme api. + */ + protected void service(HttpServletRequest request, HttpServletResponse = response) throws ServletException, IOException { try { - MBeanServer mbeanServer =3D MBeanServerLocator.locateJBoss(); - LayoutService layoutService =3D (LayoutService)MBeanProxy.get(Lay= outService.class, new ObjectName("portal:service=3DLayoutService"), mbeanSe= rver); - ThemeService themeService =3D (ThemeService)MBeanProxy.get(ThemeS= ervice.class, new ObjectName("portal:service=3DThemeService"), mbeanServer); - PageService pageService =3D (PageService)MBeanProxy.get(PageServi= ce.class, new ObjectName("portal:service=3DPageService"), mbeanServer); - - ClassLoader loader =3D Thread.currentThread().getContextClassLoad= er(); - RuntimeContext runtimeContext =3D new RuntimeContext("TestAppId",= getServletContext(), "/theme-test", loader); - - // add layouts from metadata - InputStream in =3D null; - in =3D getServletContext().getResourceAsStream("/WEB-INF/portal-l= ayouts.xml"); - Unmarshaller unmarshaller =3D UnmarshallerFactory.newInstance().n= ewUnmarshaller(); - List portalLayouts =3D (List)unmarshaller.unmarshal(in, new Porta= lLayoutMetaDataFactory(), null); - for (Iterator i =3D portalLayouts.iterator(); i.hasNext();) - { - PortalLayoutMetaData layoutMD =3D (PortalLayoutMetaData)i.next= (); - layoutService.addLayout(runtimeContext, layoutMD); - } - layout =3D layoutService.getLayout("generic", true); - - // add rendersets from metadata - in =3D getServletContext().getResourceAsStream("/WEB-INF/layout/p= ortal-renderSet.xml"); - unmarshaller =3D UnmarshallerFactory.newInstance().newUnmarshalle= r(); - List renderSets =3D (List)unmarshaller.unmarshal(in, new RenderSe= tMetaDataFactory(), null); - for (Iterator i =3D renderSets.iterator(); i.hasNext();) - { - RenderSetMetaData renderSetMD =3D (RenderSetMetaData)i.next(); - layoutService.addRenderSet(runtimeContext, renderSetMD); - } - renderSet =3D layoutService.getRenderSet("divRenderer", MediaType= .HTML); - - // add themes from metadata - in =3D getServletContext().getResourceAsStream("/WEB-INF/portal-t= hemes.xml"); - unmarshaller =3D UnmarshallerFactory.newInstance().newUnmarshalle= r(); - List themes =3D (List)unmarshaller.unmarshal(in, new PortalThemeM= etaDataFactory(), null); - for (Iterator i =3D themes.iterator(); i.hasNext();) - { - PortalThemeMetaData themeMD =3D (PortalThemeMetaData)i.next(); - themeService.addTheme(runtimeContext, themeMD); - } - theme =3D themeService.getTheme("renaissance", true); + proceed(request, response); } catch (Exception e) { - e.printStackTrace(); + throw new ServletException(e); } } = - /** - * Generates a portal page with windows, using the theme api. - * - * @param httpServletRequest - * @param httpServletResponse - * @throws ServletException - * @throws IOException - */ - public void doGet(HttpServletRequest httpServletRequest, HttpServletRes= ponse httpServletResponse) throws ServletException, IOException + public void proceed(HttpServletRequest request, HttpServletResponse res= ponse) throws Exception { + MBeanServer mbeanServer =3D MBeanServerLocator.locateJBoss(); + + LayoutService layoutService =3D (LayoutService)MBeanProxy.get(Layout= Service.class, new ObjectName("portal:service=3DLayoutService"), mbeanServe= r); + ThemeService themeService =3D (ThemeService)MBeanProxy.get(ThemeServ= ice.class, new ObjectName("portal:service=3DThemeService"), mbeanServer); + PageService pageService =3D (PageService)MBeanProxy.get(PageService.= class, new ObjectName("portal:service=3DPageService"), mbeanServer); + + PortalRenderSet renderSet =3D layoutService.getRenderSet("divRendere= r", MediaType.HTML); + PortalLayout layout =3D layoutService.getLayout("generic", true); + PortalTheme theme =3D themeService.getTheme("renaissance", true); + + // Map pageProps =3D new HashMap(); pageProps.put(ThemeConstants.PORTAL_AJAX_JAVASCRIPT_BASE, "/portal-a= jax"); @@ -178,28 +129,17 @@ = // set the renderctx and req/res attr RenderContext renderCtx =3D new RenderContext(layout, markupInfo, pa= geResult, serverRequest); - httpServletResponse.setContentType(renderCtx.getContentType().toStri= ng()); - httpServletResponse.setCharacterEncoding(renderCtx.getCharset()); - httpServletRequest.setAttribute(LayoutConstants.ATTR_RENDERCONTEXT, = renderCtx); - httpServletRequest.setAttribute(LayoutConstants.ATTR_PAGE, pageResul= t); - httpServletRequest.setAttribute(ThemeConstants.ATTR_THEME, theme); + response.setContentType(renderCtx.getContentType().toString()); + response.setCharacterEncoding(renderCtx.getCharset()); + request.setAttribute(LayoutConstants.ATTR_RENDERCONTEXT, renderCtx); + request.setAttribute(LayoutConstants.ATTR_PAGE, pageResult); + request.setAttribute(ThemeConstants.ATTR_THEME, theme); = - try - { - LayoutDispatcher dispatcher1 =3D new LayoutDispatcher(renderCtx, = httpServletRequest, httpServletResponse, pageResult); - dispatcher1.include(); - } - catch (Exception e) - { - e.printStackTrace(); - } + // + LayoutDispatcher dispatcher1 =3D new LayoutDispatcher(renderCtx, req= uest, response, pageResult); + dispatcher1.include(); } = - public void doPost(HttpServletRequest httpServletRequest, HttpServletRe= sponse httpServletResponse) throws ServletException, IOException - { - doGet(httpServletRequest, httpServletResponse); - } - /** * Generates the WindowResult for our windowcontext * --===============4890674724298848501==--