0.4.1 リリース

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>org.support-project</groupId>
 	<artifactId>knowledge</artifactId>
 	<packaging>war</packaging>
-	<version>0.4.0</version>
+	<version>0.4.1</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.0</version>
+			<version>0.4.1</version>
 		</dependency>
 
 		<dependency>

src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java

@@ -231,6 +231,7 @@ public Boundary like() throws InvalidParamException {
 	 * @return
 	 */
 	public Boundary escape(KnowledgesEntity entity) {
+		super.setSendEscapeHtml(false);
 		return super.send(entity);
 	}
 

src/main/java/org/support/project/knowledge/searcher/impl/LuceneSearcher.java

@@ -36,6 +36,7 @@
 import org.support.project.common.config.ConfigLoader;
 import org.support.project.common.log.Log;
 import org.support.project.common.log.LogFactory;
+import org.support.project.common.util.HtmlUtils;
 import org.support.project.common.util.StringUtils;
 import org.support.project.knowledge.config.AppConfig;
 import org.support.project.knowledge.config.IndexType;
@@ -156,12 +157,21 @@ private Query structQuery(final SearchingValue value) throws ParseException {
 
 			QueryParser queryParser = new QueryParser(Version.LUCENE_4_10_2, FIELD_LABEL_TITLE, analyzer);
 			queryParser.setDefaultOperator(Operator.OR);
-			Query query = queryParser.parse(value.getKeyword());
+			Query query;
+			try {
+				query = queryParser.parse(value.getKeyword());
+			} catch (org.apache.lucene.queryparser.classic.ParseException e) {
+				query = queryParser.parse(value.getKeyword().replaceAll("/", ""));
+			}
 			miniContainer.add(query, BooleanClause.Occur.SHOULD);
 
 			queryParser = new QueryParser(Version.LUCENE_4_10_2, FIELD_LABEL_CONTENTS, analyzer);
 			queryParser.setDefaultOperator(Operator.OR);
-			query = queryParser.parse(value.getKeyword());
+			try {
+				query = queryParser.parse(value.getKeyword());
+			} catch (org.apache.lucene.queryparser.classic.ParseException e) {
+				query = queryParser.parse(value.getKeyword().replaceAll("/", ""));
+			}
 			miniContainer.add(query, BooleanClause.Occur.SHOULD);
 
 			container.add(miniContainer, BooleanClause.Occur.MUST);

src/main/resources/appresource.properties

@@ -50,7 +50,7 @@ message.success.save.target={1} was Saved.
 message.allready.updated=Allready updated.
 
 # Common Label
-label.version=0.4.0
+label.version=0.4.1
 label.login=Sign in
 label.previous = Previous
 label.next=Next

src/main/resources/appresource_ja.properties

@@ -50,7 +50,7 @@ message.success.save.target={1} \u4fdd\u5b58\u3057\u307e\u3057\u305f\u3002
 message.allready.updated=\u3059\u3067\u306b\u66f4\u65b0\u3055\u308c\u3066\u3044\u307e\u3059
 
 # Common Label
-label.version=0.4.0
+label.version=0.4.1
 label.login=\u30b5\u30a4\u30f3\u30a4\u30f3
 label.previous = \u524d\u3078
 label.next = \u6b21\u3078

src/main/webapp/WEB-INF/views/admin/mail/config.jsp

@@ -36,11 +36,11 @@ function deleteMail() {
 
 	<div class="form-group">
 		<label for="host"><%= jspUtil.label("knowledge.mail.label.host") %></label>
-		<input type="text" class="form-control" name="host" id="host" placeholder="SMTP HOST" value="${host}" />
+		<input type="text" class="form-control" name="host" id="host" placeholder="SMTP HOST" value="<%= jspUtil.out("host") %>" />
 	</div>
 	<div class="form-group">
 		<label for="port"><%= jspUtil.label("knowledge.mail.label.port") %></label>
-		<input type="text" class="form-control" name="port" id="port" placeholder="SMTP PORT" value="${port}" />
+		<input type="text" class="form-control" name="port" id="port" placeholder="SMTP PORT" value="<%= jspUtil.out("port") %>" />
 	</div>
 	<div class="form-group">
 		<label for="authType_lock"><%= jspUtil.label("label.auth") %></label><br/>
@@ -57,22 +57,22 @@ function deleteMail() {
 	</div>
 	<div class="form-group">
 		<label for="smtpId"><%= jspUtil.label("knowledge.mail.label.auth.id") %></label>
-		<input type="text" class="form-control" name="smtpId" id="smtpId" placeholder="SMTP ID" value="${smtpId}" />
+		<input type="text" class="form-control" name="smtpId" id="smtpId" placeholder="SMTP ID" value="<%= jspUtil.out("smtpId") %>" />
 	</div>
 	<div class="form-group">
 		<label for="smtpPassword"><%= jspUtil.label("knowledge.mail.label.auth.password") %></label>
-		<input type="password" class="form-control" name="smtpPassword" id="smtpPassword" placeholder="SMTP PASSWORD" value="${smtpPassword}" />
+		<input type="password" class="form-control" name="smtpPassword" id="smtpPassword" placeholder="SMTP PASSWORD" value="<%= jspUtil.out("smtpPassword") %>" />
 	</div>
 	<div class="form-group">
 		<label for="fromAddress"><%= jspUtil.label("knowledge.mail.label.auth.send.address") %></label>
-		<input type="text" class="form-control" name="fromAddress" id="fromAddress" placeholder="送信元アドレス" value="${fromAddress}" />
+		<input type="text" class="form-control" name="fromAddress" id="fromAddress" placeholder="送信元アドレス" value="<%= jspUtil.out("fromAddress") %>" />
 	</div>
 	<div class="form-group">
 		<label for="fromName"><%= jspUtil.label("knowledge.mail.label.auth.send.name") %></label>
-		<input type="text" class="form-control" name="fromName" id="fromName" placeholder="送信者名" value="${fromName}" />
+		<input type="text" class="form-control" name="fromName" id="fromName" placeholder="送信者名" value="<%= jspUtil.out("fromName") %>" />
 	</div>
 
-	<input type="hidden" name="systemName" value="${systemName}" />
+	<input type="hidden" name="systemName" value="<%= jspUtil.out("systemName") %>" />
 
 	<button type="submit" class="btn btn-primary"><i class="fa fa-save"></i>&nbsp;<%= jspUtil.label("label.save") %></button>
 	<button type="button" class="btn btn-danger" onclick="deleteMail();"><i class="fa fa-remove"></i>&nbsp;<%= jspUtil.label("label.delete") %></button>

src/main/webapp/WEB-INF/views/admin/users/accept_list.jsp

@@ -24,10 +24,10 @@
 
 <c:forEach var="entry" items="${entries}" varStatus="status">
 	<div class="list-group-item">
-		<a href="<%= request.getContextPath() %>/admin.users/accept/${entry.id}" class="btn btn-primary">
+		<a href="<%= request.getContextPath() %>/admin.users/accept/<%= jspUtil.out("entry.id") %>" class="btn btn-primary">
 			<i class="fa fa-gavel"></i>&nbsp;<%= jspUtil.label("knowledge.accept.label.accept") %>
 		</a>
-		<h4 class="list-group-item-heading">${entry.userName} (${entry.userKey})</h4>
+		<h4 class="list-group-item-heading"><%= jspUtil.out("entry.userName") %> (<%= jspUtil.out("entry.userKey") %>)</h4>
 		<p class="list-group-item-text">
 		<%= jspUtil.label("label.regist.datetime") %>
 			<i class="fa fa-calendar"></i>&nbsp;<%= jspUtil.date("user.insertDatetime")%> / 

src/main/webapp/WEB-INF/views/admin/users/list.jsp

@@ -19,15 +19,15 @@
 <nav>
 	<ul class="pager">
 		<li class="previous">
-			<a href="<%= request.getContextPath() %>/admin.users/list/${previous}"><span aria-hidden="true">&larr;</span>
+			<a href="<%= request.getContextPath() %>/admin.users/list/<%= jspUtil.out("previous") %>"><span aria-hidden="true">&larr;</span>
 			<%= jspUtil.label("label.previous") %></a>
 		</li>
 		<li >
-			<a href="<%= request.getContextPath() %>/admin.users/view_add?offset=${offset}"><i class="fa fa-plus-circle"></i>&nbsp;
+			<a href="<%= request.getContextPath() %>/admin.users/view_add?offset=<%= jspUtil.out("offset") %>"><i class="fa fa-plus-circle"></i>&nbsp;
 			<%= jspUtil.label("label.add") %></a>
 		</li>
 		<li class="next">
-			<a href="<%= request.getContextPath() %>/admin.users/list/${next}"><%= jspUtil.label("label.next") %>
+			<a href="<%= request.getContextPath() %>/admin.users/list/<%= jspUtil.out("next") %>"><%= jspUtil.label("label.next") %>
 			<span aria-hidden="true">&rarr;</span></a>
 		</li>
 	</ul>
@@ -40,8 +40,8 @@
 </c:if>
 
 <c:forEach var="user" items="${users}" varStatus="status">
-	<a href="<%= request.getContextPath() %>/admin.users/view_edit/${user.userId}?offset=${offset}" class="list-group-item">
-		<h4 class="list-group-item-heading">${user.userName} (${user.userKey})</h4>
+	<a href="<%= request.getContextPath() %>/admin.users/view_edit/<%= jspUtil.out("user.userId") %>?offset=<%= jspUtil.out("offset") %>" class="list-group-item">
+		<h4 class="list-group-item-heading"><%= jspUtil.out("user.userName") %> (<%= jspUtil.out("user.userKey") %>)</h4>
 		<p class="list-group-item-text">
 		<%= jspUtil.label("label.regist.datetime") %> / <%= jspUtil.label("label.update.datetime") %>
 			<i class="fa fa-calendar"></i>&nbsp;<%= jspUtil.date("user.insertDatetime")%> / 
@@ -56,15 +56,15 @@
 <nav>
 	<ul class="pager">
 		<li class="previous">
-			<a href="<%= request.getContextPath() %>/admin.users/list/${previous}"><span aria-hidden="true">&larr;</span>
+			<a href="<%= request.getContextPath() %>/admin.users/list/<%= jspUtil.out("previous") %>"><span aria-hidden="true">&larr;</span>
 			<%= jspUtil.label("label.previous") %></a>
 		</li>
 		<li >
-			<a href="<%= request.getContextPath() %>/admin.users/view_add?offset=${offset}"><i class="fa fa-plus-circle"></i>&nbsp;
+			<a href="<%= request.getContextPath() %>/admin.users/view_add?offset=<%= jspUtil.out("offset") %>"><i class="fa fa-plus-circle"></i>&nbsp;
 			<%= jspUtil.label("label.add") %></a>
 		</li>
 		<li class="next">
-			<a href="<%= request.getContextPath() %>/admin.users/list/${next}"><%= jspUtil.label("label.next") %>
+			<a href="<%= request.getContextPath() %>/admin.users/list/<%= jspUtil.out("next") %>"><%= jspUtil.label("label.next") %>
 			<span aria-hidden="true">&rarr;</span></a>
 		</li>
 	</ul>

src/main/webapp/WEB-INF/views/admin/users/view_add.jsp

@@ -25,42 +25,43 @@
 
 	<div class="form-group">
 		<label for="userKey"><%= jspUtil.label("knowledge.signup.label.mail") %></label>
-		<input type="text" class="form-control" name="userKey" id="userKey" placeholder="Mail Address" value="${userKey}" />
+		<input type="text" class="form-control" name="userKey" id="userKey" placeholder="Mail Address" value="<%= jspUtil.out("userKey") %>" />
 	</div>
 	<div class="form-group">
 		<label for="userName"><%= jspUtil.label("knowledge.signup.label.name") %></label>
-		<input type="text" class="form-control" name="userName" id="userName" placeholder="User Name" value="${userName}" />
+		<input type="text" class="form-control" name="userName" id="userName" placeholder="User Name" value="<%= jspUtil.out("userName") %>" />
 	</div>
 
 	<div class="form-group">
 		<label for="password"><%= jspUtil.label("knowledge.signup.label.password") %></label>
-		<input type="password" class="form-control" name="password" id="password" placeholder="Password" value="${password}" />
+		<input type="password" class="form-control" name="password" id="password" placeholder="Password" value="<%= jspUtil.out("password") %>" />
 	</div>
 	<div class="form-group">
 		<label for="confirm_password"><%= jspUtil.label("knowledge.signup.label.confirm.password") %></label>
-		<input type="password" class="form-control" name="confirm_password" id="confirm_password" placeholder="Confirm Password" value="${confirm_password}" />
+		<input type="password" class="form-control" name="confirm_password" id="confirm_password"
+			placeholder="Confirm Password" value="<%= jspUtil.out("confirm_password") %>" />
 	</div>
 
 	<div class="form-group">
 		<label for="role_${role.roleId}"><%= jspUtil.label("label.role") %></label><br/>
 		<c:forEach var="role" items="${systemRoles}" varStatus="status">		
 		<label class="radio-inline">
-			<input type="checkbox" value="${role.roleKey}" name="roles" 
+			<input type="checkbox" value="<%= jspUtil.out("role.roleKey") %>" name="roles" 
 				id="role_${role.roleId}" <% 
 					if (jspUtil.getValue("role", Roles.class).isChecked()) {
 						out.write("checked=\"checked\"");
 					} 
 				%>/>
-			${role.roleName}
+			<%= jspUtil.out("role.roleName") %>
 		</label>
 		</c:forEach>
 	</div>
 
-	<input type="hidden" name="offset" value="${offset}" />
+	<input type="hidden" name="offset" value="<%= jspUtil.out("offset") %>" />
 
 
 	<button type="submit" class="btn btn-primary"><i class="fa fa-save"></i>&nbsp;<%= jspUtil.label("label.registration") %></button>
-	<a href="<%= request.getContextPath() %>/admin.users/list/${offset}"
+	<a href="<%= request.getContextPath() %>/admin.users/list/<%= jspUtil.out("offset") %>"
 	class="btn btn-success" role="button"><i class="fa fa-list-ul"></i>&nbsp;<%= jspUtil.label("label.backlist") %></a>
 
 </form>

src/main/webapp/WEB-INF/views/admin/users/view_edit.jsp

@@ -35,33 +35,33 @@ function deleteUser() {
 
 	<div class="form-group">
 		<label for="userKey"><%= jspUtil.label("knowledge.signup.label.mail") %></label>
-		<input type="text" class="form-control" name="userKey" id="userKey" placeholder="Mail Address" value="${userKey}" />
+		<input type="text" class="form-control" name="userKey" id="userKey" placeholder="Mail Address" value="<%= jspUtil.out("userKey") %>" />
 	</div>
 	<div class="form-group">
 		<label for="userName"><%= jspUtil.label("knowledge.signup.label.name") %></label>
-		<input type="text" class="form-control" name="userName" id="userName" placeholder="User Name" value="${userName}" />
+		<input type="text" class="form-control" name="userName" id="userName" placeholder="User Name" value="<%= jspUtil.out("userName") %>" />
 	</div>
 
 	<div class="form-group">
 		<label for="password"><%= jspUtil.label("knowledge.signup.label.password") %><%= jspUtil.label("knowledge.account.label.password.msg") %></label>
-		<input type="password" class="form-control" name="password" id="password" placeholder="Password" value="${password}" />
+		<input type="password" class="form-control" name="password" id="password" placeholder="Password" value="<%= jspUtil.out("password") %>" />
 	</div>
 	<div class="form-group">
 		<label for="confirm_password"><%= jspUtil.label("knowledge.signup.label.confirm.password") %></label>
-		<input type="password" class="form-control" name="confirm_password" id="confirm_password" placeholder="Confirm Password" value="${confirm_password}" />
+		<input type="password" class="form-control" name="confirm_password" id="confirm_password" placeholder="Confirm Password" value="<%= jspUtil.out("confirm_password") %>" />
 	</div>
 
 	<div class="form-group">
 		<label for="role_${role.roleId}"><%= jspUtil.label("label.role") %></label><br/>
 		<c:forEach var="role" items="${systemRoles}" varStatus="status">
 		<label class="radio-inline">
-			<input type="checkbox" value="${role.roleKey}" name="roles" 
+			<input type="checkbox" value="<%= jspUtil.out("role.roleKey") %>" name="roles" 
 				id="role_${role.roleId}" <% 
 					if (jspUtil.getValue("role", Roles.class).isChecked()) {
 						out.write("checked=\"checked\"");
 					} 
 				%>/>
-			${role.roleName}
+			<%= jspUtil.out("role.roleName") %>
 		</label>
 		</c:forEach>
 	</div>
@@ -74,12 +74,12 @@ function deleteUser() {
 		</p>
 	</div>
 
-	<input type="hidden" name="offset" value="${offset}" />
-	<input type="hidden" name="userId" value="${userId}" />
+	<input type="hidden" name="offset" value="<%= jspUtil.out("offset") %>" />
+	<input type="hidden" name="userId" value="<%= jspUtil.out("userId") %>" />
 
 	<button type="submit" class="btn btn-primary"><i class="fa fa-save"></i>&nbsp;<%= jspUtil.label("label.update") %></button>
 	<button type="button" class="btn btn-danger" onclick="deleteUser();"><i class="fa fa-remove"></i>&nbsp;<%= jspUtil.label("label.delete") %></button>
-	<a href="<%= request.getContextPath() %>/admin.users/list/${offset}"
+	<a href="<%= request.getContextPath() %>/admin.users/list/<%= jspUtil.out("offset") %>"
 	class="btn btn-success" role="button"><i class="fa fa-list-ul"></i>&nbsp;<%= jspUtil.label("label.backlist") %></a>
 
 </form>

src/main/webapp/WEB-INF/views/auth/form.jsp

@@ -48,19 +48,19 @@
 				<label for="inputEmail" class="control-label"><%= jspUtil.label("knowledge.auth.label.mail") %></label>
 				<div class="">
 				<input type="text" class="form-control"
-					name="username" value="${username}"
+					name="username" value="<%= jspUtil.out("username") %>"
 					placeholder="Email address" autofocus>
 				</div>
 			</div>
 			<div class="form-group">
 				<label for="inputPass" class="control-label"><%= jspUtil.label("knowledge.auth.label.password") %></label>
 				<div class="">
 				<input type="password" class="form-control"
-					name="password" value="${password}"
+					name="password" value="<%= jspUtil.out("password") %>"
 					placeholder="Password">
 				</div>
 			</div>
-			<input type="hidden" name="page" value="${page}" id="page">
+			<input type="hidden" name="page" value="<%= jspUtil.out("page") %>" id="page">
 
 			<div class="form-group">
 				<div class="">