Diverse Kleinigkeiten, Nachführungen, Formatierungen.

git-svn-id: https://svn.libreccm.org/ccm/trunk@857 8810af33-2d31-482b-a856-94f89814c4df

ccm-core/src/com/arsdigita/bebop/page/BebopApplicationServlet.java

@@ -14,7 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
  */
 package com.arsdigita.bebop.page;
 
@@ -36,17 +35,18 @@ import java.util.HashMap;
 import java.util.Set;
 
 import javax.servlet.ServletException;
-import javax.servlet.ServletContext;
+//import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
 
 /**
- * @author Justin Ross <jross@redhat.com>
- * @version $Id: BebopApplicationServlet.java 1372 2006-11-13 09:22:54Z chrisgilbert23 $
  * 
- * chris gilbert - allow BebopApplicationServlet pages to disable client/middleware
+ * @author Justin Ross <jross@redhat.com>
+ * @author chris gilbert - allow BebopApplicationServlet pages to disable
+ *                         client/middleware
+ * @version $Id: BebopApplicationServlet.java 1372 2006-11-13 09:22:54Z chrisgilbert23 $
  */
 public class BebopApplicationServlet extends BaseApplicationServlet {
 
@@ -82,8 +82,8 @@ public class BebopApplicationServlet extends BaseApplicationServlet {
     }
 
     /**
+     * disable client/middleware caching of specified page (Chris Gilbert).
      *
-     * disable client/middleware caching of specified page. 
      * @param pathInfo - the same path used to add the page when put was called
      */
     protected final void disableClientCaching(String pathInfo) {

ccm-core/src/com/arsdigita/bebop/page/BebopMapDispatcher.java

@@ -46,8 +46,8 @@ public class BebopMapDispatcher extends MapDispatcher {
         Logger.getLogger(BebopMapDispatcher.class);
 
     /**
-     * Creates BebopMapDispatcher with empty URL mapped to "/" and the
+     * Constructor creates BebopMapDispatcher with empty URL mapped to "/" and
-     * default presentation manager.  Also maps a Bebop confirmation
+     * the default presentation manager.  Also maps a Bebop confirmation
      * page to the location at ConfirmPage.CONFIRM_URL.
      */
     public BebopMapDispatcher() {
@@ -63,6 +63,7 @@ public class BebopMapDispatcher extends MapDispatcher {
      * Sets the page map for this dispatcher.
      * @param m the page map (which maps URLs to Pages)
      */
+    @Override
     public synchronized final void setMap(Map m) {
         // hijack the page map and replace Page targets
         // with Dispatcher targets.
@@ -143,10 +144,16 @@ public class BebopMapDispatcher extends MapDispatcher {
      * @param md the MapDispatcher to configure
      * @return a SAX DefaultHandler object for handling SAX events.
      */
+    @Override
     protected DefaultHandler newParseConfigHandler(MapDispatcher md) {
         return new BebopConfigHandler(md);
     }
 
+
+    
+    /**
+     * 
+     */
     private static class BebopConfigHandler
         extends MapDispatcher.ParseConfigHandler {
 
@@ -154,6 +161,7 @@ public class BebopMapDispatcher extends MapDispatcher {
             super(md);
         }
 
+        @Override
         public void endElement(String uri, String localName, String qn) {
             if (qn.equals("page-class")) {
                 try {

ccm-core/src/com/arsdigita/ui/permissions/PermissionsDispatcher.java

@@ -29,7 +29,8 @@ import com.arsdigita.dispatcher.DispatcherHelper;
 import com.arsdigita.ui.login.UserAuthenticationListener;
 
 /**
- * Dispatcher for the permissions UI package.
+ * Dispatcher for the
+ * UI package.
  * Manages permissions admin pages.
  * The dispatcher is mounted at /permissions/
  * Below that, an index page is mounted at "" or "index",

ccm-core/src/com/arsdigita/web/BaseApplicationServlet.java

@@ -95,6 +95,7 @@ public abstract class BaseApplicationServlet extends BaseServlet {
      *
      * @see com.arsdigita.web.BaseServlet#doService(HttpServletRequest,HttpServletResponse)
      */
+    @Override
     protected final void doService(final HttpServletRequest sreq,
                                    final HttpServletResponse sresp)
             throws ServletException, IOException {
@@ -152,6 +153,11 @@ public abstract class BaseApplicationServlet extends BaseServlet {
                                       Application app)
             throws ServletException, IOException;
 
+    /**
+     * 
+     * @param sreq
+     * @return
+     */
     private Application getApplication(HttpServletRequest sreq) {
         s_log.debug("Resolving the application that will handle this request");
 

ccm-portalserver/src/com/arsdigita/portalserver/ui/PortalDispatcher.java

@@ -36,25 +36,23 @@ import org.apache.log4j.Logger;
  * <p><strong>Experimental</strong></p>
  *
  * @author <a href="mailto:justin@arsdigita.com">Justin Ross</a>
- * @version $Id: //portalserver/dev/src/com/arsdigita/portalserver/ui/PortalDispatcher.java#5 $
+ * @version $Id: PortalDispatcher.java  pboy $
  */
 public class PortalDispatcher extends BebopMapDispatcher {
-    public static final String versionId =
-        "$Id: //portalserver/dev/src/com/arsdigita/portalserver/ui/PortalDispatcher.java#5 $" +
-        "$Author: dennis $" +
-        "$DateTime: 2004/08/17 23:19:25 $";
 
     private static final Logger s_log = Logger.getLogger
         (PortalDispatcher.class);
 
     // XXX Move these to constant pool.
-
     protected static final String PORTAL_HOME_PAGE = "index.xhtml";
     protected static final String PORTAL_ADMIN_PAGE = "admin";
     protected static final String PORTAL_PARTICIPANT_PAGE = "participants";
 
     private Dispatcher m_portalsiteAdminDispatcher;
 
+    /**
+     * Constructor
+     */
     public PortalDispatcher() {
         super();
 
@@ -67,6 +65,15 @@ public class PortalDispatcher extends BebopMapDispatcher {
         setMap(m);
     }
 
+    /**
+     * 
+     * @param request
+     * @param response
+     * @param context
+     * @throws IOException
+     * @throws ServletException
+     */
+    @Override
     public void dispatch(HttpServletRequest request,
                          HttpServletResponse response,
                          RequestContext context)

ccm-shp-aplaws/src/com/arsdigita/aplaws/Loader.java

@@ -18,13 +18,13 @@
 
 package com.arsdigita.aplaws;
 
-import com.arsdigita.london.navigation.Navigation;
+//import com.arsdigita.london.navigation.Navigation;
 import com.arsdigita.london.navigation.Template;
-import com.arsdigita.london.navigation.TemplateMapping;
+//import com.arsdigita.london.navigation.TemplateMapping;
 import com.arsdigita.london.terms.Domain;
 import com.arsdigita.london.terms.importer.Parser;
-import com.arsdigita.london.portal.PageLayout;
+import com.arsdigita.portalworkspace.PageLayout;
-import com.arsdigita.london.portal.Workspace;
+import com.arsdigita.portalworkspace.Workspace;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.categorization.RootCategoryCollection;

ccm-shp-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java

@@ -30,8 +30,8 @@ import com.arsdigita.categorization.Category;
 import com.arsdigita.util.Assert;
 import com.arsdigita.bebop.PageState;
 
-import com.arsdigita.london.portal.Workspace;
+import com.arsdigita.portalworkspace.Workspace;
-import com.arsdigita.london.portal.ui.WorkspaceSelectionModel;
+import com.arsdigita.portalworkspace.ui.WorkspaceSelectionModel;
 
 public class CategoryPortalSelectionModel extends WorkspaceSelectionModel {
 

ccm-shp-aplaws/src/com/arsdigita/aplaws/ui/HomepagePortalSelectionModel.java

@@ -16,8 +16,8 @@
 package com.arsdigita.aplaws.ui;
 
 import com.arsdigita.bebop.AbstractSingleSelectionModel;
-import com.arsdigita.london.portal.ui.PortalSelectionModel;
+import com.arsdigita.portalworkspace.ui.PortalSelectionModel;
-import com.arsdigita.london.portal.WorkspacePage;
+import com.arsdigita.portalworkspace.WorkspacePage;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.parameters.ParameterModel;
 import com.arsdigita.domain.DomainObject;

ccm-shp-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java

@@ -20,11 +20,11 @@ import com.arsdigita.bebop.ActionLink;
 import com.arsdigita.bebop.Page;
 import com.arsdigita.bebop.event.ActionEvent;
 import com.arsdigita.bebop.event.ActionListener;
-import com.arsdigita.london.portal.ui.PersistentPortal;
+import com.arsdigita.portalworkspace.ui.PersistentPortal;
-import com.arsdigita.london.portal.Workspace;
+import com.arsdigita.portalworkspace.Workspace;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.xml.Element;
-import com.arsdigita.london.portal.ui.PortalConstants;
+import com.arsdigita.portalworkspace.ui.PortalConstants;
 import com.arsdigita.kernel.permissions.PermissionService;
 import com.arsdigita.kernel.permissions.PermissionDescriptor;
 import com.arsdigita.kernel.permissions.PrivilegeDescriptor;

ccm-shp-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java

@@ -27,9 +27,9 @@ import com.arsdigita.kernel.permissions.PermissionService;
 import com.arsdigita.kernel.permissions.PermissionDescriptor;
 import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
 
-import com.arsdigita.london.portal.Workspace;
+import com.arsdigita.portalworkspace.Workspace;
-import com.arsdigita.london.portal.WorkspacePage;
+import com.arsdigita.portalworkspace.WorkspacePage;
-import com.arsdigita.london.portal.WorkspacePageCollection;
+import com.arsdigita.portalworkspace.WorkspacePageCollection;
 
 import com.arsdigita.london.subsite.Subsite;
 

ccm-themedirector/src/com/arsdigita/themedirector/ThemeFile.java

@@ -47,7 +47,7 @@ public class ThemeFile extends DomainObject {
                                 Logger.getLogger(ThemeFile.class);
 
     public static final String BASE_DATA_OBJECT_TYPE = 
-        "com.arsdigita.themedirector.ThemeFile";
+                               "com.arsdigita.themedirector.ThemeFile";
 
     public static final String ID = "id";
     public static final String FILE_PATH = "filePath";

environment/project.xml.gen-dev

@@ -62,13 +62,14 @@
 <!--  - - - - -  -   -->
 <!--    <ccm:application name="ccm-auth-http"/>                      -->
 <!--    <ccm:application name="ccm-bookmarks"/>                      -->
-<!--    temporarily excluded, produces errors in the build process
+<!--    temporarily excluded, produces errors in the build process   -->
-        <ccm:application name="ccm-docmngr"/>                        -->
+        <ccm:application name="ccm-docmgr"/>                        
 <!--    <ccm:application name="ccm-formbuilder-pdf"/>                -->
         <ccm:application name="ccm-forum"/>
 <!--    <ccm:application name="ccm-forum-categorised"/>              -->
 <!--    <ccm:application name="ccm-portalserver"/>                   -->
-        <ccm:application name="ccm-portalworkspace"/>                
+        <ccm:application name="ccm-portalserver"/>                
+        <ccm:application name="ccm-portalworkspace"/>               
 <!--    <ccm:application name="ccm-simplesurvey"/>                   -->
         <ccm:application name="ccm-themedirector"/>                     
 <!--    <ccm:application name="ccm-user-preferences"/>               -->