[jboss-svn-commits] JBoss Portal SVN: r5338 - in trunk: core/src/main/org/jboss/portal/core/controller core/src/main/org/jboss/portal/core/deployment/jboss core/src/main/org/jboss/portal/core/impl/model/instance core/src/main/org/jboss/portal/core/impl/model/portal core/src/main/org/jboss/portal/test/core forums/src/main/org/jboss/portlet/forums

[jboss-svn-commits at lists.jboss.org]

Author: julien at jboss.com
Date: 2006-10-05 20:11:45 -0400 (Thu, 05 Oct 2006)
New Revision: 5338

Modified:
   trunk/core/src/main/org/jboss/portal/core/controller/ControllerCommand.java
   trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
   trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java
   trunk/forums/src/main/org/jboss/portlet/forums/ForumsPortlet.java
Log:
more containerContext -> context comment fixes

Modified: trunk/core/src/main/org/jboss/portal/core/controller/ControllerCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/ControllerCommand.java	2006-10-06 00:01:46 UTC (rev 5337)
+++ trunk/core/src/main/org/jboss/portal/core/controller/ControllerCommand.java	2006-10-06 00:11:45 UTC (rev 5338)
@@ -55,7 +55,7 @@
    /** . */
    protected static Logger log = Logger.getLogger(ControllerCommand.class);
 
-   /** The containerContext of the command. */
+   /** The context of the command. */
    protected ControllerContext context;
 
    /** Execute command when the end of the stack is reached. */

Modified: trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java	2006-10-06 00:01:46 UTC (rev 5337)
+++ trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java	2006-10-06 00:11:45 UTC (rev 5338)
@@ -82,7 +82,7 @@
       }
    }
 
-   /** Inject service proxies into the containerContext of the web application if it is needed. */
+   /** Inject service proxies into the context of the web application if it is needed. */
    protected void injectServices()
    {
       if (jbossAppMD instanceof JBossApplicationMetaData)

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java	2006-10-06 00:01:46 UTC (rev 5337)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java	2006-10-06 00:11:45 UTC (rev 5338)
@@ -230,7 +230,7 @@
       //
       PortletContext portletContext = instance.getPortletContext();
 
-      // The instance containerContext for the invocation
+      // The instance context for the invocation
       InstanceContextImpl instanceContext = new InstanceContextImpl(this, accessMode);
 
       try
@@ -265,7 +265,7 @@
             {
                if (debug)
                {
-//                 log.debug("About to update portlet containerContext (" + instanceId + "," + portletContext +
+//                 log.debug("About to update portlet context (" + instanceId + "," + portletContext +
 //                           ") having id " + instanceContext.clonedContext + " for user " + userId);
                }
                modified(instanceContext.modifiedContext);

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java	2006-10-06 00:01:46 UTC (rev 5337)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java	2006-10-06 00:11:45 UTC (rev 5338)
@@ -309,10 +309,10 @@
       {
          InstanceCustomizationImpl userInstance = (InstanceCustomizationImpl)i.next();
 
-         // Get the user portlet containerContext
+         // Get the user portlet context
          PortletContext userPortletContext = userInstance.getPortletContext();
 
-         // Add the portlet containerContext
+         // Add the portlet context
          toDestroy.add(userPortletContext);
 
          //

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java	2006-10-06 00:01:46 UTC (rev 5337)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java	2006-10-06 00:11:45 UTC (rev 5338)
@@ -248,7 +248,7 @@
        log.debug("Detecting the existence of the portal object root context");
        Session session = sessionFactory.getCurrentSession();
 
-       // Create root containerContext if it does not exist
+       // Create root context if it does not exist
        ObjectNode root = lookup(session, "");
        if (root == null)
        {

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-06 00:01:46 UTC (rev 5337)
+++ trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java	2006-10-06 00:11:45 UTC (rev 5338)
@@ -110,7 +110,7 @@
       /**
        * 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.
+       * The alternative is that each test sets its own context id.
        */
       DelegatingPolicy p = (DelegatingPolicy)Policy.getPolicy();
       p.delete("ctxid");

Modified: trunk/forums/src/main/org/jboss/portlet/forums/ForumsPortlet.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/ForumsPortlet.java	2006-10-06 00:01:46 UTC (rev 5337)
+++ trunk/forums/src/main/org/jboss/portlet/forums/ForumsPortlet.java	2006-10-06 00:11:45 UTC (rev 5338)
@@ -2414,7 +2414,7 @@
           //        {
           //           // Create the command
           //   return new StoreAttachmentCommand(
-          //        containerContext.getFileHome(),
+          //        context.getFileHome(),
           //        id,
           //        fileId,
           //        webFile.getContentType(),
@@ -3179,7 +3179,7 @@
          }
          else
          {
-            // Fill containerContext with categories
+            // Fill context with categories
             Iterator iterator = forumsModule.findCategories().iterator();
             while (iterator.hasNext())
             {
@@ -3216,7 +3216,7 @@
             viewCatURL.setParameter("c", "" + category.getId());
             catrow.put("U_VIEWCAT", viewCatURL.toString());
 
-            // Fill containerContext with forums
+            // Fill context with forums
             Iterator forumsIterator = forumsModule.findForumsByCategoryId(category.getId()).iterator();
             while (forumsIterator.hasNext())
             {