Author: thomas.heute(a)jboss.com Date: 2007-11-01 09:47:39 -0400 (Thu, 01 Nov 2007) New Revision: 8815 Removed: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeRequest.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/build/ide/intellij/idea60/modules/portlet/samples.iml modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/build/local.properties Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeResponse.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/bridge/src/main/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/build/build-thirdparty.xml modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/jboss-portal-portlet.ipr modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContext.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletInfoFactoryImpl.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/info/ContainerPortletInfo.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/spi/PortletInfoFactory.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java Log: Apply bridge fix, module dependency and minor stuff Deleted: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeRequest.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeRequest.java 2007-11-01 13:45:40 UTC (rev 8814) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeRequest.java 2007-11-01 13:47:39 UTC (rev 8815) @@ -1,329 +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.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"); - } -} Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeResponse.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeResponse.java 2007-11-01 13:45:40 UTC (rev 8814) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeResponse.java 2007-11-01 13:47:39 UTC (rev 8815) @@ -22,24 +22,25 @@ ******************************************************************************/ package org.jboss.portal.portlet.bridge; -import org.jboss.portal.portlet.invocation.PortletInvocation; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintWriter; +import java.util.Locale; 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; +import javax.servlet.http.HttpServletResponseWrapper; +import org.jboss.portal.portlet.invocation.PortletInvocation; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 6862 $ */ -public class BridgeResponse implements HttpServletResponse +public class BridgeResponse extends HttpServletResponseWrapper { /** . */ @@ -53,6 +54,7 @@ public BridgeResponse(JBossServletContextProvider.BridgeInfo info) { + super(info.getInvocation().getDispatchedResponse()); invocation = info.getInvocation(); HttpServletRequest hreq = invocation.getDispatchedRequest(); this.presp = (PortletResponse)hreq.getAttribute("javax.portlet.response"); Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/bridge/src/main/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/bridge/src/main/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java 2007-11-01 13:45:40 UTC (rev 8814) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/bridge/src/main/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java 2007-11-01 13:47:39 UTC (rev 8815) @@ -22,11 +22,6 @@ ******************************************************************************/ 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; @@ -34,6 +29,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.portals.bridges.common.ServletContextProvider; +import org.jboss.portal.portlet.container.PortletContainer; +import org.jboss.portal.portlet.container.PortletContainerInvoker; +import org.jboss.portal.portlet.invocation.PortletInvocation; + /** * 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. @@ -102,7 +102,7 @@ /** Lazy initialisation of the bridge info. */ private void init(BridgeInfo bridgeInfo) { - bridgeInfo.breq = new BridgeRequest(bridgeInfo); + bridgeInfo.breq = bridgeInfo.getInvocation().getDispatchedRequest(); bridgeInfo.bresp = new BridgeResponse(bridgeInfo); } @@ -115,10 +115,10 @@ private final ServletContext ctx; /** The bridge response. */ - private BridgeRequest breq; + private HttpServletRequest breq; /** The bridge response. */ - private BridgeResponse bresp; + private HttpServletResponse bresp; public BridgeInfo(PortletInvocation invocation) { Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/build/build-thirdparty.xml =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/build/build-thirdparty.xml 2007-11-01 13:45:40 UTC (rev 8814) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/build/build-thirdparty.xml 2007-11-01 13:47:39 UTC (rev 8815) @@ -46,9 +46,9 @@ are pushed to the http://repository.jboss.com site. --> - <componentref name="jboss-portal/modules/common" version="1.0.0"/> + <componentref name="jboss-portal/modules/common" version="trunk-SNAPSHOT"/> <componentref name="jboss-portal/modules/web" version="1.0.0"/> - <componentref name="jboss-portal/modules/test" version="1.0.0"/> + <componentref name="jboss-portal/modules/test" version="1.0-SNAPSHOT"/> <componentref name="sun-servlet" version="2.4"/> <componentref name="sun-jaf" version="1.1"/> Deleted: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/build/ide/intellij/idea60/modules/portlet/samples.iml =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/build/ide/intellij/idea60/modules/portlet/samples.iml 2007-11-01 13:45:40 UTC (rev 8814) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/build/ide/intellij/idea60/modules/portlet/samples.iml 2007-11-01 13:47:39 UTC (rev 8815) @@ -1,205 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> - <component name="ModuleRootManager" /> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/../../../../../../samples/output/idea50/classes" /> - <exclude-output /> - <content url="file://$MODULE_DIR$/../../../../../../samples"> - <sourceFolder url="file://$MODULE_DIR$/../../../../../../samples/src/main" isTestSource="false" /> - <excludeFolder url="file://$MODULE_DIR$/../../../../../../samples/output" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="api" /> - <orderEntry type="module" module-name="common" /> - <orderEntry type="module" module-name="portlet" /> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-log4j/lib/log4j.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> - <component name="copyright"> - <Base> - <setting name="state" value="1" /> - </Base> - <LanguageOptions name="$TEMPLATE$"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="true" /> - <option name="separateAfter" value="true" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="true" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="JBoss, a division of Red Hat&#10;Copyright &amp;#36;today.year, Red Hat Middleware, LLC, and individual &#10;contributors as indicated by the @authors tag. See the &#10;copyright.txt in the distribution for a full listing of &#10;individual contributors.&#10;&#10;This is free software; you can redistribute it and/or modify it&#10;under the terms of the GNU Lesser General Public License as&#10;published by the Free Software Foundation; either version 2.1 of&#10;the License, or (at your option) any later version.&#10;&#10;This software is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU&#10;Lesser General Public License for more details.&#10;&#10;You should have received a copy of the GNU Lesser General Public&#10;License along with this software; if not, write to the Free&#10;Software Foundation, Inc., 51 Fr! anklin St, Fifth Floor, Boston, MA&#10;02110-1301 USA, or see the FSF site: http://www.fsf.org." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="4" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="CSS"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="2" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="HTML"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="2" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="JAVA"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="2" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="JSP"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="2" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="JavaScript"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="2" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="Properties"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="2" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="XML"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="2" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - </component> -</module> - Deleted: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/build/local.properties =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/build/local.properties 2007-11-01 13:45:40 UTC (rev 8814) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/build/local.properties 2007-11-01 13:47:39 UTC (rev 8815) @@ -1,48 +0,0 @@ -### ====================================================================== ### -## ## -## Local project properties. ## -## ## -## Define properties that are local to your environment here. This ## -## file (local.properties) should not be checked in. Modify the ## -## example to affect all users. ## -## ## -### ====================================================================== ### - -### General compiler configuration ### - -#build.compiler=jikes -#build.warnings=true -#build.pedantic=true -#javac.depend=on - -### Javac/Jikes compiler configuration ### - -javac.optimize=off -javac.debug=on -javac.deprecation=on - -### Enable verbose build output ### - -#init.verbose=true - -### JavaDoc ### -#docs-javadocs.disable=true - -### Do we build xdoclet or get it from thirdparty ### -### uncomment for thirdparty: comment to use xdoclet module. -### To use xdoclet module also uncomment the xdoclet line in groups in build/build.xml -#xdoclet.xdoclet.root=${project.root}/thirdparty/xdoclet - -# Portal database, for now : hsqldb, mysql, postgresql are the possible values -portal.database=mysql -# The datasource name used in the JNDI binding -portal.datasource.name=PortalDS -# Context root for the portal main servlet -portal.web.context-root=/portal -# JBoss server/<xxx> directory for JBoss Portal, ie: $JBOSS_HOME/server/default -portal.deploy.dir=default/deploy -portal-ha.deploy.dir=all/deploy -# Show SQL or not -portal.sql.show=false -# Uncomment if you want to use a specific JBoss home path otherwise the build will use the JBOSS_HOME env variable -#jboss.home= Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/jboss-portal-portlet.ipr =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/jboss-portal-portlet.ipr 2007-11-01 13:45:40 UTC (rev 8814) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/jboss-portal-portlet.ipr 2007-11-01 13:47:39 UTC (rev 8815) @@ -61,7 +61,6 @@ <option name="OUTPUT_DIRECTORY" /> </component> <component name="GUI Designer component loader factory" /> - <component name="IdProvider" IDEtalkID="E2A438D8B6AE84F43587A2210E562521" /> <component name="InspectionProjectProfileManager"> <option name="PROJECT_PROFILE" value="Project Default" /> <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> @@ -88,6 +87,36 @@ <option name="myVal" value="100" /> </server> </used_levels> + <inspection_tool class="JavaDoc" level="WARNING" enabled="false"> + <option name="TOP_LEVEL_CLASS_OPTIONS"> + <value> + <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" /> + <option name="REQUIRED_TAGS" value="" /> + </value> + </option> + <option name="INNER_CLASS_OPTIONS"> + <value> + <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" /> + <option name="REQUIRED_TAGS" value="" /> + </value> + </option> + <option name="METHOD_OPTIONS"> + <value> + <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" /> + <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" /> + </value> + </option> + <option name="FIELD_OPTIONS"> + <value> + <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" /> + <option name="REQUIRED_TAGS" value="" /> + </value> + </option> + <option name="IGNORE_DEPRECATED" value="false" /> + <option name="IGNORE_JAVADOC_PERIOD" value="true" /> + <option name="myAdditionalJavadocTags" value="" /> + </inspection_tool> + <inspection_tool class="DuplicateThrows" level="WARNING" enabled="false" /> </profile> </profiles> </component> @@ -284,13 +313,10 @@ <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" /> - <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml" /> - <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/tools/tools.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/tools/tools.iml" /> </modules> </component> - <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="false" project-jdk-name="1.5" project-jdk-type="JavaSDK"> - <output url="file://$PROJECT_DIR$/output" /> + <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK"> + <output url="file://$PROJECT_DIR$/classes" /> </component> <component name="ProjectRunConfigurationManager" /> <component name="RmicSettings"> @@ -300,10 +326,6 @@ <option name="GENERATE_IIOP_STUBS" value="false" /> <option name="ADDITIONAL_OPTIONS_STRING" value="" /> </component> - <component name="StarteamVcsAdapter" /> - <component name="VssVcs"> - <SourceSafePersistencyRemovedFolder>$PROJECT_DIR$/wsrp/src/resources/test</SourceSafePersistencyRemovedFolder> - </component> <component name="com.intellij.jsf.UserDefinedFacesConfigs"> <option name="USER_DEFINED_CONFIGS"> <value> @@ -311,179 +333,6 @@ </value> </option> </component> - <component name="copyright"> - <Base> - <setting name="state" value="1" /> - </Base> - <LanguageOptions name="$TEMPLATE$"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="true" /> - <option name="separateAfter" value="true" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="true" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="JBoss, a division of Red Hat&#10;Copyright &amp;#36;today.year, Red Hat Middleware, LLC, and individual &#10;contributors as indicated by the @authors tag. See the &#10;copyright.txt in the distribution for a full listing of &#10;individual contributors.&#10;&#10;This is free software; you can redistribute it and/or modify it&#10;under the terms of the GNU Lesser General Public License as&#10;published by the Free Software Foundation; either version 2.1 of&#10;the License, or (at your option) any later version.&#10;&#10;This software is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU&#10;Lesser General Public License for more details.&#10;&#10;You should have received a copy of the GNU Lesser General Public&#10;License along with this software; if not, write to the Free&#10;Software Foundation, Inc., 51 Fr! anklin St, Fifth Floor, Boston, MA&#10;02110-1301 USA, or see the FSF site: http://www.fsf.org." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="4" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="CSS"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="1" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="HTML"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="1" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="JAVA"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="2" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="JSP"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="1" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="JavaScript"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="1" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="Properties"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="1" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - <LanguageOptions name="XML"> - <option name="templateOptions"> - <value> - <option name="block" value="true" /> - <option name="separateBefore" value="false" /> - <option name="separateAfter" value="false" /> - <option name="prefixLines" value="true" /> - <option name="lenBefore" value="80" /> - <option name="lenAfter" value="80" /> - <option name="box" value="false" /> - <option name="filler" value=" " /> - </value> - </option> - <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." /> - <option name="keyword" value="Copyright" /> - <option name="fileTypeOverride" value="2" /> - <option name="relativeBefore" value="true" /> - <option name="addBlankAfter" value="true" /> - <option name="fileLocation" value="1" /> - <option name="useAlternate" value="false" /> - </LanguageOptions> - </component> <component name="libraryTable" /> <component name="uidesigner-configuration"> <option name="INSTRUMENT_CLASSES" value="true" /> Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContext.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContext.java 2007-11-01 13:45:40 UTC (rev 8814) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContext.java 2007-11-01 13:47:39 UTC (rev 8815) @@ -42,6 +42,13 @@ ServletContext getServletContext(); /** + * Returns the context path of the web application + * + * @return the context path + */ + String getContextPath(); + + /** * Return the classloader. * * @return the classloader Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java 2007-11-01 13:45:40 UTC (rev 8814) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java 2007-11-01 13:47:39 UTC (rev 8815) @@ -71,6 +71,9 @@ /** . */ private PortletApplicationRegistrationContext registrationContext; + + /** . */ + private String contextPath; public PortletApplicationContextImpl( PortletApplicationRegistry registry, @@ -79,7 +82,8 @@ PortletApplicationMetaData portletAppMD, JBossApplicationMetaData jbossAppMD, ServletContext servletContext, - ClassLoader classLoader) + ClassLoader classLoader, + String contextPath) { this.registry = registry; this.portletAPIFactory = portletAPIFactory; @@ -88,6 +92,7 @@ this.jbossAppMD = jbossAppMD; this.servletContext = servletContext; this.classLoader = classLoader; + this.contextPath = contextPath; } public PortletApplicationImpl getPortletApplication() @@ -189,6 +194,11 @@ return servletContext; } + public String getContextPath() + { + return contextPath; + } + public ClassLoader getClassLoader() { return classLoader; Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java 2007-11-01 13:45:40 UTC (rev 8814) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java 2007-11-01 13:47:39 UTC (rev 8815) @@ -220,7 +220,7 @@ bundleMgr); // Create meta data - PortletInfo info = application.getPortletInfoFactory().createPortletInfo(metaData, jbossMetaData, bundleMgr); + PortletInfo info = application.getPortletInfoFactory().createPortletInfo(application.getContext(), metaData, jbossMetaData, bundleMgr); // Finally initialize the porlet instance try Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletInfoFactoryImpl.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletInfoFactoryImpl.java 2007-11-01 13:45:40 UTC (rev 8814) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletInfoFactoryImpl.java 2007-11-01 13:47:39 UTC (rev 8815) @@ -22,6 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.jsr168; +import org.jboss.portal.portlet.container.PortletApplicationContext; import org.jboss.portal.portlet.impl.jsr168.spi.PortletInfoFactory; import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData; import org.jboss.portal.portlet.impl.jsr168.info.ContainerPortletInfo; @@ -35,8 +36,8 @@ */ public class PortletInfoFactoryImpl implements PortletInfoFactory { - public PortletInfo createPortletInfo(PortletMetaData portletMD, JBossPortletMetaData jbossPortletMD, ResourceBundleManager resourceBundleManager) + public PortletInfo createPortletInfo(PortletApplicationContext portletApplicationContext, PortletMetaData portletMD, JBossPortletMetaData jbossPortletMD, ResourceBundleManager resourceBundleManager) { - return new ContainerPortletInfo(portletMD, jbossPortletMD, resourceBundleManager); + return new ContainerPortletInfo(portletApplicationContext, portletMD, jbossPortletMD, resourceBundleManager); } } Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java 2007-11-01 13:45:40 UTC (rev 8814) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java 2007-11-01 13:47:39 UTC (rev 8815) @@ -32,10 +32,10 @@ import org.jboss.portal.portlet.impl.jsr168.PortletRequestAttributes; import org.jboss.portal.portlet.impl.jsr168.info.ContainerPreferencesInfo; import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.spi.InstanceContext; import org.jboss.portal.portlet.spi.RequestContext; import org.jboss.portal.portlet.spi.SecurityContext; import org.jboss.portal.portlet.spi.UserContext; +import org.jboss.portal.portlet.spi.WindowContext; import org.jboss.portal.portlet.state.PropertyContext; import javax.portlet.PortalContext; @@ -75,7 +75,7 @@ protected UserContext userContext; protected SecurityContext securityContext; protected RequestContext requestContext; - protected InstanceContext instanceContext; + protected WindowContext windowContext; protected PortletPreferences preferences; protected PortletContainerImpl container; protected HttpServletRequest dreq; @@ -96,7 +96,7 @@ this.userContext = invocation.getUserContext(); this.securityContext = invocation.getSecurityContext(); this.requestContext = invocation.getRequestContext(); - this.instanceContext = invocation.getInstanceContext(); + this.windowContext = invocation.getWindowContext(); this.container = (PortletContainerImpl)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER); this.dreq = invocation.getDispatchedRequest(); this.portalContext = new PortalContextImpl(invocation.getPortalContext()); @@ -393,7 +393,7 @@ PortletApplicationImpl portletApp = (PortletApplicationImpl)container.getApplication(); psession = new PortletSessionImpl( hsession, - instanceContext.getId(), + windowContext.getId(), portletApp.getPortletContext()); } else if (psession == null) @@ -407,7 +407,7 @@ PortletApplicationImpl portletApp = (PortletApplicationImpl)container.getApplication(); psession = new PortletSessionImpl( hsession, - instanceContext.getId(), + windowContext.getId(), portletApp.getPortletContext()); } } Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/info/ContainerPortletInfo.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/info/ContainerPortletInfo.java 2007-11-01 13:45:40 UTC (rev 8814) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/info/ContainerPortletInfo.java 2007-11-01 13:47:39 UTC (rev 8815) @@ -23,6 +23,7 @@ package org.jboss.portal.portlet.impl.jsr168.info; import org.jboss.portal.common.i18n.ResourceBundleManager; +import org.jboss.portal.portlet.container.PortletApplicationContext; import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData; import org.jboss.portal.portlet.info.CacheInfo; import org.jboss.portal.portlet.info.CapabilitiesInfo; @@ -52,6 +53,7 @@ private Boolean remotable; public ContainerPortletInfo( + PortletApplicationContext portletApplicationContext, PortletMetaData portletMD, JBossPortletMetaData jbossPortletMD, ResourceBundleManager bundleMgr) Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/spi/PortletInfoFactory.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/spi/PortletInfoFactory.java 2007-11-01 13:45:40 UTC (rev 8814) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/spi/PortletInfoFactory.java 2007-11-01 13:47:39 UTC (rev 8815) @@ -22,6 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.jsr168.spi; +import org.jboss.portal.portlet.container.PortletApplicationContext; import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData; import org.jboss.portal.portlet.metadata.JBossPortletMetaData; @@ -45,6 +46,7 @@ * @return the runtime portlet meta data */ PortletInfo createPortletInfo( + PortletApplicationContext portletApplicationContext, PortletMetaData portletMD, JBossPortletMetaData jbossPortletMD, ResourceBundleManager resourceBundleManager); Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2007-11-01 13:45:40 UTC (rev 8814) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2007-11-01 13:47:39 UTC (rev 8815) @@ -250,4 +250,9 @@ { throw new NotYetImplemented(); } + + public String getContextPath() + { + throw new NotYetImplemented(); + } }