[Jboss-svn-commits] JBL Code SVN: r2865 - in trunk/forge/portal-extensions: . forge-common/src/java/org/jboss/forge/common forge-root-redirect/src/java/org/jboss/forge/redirect

[<jbo...@li...>]

Author: szimano
Date: 2006-03-10 11:20:41 -0500 (Fri, 10 Mar 2006)
New Revision: 2865

Modified:
   trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/VolatileTempFileRemover.java
   trunk/forge/portal-extensions/forge-root-redirect/src/java/org/jboss/forge/redirect/RootRedirectFilter.java
   trunk/forge/portal-extensions/maven.xml
Log:
blog and download redirection plus temp file fix
JBIT-885 JBIT-886


Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/VolatileTempFileRemover.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/VolatileTempFileRemover.java	2006-03-10 10:20:13 UTC (rev 2864)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/VolatileTempFileRemover.java	2006-03-10 16:20:41 UTC (rev 2865)
@@ -30,7 +30,7 @@
 		
 		while (running) {
 			try {
-				wait(NUMBER_OF_HOURS * 60 * 60 * 1000 );
+				sleep(NUMBER_OF_HOURS * 60 * 60 * 1000 );
 			} catch (InterruptedException e) {
 			}
 			

Modified: trunk/forge/portal-extensions/forge-root-redirect/src/java/org/jboss/forge/redirect/RootRedirectFilter.java
===================================================================
--- trunk/forge/portal-extensions/forge-root-redirect/src/java/org/jboss/forge/redirect/RootRedirectFilter.java	2006-03-10 10:20:13 UTC (rev 2864)
+++ trunk/forge/portal-extensions/forge-root-redirect/src/java/org/jboss/forge/redirect/RootRedirectFilter.java	2006-03-10 16:20:41 UTC (rev 2865)
@@ -35,14 +35,21 @@
 public class RootRedirectFilter implements Filter {
 	private final static String WRONG_REQ_RESP = "Error accessing the requested resource.";
 
-	private static String bbRedirect = "http://www.jboss.com/index.html?module=bb";
+	private static String bbRedirect = "http://www.jboss.com/index.html?module=";
+	
+	private static String blogRedirect = "http://www.jboss.com";
 
 	private static final String BB_REDIRECT = "bbRedirect";
+	
+	private static final String BLOG_REDIRECT = "blogRedirect";
 
 	public void init(FilterConfig conf) {
 		if (conf.getInitParameter(BB_REDIRECT) != null) {
 			bbRedirect = conf.getInitParameter(BB_REDIRECT);
 		}
+		if (conf.getInitParameter(BLOG_REDIRECT) != null) {
+			blogRedirect = conf.getInitParameter(BLOG_REDIRECT);
+		}
 	}
 
 	private boolean checkFirstToken(String token) {
@@ -58,18 +65,21 @@
 
 			String requestURI = httpRequest.getRequestURI();
 
-			// send response to forums
+			// send response to forums or downloads
 			if (requestURI.equals("/index.html")
-					&& httpRequest.getParameter("module").equals("bb")) {
-				
-				String redirectToForum = bbRedirect;
+					&& httpRequest.getParameter("module") != null
+					&& (httpRequest.getParameter("module").equals("bb") || httpRequest
+							.getParameter("module").equals("downloads"))) {
 
+				String redirectToForum = bbRedirect
+						+ httpRequest.getParameter("module");
+
 				Map parameterMap = httpRequest.getParameterMap();
 
 				for (Object key : parameterMap.keySet()) {
 					if (!key.equals("module")) {
 						redirectToForum += "&" + (String) key + "="
-								+ httpRequest.getParameter((String)key);
+								+ httpRequest.getParameter((String) key);
 					}
 				}
 
@@ -77,6 +87,12 @@
 				return;
 
 			}
+			else if (requestURI.startsWith("/jbossBlog")){
+				String redirectToBlog = blogRedirect + requestURI;
+				
+				httpResponse.sendRedirect(redirectToBlog);
+				return;
+			}
 
 			String[] tokens = requestURI.split("[/]", 3);
 

Modified: trunk/forge/portal-extensions/maven.xml
===================================================================
--- trunk/forge/portal-extensions/maven.xml	2006-03-10 10:20:13 UTC (rev 2864)
+++ trunk/forge/portal-extensions/maven.xml	2006-03-10 16:20:41 UTC (rev 2865)
@@ -90,7 +90,7 @@
 	<!-- Copies necessary jars to the repository -->
 	<goal name="prepare-repo">
 		<ant:copy todir="${maven.repo.local}">
-			<ant:fileset dir="binaries/maven-repo-addons" />
+			<ant:fileset dir="binaries/maven-repo-addons" overwrite="true" />
 		</ant:copy>
 	
 		<ant:exec dir="${basedir}/shotoku" executable="maven">