[jboss-svn-commits] JBL Code SVN: r23400 - in labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect: src/web and 3 other directories.

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

Author: szimano
Date: 2008-10-09 12:26:07 -0400 (Thu, 09 Oct 2008)
New Revision: 23400

Added:
   labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/images/bkgblur_right.gif
   labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/images/bookmark_bkg.jpg
   labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/images/bookmark_blur_bottom.gif
Modified:
   labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/java/org/jboss/wiki/redirect/WikiToClearspaceRedirect.java
   labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/WEB-INF/web.xml
   labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/newlocation.jsp
   labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/target/classes/org/jboss/wiki/redirect/WikiToClearspaceRedirect.class
Log:
redirects

Modified: labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/java/org/jboss/wiki/redirect/WikiToClearspaceRedirect.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/java/org/jboss/wiki/redirect/WikiToClearspaceRedirect.java	2008-10-09 15:59:08 UTC (rev 23399)
+++ labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/java/org/jboss/wiki/redirect/WikiToClearspaceRedirect.java	2008-10-09 16:26:07 UTC (rev 23400)
@@ -38,7 +38,7 @@
 			return;
 		}
 
-		if (req.getRequestURI().equals(req.getContextPath())) {
+		if (req.getRequestURI().equals(req.getContextPath() + "/redirect")) {
 			resp.sendRedirect(redirectTo + "community/wiki");
 			return;
 		}
@@ -49,16 +49,20 @@
 			page = (String)req.getParameter("page");
 		} else {
 			page = req.getRequestURI().substring(
-					req.getContextPath().length() + 1);
+					(req.getContextPath() + "/redirect").length() + 1);
 		}
 
-		if (pagesMap.containsKey(page)) {
-			String redirPage = redirectTo + "docs/"
+        System.out.println("Outside ! "+page + " and " + pagesMap.get(page));
+
+        if (pagesMap.containsKey(page)) {
+            System.out.println("Inside ! "+page);
+            
+            String redirPage = redirectTo + "docs/"
 					+ pagesMap.getProperty(page);
 
             req.setAttribute("pageRedirect", redirPage);
 
-            req.getRequestDispatcher("newlocation.jsp").forward(req, resp);
+            req.getRequestDispatcher("/newlocation.jsp").include(req, resp);
             return;
         } else {
 			resp.sendRedirect(redirectTo + "404");

Modified: labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/WEB-INF/web.xml	2008-10-09 15:59:08 UTC (rev 23399)
+++ labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/WEB-INF/web.xml	2008-10-09 16:26:07 UTC (rev 23400)
@@ -17,6 +17,6 @@
 	</servlet>
 	<servlet-mapping>
 		<servlet-name>WikiRedirect</servlet-name>
-		<url-pattern>/*</url-pattern>
+		<url-pattern>/redirect/*</url-pattern>
 	</servlet-mapping>
 </web-app>

Added: labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/images/bkgblur_right.gif
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/images/bkgblur_right.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/images/bookmark_bkg.jpg
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/images/bookmark_bkg.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/images/bookmark_blur_bottom.gif
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/images/bookmark_blur_bottom.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/newlocation.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/newlocation.jsp	2008-10-09 15:59:08 UTC (rev 23399)
+++ labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/web/newlocation.jsp	2008-10-09 16:26:07 UTC (rev 23400)
@@ -22,7 +22,7 @@
 	clear:both;
 	margin: 0px auto;
 	background-color:#FFFFFF;
-	background-image:url(images/bkgblur_right.gif);
+	background-image:url(/wiki-redirect/images/bkgblur_right.gif);
 	background-repeat:repeat-y;
 	background-position:right;
 	width: 666px;
@@ -31,7 +31,7 @@
 
 #content {
 	background-repeat: no-repeat;
-	background-image:url(images/bookmark_bkg.jpg);
+	background-image:url(/wiki-redirect/images/bookmark_bkg.jpg);
 	background-position: 10px 15px;
 	padding: 210px 20px 20px 270px;
 	display: block;
@@ -46,7 +46,7 @@
 	text-align:center;
 	color:#a1a1a1;
 	font-size:10px;
-	background-image:url(images/bookmark_blur_bottom.gif);
+	background-image:url(/wiki-redirect/images/bookmark_blur_bottom.gif);
 	background-repeat:no-repeat;
 	background-position:top center;
 	background-color:#e6e7e8;

Modified: labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/target/classes/org/jboss/wiki/redirect/WikiToClearspaceRedirect.class
===================================================================
(Binary files differ)