[jboss-svn-commits] JBL Code SVN: r15304 - in labs/jbosslabs/qa/portal-extensions: forge-file-access/src/web/WEB-INF and 1 other directories.

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

Author: adamw
Date: 2007-09-23 11:35:57 -0400 (Sun, 23 Sep 2007)
New Revision: 15304

Modified:
   labs/jbosslabs/qa/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/portlet/DownloadCounterPortlet.java
   labs/jbosslabs/qa/portal-extensions/forge-file-access/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/qa/portal-extensions/forge-file-access/src/web/WEB-INF/portlet.xml
   labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java
Log:
MERGE 15287:15303

Modified: labs/jbosslabs/qa/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/portlet/DownloadCounterPortlet.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/portlet/DownloadCounterPortlet.java	2007-09-23 15:23:51 UTC (rev 15303)
+++ labs/jbosslabs/qa/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/portlet/DownloadCounterPortlet.java	2007-09-23 15:35:57 UTC (rev 15304)
@@ -47,7 +47,7 @@
  */
 
 public class DownloadCounterPortlet extends JBossPortlet {
-	public void doView(JBossRenderRequest request, JBossRenderResponse response)
+	/*public void doView(JBossRenderRequest request, JBossRenderResponse response)
 			throws IOException, PortletException {		
 		// Getting name of the project on which the download counter is used.
 		String projectId = ProjectsHelper.getSelectedProjectId(request);
@@ -73,7 +73,7 @@
 		PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher(
 				ForgeHelper.createRepoAccessPath(portalName,DownloadCounterTools.getJspCmPath()));
 		rd.include(request, response);
-	}
+	}*/
 	
 	
 }

Modified: labs/jbosslabs/qa/portal-extensions/forge-file-access/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-file-access/src/web/WEB-INF/portlet-instances.xml	2007-09-23 15:23:51 UTC (rev 15303)
+++ labs/jbosslabs/qa/portal-extensions/forge-file-access/src/web/WEB-INF/portlet-instances.xml	2007-09-23 15:35:57 UTC (rev 15304)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deployments>
-   <deployment>
+   <!--deployment>
       <if-exists>overwrite</if-exists>
       <instance>
          <instance-id>DownloadCounterPortletInstance</instance-id>
          <portlet-ref>DownloadCounterPortlet</portlet-ref>
       </instance>
-   </deployment>
+   </deployment-->
 </deployments>
\ No newline at end of file

Modified: labs/jbosslabs/qa/portal-extensions/forge-file-access/src/web/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-file-access/src/web/WEB-INF/portlet.xml	2007-09-23 15:23:51 UTC (rev 15303)
+++ labs/jbosslabs/qa/portal-extensions/forge-file-access/src/web/WEB-INF/portlet.xml	2007-09-23 15:35:57 UTC (rev 15304)
@@ -2,7 +2,7 @@
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd /opt/SUNWps/dtd/portlet.xsd" version="1.0">
-   <portlet>
+   <!--portlet>
       <portlet-name>DownloadCounterPortlet</portlet-name>
       <portlet-class>org.jboss.forge.fileaccess.portlet.DownloadCounterPortlet</portlet-class>
       <supported-locale>en</supported-locale>
@@ -13,5 +13,5 @@
       <portlet-info>
          <title>JBoss Download Counter Portlet</title>
       </portlet-info>
-   </portlet>
+   </portlet-->
 </portlet-app>

Modified: labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java	2007-09-23 15:23:51 UTC (rev 15303)
+++ labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java	2007-09-23 15:35:57 UTC (rev 15304)
@@ -121,7 +121,7 @@
         // End of redirects.
         
         // Checking if the last token has a .; if yes, redirecting to url with a / at the end.
-        String rest = parser.getCurrent();
+        String rest = requestPath;
         if (rest != null) {
         	int lastSlash = rest.lastIndexOf('/');
         	if (lastSlash != -1) {