[jboss-svn-commits] JBL Code SVN: r32336 - in labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main: plugin and 1 other directory.

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

Author: lkrzyzanek
Date: 2010-04-01 08:34:10 -0400 (Thu, 01 Apr 2010)
New Revision: 32336

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/struts/RedirectOldBlogPostToSBSAction.java
   labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/plugin/struts.xml
Log:
Added url backward compatibility for users and feeds

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/struts/RedirectOldBlogPostToSBSAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/struts/RedirectOldBlogPostToSBSAction.java	2010-04-01 11:01:21 UTC (rev 32335)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/struts/RedirectOldBlogPostToSBSAction.java	2010-04-01 12:34:10 UTC (rev 32336)
@@ -37,20 +37,26 @@
   private String urlToRedirect = null;
 
   /** Old Blog code */
-  private String blogCode = null;
+  private String permalink = null;
 
+  /** username */
+  private String username = null;
+
   private OldBlogsManager oldBlogsManager;
 
   public static final String URL_NOT_DEFINED = "urlNotDefined";
 
-  @Override
-  public String execute() {
-    if (blogCode == null || blogCode.length() == 0) {
+  public String redirectPost() {
+    if (permalink == null || permalink.length() == 0) {
       return URL_NOT_DEFINED;
     }
 
-    urlToRedirect = oldBlogsManager.getSBSURL(blogCode);
+    if (permalink.endsWith(".txt")) {
+      permalink = permalink.substring(0, permalink.length() - 4);
+    }
 
+    urlToRedirect = oldBlogsManager.getSBSURL(permalink);
+
     if (urlToRedirect == null) {
       return NOTFOUND;
     }
@@ -58,6 +64,36 @@
     return SUCCESS;
   }
 
+  public String redirectUser() {
+    if (username == null || username.length() == 0) {
+      return URL_NOT_DEFINED;
+    }
+    String sbsUser = oldBlogsManager.getSBSUsername(username);
+
+    if (sbsUser == null) {
+      return NOTFOUND;
+    }
+
+    urlToRedirect = "/people/" + sbsUser + "/blog";
+
+    return SUCCESS;
+  }
+
+  public String redirectFeed() {
+    if (username == null || username.length() == 0) {
+      return URL_NOT_DEFINED;
+    }
+    String sbsUser = oldBlogsManager.getSBSUsername(username);
+
+    if (sbsUser == null) {
+      return NOTFOUND;
+    }
+
+    urlToRedirect = "/people/" + sbsUser + "/blog/feeds/posts";
+
+    return SUCCESS;
+  }
+
   public String getUrlToRedirect() {
     return urlToRedirect;
   }
@@ -66,14 +102,22 @@
     this.urlToRedirect = urlToRedirect;
   }
 
-  public String getBlogCode() {
-    return blogCode;
+  public String getPermalink() {
+    return permalink;
   }
 
-  public void setBlogCode(String blogCode) {
-    this.blogCode = blogCode;
+  public void setPermalink(String permalink) {
+    this.permalink = permalink;
   }
 
+  public String getUsername() {
+    return username;
+  }
+
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
   public void setOldBlogsManager(OldBlogsManager oldBlogsManager) {
     this.oldBlogsManager = oldBlogsManager;
   }

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/plugin/struts.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/plugin/struts.xml	2010-04-01 11:01:21 UTC (rev 32335)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/plugin/struts.xml	2010-04-01 12:34:10 UTC (rev 32336)
@@ -26,8 +26,8 @@
   </package>
 
   <package name="bm-actions" namespace="/bm" extends="community-actions">
-    <action name="redirect-to-sbs"
-      class="org.jboss.labs.sbs.plugin.bm.struts.RedirectOldBlogPostToSBSAction">
+    <action name="redirect-post-to-sbs"
+      class="org.jboss.labs.sbs.plugin.bm.struts.RedirectOldBlogPostToSBSAction" method="redirectPost">
       <result name="success" type="httpheader">
         <param name="status">301</param>
         <param name="headers.Location">${urlToRedirect}</param>
@@ -36,6 +36,30 @@
       <result name="input" type="redirect">/blogs</result>
       <result name="urlNotDefined" type="redirect">/blogs</result>
     </action>
+
+    <action name="redirect-user-to-sbs"
+      class="org.jboss.labs.sbs.plugin.bm.struts.RedirectOldBlogPostToSBSAction" method="redirectUser">
+      <result name="success" type="httpheader">
+        <param name="status">301</param>
+        <param name="headers.Location">${urlToRedirect}</param>
+        <param name="parse">true</param>
+      </result>
+      <result name="input" type="redirect">/people</result>
+      <result name="urlNotDefined" type="redirect">/people</result>
+    </action>
+
+    <action name="redirect-feed-to-sbs"
+      class="org.jboss.labs.sbs.plugin.bm.struts.RedirectOldBlogPostToSBSAction" method="redirectFeed">
+      <result name="success" type="httpheader">
+        <param name="status">301</param>
+        <param name="headers.Location">${urlToRedirect}</param>
+        <param name="parse">true</param>
+      </result>
+      <result name="input" type="redirect">/blogs/feeds</result>
+      <result name="urlNotDefined" type="redirect">/blogs/feeds</result>
+    </action>
+
+
   </package>