Merge pull request #14 from support-project/develop

marge on release 0.4.4 develop -> master
support-project · Feb 20, 2015 · e6a3f4c · e6a3f4c
2 parents fea6210 + 6fafe6a
commit e6a3f4c
Show file tree

Hide file tree

Showing 26 changed files with 527 additions and 226 deletions.
diff --git a/document/database/knowledge.a5er b/document/database/knowledge.a5er
@@ -97,14 +97,14 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,7735,2265,7597,R,R
+Position="MAIN",0,4383,2265,7690,R,R
 Dependence=0
 Caption=
 PName=
 LineMode=0
-Bar1=774
+Bar1=438
 Bar2=226
-Bar3=760
+Bar3=769
 TermPos1=R
 TermPos2=R
 
@@ -115,15 +115,15 @@ Comment=
 TableOption=
 Page=MAIN
 Left=100
-Top=1300
+Top=1350
 Field="NO","NO","bigint","NOT NULL",0,"","",$FFFFFFFF,"AUTO_INCREMENT"
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",,"","",$FFFFFFFF,""
 Index=IDX_LIKES_KNOWLEDGE_ID=0,KNOWLEDGE_ID
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150102013522
-Position="MAIN",100,1300
+Position="MAIN",100,1350
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -152,7 +152,7 @@ LName=コメント
 Comment=
 TableOption=
 Page=MAIN
-Left=1300
+Left=1500
 Top=1550
 Field="コメント番号","COMMENT_NO","bigint","NOT NULL",0,"","",$FFFFFFFF,"AUTO_INCREMENT"
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",,"","",$FFFFFFFF,""
@@ -162,7 +162,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150102013923
-Position="MAIN",1300,1550
+Position="MAIN",1500,1550
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -173,14 +173,14 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,7100,4465,3310,R,R
+Position="MAIN",0,7100,4465,3064,R,R
 Dependence=0
 Caption=
 PName=
 LineMode=0
 Bar1=710
 Bar2=446
-Bar3=331
+Bar3=306
 TermPos1=R
 TermPos2=R
 
@@ -190,7 +190,7 @@ LName=投票
 Comment=
 TableOption=
 Page=MAIN
-Left=1250
+Left=1500
 Top=1400
 Field="VOTE_NO","VOTE_NO","bigint","NOT NULL",0,"","",$FFFFFFFF,"AUTO_INCREMENT"
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",,"","",$FFFFFFFF,""
@@ -200,7 +200,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150102013835
-Position="MAIN",1250,1400,435,89
+Position="MAIN",1500,1400,435,89
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -229,7 +229,7 @@ LName=ナレッジの参照履歴
 Comment=
 TableOption=
 Page=MAIN
-Left=1150
+Left=1500
 Top=850
 Field="HISTORY_NO","HISTORY_NO","bigint","NOT NULL",0,"","",$FFFFFFFF,"AUTO_INCREMENT"
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",,"","",$FFFFFFFF,""
@@ -239,7 +239,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150102013703
-Position="MAIN",1150,850
+Position="MAIN",1500,850
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -267,7 +267,7 @@ LName=ストックしたナレッジ
 Comment=
 TableOption=
 Page=MAIN
-Left=1200
+Left=1500
 Top=1250
 Field="USER_ID","USER_ID","@INT","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",1,"","",$FFFFFFFF,""
@@ -276,7 +276,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20141222154849
-Position="MAIN",1200,1250
+Position="MAIN",1500,1250
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -304,15 +304,15 @@ LName=アクセス可能なグループ
 Comment=
 TableOption=
 Page=MAIN
-Left=1200
+Left=1500
 Top=1100
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="GROUP_ID","GROUP_ID","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20141222154841
-Position="MAIN",1200,1100
+Position="MAIN",1500,1100
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -341,15 +341,15 @@ LName=アクセス可能なユーザ
 Comment=
 TableOption=
 Page=MAIN
-Left=1200
+Left=1500
 Top=1000
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="USER_ID","USER_ID","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20141222154833
-Position="MAIN",1200,1000
+Position="MAIN",1500,1000
 
 [Relation]
 Entity1=TAGS
@@ -380,14 +380,14 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4572,7878,5351,R,R
+Position="MAIN",0,4572,7878,5786,R,R
 Dependence=1
 Caption=
 PName=
 LineMode=0
 Bar1=457
 Bar2=788
-Bar3=535
+Bar3=579
 TermPos1=R
 TermPos2=R
 
@@ -432,15 +432,15 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4961,5662,4736,R,R
+Position="MAIN",0,4744,5662,4756,R,R
 Dependence=1
 Caption=
 PName=
 ModifiedDateTime=20141222154815
 LineMode=0
-Bar1=496
+Bar1=474
 Bar2=566
-Bar3=474
+Bar3=476
 TermPos1=R
 TermPos2=R
 
@@ -451,7 +451,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=600
-Top=1600
+Top=1650
 Field="添付ファイル番号","FILE_NO","bigint","NOT NULL",0,"","",$FFFFFFFF,"AUTO_INCREMENT"
 Field="ナレッジID","KNOWLEDGE_ID","bigint",,,"","",$FFFFFFFF,""
 Field="ファイル名","FILE_NAME","@VARCHAR(256)",,,"","",$FFFFFFFF,""
@@ -463,25 +463,29 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150102013438
-Position="MAIN",600,1600
+Position="MAIN",600,1650
 
 [Entity]
 PName=KNOWLEDGES
 LName=ナレッジ
 Comment=
 TableOption=
 Page=MAIN
-Left=600
+Left=650
 Top=1300
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,"AUTO_INCREMENT"
 Field="タイトル","TITLE","@VARCHAR(1024)","NOT NULL",,"","",$FFFFFFFF,""
 Field="内容","CONTENT","text",,,"","",$FFFFFFFF,""
 Field="公開区分","PUBLIC_FLAG","@INT",,,"","",$FFFFFFFF,""
+Field="タグID一覧","TAG_IDS","@VARCHAR(1024)",,,"","",$FFFFFFFF,""
+Field="タグ名称一覧","TAG_NAMES","text",,,"","",$FFFFFFFF,""
+Field="いいね件数","LIKE_COUNT","bigint",,,"","",$FFFFFFFF,""
+Field="コメント件数","COMMENT_COUNT","@INT",,,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
-ModifiedDateTime=20150102012615
-Position="MAIN",600,1300
+ModifiedDateTime=20150219042038
+Position="MAIN",650,1300
 
 [Comment]
 Comment=knowledge
@@ -838,7 +842,7 @@ Page=Main
 Left=21
 Top=794
 Width=2203
-Height=1028
+Height=1148
 BrushColor=$DEB2C7
 BrushAlpha=50
 ShapeType=Rectangle

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>org.support-project</groupId>
 	<artifactId>knowledge</artifactId>
 	<packaging>war</packaging>
-	<version>0.4.3</version>
+	<version>0.4.4</version>
 	<name>webapp for knowledge</name>
 	<url>https://support-project.org/</url>
 
@@ -17,7 +17,7 @@
 		<dependency>
 			<groupId>org.support-project</groupId>
 			<artifactId>web</artifactId>
-			<version>0.4.3</version>
+			<version>0.4.4</version>
 		</dependency>
 
 		<dependency>

diff --git a/src/main/java/org/support/project/knowledge/control/admin/DatabaseControl.java b/src/main/java/org/support/project/knowledge/control/admin/DatabaseControl.java
@@ -7,12 +7,12 @@
 
 import org.apache.commons.fileupload.FileItem;
 import org.support.project.common.bean.ValidateError;
+import org.support.project.common.logic.H2DBServerLogic;
 import org.support.project.common.wrapper.FileInputStreamWithDeleteWrapper;
 import org.support.project.knowledge.control.Control;
 import org.support.project.knowledge.logic.DatabaseLogic;
 import org.support.project.web.annotation.Auth;
 import org.support.project.web.boundary.Boundary;
-import org.support.project.web.logic.H2DBServerLogic;
 
 public class DatabaseControl extends Control {