[jboss-svn-commits] JBL Code SVN: r23370 - labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/java/org/jboss/wiki/redirect.

Wed Oct 8 06:41:13 EDT 2008

Author: szimano
Date: 2008-10-08 06:41:13 -0400 (Wed, 08 Oct 2008)
New Revision: 23370

Modified:
   labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/java/org/jboss/wiki/redirect/WikiToClearspaceRedirect.java
Log:
page attribute

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-08 09:23:59 UTC (rev 23369)
+++ labs/jbosslabs/trunk/portal-extensions/jboss-wiki-redirect/src/java/org/jboss/wiki/redirect/WikiToClearspaceRedirect.java	2008-10-08 10:41:13 UTC (rev 23370)
@@ -18,40 +18,53 @@
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
-	
+
 	private Properties pagesMap;
-	
+
 	private String redirectTo;
-	
+
 	private static final String PROP_FILE = "propertiesFile";
-	
+
 	private static final String NEW_DOMAIN = "newDomain";
 
 	@Override
 	protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 			throws ServletException, IOException {
-		if (pagesMap == null || pagesMap.isEmpty() || redirectTo == null || redirectTo.length() == 0) {
+		if (pagesMap == null || pagesMap.isEmpty() || redirectTo == null
+				|| redirectTo.length() == 0) {
 			// wrong configuration. Send internal error
 			resp.sendError(500);
-			
+
 			return;
 		}
-		
+
 		if (req.getRequestURI().equals(req.getContextPath())) {
 			resp.sendRedirect(redirectTo);
 			return;
 		}
-		
-		String page = req.getRequestURI().substring(req.getContextPath().length() + 1);
-		
+
+		String page;
+
+		if (req.getAttribute("page") != null) {
+			page = (String)req.getAttribute("page");
+		} else {
+			page = req.getRequestURI().substring(
+					req.getContextPath().length() + 1);
+		}
+
 		if (pagesMap.containsKey(page)) {
-			String redirPage = redirectTo + "docs/" + pagesMap.getProperty(page);
-			
+			String redirPage = redirectTo + "docs/"
+					+ pagesMap.getProperty(page);
+
 			resp.setContentType("text/html");
 			resp.getWriter().write("<html><head>");
-			resp.getWriter().write("<meta http-equiv='refresh' content='5;url=");
+			resp.getWriter()
+					.write("<meta http-equiv='refresh' content='5;url=");
 			resp.getWriter().write(redirPage);
-			resp.getWriter().write("'/>\n</head><body>\n<h3>Please update bookmars</h3>\nNew address: <a href='");
+			resp
+					.getWriter()
+					.write(
+							"'/>\n</head><body>\n<h3>Please update bookmars</h3>\nNew address: <a href='");
 			resp.getWriter().write(redirPage);
 			resp.getWriter().write("'>");
 			resp.getWriter().write(redirPage);
@@ -68,11 +81,11 @@
 		redirectTo = config.getInitParameter(NEW_DOMAIN);
 		File propFile = new File(config.getInitParameter(PROP_FILE));
 		if (propFile.exists()) {
-			
+
 			FileInputStream fis = null;
 			try {
 				fis = new FileInputStream(propFile);
-				
+
 				pagesMap = new Properties();
 				pagesMap.load(fis);
 			} catch (FileNotFoundException e) {


