Thu Oct 5 20:02:25 EDT 2006

Author: julien at jboss.com
Date: 2006-10-05 20:01:46 -0400 (Thu, 05 Oct 2006)
New Revision: 5337

Modified:
   trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java
   trunk/core/src/main/org/jboss/portal/core/aspects/server/TransactionInterceptor.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/MarkupCommand.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/RenderPageCommand.java
   trunk/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java
   trunk/core/src/main/org/jboss/portal/core/metadata/PortalObjectMetaData.java
   trunk/core/src/main/org/jboss/portal/core/model/portal/Context.java
   trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectContainer.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IfTag.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IncludeTag.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IterateTag.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/PortalLib.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/Context.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/DelegateContext.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/NamedContext.java
   trunk/core/src/main/org/jboss/portal/test/core/IfTagTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java
   trunk/forums/src/main/org/jboss/portlet/forums/servlet/DownloadAttachmentsServlet.java
   trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java
   trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java
   trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPConstants.java
   trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPRewritingConstants.java
   trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPTypeFactory.java
   trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ActionHandler.java
   trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerSessionInformation.java
   trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RequestPrecursor.java
   trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java
   trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java
   trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupHandler.java
Log:
as I had refactoring active for comments, the field renaming from context to containerContext lead to rename lot of comments having the word context in it. I am fixing that and I disabled that feature in my IDE setting...

Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java
===================================================================

--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -220,7 +220,7 @@
       // get the strategy to use
       LayoutStrategy strategy = getLayoutStrategy(page, layout, sinv);
 
-      // build the strategy containerContext
+      // build the strategy context
       Portal portal = page.getPortal();
       HTTPStreamInfo streamInfo = sinv.getResponse().getStreamInfo();
       Set windowStates = portal.getSupportedWindowStates();
@@ -261,9 +261,9 @@
    }
 
    /**
-    * Create a window containerContext for the given window
+    * Create a window context for the given window
     *
-    * @param window the window to create the containerContext for
+    * @param window the window to create the context for
     * @return a new WindowContext
     * @see org.jboss.portal.theme.page.WindowContext
     */
@@ -271,7 +271,7 @@
    {
       String region;
       Integer order;
-//            UserContext userCtx = containerContext.getServerInvocation().getRequest().getUser();
+//            UserContext userCtx = context.getServerInvocation().getRequest().getUser();
 //            if (userCtx != null)
 //            {
 //               PreferenceStore store = userCtx.getPreferences();
@@ -348,7 +348,7 @@
          pageNavState.setWindowRegion(windowID, (String)regionChangeMap.get(windowID), true);
       }
 
-      // restore previous window containerContext region and order
+      // restore previous window context region and order
       Map idsToRestore = strategyResponse.getWindowIDsToRestore();
       for (Iterator i = idsToRestore.keySet().iterator(); i.hasNext();)
       {

Modified: trunk/core/src/main/org/jboss/portal/core/aspects/server/TransactionInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/server/TransactionInterceptor.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/server/TransactionInterceptor.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -39,7 +39,7 @@
 
    // Attributes ----------------------------------------------------
 
-    /** The JNDI containerContext. */
+    /** The JNDI context. */
     private TransactionManager tm;
 
    // Static --------------------------------------------------------

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/MarkupCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/MarkupCommand.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/MarkupCommand.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -169,7 +169,7 @@
     * call the component invocation(s) to create the markup fragment(s) for this request
     *
     * @param cfg    the server config to get config information (for error behaviour )
-    * @param navCtx the navigational state containerContext to get to the window navigational state
+    * @param navCtx the navigational state context to get to the window navigational state
     * @return a markup result containing the fragments rendered by the portlets in this command
     * @throws InvocationException
     */
@@ -357,7 +357,7 @@
       //
       ThemeService service = context.getController().getPageService().getThemeService();
 
-      // If the id is provided in the form of containerContext.name then look up the theme via a registration id
+      // If the id is provided in the form of context.name then look up the theme via a registration id
       if (themeIdString.lastIndexOf(".") > 0)
       {
          ServerRegistrationID themeId = ServerRegistrationID.createID(ServerRegistrationID.TYPE_THEME, parseID(themeIdString));
@@ -393,7 +393,7 @@
       PortalLayout layout = null;
       if (layoutIDString.lastIndexOf(".") > 0)
       {
-         // if the id is provided in the form of containerContext.name then look up the layout via a registration id
+         // if the id is provided in the form of context.name then look up the layout via a registration id
          ServerRegistrationID layoutID = ServerRegistrationID.createID(ServerRegistrationID.TYPE_LAYOUT, parseID(layoutIDString));
          layout = layoutService.getLayout(layoutID, true);
       }

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/RenderPageCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/RenderPageCommand.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/RenderPageCommand.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -52,7 +52,7 @@
     * Call the component / portlet invocation for each window on the page, and create a markup result with the resulting markup fragments in it
     *
     * @param cfg    the server configuration to get access to customizable error behaviour
-    * @param navCtx the navigational state containerContext to access page and window navigational state
+    * @param navCtx the navigational state context to access page and window navigational state
     * @return a modifiable page result containing the markup fragments from the individual portlets on this page
     * @throws InvocationException
     */

Modified: trunk/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -91,7 +91,7 @@
 
    public void createContextIfNotExist()
    {
-      // Create containerContext if not exist
+      // Create context if not exist
       Context ctx = portalObjectContainer.getContext();
 
       //

Modified: trunk/core/src/main/org/jboss/portal/core/metadata/PortalObjectMetaData.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/metadata/PortalObjectMetaData.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/core/src/main/org/jboss/portal/core/metadata/PortalObjectMetaData.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -114,7 +114,7 @@
     * Create an instance of the corresponding portal object.
     *
     * @param parent the parent object
-    * @param buildContext the containerContext
+    * @param buildContext the context
     * @return the corresponding portal object
     * @throws Exception any exception
     */

Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/Context.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/Context.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/Context.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -46,8 +46,8 @@
    Portal createPortal(String name) throws DuplicatePortalObjectException, IllegalArgumentException;
 
    /**
-    * Get the default portal of the containerContext based on some criteria. For instance
-    * a shared containerContext get the portal with the "default" name, for a private
+    * Get the default portal of the context based on some criteria. For instance
+    * a shared context get the portal with the "default" name, for a private
     * portal it gets the only portal owned by the user. 
     */
    Portal getDefaultPortal();

Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectContainer.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectContainer.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -33,7 +33,7 @@
 public interface PortalObjectContainer
 {
    /**
-    * Create the root containerContext.
+    * Create the root context.
     */
    void createContext();
 
@@ -43,7 +43,7 @@
    PortalObject getObject(String id);
 
    /**
-    * Return the root containerContext of this container.
+    * Return the root context of this container.
     */
    Context getContext();
 

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -49,7 +49,7 @@
 {
 
    /**
-    * Key for containerContext attribute in the portlet request.
+    * Key for context attribute in the portlet request.
     */
    public static final String CTX_REQUEST = "org.jboss.portal.core.context";
 
@@ -60,7 +60,7 @@
    public static final ThreadLocal request = new ThreadLocal();
 
    /**
-    * Stack of containerContext, needed by expression language static methods
+    * Stack of context, needed by expression language static methods
     */
    public static final ThreadLocal contextStack = new ThreadLocal();
 

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IfTag.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IfTag.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IfTag.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -66,7 +66,7 @@
    {
       contextStack = (LinkedList)PortalJsp.contextStack.get();
       
-      // If no containerContext has been set
+      // If no context has been set
       if (contextStack.isEmpty()) {
          include = false;
          PortalJsp.log.debug("No context has been found");

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IncludeTag.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IncludeTag.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IncludeTag.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -48,7 +48,7 @@
    private String page;
    
    /**
-    * Stack of containerContext before changing it for the inclusion
+    * Stack of context before changing it for the inclusion
     */
    private LinkedList formerContextStack;
    
@@ -65,18 +65,18 @@
    
    public int doStartTag() throws JspException {
       
-      // Save the former containerContext stack
+      // Save the former context stack
       formerContextStack = (LinkedList)PortalJsp.contextStack.get();
       formerContext = (Context)pageContext.getRequest().getAttribute(PortalJsp.CTX_REQUEST);
 
       LinkedList list = (LinkedList)PortalJsp.contextStack.get();
       LinkedList stack = new LinkedList();
       if (!list.isEmpty()) {
-         // Change the containerContext attribute to the new containerContext
+         // Change the context attribute to the new context
          NamedContext ctx =  (NamedContext)(list).getLast();
          pageContext.getRequest().setAttribute(PortalJsp.CTX_REQUEST, ctx.getContext());
 
-         // Change the containerContext stack to the new containerContext
+         // Change the context stack to the new context
          stack.addLast(new NamedContext("", ctx.getContext()));
       }
       

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IterateTag.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IterateTag.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IterateTag.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -54,7 +54,7 @@
    private boolean include;
    
    /**
-    * @param ctx The containerContext to set.
+    * @param ctx The context to set.
     */
    public void setCtx(String ctx)
    {

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/PortalLib.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/PortalLib.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/PortalLib.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -64,8 +64,8 @@
    }
    
   /**
-   * Return a translated message for a containerContext value
-   * @param key The containerContext value
+   * Return a translated message for a context value
+   * @param key The context value
    * @return Translated text
    */
    public static String i18nOut(String key)
@@ -75,9 +75,9 @@
 
    
    /**
-    * Print a value from the containerContext
-    * @param key The containerContext path to the value requested
-    * @return The value defined in the containerContext
+    * Print a value from the context
+    * @param key The context path to the value requested
+    * @return The value defined in the context
     */
    public static String out(String key)
    {

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/Context.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/Context.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/Context.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -30,7 +30,7 @@
  */
 public interface Context
 {
-   /** null containerContext */
+   /** null context */
    Context NULL_CONTEXT = new AbstractContext()
    {
       final Iterator it = Collections.EMPTY_LIST.iterator();
@@ -57,7 +57,7 @@
    };
 
    /**
-    * get the template data from the containerContext
+    * get the template data from the context
     * 
     * @param key
     *           template variable name
@@ -74,7 +74,7 @@
     * @param value
     *           value to render in template
     * 
-    * @return containerContext to place data into
+    * @return context to place data into
     */
    public Context put(String key, String value);
 
@@ -86,7 +86,7 @@
     * @param value
     *           value to render in template
     * 
-    * @return containerContext to place data into
+    * @return context to place data into
     */
    public Context put(String key, Integer value);
 

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/DelegateContext.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/DelegateContext.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/DelegateContext.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -32,7 +32,7 @@
 public class DelegateContext
       implements Context
 {
-   /** containerContext's children */
+   /** context's children */
    private ChildrenStrategy children;
 
    /** template name/value pairs for substitution */
@@ -61,13 +61,13 @@
    }
 
    /**
-    * create a new "root" data containerContext and name/value pairs to be used as nested
+    * create a new "root" data context and name/value pairs to be used as nested
     * or loop data
     * 
     * @param children
     *           name/value pairs for nested or loop data
     * 
-    * @return containerContext to continue adding template data too
+    * @return context to continue adding template data too
     */
    public static final DelegateContext createWithChildren(Map children)
    {
@@ -75,12 +75,12 @@
    }
 
    /**
-    * create a new data containerContext with already existing name/value pairs
+    * create a new data context with already existing name/value pairs
     * 
     * @param values
     *           existing name/value pair map
     * 
-    * @return containerContext to continue adding template data too
+    * @return context to continue adding template data too
     */
    public static final DelegateContext createWithValues(Map values)
    {
@@ -88,13 +88,13 @@
    }
 
    /**
-    * add an existing data containerContext into this containerContext for use in template loops
+    * add an existing data context into this context for use in template loops
     * or nested template data.
     * 
     * @param name
     *           variable prefix name
     * @param ctx
-    *           containerContext to add
+    *           context to add
     */
    public void append(String name, Context ctx)
    {
@@ -124,7 +124,7 @@
     * @param name
     *           variable prefix name
     * 
-    * @return delegate containerContext that will contain the loop or nested data
+    * @return delegate context that will contain the loop or nested data
     */
    public DelegateContext next(String name)
    {

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/NamedContext.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/NamedContext.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/NamedContext.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -22,7 +22,7 @@
 package org.jboss.portal.core.servlet.jsp.taglib.context;
 
 /**
- * POJO for a containerContext linked to a name
+ * POJO for a context linked to a name
  * @author <a href="theute at jboss.org">Thomas Heute</a>
  * $Revision$
  */
@@ -39,7 +39,7 @@
    }
    
    /**
-    * @return Returns the containerContext.
+    * @return Returns the contedxt.
     */
    public Context getContext()
    {
@@ -55,7 +55,7 @@
    }
 
    /**
-    * @param context The containerContext to set.
+    * @param context The context to set.
     */
    public void setContext(Context context)
    {

Modified: trunk/core/src/main/org/jboss/portal/test/core/IfTagTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/IfTagTestCase.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/core/src/main/org/jboss/portal/test/core/IfTagTestCase.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -68,7 +68,7 @@
 
       // todo : fixme
       //PortletRequest req = new ActionRequestImpl(null, null, null, null, null, null, request);
-      //req.setAttribute(PortalJsp.CTX_REQUEST, containerContext);
+      //req.setAttribute(PortalJsp.CTX_REQUEST, context);
       //request.setAttribute("javax.portlet.request", req);
 
       //rd.forward(request, response);

Modified: trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -108,7 +108,7 @@
    protected void tearDown() throws Exception
    { 
       /**
-       * Need to delete the containerContext information set in the policy provider
+       * Need to delete the context information set in the policy provider
        * for this test as it will affect the next test that is being run.
        * The alternative is that each test sets its own containerContext id.
        */

Modified: trunk/forums/src/main/org/jboss/portlet/forums/servlet/DownloadAttachmentsServlet.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/servlet/DownloadAttachmentsServlet.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/forums/src/main/org/jboss/portlet/forums/servlet/DownloadAttachmentsServlet.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -157,7 +157,7 @@
 
    /**
     * In portal we don't use hibernate transactions because every request
-    * is surounded with JTA transaction containerContext by portal. So in servlet when we
+    * is surounded with JTA transaction context by portal. So in servlet when we
     * use ForumsModule we must do the same.
     * @param id
     * @return

Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -189,7 +189,7 @@
    {
       assertNotNull(response);
 
-      // Markup containerContext
+      // Markup context
       MarkupContext markupContext = response.getMarkupContext();
       assertNotNull(markupContext);
       assertEquals("<p>" + count + "</p><div><a href=\"wsrp_rewrite?wsrp-urlType=render" +
@@ -223,7 +223,7 @@
       // check update response
       UpdateResponse updateResponse = response.getUpdateResponse();
       assertNotNull(updateResponse);
-      // request was readOnly so no updated portlet containerContext
+      // request was readOnly so no updated portlet context
       assertNull(updateResponse.getPortletContext());
 
       String navigationalState = updateResponse.getNavigationalState();
@@ -408,7 +408,7 @@
    {
       assertNotNull(response);
 
-      // Markup containerContext
+      // Markup context
       MarkupContext markupContext = response.getMarkupContext();
       assertNotNull(markupContext);
       assertEquals("text/html", markupContext.getMimeType());

Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -58,7 +58,7 @@
       // deregister
       registrationService.deregister(rc);
 
-      // try to get service description with the deregistered containerContext
+      // try to get service description with the deregistered context
       // Try to get service description
       GetServiceDescription gs = getNoRegistrationServiceDescriptionRequest();
       gs.setRegistrationContext(rc);
@@ -66,7 +66,7 @@
       try
       {
          serviceDescriptionService.getServiceDescription(gs);
-         fail("Consumer tried to access info with a de-registered containerContext. Operations should fail.");
+         fail("Consumer tried to access info with a de-registered context. Operations should fail.");
       }
       catch (InvalidRegistrationFault invalidRegistrationFault)
       {
@@ -101,7 +101,7 @@
          // kinda weird... will be replaced by ModifyRegistrationRequiredFault in WSRP 2.0
       }
 
-      // remove registration containerContext, try again and check that we get new registration info
+      // remove registration context, try again and check that we get new registration info
       gs.setRegistrationContext(null);
       PropertyDescription[] pds = serviceDescriptionService.getServiceDescription(gs)
          .getRegistrationPropertyDescription().getPropertyDescriptions();

Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPConstants.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPConstants.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPConstants.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -89,7 +89,7 @@
    public static final String EDIT_MODE = "wsrp:edit";
    /**
     * <p>When in <code>wsrp:help</code> mode, a Portlet may provide help screens that explains the Portlet and its
-    * expected usage. Some Portlets will provide containerContext-sensitive help based on the markup the End-User was viewing
+    * expected usage. Some Portlets will provide context-sensitive help based on the markup the End-User was viewing
     * when entering this mode.</p>
     */
    public static final String HELP_MODE = "wsrp:help";

Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPRewritingConstants.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPRewritingConstants.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPRewritingConstants.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -23,7 +23,7 @@
 package org.jboss.portal.wsrp;
 
 /**
- * <p>This class provides constants used in the containerContext of URL rewriting.</p>
+ * <p>This class provides constants used in the context of URL rewriting.</p>
  *
  * @author <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
  * @version $Revision$

Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPTypeFactory.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPTypeFactory.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPTypeFactory.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -443,7 +443,7 @@
     */
    public static UserContext createUserContext(String userContextKey)
    {
-      ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(userContextKey, "user containerContext key", "UserContext");
+      ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(userContextKey, "user context key", "UserContext");
       return new UserContext(userContextKey, null, null, null);
    }
 

Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ActionHandler.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ActionHandler.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ActionHandler.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -65,7 +65,7 @@
    {
       // access mode
       InstanceContext instanceContext = invocation.getInstanceContext();
-      ParameterValidation.throwIllegalArgExceptionIfNull(instanceContext, "instance containerContext");
+      ParameterValidation.throwIllegalArgExceptionIfNull(instanceContext, "instance context");
       AccessMode accessMode = instanceContext.getAccessMode();
       ParameterValidation.throwIllegalArgExceptionIfNull(accessMode, "access mode");
       if (AccessMode.CLONE_BEFORE_WRITE.equals(accessMode))

Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerSessionInformation.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerSessionInformation.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerSessionInformation.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -284,7 +284,7 @@
       }
 
       /**
-       * Checks that the session associated with the session containerContext hasn't expired and update the last invocation time
+       * Checks that the session associated with the session context hasn't expired and update the last invocation time
        *
        * @return
        */

Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RequestPrecursor.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RequestPrecursor.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RequestPrecursor.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -51,10 +51,10 @@
    RuntimeContext runtimeContext;
    MarkupParams markupParams;
    private static final String PORTLET_HANDLE = "portlet handle";
-   private static final String SECURITY_CONTEXT = "security containerContext";
-   private static final String USER_CONTEXT = "user containerContext";
-   private static final String INVOCATION_CONTEXT = "invocation containerContext";
-   private static final String STREAM_INFO = "stream info in invocation containerContext";
+   private static final String SECURITY_CONTEXT = "security context";
+   private static final String USER_CONTEXT = "user context";
+   private static final String INVOCATION_CONTEXT = "invocation context";
+   private static final String STREAM_INFO = "stream info in invocation context";
    private static final String USER_AGENT = "User-Agent";
 
    public RequestPrecursor(WSRPConsumerImpl wsrpConsumer, PortletInvocation invocation)
@@ -64,7 +64,7 @@
       ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(portletHandle, PORTLET_HANDLE, null);
       log.debug("About to invoke on portlet: " + portletHandle);
 
-      // create runtime containerContext
+      // create runtime context
       SecurityContext securityContext = invocation.getSecurityContext();
       ParameterValidation.throwIllegalArgExceptionIfNull(securityContext, SECURITY_CONTEXT);
       String authType = WSRPUtils.convertRequestAuthTypeToWSRPAuthType(securityContext.getAuthType());
@@ -90,7 +90,7 @@
       }
       catch (Exception e)
       {
-         log.debug("Mode was null in containerContext.");
+         log.debug("Mode was null in context.");
          mode = WSRPConstants.VIEW_MODE;
       }
 
@@ -101,7 +101,7 @@
       }
       catch (Exception e)
       {
-         log.debug("WindowState was null in containerContext.");
+         log.debug("WindowState was null in context.");
          windowState = WSRPConstants.NORMAL_WINDOW_STATE;
       }
 

Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -152,7 +152,7 @@
    {
       if (portletContext == null)
       {
-         throw new IllegalArgumentException("No null portlet containerContext accepted");
+         throw new IllegalArgumentException("No null portlet context accepted");
       }
       return getPortlet(portletContext.getId());
    }
@@ -526,7 +526,7 @@
                {
                   RegistrationContext registrationContext = getRegistrationService().register(registrationData);
 
-                  // if we reach this point, registration was successful so remember the returned registration containerContext
+                  // if we reach this point, registration was successful so remember the returned registration context
                   this.registrationContext = registrationContext;
 
                   // add it to the request and try to get the service description again!
@@ -627,7 +627,7 @@
 
    private String getUserContextKeyFor(UserContext userContext)
    {
-      // fix-me: probably need to have an Id attribute on userId containerContext.
+      // fix-me: probably need to have an Id attribute on userId context.
       String userId = userContext.getId();
       if (userId != null)
       {
@@ -642,15 +642,15 @@
    // fix-me!
    org.jboss.portal.wsrp.core.UserContext getUserContextFrom(PortletInvocation invocation, RuntimeContext runtimeContext)
    {
-      // first decide if we need to pass the user containerContext...
+      // first decide if we need to pass the user context...
       WSRPPortletInfo info = getPortletInfo(invocation);
 
       if (info != null && info.isUserContextStoredInSession() && runtimeContext.getSessionID() != null)
       {
-         return null; // the user containerContext is most likely in the session already
+         return null; // the user context is most likely in the session already
       }
 
-      // todo: deal with user categories and user containerContext key properly
+      // todo: deal with user categories and user context key properly
       UserContext userContext = invocation.getUserContext();
       if (userContext != null)
       {

Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -43,7 +43,7 @@
 
       /*
       // put the request and response in ServletAccess... not working, using a filter for now
-      MessageContext messageContext = containerContext.getMessageContext();
+      MessageContext messageContext = context.getMessageContext();
       HttpServletRequest request = (HttpServletRequest)messageContext.getProperty("transport.http.servletRequest");
       HttpServletResponse response = (HttpServletResponse)messageContext.getProperty("transport.http.servletResponse");
       ServletAccess.setRequestAndResponse(request, response);

Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupHandler.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupHandler.java	2006-10-05 23:47:54 UTC (rev 5336)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupHandler.java	2006-10-06 00:01:46 UTC (rev 5337)
@@ -305,7 +305,7 @@
       // based on the markup parameters and portlet description generate the most appropriate markup request
       final MarkupRequest markupRequest = createMarkupRequestFrom(markupTypes, markupParams, portlet);
 
-      // create information for action containerContext
+      // create information for action context
       StateString navigationalState = createNavigationalState(markupParams.getNavigationalState());
       SecurityContext securityContext = createSecurityContext(markupParams, runtimeContext, wsrpUserContext);
       HTTPStreamInfo streamInfo = createStreamInfo(markupRequest);


