[portal-commits] JBoss Portal SVN: r8212 - in modules/portlet/trunk: bridge and 20 other directories.

Author: julien(a)jboss.com Date: 2007-09-11 02:51:35 -0400 (Tue, 11 Sep 2007) New Revision: 8212 Added: modules/portlet/trunk/bridge/ modules/portlet/trunk/bridge/.classpath modules/portlet/trunk/bridge/.cvsignore modules/portlet/trunk/bridge/.project modules/portlet/trunk/bridge/build.bat modules/portlet/trunk/bridge/build.sh modules/portlet/trunk/bridge/build.xml modules/portlet/trunk/bridge/src/ modules/portlet/trunk/bridge/src/main/ modules/portlet/trunk/bridge/src/main/org/ modules/portlet/trunk/bridge/src/main/org/jboss/ modules/portlet/trunk/bridge/src/main/org/jboss/portal/ modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/ modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/ modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeInterceptor.java modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeRequest.java modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeResponse.java modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java modules/portlet/trunk/build/ide/intellij/idea60/modules/bridge/ modules/portlet/trunk/build/ide/intellij/idea60/modules/bridge/bridge.iml modules/portlet/trunk/build/ide/intellij/idea60/modules/management/ modules/portlet/trunk/build/ide/intellij/idea60/modules/management/management.iml modules/portlet/trunk/management/ modules/portlet/trunk/management/build.xml modules/portlet/trunk/management/src/ modules/portlet/trunk/management/src/main/ modules/portlet/trunk/management/src/main/org/ modules/portlet/trunk/management/src/main/org/jboss/ modules/portlet/trunk/management/src/main/org/jboss/portal/ modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/ modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/ modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/LocalPortletManagement.java modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/LocalPortletManagementMBean.java modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptor.java modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/PortletInfo.java Removed: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/management/LocalPortletManagement.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/management/LocalPortletManagementMBean.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptor.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/management/PortletInfo.java Modified: modules/portlet/trunk/build/build-thirdparty.xml modules/portlet/trunk/build/build.xml modules/portlet/trunk/jboss-portal-portlet.ipr modules/portlet/trunk/jboss-portal-portlet.iws Log: moved bridge module to portlet module and moved the management class from portlet to management Added: modules/portlet/trunk/bridge/.classpath =================================================================== --- modules/portlet/trunk/bridge/.classpath (rev 0) +++ modules/portlet/trunk/bridge/.classpath 2007-09-11 06:51:35 UTC (rev 8212) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src/main"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/> + <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/> + <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/> + <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar" sourcepath="/JBoss_AS_4.0.5/system/src/main"/> + <classpathentry kind="lib" path="/thirdparty/portals-bridges/lib/portals-bridges-common.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/api"/> + <classpathentry combineaccessrules="false" kind="src" path="/portlet"/> + <classpathentry combineaccessrules="false" kind="src" path="/server"/> + <classpathentry combineaccessrules="false" kind="src" path="/jems"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> + <classpathentry kind="output" path="output/classes"/> +</classpath> Property changes on: modules/portlet/trunk/bridge/.classpath ___________________________________________________________________ Name: svn:executable + * Added: modules/portlet/trunk/bridge/.cvsignore =================================================================== --- modules/portlet/trunk/bridge/.cvsignore (rev 0) +++ modules/portlet/trunk/bridge/.cvsignore 2007-09-11 06:51:35 UTC (rev 8212) @@ -0,0 +1 @@ +output Property changes on: modules/portlet/trunk/bridge/.cvsignore ___________________________________________________________________ Name: svn:executable + * Added: modules/portlet/trunk/bridge/.project =================================================================== --- modules/portlet/trunk/bridge/.project (rev 0) +++ modules/portlet/trunk/bridge/.project 2007-09-11 06:51:35 UTC (rev 8212) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>bridge</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Property changes on: modules/portlet/trunk/bridge/.project ___________________________________________________________________ Name: svn:executable + * Added: modules/portlet/trunk/bridge/build.bat =================================================================== --- modules/portlet/trunk/bridge/build.bat (rev 0) +++ modules/portlet/trunk/bridge/build.bat 2007-09-11 06:51:35 UTC (rev 8212) @@ -0,0 +1,54 @@ +@echo off +rem +rem Invokes a script of the same name in the 'tools' module. +rem +rem The 'tools' module is expected to be a peer directory of the directory +rem in which this script lives. +rem +rem @author Jason Dillon <jason(a)planet57.com&gt; +rem + +rem $Id: build.bat 402 2005-05-02 22:30:37Z julien $ + +setlocal + +set PROGNAME=%~nx0 +set DIRNAME=%~dp0 + +rem Legacy shell support +if x%PROGNAME%==x set PROGNAME=build.bat +if x%DIRNAME%==x set DIRNAME=.\ + +set MODULE_ROOT=%DIRNAME% +if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools +set TARGET=%TOOLS_ROOT%\bin\build.bat +set ARGS=%* + +rem Start'er up yo +goto main + +:debug +if not x%DEBUG%==x echo %PROGNAME%: %* +goto :EOF + +:main +call :debug PROGNAME=%PROGNAME% +call :debug DIRNAME=%DIRNAME% +call :debug TOOLS_ROOT=%TOOLS_ROOT% +call :debug TARGET=%TARGET% + +if exist %TARGET% call :call-script & goto :EOF +rem else fail, we can not go on + +echo %PROGNAME%: *ERROR* The target executable does not exist: +echo %PROGNAME%: +echo %PROGNAME%: %TARGET% +echo %PROGNAME%: +echo %PROGNAME%: Please make sure you have checked out the 'tools' module +echo %PROGNAME%: and make sure it is up to date. +goto :EOF + +:call-script +call :debug Executing %TARGET% %ARGS% +call %TARGET% %ARGS% +goto :EOF Property changes on: modules/portlet/trunk/bridge/build.bat ___________________________________________________________________ Name: svn:executable + * Added: modules/portlet/trunk/bridge/build.sh =================================================================== --- modules/portlet/trunk/bridge/build.sh (rev 0) +++ modules/portlet/trunk/bridge/build.sh 2007-09-11 06:51:35 UTC (rev 8212) @@ -0,0 +1,49 @@ +#!/bin/sh +## +## Invokes a script of the same name in the 'tools' module. +## +## The 'tools' module is expected to be a peer directory of the directory +## in which this script lives. +## +## @author Jason Dillon <jason(a)planet57.com&gt; +## + +# $Id: build.sh 402 2005-05-02 22:30:37Z julien $ + +PROGNAME=`basename $0` +DIRNAME=`dirname $0` + +# Buss it yo +main() { + if [ "x$TOOLS_ROOT" = "x" ]; then + TOOLS_ROOT=`cd $DIRNAME/../tools && pwd` + fi + + MODULE_ROOT=`cd $DIRNAME; pwd` + export TOOLS_ROOT MODULE_ROOT DEBUG TRACE + + # Where is the target script? + target="$TOOLS_ROOT/bin/$PROGNAME" + if [ ! -f "$target" ]; then + echo "${PROGNAME}: *ERROR* The target executable does not exist:" + echo "${PROGNAME}:" + echo "${PROGNAME}: $target" + echo "${PROGNAME}:" + echo "${PROGNAME}: Please make sure you have checked out the 'tools' module" + echo "${PROGNAME}: and make sure it is up to date." + exit 2 + fi + + # Get busy yo! + if [ "x$DEBUG" != "x" ]; then + echo "${PROGNAME}: Executing: /bin/sh $target $@" + fi + if [ "x$TRACE" = "x" ]; then + exec /bin/sh $target "$@" + else + exec /bin/sh -x $target "$@" + fi +} + +# Lets get ready to rumble! +main "$@" Property changes on: modules/portlet/trunk/bridge/build.sh ___________________________________________________________________ Name: svn:executable + * Added: modules/portlet/trunk/bridge/build.xml =================================================================== --- modules/portlet/trunk/bridge/build.xml (rev 0) +++ modules/portlet/trunk/bridge/build.xml 2007-09-11 06:51:35 UTC (rev 8212) @@ -0,0 +1,191 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE project [ + <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> + <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> + <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"> + <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> + <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> + <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent"> + ]> + +<!-- $Id: build.xml 8210 2007-09-10 23:40:53Z julien(a)jboss.com $ --> + +<!--+======================================================================+--> +<!--| JBoss Portal (The OpenSource Portal) Build File |--> +<!--| |--> +<!--| Distributable under LGPL license. |--> +<!--| See terms of license at http://www.gnu.org. |--> +<!--| |--> +<!--| This file has been designed to work with the 'tools' module and |--> +<!--| Buildmagic extentions. |--> +<!--+======================================================================+--> + +<project default="main" name="JBoss Portal Bridge"> + + <!--+====================================================================+--> + <!--| Setup |--> + <!--| |--> + <!--| Include the common build elements. |--> + <!--| |--> + <!--| This defines several different targets, properties and paths. |--> + <!--| It also sets up the basic extention tasks amoung other things. |--> + <!--+====================================================================+--> + + &buildmagic; + + &modules; + &defaults; + &tools; + &targets; + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <!-- + | Initialize the build system. Must depend on '_buildmagic:init'. + | Other targets should depend on 'init' or things will mysteriously fail. + --> + + <target name="init" unless="init.disable" depends="_buildmagic:init"> + </target> + + <!--+====================================================================+--> + <!--| Configuration |--> + <!--| |--> + <!--| This target is invoked by the Buildmagic initialization logic |--> + <!--| and should contain module specific configuration elements. |--> + <!--+====================================================================+--> + + <target name="configure" unless="configure.disable"> + + <!-- Configure thirdparty libraries --> + &libraries; + <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> + <path refid="apache.log4j.classpath"/> + <path refid="sun.servlet.classpath"/> + <path refid="portals.bridges.classpath"/> + </path> + + <path id="javac.classpath"> + <pathelement location="${build.classes}"/> + </path> + + <!-- Configure modules --> + <call target="configure-modules"/> + <path id="dependentmodule.classpath"> + <path refid="jboss.portal-portlet-jsr168api.classpath"/> + <path refid="jboss.portal-portlet.classpath"/> + </path> + + <!--+=======================================+--> + <!--| Override any default properties here. |--> + <!--+=======================================+--> + + <!-- Configure defaults & build tools --> + <call target="configure-defaults"/> + <call target="configure-tools"/> + + <!--+=======================================+--> + <!--| Define module specific elements here. |--> + <!--+=======================================+--> + <property name="javadoc.private" value="true"/> + <property name="javadoc.protected" value="false"/> + + </target> + + <!--+====================================================================+--> + <!--| Compile |--> + <!--| |--> + <!--| This target should depend on other compile-* targets for each |--> + <!--| different type of compile that needs to be performed, short of |--> + <!--| documentation compiles. |--> + <!--+====================================================================+--> + + <target name="compile" + description="Compile all source files." + depends="_default:compile-classes, + _default:compile-etc, + _default:compile-resources"> + <!-- Add module specific elements here. --> + </target> + + <!--+====================================================================+--> + <!--| Generate Output |--> + <!--| |--> + <!--| Generates the target output for this module. Target output is |--> + <!--| the output which is ment to be released or used by external |--> + <!--| modules. |--> + <!--+====================================================================+--> + + <target name="output" + description="Generate all target output." + depends="compile"> + + <mkdir dir="${build.lib}"/> + + <jar jarfile="${build.lib}/portal-portlet-bridge-lib.jar"> + <fileset dir="${build.classes}"/> + </jar> + + </target> + + <!-- ================================================================== --> + <!-- Cleaning --> + <!-- ================================================================== --> + + <!-- Clean up all build output --> + <target name="clean" depends="_default:clean"> + <!-- Add module specific elements here. --> + </target> + + <!--+====================================================================+--> + <!--| Documents |--> + <!--| |--> + <!--| Generate all documentation for this module. |--> + <!--+====================================================================+--> + + <target name="docs" depends="_default:docs"> + <!-- Add module specific elements here. --> + </target> + + <!-- ================================================================== --> + <!-- Misc. --> + <!-- ================================================================== --> + + <target name="main" depends="most"/> + <target name="all" depends="_default:all"/> + <target name="most" depends="_default:most"/> + <target name="help" depends="_default:help"/> + + <!-- ================================================================== --> + <!-- Test. --> + <!-- ================================================================== --> + + <target name="package-tests"/> + +</project> Property changes on: modules/portlet/trunk/bridge/build.xml ___________________________________________________________________ Name: svn:executable + * Added: modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeInterceptor.java =================================================================== --- modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeInterceptor.java (rev 0) +++ modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeInterceptor.java 2007-09-11 06:51:35 UTC (rev 8212) @@ -0,0 +1,55 @@ +/****************************************************************************** + * 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.portlet.bridge; + +import org.jboss.portal.portlet.invocation.PortletInterceptor; +import org.jboss.portal.portlet.invocation.PortletInvocation; + +/** + * The bridge interceptor set the bridge for the duration of the request made to the portlet. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 6549 $ + */ +public class BridgeInterceptor extends PortletInterceptor +{ + + protected Object invoke(PortletInvocation invocation) throws Exception + { + JBossServletContextProvider.BridgeInfo previousInfo = JBossServletContextProvider.get(); + try + { + // Set bridge + JBossServletContextProvider.BridgeInfo bridgeInfo = new JBossServletContextProvider.BridgeInfo(invocation); + JBossServletContextProvider.set(bridgeInfo); + + // Proceed to invocation + return invocation.invokeNext(); + } + finally + { + // Remove bridge + JBossServletContextProvider.set(previousInfo); + } + } +} Property changes on: modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeInterceptor.java ___________________________________________________________________ Name: svn:executable + * Added: modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeRequest.java =================================================================== --- modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeRequest.java (rev 0) +++ modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeRequest.java 2007-09-11 06:51:35 UTC (rev 8212) @@ -0,0 +1,329 @@ +/****************************************************************************** + * 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.portlet.bridge; + +import org.jboss.portal.portlet.impl.spi.AbstractRequestContext; +import org.jboss.portal.portlet.invocation.PortletInvocation; + +import javax.portlet.PortletRequest; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletInputStream; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.security.Principal; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Map; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 6862 $ + */ +public class BridgeRequest implements HttpServletRequest +{ + + protected final PortletRequest preq; + protected final HttpServletRequest hreq; + + public BridgeRequest(JBossServletContextProvider.BridgeInfo info) + { + PortletInvocation invocation = info.getInvocation(); + this.hreq = invocation.getDispatchedRequest(); + this.preq = (PortletRequest)hreq.getAttribute("javax.portlet.request"); + } + + public String getProtocol() + { + return null; + } + + public String getRemoteAddr() + { + return null; + } + + public String getRemoteHost() + { + return null; + } + + public String getRealPath(String s) + { + return null; + } + + public StringBuffer getRequestURL() + { + return null; + } + + public String getPathInfo() + { + return hreq.getPathInfo(); + } + + public String getQueryString() + { + return hreq.getQueryString(); + } + + public String getServletPath() + { + return hreq.getServletPath(); + } + + public String getRequestURI() + { + return hreq.getRequestURI(); + } + + public String getPathTranslated() + { + return hreq.getPathTranslated(); + } + + public String getScheme() + { + return preq.getScheme(); + } + + public String getServerName() + { + return preq.getServerName(); + } + + public int getServerPort() + { + return preq.getServerPort(); + } + + public Object getAttribute(String name) + { + return preq.getAttribute(name); + } + + public Enumeration getAttributeNames() + { + return preq.getAttributeNames(); + } + + public void setAttribute(String name, Object value) + { + preq.setAttribute(name, value); + } + + public void removeAttribute(String name) + { + preq.removeAttribute(name); + } + + public Locale getLocale() + { + return preq.getLocale(); + } + + public Enumeration getLocales() + { + return preq.getLocales(); + } + + public boolean isSecure() + { + return preq.isSecure(); + } + + public String getAuthType() + { + return preq.getAuthType(); + } + + public String getContextPath() + { + return preq.getContextPath(); + } + + public String getRemoteUser() + { + return preq.getRemoteUser(); + } + + public Principal getUserPrincipal() + { + return preq.getUserPrincipal(); + } + + public String getRequestedSessionId() + { + return preq.getRequestedSessionId(); + } + + public boolean isRequestedSessionIdValid() + { + return preq.isRequestedSessionIdValid(); + } + + public String getParameter(String s) + { + return preq.getParameter(s); + } + + public Enumeration getParameterNames() + { + return preq.getParameterNames(); + } + + public String[] getParameterValues(String s) + { + return preq.getParameterValues(s); + } + + public Map getParameterMap() + { + return preq.getParameterMap(); + } + + public String getCharacterEncoding() + { + return null; + } + + public void setCharacterEncoding(String s) throws UnsupportedEncodingException + { + } + + public int getContentLength() + { + return 0; + } + + public String getContentType() + { + return null; + } + + public ServletInputStream getInputStream() throws IOException + { + return null; + } + + public BufferedReader getReader() throws IOException + { + return null; + } + + // Must be based on properties provided by the getProperties method of the PortletRequest interface + + public String getHeader(String name) + { + return null; + } + + public Enumeration getHeaders(String names) + { + return null; + } + + public Enumeration getHeaderNames() + { + return null; + } + + public Cookie[] getCookies() + { + return new Cookie[0]; + } + + public long getDateHeader(String s) + { + return 0; + } + + public int getIntHeader(String s) + { + return 0; + } + + public String getMethod() + { + return "GET"; + } + + public RequestDispatcher getRequestDispatcher(String s) + { + return hreq.getRequestDispatcher(s); + } + + public boolean isUserInRole(String roleName) + { + return preq.isUserInRole(roleName); + } + + public HttpSession getSession(boolean create) + { + return hreq.getSession(create); + } + + public HttpSession getSession() + { + return hreq.getSession(); + } + + public boolean isRequestedSessionIdFromCookie() + { + return false; + } + + public boolean isRequestedSessionIdFromURL() + { + return false; + } + + public boolean isRequestedSessionIdFromUrl() + { + return false; + } + + public int getRemotePort() + { + throw new UnsupportedOperationException("NYI"); + } + + public String getLocalName() + { + throw new UnsupportedOperationException("NYI"); + } + + public String getLocalAddr() + { + throw new UnsupportedOperationException("NYI"); + } + + public int getLocalPort() + { + throw new UnsupportedOperationException("NYI"); + } +} Property changes on: modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeRequest.java ___________________________________________________________________ Name: svn:executable + * Added: modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeResponse.java =================================================================== --- modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeResponse.java (rev 0) +++ modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeResponse.java 2007-09-11 06:51:35 UTC (rev 8212) @@ -0,0 +1,294 @@ +/****************************************************************************** + * 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.portlet.bridge; + +import org.jboss.portal.portlet.invocation.PortletInvocation; + +import javax.portlet.PortletResponse; +import javax.portlet.RenderResponse; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintWriter; +import java.util.Locale; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 6862 $ + */ +public class BridgeResponse implements HttpServletResponse +{ + + /** . */ + protected final PortletResponse presp; + + /** . */ + protected final PortletInvocation invocation; + + /** . */ + protected ServletOutputStream sos; + + public BridgeResponse(JBossServletContextProvider.BridgeInfo info) + { + invocation = info.getInvocation(); + HttpServletRequest hreq = invocation.getDispatchedRequest(); + this.presp = (PortletResponse)hreq.getAttribute("javax.portlet.response"); + this.sos = null; + } + + public String encodeRedirectURL(String s) + { + return null; + } + + public String encodeRedirectUrl(String s) + { + return null; + } + + public String getCharacterEncoding() + { + return "UTF-8"; + } + + public void setBufferSize(int i) + { + if (presp instanceof RenderResponse) + { + ((RenderResponse)presp).setBufferSize(i); + } + else + { + throw new IllegalStateException("setBufferSize called on non render response"); + } + } + + public void flushBuffer() throws IOException + { + if (presp instanceof RenderResponse) + { + ((RenderResponse)presp).flushBuffer(); + } + else + { + throw new IllegalStateException("flushBuffer called on non render response"); + } + } + + public void resetBuffer() + { + if (presp instanceof RenderResponse) + { + ((RenderResponse)presp).resetBuffer(); + } + else + { + throw new IllegalStateException("resetBuffer called on non render response"); + } + } + + public void reset() + { + if (presp instanceof RenderResponse) + { + ((RenderResponse)presp).reset(); + } + else + { + throw new IllegalStateException("reset called on non render response"); + } + } + + public int getBufferSize() + { + if (presp instanceof RenderResponse) + { + return ((RenderResponse)presp).getBufferSize(); + } + throw new IllegalStateException("getBufferSize called on non render response"); + } + + public boolean isCommitted() + { + if (presp instanceof RenderResponse) + { + return ((RenderResponse)presp).isCommitted(); + } + throw new IllegalStateException("isCommited called on non render response"); + } + + public ServletOutputStream getOutputStream() throws IOException + { + if (sos == null) + { + if (presp instanceof RenderResponse) + { + sos = new ServletOutputStream() + { + private OutputStream out = ((RenderResponse)presp).getPortletOutputStream(); + + public void write(byte b[], int off, int len) throws IOException + { + out.write(b, off, len); + } + + public void write(byte b[]) throws IOException + { + out.write(b); + } + + public void write(int b) throws IOException + { + out.write(b); + } + }; + } + else + { + throw new IllegalStateException("getOutputStream called on non render response"); + } + } + return sos; + } + + public PrintWriter getWriter() throws IOException + { + if (presp instanceof RenderResponse) + { + RenderResponse rresp = (RenderResponse)presp; + if (rresp.getContentType() == null) + { + // + rresp.setContentType("text/html"); + } + return rresp.getWriter(); + } + throw new IllegalStateException("getWriter called on non render response"); + } + + public String encodeURL(String s) + { + // URL may not start with / or http:// so we need to defer it to the real response + // PortletResponse would throw an IllegalArgumentException + return invocation.getDispatchedResponse().encodeURL(s); + } + + public String encodeUrl(String s) + { + return invocation.getDispatchedResponse().encodeURL(s); + } + + // Must perform no operations + + public void setContentType(String mimeType) + { + if (presp instanceof RenderResponse) + { + ((RenderResponse)presp).setContentType(mimeType); + } + else + { + throw new IllegalStateException("setContentType called on non render response"); + } + } + + public void setContentLength(int i) + { + } + + public void setLocale(Locale locale) + { + } + + public void addCookie(Cookie cookie) + { + } + + public void sendError(int i) throws IOException + { + } + + public void sendError(int i, String s) throws IOException + { + } + + public void sendRedirect(String s) throws IOException + { + } + + public void setDateHeader(String s, long l) + { + } + + public void addDateHeader(String s, long l) + { + } + + public void setHeader(String s, String s1) + { + } + + public void addHeader(String s, String s1) + { + } + + public void setIntHeader(String s, int i) + { + } + + public void addIntHeader(String s, int i) + { + } + + public void setStatus(int i) + { + } + + public void setStatus(int i, String s) + { + } + + public boolean containsHeader(String s) + { + return false; + } + + public Locale getLocale() + { + return invocation.getUserContext().getLocale(); + } + + public String getContentType() + { + throw new UnsupportedOperationException(); + } + + public void setCharacterEncoding(String s) + { + throw new UnsupportedOperationException(); + } +} + Property changes on: modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeResponse.java ___________________________________________________________________ Name: svn:executable + * Added: modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java =================================================================== --- modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java (rev 0) +++ modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java 2007-09-11 06:51:35 UTC (rev 8212) @@ -0,0 +1,139 @@ +/****************************************************************************** + * 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.portlet.bridge; + +import org.apache.portals.bridges.common.ServletContextProvider; +import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.container.PortletContainerInvoker; +import org.jboss.portal.portlet.container.PortletContainer; + +import javax.portlet.GenericPortlet; +import javax.portlet.PortletRequest; +import javax.portlet.PortletResponse; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * The JBoss implementation of <code>org.apache.portals.bridges.common.ServletContextProvider</code> use thread local + * variables to keep the request associated with the current thread of execution. + * + * @author <a href="mailto:dr@vizuri.com">Swarn Dhaliwal</a> + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7226 $ + */ +public class JBossServletContextProvider implements ServletContextProvider +{ + + /** . */ + private static final ThreadLocal local = new ThreadLocal(); + + static void set(BridgeInfo info) + { + local.set(info); + } + + public static BridgeInfo get() + { + return (BridgeInfo)local.get(); + } + + /** @throws IllegalStateException if no bridge info is found */ + public ServletContext getServletContext(GenericPortlet genericPortlet) throws IllegalStateException + { + BridgeInfo info = ((BridgeInfo)local.get()); + if (info == null) + { + throw new IllegalStateException("No bridge set"); + } + return info.ctx; + } + + /** @throws IllegalStateException if no bridge info is found */ + public HttpServletRequest getHttpServletRequest(GenericPortlet genericPortlet, PortletRequest portletRequest) throws IllegalStateException + { + BridgeInfo info = (BridgeInfo)JBossServletContextProvider.local.get(); + if (info == null) + { + throw new IllegalStateException("No bridge set"); + } + if (info.breq == null) + { + init(info); + } + return info.breq; + } + + /** @throws IllegalStateException if no bridge info is found */ + public HttpServletResponse getHttpServletResponse(GenericPortlet genericPortlet, PortletResponse portletResponse) throws IllegalStateException + { + BridgeInfo info = (BridgeInfo)JBossServletContextProvider.local.get(); + if (info == null) + { + throw new IllegalStateException("No bridge set"); + } + if (info.breq == null) + { + init(info); + } + return info.bresp; + } + + /** Lazy initialisation of the bridge info. */ + private void init(BridgeInfo bridgeInfo) + { + bridgeInfo.breq = new BridgeRequest(bridgeInfo); + bridgeInfo.bresp = new BridgeResponse(bridgeInfo); + } + + public static class BridgeInfo + { + /** Servlet context of the dispatched application. */ + private final PortletInvocation invocation; + + /** Servlet context of the dispatched application. */ + private final ServletContext ctx; + + /** The bridge response. */ + private BridgeRequest breq; + + /** The bridge response. */ + private BridgeResponse bresp; + + public BridgeInfo(PortletInvocation invocation) + { + PortletContainer container = (PortletContainer)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER); + + // + this.invocation = invocation; + this.ctx = container.getApplication().getContext().getServletContext(); + this.breq = null; + this.bresp = null; + } + + public PortletInvocation getInvocation() + { + return invocation; + } + } +} Property changes on: modules/portlet/trunk/bridge/src/main/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java ___________________________________________________________________ Name: svn:executable + * Modified: modules/portlet/trunk/build/build-thirdparty.xml =================================================================== --- modules/portlet/trunk/build/build-thirdparty.xml 2007-09-10 23:44:42 UTC (rev 8211) +++ modules/portlet/trunk/build/build-thirdparty.xml 2007-09-11 06:51:35 UTC (rev 8212) @@ -29,7 +29,6 @@ <!-- File Imports --> <import file="../tools/etc/jbossbuild/tasks.xml"/> - <!-- Main Definition of dependencies --> <build id="jbossportal-thirdparty" impltitle="JBossPortal" @@ -59,6 +58,8 @@ <componentref name="apache-httpclient" version="3.0.1"/> <componentref name="apache-logging" version="1.1"/> + <componentref name="portals-bridges" version="1.0.3"/> + <!-- MC 1.0.2 --> <!-- <componentref name="jboss/common" version="1.2.0.GA-brew"/> Modified: modules/portlet/trunk/build/build.xml =================================================================== --- modules/portlet/trunk/build/build.xml 2007-09-10 23:44:42 UTC (rev 8211) +++ modules/portlet/trunk/build/build.xml 2007-09-11 06:51:35 UTC (rev 8212) @@ -114,12 +114,15 @@ <module name="jsr168api"/> <module name="portlet"/> <module name="federation"/> + <module name="management"/> + <module name="bridge"/> + <module name="test"/> <!-- Module groups --> <group name="portlet"> <include - modules="jsr168api,portlet,federation"/> + modules="jsr168api,portlet,federation,management,bridge"/> </group> <group name="default"> Added: modules/portlet/trunk/build/ide/intellij/idea60/modules/bridge/bridge.iml =================================================================== --- modules/portlet/trunk/build/ide/intellij/idea60/modules/bridge/bridge.iml (rev 0) +++ modules/portlet/trunk/build/ide/intellij/idea60/modules/bridge/bridge.iml 2007-09-11 06:51:35 UTC (rev 8212) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$/../../../../../../bridge"> + <sourceFolder url="file://$MODULE_DIR$/../../../../../../bridge/src/main" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="portlet" /> + <orderEntry type="module" module-name="jsr168api" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/portals-bridges/lib/portals-bridges-common.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> + <component name="VcsManagerConfiguration"> + <option name="ACTIVE_VCS_NAME" value="svn" /> + <option name="USE_PROJECT_VCS" value="false" /> + </component> +</module> + Added: modules/portlet/trunk/build/ide/intellij/idea60/modules/management/management.iml =================================================================== --- modules/portlet/trunk/build/ide/intellij/idea60/modules/management/management.iml (rev 0) +++ modules/portlet/trunk/build/ide/intellij/idea60/modules/management/management.iml 2007-09-11 06:51:35 UTC (rev 8212) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$/../../../../../../management"> + <sourceFolder url="file://$MODULE_DIR$/../../../../../../management/src/main" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="portlet" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/oswego-concurrent/lib/concurrent.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> + <component name="VcsManagerConfiguration"> + <option name="ACTIVE_VCS_NAME" value="svn" /> + <option name="USE_PROJECT_VCS" value="false" /> + </component> +</module> + Modified: modules/portlet/trunk/jboss-portal-portlet.ipr =================================================================== --- modules/portlet/trunk/jboss-portal-portlet.ipr 2007-09-10 23:44:42 UTC (rev 8211) +++ modules/portlet/trunk/jboss-portal-portlet.ipr 2007-09-11 06:51:35 UTC (rev 8212) @@ -252,8 +252,10 @@ </component> <component name="ProjectModuleManager"> <modules> + <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/bridge/bridge.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/bridge/bridge.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/federation/federation.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/federation/federation.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/jsr168api/jsr168api.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/jsr168api/jsr168api.iml" /> + <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/management/management.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/management/management.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/portlet/portlet.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/portlet/portlet.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/test/test.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/test/test.iml" /> <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/testsuite/testsuite.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/testsuite/testsuite.iml" /> Modified: modules/portlet/trunk/jboss-portal-portlet.iws =================================================================== --- modules/portlet/trunk/jboss-portal-portlet.iws 2007-09-10 23:44:42 UTC (rev 8211) +++ modules/portlet/trunk/jboss-portal-portlet.iws 2007-09-11 06:51:35 UTC (rev 8212) @@ -17,52 +17,43 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/deployment/PortletApplicationMetaDataFactory.java" afterPath="" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF/classes/log4j.properties" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/jboss-4.2" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF/classes/logging.properties" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/deployment" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/jboss-4.2/portlet-test-war" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployer.java" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployer.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/jboss-context.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/classes/log4j.properties" afterPath="" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/tomcat-6.0" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war/META-INF/context.xml" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/deployment/ValueTrimmingFilter.java" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/spi/RequestContext.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/spi/RequestContext.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/context.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/deployment/PortletApplicationMetaDataFactory.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/deployment/ValueTrimmingFilter.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/test/servers.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ActionContextImpl.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ActionContextImpl.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/deployment/JBossApplicationMetaDataFactory.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF/classes" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml" afterPath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractRequestContext.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractRequestContext.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/test" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war/META-INF" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/classes/logging.properties" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/web.xml" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/build.xml" afterPath="$PROJECT_DIR$/test/build.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/deployment/UnmarshallerTestCase.java" afterPath="" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet/management" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet/management/LocalPortletManagement.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/.classpath" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/management/PortletInfo.java" afterPath="" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main/org/jboss/portal" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/build.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/.project" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/build.sh" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src/main/org/jboss" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src/main/org/jboss/portal/portlet" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/management/LocalPortletManagement.java" afterPath="" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src/main/org/jboss/portal/portlet/bridge" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptor.java" afterPath="" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src/main/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src/main" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main/org" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeResponse.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java" afterPath="" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptor.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/management/LocalPortletManagementMBean.java" afterPath="" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src/main/org/jboss/portal" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src/main/org" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/build.bat" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeInterceptor.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/.cvsignore" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/build.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main/org/jboss" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet/management/PortletInfo.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet/management/LocalPortletManagementMBean.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeRequest.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -838,98 +829,7 @@ </subPane> </component> <component name="FileEditorManager"> - <leaf> - <file leaf-file-name="UserContext.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/spi/UserContext.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="0" selection-start="2037" selection-end="2037" vertical-scroll-proportion="0.16276202"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="AbstractUserContext.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="70" column="0" selection-start="2962" selection-end="2962" vertical-scroll-proportion="0.4401973"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="AbstractActionContext.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractActionContext.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="39" column="22" selection-start="2276" selection-end="2276" vertical-scroll-proportion="0.08508015"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ActionContextImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ActionContextImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="58" column="0" selection-start="2609" selection-end="2609" vertical-scroll-proportion="0.50308263"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ValueMapAssert.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ValueMapAssert.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="65" column="0" selection-start="2889" selection-end="2889" vertical-scroll-proportion="0.57706535"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="InstanceContext.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/spi/InstanceContext.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="31" column="0" selection-start="1994" selection-end="1994" vertical-scroll-proportion="0.13316892"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="AbstractInstanceContext.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractInstanceContext.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="36" selection-start="2112" selection-end="2135" vertical-scroll-proportion="0.014796548"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="TestInstanceContext.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/TestInstanceContext.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="13" selection-start="2194" selection-end="2194" vertical-scroll-proportion="0.014796548"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="UserContextSupport.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/UserContextSupport.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="13" selection-start="2071" selection-end="2071" vertical-scroll-proportion="0.13316892"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="SecurityContextSupport.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="13" selection-start="2108" selection-end="2108" vertical-scroll-proportion="0.17755857"> - <folding /> - </state> - </provider> - </entry> - </file> - </leaf> + <leaf /> </component> <component name="FindManager"> <FindUsagesManager> @@ -1017,577 +917,7 @@ <option name="myItemId" value="jboss-portal-portlet.ipr" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools/etc" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools/etc" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools/etc/buildfragments" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/tomcat-6.0" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF/classes" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/tomcat-6.0" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war/META-INF" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/portlet-test-war" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/jboss-4.2" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/jboss-4.2/portlet-test-war" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/deployment" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/portal-portlet-lib-jar" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/portal-portlet-lib-jar/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/portal-portlet-lib-jar/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/portal-portlet-lib-jar/org/jboss/portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/portal-portlet-lib-jar/org/jboss/portal/portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </subPane> </component> <component name="ProjectReloadState"> @@ -1601,7 +931,7 @@ <showLibraryContents /> <hideEmptyPackages /> <abbreviatePackageNames /> - <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" /> + <showStructure Scope="false" ProjectPane="false" PackagesPane="false" Favorites="false" /> <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> @@ -1627,10 +957,11 @@ <recent name="org.jboss.portal.portlet.registry" /> </key> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> + <recent name="org.jboss.portal.portlet" /> + <recent name="org.jboss.portal" /> + <recent name="org.jboss.portal.portlet.management" /> <recent name="org.jboss.portal.portlet.test.deployment" /> <recent name="org.jboss.portal.test.portlet.state" /> - <recent name="org.jboss.portal.portlet.test.url" /> - <recent name="org.jboss.portal.portlet.impl" /> </key> </component> <component name="RestoreUpdateTree" /> @@ -1841,7 +1172,7 @@ <option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" /> <option name="PUT_FOCUS_INTO_COMMENT" value="false" /> <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> - <option name="LAST_COMMIT_MESSAGE" value="improve singleton access to RemoteTestDriverServer" /> + <option name="LAST_COMMIT_MESSAGE" value="remove empty dirs" /> <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" /> <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" /> <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> @@ -1862,6 +1193,7 @@ <MESSAGE value="- forgot to wire the PortletContainer to the PortletApplication" /> <MESSAGE value="- somehow the portal servlet can almost render portlets" /> <MESSAGE value="improve singleton access to RemoteTestDriverServer" /> + <MESSAGE value="remove empty dirs" /> </component> <component name="VssConfiguration"> <option name="CLIENT_PATH" value="" /> @@ -1909,113 +1241,113 @@ </component> <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.11111111" version="1"> <option name="myPlainMode" value="false" /> - <option name="myLastEditedConfigurable" value="portlet" /> + <option name="myLastEditedConfigurable" value="bridge" /> </component> <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1"> <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/PortletSupport.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="65" column="64" selection-start="2869" selection-end="2869" vertical-scroll-proportion="0.5918619"> + <state line="35" column="13" selection-start="2108" selection-end="2108" vertical-scroll-proportion="0.17755857"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/ActionContextSupport.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/LocalInterceptor.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="13" selection-start="2156" selection-end="2156" vertical-scroll-proportion="0.13316892"> + <state line="34" column="13" selection-start="2194" selection-end="2194" vertical-scroll-proportion="0.16276202"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java"> + <entry file="file://$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet/management/LocalPortletManagementMBean.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="13" selection-start="2068" selection-end="2068" vertical-scroll-proportion="0.13316892"> + <state line="28" column="17" selection-start="1917" selection-end="1917" vertical-scroll-proportion="0.10357583"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java"> + <entry file="file://$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet/management/LocalPortletManagement.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="13" selection-start="2256" selection-end="2256" vertical-scroll-proportion="0.13316892"> + <state line="31" column="13" selection-start="2015" selection-end="2015" vertical-scroll-proportion="0.13316892"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/RenderContextSupport.java"> + <entry file="file://$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptor.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="13" selection-start="1972" selection-end="1972" vertical-scroll-proportion="0.13316892"> + <state line="28" column="17" selection-start="1917" selection-end="1917" vertical-scroll-proportion="0.10357583"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/spi/UserContext.java"> + <entry file="file://$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="0" selection-start="2037" selection-end="2037" vertical-scroll-proportion="0.16276202"> + <state line="39" column="13" selection-start="2355" selection-end="2355" vertical-scroll-proportion="0.13316892"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java"> + <entry file="file://$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet/management/PortletInfo.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="70" column="0" selection-start="2962" selection-end="2962" vertical-scroll-proportion="0.4401973"> + <state line="28" column="13" selection-start="1913" selection-end="1913" vertical-scroll-proportion="0.10357583"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractActionContext.java"> + <entry file="file://$PROJECT_DIR$/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeInterceptor.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="39" column="22" selection-start="2276" selection-end="2276" vertical-scroll-proportion="0.08508015"> + <state line="33" column="13" selection-start="2138" selection-end="2138" vertical-scroll-proportion="0.16276202"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ActionContextImpl.java"> + <entry file="file://$PROJECT_DIR$/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeResponse.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="58" column="0" selection-start="2609" selection-end="2609" vertical-scroll-proportion="0.50308263"> + <state line="41" column="13" selection-start="2333" selection-end="2333" vertical-scroll-proportion="0.13316892"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ValueMapAssert.java"> + <entry file="file://$PROJECT_DIR$/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeRequest.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="65" column="0" selection-start="2889" selection-end="2889" vertical-scroll-proportion="0.57706535"> + <state line="45" column="13" selection-start="2494" selection-end="2494" vertical-scroll-proportion="0.13316892"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/spi/InstanceContext.java"> + <entry file="file://$PROJECT_DIR$/bridge/src/main/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="31" column="0" selection-start="1994" selection-end="1994" vertical-scroll-proportion="0.13316892"> + <state line="44" column="13" selection-start="2677" selection-end="2677" vertical-scroll-proportion="0.1959799"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/TestInstanceContext.java"> + <entry file="file://$PROJECT_DIR$/management/build.sh"> <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="13" selection-start="2194" selection-end="2194" vertical-scroll-proportion="0.014796548"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/UserContextSupport.java"> + <entry file="file://$PROJECT_DIR$/management/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="13" selection-start="2071" selection-end="2071" vertical-scroll-proportion="0.13316892"> + <state line="100" column="0" selection-start="5483" selection-end="5539" vertical-scroll-proportion="0.50308263"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java"> + <entry file="file://$PROJECT_DIR$/bridge/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="13" selection-start="2108" selection-end="2108" vertical-scroll-proportion="0.17755857"> + <state line="67" column="64" selection-start="4063" selection-end="4063" vertical-scroll-proportion="0.014796548"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractInstanceContext.java"> + <entry file="file://$PROJECT_DIR$/portlet/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="36" selection-start="2112" selection-end="2135" vertical-scroll-proportion="0.014796548"> + <state line="105" column="0" selection-start="5717" selection-end="5783" vertical-scroll-proportion="0.9321825"> <folding /> </state> </provider> Added: modules/portlet/trunk/management/build.xml =================================================================== --- modules/portlet/trunk/management/build.xml (rev 0) +++ modules/portlet/trunk/management/build.xml 2007-09-11 06:51:35 UTC (rev 8212) @@ -0,0 +1,194 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE project [ + <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> + <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> + <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"> + <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> + <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> + <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent"> + ]> + +<!-- $Id: build.xml 7969 2007-08-17 09:29:00Z julien(a)jboss.com $ --> + +<!--+======================================================================+--> +<!--| JBoss Portal (The OpenSource Portal) Build File |--> +<!--| |--> +<!--| Distributable under LGPL license. |--> +<!--| See terms of license at http://www.gnu.org. |--> +<!--| |--> +<!--| This file has been designed to work with the 'tools' module and |--> +<!--| Buildmagic extentions. |--> +<!--+======================================================================+--> + +<project default="main" name="JBoss Portal"> + + <!--+====================================================================+--> + <!--| Setup |--> + <!--| |--> + <!--| Include the common build elements. |--> + <!--| |--> + <!--| This defines several different targets, properties and paths. |--> + <!--| It also sets up the basic extention tasks amoung other things. |--> + <!--+====================================================================+--> + + &buildmagic; + &modules; + &defaults; + &tools; + &targets; + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <!-- + | Initialize the build system. Must depend on '_buildmagic:init'. + | Other targets should depend on 'init' or things will mysteriously fail. + --> + + <target name="init" unless="init.disable" depends="_buildmagic:init"> + </target> + + <!--+====================================================================+--> + <!--| Configuration |--> + <!--| |--> + <!--| This target is invoked by the Buildmagic initialization logic |--> + <!--| and should contain module specific configuration elements. |--> + <!--+====================================================================+--> + + <target name="configure" unless="configure.disable"> + + <!-- Configure some properties --> + <property name="jboss-junit-configuration" value=""/> + <property name="junit.formatter.usefile" value="true"/> + + <!-- Configure thirdparty libraries --> + &libraries; + <path id="library.classpath"> + <path refid="jboss.portal/modules/common.classpath"/> + <path refid="jboss.portal/modules/web.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> + <path refid="oswego.concurrent.classpath"/> + </path> + + <!-- Configure modules --> + <call target="configure-modules"/> + <path id="dependentmodule.classpath"> + <path refid="jboss.portal-portlet.classpath"/> + </path> + + <!--+=======================================+--> + <!--| Override any default properties here. |--> + <!--+=======================================+--> + + <!-- Configure defaults & build tools --> + <call target="configure-defaults"/> + <!--<call target="configure-tools"/>--> + + <!--+=======================================+--> + <!--| Define module specific elements here. |--> + <!--+=======================================+--> + <property name="javadoc.private" value="true"/> + <property name="javadoc.protected" value="false"/> + + </target> + + <!--+====================================================================+--> + <!--| Compile |--> + <!--| |--> + <!--| This target should depend on other compile-* targets for each |--> + <!--| different type of compile that needs to be performed, short of |--> + <!--| documentation compiles. |--> + <!--+====================================================================+--> + + <target name="compile" + description="Compile all source files." + depends="_default:compile-classes, + _default:compile-etc, + _default:compile-resources"> + <!-- Add module specific elements here. --> + </target> + + <!--+====================================================================+--> + <!--| Generate Output |--> + <!--| |--> + <!--| Generates the target output for this module. Target output is |--> + <!--| the output which is ment to be released or used by external |--> + <!--| modules. |--> + <!--+====================================================================+--> + + <target name="output" + description="Generate all target output." + depends="compile"> + <mkdir dir="${build.lib}"/> + + <!-- Portlet management lib jar --> + <jar jarfile="${build.lib}/portal-portlet-management-lib.jar"> + <fileset dir="${build.classes}"> + </fileset> + </jar> + + </target> + + <target name="package-tests" depends="init"> + </target> + + <!-- ================================================================== --> + <!-- Cleaning --> + <!-- ================================================================== --> + + <!-- Clean up all build output --> + <target name="clean" depends="_default:clean"> + <!-- Add module specific elements here. --> + </target> + + <!--+====================================================================+--> + <!--| Documents |--> + <!--| |--> + <!--| Generate all documentation for this module. |--> + <!--+====================================================================+--> + + <target name="docs" depends="_default:docs"> + <!-- Add module specific elements here. --> + </target> + + <!-- ================================================================== --> + <!-- Misc. --> + <!-- ================================================================== --> + + <target name="main" depends="most"/> + <target name="all" depends="_default:all"/> + <target name="most" depends="_default:most"/> + <target name="help" depends="_default:help"/> + + <!-- ================================================================== --> + <!-- Deployment --> + <!-- ================================================================== --> + + <target name="tests" depends="init, _buildmagic:configure:deployment"> + </target> + +</project> Added: modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/LocalPortletManagement.java =================================================================== --- modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/LocalPortletManagement.java (rev 0) +++ modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/LocalPortletManagement.java 2007-09-11 06:51:35 UTC (rev 8212) @@ -0,0 +1,88 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.management; + +import org.jboss.portal.portlet.Portlet; +import org.jboss.portal.portlet.container.PortletContainer; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class LocalPortletManagement implements LocalPortletManagementMBean +{ + private Portlet portlet; + + private PortletContainerManagementInterceptor interceptor; + + public LocalPortletManagement(Portlet portlet, PortletContainerManagementInterceptor interceptor) + { + this.portlet = portlet; + this.interceptor = interceptor; + } + + public String getId() + { + return portlet.getContext().getId(); + } + + public float getAverageRenderTime() + { + return interceptor.getPortletInfo(getId()).getAverageRenderTime(); + } + + public float getAverageActionTime() + { + return interceptor.getPortletInfo(getId()).getAverageActionTime(); + } + + public long getMaxRenderTime() + { + return interceptor.getPortletInfo(getId()).getMaxRenderTime(); + } + + public long getMaxActionTime() + { + return interceptor.getPortletInfo(getId()).getMaxActionTime(); + } + + public long getRenderRequestCount() + { + return interceptor.getPortletInfo(getId()).getRenderRequestCount(); + } + + public long getActionRequestCount() + { + return interceptor.getPortletInfo(getId()).getActionRequestCount(); + } + + public long getActionErrorCount() + { + return interceptor.getPortletInfo(getId()).getActionErrorCount(); + } + + public long getRenderErrorCount() + { + return interceptor.getPortletInfo(getId()).getRenderErrorCount(); + } +} Added: modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/LocalPortletManagementMBean.java =================================================================== --- modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/LocalPortletManagementMBean.java (rev 0) +++ modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/LocalPortletManagementMBean.java 2007-09-11 06:51:35 UTC (rev 8212) @@ -0,0 +1,46 @@ +/****************************************************************************** + * 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.portlet.management; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public interface LocalPortletManagementMBean +{ + public float getAverageRenderTime(); + + public float getAverageActionTime(); + + public long getMaxRenderTime(); + + public long getMaxActionTime(); + + public long getRenderRequestCount(); + + public long getActionRequestCount(); + + public long getActionErrorCount(); + + public long getRenderErrorCount(); +} Added: modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptor.java =================================================================== --- modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptor.java (rev 0) +++ modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptor.java 2007-09-11 06:51:35 UTC (rev 8212) @@ -0,0 +1,32 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.management; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public interface PortletContainerManagementInterceptor +{ + public PortletInfo getPortletInfo(String portletName); +} Added: modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java =================================================================== --- modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java (rev 0) +++ modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java 2007-09-11 06:51:35 UTC (rev 8212) @@ -0,0 +1,97 @@ +/****************************************************************************** + * 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.portlet.management; + +import java.util.Map; + +import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.portal.portlet.PortletContext; +import org.jboss.portal.portlet.invocation.ActionInvocation; +import org.jboss.portal.portlet.invocation.PortletInterceptor; +import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.invocation.RenderInvocation; + +import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class PortletContainerManagementInterceptorImpl extends PortletInterceptor implements PortletContainerManagementInterceptor +{ + + private Map map = new ConcurrentHashMap(); + + + // Correctness is not insured. + protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException + { + PortletContext portlet = invocation.getTarget(); + String portletName = portlet.getId(); + + boolean error = false; + + long delta = - System.currentTimeMillis(); + Object object; + try + { + object = invocation.invokeNext(); + } + catch (InvocationException e) + { + error = true; + throw e; + } + catch (Exception e) + { + error = true; + throw e; + } + + delta += System.currentTimeMillis(); + + if (invocation instanceof RenderInvocation) + { + PortletInfo info = getPortletInfo(portletName); + info.newRenderCall(delta, error); + } + else if (invocation instanceof ActionInvocation) + { + PortletInfo info = getPortletInfo(portletName); + info.newActionCall(delta, error); + } + return object; + } + + public synchronized PortletInfo getPortletInfo(String key) + { + PortletInfo info = (PortletInfo)map.get(key); + if (info == null) + { + info = new PortletInfo(); + map.put(key, info); + } + return info; + } + +} Added: modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/PortletInfo.java =================================================================== --- modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/PortletInfo.java (rev 0) +++ modules/portlet/trunk/management/src/main/org/jboss/portal/portlet/management/PortletInfo.java 2007-09-11 06:51:35 UTC (rev 8212) @@ -0,0 +1,144 @@ +/****************************************************************************** + * 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.portlet.management; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class PortletInfo +{ + + private long renderRequestProcessingTime; + + private long actionRequestProcessingTime; + + private long maxActionTime; + + private long maxRenderTime; + + private String maxRenderRequestUri; + + private String maxActionRequestUri; + + private int actionRequestCount; + + private int renderRequestCount; + + private int renderErrorCount; + + private int actionErrorCount; + + public long getRenderRequestProcessingTime() + { + return renderRequestProcessingTime; + } + + public long getActionRequestProcessingTime() + { + return actionRequestProcessingTime; + } + + public long getMaxRenderTime() + { + return maxRenderTime; + } + + public long getMaxActionTime() + { + return maxActionTime; + } + + public String getMaxRenderRequestUri() + { + return maxRenderRequestUri; + } + + public String getMaxActionRequestUri() + { + return maxActionRequestUri; + } + + public synchronized float getAverageRenderTime() + { + return (float)renderRequestProcessingTime/renderRequestCount; + } + + public synchronized float getAverageActionTime() + { + return (float)actionRequestProcessingTime/actionRequestCount; + } + + public int getRenderRequestCount() + { + return renderRequestCount; + } + + public int getActionRequestCount() + { + return actionRequestCount; + } + + public int getRenderErrorCount() + { + return renderErrorCount; + } + + public int getActionErrorCount() + { + return actionErrorCount; + } + + public synchronized void newRenderCall(long time, boolean error) + { + renderRequestProcessingTime += time; + if (time > maxRenderTime) + { + maxRenderTime = time; + } + renderRequestCount++; + if (error) + { + renderErrorCount++; + } + } + + public synchronized void newActionCall(long time, boolean error) + { + actionRequestProcessingTime += time; + if (time > maxActionTime) + { + maxActionTime = time; + } + actionRequestCount++; + if (error) + { + actionErrorCount++; + } + } + + public boolean isUsed() + { + return getActionRequestCount() + getRenderRequestCount() > 0; + } +} Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/management/LocalPortletManagement.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/management/LocalPortletManagement.java 2007-09-10 23:44:42 UTC (rev 8211) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/management/LocalPortletManagement.java 2007-09-11 06:51:35 UTC (rev 8212) @@ -1,88 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.management; - -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.container.PortletContainer; - -/** - * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision$ - */ -public class LocalPortletManagement implements LocalPortletManagementMBean -{ - private Portlet portlet; - - private PortletContainerManagementInterceptor interceptor; - - public LocalPortletManagement(Portlet portlet, PortletContainerManagementInterceptor interceptor) - { - this.portlet = portlet; - this.interceptor = interceptor; - } - - public String getId() - { - return portlet.getContext().getId(); - } - - public float getAverageRenderTime() - { - return interceptor.getPortletInfo(getId()).getAverageRenderTime(); - } - - public float getAverageActionTime() - { - return interceptor.getPortletInfo(getId()).getAverageActionTime(); - } - - public long getMaxRenderTime() - { - return interceptor.getPortletInfo(getId()).getMaxRenderTime(); - } - - public long getMaxActionTime() - { - return interceptor.getPortletInfo(getId()).getMaxActionTime(); - } - - public long getRenderRequestCount() - { - return interceptor.getPortletInfo(getId()).getRenderRequestCount(); - } - - public long getActionRequestCount() - { - return interceptor.getPortletInfo(getId()).getActionRequestCount(); - } - - public long getActionErrorCount() - { - return interceptor.getPortletInfo(getId()).getActionErrorCount(); - } - - public long getRenderErrorCount() - { - return interceptor.getPortletInfo(getId()).getRenderErrorCount(); - } -} Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/management/LocalPortletManagementMBean.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/management/LocalPortletManagementMBean.java 2007-09-10 23:44:42 UTC (rev 8211) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/management/LocalPortletManagementMBean.java 2007-09-11 06:51:35 UTC (rev 8212) @@ -1,46 +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.portlet.management; - -/** - * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision$ - */ -public interface LocalPortletManagementMBean -{ - public float getAverageRenderTime(); - - public float getAverageActionTime(); - - public long getMaxRenderTime(); - - public long getMaxActionTime(); - - public long getRenderRequestCount(); - - public long getActionRequestCount(); - - public long getActionErrorCount(); - - public long getRenderErrorCount(); -} Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptor.java 2007-09-10 23:44:42 UTC (rev 8211) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptor.java 2007-09-11 06:51:35 UTC (rev 8212) @@ -1,32 +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.portlet.management; - -/** - * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision$ - */ -public interface PortletContainerManagementInterceptor -{ - public PortletInfo getPortletInfo(String portletName); -} Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java 2007-09-10 23:44:42 UTC (rev 8211) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java 2007-09-11 06:51:35 UTC (rev 8212) @@ -1,97 +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.portlet.management; - -import java.util.Map; - -import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.PortletInterceptor; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.RenderInvocation; - -import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; - -/** - * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision$ - */ -public class PortletContainerManagementInterceptorImpl extends PortletInterceptor implements PortletContainerManagementInterceptor -{ - - private Map map = new ConcurrentHashMap(); - - - // Correctness is not insured. - protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException - { - PortletContext portlet = invocation.getTarget(); - String portletName = portlet.getId(); - - boolean error = false; - - long delta = - System.currentTimeMillis(); - Object object; - try - { - object = invocation.invokeNext(); - } - catch (InvocationException e) - { - error = true; - throw e; - } - catch (Exception e) - { - error = true; - throw e; - } - - delta += System.currentTimeMillis(); - - if (invocation instanceof RenderInvocation) - { - PortletInfo info = getPortletInfo(portletName); - info.newRenderCall(delta, error); - } - else if (invocation instanceof ActionInvocation) - { - PortletInfo info = getPortletInfo(portletName); - info.newActionCall(delta, error); - } - return object; - } - - public synchronized PortletInfo getPortletInfo(String key) - { - PortletInfo info = (PortletInfo)map.get(key); - if (info == null) - { - info = new PortletInfo(); - map.put(key, info); - } - return info; - } - -} Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/management/PortletInfo.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/management/PortletInfo.java 2007-09-10 23:44:42 UTC (rev 8211) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/management/PortletInfo.java 2007-09-11 06:51:35 UTC (rev 8212) @@ -1,144 +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.portlet.management; - -/** - * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision$ - */ -public class PortletInfo -{ - - private long renderRequestProcessingTime; - - private long actionRequestProcessingTime; - - private long maxActionTime; - - private long maxRenderTime; - - private String maxRenderRequestUri; - - private String maxActionRequestUri; - - private int actionRequestCount; - - private int renderRequestCount; - - private int renderErrorCount; - - private int actionErrorCount; - - public long getRenderRequestProcessingTime() - { - return renderRequestProcessingTime; - } - - public long getActionRequestProcessingTime() - { - return actionRequestProcessingTime; - } - - public long getMaxRenderTime() - { - return maxRenderTime; - } - - public long getMaxActionTime() - { - return maxActionTime; - } - - public String getMaxRenderRequestUri() - { - return maxRenderRequestUri; - } - - public String getMaxActionRequestUri() - { - return maxActionRequestUri; - } - - public synchronized float getAverageRenderTime() - { - return (float)renderRequestProcessingTime/renderRequestCount; - } - - public synchronized float getAverageActionTime() - { - return (float)actionRequestProcessingTime/actionRequestCount; - } - - public int getRenderRequestCount() - { - return renderRequestCount; - } - - public int getActionRequestCount() - { - return actionRequestCount; - } - - public int getRenderErrorCount() - { - return renderErrorCount; - } - - public int getActionErrorCount() - { - return actionErrorCount; - } - - public synchronized void newRenderCall(long time, boolean error) - { - renderRequestProcessingTime += time; - if (time > maxRenderTime) - { - maxRenderTime = time; - } - renderRequestCount++; - if (error) - { - renderErrorCount++; - } - } - - public synchronized void newActionCall(long time, boolean error) - { - actionRequestProcessingTime += time; - if (time > maxActionTime) - { - maxActionTime = time; - } - actionRequestCount++; - if (error) - { - actionErrorCount++; - } - } - - public boolean isUsed() - { - return getActionRequestCount() + getRenderRequestCount() > 0; - } -}