[jboss-svn-commits] JBL Code SVN: r32335 - in labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src: main/java/org/jboss/labs/sbs/plugin/bm/dao and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Apr 1 07:01:22 EDT 2010
Author: lkrzyzanek
Date: 2010-04-01 07:01:21 -0400 (Thu, 01 Apr 2010)
New Revision: 32335
Modified:
labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManager.java
labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/dao/DbOldBlogsMappingDAO.java
labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/dao/OldBlogsMappingDAO.java
labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/plugin/schema.xml
labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/resources/oldBlogUsersMap.properties
labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManagerTest.java
Log:
Changed PRE to be decorated as JAVA
Changed old blogs <-> SBS mapping to be mapped to Blogs ID instead of URL.
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManager.java 2010-04-01 09:15:21 UTC (rev 32334)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManager.java 2010-04-01 11:01:21 UTC (rev 32335)
@@ -45,6 +45,7 @@
import com.jivesoftware.community.Blog;
import com.jivesoftware.community.BlogManager;
import com.jivesoftware.community.BlogPost;
+import com.jivesoftware.community.BlogPostNotFoundException;
import com.jivesoftware.community.renderer.impl.v2.HtmlRenderUtils;
import com.jivesoftware.community.renderer.impl.v2.JAXPUtils;
import com.jivesoftware.community.util.BlogUtils;
@@ -79,7 +80,7 @@
private Properties oldBlogUsersMap = null;
/** Cache for old blog posts to SBS URL mapping */
- private com.jivesoftware.community.cache.Cache<String, String> oldBlogPostsMappings;
+ private com.jivesoftware.community.cache.Cache<String, Long> oldBlogPostsMappings;
/**
* Filter only directories
@@ -109,16 +110,23 @@
@Override
public String getSBSURL(String oldBlogCode) {
- String url = oldBlogPostsMappings.get(oldBlogCode);
- if (url == null) {
+ Long postId = oldBlogPostsMappings.get(oldBlogCode);
+ if (postId == null) {
try {
- url = oldBlogsMappingDAO.getBlogPostMapping(oldBlogCode);
+ postId = oldBlogsMappingDAO.getBlogPostMapping(oldBlogCode);
} catch (EmptyResultDataAccessException e) {
return null;
}
- oldBlogPostsMappings.put(oldBlogCode, url);
+ oldBlogPostsMappings.put(oldBlogCode, postId);
}
- return url;
+ BlogPost post;
+ try {
+ post = blogManager.getBlogPost(postId);
+ } catch (BlogPostNotFoundException e) {
+ return null;
+ }
+
+ return BlogUtils.getRelativePostLink(post);
}
@Override
@@ -195,7 +203,7 @@
BlogPost post = insertBlogEntry(userBlog, oldBlogEntry);
- oldBlogsMappingDAO.saveBlogMapping(oldBlogEntry.getCode(), BlogUtils.getRelativePostLink(post));
+ oldBlogsMappingDAO.saveBlogMapping(oldBlogEntry.getCode(), post.getID());
count++;
} catch (Exception e) {
@@ -332,7 +340,7 @@
}
}
String body = StringUtils.replaceAll(description.toString(), "<pre>",
- "<pre class=\"jive_text_macro jive_macro_code\" jivemacro=\"code\" ___default_attr=\"plain\">");
+ "<pre class=\"jive_text_macro jive_macro_code\" jivemacro=\"code\" ___default_attr=\"java\">");
bean.setBody(body);
br.close();
@@ -378,11 +386,11 @@
this.oldBlogsMappingDAO = oldBlogsMappingDAO;
}
- public void setOldBlogPostsMappings(com.jivesoftware.community.cache.Cache<String, String> oldBlogPostsMappings) {
+ public void setOldBlogPostsMappings(com.jivesoftware.community.cache.Cache<String, Long> oldBlogPostsMappings) {
this.oldBlogPostsMappings = oldBlogPostsMappings;
}
- public com.jivesoftware.community.cache.Cache<String, String> getOldBlogPostsMappings() {
+ public com.jivesoftware.community.cache.Cache<String, Long> getOldBlogPostsMappings() {
return oldBlogPostsMappings;
}
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/dao/DbOldBlogsMappingDAO.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/dao/DbOldBlogsMappingDAO.java 2010-04-01 09:15:21 UTC (rev 32334)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/dao/DbOldBlogsMappingDAO.java 2010-04-01 11:01:21 UTC (rev 32335)
@@ -39,17 +39,17 @@
*/
public class DbOldBlogsMappingDAO extends JiveJdbcDaoSupport implements OldBlogsMappingDAO {
- private static final String SELECT_POST_MAPPING = "SELECT sbs_url FROM oldBlogsPostsMapping WHERE post_code = ?";
+ private static final String SELECT_POST_MAPPING = "SELECT blogpostID FROM oldBlogsPostsMapping WHERE post_code = ?";
- private static final String INSERT_POST_MAPPING = "INSERT INTO oldBlogsPostsMapping (post_code, sbs_url) VALUES (?, ?)";
+ private static final String INSERT_POST_MAPPING = "INSERT INTO oldBlogsPostsMapping (post_code, blogpostID) VALUES (?, ?)";
@Override
- public String getBlogPostMapping(String blogPostCode) throws EmptyResultDataAccessException {
- return this.getSimpleJdbcTemplate().queryForObject(SELECT_POST_MAPPING, String.class, blogPostCode);
+ public Long getBlogPostMapping(String blogPostCode) throws EmptyResultDataAccessException {
+ return this.getSimpleJdbcTemplate().queryForLong(SELECT_POST_MAPPING, blogPostCode);
}
@Override
- public void saveBlogMapping(String blogPostCode, String sbsURL) {
+ public void saveBlogMapping(String blogPostCode, Long sbsURL) {
this.getSimpleJdbcTemplate().update(INSERT_POST_MAPPING, blogPostCode, sbsURL);
}
@@ -60,10 +60,10 @@
* @author <a href="mailto:lkrzyzan at redhat.com">Libor Krzyzanek</a>
*/
class TwoColumnsAsMapExtractor implements ResultSetExtractor {
- public Map<String, String> extractData(ResultSet rs) throws SQLException, DataAccessException {
- Map<String, String> result = new HashMap<String, String>();
+ public Map<String, Long> extractData(ResultSet rs) throws SQLException, DataAccessException {
+ Map<String, Long> result = new HashMap<String, Long>();
while (rs.next()) {
- result.put(rs.getString(1), rs.getString(2));
+ result.put(rs.getString(1), rs.getLong(2));
}
return result;
}
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/dao/OldBlogsMappingDAO.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/dao/OldBlogsMappingDAO.java 2010-04-01 09:15:21 UTC (rev 32334)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/dao/OldBlogsMappingDAO.java 2010-04-01 11:01:21 UTC (rev 32335)
@@ -23,8 +23,6 @@
import org.springframework.dao.EmptyResultDataAccessException;
-import com.jivesoftware.community.util.BlogUtils;
-
/**
* Interface for old blogs mapping to SBS content
*
@@ -40,15 +38,14 @@
* @return URL in SBS
* @throws EmptyResultDataAccessException
*/
- public String getBlogPostMapping(String blogPostCode) throws EmptyResultDataAccessException;
+ public Long getBlogPostMapping(String blogPostCode) throws EmptyResultDataAccessException;
/**
* Insert new blog post mapping
*
* @param blogPostCode
- * @param sbsURL
- * @see BlogUtils#getRelativePostLink(com.jivesoftware.community.BlogPost)
+ * @param blogpostID
*/
- public void saveBlogMapping(String blogPostCode, String sbsURL);
+ public void saveBlogMapping(String blogPostCode, Long blogpostID);
}
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/plugin/schema.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/plugin/schema.xml 2010-04-01 09:15:21 UTC (rev 32334)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/plugin/schema.xml 2010-04-01 11:01:21 UTC (rev 32335)
@@ -4,8 +4,8 @@
<table name="oldBlogsPostsMapping" description="Mapping of old Blogs Posts codes to SBS URLs">
<column name="post_code" type="varchar" size="255" nullable="false"
description="Primary key - Blog post code" />
- <column name="sbs_url" type="varchar" size="255" nullable="false"
- description="SBS relative URL" />
+ <column name="blogpostID" type="bigint" nullable="false"
+ description="SBS Blog post iD" />
<index type="primary" name="oldBlogsPostsMapping_pk" column="post_code" />
</table>
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/resources/oldBlogUsersMap.properties
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/resources/oldBlogUsersMap.properties 2010-04-01 09:15:21 UTC (rev 32334)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/resources/oldBlogUsersMap.properties 2010-04-01 11:01:21 UTC (rev 32335)
@@ -4,7 +4,7 @@
admin=admin
acoliver=acoliver at jboss.org
#TODO
-adarcy=
+adarcy=adarcy
aguizar=alex.guizar at jboss.com
alesj=alesj
arubinger=ALRubinger
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManagerTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManagerTest.java 2010-04-01 09:15:21 UTC (rev 32334)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManagerTest.java 2010-04-01 11:01:21 UTC (rev 32335)
@@ -64,7 +64,7 @@
+ "user1/pretest.meta"), "UTF-8");
final String emptyLine = "<p></p>" + DbOldBlogsManager.LINE_SEPARATOR;
assertEquals("<p>data</p>" + DbOldBlogsManager.LINE_SEPARATOR
- + "<pre class=\"jive_text_macro jive_macro_code\" jivemacro=\"code\" ___default_attr=\"plain\">"
+ + "<pre class=\"jive_text_macro jive_macro_code\" jivemacro=\"code\" ___default_attr=\"java\">"
+ DbOldBlogsManager.LINE_SEPARATOR + "<p> import java.lang.*;</p>"
+ DbOldBlogsManager.LINE_SEPARATOR + emptyLine + "<p> public class Test {</p>"
+ DbOldBlogsManager.LINE_SEPARATOR + emptyLine
More information about the jboss-svn-commits
mailing list