[jboss-svn-commits] JBL Code SVN: r23391 - in labs/jbosslabs/qa/portal-extensions: jboss-wiki-redirect and 2 other directories.

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

Author: unibrew
Date: 2008-10-09 09:02:53 -0400 (Thu, 09 Oct 2008)
New Revision: 23391

Modified:
   labs/jbosslabs/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/
   labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/java/org/jboss/wiki/redirect/WikiToClearspaceRedirect.java
   labs/jbosslabs/qa/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
svn merge -r 23342:23390 https://svn.jboss.org/repos/labs/labs/jbosslabs/trunk/portal-extensions .

Modified: labs/jbosslabs/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml	2008-10-09 12:11:41 UTC (rev 23390)
+++ labs/jbosslabs/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml	2008-10-09 13:02:53 UTC (rev 23391)
@@ -106,7 +106,7 @@
     <deployment>
         <if-exists>overwrite</if-exists>
         <instance>
-            <instance-id>FreezoneCommunityPageInstance</instance-id>
+            <instance-id>FreezoneHelpPageInstance</instance-id>
             <portlet-ref>FreezonePortlet</portlet-ref>
             <preferences>
                 <preference>
@@ -123,7 +123,7 @@
     <deployment>
         <if-exists>overwrite</if-exists>
         <instance>
-            <instance-id>FreezoneCommunityTitlePageInstance</instance-id>
+            <instance-id>FreezoneHelpTitlePageInstance</instance-id>
             <portlet-ref>FreezonePortlet</portlet-ref>
             <preferences>
                 <preference>
@@ -140,7 +140,7 @@
     <deployment>
         <if-exists>overwrite</if-exists>
         <instance>
-            <instance-id>FreezoneCommunityNavPageInstance</instance-id>
+            <instance-id>FreezoneHelpNavPageInstance</instance-id>
             <portlet-ref>FreezonePortlet</portlet-ref>
             <preferences>
                 <preference>


Property changes on: labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect
___________________________________________________________________
Name: svn:ignore
   + build
dist


Modified: labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/java/org/jboss/wiki/redirect/WikiToClearspaceRedirect.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/java/org/jboss/wiki/redirect/WikiToClearspaceRedirect.java	2008-10-09 12:11:41 UTC (rev 23390)
+++ labs/jbosslabs/qa/portal-extensions/jboss-wiki-redirect/src/java/org/jboss/wiki/redirect/WikiToClearspaceRedirect.java	2008-10-09 13:02:53 UTC (rev 23391)
@@ -18,44 +18,57 @@
 	 * 
 	 */
 	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);
+			resp.sendRedirect(redirectTo + "community/wiki");
 			return;
 		}
-		
-		String page = req.getRequestURI().substring(req.getContextPath().length() + 1);
-		
+
+		String page;
+
+		if (req.getParameter("page") != null) {
+			page = (String)req.getParameter("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);
-			resp.getWriter().write("</a>\n</body></html>");
+			resp.getWriter().write("</a>\n<br/><br/>Will redirect automaticaly in 5 seconds</body></html>");
 			resp.getWriter().close();
 		} else {
 			resp.sendError(404);
@@ -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) {

Modified: labs/jbosslabs/qa/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml	2008-10-09 12:11:41 UTC (rev 23390)
+++ labs/jbosslabs/qa/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml	2008-10-09 13:02:53 UTC (rev 23391)
@@ -290,20 +290,20 @@
 			</properties>
 
             <window>
-				<window-name>FreezoneCommunityTitleWindow</window-name>
-				<instance-ref>FreezoneCommunityTitlePageInstance</instance-ref>
+				<window-name>FreezoneHelpTitleWindow</window-name>
+				<instance-ref>FreezoneHelpTitlePageInstance</instance-ref>
 				<region>triple</region>
 				<height>0</height>
 			</window>
             <window>
-				<window-name>FreezoneCommunityNavWindow</window-name>
-				<instance-ref>FreezoneCommunityNavPageInstance</instance-ref>
+				<window-name>FreezoneHelpNavWindow</window-name>
+				<instance-ref>FreezoneHelpNavPageInstance</instance-ref>
 				<region>left1_6</region>
 				<height>0</height>
 			</window>
             <window>
-				<window-name>FreezoneCommunityWindow</window-name>
-				<instance-ref>FreezoneCommunityPageInstance</instance-ref>
+				<window-name>FreezoneHelpWindow</window-name>
+				<instance-ref>FreezoneHelpPageInstance</instance-ref>
 				<region>center5_6</region>
 				<height>0</height>
 			</window>