[jboss-svn-commits] JBL Code SVN: r19519 - in labs/jbosslabs/qa/portal-extensions: forge-mapper/src/java/org/jboss/labs/mapper/command and 1 other directories.

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

Author: adamw
Date: 2008-04-11 06:29:11 -0400 (Fri, 11 Apr 2008)
New Revision: 19519

Modified:
   labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
   labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java
   labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java
Log:
svn merge -r 19516:19518 https://svn.labs.jboss.org/labs/jbosslabs/trunk/portal-extensions .

Modified: labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2008-04-11 10:27:35 UTC (rev 19518)
+++ labs/jbosslabs/qa/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2008-04-11 10:29:11 UTC (rev 19519)
@@ -98,7 +98,7 @@
    	<url-pattern>/*</url-pattern>
    </filter-mapping> 
 
-<filter>
+  <!--filter>
         <filter-name>wikiComRedirect</filter-name>
         <filter-class>org.jboss.forge.portal.WikiComRedirectFilter</filter-class>
         <init-param>
@@ -117,7 +117,7 @@
         <filter-name>wikiComRedirect</filter-name>
         <url-pattern>/*</url-pattern>
    </filter-mapping> 
-   
+   -->
     <filter>
       <filter-name>redirectFilter</filter-name>
       <filter-class>org.jboss.forge.redirect.RootRedirectFilter</filter-class>

Modified: labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java	2008-04-11 10:27:35 UTC (rev 19518)
+++ labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java	2008-04-11 10:29:11 UTC (rev 19519)
@@ -173,6 +173,7 @@
                     return sendRedirect(invocation, ForgeHelper.createFileAccessPath(absPath));
                 }
             } catch (ResourceDoesNotExist resourceDoesNotExist) {
+            	invocation.getServerContext().getClientResponse().setStatus(404);
                 // The page does not exist; proceeding.
             }
 

Modified: labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java	2008-04-11 10:27:35 UTC (rev 19518)
+++ labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java	2008-04-11 10:29:11 UTC (rev 19519)
@@ -61,10 +61,8 @@
     @CacheItemInject(dataSource=FreezoneConfWatcher.class)
     private CacheItemUser<String, List<String>> conf;
 
-    private final static String ERROR_404_MSG = "404 - Not found.";
+    private final static String ERROR_404_MSG = "Not found.";
 
-    private final static String TAGME_JSP = "freezone/tagme.jsp";
-
     private void sendResponseNotFound(JBossRenderResponse response)
             throws IOException {
         response.setContentType(Constants.PAGES_MIME_TYPE);
@@ -146,7 +144,6 @@
             // (possibly) create a new page.
             if (isAllowedToEdit(request, response)) {
                 response.setContentType(Constants.PAGES_MIME_TYPE);
-                writeTagmeButton(request, response, requestedPath);
                 writeEditLink(request, response);
                 response.getWriter().println(ERROR_404_MSG);
             } else {
@@ -157,7 +154,6 @@
         }
 
         response.setContentType(Constants.PAGES_MIME_TYPE);
-        writeTagmeButton(request, response, requestedPath);
         if (isAllowedToEdit(request, response)) {
             writeEditLink(request, response);
         }
@@ -165,21 +161,6 @@
         Tools.transfer(requestedNode.getContentInputStream(), response.getWriter());
     }
 
-    private void writeTagmeButton(JBossRenderRequest request,
-                                  JBossRenderResponse response, String requestedPath)
-            throws PortletException, IOException {
-        if (request.getUser() != null) {
-            request.setAttribute("TAGME_PATH", requestedPath);
-            request.setAttribute("TAGME_USER", request.getUser().getUserName());
-
-            PortletRequestDispatcher rd = getPortletContext()
-                    .getRequestDispatcher(
-                            ForgeHelper.createRepoAccessPath(TAGME_JSP));
-
-            rd.include(request, response);
-        }
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     protected boolean isAllowed(JBossRenderRequest request,