[jboss-svn-commits] JBL Code SVN: r5076 - in labs/jbosslabs/trunk/portal-extensions: configuration/to-copy/server/all/conf forge-file-access forge-file-access/src/java/org/jboss/forge/fileaccess

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

Author: adamw
Date: 2006-07-13 14:59:29 -0400 (Thu, 13 Jul 2006)
New Revision: 5076

Modified:
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/conf/
   labs/jbosslabs/trunk/portal-extensions/forge-file-access/forge-file-access.iml
   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/TempFilesFileAccessMonitor.java
Log:
http://jira.jboss.com/jira/browse/JBSHOTOKU-90


Property changes on: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/conf
___________________________________________________________________
Name: svn:ignore
   + log4j.xml


Modified: labs/jbosslabs/trunk/portal-extensions/forge-file-access/forge-file-access.iml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-file-access/forge-file-access.iml	2006-07-13 18:48:54 UTC (rev 5075)
+++ labs/jbosslabs/trunk/portal-extensions/forge-file-access/forge-file-access.iml	2006-07-13 18:59:29 UTC (rev 5076)
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="shotoku-base" />
     <orderEntry type="module" module-name="shotoku-file-access" />
     <orderEntry type="library" name="jboss" level="application" />
+    <orderEntry type="module" module-name="forge-common" />
     <orderEntryProperties />
   </component>
 </module>

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	2006-07-13 18:48:54 UTC (rev 5075)
+++ labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/DownloadsFileAccessMonitor.java	2006-07-13 18:59:29 UTC (rev 5076)
@@ -7,16 +7,18 @@
 import org.jboss.forge.common.projects.DownloadCountersWatcher;
 import org.jboss.forge.common.ForgeHelper;
 
-import javax.servlet.ServletRequest;
-import java.io.InputStream;
+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, ServletRequest request,
-                                         ContentManager cm) {
+    public ContentInformation resourceRequested(String path,
+                                                HttpServletRequest request,
+                                                HttpServletResponse response,
+                                                ContentManager cm) {
         if (path.indexOf("/downloads/") != -1) {
             // resolving portal name
             String portalName = resolvePortalName(path);

Modified: labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/TempFilesFileAccessMonitor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/TempFilesFileAccessMonitor.java	2006-07-13 18:48:54 UTC (rev 5075)
+++ labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/TempFilesFileAccessMonitor.java	2006-07-13 18:59:29 UTC (rev 5076)
@@ -6,7 +6,8 @@
 import org.jboss.shotoku.tools.Tools;
 import org.jboss.forge.common.ForgeHelper;
 
-import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -15,8 +16,11 @@
  * @author Adam Warski (adamw at aster.pl)
  */
 public class TempFilesFileAccessMonitor implements FileAccessMonitor {
-    public ContentInformation resourceRequested(String path, ServletRequest request,
-                                                ContentManager cm) throws FileNotFoundException {
+    public ContentInformation resourceRequested(String path,
+                                                HttpServletRequest request,
+                                                HttpServletResponse response,
+                                                ContentManager cm)
+            throws FileNotFoundException {
         if (path.startsWith(ForgeHelper.TMP_FILES_ACCESS)) {
             String fileNumber = path.substring(ForgeHelper.TMP_FILES_ACCESS.length());
             File file = new File(ForgeHelper.getFilePath(Integer.valueOf(fileNumber)));