[jboss-svn-commits] JBL Code SVN: r14124 - in labs/jbosslabs/trunk/portal-extensions: forge-file-access/src/java/org/jboss/forge/fileaccess and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Aug 9 13:08:32 EDT 2007
Author: wrzep
Date: 2007-08-09 13:08:32 -0400 (Thu, 09 Aug 2007)
New Revision: 14124
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDescriptor.java
labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/DownloadsFileAccessMonitor.java
labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/DownloadingFilter.java
Log:
JBLAB-882
redirect+count
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java 2007-08-09 17:07:52 UTC (rev 14123)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java 2007-08-09 17:08:32 UTC (rev 14124)
@@ -117,8 +117,12 @@
*/
public synchronized void increment(final String link)
{
+
+ System.out.println("### increment " + downloadCounters + "\n link: " + link + " get: " + downloadCounters.get(link));
+
if (downloadCounters != null && downloadCounters.get(link) != null)
{
+
// Status change to inform about counters modification.
downloadCounters.get(link).increment();
try
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDescriptor.java 2007-08-09 17:07:52 UTC (rev 14123)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDescriptor.java 2007-08-09 17:08:32 UTC (rev 14124)
@@ -173,7 +173,6 @@
logger = Logger.getLogger(this.getClass());
}
-
/**
* Method only returns all download counters.
@@ -573,6 +572,7 @@
*/
synchronized public void increment (final String link) {
if (downloadCounters!=null && downloadCounters.get(link)!=null) {
+
// Status change to inform about counters modification.
changeStatus=true;
downloadCounters.get(link).increment();
Modified: labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/DownloadsFileAccessMonitor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/DownloadsFileAccessMonitor.java 2007-08-09 17:07:52 UTC (rev 14123)
+++ labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/DownloadsFileAccessMonitor.java 2007-08-09 17:08:32 UTC (rev 14124)
@@ -1,50 +1,47 @@
-package org.jboss.forge.fileaccess;
-
-import org.jboss.shotoku.fileaccess.FileAccessMonitor;
-import org.jboss.shotoku.fileaccess.ContentInformation;
-import org.jboss.shotoku.ContentManager;
-import org.jboss.forge.common.projects.DownloadCountersDescriptor;
-import org.jboss.forge.common.projects.DownloadCountersWatcher;
-import org.jboss.forge.common.projects.DownloadCounterTools;
-import org.jboss.forge.common.ForgeHelper;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-
-/**
- * @author Adam Warski (adamw at aster.pl)
- */
-public class DownloadsFileAccessMonitor implements FileAccessMonitor {
- public ContentInformation resourceRequested(String path,
- HttpServletRequest request,
- HttpServletResponse response,
- ContentManager cm) {
- if (path.indexOf("/downloads/") != -1) {
- // resolving portal name
- String portalName = resolvePortalName(path);
-
- // Trying to get DownloadCountersDescriptor object from the
- // cache
- DownloadCountersDescriptor downloadCounters =
- DownloadCounterTools.getDesc(portalName);
-
- // Sending the request link to the DownloadCounter to
- // increment
- // counter for this link if it's one of the tracked links.
- if (downloadCounters != null)
- downloadCounters.increment(File.separator + path);
- }
-
- return null;
- }
-
- /**
- * Method used to resolve portal name to which the download link aims.
- *
- * @param link
- */
- private static String resolvePortalName(String link) {
- return link.split(File.separator)[0];
- }
-}
+//package org.jboss.forge.fileaccess;
+//
+//import org.jboss.shotoku.fileaccess.FileAccessMonitor;
+//import org.jboss.shotoku.fileaccess.ContentInformation;
+//import org.jboss.shotoku.ContentManager;
+//import org.jboss.forge.common.projects.DownloadCountersDescriptor;
+//import org.jboss.forge.common.projects.DownloadCounterTools;
+//import javax.servlet.http.HttpServletResponse;
+//import javax.servlet.http.HttpServletRequest;
+//import java.io.File;
+//
+///**
+// * @author Adam Warski (adamw at aster.pl)
+// */
+//public class DownloadsFileAccessMonitor implements FileAccessMonitor {
+// public ContentInformation resourceRequested(String path,
+// HttpServletRequest request,
+// HttpServletResponse response,
+// ContentManager cm) {
+// if (path.indexOf("/downloads/") != -1) {
+// // resolving portal name
+// String portalName = resolvePortalName(path);
+//
+// // Trying to get DownloadCountersDescriptor object from the
+// // cache
+// DownloadCountersDescriptor downloadCounters =
+// DownloadCounterTools.getDesc(portalName);
+//
+// // Sending the request link to the DownloadCounter to
+// // increment
+// // counter for this link if it's one of the tracked links.
+// if (downloadCounters != null)
+// downloadCounters.increment(File.separator + path);
+// }
+//
+// return null;
+// }
+//
+// /**
+// * Method used to resolve portal name to which the download link aims.
+// *
+// * @param link
+// */
+// private static String resolvePortalName(String link) {
+// return link.split(File.separator)[0];
+// }
+//}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/DownloadingFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/DownloadingFilter.java 2007-08-09 17:07:52 UTC (rev 14123)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/DownloadingFilter.java 2007-08-09 17:08:32 UTC (rev 14124)
@@ -22,6 +22,7 @@
package org.jboss.forge.portal;
+import java.io.File;
import java.io.IOException;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
@@ -32,34 +33,38 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.jboss.logging.Logger;
+import org.jboss.forge.common.Constants;
+import org.jboss.forge.common.projects.DownloadCounterTools;
+import org.jboss.forge.common.projects.DownloadCountersDescriptor;
/**
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ * @author Adam Warski (adamw at aster.pl)
* @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
*/
public class DownloadingFilter implements Filter {
- private static final Logger log = Logger.getLogger(DownloadingFilter.class);
-
- private static final String URL_PARAM = "url";
+ private static final String URL_PARAM = "url";
- public void destroy() {}
-
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain) throws IOException, ServletException {
- if (request instanceof HttpServletRequest) {
+
+ if (request instanceof HttpServletRequest) {
HttpServletRequest htReq = (HttpServletRequest) request;
- String url = htReq.getParameter(URL_PARAM);
+ String link = htReq.getParameter(URL_PARAM);
if ((response instanceof HttpServletResponse) &&
- (url != null) && (url.length() > 0)) {
+ (link != null) && (link.length() > 0)) {
+
+ String portalName = Constants.LABS_PORTAL;
+
+ count(portalName, link);
- ((HttpServletResponse) response).sendRedirect(url);
- return;
+ ((HttpServletResponse) response).sendRedirect(link);
+ return;
}
}
@@ -67,6 +72,23 @@
}
- public void init(FilterConfig arg0) throws ServletException {}
+ private static void count(String portalName, String url) {
+ // Trying to get DownloadCountersDescriptor object from the
+ // cache
+ DownloadCountersDescriptor downloadCounters =
+ DownloadCounterTools.getDesc(portalName);
+
+ // Sending the request link to the DownloadCounter to
+ // increment
+ // counter for this link if it's one of the tracked links.
+ if (downloadCounters != null) {
+
+ downloadCounters.increment(url);
+ }
+ }
+
+ public void init(FilterConfig arg0) throws ServletException {}
+
+ public void destroy() {}
}
More information about the jboss-svn-commits
mailing list