diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f27dc3e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+.classpath
+.project
+.externalToolBuilders/
+.settings/
+*.class
+*.jar
+*.zip
+nbproject/
+build/
+dist/
diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..5f155c7
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="TalkjaSolr" default="default" basedir=".">
+    <description>Builds, tests, and runs the project TalkjaSolr.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties 
+      -post-init:                called after initialization of project properties 
+      -pre-compile:              called before javac compilation 
+      -post-compile:             called after javac compilation 
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-dist:                 called before archive building 
+      -post-dist:                called after archive building 
+      -post-clean:               called after cleaning build products 
+      -pre-run-deploy:           called before deploying
+      -post-run-deploy:          called after deploying
+
+    Example of pluging an obfuscator after the compilation could look like 
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Other way how to customize the build is by overriding existing main targets.
+    The target of interest are: 
+
+      init-macrodef-javac:    defines macro for javac compilation
+      init-macrodef-junit:   defines macro for junit execution
+      init-macrodef-debug:    defines macro for class debugging
+      do-dist:                archive building
+      run:                    execution of project 
+      javadoc-build:          javadoc generation 
+
+    Example of overriding the target for project execution could look like 
+
+        <target name="run" depends="<PROJNAME>-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that overridden target depends on jar target and not only on 
+    compile target as regular run target does. Again, for list of available 
+    properties which you can use check the target you are overriding in 
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>
diff --git a/src/conf/MANIFEST.MF b/src/conf/MANIFEST.MF
new file mode 100644
index 0000000..59499bc
--- /dev/null
+++ b/src/conf/MANIFEST.MF
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+
diff --git a/src/java/solrbook/client/servlet/Client.java b/src/java/solrbook/client/servlet/Client.java
new file mode 100644
index 0000000..041277e
--- /dev/null
+++ b/src/java/solrbook/client/servlet/Client.java
@@ -0,0 +1,28 @@
+package solrbook.client.servlet;
+
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.impl.HttpSolrServer;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrDocument;
+import org.apache.solr.common.SolrDocumentList;
+
+public class Client {
+    public static void main(String... args) throws Exception
+    {
+        final SolrServer solr = new HttpSolrServer("http://172.17.0.1:8983/solr/talkja");
+        final SolrQuery solrQuery = new SolrQuery();
+        solrQuery.set("q", ":");
+        final QueryResponse response = solr.query(solrQuery);
+        final SolrDocumentList results = response.getResults();
+        System.out.println(results.size());
+        for (SolrDocument document : results) {
+            System.out.println(document.get("url"));
+            System.out.println(document.get("id"));
+            
+            System.out.println(document.get("title"));
+            System.out.println(document.get("name"));
+            
+        }
+    }
+}
diff --git a/src/java/solrbook/client/servlet/SearchServlet.java b/src/java/solrbook/client/servlet/SearchServlet.java
new file mode 100644
index 0000000..a8ce105
--- /dev/null
+++ b/src/java/solrbook/client/servlet/SearchServlet.java
@@ -0,0 +1,173 @@
+/**
+ *
+ */
+package solrbook.client.servlet;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.HttpSolrServer;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.params.FacetParams;
+import org.apache.solr.common.params.HighlightParams;
+
+import solrbook.client.util.SearchUtil;
+
+/**
+ * @author $Author$
+ * 
+ */
+public class SearchServlet extends HttpServlet {
+
+  private SolrServer solrServer = null;
+
+  /*
+   * (非 Javadoc)
+   * 
+   * @see javax.servlet.GenericServlet#init(javax.servlet.ServletConfig)
+   */
+  @Override
+  public void init(ServletConfig config) throws ServletException {
+    super.init(config);
+
+    solrServer = new HttpSolrServer("http://172.17.0.1:8983/solr/talkja");
+
+  }
+
+  @Override
+  public void doPost(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+    doGet(request, response);
+  }
+
+  @Override
+  public void doGet(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+    doService(request, response);
+  }
+
+  @SuppressWarnings("CallToPrintStackTrace")
+  protected void doService(
+    HttpServletRequest request,
+    HttpServletResponse response) throws ServletException, IOException {
+
+    // 検索条件生成
+    SolrQuery query = createSolrQuery(request);
+
+    // 結果受け取り
+    QueryResponse rsp = null;
+    try {
+      rsp = solrServer.query(query);
+    } catch (SolrServerException sse) {
+      sse.printStackTrace();
+    }
+    request.setAttribute("rsp", rsp);
+
+    RequestDispatcher rd = request.getRequestDispatcher("/WEB-INF/jsp/search.jsp");
+    rd.forward(request, response);
+  }
+
+  private String getQueryString(HttpServletRequest request) {
+    String vStr = request.getParameter("query");
+    String queryStr = null;
+    if (vStr != null) {
+        try {
+            queryStr = new String(vStr.getBytes("8859_1"));
+        } catch (UnsupportedEncodingException ex) {
+            Logger.getLogger(SearchServlet.class.getName()).log(Level.SEVERE, null, ex);
+        }
+    }
+    request.setAttribute("query", queryStr);
+
+    if (StringUtils.isEmpty(queryStr)) {
+      queryStr = "*:*";
+    }
+
+    return queryStr;
+  }
+
+  private String getPerFieldParameterName(String field, String paramName) {
+    return "f." + field + "." + paramName;
+  }
+
+  private SolrQuery createSolrQuery(HttpServletRequest request) {
+    SolrQuery query = new SolrQuery();
+    query.setRows(10);
+    
+    // fl（取得フィールドの指定）
+    //query.setFields(SearchUtil.getFields());
+
+    // ハイライト
+    query.setHighlight(true);
+    query.addHighlightField(SearchUtil.getTitleHighlightField());
+    for (String field : SearchUtil.getSummaryHighlightFields()) {
+        query.addHighlightField(field);
+    }
+    query.setHighlightSnippets(1);
+    query.setHighlightSimplePre("<b style=\"background:aquamarine\">");
+    query.setHighlightSimplePost("</b>");
+    query.set(HighlightParams.USE_PHRASE_HIGHLIGHTER, true);
+    query.set(getPerFieldParameterName("title", HighlightParams.ALTERNATE_FIELD), "title");
+    query.set(getPerFieldParameterName("contents", HighlightParams.ALTERNATE_FIELD), "contents");
+    query.set(getPerFieldParameterName("contents", HighlightParams.ALTERNATE_FIELD_LENGTH), 1000);
+
+    // ファセット
+    /*
+    query.setFacet(true);
+    query.setFacetLimit(20);
+    query.setFacetMinCount(1);
+    query.setFacetSort(FacetParams.FACET_SORT_COUNT);
+    // ファセットフィールド
+    for (String field : SearchUtil.getFacetLabels().keySet()) {
+      query.addFacetField(field);
+    }
+    for (String category : SearchUtil.getFacetQueries().keySet()) {
+      for (int i = 0; i < SearchUtil.getFacetQueries().get(category).length; i++) {
+        query.addFacetQuery(SearchUtil.getFacetQueries().get(category)[i][0]);
+      }
+    }
+    
+    */
+
+    // 検索語の設定
+    String str = getQueryString(request);
+    if ((str != null) && str.trim().length() > 0) {
+        query.setQuery(str);    
+    }
+    
+    // start（取得開始位置）
+    int start = 0;
+    String startStr = request.getParameter("start");
+    if (!StringUtils.isEmpty(startStr)) {
+        try {
+            start = Integer.parseInt(startStr);
+            request.setAttribute("start", startStr);
+        }
+        catch (NumberFormatException nfe) {}
+    }
+
+    // fq（絞り込み条件の取得）
+    /*
+    String[] filterQueries = request.getParameterValues("fq");
+    if (filterQueries != null) {
+      query.addFilterQuery(filterQueries);
+    }
+    request.setAttribute("fq", filterQueries);
+    */
+
+    return query;
+  }
+}
diff --git a/src/java/solrbook/client/util/SearchUtil.java b/src/java/solrbook/client/util/SearchUtil.java
new file mode 100644
index 0000000..53e5fba
--- /dev/null
+++ b/src/java/solrbook/client/util/SearchUtil.java
@@ -0,0 +1,160 @@
+package solrbook.client.util;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * @author $Author$
+ * 
+ */
+public class SearchUtil {
+    public static final String ENCODING = "UTF-8";
+
+    private static HashMap<String, String[][]> facetQueries;
+
+    private static Map<String, String> facetLabels;
+
+    private static final String[] SUMMARY_HIGHLIGHT_FIELDS = {
+        "contents"
+    };
+
+    private static final String TITLE_HIGHLIGHT_FIELDS = "title";
+
+    private static final String[] FIELDS = {
+        "path",
+        "dir",
+        "url",
+        "id",
+        "title",
+        "name",
+        "date",
+        "contents"
+    };
+
+  /*
+  static {
+    facetQueries = new HashMap<String, String[][]>();
+    String[][] yearsArr = { { "pub_date:[20090101 TO *]", "2009年以降" },
+
+    { "pub_date:[20080101 TO 20081231]", "2008年" },
+        { "pub_date:[20070101 TO 20071231]", "2007年" },
+        { "pub_date:[20060101 TO 20061231]", "2006年" },
+        { "pub_date:[20050101 TO 20051231]", "2005年" },
+        { "pub_date:[* TO 20041231]", "2004年以前" } };
+
+    //facetQueries.put("発売年", yearsArr);
+
+    facetLabels = new HashMap<String, String>();
+    facetLabels.put("date", "投稿日時");
+    facetLabels.put("author_facet", "著者");
+
+  }
+  */
+
+    /**
+     * @return summaryHighlightFields
+     */
+    public static String[] getSummaryHighlightFields() {
+        return SUMMARY_HIGHLIGHT_FIELDS;
+    }
+
+    /**
+     * @return titleHighlightField
+     */
+    public static String getTitleHighlightField() {
+        return TITLE_HIGHLIGHT_FIELDS;
+    }
+
+    /**
+     * @return fields
+     */
+    public static String[] getFields() {
+        return FIELDS;
+    }
+
+    public static HashMap<String, String[][]> getFacetQueries() {
+      return facetQueries;
+    }
+
+    public static Map<String, String> getFacetLabels() {
+      return facetLabels;
+    }
+
+    public static String getFacetLabel(String fieldName) {
+        String label = facetLabels.get(fieldName);
+        if (label == null)
+          label = fieldName;
+        return label;
+    }
+
+  public static String getLinkStr(
+    String query,
+    String[] filterQueries,
+    String filterValue,
+    int start) {
+    List<String> link = new ArrayList<>();
+
+    if (!StringUtils.isEmpty(query)) {
+      link.add(getUrlEncodedParam("query", query));
+    }
+
+    if (filterQueries != null && filterQueries.length > 0) {
+      for (String fq : filterQueries) {
+        if (!StringUtils.isEmpty(fq)) {
+          link.add(getUrlEncodedParam("fq", fq));
+        }
+      }
+    }
+
+    if (!StringUtils.isEmpty(filterValue)) {
+      link.add(getUrlEncodedParam("fq", filterValue));
+    }
+
+    if (start > 0) {
+      link.add("start=" + start);
+    }
+
+    String linkStr = "";
+    for (int i = 0; i < link.size(); i++) {
+      if (i == 0) {
+        linkStr += "?";
+      } else {
+        linkStr += "&";
+      }
+      linkStr += link.get(i);
+    }
+
+    return linkStr;
+  }
+
+  private static String getUrlEncodedParam(String paramName, String value) {
+    String tmp = "";
+    try {
+      tmp = paramName + "=" + URLEncoder.encode(value, ENCODING);
+    } catch (UnsupportedEncodingException uee) {
+    }
+    return tmp;
+  }
+
+    /*
+    public static int getFacetQueryTotalCount(
+      String queryLabelName,
+      Map<String, Integer> facetQueriesMap) {
+      int total = 0;
+      if (facetQueriesMap != null) {
+        String[][] queriesArray = SearchUtil.getFacetQueries().get(queryLabelName);
+        for (int i = 0; i < queriesArray.length; i++) {
+          if (facetQueriesMap.containsKey(queriesArray[i][0])) {
+            total += facetQueriesMap.get(queriesArray[i][0]).intValue();
+          }
+        }
+      }
+      return total;
+    }
+    */
+}
diff --git a/web/IconTarget.png b/web/IconTarget.png
new file mode 100644
index 0000000..33b715c
--- /dev/null
+++ b/web/IconTarget.png
Binary files differ
diff --git a/web/META-INF/MANIFEST.MF b/web/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..5f631a8
--- /dev/null
+++ b/web/META-INF/MANIFEST.MF
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.9.2
+Created-By: 1.7.0_45-b18 (Oracle Corporation)
+
diff --git a/web/WEB-INF/glassfish-web.xml b/web/WEB-INF/glassfish-web.xml
new file mode 100644
index 0000000..13e0059
--- /dev/null
+++ b/web/WEB-INF/glassfish-web.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
+<glassfish-web-app error-url="">
+  <class-loader delegate="true"/>
+  <jsp-config>
+    <property name="keepgenerated" value="true">
+      <description>Keep a copy of the generated servlet class' java code.</description>
+    </property>
+  </jsp-config>
+</glassfish-web-app>
diff --git a/web/WEB-INF/jsp/_document.jsp b/web/WEB-INF/jsp/_document.jsp
new file mode 100644
index 0000000..3f7f42c
--- /dev/null
+++ b/web/WEB-INF/jsp/_document.jsp
@@ -0,0 +1,48 @@
+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%
+Map<String, List<String>> highlighting = rsp.getHighlighting().get(document.getFirstValue("url"));
+String summary = "";
+String contents = "";
+boolean first = true;
+if(document.getFieldValues("contents") != null){
+  for(Object line : document.getFieldValues("contents")){
+    if(!first){
+      contents += ", ";
+    }else{
+      first = false;
+    }
+    contents += line.toString();
+  }
+}
+
+first = true;
+for(String field : SearchUtil.getSummaryHighlightFields()){
+  if(highlighting.get(field) != null){
+    for(String text : highlighting.get(field)){
+      if(!first){
+        summary += "...";
+      }else{
+        first = false;
+      }
+      summary += text;
+    }
+  }
+}
+String info = "";
+if(document.getFirstValue("id") != null){
+  info += "id："+document.getFirstValue("id");
+}
+if(document.getFirstValue("name") != null){
+  if(info.length() > 0){
+    info += " | ";
+  }
+  info += document.getFirstValue("name");
+}
+%>
+<h2><a href="<%=document.getFieldValue("url") %>"><%=highlighting.get("title").get(0) %></a></h2>
+<div class="articles"><%=summary%></div>
+<br/>
+<div class="articles"><%=StringEscapeUtils.escapeHtml(contents)%></div>
+
+<div class="articles"><%=StringEscapeUtils.escapeHtml(info) %></div>
+<hr/>
diff --git a/web/WEB-INF/jsp/_facet_field.jsp b/web/WEB-INF/jsp/_facet_field.jsp
new file mode 100644
index 0000000..ab4cc72
--- /dev/null
+++ b/web/WEB-INF/jsp/_facet_field.jsp
@@ -0,0 +1,19 @@
+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%
+if(facetField != null){
+  List<Count> facetCountList = facetField.getValues();
+%>
+<h2><%=SearchUtil.getFacetLabel(facetField.getName()) %></h2>
+<div id="<%=facetField.getName()%>">
+<%
+  if(facetCountList != null){
+    for(Count count : facetCountList){
+	String linkStr = SearchUtil.getLinkStr(query,fq, facetField.getName()+":"+count.getName(), 0);
+%>
+<a href="./index.html<%=linkStr%>"><%=StringEscapeUtils.escapeHtml(count.getName())%>(<%=count.getCount()%>)</a><br>
+<%
+    }
+  }
+}
+%>
+</div>
diff --git a/web/WEB-INF/jsp/_facet_queries.jsp b/web/WEB-INF/jsp/_facet_queries.jsp
new file mode 100644
index 0000000..3d4eb4c
--- /dev/null
+++ b/web/WEB-INF/jsp/_facet_queries.jsp
@@ -0,0 +1,23 @@
+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<% if(SearchUtil.getFacetQueryTotalCount(queryLabelName, rsp.getFacetQuery()) > 0){ %>
+<% String[][] queriesArray = SearchUtil.getFacetQueries().get(queryLabelName); %>
+<h2><%=queryLabelName %></h2>
+<div>
+<%
+Map<String, Integer> facetQueriesMap = rsp.getFacetQuery();
+if(facetQueriesMap != null){
+  for(int i=0;i<queriesArray.length;i++){
+    if(facetQueriesMap.containsKey(queriesArray[i][0])){
+      int count = facetQueriesMap.get(queriesArray[i][0]).intValue();
+      if(count > 0){
+        String linkStr = SearchUtil.getLinkStr(query,fq, queriesArray[i][0], 0);
+        %>
+        <a href="./index.html<%=linkStr%>"><%=queriesArray[i][1]%>(<%=count%>)</a><br>
+      <%
+        }
+      }
+    }
+  }
+}
+%>
+</div>
diff --git a/web/WEB-INF/jsp/_pagination.jsp b/web/WEB-INF/jsp/_pagination.jsp
new file mode 100644
index 0000000..f142d6f
--- /dev/null
+++ b/web/WEB-INF/jsp/_pagination.jsp
@@ -0,0 +1,52 @@
+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<div id="page">
+<%
+String p_head = "|&lt;&lt;先頭ページへ";
+String p_prev = "&lt;前へ";
+String p_next = "次へ&gt;";
+String p_tail = "末尾ページへ&gt;&gt;|";
+
+int wsiz = 10;
+int w1 = 5;
+int w2 = 5;
+
+int pcnt = (int)(found / rows + ( ( found % rows ) == 0 ? 0 : 1 ));
+int cpag = (int)(start / rows + 1);
+int wbgn = cpag - w1;
+int wend = cpag + w2;
+if( wbgn < 1 ){
+  wbgn = 1;
+  wend = wbgn + wsiz;
+  if( wend > pcnt + 1 ){
+    wend = pcnt + 1;
+  }
+}
+if( wend > pcnt + 1 ){
+  wend = pcnt + 1;
+  wbgn = wend - wsiz;
+  if( wbgn < 1 ){
+    wbgn = 1;
+  }
+}
+%>
+<% if( pcnt > 1 ){ %>
+<strong>Page</strong>
+  <% if( cpag > 1 ){ %>
+    <a href="./index.html<%=SearchUtil.getLinkStr(query,fq, null, 0)%>"><%=p_head%></a>&nbsp;&nbsp;&nbsp;
+    <a href="./index.html<%=SearchUtil.getLinkStr(query,fq, null, ((cpag-2)*rows))%>"><%=p_prev%></a>&nbsp;&nbsp;&nbsp;
+  <% } %>
+  &nbsp;
+  <% for(int i=wbgn;i<wend;i++){ %>
+    <% if(cpag == i){ %>
+      <%=i %>&nbsp;&nbsp;&nbsp;
+    <% }else{ %>
+      <a href="./index.html<%=SearchUtil.getLinkStr(query,fq, null, ((i-1)*rows))%>"><%=i %></a>&nbsp;&nbsp;&nbsp;
+    <% } %>
+  <% } %>
+  &nbsp;
+  <% if( cpag < pcnt ){ %>
+    <a href="./index.html<%=SearchUtil.getLinkStr(query,fq, null, (cpag*rows))%>"><%=p_next%></a>&nbsp;&nbsp;&nbsp;
+    <a href="./index.html<%=SearchUtil.getLinkStr(query,fq, null, ((pcnt-1)*rows))%>"><%=p_tail%></a>&nbsp;&nbsp;&nbsp;
+  <% } %>
+<% } %>
+</div>
diff --git a/web/WEB-INF/jsp/_result_header.jsp b/web/WEB-INF/jsp/_result_header.jsp
new file mode 100644
index 0000000..f78670f
--- /dev/null
+++ b/web/WEB-INF/jsp/_result_header.jsp
@@ -0,0 +1,14 @@
+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<div id="result_header">
+<%if(!StringUtils.isEmpty(query)){ %>
+  <b><%=StringEscapeUtils.escapeHtml(query)%></b> の検索結果&nbsp;&nbsp;&nbsp;
+<%}
+if(found > 0){%>
+  <b><%=found%></b> 件中
+  <b><%=start+1%></b> -
+  <b><%=start+rows > found ? found : start+rows%></b> 件目
+<%}else{ %>
+  <b>0</b> 件
+<%} %>
+( <%=qtime/1000%> 秒 )
+</div>
diff --git a/web/WEB-INF/jsp/search.jsp b/web/WEB-INF/jsp/search.jsp
new file mode 100644
index 0000000..e68510a
--- /dev/null
+++ b/web/WEB-INF/jsp/search.jsp
@@ -0,0 +1,223 @@
+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ page session="false"%>
+<%@page import="org.apache.solr.client.solrj.response.QueryResponse"%>
+<%@page import="org.apache.solr.client.solrj.response.FacetField"%>
+<%@page import="org.apache.solr.client.solrj.response.FacetField.Count"%>
+<%@page import="org.apache.solr.common.util.NamedList"%>
+<%@page import="org.apache.solr.common.SolrDocument"%>
+<%@page import="org.apache.commons.lang.StringUtils" %>
+<%@page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@page import="java.util.List"%>
+<%@page import="java.util.Map"%>
+
+<%@page import="solrbook.client.util.SearchUtil"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link media="screen" href="./style.css" type="text/css" rel="stylesheet" />
+<%
+QueryResponse rsp = (QueryResponse)request.getAttribute("rsp");
+String query = (String)request.getAttribute("query");
+String startStr = (String)request.getAttribute("start");
+String[] fq = (String[])request.getAttribute("fq");
+if(query == null){
+  query ="";
+}
+long found = 0;
+long start = 0;
+int rows = 10;
+int qtime = 0;
+if(rsp != null){
+    qtime = rsp.getQTime();
+
+    //start = rsp.getResults().getStart();
+    if (startStr != null) {
+        try {
+            start = Long.parseLong(startStr);
+        }
+        catch (NumberFormatException nfe) {
+            start = 0;
+        }
+    }
+
+    String rowsStr = (String)((NamedList)rsp.getResponseHeader().get("params")).get("rows");
+    try {
+        rows = Integer.parseInt(rowsStr);
+    }
+    catch (NumberFormatException nfe) {}
+    found = rsp.getResults().getNumFound();
+}
+
+if (!StringUtils.isEmpty(query)) {
+%>
+<title><%= StringEscapeUtils.escapeHtml(query) %>の検索結果</title>
+<%
+}
+else {
+%>
+<title>OSM Talk-ja 検索</title>
+<%
+}
+%>
+
+</head>
+<body onload="document.f1.query.focus();">
+<div id="wrap">
+    <div id="header">
+        <h1><a href="#">OSM Talk-ja 検索</a></h1>
+        <br/>
+        <form name="f1" action="index.html">
+            <input type="text" name="query" value="<%= StringEscapeUtils.escapeHtml(query) %>"/>
+            <input value="検索" type="submit"/>
+        </form>
+    </div>
+
+    <!-- %@include file="_result_header.jsp" % -->
+    <div id="result_header">
+<%
+if (!StringUtils.isEmpty(query)) {
+%>
+        <b><%= StringEscapeUtils.escapeHtml(query) %></b> の検索結果&nbsp;&nbsp;&nbsp;
+<%
+}
+if (found > 0) {
+%>
+        <b><%= found %></b> 件中
+        <b><%= start+1 %></b> -
+        <b><%= start+rows > found ? found : start+rows %></b> 件目
+<%
+}
+else {
+%>
+        <b>0</b> 件
+<%
+}
+%>
+        ( <%= qtime/1000 %> 秒 )
+    </div>
+
+    <div id="content">
+<%
+if (rsp != null) {
+    if (found == 0) { 
+%>
+        <b><%= StringEscapeUtils.escapeHtml(query) %></b> は見つかりませんでした。他の検索語で試してください。
+<%
+    }
+    else {
+%>
+        <div id="result" class="right">
+<%
+        for (SolrDocument document : rsp.getResults()) {
+            String info = "";
+            if(document.getFirstValue("id") != null){
+                info += document.getFirstValue("id");
+            }
+            if(document.getFirstValue("date") != null){
+                if(info.length() > 0){
+                    info += " | ";
+                }
+                info += document.getFirstValue("date");
+            }
+            if(document.getFirstValue("name") != null){
+                if(info.length() > 0){
+                    info += " | ";
+                }
+                info += document.getFirstValue("name");
+            }
+
+            String titleStr = "";
+            if (document.getFirstValue("title") != null) {
+                titleStr = (String)document.getFirstValue("title");
+            }
+%>
+            <h2><a href="<%= document.getFieldValue("url") %>"><img src="IconTarget.png"/><%= StringEscapeUtils.escapeHtml(titleStr) %></a></h2>
+            <h3><%= info %></h3>
+
+<%
+            if(!StringUtils.isEmpty(query)){
+                String contents = "";
+                boolean first = true;
+                if (document.getFieldValues("contents") != null){
+                    int i = 10;
+                    for (Object line : document.getFieldValues("contents")) {
+                        i--;
+                        if (i < 0) {
+                            break;
+                        }
+                        String str = line.toString();
+                        if ((str != null) && (str.trim().length() > 0)) {
+                            if (!first) {
+                                contents += " / ";
+                            }
+                            else {
+                                first = false;
+                            }
+                            contents += line.toString();
+                        }
+                    }
+                }
+%>
+            <div class="articles"><i><%= StringEscapeUtils.escapeHtml(contents) %></i></div>
+<%
+            }
+%>
+
+<%
+            String summary = "";
+            Map<String, List<String>> highlighting = rsp.getHighlighting().get(document.getFirstValue("url"));
+            boolean first = true;
+            for (String field : SearchUtil.getSummaryHighlightFields()){
+                if (highlighting.get(field) != null){
+                    for (String text : highlighting.get(field)){
+                        if (!first) {
+                            summary += "...";
+                        }
+                        else {
+                            first = false;
+                        }
+                        summary += text;
+                    }
+                }
+            }
+%>
+            <div class="articles"><%= summary %></div>
+            <br/>
+            <hr/>
+<%
+        }
+    }
+%>
+        </div><!-- end of #result -->
+
+        <div id="facet" class="left">
+        <%-- facet fields --%>
+<%
+    //for (FacetField facetField : rsp.getFacetFields()) {
+%>
+        <!-- %@include file="_facet_field.jsp"% -->
+<% 
+    //}
+%>
+
+        <%-- facet queries --%>
+        <!-- % for(String queryLabelName : SearchUtil.getFacetQueries().keySet()){ % -->
+        <!-- %@include file="_facet_queries.jsp"% -->
+        <!-- % } % -->
+        </div><!-- end of #facet -->
+<%
+}
+%>
+
+        <div style="CLEAR: both"></div>
+
+    </div><!-- end of #content -->
+
+    <%@include file="_pagination.jsp" %>
+
+    <div id="footer">powered by Apache Solr4.</div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/web/WEB-INF/jsp/search_1.jsp b/web/WEB-INF/jsp/search_1.jsp
new file mode 100644
index 0000000..af99e75
--- /dev/null
+++ b/web/WEB-INF/jsp/search_1.jsp
@@ -0,0 +1,223 @@
+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ page session="false"%>
+<%@page import="org.apache.solr.client.solrj.response.QueryResponse"%>
+<%@page import="org.apache.solr.client.solrj.response.FacetField"%>
+<%@page import="org.apache.solr.client.solrj.response.FacetField.Count"%>
+<%@page import="org.apache.solr.common.util.NamedList"%>
+<%@page import="org.apache.solr.common.SolrDocument"%>
+<%@page import="org.apache.commons.lang.StringUtils" %>
+<%@page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@page import="java.util.List"%>
+<%@page import="java.util.Map"%>
+
+<%@page import="solrbook.client.util.SearchUtil"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link media="screen" href="./style.css" type="text/css" rel="stylesheet" />
+<%
+QueryResponse rsp = (QueryResponse)request.getAttribute("rsp");
+String query = (String)request.getAttribute("query");
+String startStr = (String)request.getAttribute("start");
+String[] fq = (String[])request.getAttribute("fq");
+if(query == null){
+  query ="";
+}
+long found = 0;
+long start = 0;
+int rows = 10;
+int qtime = 0;
+if(rsp != null){
+    qtime = rsp.getQTime();
+
+    //start = rsp.getResults().getStart();
+    if (startStr != null) {
+        try {
+            start = Long.parseLong(startStr);
+        }
+        catch (NumberFormatException nfe) {
+            start = 0;
+        }
+    }
+
+    String rowsStr = (String)((NamedList)rsp.getResponseHeader().get("params")).get("rows");
+    try {
+        rows = Integer.parseInt(rowsStr);
+    }
+    catch (NumberFormatException nfe) {}
+    found = rsp.getResults().getNumFound();
+}
+
+if (!StringUtils.isEmpty(query)) {
+%>
+<title><%= StringEscapeUtils.escapeHtml(query) %>の検索結果</title>
+<%
+}
+else {
+%>
+<title>OSM Talk-ja 検索</title>
+<%
+}
+%>
+
+</head>
+<body onload="document.f1.query.focus();">
+<div id="wrap">
+    <div id="header">
+        <h1><a href="#">OSM Talk-ja 検索</a></h1>
+        <br/>
+        <form name="f1" action="index.html">
+            <input type="text" name="query" value="<%= StringEscapeUtils.escapeHtml(query) %>"/>
+            <input value="検索" type="submit"/>
+        </form>
+    </div>
+
+    <!-- %@include file="_result_header.jsp" % -->
+    <div id="result_header">
+<%
+if (!StringUtils.isEmpty(query)) {
+%>
+        <b><%= StringEscapeUtils.escapeHtml(query) %></b> の検索結果&nbsp;&nbsp;&nbsp;
+<%
+}
+if (found > 0) {
+%>
+        <b><%= found %></b> 件中
+        <b><%= start+1 %></b> -
+        <b><%= start+rows > found ? found : start+rows %></b> 件目
+<%
+}
+else {
+%>
+        <b>0</b> 件
+<%
+}
+%>
+        ( <%= qtime/1000 %> 秒 )
+    </div>
+
+    <div id="content">
+<%
+if (rsp != null) {
+    if (found == 0) { 
+%>
+        <b><%= StringEscapeUtils.escapeHtml(query) %></b> は見つかりませんでした。他の検索語で試してください。
+<%
+    }
+    else {
+%>
+        <div id="result" class="right">
+<%
+        for (SolrDocument document : rsp.getResults()) {
+            String info = "";
+            if(document.getFirstValue("id") != null){
+                info += document.getFirstValue("id");
+            }
+            if(document.getFirstValue("date") != null){
+                if(info.length() > 0){
+                    info += " | ";
+                }
+                info += document.getFirstValue("date");
+            }
+            if(document.getFirstValue("name") != null){
+                if(info.length() > 0){
+                    info += " | ";
+                }
+                info += document.getFirstValue("name");
+            }
+
+            String titleStr = "";
+            if (document.getFirstValue("title") != null) {
+                titleStr = (String)document.getFirstValue("title");
+            }
+%>
+            <h2><a href="<%= document.getFieldValue("url") %>"><img src="IconTarget.png"/><%= StringEscapeUtils.escapeHtml(titleStr) %></a></h2>
+            <h3><%= info %></h3>
+
+<%
+            if(!StringUtils.isEmpty(query)){
+                String contents = "";
+                boolean first = true;
+                if (document.getFieldValues("contents") != null){
+                    int i = 10;
+                    for (Object line : document.getFieldValues("contents")) {
+                        i--;
+                        if (i < 0) {
+                            break;
+                        }
+                        String str = line.toString();
+                        if ((str != null) && (str.trim().length() > 0)) {
+                            if (!first) {
+                                contents += " / ";
+                            }
+                            else {
+                                first = false;
+                            }
+                            contents += line.toString();
+                        }
+                    }
+                }
+%>
+            <div class="articles"><i><%= StringEscapeUtils.escapeHtml(contents) %></i></div>
+<%
+            }
+%>
+
+<%
+            String summary = "";
+            Map<String, List<String>> highlighting = rsp.getHighlighting().get(document.getFirstValue("url"));
+            boolean first = true;
+            for (String field : SearchUtil.getSummaryHighlightFields()){
+                if (highlighting.get(field) != null){
+                    for (String text : highlighting.get(field)){
+                        if (!first) {
+                            summary += "...";
+                        }
+                        else {
+                            first = false;
+                        }
+                        summary += text;
+                    }
+                }
+            }
+%>
+            <div class="articles"><%= summary %></div>
+            <br/>
+            <hr/>
+<%
+        }
+    }
+%>
+        </div><!-- end of #result -->
+
+        <div id="facet" class="left">
+        <%-- facet fields --%>
+<%
+    //for (FacetField facetField : rsp.getFacetFields()) {
+%>
+        <!-- %@include file="_facet_field.jsp"% -->
+<% 
+    //}
+%>
+
+        <%-- facet queries --%>
+        <!-- % for(String queryLabelName : SearchUtil.getFacetQueries().keySet()){ % -->
+        <!-- %@include file="_facet_queries.jsp"% -->
+        <!-- % } % -->
+        </div><!-- end of #facet -->
+<%
+}
+%>
+
+        <div style="CLEAR: both"></div>
+
+    </div><!-- end of #content -->
+
+    <%@include file="_pagination.jsp" %>
+
+    <div id="footer">powered by Apache Solr4.</div>
+</div>
+</body>
+</html>
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
new file mode 100644
index 0000000..89c8d40
--- /dev/null
+++ b/web/WEB-INF/web.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+		  http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+           version="2.5">
+
+
+    <display-name>SolrSample</display-name>
+
+    <!--==========================================================================
+                              Servlet定義
+      =========================================================================== -->
+    <!-- Top -->
+    <servlet>
+        <servlet-name>index</servlet-name>
+        <servlet-class>solrbook.client.servlet.SearchServlet</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>index</servlet-name>
+        <url-pattern>/index.html</url-pattern>
+    </servlet-mapping>
+
+    <!--==========================================================================
+        ウェルカムファイル定義
+        =========================================================================== -->
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+
+
+</web-app>
diff --git a/web/style.css b/web/style.css
new file mode 100644
index 0000000..ed3c127
--- /dev/null
+++ b/web/style.css
@@ -0,0 +1,123 @@
+* {
+    padding: 0;
+    margin: 0;
+} 
+
+body {
+background: #fff;
+font-family: 'ヒラギノ角ゴ Pro W3','Hiragino Kaku Gothic Pro','メイリオ',Meiryo,'ＭＳ Ｐゴシック',Arial,Helvetica,sans-serif;
+font-size: 12px;
+line-height: 18px;
+color: #333333;;
+}
+
+img { border: none; }
+a { color: #57626a; text-decoration: none; }
+a:hover { text-decoration: underline; color : #000; }
+
+em{
+background: aquamarine;
+font-weight: bold;
+}
+
+#wrap {
+margin: 0 auto;
+width: 800px;
+}
+
+#header { 
+padding: 10px 0 20px 0;
+}
+#header h1 {
+font-size: 26px;
+font-weight: 100;
+letter-spacing: -3px;
+padding: 12px 0 5px 10px;
+}
+#header h1 a {
+color: #57626a;
+text-decoration: none;
+}
+#header h1 a:hover {
+color: #57626a;
+text-decoration: none;
+}
+#header h2 {
+color: #ccc;
+font-size: 15px;
+font-weight: 100;
+padding: 0 0 0 11px;
+letter-spacing: -1px;
+line-height: 12px;
+}
+
+#content {
+padding: 10px 20px;
+}
+
+#result_header {
+background: #eee;
+border-top: 3px solid #57626a;
+margin-top: 20px;
+color: #333;
+font-size: 11px;
+padding: 10px;
+}
+
+.right {
+width: 568px;
+float: right;
+text-align: justify;
+}
+.right h2 {
+color: #FF4800;
+font-size: 20px;
+letter-spacing: -3px;
+font-weight: 100;
+padding : 10px 0 15px 0;
+}
+
+.left {
+width: 150px;
+float: left;
+padding: 10px;
+border-right: 1px solid #bbb;
+font-size: 12px;
+}
+.left ul {
+list-style-type: square;
+padding: 5px 10px 10px 20px;
+color: #57626a;
+}
+.left h2 {
+height: 30px;
+font-size: 14px;
+color: #666;
+line-height: 30px;
+font-weight: 600;
+}
+.left a { text-decoration: none }
+
+#footer {
+background: #eee;
+border-top: 3px solid #57626a;
+margin-top: 20px;
+text-align: center;
+color: #333;
+font-size: 11px;
+padding: 10px;
+}
+
+#page {
+margin:10px;
+text-align: center;
+padding:0px;
+}
+#page a {
+text-align:center;padding:3px 4px 2px 4px;
+text-decoration:none;font-weight:bold;color:#555555;
+border:1px solid #CCCCCC;background:#FFFFFF;
+}
+#page a:hover {background:#FFCC99;}
+#page a:visited {background:#FFFFFF;}
+#page a:active {background:#CCFFCC;}