refactor to Hexagonal(api and spi)

fenglez · Oct 24, 2019 · d458dcd · d458dcd
1 parent c12f012
commit d458dcd
Show file tree

Hide file tree

Showing 530 changed files with 2,127 additions and 1,295 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,8 +50,8 @@ classes/com/jdon/jivejdon/repository/builder/ThreadRepositoryDao.class
 classes/com/jdon/jivejdon/repository/dao/sql/MessageDaoSql.class
 classes/com/jdon/jivejdon/service/imp/message/ForumMessageShell.class
 doc/tomcat/lib/jaas.jar
-report/TEST-com.jdon.jivejdon.repository.search.CompassTest.txt
-report/TEST-com.jdon.jivejdon.model.realtime.NotificationLocatorTest.txt
+report/TEST-com.jdon.jivejdon.infrastructure.repository.search.CompassTest.txt
+report/TEST-com.jdon.jivejdon.domain.model.realtime.NotificationLocatorTest.txt
 .classpath
 .factorypath
 .project
@@ -77,9 +77,9 @@ classes/com/jdon/jivejdon/repository/builder/ThreadRepositoryDao.class
 classes/com/jdon/jivejdon/repository/dao/sql/MessageDaoSql.class
 classes/com/jdon/jivejdon/service/imp/message/ForumMessageShell.class
 doc/tomcat/lib/jaas.jar
-report/TEST-com.jdon.jivejdon.model.realtime.NotificationLocatorTest.txt
+report/TEST-com.jdon.jivejdon.domain.model.realtime.NotificationLocatorTest.txt
 doc/tomcat/lib/jaas.jar
-report/TEST-com.jdon.jivejdon.repository.search.CompassTest.txt
+report/TEST-com.jdon.jivejdon.infrastructure.repository.search.CompassTest.txt
 /doc/tomcat/lib/jaas.jar
 .settings/
 application/blog/js/

diff --git a/application/404.jsp b/application/404.jsp
@@ -3,8 +3,8 @@
 <%@ page trimDirectiveWhitespaces="true" %>
 <%@page isELIgnored="false" %>
 <%@page import="com.jdon.controller.WebAppUtil,
-com.jdon.jivejdon.component.block.ErrorBlockerIF,com.jdon.jivejdon.component.email.EmailHelper" %>
-<%@ page import="com.jdon.jivejdon.component.email.EmailVO" %>
+com.jdon.jivejdon.spi.component.block.ErrorBlockerIF,com.jdon.jivejdon.spi.component.email.EmailHelper" %>
+<%@ page import="com.jdon.jivejdon.spi.component.email.EmailVO" %>
 <%
 ErrorBlockerIF errorBlocker = (ErrorBlockerIF) WebAppUtil.getComponentInstance("errorBlocker", this.getServletContext());
 if (errorBlocker.checkRate(request.getRemoteAddr(), 4)){

diff --git a/application/503.jsp b/application/503.jsp
@@ -7,7 +7,7 @@ response.setDateHeader("Expires", 0);
 %>
 
 <%@page import="com.jdon.controller.WebAppUtil,
-com.jdon.jivejdon.component.block.ErrorBlockerIF"%>
+com.jdon.jivejdon.spi.component.block.ErrorBlockerIF"%>
 <%
 ErrorBlockerIF errorBlocker = (ErrorBlockerIF) WebAppUtil.getComponentInstance("errorBlocker", this.getServletContext());
 if (errorBlocker.checkCount(request.getRemoteAddr(), 10)){

diff --git a/application/WEB-INF/struts-config.xml b/application/WEB-INF/struts-config.xml
@@ -21,23 +21,23 @@
 
   <plug-in className="com.jdon.strutsutil.InitPlugIn">
     <set-property property="modelmapping-config"  
-    value="com.jdon.jivejdon.model.models.xml" />
+    value="com.jdon.jivejdon.domain.model.models.xml" />
   </plug-in>
   <plug-in className="com.jdon.strutsutil.InitPlugIn">
     <set-property property="modelmapping-config"  
-    value="com.jdon.jivejdon.model.others.models.xml" />
+    value="com.jdon.jivejdon.domain.model.others.models.xml" />
   </plug-in>
   <plug-in className="com.jdon.strutsutil.InitPlugIn">
     <set-property property="modelmapping-config"  
-    value="com.jdon.jivejdon.component.managers.xml" />
+    value="com.jdon.jivejdon.spi.component.managers.xml" />
   </plug-in>
   <plug-in className="com.jdon.strutsutil.InitPlugIn">
     <set-property property="modelmapping-config"  
-    value="com.jdon.jivejdon.repository.repository.xml" />
+    value="com.jdon.jivejdon.infrastructure.repository.repository.xml" />
   </plug-in>
   <plug-in className="com.jdon.strutsutil.InitPlugIn">
     <set-property property="modelmapping-config"  
-    value="com.jdon.jivejdon.repository.dao.daos.xml" />
+    value="com.jdon.jivejdon.infrastructure.repository.dao.daos.xml" />
   </plug-in>  
   <plug-in className="com.jdon.strutsutil.InitPlugIn">
     <set-property property="modelmapping-config"  

diff --git a/application/account/NewAccountForm.jsp b/application/account/NewAccountForm.jsp
@@ -2,7 +2,7 @@
 <%@ taglib uri="struts-bean" prefix="bean" %>
 <%@ taglib uri="struts-html" prefix="html" %>
 <%@ page contentType="text/html; charset=UTF-8" %>
-<%@page import="com.jdon.jivejdon.component.block.ErrorBlockerIF"%>
+<%@page import="com.jdon.jivejdon.spi.component.block.ErrorBlockerIF"%>
 <%@page import="java.util.UUID"%>
 <%@page import="com.jdon.jivejdon.presentation.form.SkinUtils"%>
 <%

diff --git a/application/account/checkUser.jsp b/application/account/checkUser.jsp
@@ -6,7 +6,7 @@
 
 
 <%@page import="com.jdon.controller.WebAppUtil,
-com.jdon.jivejdon.service.account.AccountService"%>
+com.jdon.jivejdon.api.account.AccountService"%>
 
 <%
 String sessionId = request.getParameter("sessionId");

diff --git a/application/account/loginAJAX.jsp b/application/account/loginAJAX.jsp
@@ -24,8 +24,8 @@
 
 
 <%@page import="com.jdon.controller.WebAppUtil,
-              com.jdon.jivejdon.model.account.Account,
-              com.jdon.jivejdon.service.account.AccountService" %>
+              com.jdon.jivejdon.domain.model.account.Account,
+              com.jdon.jivejdon.api.account.AccountService" %>
 <%
   //need at first include IncludeTop.jsp
 //this jsp can save logined account all datas into request, if you inlude this jsp, you can get them. 

diff --git a/application/account/login_error.jsp b/application/account/login_error.jsp
@@ -5,7 +5,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 
 <%@page import="com.jdon.controller.WebAppUtil,
-com.jdon.jivejdon.component.block.ErrorBlockerIF"%>
+com.jdon.jivejdon.spi.component.block.ErrorBlockerIF"%>
 <%
 ErrorBlockerIF errorBlocker = (ErrorBlockerIF) WebAppUtil.getComponentInstance("errorBlocker", request);
 if (errorBlocker.checkCount(request.getRemoteAddr(), 5)){

diff --git a/application/account/protected/sub/sub.jsp b/application/account/protected/sub/sub.jsp
@@ -1,4 +1,4 @@
-<%@ page import="com.jdon.jivejdon.model.account.Account" %>
+<%@ page import="com.jdon.jivejdon.domain.model.account.Account" %>
 <%@ taglib uri="struts-logic" prefix="logic" %>
 <%@ taglib uri="struts-bean" prefix="bean" %>
 <%@ taglib uri="struts-html" prefix="html" %>

diff --git a/application/account/protected/sub/subAccountList.jsp b/application/account/protected/sub/subAccountList.jsp
@@ -1,4 +1,4 @@
-<%@ page import="com.jdon.jivejdon.model.account.Account" %>
+<%@ page import="com.jdon.jivejdon.domain.model.account.Account" %>
 <%@ taglib uri="struts-logic" prefix="logic" %>
 <%@ taglib uri="struts-bean" prefix="bean" %>
 <%@ taglib uri="struts-html" prefix="html" %>
@@ -80,16 +80,16 @@
 					<bean:write name="subscribed" property="name" />
 				</td>
 				<td class="contact" align="center" >
-				    <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.component.subscription.action.ShortMsgAction)" disabled="true"/>
+				    <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.spi.component.subscription.action.ShortMsgAction)" disabled="true"/>
 				</td>
 				<td class="contact" align="center" >
-				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.component.subscription.action.EmailAction)" disabled="true"/>
+				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.spi.component.subscription.action.EmailAction)" disabled="true"/>
 				</td>
 				<td class="contact" align="center" >
-				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.component.subscription.action.SinaWeiboAction)" disabled="true"/>
+				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.spi.component.subscription.action.SinaWeiboAction)" disabled="true"/>
 				</td>
 				<td class="contact" align="center" >
-				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.component.subscription.action.TecentWeiboAction)" disabled="true"/>
+				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.spi.component.subscription.action.TecentWeiboAction)" disabled="true"/>
 				</td>
 
 

diff --git a/application/account/protected/sub/subForumList.jsp b/application/account/protected/sub/subForumList.jsp
@@ -1,4 +1,4 @@
-<%@ page import="com.jdon.jivejdon.model.account.Account" %>
+<%@ page import="com.jdon.jivejdon.domain.model.account.Account" %>
 <%@ taglib uri="struts-logic" prefix="logic" %>
 <%@ taglib uri="struts-bean" prefix="bean" %>
 <%@ taglib uri="struts-html" prefix="html" %>
@@ -77,18 +77,18 @@
 					</a>
 				</td>
 				<td class="contact" align="center" >
-				    <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.component.subscription.action.ShortMsgAction)" disabled="true"/>
+				    <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.spi.component.subscription.action.ShortMsgAction)" disabled="true"/>
 				</td>
 				<td class="contact" align="center" >
-				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.component.subscription.action.EmailAction)" disabled="true"/>
+				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.spi.component.subscription.action.EmailAction)" disabled="true"/>
 				</td>
 
 				<td class="contact" align="center" >
-				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.component.subscription.action.SinaWeiboAction)" disabled="true"/>
+				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.spi.component.subscription.action.SinaWeiboAction)" disabled="true"/>
 				</td>
 
 				<td class="contact" align="center" >
-				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.component.subscription.action.TecentWeiboAction)" disabled="true"/>
+				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.spi.component.subscription.action.TecentWeiboAction)" disabled="true"/>
 				</td>
 
 			</tr>

diff --git a/application/account/protected/sub/subTagList.jsp b/application/account/protected/sub/subTagList.jsp
@@ -1,4 +1,4 @@
-<%@ page import="com.jdon.jivejdon.model.account.Account" %>
+<%@ page import="com.jdon.jivejdon.domain.model.account.Account" %>
 <%@ taglib uri="struts-logic" prefix="logic" %>
 <%@ taglib uri="struts-bean" prefix="bean" %>
 <%@ taglib uri="struts-html" prefix="html" %>
@@ -88,19 +88,19 @@
 				</td>
 
 				<td class="contact" align="center" >
-				    <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.component.subscription.action.ShortMsgAction)" disabled="true"/>
+				    <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.spi.component.subscription.action.ShortMsgAction)" disabled="true"/>
 				</td>
 
 				<td class="contact" align="center" >
-				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.component.subscription.action.EmailAction)" disabled="true"/>
+				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.spi.component.subscription.action.EmailAction)" disabled="true"/>
 				</td>
 
 				<td class="contact" align="center" >
-				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.component.subscription.action.SinaWeiboAction)" disabled="true"/>
+				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.spi.component.subscription.action.SinaWeiboAction)" disabled="true"/>
 				</td>
 
 			     <td class="contact" align="center" >
-				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.component.subscription.action.TecentWeiboAction)" disabled="true"/>
+				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.spi.component.subscription.action.TecentWeiboAction)" disabled="true"/>
 				</td>
 
 

diff --git a/application/account/protected/sub/subThreadList.jsp b/application/account/protected/sub/subThreadList.jsp
@@ -1,4 +1,4 @@
-<%@ page import="com.jdon.jivejdon.model.account.Account" %>
+<%@ page import="com.jdon.jivejdon.domain.model.account.Account" %>
 <%@ taglib uri="struts-logic" prefix="logic" %>
 <%@ taglib uri="struts-bean" prefix="bean" %>
 <%@ taglib uri="struts-html" prefix="html" %>
@@ -76,16 +76,16 @@
 					</a>
 				</td>
 				<td class="contact" align="center" >
-				    <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.component.subscription.action.ShortMsgAction)" disabled="true"/>
+				    <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.spi.component.subscription.action.ShortMsgAction)" disabled="true"/>
 				</td>
 				<td class="contact" align="center" >
-				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.component.subscription.action.EmailAction)" disabled="true"/>
+				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.spi.component.subscription.action.EmailAction)" disabled="true"/>
 				</td>
 				<td class="contact" align="center" >
-				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.component.subscription.action.SinaWeiboAction)" disabled="true"/>
+				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.spi.component.subscription.action.SinaWeiboAction)" disabled="true"/>
 				</td>
 		        <td class="contact" align="center" >
-				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.component.subscription.action.TecentWeiboAction)" disabled="true"/>
+				   <html:checkbox name="subscription" property="actionType(com.jdon.jivejdon.spi.component.subscription.action.TecentWeiboAction)" disabled="true"/>
 				</td>
 
 

diff --git a/application/account/register.jsp b/application/account/register.jsp
@@ -5,7 +5,7 @@
 
 
 <%@page import="com.jdon.controller.WebAppUtil,
-com.jdon.jivejdon.component.block.ErrorBlockerIF"%>
+com.jdon.jivejdon.spi.component.block.ErrorBlockerIF"%>
 <%
     ErrorBlockerIF errorBlocker = (ErrorBlockerIF) WebAppUtil.getComponentInstance("errorBlocker", this.getServletContext());
     if (errorBlocker.checkCount(request.getRemoteAddr(), 3)){

diff --git a/application/admin/filters/filters.jsp b/application/admin/filters/filters.jsp
@@ -151,7 +151,7 @@ function properties(theForm) {
                 <td width="20%">&nbsp;</td>
                 <td width="20%" nowrap>
 
-                     <%=com.jdon.jivejdon.model.message.output.beanutil.FiltersUtils.getPropertyHTML(filtersForm.getFiltersIndexed(i),  propertyDescriptor ) %>
+                     <%=com.jdon.jivejdon.domain.model.message.output.beanutil.FiltersUtils.getPropertyHTML(filtersForm.getFiltersIndexed(i),  propertyDescriptor ) %>
                 </td>
             </tr>
          </logic:iterate>

diff --git a/application/blog/header.jsp b/application/blog/header.jsp
@@ -1,4 +1,4 @@
-<%@ page import="com.jdon.jivejdon.model.account.Account" %>
+<%@ page import="com.jdon.jivejdon.domain.model.account.Account" %>
 <%@ taglib uri="struts-logic" prefix="logic" %>
 <%@ taglib uri="struts-bean" prefix="bean" %>
 <%@ taglib uri="struts-html" prefix="html" %>

diff --git a/application/common/503warn.jsp b/application/common/503warn.jsp
@@ -1,7 +1,7 @@
 <%@ page session="false" %>
 <%@ page trimDirectiveWhitespaces="true" %>
 <%@page import="com.jdon.controller.WebAppUtil,
-com.jdon.jivejdon.component.throttle.hitkey.CustomizedThrottle,com.jdon.jivejdon.component.throttle.hitkey.HitKeySame,com.jdon.jivejdon.component.throttle.hitkey.HitKeyIF"%>
+com.jdon.jivejdon.spi.component.throttle.hitkey.CustomizedThrottle,com.jdon.jivejdon.spi.component.throttle.hitkey.HitKeySame,com.jdon.jivejdon.spi.component.throttle.hitkey.HitKeyIF"%>
 
 <%
 	try{

diff --git a/application/common/loginAccount.jsp b/application/common/loginAccount.jsp
@@ -1,6 +1,6 @@
 <%@ page trimDirectiveWhitespaces="true" %>
-<%@page import="com.jdon.jivejdon.service.account.AccountService,
-              com.jdon.jivejdon.model.account.Account,
+<%@page import="com.jdon.jivejdon.api.account.AccountService,
+              com.jdon.jivejdon.domain.model.account.Account,
               com.jdon.controller.WebAppUtil" %>
 <%
 //need at first include IncludeTop.jsp

diff --git a/application/common/permError.jsp b/application/common/permError.jsp
@@ -6,7 +6,7 @@
 <%@ page import="java.io.*,java.util.*"%>
 
 <%@page import="com.jdon.controller.WebAppUtil,
-com.jdon.jivejdon.component.block.ErrorBlockerIF,com.jdon.jivejdon.component.email.*"%>
+com.jdon.jivejdon.spi.component.block.ErrorBlockerIF,com.jdon.jivejdon.spi.component.email.*"%>
 <%
    String isSendMail=(String)this.getServletContext().getAttribute(request.getRemoteAddr()+"500"); 
    if (isSendMail == null)

diff --git a/application/forum/feed/feedback.jsp b/application/forum/feed/feedback.jsp
@@ -5,7 +5,7 @@
 
 
 <%@page import="com.jdon.controller.WebAppUtil,
-com.jdon.jivejdon.component.block.ErrorBlockerIF"%>
+com.jdon.jivejdon.spi.component.block.ErrorBlockerIF"%>
 <%
 ErrorBlockerIF errorBlocker = (ErrorBlockerIF) WebAppUtil.getComponentInstance("errorBlocker", this.getServletContext());
 if (errorBlocker.checkCount(request.getRemoteAddr(), 3)){

diff --git a/application/forum/threadListCore.jsp b/application/forum/threadListCore.jsp
@@ -26,7 +26,7 @@
               </span>
 
             <%
-             com.jdon.jivejdon.model.ForumThread thread = (com.jdon.jivejdon.model.ForumThread)pageContext.getAttribute("forumThread");
+             com.jdon.jivejdon.domain.model.ForumThread thread = (com.jdon.jivejdon.domain.model.ForumThread)pageContext.getAttribute("forumThread");
              int bodylength = thread.getRootMessage().getMessageVO().getBody().length();
              java.text.DecimalFormat df  = new java.text.DecimalFormat("#.000");
              int bl = bodylength/1024;

diff --git a/application/forum/threadsPrevNext1.jsp b/application/forum/threadsPrevNext1.jsp
@@ -21,7 +21,7 @@
 <%
 java.util.ListIterator iter = (java.util.ListIterator)request.getAttribute("ThreadsPrevNext");
 if (iter.hasPrevious()){
-   com.jdon.jivejdon.model.ForumThread forumThreadPrev = (com.jdon.jivejdon.model.ForumThread)iter.previous();
+   com.jdon.jivejdon.domain.model.ForumThread forumThreadPrev = (com.jdon.jivejdon.domain.model.ForumThread)iter.previous();
    request.setAttribute("forumThreadPrev", forumThreadPrev);
   // advance the iterator pointer back to the original index   
    iter.next();
@@ -66,7 +66,7 @@ if (iter.hasPrevious()){
 if (iter.hasNext())
    iter.next();
 if (iter.hasNext()){
-   com.jdon.jivejdon.model.ForumThread forumThreadNext = (com.jdon.jivejdon.model.ForumThread)iter.next();
+   com.jdon.jivejdon.domain.model.ForumThread forumThreadNext = (com.jdon.jivejdon.domain.model.ForumThread)iter.next();
    request.setAttribute("forumThreadNext", forumThreadNext);
   %>
     <logic:notEmpty name="forumThreadNext" >

diff --git a/application/forum/threadsPrevNext2.jsp b/application/forum/threadsPrevNext2.jsp
@@ -12,7 +12,7 @@
 <%
 java.util.ListIterator iter2 = (java.util.ListIterator)request.getAttribute("ThreadsPrevNext2");
 if (iter2.hasPrevious()){
-   com.jdon.jivejdon.model.ForumThread forumThreadPrev = (com.jdon.jivejdon.model.ForumThread)iter2.previous();
+   com.jdon.jivejdon.domain.model.ForumThread forumThreadPrev = (com.jdon.jivejdon.domain.model.ForumThread)iter2.previous();
    request.setAttribute("forumThreadPrev", forumThreadPrev);
   // advance the iterator pointer back to the original index   
    iter2.next();
@@ -64,7 +64,7 @@ if (iter2.hasPrevious()){
 if (iter2.hasNext())
     iter2.next();
 if (iter2.hasNext()){
-   com.jdon.jivejdon.model.ForumThread forumThreadNext = (com.jdon.jivejdon.model.ForumThread)iter2.next();
+   com.jdon.jivejdon.domain.model.ForumThread forumThreadNext = (com.jdon.jivejdon.domain.model.ForumThread)iter2.next();
    request.setAttribute("forumThreadNext", forumThreadNext);
   %>
   <logic:notEmpty name="forumThreadNext" >

diff --git a/application/forum/threadsPrevNext3.jsp b/application/forum/threadsPrevNext3.jsp
@@ -21,7 +21,7 @@ if (iter3.hasPrevious()){
     <tr>
 	<td>上一篇:
         <%
-   com.jdon.jivejdon.model.ForumThread forumThreadPrev = (com.jdon.jivejdon.model.ForumThread)iter3.previous();
+   com.jdon.jivejdon.domain.model.ForumThread forumThreadPrev = (com.jdon.jivejdon.domain.model.ForumThread)iter3.previous();
    request.setAttribute("forumThreadPrev", forumThreadPrev);
   // advance the iterator pointer back to the original index   
    iter3.next();
@@ -42,7 +42,7 @@ if (iter3.hasNext()){
 %>
 	<td align="right">下一篇:
    <%
-   com.jdon.jivejdon.model.ForumThread forumThreadNext = (com.jdon.jivejdon.model.ForumThread)iter3.next();
+   com.jdon.jivejdon.domain.model.ForumThread forumThreadNext = (com.jdon.jivejdon.domain.model.ForumThread)iter3.next();
    request.setAttribute("forumThreadNext", forumThreadNext);
   %>
   <logic:notEmpty name="forumThreadNext" >

diff --git a/application/imageShowInHtml.jsp b/application/imageShowInHtml.jsp
@@ -2,7 +2,7 @@
     pageEncoding="utf-8"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <%@page import="com.jdon.controller.WebAppUtil,
-com.jdon.jivejdon.component.block.ErrorBlockerIF"%>
+com.jdon.jivejdon.spi.component.block.ErrorBlockerIF"%>
 <%
 ErrorBlockerIF errorBlocker = (ErrorBlockerIF) WebAppUtil.getComponentInstance("errorBlocker", this.getServletContext());
 if (errorBlocker.checkCount(request.getRemoteAddr(), 5)){

diff --git a/doc/install_cn.txt b/doc/install_cn.txt
@@ -105,7 +105,7 @@ note:
 替代myaspect.xml和web.xml 失效防止Spam功能。
 
 设置：
-起初设置要进入管理依据下面顺序安装下面过滤器 ,如果没有，添加过滤器类名，包括包名类名：com.jdon.jivejdon.model.message.output.html.ListStyle:
+起初设置要进入管理依据下面顺序安装下面过滤器 ,如果没有，添加过滤器类名，包括包名类名：com.jdon.jivejdon.domain.model.message.output.html.ListStyle:
 1.  HTMLFilter
 2 	ListStyle
 3 	CodeHighlighter
@@ -120,8 +120,8 @@ note:
 12 	AuthorNameFormat
 13 	QuoteRegexFilter
 14 	FontStyle
-15 com.jdon.jivejdon.model.message.output.linkurl.LinkUrlExtractor
-16 com.jdon.jivejdon.model.message.output.thumbnailUrl.ThumbnailExtractor
+15 com.jdon.jivejdon.domain.model.message.output.linkurl.LinkUrlExtractor
+16 com.jdon.jivejdon.domain.model.message.output.thumbnailUrl.ThumbnailExtractor
 
 
 ##############################################################################################