Update README.md

README typo fix.

.gitignore

@@ -14,6 +14,7 @@ project/plugins/project/
 .classpath
 .project
 .cache
+.settings
 
 # IntelliJ specific
 .idea/

README.md

@@ -6,20 +6,25 @@ GitBucket is the easily installable Github clone written with Scala.
 The current version of GitBucket provides a basic features below:
 
 - Public / Private Git repository (http access only)
-- Repository viewer (some advanced features are not implemented)
+- Repository viewer (some advanced features such as online file editing are not implemented)
+- Repository search (Code and Issues)
 - Wiki
 - Issues
+- Fork / Pull request
+- Mail notification
 - Activity timeline
 - User management (for Administrators)
+- Group (like Organization in Github)
+- LDAP integration
+- Gravatar support
 
 Following features are not implemented, but we will make them in the future release!
 
-- Fork and pull request
+- File editing in repository viewer
-- Search
+- Comment for the changeset
 - Network graph
-- Statics
+- Statistics
 - Watch / Star
-- Team management (like Organization in Github)
 
 If you want to try the development version of GitBucket, see the documentation for developers at [Wiki](https://github.com/takezoe/gitbucket/wiki).
 
@@ -27,44 +32,143 @@ Installation
 --------
 
 1. Download latest **gitbucket.war** from [the release page](https://github.com/takezoe/gitbucket/releases).
-2. Deploy it to the servlet container such as Tomcat or Jetty.
+2. Deploy it to the Servlet 3.0 container such as Tomcat 7.x, Jetty 8.x, GlassFish 3.x or higher.
 3. Access **http://[hostname]:[port]/gitbucket/** using your web browser.
 
+If you are using Gitbucket behind a webserver please make sure you have increased the **client_max_body_size** (on nignx)
+
 The default administrator account is **root** and password is **root**.
 
-To upgrade GitBucket, only replace gitbucket.war.
+or you can start GitBucket by `java -jar gitbucket.war` without servlet container. In this case, GitBucket URL is **http://[hostname]:8080/**. You can specify following options.
+
+- --port=[NUMBER]
+- --prefix=[CONTEXTPATH]
+- --host=[HOSTNAME]
+- --gitbucket.home=[DATA_DIR]
+
+To upgrade GitBucket, only replace gitbucket.war. All GitBucket data is stored in HOME/.gitbucket. So if you want to back up GitBucket data, copy this directory to the other disk.
+
+For Installation on Windows Server with IIS see [this wiki page](https://github.com/takezoe/gitbucket/wiki/Installation-on-IIS-and-Helicontech-Zoo)
+
+### Mac OS X
+On OS X, copy the [gitbucket.plist](https://raw.github.com/takezoe/gitbucket/master/contrib/macosx/gitbucket.plist) file to `~/Library/LaunchAgents/`
+
+Run the following commands in `Terminal` to
+
+- start gitbucket: `launchctl load ~/Library/LaunchAgents/gitbucket.plist`
+- stop gitbucket: `launchctl unload ~/Library/LaunchAgents/gitbucket.plist`
 
 Release Notes
 --------
+### 1.12 - 29 Mar 2014
+- SSH repository access is available
+- Allow users can create and management their groups
+- Git submodule support
+- Close issues via commit messages
+- Show repository description below the name on repository page
+- Fix presentation of the source viewer
+- Upgrade to sbt 0.13
+- Fix some bugs
+
+### 1.11.1 - 06 Mar 2014
+- Bug fix
+
+### 1.11 - 01 Mar 2014
+- Base URL for redirection, notification and repository URL box is configurable
+- Remove ```--https``` option because it's possible to substitute in the base url
+- Headline anchor is available for Markdown contents such as Wiki page
+- Improve H2 connectivity
+- Label is available for pull requests not only issues
+- Delete branch button is added
+- Repository icons are updated
+- Select lines of source code by URL hash like `#L10` or `#L10-L15` in repository viewer
+- Display reference to issue from others in comment list
+- Fix some bugs
+
+### 1.10 - 01 Feb 2014
+- Rename repository
+- Transfer repository owner
+- Change default data directory to `HOME/.gitbucket` from `HOME/gitbucket` to avoid problem like #243, but if data directory already exist at HOME/gitbucket, it continues being used.
+- Add LDAP display name attribute
+- Response performance improvement
+- Fix some bugs
+
+### 1.9 - 28 Dec 2013
+- Display GITBUCKET_HOME on the system settings page
+- Fix some bugs
+
+### 1.8 - 30 Nov 2013
+- Add user and group deletion
+- Improve pull request performance
+- Pull request synchronization (when source repository is updated after pull request, it's applied to the pull request)
+- LDAP StartTLS support
+- Enable hard wrapping in Markdown
+- Add new some options to specify the data directory. See details in [Wiki](https://github.com/takezoe/gitbucket/wiki/DirectoryStructure).
+- Fix some bugs
+
+### 1.7 - 26 Oct 2013
+- Support working on Java6 in embedded Jetty mode
+- Add `--host` option to bind specified host name in embedded Jetty mode
+- Add `--https=true` option to force https scheme when using embedded Jetty mode at the back of https proxy
+- Add full name as user property
+- Change link color for absent Wiki pages
+- Add ZIP download button to the repository viewer tab
+- Improve ZIP exporting performance
+- Expand issue and comment textarea for long text automatically
+- Add conflict detection in Wiki
+- Add reverting wiki page from history
+- Match committer to user name by email address
+- Mail notification sender is customizable
+- Add link to changeset in refs comment for issues
+- Fix some bugs
+
+### 1.6 - 1 Oct 2013
+- Web hook
+- Performance improvement for pull request
+- Executable war file
+- Specify suitable Content-Type for downloaded files in the repository viewer
+- Fix some bugs
+
+### 1.5 - 4 Sep 2013
+- Fork and pull request
+- LDAP authentication
+- Mail notification
+- Add an option to turn off the gravatar support
+- Add the branch tab in the repository viewer
+- Encoding auto detection for the file content in the repository viewer
+- Add favicon, header logo and icons for the timeline
+- Specify data directory via environment variable GITBUCKET_HOME
+- Fix some bugs
+
 ### 1.4 - 31 Jul 2013
-- Group management.
+- Group management
-- Repository search for code and issues.
+- Repository search for code and issues
-- Display user related issues on the dashboard.
+- Display user related issues on the dashboard
-- Display participants avatar of issues on the issue page.
+- Display participants avatar of issues on the issue page
-- Performance improvement for repository viewer.
+- Performance improvement for repository viewer
-- Alert by milestone due date.
+- Alert by milestone due date
-- H2 database administration console.
+- H2 database administration console
-- Fixed some bugs.
+- Fix some bugs
 
 ### 1.3 - 18 Jul 2013
-- Batch updating for issues.
+- Batch updating for issues
-- Display assigned user on issue list.
+- Display assigned user on issue list
-- User icon and Gravatar support.
+- User icon and Gravatar support
-- Convert @xxxx to link to the account page.
+- Convert @xxxx to link to the account page
-- Add copy to clipboard button for git clone URL.
+- Add copy to clipboard button for git clone URL
-- Allows multi-byte characters as wiki page name.
+- Allow multi-byte characters as wiki page name
-- Allows to create the empty repository.
+- Allow to create the empty repository
-- Fixed some bugs.
+- Fix some bugs
 
 ### 1.2 - 09 Jul 2013
-- Added activity timeline.
+- Add activity timeline
-- Bugfix for Git 1.8.1.5 or later.
+- Bugfix for Git 1.8.1.5 or later
-- Allows multi-byte characters as label.
+- Allow multi-byte characters as label
-- Fixed some bugs.
+- Fix some bugs
 
 ### 1.1 - 05 Jul 2013
-- Fixed some bugs.
+- Fix some bugs
-- Upgrade to JGit 3.0.
+- Upgrade to JGit 3.0
 
 ### 1.0 - 04 Jul 2013
-- This is a first public release.
+- This is a first public release

build.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<project name="gitbucket" default="all" basedir=".">
+
+  <property name="target.dir" value="target"/>
+  <property name="embed.classes.dir" value="${target.dir}/embed-classes"/>
+  <property name="jetty.dir" value="embed-jetty"/>
+  <property name="scala.version" value="2.10"/>
+  <property name="gitbucket.version" value="0.0.1"/>
+  <property name="jetty.version" value="8.1.8.v20121106"/>
+  <property name="servlet.version" value="3.0.0.v201112011016"/>
+
+  <condition property="sbt.exec" value="sbt.bat" else="sbt.sh">
+    <os family="windows" />
+  </condition>
+
+  <target name="clean">
+    <delete dir="${embed.classes.dir}"/>
+    <delete file="${target.dir}/scala-${scala.version}/gitbucket.war"/>
+  </target>
+
+  <target name="war" depends="clean">
+    <exec executable="${sbt.exec}" resolveexecutable="true" failonerror="true">
+      <arg line="clean compile test package" />
+    </exec>
+  </target>
+
+  <target name="embed" depends="war">
+    <mkdir dir="${embed.classes.dir}"/>
+
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/javax.servlet-${servlet.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-continuation-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-http-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-io-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-security-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-server-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-servlet-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-util-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-webapp-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-xml-${jetty.version}.jar" />
+
+    <zip destfile="${target.dir}/scala-${scala.version}/gitbucket_${scala.version}-${gitbucket.version}.war"
+         basedir="${embed.classes.dir}"
+         update = "true"
+         includes="javax/**,org/**"/>
+
+    <zip destfile="${target.dir}/scala-${scala.version}/gitbucket_${scala.version}-${gitbucket.version}.war"
+         basedir="${target.dir}/scala-${scala.version}/classes"
+         update = "true"
+         includes="JettyLauncher.class,HttpsSupportConnector.class"/>
+  </target>
+
+  <target name="rename" depends="embed">
+    <rename src="${target.dir}/scala-${scala.version}/gitbucket_${scala.version}-${gitbucket.version}.war"
+            dest="${target.dir}/scala-${scala.version}/gitbucket.war"/>
+  </target>
+
+  <target name="all" depends="rename">
+  </target>
+
+
+</project>

contrib/macosx/gitbucket.plist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>Label</key>
+    <string>gitbucket</string>
+    <key>ProgramArguments</key>
+    <array>
+      <string>/usr/bin/java</string>
+      <string>-Dmail.smtp.starttls.enable=true</string>
+      <string>-jar</string>
+      <string>gitbucket.war</string>
+      <string>--host=127.0.0.1</string>
+      <string>--port=8080</string>
+      <string>--https=true</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+  </dict>
+</plist>

contrib/redhat/gitbucket.conf

@@ -0,0 +1,17 @@
+# Bind host
+#GITBUCKET_HOST=0.0.0.0
+
+# Server port
+#GITBUCKET_PORT=8080
+
+# Data directory (GITBUCKET_HOME/gitbucket)
+#GITBUCKET_HOME=/var/lib/gitbucket
+
+# Path to the WAR file
+#GITBUCKET_WAR_FILE=/usr/share/gitbucket/lib/gitbucket.war
+
+# URL prefix for the GitBucket page (http://<host>:<port>/<prefix>/)
+#GITBUCKET_PREFIX=
+
+# Other Java option
+#GITBUCKET_JVM_OPTS=

contrib/redhat/gitbucket.init

@@ -0,0 +1,106 @@
+#!/bin/bash
+#
+# /etc/rc.d/init.d/gitbucket
+#
+# Starts the GitBucket server
+#
+# chkconfig: 345 60 40
+# description: Run GitBucket server
+# processname: java
+
+# Source function library
+. /etc/rc.d/init.d/functions
+
+# Default values
+GITBUCKET_HOME=/var/lib/gitbucket
+GITBUCKET_WAR_FILE=/usr/share/gitbucket/lib/gitbucket.war
+
+# Pull in cq settings
+[ -f /etc/sysconfig/gitbucket ] && . /etc/sysconfig/gitbucket
+
+# Location of the log and PID file
+LOG_FILE=/var/log/gitbucket/run.log
+PID_FILE=/var/run/gitbucket.pid
+
+# Default return value
+RETVAL=0
+
+
+start() {
+	echo -n $"Starting GitBucket server: "
+
+	# Compile statup parameters
+	if [ $GITBUCKET_PORT ]; then
+		START_OPTS="${START_OPTS} --port=${GITBUCKET_PORT}"
+	fi
+	if [ $GITBUCKET_PREFIX ]; then
+		START_OPTS="${START_OPTS} --prefix=${GITBUCKET_PREFIX}"
+	fi
+	if [ $GITBUCKET_HOST ]; then
+		START_OPTS="${START_OPTS} --host=${GITBUCKET_HOST}"
+	fi
+
+	# Run the Java process
+	GITBUCKET_HOME="${GITBUCKET_HOME}" java $GITBUCKET_JVM_OPTS -jar $GITBUCKET_WAR_FILE $START_OPTS >>$LOG_FILE 2>&1 &
+	RETVAL=$?
+
+	# Store PID of the Java process into a file
+	echo $! > $PID_FILE
+
+	if [ $RETVAL -eq 0 ] ; then
+		success "GitBucket startup"
+	else
+		failure "GitBucket startup"
+	fi
+
+	echo
+	return $RETVAL
+}
+
+
+stop() {
+	echo -n $"Stopping GitBucket server: "
+
+	# Run the Java process
+	kill $(cat $PID_FILE 2>/dev/null) >>$LOG_FILE 2>&1
+	RETVAL=$?
+
+	if [ $RETVAL -eq 0 ] ; then
+		rm -f $PID_FILE
+		success "GitBucket stopping"
+	else
+		failure "GitBucket stopping"
+	fi
+
+	echo
+	return $RETVAL
+}
+
+
+restart() {
+	stop
+	start
+}
+
+
+case "$1" in
+start)
+	start
+	;;
+stop)
+	stop
+	;;
+restart)
+	restart
+	;;
+status)
+	status -p $PID_FILE java
+	RETVAL=$?
+	;;
+*)
+	echo $"Usage: $0 [start|stop|restart|status]"
+	RETVAL=2
+esac
+
+
+exit $RETVAL

contrib/redhat/gitbucket.spec

@@ -0,0 +1,47 @@
+Name:		gitbucket
+Summary:	GitHub clone written with Scala.
+Version:	1.7
+Release:	1%{?dist}
+License:	Apache
+URL:		https://github.com/takezoe/gitbucket
+Group:		System/Servers
+Source0:	%{name}.war
+Source1:	%{name}.init
+Source2:	%{name}.conf
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
+BuildArch:	noarch
+Requires:	java >= 1.7
+
+
+%description
+
+GitBucket is the easily installable GitHub clone written with Scala.
+
+
+%install
+[ "%{buildroot}" != / ] && %{__rm} -rf "%{buildroot}"
+%{__mkdir_p} %{buildroot}{%{_sysconfdir}/{init.d,sysconfig},%{_datarootdir}/%{name}/lib,%{_sharedstatedir}/%{name},%{_localstatedir}/log/%{name}}
+%{__install} -m 0644 %{SOURCE0} %{buildroot}%{_datarootdir}/%{name}/lib
+%{__install} -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{name}
+%{__install} -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+touch %{buildroot}%{_localstatedir}/log/%{name}/run.log
+
+
+%clean
+[ "%{buildroot}" != / ] && %{__rm} -rf "%{buildroot}"
+
+
+%files
+%defattr(-,root,root,-)
+%{_datarootdir}/%{name}/lib/%{name}.war
+%{_sysconfdir}/init.d/%{name}
+%config %{_sysconfdir}/sysconfig/%{name}
+%{_localstatedir}/log/%{name}/run.log
+
+
+%changelog
+* Mon Oct 28 2013 Jiri Tyr <jiri_DOT_tyr at gmail.com>
+- Version bump to v1.7.
+
+* Thu Oct 17 2013 Jiri Tyr <jiri_DOT_tyr at gmail.com>
+- First build.

etc/gitbucket.erd

@@ -23,8 +23,8 @@
       <constraint>
         <height>-1</height>
         <width>-1</width>
-        <x>37</x>
+        <x>33</x>
-        <y>36</y>
+        <y>18</y>
       </constraint>
       <sourceConnections/>
       <targetConnections>
@@ -51,8 +51,8 @@
             <constraint>
               <height>-1</height>
               <width>-1</width>
-              <x>751</x>
+              <x>723</x>
-              <y>47</y>
+              <y>138</y>
             </constraint>
             <sourceConnections>
               <net.java.amateras.db.visual.model.ForeignKeyModel>
@@ -79,8 +79,8 @@
                   <constraint>
                     <height>-1</height>
                     <width>-1</width>
-                    <x>882</x>
+                    <x>1182</x>
-                    <y>239</y>
+                    <y>339</y>
                   </constraint>
                   <sourceConnections/>
                   <targetConnections>
@@ -108,8 +108,8 @@
                         <constraint>
                           <height>-1</height>
                           <width>-1</width>
-                          <x>940</x>
+                          <x>1301</x>
-                          <y>615</y>
+                          <y>836</y>
                         </constraint>
                         <sourceConnections>
                           <net.java.amateras.db.visual.model.ForeignKeyModel reference="../../.."/>
@@ -138,8 +138,8 @@
                               <constraint>
                                 <height>-1</height>
                                 <width>-1</width>
-                                <x>420</x>
+                                <x>684</x>
-                                <y>758</y>
+                                <y>858</y>
                               </constraint>
                               <sourceConnections>
                                 <net.java.amateras.db.visual.model.ForeignKeyModel reference="../../.."/>
@@ -167,8 +167,8 @@
                                     <constraint>
                                       <height>-1</height>
                                       <width>-1</width>
-                                      <x>307</x>
+                                      <x>293</x>
-                                      <y>356</y>
+                                      <y>478</y>
                                     </constraint>
                                     <sourceConnections>
                                       <net.java.amateras.db.visual.model.ForeignKeyModel>
@@ -210,8 +210,8 @@
                                           <constraint>
                                             <height>-1</height>
                                             <width>-1</width>
-                                            <x>641</x>
+                                            <x>875</x>
-                                            <y>569</y>
+                                            <y>677</y>
                                           </constraint>
                                           <sourceConnections>
                                             <net.java.amateras.db.visual.model.ForeignKeyModel>
@@ -283,9 +283,14 @@
                                               <defaultValue></defaultValue>
                                             </net.java.amateras.db.visual.model.ColumnModel>
                                             <net.java.amateras.db.visual.model.ColumnModel>
-                                              <columnName>MILESTONE_NAME</columnName>
+                                              <columnName>TITLE</columnName>
-                                              <logicalName>Milestone Name</logicalName>
+                                              <logicalName>Title</logicalName>
-                                              <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel/columnType"/>
+                                              <columnType class="net.java.amateras.db.dialect.ColumnType">
+                                                <name>VARCHAR</name>
+                                                <logicalName>文字列</logicalName>
+                                                <supportSize>true</supportSize>
+                                                <type>12</type>
+                                              </columnType>
                                               <size>100</size>
                                               <notNull>true</notNull>
                                               <primaryKey>false</primaryKey>
@@ -293,6 +298,49 @@
                                               <autoIncrement>false</autoIncrement>
                                               <defaultValue></defaultValue>
                                             </net.java.amateras.db.visual.model.ColumnModel>
+                                            <net.java.amateras.db.visual.model.ColumnModel>
+                                              <columnName>DESCRIPTION</columnName>
+                                              <logicalName>Description</logicalName>
+                                              <columnType class="net.java.amateras.db.dialect.ColumnType">
+                                                <name>TEXT</name>
+                                                <logicalName>文字列</logicalName>
+                                                <supportSize>true</supportSize>
+                                                <type>2005</type>
+                                              </columnType>
+                                              <size></size>
+                                              <notNull>false</notNull>
+                                              <primaryKey>false</primaryKey>
+                                              <description></description>
+                                              <autoIncrement>false</autoIncrement>
+                                              <defaultValue></defaultValue>
+                                            </net.java.amateras.db.visual.model.ColumnModel>
+                                            <net.java.amateras.db.visual.model.ColumnModel>
+                                              <columnName>DUE_DATE</columnName>
+                                              <logicalName>Due Date</logicalName>
+                                              <columnType class="net.java.amateras.db.dialect.ColumnType">
+                                                <name>TIMESTAMP</name>
+                                                <logicalName>日時</logicalName>
+                                                <supportSize>false</supportSize>
+                                                <type>93</type>
+                                              </columnType>
+                                              <size>10</size>
+                                              <notNull>false</notNull>
+                                              <primaryKey>false</primaryKey>
+                                              <description></description>
+                                              <autoIncrement>false</autoIncrement>
+                                              <defaultValue></defaultValue>
+                                            </net.java.amateras.db.visual.model.ColumnModel>
+                                            <net.java.amateras.db.visual.model.ColumnModel>
+                                              <columnName>CLOSED_DATE</columnName>
+                                              <logicalName>Closed Date</logicalName>
+                                              <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[6]/columnType"/>
+                                              <size>10</size>
+                                              <notNull>false</notNull>
+                                              <primaryKey>false</primaryKey>
+                                              <description></description>
+                                              <autoIncrement>false</autoIncrement>
+                                              <defaultValue></defaultValue>
+                                            </net.java.amateras.db.visual.model.ColumnModel>
                                           </columns>
                                           <indices/>
                                           <backgroundColor>
@@ -350,6 +398,36 @@
                                           </entry>
                                         </references>
                                       </net.java.amateras.db.visual.model.ForeignKeyModel>
+                                      <net.java.amateras.db.visual.model.ForeignKeyModel>
+                                        <listeners serialization="custom">
+                                          <java.beans.PropertyChangeSupport>
+                                            <default>
+                                              <source class="net.java.amateras.db.visual.model.ForeignKeyModel" reference="../../../.."/>
+                                              <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
+                                            </default>
+                                            <null/>
+                                          </java.beans.PropertyChangeSupport>
+                                        </listeners>
+                                        <source class="net.java.amateras.db.visual.model.TableModel" reference="../../.."/>
+                                        <target class="net.java.amateras.db.visual.model.TableModel" reference="../../../../../../../../../../../../../../../../../.."/>
+                                        <foreignKeyName>ISSUE_FK_2</foreignKeyName>
+                                        <references>
+                                          <entry>
+                                            <net.java.amateras.db.visual.model.ColumnModel reference="../../../../net.java.amateras.db.visual.model.ForeignKeyModel[3]/references/entry/net.java.amateras.db.visual.model.ColumnModel"/>
+                                            <net.java.amateras.db.visual.model.ColumnModel>
+                                              <columnName>ASSIGNED_USER_NAME</columnName>
+                                              <logicalName>Assinged User Name</logicalName>
+                                              <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/columns/net.java.amateras.db.visual.model.ColumnModel[4]/columnType"/>
+                                              <size>100</size>
+                                              <notNull>false</notNull>
+                                              <primaryKey>false</primaryKey>
+                                              <description></description>
+                                              <autoIncrement>false</autoIncrement>
+                                              <defaultValue></defaultValue>
+                                            </net.java.amateras.db.visual.model.ColumnModel>
+                                          </entry>
+                                        </references>
+                                      </net.java.amateras.db.visual.model.ForeignKeyModel>
                                     </sourceConnections>
                                     <targetConnections>
                                       <net.java.amateras.db.visual.model.ForeignKeyModel>
@@ -375,8 +453,8 @@
                                           <constraint>
                                             <height>-1</height>
                                             <width>-1</width>
-                                            <x>26</x>
+                                            <x>18</x>
-                                            <y>660</y>
+                                            <y>776</y>
                                           </constraint>
                                           <sourceConnections>
                                             <net.java.amateras.db.visual.model.ForeignKeyModel reference="../../.."/>
@@ -462,6 +540,22 @@
                                               <autoIncrement>true</autoIncrement>
                                               <defaultValue></defaultValue>
                                             </net.java.amateras.db.visual.model.ColumnModel>
+                                            <net.java.amateras.db.visual.model.ColumnModel>
+                                              <columnName>ACTION</columnName>
+                                              <logicalName>Action</logicalName>
+                                              <columnType class="net.java.amateras.db.dialect.ColumnType">
+                                                <name>VARCHAR</name>
+                                                <logicalName>文字列</logicalName>
+                                                <supportSize>true</supportSize>
+                                                <type>12</type>
+                                              </columnType>
+                                              <size>20</size>
+                                              <notNull>true</notNull>
+                                              <primaryKey>false</primaryKey>
+                                              <description>Expand to VARCHAR(20) from VARCHAR(10) in 1.3</description>
+                                              <autoIncrement>false</autoIncrement>
+                                              <defaultValue></defaultValue>
+                                            </net.java.amateras.db.visual.model.ColumnModel>
                                             <net.java.amateras.db.visual.model.ColumnModel reference="../../sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/references/entry/net.java.amateras.db.visual.model.ColumnModel[2]"/>
                                             <net.java.amateras.db.visual.model.ColumnModel>
                                               <columnName>CONTENT</columnName>
@@ -498,7 +592,7 @@
                                             <net.java.amateras.db.visual.model.ColumnModel>
                                               <columnName>UPDATED_DATE</columnName>
                                               <logicalName>Updated Date</logicalName>
-                                              <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[7]/columnType"/>
+                                              <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[8]/columnType"/>
                                               <size>10</size>
                                               <notNull>true</notNull>
                                               <primaryKey>false</primaryKey>
@@ -572,10 +666,11 @@
                                         <autoIncrement>false</autoIncrement>
                                         <defaultValue></defaultValue>
                                       </net.java.amateras.db.visual.model.ColumnModel>
+                                      <net.java.amateras.db.visual.model.ColumnModel reference="../../sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[4]/references/entry/net.java.amateras.db.visual.model.ColumnModel[2]"/>
                                       <net.java.amateras.db.visual.model.ColumnModel>
                                         <columnName>TITLE</columnName>
                                         <logicalName>Title</logicalName>
-                                        <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/columns/net.java.amateras.db.visual.model.ColumnModel[6]/columnType"/>
+                                        <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/columns/net.java.amateras.db.visual.model.ColumnModel[7]/columnType"/>
                                         <size></size>
                                         <notNull>true</notNull>
                                         <primaryKey>false</primaryKey>
@@ -586,7 +681,7 @@
                                       <net.java.amateras.db.visual.model.ColumnModel>
                                         <columnName>CONTENT</columnName>
                                         <logicalName>Content</logicalName>
-                                        <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/columns/net.java.amateras.db.visual.model.ColumnModel[6]/columnType"/>
+                                        <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/columns/net.java.amateras.db.visual.model.ColumnModel[7]/columnType"/>
                                         <size></size>
                                         <notNull>true</notNull>
                                         <primaryKey>false</primaryKey>
@@ -597,7 +692,7 @@
                                       <net.java.amateras.db.visual.model.ColumnModel>
                                         <columnName>REGISTERED_DATE</columnName>
                                         <logicalName>Registered Date</logicalName>
-                                        <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/columns/net.java.amateras.db.visual.model.ColumnModel[7]/columnType"/>
+                                        <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/columns/net.java.amateras.db.visual.model.ColumnModel[8]/columnType"/>
                                         <size>10</size>
                                         <notNull>true</notNull>
                                         <primaryKey>false</primaryKey>
@@ -608,7 +703,7 @@
                                       <net.java.amateras.db.visual.model.ColumnModel>
                                         <columnName>UPDATED_DATE</columnName>
                                         <logicalName>Updated Date</logicalName>
-                                        <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/columns/net.java.amateras.db.visual.model.ColumnModel[7]/columnType"/>
+                                        <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/columns/net.java.amateras.db.visual.model.ColumnModel[8]/columnType"/>
                                         <size>10</size>
                                         <notNull>true</notNull>
                                         <primaryKey>false</primaryKey>
@@ -801,8 +896,8 @@
                         <constraint>
                           <height>-1</height>
                           <width>-1</width>
-                          <x>388</x>
+                          <x>481</x>
-                          <y>166</y>
+                          <y>361</y>
                         </constraint>
                         <sourceConnections>
                           <net.java.amateras.db.visual.model.ForeignKeyModel reference="../../.."/>
@@ -862,6 +957,250 @@
                     </net.java.amateras.db.visual.model.ForeignKeyModel>
                     <net.java.amateras.db.visual.model.ForeignKeyModel reference="../net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel"/>
                     <net.java.amateras.db.visual.model.ForeignKeyModel reference="../net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel"/>
+                    <net.java.amateras.db.visual.model.ForeignKeyModel>
+                      <listeners serialization="custom">
+                        <java.beans.PropertyChangeSupport>
+                          <default>
+                            <source class="net.java.amateras.db.visual.model.ForeignKeyModel" reference="../../../.."/>
+                            <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
+                          </default>
+                          <null/>
+                        </java.beans.PropertyChangeSupport>
+                      </listeners>
+                      <source class="net.java.amateras.db.visual.model.TableModel">
+                        <listeners serialization="custom">
+                          <java.beans.PropertyChangeSupport>
+                            <default>
+                              <source class="net.java.amateras.db.visual.model.TableModel" reference="../../../.."/>
+                              <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
+                            </default>
+                            <null/>
+                          </java.beans.PropertyChangeSupport>
+                        </listeners>
+                        <constraint>
+                          <height>-1</height>
+                          <width>-1</width>
+                          <x>1199</x>
+                          <y>25</y>
+                        </constraint>
+                        <sourceConnections>
+                          <net.java.amateras.db.visual.model.ForeignKeyModel reference="../../.."/>
+                          <net.java.amateras.db.visual.model.ForeignKeyModel>
+                            <listeners serialization="custom">
+                              <java.beans.PropertyChangeSupport>
+                                <default>
+                                  <source class="net.java.amateras.db.visual.model.ForeignKeyModel" reference="../../../.."/>
+                                  <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
+                                </default>
+                                <null/>
+                              </java.beans.PropertyChangeSupport>
+                            </listeners>
+                            <source class="net.java.amateras.db.visual.model.TableModel" reference="../../.."/>
+                            <target class="net.java.amateras.db.visual.model.TableModel" reference="../../../../../../../../../../../.."/>
+                            <foreignKeyName>ACTIVITY_FK_2</foreignKeyName>
+                            <references>
+                              <entry>
+                                <net.java.amateras.db.visual.model.ColumnModel reference="../../../../../../../net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[3]/references/entry/net.java.amateras.db.visual.model.ColumnModel"/>
+                                <net.java.amateras.db.visual.model.ColumnModel>
+                                  <columnName>ACTIVITY_USER_NAME</columnName>
+                                  <logicalName>Activity User Name</logicalName>
+                                  <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../../../../net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/columns/net.java.amateras.db.visual.model.ColumnModel[4]/columnType"/>
+                                  <size>100</size>
+                                  <notNull>true</notNull>
+                                  <primaryKey>false</primaryKey>
+                                  <description></description>
+                                  <autoIncrement>false</autoIncrement>
+                                  <defaultValue></defaultValue>
+                                </net.java.amateras.db.visual.model.ColumnModel>
+                              </entry>
+                            </references>
+                          </net.java.amateras.db.visual.model.ForeignKeyModel>
+                        </sourceConnections>
+                        <targetConnections/>
+                        <error></error>
+                        <linkedPath></linkedPath>
+                        <tableName>ACTIVITY</tableName>
+                        <logicalName>Activity</logicalName>
+                        <description>Since 1.2</description>
+                        <columns>
+                          <net.java.amateras.db.visual.model.ColumnModel>
+                            <columnName>ACTIVITY_ID</columnName>
+                            <logicalName>Activity ID</logicalName>
+                            <columnType class="net.java.amateras.db.dialect.ColumnType">
+                              <name>INT</name>
+                              <logicalName>整数</logicalName>
+                              <supportSize>false</supportSize>
+                              <type>4</type>
+                            </columnType>
+                            <size>10</size>
+                            <notNull>true</notNull>
+                            <primaryKey>true</primaryKey>
+                            <description></description>
+                            <autoIncrement>true</autoIncrement>
+                            <defaultValue></defaultValue>
+                          </net.java.amateras.db.visual.model.ColumnModel>
+                          <net.java.amateras.db.visual.model.ColumnModel>
+                            <columnName>USER_NAME</columnName>
+                            <logicalName>User Name</logicalName>
+                            <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/columns/net.java.amateras.db.visual.model.ColumnModel[4]/columnType"/>
+                            <size>100</size>
+                            <notNull>true</notNull>
+                            <primaryKey>false</primaryKey>
+                            <description></description>
+                            <autoIncrement>false</autoIncrement>
+                            <defaultValue></defaultValue>
+                          </net.java.amateras.db.visual.model.ColumnModel>
+                          <net.java.amateras.db.visual.model.ColumnModel>
+                            <columnName>REPOSITORY_NAME</columnName>
+                            <logicalName>Repository Name</logicalName>
+                            <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/columns/net.java.amateras.db.visual.model.ColumnModel[4]/columnType"/>
+                            <size>100</size>
+                            <notNull>true</notNull>
+                            <primaryKey>false</primaryKey>
+                            <description></description>
+                            <autoIncrement>false</autoIncrement>
+                            <defaultValue></defaultValue>
+                          </net.java.amateras.db.visual.model.ColumnModel>
+                          <net.java.amateras.db.visual.model.ColumnModel reference="../../sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/references/entry/net.java.amateras.db.visual.model.ColumnModel[2]"/>
+                          <net.java.amateras.db.visual.model.ColumnModel>
+                            <columnName>ACTIVITY_TYPE</columnName>
+                            <logicalName>Activity Type</logicalName>
+                            <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/columns/net.java.amateras.db.visual.model.ColumnModel[4]/columnType"/>
+                            <size>100</size>
+                            <notNull>true</notNull>
+                            <primaryKey>false</primaryKey>
+                            <description></description>
+                            <autoIncrement>false</autoIncrement>
+                            <defaultValue></defaultValue>
+                          </net.java.amateras.db.visual.model.ColumnModel>
+                          <net.java.amateras.db.visual.model.ColumnModel>
+                            <columnName>MESSAGE</columnName>
+                            <logicalName>Message</logicalName>
+                            <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/columns/net.java.amateras.db.visual.model.ColumnModel[5]/columnType"/>
+                            <size></size>
+                            <notNull>true</notNull>
+                            <primaryKey>false</primaryKey>
+                            <description></description>
+                            <autoIncrement>false</autoIncrement>
+                            <defaultValue></defaultValue>
+                          </net.java.amateras.db.visual.model.ColumnModel>
+                          <net.java.amateras.db.visual.model.ColumnModel>
+                            <columnName>ADDITIONAL_INFO</columnName>
+                            <logicalName>Additional Information</logicalName>
+                            <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/columns/net.java.amateras.db.visual.model.ColumnModel[5]/columnType"/>
+                            <size></size>
+                            <notNull>false</notNull>
+                            <primaryKey>false</primaryKey>
+                            <description></description>
+                            <autoIncrement>false</autoIncrement>
+                            <defaultValue></defaultValue>
+                          </net.java.amateras.db.visual.model.ColumnModel>
+                          <net.java.amateras.db.visual.model.ColumnModel>
+                            <columnName>ACTIVITY_DATE</columnName>
+                            <logicalName>Activity Date</logicalName>
+                            <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/columns/net.java.amateras.db.visual.model.ColumnModel[6]/columnType"/>
+                            <size>10</size>
+                            <notNull>true</notNull>
+                            <primaryKey>false</primaryKey>
+                            <description></description>
+                            <autoIncrement>false</autoIncrement>
+                            <defaultValue></defaultValue>
+                          </net.java.amateras.db.visual.model.ColumnModel>
+                        </columns>
+                        <indices/>
+                        <backgroundColor>
+                          <red>255</red>
+                          <green>255</green>
+                          <blue>206</blue>
+                        </backgroundColor>
+                        <sql></sql>
+                      </source>
+                      <target class="net.java.amateras.db.visual.model.TableModel" reference="../../.."/>
+                      <foreignKeyName>ACTIVITY_FK_1</foreignKeyName>
+                      <references/>
+                    </net.java.amateras.db.visual.model.ForeignKeyModel>
+                    <net.java.amateras.db.visual.model.ForeignKeyModel>
+                      <listeners serialization="custom">
+                        <java.beans.PropertyChangeSupport>
+                          <default>
+                            <source class="net.java.amateras.db.visual.model.ForeignKeyModel" reference="../../../.."/>
+                            <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
+                          </default>
+                          <null/>
+                        </java.beans.PropertyChangeSupport>
+                      </listeners>
+                      <source class="net.java.amateras.db.visual.model.TableModel">
+                        <listeners serialization="custom">
+                          <java.beans.PropertyChangeSupport>
+                            <default>
+                              <source class="net.java.amateras.db.visual.model.TableModel" reference="../../../.."/>
+                              <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
+                            </default>
+                            <null/>
+                          </java.beans.PropertyChangeSupport>
+                        </listeners>
+                        <constraint>
+                          <height>-1</height>
+                          <width>-1</width>
+                          <x>1451</x>
+                          <y>577</y>
+                        </constraint>
+                        <sourceConnections>
+                          <net.java.amateras.db.visual.model.ForeignKeyModel reference="../../.."/>
+                        </sourceConnections>
+                        <targetConnections/>
+                        <error></error>
+                        <linkedPath></linkedPath>
+                        <tableName>COMMIT_LOG</tableName>
+                        <logicalName>Commit Log</logicalName>
+                        <description>Since 1.2</description>
+                        <columns>
+                          <net.java.amateras.db.visual.model.ColumnModel>
+                            <columnName>USER_NAME</columnName>
+                            <logicalName>User Name</logicalName>
+                            <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/columns/net.java.amateras.db.visual.model.ColumnModel[4]/columnType"/>
+                            <size>100</size>
+                            <notNull>true</notNull>
+                            <primaryKey>true</primaryKey>
+                            <description></description>
+                            <autoIncrement>false</autoIncrement>
+                            <defaultValue></defaultValue>
+                          </net.java.amateras.db.visual.model.ColumnModel>
+                          <net.java.amateras.db.visual.model.ColumnModel>
+                            <columnName>REPOSITORY_NAME</columnName>
+                            <logicalName>Repository Name</logicalName>
+                            <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/columns/net.java.amateras.db.visual.model.ColumnModel[4]/columnType"/>
+                            <size>100</size>
+                            <notNull>true</notNull>
+                            <primaryKey>true</primaryKey>
+                            <description></description>
+                            <autoIncrement>false</autoIncrement>
+                            <defaultValue></defaultValue>
+                          </net.java.amateras.db.visual.model.ColumnModel>
+                          <net.java.amateras.db.visual.model.ColumnModel>
+                            <columnName>COMMIT_ID</columnName>
+                            <logicalName>Commit ID</logicalName>
+                            <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/columns/net.java.amateras.db.visual.model.ColumnModel[4]/columnType"/>
+                            <size>40</size>
+                            <notNull>true</notNull>
+                            <primaryKey>true</primaryKey>
+                            <description></description>
+                            <autoIncrement>false</autoIncrement>
+                            <defaultValue></defaultValue>
+                          </net.java.amateras.db.visual.model.ColumnModel>
+                        </columns>
+                        <indices/>
+                        <backgroundColor>
+                          <red>255</red>
+                          <green>255</green>
+                          <blue>206</blue>
+                        </backgroundColor>
+                        <sql></sql>
+                      </source>
+                      <target class="net.java.amateras.db.visual.model.TableModel" reference="../../.."/>
+                      <foreignKeyName>COMMIT_LOG_FK_1</foreignKeyName>
+                      <references/>
+                    </net.java.amateras.db.visual.model.ForeignKeyModel>
                   </targetConnections>
                   <error></error>
                   <linkedPath></linkedPath>
@@ -1062,6 +1401,100 @@
         </net.java.amateras.db.visual.model.ForeignKeyModel>
         <net.java.amateras.db.visual.model.ForeignKeyModel reference="../net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[3]"/>
         <net.java.amateras.db.visual.model.ForeignKeyModel reference="../net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]"/>
+        <net.java.amateras.db.visual.model.ForeignKeyModel reference="../net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[6]/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]"/>
+        <net.java.amateras.db.visual.model.ForeignKeyModel reference="../net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[4]"/>
+        <net.java.amateras.db.visual.model.ForeignKeyModel>
+          <listeners serialization="custom">
+            <java.beans.PropertyChangeSupport>
+              <default>
+                <source class="net.java.amateras.db.visual.model.ForeignKeyModel" reference="../../../.."/>
+                <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
+              </default>
+              <null/>
+            </java.beans.PropertyChangeSupport>
+          </listeners>
+          <source class="net.java.amateras.db.visual.model.TableModel">
+            <listeners serialization="custom">
+              <java.beans.PropertyChangeSupport>
+                <default>
+                  <source class="net.java.amateras.db.visual.model.TableModel" reference="../../../.."/>
+                  <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
+                </default>
+                <null/>
+              </java.beans.PropertyChangeSupport>
+            </listeners>
+            <constraint>
+              <height>-1</height>
+              <width>-1</width>
+              <x>432</x>
+              <y>240</y>
+            </constraint>
+            <sourceConnections>
+              <net.java.amateras.db.visual.model.ForeignKeyModel reference="../../.."/>
+              <net.java.amateras.db.visual.model.ForeignKeyModel>
+                <listeners serialization="custom">
+                  <java.beans.PropertyChangeSupport>
+                    <default>
+                      <source class="net.java.amateras.db.visual.model.ForeignKeyModel" reference="../../../.."/>
+                      <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
+                    </default>
+                    <null/>
+                  </java.beans.PropertyChangeSupport>
+                </listeners>
+                <source class="net.java.amateras.db.visual.model.TableModel" reference="../../.."/>
+                <target class="net.java.amateras.db.visual.model.TableModel" reference="../../../../../.."/>
+                <foreignKeyName>GROUP_MEMBER_FK_2</foreignKeyName>
+                <references/>
+              </net.java.amateras.db.visual.model.ForeignKeyModel>
+            </sourceConnections>
+            <targetConnections/>
+            <error></error>
+            <linkedPath></linkedPath>
+            <tableName>GROUP_MEMBER</tableName>
+            <logicalName>Group Member</logicalName>
+            <description>Since 1.4</description>
+            <columns>
+              <net.java.amateras.db.visual.model.ColumnModel>
+                <columnName>GROUP_NAME</columnName>
+                <logicalName>Group Name</logicalName>
+                <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/columns/net.java.amateras.db.visual.model.ColumnModel[4]/columnType"/>
+                <size>100</size>
+                <notNull>true</notNull>
+                <primaryKey>true</primaryKey>
+                <description></description>
+                <autoIncrement>false</autoIncrement>
+                <defaultValue></defaultValue>
+              </net.java.amateras.db.visual.model.ColumnModel>
+              <net.java.amateras.db.visual.model.ColumnModel>
+                <columnName>USER_NAME</columnName>
+                <logicalName>User Name</logicalName>
+                <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../../net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/columns/net.java.amateras.db.visual.model.ColumnModel[4]/columnType"/>
+                <size>100</size>
+                <notNull>true</notNull>
+                <primaryKey>true</primaryKey>
+                <description></description>
+                <autoIncrement>false</autoIncrement>
+                <defaultValue></defaultValue>
+              </net.java.amateras.db.visual.model.ColumnModel>
+            </columns>
+            <indices/>
+            <backgroundColor>
+              <red>255</red>
+              <green>255</green>
+              <blue>206</blue>
+            </backgroundColor>
+            <sql></sql>
+          </source>
+          <target class="net.java.amateras.db.visual.model.TableModel" reference="../../.."/>
+          <foreignKeyName>GROUP_MEMBER_FK_1</foreignKeyName>
+          <references>
+            <entry>
+              <net.java.amateras.db.visual.model.ColumnModel reference="../../../../net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[3]/references/entry/net.java.amateras.db.visual.model.ColumnModel"/>
+              <net.java.amateras.db.visual.model.ColumnModel reference="../../../source/columns/net.java.amateras.db.visual.model.ColumnModel"/>
+            </entry>
+          </references>
+        </net.java.amateras.db.visual.model.ForeignKeyModel>
+        <net.java.amateras.db.visual.model.ForeignKeyModel reference="../net.java.amateras.db.visual.model.ForeignKeyModel[6]/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]"/>
       </targetConnections>
       <error></error>
       <linkedPath></linkedPath>
@@ -1089,8 +1522,8 @@
         <net.java.amateras.db.visual.model.ColumnModel>
           <columnName>PASSWORD</columnName>
           <logicalName>Password</logicalName>
-          <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[2]/columnType"/>
+          <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/columns/net.java.amateras.db.visual.model.ColumnModel[4]/columnType"/>
-          <size>20</size>
+          <size>40</size>
           <notNull>true</notNull>
           <primaryKey>false</primaryKey>
           <description></description>
@@ -1098,18 +1531,18 @@
           <defaultValue></defaultValue>
         </net.java.amateras.db.visual.model.ColumnModel>
         <net.java.amateras.db.visual.model.ColumnModel>
-          <columnName>USER_TYPE</columnName>
+          <columnName>ADMINISTRATOR</columnName>
-          <logicalName>User Type</logicalName>
+          <logicalName>Administrator</logicalName>
           <columnType class="net.java.amateras.db.dialect.ColumnType">
-            <name>INT</name>
+            <name>BOOLEAN</name>
-            <logicalName>整数</logicalName>
+            <logicalName>真偽値</logicalName>
             <supportSize>false</supportSize>
-            <type>4</type>
+            <type>16</type>
           </columnType>
           <size>10</size>
           <notNull>true</notNull>
           <primaryKey>false</primaryKey>
-          <description>0:Normal 1:Administrator</description>
+          <description></description>
           <autoIncrement>false</autoIncrement>
           <defaultValue>0</defaultValue>
         </net.java.amateras.db.visual.model.ColumnModel>
@@ -1157,6 +1590,33 @@
           <autoIncrement>false</autoIncrement>
           <defaultValue></defaultValue>
         </net.java.amateras.db.visual.model.ColumnModel>
+        <net.java.amateras.db.visual.model.ColumnModel>
+          <columnName>IMAGE</columnName>
+          <logicalName>Image</logicalName>
+          <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/columns/net.java.amateras.db.visual.model.ColumnModel[5]/columnType"/>
+          <size>100</size>
+          <notNull>false</notNull>
+          <primaryKey>false</primaryKey>
+          <description>Since 1.3</description>
+          <autoIncrement>false</autoIncrement>
+          <defaultValue></defaultValue>
+        </net.java.amateras.db.visual.model.ColumnModel>
+        <net.java.amateras.db.visual.model.ColumnModel>
+          <columnName>GROUP_ACCOUNT</columnName>
+          <logicalName>Group Account</logicalName>
+          <columnType class="net.java.amateras.db.dialect.ColumnType">
+            <name>BOOLEAN</name>
+            <logicalName>真偽値</logicalName>
+            <supportSize>false</supportSize>
+            <type>16</type>
+          </columnType>
+          <size>10</size>
+          <notNull>true</notNull>
+          <primaryKey>false</primaryKey>
+          <description>Since 1.4</description>
+          <autoIncrement>false</autoIncrement>
+          <defaultValue>FALSE</defaultValue>
+        </net.java.amateras.db.visual.model.ColumnModel>
       </columns>
       <indices>
         <net.java.amateras.db.visual.model.IndexModel>
@@ -1184,6 +1644,91 @@
     <net.java.amateras.db.visual.model.TableModel reference="../net.java.amateras.db.visual.model.TableModel/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target"/>
     <net.java.amateras.db.visual.model.TableModel reference="../net.java.amateras.db.visual.model.TableModel/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source"/>
     <net.java.amateras.db.visual.model.TableModel reference="../net.java.amateras.db.visual.model.TableModel/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[3]/source"/>
+    <net.java.amateras.db.visual.model.TableModel reference="../net.java.amateras.db.visual.model.TableModel/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[6]/source"/>
+    <net.java.amateras.db.visual.model.TableModel reference="../net.java.amateras.db.visual.model.TableModel/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[7]/source"/>
+    <net.java.amateras.db.visual.model.TableModel reference="../net.java.amateras.db.visual.model.TableModel/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[6]/source"/>
+    <net.java.amateras.db.visual.model.TableModel>
+      <listeners serialization="custom">
+        <java.beans.PropertyChangeSupport>
+          <default>
+            <source class="net.java.amateras.db.visual.model.TableModel" reference="../../../.."/>
+            <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
+          </default>
+          <null/>
+        </java.beans.PropertyChangeSupport>
+      </listeners>
+      <constraint>
+        <height>-1</height>
+        <width>-1</width>
+        <x>410</x>
+        <y>860</y>
+      </constraint>
+      <sourceConnections/>
+      <targetConnections/>
+      <error></error>
+      <linkedPath></linkedPath>
+      <tableName>ISSUE_OUTLINE_VIEW</tableName>
+      <logicalName>Issue Outline View</logicalName>
+      <description>Since 1.4</description>
+      <columns>
+        <net.java.amateras.db.visual.model.ColumnModel>
+          <columnName>USER_NAME</columnName>
+          <logicalName>User Name</logicalName>
+          <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../net.java.amateras.db.visual.model.TableModel/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/columns/net.java.amateras.db.visual.model.ColumnModel[5]/columnType"/>
+          <size>100</size>
+          <notNull>false</notNull>
+          <primaryKey>false</primaryKey>
+          <description></description>
+          <autoIncrement>false</autoIncrement>
+          <defaultValue></defaultValue>
+        </net.java.amateras.db.visual.model.ColumnModel>
+        <net.java.amateras.db.visual.model.ColumnModel>
+          <columnName>REPOSITORY_NAME</columnName>
+          <logicalName>Repository Name</logicalName>
+          <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../../../net.java.amateras.db.visual.model.TableModel/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/source/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/sourceConnections/net.java.amateras.db.visual.model.ForeignKeyModel[2]/target/targetConnections/net.java.amateras.db.visual.model.ForeignKeyModel/source/columns/net.java.amateras.db.visual.model.ColumnModel[5]/columnType"/>
+          <size>100</size>
+          <notNull>false</notNull>
+          <primaryKey>false</primaryKey>
+          <description></description>
+          <autoIncrement>false</autoIncrement>
+          <defaultValue></defaultValue>
+        </net.java.amateras.db.visual.model.ColumnModel>
+        <net.java.amateras.db.visual.model.ColumnModel>
+          <columnName>ISSUE_ID</columnName>
+          <logicalName>Issue ID</logicalName>
+          <columnType class="net.java.amateras.db.dialect.ColumnType">
+            <name>INT</name>
+            <logicalName>整数</logicalName>
+            <supportSize>false</supportSize>
+            <type>4</type>
+          </columnType>
+          <size>10</size>
+          <notNull>false</notNull>
+          <primaryKey>false</primaryKey>
+          <description></description>
+          <autoIncrement>false</autoIncrement>
+          <defaultValue></defaultValue>
+        </net.java.amateras.db.visual.model.ColumnModel>
+        <net.java.amateras.db.visual.model.ColumnModel>
+          <columnName>COMMENT_COUNT</columnName>
+          <logicalName>Comment Count</logicalName>
+          <columnType class="net.java.amateras.db.dialect.ColumnType" reference="../../net.java.amateras.db.visual.model.ColumnModel[3]/columnType"/>
+          <size>10</size>
+          <notNull>false</notNull>
+          <primaryKey>false</primaryKey>
+          <description></description>
+          <autoIncrement>false</autoIncrement>
+          <defaultValue></defaultValue>
+        </net.java.amateras.db.visual.model.ColumnModel>
+      </columns>
+      <indices/>
+      <backgroundColor>
+        <red>210</red>
+        <green>232</green>
+        <blue>249</blue>
+      </backgroundColor>
+      <sql></sql>
+    </net.java.amateras.db.visual.model.TableModel>
   </children>
   <dommains/>
   <dialectName>H2</dialectName>

etc/icons.svg

@@ -0,0 +1,983 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="icons.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="450.21999"
+     inkscape:cy="97.51519"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1-9"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="706"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     inkscape:snap-grids="false"
+     inkscape:snap-page="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="false"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-to-guides="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3080" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="layer1-9"
+       inkscape:label="Layer 1"
+       transform="matrix(0.66004549,0,0,0.66004549,12.445368,29.409765)">
+      <path
+         style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:1.51504707px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 865.73247,686.51304 c 0,0 19.28074,14.1795 55.09542,13.7739 35.81468,-0.4056 45.91286,-13.7739 45.91286,-13.7739 l 31.84606,-118.8515 -163.46293,0 z"
+         id="path4000"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czcccc" />
+      <path
+         style="fill:none;stroke:#b3b3b3;stroke-width:25.84518814;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 306.9072,1201.5096 c 0,0 3.44333,-28.5633 47.63498,-35.4849 15.10377,-2.3655 48.7968,-8.2798 48.7968,-42.5816"
+         id="path3207"
+         inkscape:connector-curvature="0"
+         inkscape:transform-center-x="-6.1348784"
+         sodipodi:nodetypes="csc"
+         inkscape:transform-center-y="1.9434039e-005" />
+      <path
+         style="fill:none;stroke:#b3b3b3;stroke-width:26.60422707;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 76.384718,1086.1545 c 0,82.8617 105.181182,77.9295 105.181182,77.9295"
+         id="path4318"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:1.18291342;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect3935"
+         width="266.2222"
+         height="35.127476"
+         x="-4.6761055"
+         y="865.6405" />
+      <path
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:11.34059906;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 664.11762,675.10023 -74.94096,87.54344 20.17642,-92.15099 z"
+         id="path3894-1"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:28.84111404;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect3088-5-5"
+         width="169.03172"
+         height="105.81662"
+         x="547.64557"
+         y="573.36456" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3850"
+         d="m 445.03908,191.42833 0,-128.577242 c 0,0 1.85983,-15.30681 -16.73849,-15.30681 -18.59831,0 -51.14538,0 -51.14538,0"
+         style="fill:none;stroke:#008000;stroke-width:22.7257061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         id="path2991"
+         transform="translate(-137.57539,-163.64471)"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#008000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         id="path2993"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc"
+         transform="matrix(0.83611704,0,0,0.83611704,-94.824045,-115.22257)" />
+      <rect
+         id="rect2995"
+         y="54.447956"
+         x="104.3765"
+         height="99.221695"
+         width="29.189819"
+         style="fill:#008000;stroke:#ffffff;stroke-width:1.11112404" />
+      <rect
+         id="rect2997"
+         y="173.24185"
+         x="104.63474"
+         height="26.258072"
+         width="29.724136"
+         style="fill:#008000;stroke:#ffffff;stroke-width:0.57680577" />
+      <rect
+         y="68.361099"
+         x="330.18893"
+         height="104.27071"
+         width="3.2554624"
+         id="rect3818"
+         style="fill:#ffffff;stroke:#008000;stroke-width:22.7257061;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,-20.394061,56.890898)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-4"
+         style="fill:#ffffff;stroke:#008000;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,-21.929587,-93.432709)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795"
+         style="fill:#ffffff;stroke:#008000;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,92.394578,56.992418)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-4-0"
+         style="fill:#ffffff;stroke:#008000;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3852"
+         d="m 404.75446,10.803052 0,70.691447 L 359.1655,49.35988 z"
+         style="fill:#008000;stroke:#008000;stroke-width:0.83335358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3850-4"
+         d="m 448.69288,446.18012 0,-128.57725 c 0,0 1.85984,-15.30681 -16.73848,-15.30681 -18.59831,0 -51.14539,0 -51.14539,0"
+         style="fill:none;stroke:#800000;stroke-width:22.7257061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         id="path2991-8"
+         transform="translate(-133.92158,91.107081)"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#800000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         id="path2993-8"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc"
+         transform="matrix(0.83611704,0,0,0.83611704,-91.170233,139.52922)" />
+      <rect
+         id="rect2995-2"
+         y="309.19974"
+         x="108.03028"
+         height="99.221687"
+         width="29.189819"
+         style="fill:#800000;stroke:#ffffff;stroke-width:1.11112404" />
+      <rect
+         id="rect2997-4"
+         y="427.99362"
+         x="108.28852"
+         height="26.258072"
+         width="29.724136"
+         style="fill:#800000;stroke:#ffffff;stroke-width:0.57680577" />
+      <rect
+         y="323.11288"
+         x="333.84274"
+         height="104.27072"
+         width="3.2554622"
+         id="rect3818-5"
+         style="fill:#ffffff;stroke:#800000;stroke-width:22.7257061;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,-16.740254,311.64269)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-4-5"
+         style="fill:#ffffff;stroke:#800000;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,-18.275774,161.31908)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-1"
+         style="fill:#ffffff;stroke:#800000;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,96.048392,311.7442)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-4-0-7"
+         style="fill:#ffffff;stroke:#800000;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3852-1"
+         d="m 408.40826,265.55484 0,70.69144 -45.58895,-32.13461 z"
+         style="fill:#800000;stroke:#800000;stroke-width:0.83335358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <rect
+         style="fill:#cccccc"
+         id="rect2985"
+         width="308.26331"
+         height="308.26331"
+         x="647.59973"
+         y="19.593252" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#ffffff"
+         id="path2989"
+         sodipodi:cx="246.42857"
+         sodipodi:cy="327.36218"
+         sodipodi:rx="35"
+         sodipodi:ry="35"
+         d="m 281.42857,327.36218 c 0,19.32997 -15.67003,35 -35,35 -19.32996,0 -35,-15.67003 -35,-35 0,-19.32996 15.67004,-35 35,-35 19.32997,0 35,15.67004 35,35 z"
+         transform="matrix(2.9255147,0,0,2.9255147,83.281176,-813.70029)" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:1.59620917px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 715.46559,327.54005 179.96463,0 -89.85466,-201.67002 z"
+         id="path2993-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3850-1"
+         d="m 447.16245,696.53224 0,-128.57724 c 0,0 1.85984,-15.30681 -16.73848,-15.30681 -18.59831,0 -51.14539,0 -51.14539,0"
+         style="fill:none;stroke:#b3b3b3;stroke-width:22.7257061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         id="path2991-7"
+         transform="translate(-135.45201,341.45921)"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#b3b3b3;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         id="path2993-4"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc"
+         transform="matrix(0.83611704,0,0,0.83611704,-92.700665,389.88135)" />
+      <rect
+         id="rect2995-0"
+         y="559.55188"
+         x="106.49989"
+         height="99.221687"
+         width="29.189819"
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:1.11112404" />
+      <rect
+         id="rect2997-9"
+         y="678.34576"
+         x="106.75813"
+         height="26.258072"
+         width="29.724136"
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:0.57680577" />
+      <rect
+         y="573.46503"
+         x="332.31235"
+         height="104.27072"
+         width="3.2554622"
+         id="rect3818-4"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:22.7257061;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,-18.270676,561.99481)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-4-8"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,-19.806206,411.67121)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-8"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,94.517962,562.09633)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-4-0-2"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3852-4"
+         d="m 406.87783,515.90696 0,70.69145 -45.58895,-32.13462 z"
+         style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:0.83335358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <rect
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:32.11899948;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect3088"
+         width="188.24272"
+         height="117.84301"
+         x="578.56567"
+         y="534.50873" />
+      <path
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:11.66586208;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="M 667.1767,647.76042 746.75901,734.99486 725.333,643.16913 z"
+         id="path3894"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:28.84111404;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect3088-5"
+         width="169.03172"
+         height="105.81661"
+         x="595.6264"
+         y="533.38885" />
+      <path
+         id="path2991-7-7"
+         transform="matrix(0.81013086,0,0,0.81013086,-79.003905,648.21364)"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#b3b3b3;fill-rule:evenodd;stroke:#b3b3b3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         id="path2993-4-1"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc"
+         transform="matrix(0.56153831,0,0,0.56153831,-15.312437,720.57846)" />
+      <path
+         id="path2991-7-1"
+         transform="translate(167.79377,599.09604)"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#b3b3b3;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         id="path2993-4-5"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc"
+         transform="matrix(0.83611704,0,0,0.83611704,210.54515,647.51817)" />
+      <rect
+         id="rect2995-0-2"
+         y="817.18872"
+         x="409.74567"
+         height="99.221687"
+         width="29.189819"
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:1.11112404" />
+      <rect
+         id="rect2997-9-7"
+         y="935.98169"
+         x="410.00391"
+         height="26.258072"
+         width="29.724136"
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:0.57680577" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:2.92446065;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 383.15829,850.33665 -64.6851,-36.2114 10.70013,55.95688 53.98497,-19.74548 z"
+         id="rect4046-3"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:1.98877633;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 372.50197,843.46474 -43.65605,-24.43447 6.99871,38.15621 36.65734,-13.72174 z"
+         id="rect4046"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:2.92446065;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 462.88559,934.94792 64.6851,36.21128 -10.70013,-55.95672 -53.98497,19.74544 z"
+         id="rect4046-3-2"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:1.98877633;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 471.91864,943.98419 43.65605,24.43442 -6.99871,-38.15607 -36.65734,13.72165 z"
+         id="rect4046-1"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path2991-7-79"
+         transform="translate(439.9024,596.03518)"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#b3b3b3;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         id="path2993-4-54"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc"
+         transform="matrix(0.83611704,0,0,0.83611704,482.65378,644.45731)" />
+      <rect
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:7.27556181;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect4271"
+         width="55.131588"
+         height="89.475853"
+         x="1123.0723"
+         y="8.2489862"
+         transform="matrix(0.69198127,0.72191545,-0.69198127,0.72191545,0,0)" />
+      <rect
+         id="rect2995-0-3-3"
+         y="1106.4344"
+         x="-89.869194"
+         height="57.711208"
+         width="24.529409"
+         style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:0.77681416"
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
+      <rect
+         id="rect2995-0-3-2"
+         y="7.221128"
+         x="1139.5251"
+         height="82.866272"
+         width="24.378254"
+         style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:0.92796957"
+         transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
+      <rect
+         id="rect2995-0-3"
+         y="814.12781"
+         x="681.85431"
+         height="99.221687"
+         width="29.189819"
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:1.11112404" />
+      <rect
+         id="rect2997-9-1"
+         y="932.58148"
+         x="682.54327"
+         height="26.258072"
+         width="29.724136"
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:0.57680577" />
+      <rect
+         y="1088.6628"
+         x="76.264809"
+         height="104.27072"
+         width="3.2554622"
+         id="rect3818-4-8"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:22.7257061;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,-274.3181,1077.1951)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-4-8-7"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,-275.85363,926.87175)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-8-4"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,-161.78913,1021.9512)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-4-8-7-7"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <rect
+         y="1087.278"
+         x="304.77451"
+         height="104.27072"
+         width="3.2554622"
+         id="rect3818-4-8-4"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:22.7257061;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,-45.808546,1075.8101)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-4-8-7-8"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,-47.344075,925.48675)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-8-4-8"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,53.509086,972.5163)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-8-4-8-2"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:6.68107271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         id="path3992-4"
+         sodipodi:cx="490.42908"
+         sodipodi:cy="950.84186"
+         sodipodi:rx="18.487062"
+         sodipodi:ry="26.506598"
+         d="m 508.91614,950.84186 c 0,14.63919 -8.27694,26.5066 -18.48706,26.5066 -10.21013,0 -18.48707,-11.86741 -18.48707,-26.5066 0,-14.63919 8.27694,-26.5066 18.48707,-26.5066 10.21012,0 18.48706,11.86741 18.48706,26.5066 z"
+         transform="matrix(4.8923198,0,0,1.0737805,-1482.0573,-466.94845)" />
+      <path
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:12.98546886;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 967.57233,525.26244 0,30.6797 -28.50183,0 0,41.2377 28.50183,0 0,27.1288 41.19027,0 0,-27.1288 29.354,0 0,-41.2377 -29.354,0 0,-30.6797 -41.19027,0 z"
+         id="rect2995-0-2-7"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path2991-7-2"
+         transform="translate(717.27126,597.74227)"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#b3b3b3;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         id="path2993-4-7"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc"
+         transform="matrix(0.7638244,0,0,0.7638244,777.85958,666.54744)" />
+      <rect
+         id="rect2995-0-6"
+         y="-220.76018"
+         x="1298.3352"
+         height="189.71017"
+         width="28.775486"
+         style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:1.52545774"
+         transform="matrix(0.67068946,0.74173826,-0.74173826,0.67068946,0,0)" />
+      <g
+         id="g4284"
+         transform="translate(-77.916708,-8.657412)">
+        <path
+           sodipodi:nodetypes="czcczcc"
+           inkscape:connector-curvature="0"
+           id="rect4201"
+           d="m 568.37427,1080.8464 c 0,0 55.60005,-9.5933 75.06243,-8.6574 19.46238,0.9359 40.43273,8.6574 40.43273,8.6574 l 0,141.4674 c 0,0 -20.97035,-7.7215 -40.43273,-8.6574 -19.46238,-0.9359 -75.06243,8.6574 -75.06243,8.6574 z"
+           style="fill:#ffffff;stroke:#b3b3b3;stroke-width:14.36538029;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4" />
+        <rect
+           y="1108.1473"
+           x="597.4068"
+           height="5.4857273"
+           width="55.265846"
+           id="rect4203"
+           style="fill:#ffffff;stroke:#b3b3b3;stroke-width:11.82844734;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+        <rect
+           y="1142.7776"
+           x="598.48895"
+           height="5.4857273"
+           width="55.26585"
+           id="rect4203-2"
+           style="fill:#ffffff;stroke:#b3b3b3;stroke-width:11.82844734;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+        <rect
+           y="1176.1093"
+           x="598.48895"
+           height="5.4857273"
+           width="55.26585"
+           id="rect4203-2-3"
+           style="fill:#ffffff;stroke:#b3b3b3;stroke-width:11.82844734;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+        <path
+           sodipodi:nodetypes="czc"
+           inkscape:connector-curvature="0"
+           id="path4245"
+           d="m 563.55369,1233.6274 c 0,0 59.11965,-16.1473 81.00954,-14.7566 21.8899,1.3907 46.29117,14.7566 46.29117,14.7566"
+           style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:19.6372261;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <g
+           transform="matrix(-1.0032405,0,0,1,1329.8708,99.560238)"
+           id="g4277">
+          <path
+             style="fill:#ffffff;stroke:#b3b3b3;stroke-width:14.36538124;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4"
+             d="m 519.67634,980.83663 c 0,0 55.60005,-9.5933 75.06243,-8.6574 19.46238,0.9359 40.43272,8.6574 40.43272,8.6574 l 0,141.46737 c 0,0 -20.97034,-7.7215 -40.43272,-8.6574 -19.46238,-0.9359 -75.06243,8.6574 -75.06243,8.6574 z"
+             id="rect4201-2"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="czcczcc" />
+          <rect
+             style="fill:#ffffff;stroke:#b3b3b3;stroke-width:11.82844734;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+             id="rect4203-21"
+             width="55.26585"
+             height="5.4857273"
+             x="548.70886"
+             y="1008.1376" />
+          <rect
+             style="fill:#ffffff;stroke:#b3b3b3;stroke-width:11.82844734;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+             id="rect4203-2-6"
+             width="55.26585"
+             height="5.4857273"
+             x="549.79102"
+             y="1042.7678" />
+          <rect
+             style="fill:#ffffff;stroke:#b3b3b3;stroke-width:11.82844734;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+             id="rect4203-2-3-8"
+             width="55.26585"
+             height="5.4857273"
+             x="549.79102"
+             y="1076.0995" />
+          <path
+             style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:19.6372261;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m 514.85576,1133.6176 c 0,0 59.11965,-16.1473 81.00954,-14.7566 21.8899,1.3907 46.29116,14.7566 46.29116,14.7566"
+             id="path4245-5"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="czc" />
+        </g>
+      </g>
+      <g
+         id="g3107"
+         transform="matrix(0.53086704,-0.53086704,0.53086704,0.53086704,-205.0028,934.47839)">
+        <rect
+           y="1165.7029"
+           x="793.91357"
+           height="177.36816"
+           width="131.91675"
+           id="rect3075"
+           style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:19.58793259;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+        <rect
+           transform="matrix(0.69911762,0.71500668,-0.71500668,0.69911762,0,0)"
+           y="145.59781"
+           x="1379.6274"
+           height="95.711494"
+           width="95.711456"
+           id="rect3075-1"
+           style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:12.25645447;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+        <path
+           transform="matrix(1.5150471,0,0,1.5150471,-201.2129,-64.133761)"
+           d="m 710,812.36218 c 0,5.52285 -4.47715,10 -10,10 -5.52285,0 -10,-4.47715 -10,-10 0,-5.52284 4.47715,-10 10,-10 5.52285,0 10,4.47716 10,10 z"
+           sodipodi:ry="10"
+           sodipodi:rx="10"
+           sodipodi:cy="812.36218"
+           sodipodi:cx="700"
+           id="path3100"
+           style="fill:#ffffff;stroke:#ffffff;stroke-width:12.69999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+           sodipodi:type="arc" />
+      </g>
+      <path
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:12.98546886;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 937.41093,1044.4944 0,30.6797 -28.50183,0 0,41.2377 28.50183,0 0,27.1288 41.19033,0 0,-27.1288 29.35404,0 0,-41.2377 -29.35404,0 0,-30.6797 -41.19033,0 z"
+         id="rect2995-0-2-7-7"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:none;stroke:#b3b3b3;stroke-width:9.34194565;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect3083"
+         width="170.93134"
+         height="207.72536"
+         x="38.526306"
+         y="1299.8645" />
+      <rect
+         style="color:#000000;fill:none;stroke:#b3b3b3;stroke-width:8.41239071;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect3083-7"
+         width="171.86089"
+         height="167.53221"
+         x="38.061527"
+         y="1300.4821" />
+      <rect
+         id="rect2995-0-4"
+         y="1301.3412"
+         x="42.553577"
+         height="163.64935"
+         width="29.769083"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-0"
+         y="1321.9025"
+         x="85.732407"
+         height="17.555511"
+         width="16.782965"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-0-9"
+         y="1356.7848"
+         x="85.732407"
+         height="17.555511"
+         width="16.782965"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-0-9-4"
+         y="1391.6671"
+         x="85.732407"
+         height="17.555511"
+         width="16.782965"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-0-9-4-8"
+         y="1426.5494"
+         x="85.732407"
+         height="17.555511"
+         width="16.782965"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-8"
+         y="1482.7141"
+         x="70.149086"
+         height="30.541632"
+         width="42.755199"
+         style="fill:#b3b3b3;stroke:none" />
+      <path
+         sodipodi:type="star"
+         style="color:#000000;fill:#b3b3b3;fill-opacity:1;stroke:none;stroke-width:7.55999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4002"
+         sodipodi:sides="3"
+         sodipodi:cx="235.71429"
+         sodipodi:cy="1000.2193"
+         sodipodi:r1="15.016997"
+         sodipodi:r2="7.5084987"
+         sodipodi:arg1="0"
+         sodipodi:arg2="1.0471976"
+         inkscape:flatsided="false"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m 250.73129,1000.2193 -11.26275,6.5026 -11.26274,6.5025 0,-13.0051 0,-13.0051 11.26274,6.50255 z"
+         transform="matrix(1.0346242,0,0,1.5150471,-165.95814,-2.7851671)"
+         inkscape:transform-center-x="-2.5637799" />
+      <path
+         sodipodi:type="star"
+         style="color:#000000;fill:#b3b3b3;fill-opacity:1;stroke:none;stroke-width:7.55999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4002-2"
+         sodipodi:sides="3"
+         sodipodi:cx="235.71429"
+         sodipodi:cy="1000.2193"
+         sodipodi:r1="15.016997"
+         sodipodi:r2="7.5084987"
+         sodipodi:arg1="0"
+         sodipodi:arg2="1.0471976"
+         inkscape:flatsided="false"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m 250.73129,1000.2193 -11.26275,6.5026 -11.26274,6.5025 0,-13.0051 0,-13.0051 11.26274,6.50255 z"
+         transform="matrix(-0.93510984,0,0,1.5150471,326.24502,-2.7851671)"
+         inkscape:transform-center-x="3.5106467" />
+      <rect
+         style="color:#000000;fill:none;stroke:#b3b3b3;stroke-width:9.34194565;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect3083-4"
+         width="170.93134"
+         height="207.72536"
+         x="280.50113"
+         y="1299.152" />
+      <rect
+         style="color:#000000;fill:none;stroke:#b3b3b3;stroke-width:8.41239071;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect3083-7-5"
+         width="171.86087"
+         height="167.53221"
+         x="280.03638"
+         y="1299.7695" />
+      <rect
+         id="rect2995-0-4-5"
+         y="1300.6287"
+         x="284.52841"
+         height="163.64934"
+         width="29.769083"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-8-5"
+         y="1482.0016"
+         x="312.12393"
+         height="30.541632"
+         width="42.755199"
+         style="fill:#b3b3b3;stroke:none" />
+      <path
+         sodipodi:type="star"
+         style="color:#000000;fill:#b3b3b3;fill-opacity:1;stroke:none;stroke-width:7.55999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4002-27"
+         sodipodi:sides="3"
+         sodipodi:cx="235.71429"
+         sodipodi:cy="1000.2193"
+         sodipodi:r1="15.016997"
+         sodipodi:r2="7.5084987"
+         sodipodi:arg1="0"
+         sodipodi:arg2="1.0471976"
+         inkscape:flatsided="false"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m 250.73129,1000.2193 -11.26275,6.5026 -11.26274,6.5025 0,-13.0051 0,-13.0051 11.26274,6.50255 z"
+         transform="matrix(1.0346242,0,0,1.5150471,76.016678,-3.496726)"
+         inkscape:transform-center-x="-3.8842459"
+         inkscape:transform-center-y="-1.5464308e-005" />
+      <path
+         sodipodi:type="star"
+         style="color:#000000;fill:#b3b3b3;fill-opacity:1;stroke:none;stroke-width:7.55999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4002-2-6"
+         sodipodi:sides="3"
+         sodipodi:cx="235.71429"
+         sodipodi:cy="1000.2193"
+         sodipodi:r1="15.016997"
+         sodipodi:r2="7.5084987"
+         sodipodi:arg1="0"
+         sodipodi:arg2="1.0471976"
+         inkscape:flatsided="false"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m 250.73129,1000.2193 -11.26275,6.5026 -11.26274,6.5025 0,-13.0051 0,-13.0051 11.26274,6.50255 z"
+         transform="matrix(-0.93510984,0,0,1.5150471,568.21986,-3.496726)"
+         inkscape:transform-center-x="5.318797"
+         inkscape:transform-center-y="-1.5464308e-005" />
+      <rect
+         id="rect2995-0-4-5-7"
+         y="1392.2405"
+         x="365.67133"
+         height="58.049755"
+         width="29.769083"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-5-7-6"
+         y="1319.5453"
+         x="326.67615"
+         height="49.632401"
+         width="29.769083"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-5-7-8"
+         y="1179.0293"
+         x="-767.54126"
+         height="58.049755"
+         width="29.769083"
+         style="fill:#b3b3b3;stroke:none"
+         transform="matrix(0.68860063,-0.7251408,0.7251408,0.68860063,0,0)" />
+      <rect
+         id="rect2995-0-4-5-7-6-9"
+         y="1319.5453"
+         x="403.28595"
+         height="49.632404"
+         width="29.769083"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-5-7-8-2"
+         y="623.14606"
+         x="-1287.8975"
+         height="55.681484"
+         width="28.564859"
+         style="fill:#b3b3b3;stroke:none"
+         transform="matrix(-0.68607628,-0.72752961,-0.72274236,0.69111755,0,0)" />
+      <rect
+         style="color:#000000;fill:#ffffff;stroke:#b3b3b3;stroke-width:7.29121827999999980;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;fill-opacity:1"
+         id="rect3083-7-5-7"
+         width="172.98204"
+         height="125.03616"
+         x="529.78156"
+         y="1383.6165" />
+      <rect
+         id="rect2995-0-4-5-9"
+         y="1385.3533"
+         x="663.37042"
+         height="123.85819"
+         width="38.18644"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-5-9-5"
+         y="1401.4539"
+         x="552.03174"
+         height="15.96297"
+         width="117.00352"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-5-9-5-4"
+         y="1437.4023"
+         x="551.16083"
+         height="15.96297"
+         width="117.00352"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-5-9-5-4-3"
+         y="1473.7642"
+         x="551.16083"
+         height="15.96297"
+         width="117.00352"
+         style="fill:#b3b3b3;stroke:none" />
+      <path
+         style="fill:none;stroke:#b3b3b3;stroke-width:23.0681076;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 558.62308,1380.7989 0,-45.237 c 0,0 13.52904,-35.6384 56.38304,-36.1894 40.81922,-0.5248 55.47363,34.6931 55.47363,34.6931 l 0.17276,48.4719"
+         id="path4310"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccscc" />
+    </g>
+  </g>
+</svg>

project/build.properties

@@ -0,0 +1 @@
+sbt.version=0.13.1

project/build.scala

@@ -1,7 +1,6 @@
 import sbt._
 import Keys._
 import org.scalatra.sbt._
-import org.scalatra.sbt.PluginKeys._
 import twirl.sbt.TwirlPlugin._
 import com.typesafe.sbteclipse.plugin.EclipsePlugin.EclipseKeys
 
@@ -9,8 +8,8 @@ object MyBuild extends Build {
   val Organization = "jp.sf.amateras"
   val Name = "gitbucket"
   val Version = "0.0.1"
-  val ScalaVersion = "2.10.1"
+  val ScalaVersion = "2.10.3"
-  val ScalatraVersion = "2.2.0"
+  val ScalatraVersion = "2.2.1"
 
   lazy val project = Project (
     "gitbucket",
@@ -20,24 +19,36 @@ object MyBuild extends Build {
       name := Name,
       version := Version,
       scalaVersion := ScalaVersion,
-      resolvers += Classpaths.typesafeReleases,
+      resolvers ++= Seq(
+        Classpaths.typesafeReleases,
+        "amateras-repo" at "http://amateras.sourceforge.jp/mvn/"
+      ),
+      scalacOptions := Seq("-deprecation", "-language:postfixOps"),
       libraryDependencies ++= Seq(
         "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "3.0.0.201306101825-r",
-        "org.apache.commons" % "commons-io" % "1.3.2",
         "org.scalatra" %% "scalatra" % ScalatraVersion,
         "org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test",
         "org.scalatra" %% "scalatra-json" % ScalatraVersion,
-        "org.json4s" %% "json4s-jackson" % "3.2.4",
+        "org.json4s" %% "json4s-jackson" % "3.2.5",
+        "jp.sf.amateras" %% "scalatra-forms" % "0.0.14",
         "commons-io" % "commons-io" % "2.4",
-        "org.pegdown" % "pegdown" % "1.3.0",
+        "org.pegdown" % "pegdown" % "1.4.1",
         "org.apache.commons" % "commons-compress" % "1.5",
+        "org.apache.commons" % "commons-email" % "1.3.1",
+        "org.apache.httpcomponents" % "httpclient" % "4.3",
+        "org.apache.sshd" % "apache-sshd" % "0.10.0",
         "com.typesafe.slick" %% "slick" % "1.0.1",
-        "com.h2database" % "h2" % "1.3.171",
+        "com.novell.ldap" % "jldap" % "2009-10-07",
-        "ch.qos.logback" % "logback-classic" % "1.0.6" % "runtime",
+        "com.h2database" % "h2" % "1.3.173",
-        "org.eclipse.jetty" % "jetty-webapp" % "8.1.8.v20121106" % "container",
+        "ch.qos.logback" % "logback-classic" % "1.0.13" % "runtime",
-        "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container;provided;test" artifacts (Artifact("javax.servlet", "jar", "jar"))
+        "org.eclipse.jetty" % "jetty-webapp" % "8.1.8.v20121106" % "container;provided",
+        "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container;provided;test" artifacts Artifact("javax.servlet", "jar", "jar"),
+        "junit" % "junit" % "4.11" % "test"
       ),
-      EclipseKeys.withSource := true
+      EclipseKeys.withSource := true,
+      javacOptions in compile ++= Seq("-target", "6", "-source", "6"),
+      testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "junitxml", "console"),
+      packageOptions += Package.MainClass("JettyLauncher")
     ) ++ seq(Twirl.settings: _*)
   )
-}
+}

project/plugins.sbt

@@ -1,7 +1,11 @@
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.1.2")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.4.0")
 
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.2.0")
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
 
-addSbtPlugin("org.scalatra.sbt" % "scalatra-sbt" % "0.2.0")
+addSbtPlugin("org.scalatra.sbt" % "scalatra-sbt" % "0.3.5")
 
-addSbtPlugin("io.spray" % "sbt-twirl" % "0.6.1")
+resolvers += "spray repo" at "http://repo.spray.io"
+
+addSbtPlugin("io.spray" % "sbt-twirl" % "0.7.0")
+
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.4")

sbt.bat

@@ -1,2 +1,2 @@
 set SCRIPT_DIR=%~dp0
-java -Dhttp.proxyHost=proxy.intellilink.co.jp -Dhttp.proxyPort=8080 -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -jar "%SCRIPT_DIR%\sbt-launch-0.12.3.jar" %*
+java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar "%SCRIPT_DIR%\sbt-launch-0.13.1.jar" %*

sbt.sh

@@ -0,0 +1 @@
+java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar `dirname $0`/sbt-launch-0.13.1.jar "$@"

src/main/java/JettyLauncher.java

@@ -0,0 +1,62 @@
+import org.eclipse.jetty.io.EndPoint;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.webapp.WebAppContext;
+
+import java.io.IOException;
+import java.net.URL;
+import java.security.ProtectionDomain;
+
+public class JettyLauncher {
+    public static void main(String[] args) throws Exception {
+        String host = null;
+        int port = 8080;
+        String contextPath = "/";
+        boolean forceHttps = false;
+
+        for(String arg: args) {
+            if(arg.startsWith("--") && arg.contains("=")) {
+                String[] dim = arg.split("=");
+                if(dim.length >= 2) {
+                    if(dim[0].equals("--host")) {
+                        host = dim[1];
+                    } else if(dim[0].equals("--port")) {
+                        port = Integer.parseInt(dim[1]);
+                    } else if(dim[0].equals("--prefix")) {
+                        contextPath = dim[1];
+                    } else if(dim[0].equals("--gitbucket.home")){
+                        System.setProperty("gitbucket.home", dim[1]);
+                    }
+                }
+            }
+        }
+
+        Server server = new Server();
+
+        SelectChannelConnector connector = new SelectChannelConnector();
+        if(host != null) {
+            connector.setHost(host);
+        }
+        connector.setMaxIdleTime(1000 * 60 * 60);
+        connector.setSoLingerTime(-1);
+        connector.setPort(port);
+        server.addConnector(connector);
+
+        WebAppContext context = new WebAppContext();
+        ProtectionDomain domain = JettyLauncher.class.getProtectionDomain();
+        URL location = domain.getCodeSource().getLocation();
+
+        context.setContextPath(contextPath);
+        context.setDescriptor(location.toExternalForm() + "/WEB-INF/web.xml");
+        context.setServer(server);
+        context.setWar(location.toExternalForm());
+        if (forceHttps) {
+            context.setInitParameter("org.scalatra.ForceHttps", "true");
+        }
+
+        server.setHandler(context);
+        server.start();
+        server.join();
+    }
+}

src/main/java/util/PatchUtil.java

@@ -0,0 +1,93 @@
+package util;
+
+import org.eclipse.jgit.api.errors.PatchApplyException;
+import org.eclipse.jgit.diff.RawText;
+import org.eclipse.jgit.internal.JGitText;
+import org.eclipse.jgit.patch.FileHeader;
+import org.eclipse.jgit.patch.HunkHeader;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class helps to apply patch. Most of these code came from {@link org.eclipse.jgit.api.ApplyCommand}.
+ */
+public class PatchUtil {
+
+    public static String apply(String source, String patch, FileHeader fh)
+            throws IOException, PatchApplyException {
+        RawText rt = new RawText(source.getBytes("UTF-8"));
+        List<String> oldLines = new ArrayList<String>(rt.size());
+        for (int i = 0; i < rt.size(); i++)
+            oldLines.add(rt.getString(i));
+        List<String> newLines = new ArrayList<String>(oldLines);
+        for (HunkHeader hh : fh.getHunks()) {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            out.write(patch.getBytes("UTF-8"), hh.getStartOffset(), hh.getEndOffset() - hh.getStartOffset());
+            RawText hrt = new RawText(out.toByteArray());
+            List<String> hunkLines = new ArrayList<String>(hrt.size());
+            for (int i = 0; i < hrt.size(); i++)
+                hunkLines.add(hrt.getString(i));
+            int pos = 0;
+            for (int j = 1; j < hunkLines.size(); j++) {
+                String hunkLine = hunkLines.get(j);
+                switch (hunkLine.charAt(0)) {
+                    case ' ':
+                        if (!newLines.get(hh.getNewStartLine() - 1 + pos).equals(
+                                hunkLine.substring(1))) {
+                            throw new PatchApplyException(MessageFormat.format(
+                                    JGitText.get().patchApplyException, hh));
+                        }
+                        pos++;
+                        break;
+                    case '-':
+                        if (!newLines.get(hh.getNewStartLine() - 1 + pos).equals(
+                                hunkLine.substring(1))) {
+                            throw new PatchApplyException(MessageFormat.format(
+                                    JGitText.get().patchApplyException, hh));
+                        }
+                        newLines.remove(hh.getNewStartLine() - 1 + pos);
+                        break;
+                    case '+':
+                        newLines.add(hh.getNewStartLine() - 1 + pos,
+                                hunkLine.substring(1));
+                        pos++;
+                        break;
+                }
+            }
+        }
+        if (!isNoNewlineAtEndOfFile(fh))
+            newLines.add(""); //$NON-NLS-1$
+        if (!rt.isMissingNewlineAtEnd())
+            oldLines.add(""); //$NON-NLS-1$
+        if (!isChanged(oldLines, newLines))
+            return null; // don't touch the file
+        StringBuilder sb = new StringBuilder();
+        for (String l : newLines) {
+            // don't bother handling line endings - if it was windows, the \r is
+            // still there!
+            sb.append(l).append('\n');
+        }
+        sb.deleteCharAt(sb.length() - 1);
+        return sb.toString();
+    }
+
+    private static boolean isChanged(List<String> ol, List<String> nl) {
+        if (ol.size() != nl.size())
+            return true;
+        for (int i = 0; i < ol.size(); i++)
+            if (!ol.get(i).equals(nl.get(i)))
+                return true;
+        return false;
+    }
+
+    private static boolean isNoNewlineAtEndOfFile(FileHeader fh) {
+        HunkHeader lastHunk = fh.getHunks().get(fh.getHunks().size() - 1);
+        RawText lhrt = new RawText(lastHunk.getBuffer());
+        return lhrt.getString(lhrt.size() - 1).equals(
+                "\\ No newline at end of file"); //$NON-NLS-1$
+    }
+}

src/main/resources/logback.xml

@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-  <logger name="scala.slick" level="INFO" />
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="STDOUT" />
+  </root>
+  
+  <!--
+  <logger name="service.WebHookService" level="DEBUG" />
+  <logger name="servlet" level="DEBUG" />
+  -->
 </configuration>

src/main/resources/update/1_12.sql

@@ -0,0 +1,11 @@
+ALTER TABLE GROUP_MEMBER ADD COLUMN MANAGER BOOLEAN DEFAULT FALSE;
+
+CREATE TABLE SSH_KEY (
+  USER_NAME VARCHAR(100) NOT NULL,
+  SSH_KEY_ID INT AUTO_INCREMENT,
+  TITLE VARCHAR(100) NOT NULL,
+  PUBLIC_KEY TEXT NOT NULL
+);
+
+ALTER TABLE SSH_KEY ADD CONSTRAINT IDX_SSH_KEY_PK PRIMARY KEY (USER_NAME, SSH_KEY_ID);
+ALTER TABLE SSH_KEY ADD CONSTRAINT IDX_SSH_KEY_FK0 FOREIGN KEY (USER_NAME) REFERENCES ACCOUNT (USER_NAME);

src/main/resources/update/1_5.sql

@@ -0,0 +1,21 @@
+ALTER TABLE REPOSITORY ADD COLUMN ORIGIN_USER_NAME VARCHAR(100);
+ALTER TABLE REPOSITORY ADD COLUMN ORIGIN_REPOSITORY_NAME VARCHAR(100);
+ALTER TABLE REPOSITORY ADD COLUMN PARENT_USER_NAME VARCHAR(100);
+ALTER TABLE REPOSITORY ADD COLUMN PARENT_REPOSITORY_NAME VARCHAR(100);
+
+CREATE TABLE PULL_REQUEST(
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		ISSUE_ID INT NOT NULL,
+		BRANCH VARCHAR(100) NOT NULL,
+		REQUEST_USER_NAME VARCHAR(100) NOT NULL,
+		REQUEST_REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		REQUEST_BRANCH VARCHAR(100) NOT NULL,
+		COMMIT_ID_FROM VARCHAR(40) NOT NULL,
+		COMMIT_ID_TO VARCHAR(40) NOT NULL
+);
+
+ALTER TABLE PULL_REQUEST ADD CONSTRAINT IDX_PULL_REQUEST_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, ISSUE_ID);
+ALTER TABLE PULL_REQUEST ADD CONSTRAINT IDX_PULL_REQUEST_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME, ISSUE_ID) REFERENCES ISSUE (USER_NAME, REPOSITORY_NAME, ISSUE_ID);
+
+ALTER TABLE ISSUE ADD COLUMN PULL_REQUEST BOOLEAN NOT NULL DEFAULT FALSE;

src/main/resources/update/1_6.sql

@@ -0,0 +1,8 @@
+CREATE TABLE WEB_HOOK (
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		URL VARCHAR(200) NOT NULL
+);
+
+ALTER TABLE WEB_HOOK ADD CONSTRAINT IDX_WEB_HOOK_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, URL);
+ALTER TABLE WEB_HOOK ADD CONSTRAINT IDX_WEB_HOOK_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);

src/main/resources/update/1_7.sql

@@ -0,0 +1,5 @@
+ALTER TABLE ACCOUNT ADD COLUMN FULL_NAME VARCHAR(100);
+
+UPDATE ACCOUNT SET FULL_NAME = USER_NAME WHERE FULL_NAME IS NULL;
+
+ALTER TABLE ACCOUNT ALTER COLUMN FULL_NAME SET NOT NULL;

src/main/resources/update/1_8.sql

@@ -0,0 +1 @@
+ALTER TABLE ACCOUNT ADD COLUMN REMOVED BOOLEAN DEFAULT FALSE;

src/main/scala/ScalatraBootstrap.scala

@@ -1,25 +1,36 @@
+import _root_.servlet.{BasicAuthenticationFilter, TransactionFilter}
 import app._
+import jp.sf.amateras.scalatra.forms.ValidationJavaScriptProvider
 import org.scalatra._
 import javax.servlet._
+import java.util.EnumSet
 
 class ScalatraBootstrap extends LifeCycle {
   override def init(context: ServletContext) {
+    // Register TransactionFilter and BasicAuthenticationFilter at first
+    context.addFilter("transactionFilter", new TransactionFilter)
+    context.getFilterRegistration("transactionFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
+    context.addFilter("basicAuthenticationFilter", new BasicAuthenticationFilter)
+    context.getFilterRegistration("basicAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/git/*")
+
+    // Register controllers
     context.mount(new IndexController, "/")
     context.mount(new SearchController, "/")
     context.mount(new FileUploadController, "/upload")
-    context.mount(new SignInController, "/*")
     context.mount(new DashboardController, "/*")
     context.mount(new UserManagementController, "/*")
     context.mount(new SystemSettingsController, "/*")
-    context.mount(new CreateRepositoryController, "/*")
     context.mount(new AccountController, "/*")
     context.mount(new RepositoryViewerController, "/*")
     context.mount(new WikiController, "/*")
     context.mount(new LabelsController, "/*")
     context.mount(new MilestonesController, "/*")
     context.mount(new IssuesController, "/*")
+    context.mount(new PullRequestsController, "/*")
     context.mount(new RepositorySettingsController, "/*")
+    context.mount(new ValidationJavaScriptProvider, "/assets/common/js/*")
 
+    // Create GITBUCKET_HOME directory if it does not exist
     val dir = new java.io.File(_root_.util.Directory.GitBucketHome)
     if(!dir.exists){
       dir.mkdirs()

src/main/scala/app/AccountController.scala

@@ -1,29 +1,38 @@
 package app
 
 import service._
-import util.{FileUtil, OneselfAuthenticator}
+import util._
 import util.StringUtil._
 import util.Directory._
+import util.ControlUtil._
 import jp.sf.amateras.scalatra.forms._
-import org.scalatra.FlashMapSupport
+import org.apache.commons.io.FileUtils
+import org.scalatra.i18n.Messages
+import org.eclipse.jgit.api.Git
+import org.eclipse.jgit.lib.{FileMode, Constants}
+import org.eclipse.jgit.dircache.DirCache
+import model.GroupMember
 
 class AccountController extends AccountControllerBase
-  with SystemSettingsService with AccountService with RepositoryService with ActivityService
+  with AccountService with RepositoryService with ActivityService with WikiService with LabelsService with SshKeyService
-  with OneselfAuthenticator
+  with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator
 
-trait AccountControllerBase extends AccountManagementControllerBase with FlashMapSupport {
+trait AccountControllerBase extends AccountManagementControllerBase {
-  self: SystemSettingsService with AccountService with RepositoryService with ActivityService
+  self: AccountService with RepositoryService with ActivityService with WikiService with LabelsService with SshKeyService
-    with OneselfAuthenticator =>
+    with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator =>
 
-  case class AccountNewForm(userName: String, password: String,mailAddress: String,
+  case class AccountNewForm(userName: String, password: String, fullName: String, mailAddress: String,
                             url: Option[String], fileId: Option[String])
 
-  case class AccountEditForm(password: Option[String], mailAddress: String,
+  case class AccountEditForm(password: Option[String], fullName: String, mailAddress: String,
                              url: Option[String], fileId: Option[String], clearImage: Boolean)
 
+  case class SshKeyForm(title: String, publicKey: String)
+
   val newForm = mapping(
     "userName"    -> trim(label("User name"    , text(required, maxlength(100), identifier, uniqueUserName))),
     "password"    -> trim(label("Password"     , text(required, maxlength(20)))),
+    "fullName"    -> trim(label("Full Name"    , text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress()))),
     "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
     "fileId"      -> trim(label("File ID"      , optional(text())))
@@ -31,12 +40,52 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
 
   val editForm = mapping(
     "password"    -> trim(label("Password"     , optional(text(maxlength(20))))),
+    "fullName"    -> trim(label("Full Name"    , text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress("userName")))),
     "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
     "fileId"      -> trim(label("File ID"      , optional(text()))),
     "clearImage"  -> trim(label("Clear image"  , boolean()))
   )(AccountEditForm.apply)
 
+  val sshKeyForm = mapping(
+    "title"     -> trim(label("Title", text(required, maxlength(100)))),
+    "publicKey" -> trim(label("Key"  , text(required)))
+  )(SshKeyForm.apply)
+
+  case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String], members: String)
+  case class EditGroupForm(groupName: String, url: Option[String], fileId: Option[String], members: String, clearImage: Boolean)
+
+  val newGroupForm = mapping(
+    "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName))),
+    "url"       -> trim(label("URL"        ,optional(text(maxlength(200))))),
+    "fileId"    -> trim(label("File ID"    ,optional(text()))),
+    "members"   -> trim(label("Members"    ,text(required, members)))
+  )(NewGroupForm.apply)
+
+  val editGroupForm = mapping(
+    "groupName"  -> trim(label("Group name"  ,text(required, maxlength(100), identifier))),
+    "url"        -> trim(label("URL"         ,optional(text(maxlength(200))))),
+    "fileId"     -> trim(label("File ID"     ,optional(text()))),
+    "members"    -> trim(label("Members"     ,text(required, members))),
+    "clearImage" -> trim(label("Clear image" ,boolean()))
+  )(EditGroupForm.apply)
+
+  case class RepositoryCreationForm(owner: String, name: String, description: Option[String], isPrivate: Boolean, createReadme: Boolean)
+  case class ForkRepositoryForm(owner: String, name: String)
+
+  val newRepositoryForm = mapping(
+    "owner"        -> trim(label("Owner"          , text(required, maxlength(40), identifier, existsAccount))),
+    "name"         -> trim(label("Repository name", text(required, maxlength(40), identifier, uniqueRepository))),
+    "description"  -> trim(label("Description"    , optional(text()))),
+    "isPrivate"    -> trim(label("Repository Type", boolean())),
+    "createReadme" -> trim(label("Create README"  , boolean()))
+  )(RepositoryCreationForm.apply)
+
+  val forkRepositoryForm = mapping(
+    "owner" -> trim(label("Repository owner", text(required))),
+    "name"  -> trim(label("Repository name",  text(required)))
+  )(ForkRepositoryForm.apply)
+
   /**
    * Displays user information.
    */
@@ -51,14 +100,20 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
             getActivitiesByUser(userName, true))
 
         // Members
-        case "members" if(account.isGroupAccount) =>
+        case "members" if(account.isGroupAccount) => {
-          _root_.account.html.members(account, getGroupMembers(account.userName))
+          val members = getGroupMembers(account.userName)
+          _root_.account.html.members(account, members.map(_.userName),
+            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager }))
+        }
 
         // Repositories
-        case _ =>
+        case _ => {
+          val members = getGroupMembers(account.userName)
           _root_.account.html.repositories(account,
             if(account.isGroupAccount) Nil else getGroupsByUserName(userName),
-            getVisibleRepositories(context.loginAccount, baseUrl, Some(userName)))
+            getVisibleRepositories(context.loginAccount, baseUrl, Some(userName)),
+            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager }))
+        }
       }
     } getOrElse NotFound
   }
@@ -76,7 +131,9 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
 
   get("/:userName/_edit")(oneselfOnly {
     val userName = params("userName")
-    getAccountByUserName(userName).map(x => account.html.edit(Some(x), flash.get("info"))) getOrElse NotFound
+    getAccountByUserName(userName).map { x =>
+      account.html.edit(x, flash.get("info"))
+    } getOrElse NotFound
   })
 
   post("/:userName/_edit", editForm)(oneselfOnly { form =>
@@ -84,6 +141,7 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
     getAccountByUserName(userName).map { account =>
       updateAccount(account.copy(
         password    = form.password.map(sha1).getOrElse(account.password),
+        fullName    = form.fullName,
         mailAddress = form.mailAddress,
         url         = form.url))
 
@@ -94,22 +152,287 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
     } getOrElse NotFound
   })
 
+  get("/:userName/_delete")(oneselfOnly {
+    val userName = params("userName")
+
+    getAccountByUserName(userName, true).foreach { account =>
+      // Remove repositories
+      getRepositoryNamesOfUser(userName).foreach { repositoryName =>
+        deleteRepository(userName, repositoryName)
+        FileUtils.deleteDirectory(getRepositoryDir(userName, repositoryName))
+        FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName))
+        FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName))
+      }
+      // Remove from GROUP_MEMBER, COLLABORATOR and REPOSITORY
+      removeUserRelatedData(userName)
+
+      updateAccount(account.copy(isRemoved = true))
+    }
+
+    session.invalidate
+    redirect("/")
+  })
+
+  get("/:userName/_ssh")(oneselfOnly {
+    val userName = params("userName")
+    getAccountByUserName(userName).map { x =>
+      account.html.ssh(x, getPublicKeys(x.userName))
+    } getOrElse NotFound
+  })
+
+  post("/:userName/_ssh", sshKeyForm)(oneselfOnly { form =>
+    val userName = params("userName")
+    addPublicKey(userName, form.title, form.publicKey)
+    redirect(s"/${userName}/_ssh")
+  })
+
+  get("/:userName/_ssh/delete/:id")(oneselfOnly {
+    val userName = params("userName")
+    val sshKeyId = params("id").toInt
+    deletePublicKey(userName, sshKeyId)
+    redirect(s"/${userName}/_ssh")
+  })
+
   get("/register"){
-    if(loadSystemSettings().allowAccountRegistration){
+    if(context.settings.allowAccountRegistration){
       if(context.loginAccount.isDefined){
         redirect("/")
       } else {
-        account.html.edit(None, None)
+        account.html.register()
       }
     } else NotFound
   }
 
   post("/register", newForm){ form =>
-    if(loadSystemSettings().allowAccountRegistration){
+    if(context.settings.allowAccountRegistration){
-      createAccount(form.userName, sha1(form.password), form.mailAddress, false, form.url)
+      createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, false, form.url)
       updateImage(form.userName, form.fileId, false)
       redirect("/signin")
     } else NotFound
   }
 
+  get("/groups/new")(usersOnly {
+    account.html.group(None, List(GroupMember("", context.loginAccount.get.userName, true)))
+  })
+
+  post("/groups/new", newGroupForm)(usersOnly { form =>
+    createGroup(form.groupName, form.url)
+    updateGroupMembers(form.groupName, form.members.split(",").map {
+      _.split(":") match {
+        case Array(userName, isManager) => (userName, isManager.toBoolean)
+      }
+    }.toList)
+    updateImage(form.groupName, form.fileId, false)
+    redirect(s"/${form.groupName}")
+  })
+
+  get("/:groupName/_editgroup")(managersOnly {
+    defining(params("groupName")){ groupName =>
+      account.html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName))
+    }
+  })
+
+  get("/:groupName/_deletegroup")(managersOnly {
+    defining(params("groupName")){ groupName =>
+      // Remove from GROUP_MEMBER
+      updateGroupMembers(groupName, Nil)
+      // Remove repositories
+      getRepositoryNamesOfUser(groupName).foreach { repositoryName =>
+        deleteRepository(groupName, repositoryName)
+        FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName))
+        FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
+        FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
+      }
+    }
+    redirect("/")
+  })
+
+  post("/:groupName/_editgroup", editGroupForm)(managersOnly { form =>
+    defining(params("groupName"), form.members.split(",").map {
+      _.split(":") match {
+        case Array(userName, isManager) => (userName, isManager.toBoolean)
+      }
+    }.toList){ case (groupName, members) =>
+      getAccountByUserName(groupName, true).map { account =>
+        updateGroup(groupName, form.url, false)
+
+        // Update GROUP_MEMBER
+        updateGroupMembers(form.groupName, members)
+        // Update COLLABORATOR for group repositories
+        getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
+          removeCollaborators(form.groupName, repositoryName)
+          members.foreach { case (userName, isManager) =>
+            addCollaborator(form.groupName, repositoryName, userName)
+          }
+        }
+
+        updateImage(form.groupName, form.fileId, form.clearImage)
+        redirect(s"/${form.groupName}")
+
+      } getOrElse NotFound
+    }
+  })
+
+  /**
+   * Show the new repository form.
+   */
+  get("/new")(usersOnly {
+    account.html.newrepo(getGroupsByUserName(context.loginAccount.get.userName))
+  })
+
+  /**
+   * Create new repository.
+   */
+  post("/new", newRepositoryForm)(usersOnly { form =>
+    LockUtil.lock(s"${form.owner}/${form.name}/create"){
+      if(getRepository(form.owner, form.name, baseUrl).isEmpty){
+        val ownerAccount  = getAccountByUserName(form.owner).get
+        val loginAccount  = context.loginAccount.get
+        val loginUserName = loginAccount.userName
+
+        // Insert to the database at first
+        createRepository(form.name, form.owner, form.description, form.isPrivate)
+
+        // Add collaborators for group repository
+        if(ownerAccount.isGroupAccount){
+          getGroupMembers(form.owner).foreach { member =>
+            addCollaborator(form.owner, form.name, member.userName)
+          }
+        }
+
+        // Insert default labels
+        insertDefaultLabels(form.owner, form.name)
+
+        // Create the actual repository
+        val gitdir = getRepositoryDir(form.owner, form.name)
+        JGitUtil.initRepository(gitdir)
+
+        if(form.createReadme){
+          using(Git.open(gitdir)){ git =>
+            val builder  = DirCache.newInCore.builder()
+            val inserter = git.getRepository.newObjectInserter()
+            val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
+            val content  = if(form.description.nonEmpty){
+              form.name + "\n" +
+              "===============\n" +
+              "\n" +
+              form.description.get
+            } else {
+              form.name + "\n" +
+              "===============\n"
+            }
+
+            builder.add(JGitUtil.createDirCacheEntry("README.md", FileMode.REGULAR_FILE,
+              inserter.insert(Constants.OBJ_BLOB, content.getBytes("UTF-8"))))
+            builder.finish()
+
+            JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
+              loginAccount.fullName, loginAccount.mailAddress, "Initial commit")
+          }
+        }
+
+        // Create Wiki repository
+        createWikiRepository(loginAccount, form.owner, form.name)
+
+        // Record activity
+        recordCreateRepositoryActivity(form.owner, form.name, loginUserName)
+      }
+
+      // redirect to the repository
+      redirect(s"/${form.owner}/${form.name}")
+    }
+  })
+
+  get("/:owner/:repository/fork")(readableUsersOnly { repository =>
+    val loginAccount   = context.loginAccount.get
+    val loginUserName  = loginAccount.userName
+
+    LockUtil.lock(s"${loginUserName}/${repository.name}/create"){
+      if(repository.owner == loginUserName){
+        // redirect to the repository
+        redirect(s"/${repository.owner}/${repository.name}")
+      } else {
+        getForkedRepositories(repository.owner, repository.name).find(_._1 == loginUserName).map { case (owner, name) =>
+          // redirect to the repository
+          redirect(s"/${owner}/${name}")
+        } getOrElse {
+          // Insert to the database at first
+          val originUserName = repository.repository.originUserName.getOrElse(repository.owner)
+          val originRepositoryName = repository.repository.originRepositoryName.getOrElse(repository.name)
+
+          createRepository(
+            repositoryName       = repository.name,
+            userName             = loginUserName,
+            description          = repository.repository.description,
+            isPrivate            = repository.repository.isPrivate,
+            originRepositoryName = Some(originRepositoryName),
+            originUserName       = Some(originUserName),
+            parentRepositoryName = Some(repository.name),
+            parentUserName       = Some(repository.owner)
+          )
+
+          // Insert default labels
+          insertDefaultLabels(loginUserName, repository.name)
+
+          // clone repository actually
+          JGitUtil.cloneRepository(
+            getRepositoryDir(repository.owner, repository.name),
+            getRepositoryDir(loginUserName, repository.name))
+
+          // Create Wiki repository
+          JGitUtil.cloneRepository(
+            getWikiRepositoryDir(repository.owner, repository.name),
+            getWikiRepositoryDir(loginUserName, repository.name))
+
+          // insert commit id
+          using(Git.open(getRepositoryDir(loginUserName, repository.name))){ git =>
+            JGitUtil.getRepositoryInfo(loginUserName, repository.name, baseUrl).branchList.foreach { branch =>
+              JGitUtil.getCommitLog(git, branch) match {
+                case Right((commits, _)) => commits.foreach { commit =>
+                  if(!existsCommitId(loginUserName, repository.name, commit.id)){
+                    insertCommitId(loginUserName, repository.name, commit.id)
+                  }
+                }
+                case Left(_) => ???
+              }
+            }
+          }
+
+          // Record activity
+          recordForkActivity(repository.owner, repository.name, loginUserName)
+          // redirect to the repository
+          redirect(s"/${loginUserName}/${repository.name}")
+        }
+      }
+    }
+  })
+
+  private def insertDefaultLabels(userName: String, repositoryName: String): Unit = {
+    createLabel(userName, repositoryName, "bug", "fc2929")
+    createLabel(userName, repositoryName, "duplicate", "cccccc")
+    createLabel(userName, repositoryName, "enhancement", "84b6eb")
+    createLabel(userName, repositoryName, "invalid", "e6e6e6")
+    createLabel(userName, repositoryName, "question", "cc317c")
+    createLabel(userName, repositoryName, "wontfix", "ffffff")
+  }
+
+  private def existsAccount: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      if(getAccountByUserName(value).isEmpty) Some("User or group does not exist.") else None
+  }
+
+  private def uniqueRepository: Constraint = new Constraint(){
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
+      params.get("owner").flatMap { userName =>
+        getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.")
+      }
+  }
+
+  private def members: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] = {
+      if(value.split(",").exists {
+        _.split(":") match { case Array(userName, isManager) => isManager.toBoolean }
+      }) None else Some("Must select one manager at least.")
+    }
+  }
 }

src/main/scala/app/ControllerBase.scala

@@ -1,44 +1,51 @@
 package app
 
 import _root_.util.Directory._
-import _root_.util.{StringUtil, FileUtil, Validations}
+import _root_.util.Implicits._
+import _root_.util.ControlUtil._
+import _root_.util.{StringUtil, FileUtil, Validations, Keys}
 import org.scalatra._
 import org.scalatra.json._
 import org.json4s._
 import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils
 import model.Account
-import scala.Some
+import service.{SystemSettingsService, AccountService}
-import service.AccountService
 import javax.servlet.http.{HttpServletResponse, HttpSession, HttpServletRequest}
 import java.text.SimpleDateFormat
 import javax.servlet.{FilterChain, ServletResponse, ServletRequest}
+import org.scalatra.i18n._
 
 /**
  * Provides generic features for controller implementations.
  */
 abstract class ControllerBase extends ScalatraFilter
-  with ClientSideValidationFormSupport with JacksonJsonSupport with Validations {
+  with ClientSideValidationFormSupport with JacksonJsonSupport with I18nSupport with FlashMapSupport with Validations
+  with SystemSettingsService {
 
   implicit val jsonFormats = DefaultFormats
 
-  override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain) {
+  // Don't set content type via Accept header.
+  override def format(implicit request: HttpServletRequest) = ""
+
+  override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = try {
     val httpRequest  = request.asInstanceOf[HttpServletRequest]
     val httpResponse = response.asInstanceOf[HttpServletResponse]
     val context      = request.getServletContext.getContextPath
     val path         = httpRequest.getRequestURI.substring(context.length)
 
     if(path.startsWith("/console/")){
-      val account = httpRequest.getSession.getAttribute("LOGIN_ACCOUNT").asInstanceOf[Account]
+      val account = httpRequest.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
+      val baseUrl = this.baseUrl(httpRequest)
       if(account == null){
         // Redirect to login form
-        httpResponse.sendRedirect(context + "/signin?" + path)
+        httpResponse.sendRedirect(baseUrl + "/signin?redirect=" + StringUtil.urlEncode(path))
       } else if(account.isAdmin){
         // H2 Console (administrators only)
         chain.doFilter(request, response)
       } else {
         // Redirect to dashboard
-        httpResponse.sendRedirect(context + "/")
+        httpResponse.sendRedirect(baseUrl + "/")
       }
     } else if(path.startsWith("/git/")){
       // Git repository
@@ -47,84 +54,94 @@ abstract class ControllerBase extends ScalatraFilter
       // Scalatra actions
       super.doFilter(request, response, chain)
     }
+  } finally {
+    contextCache.remove();
   }
 
+  private val contextCache = new java.lang.ThreadLocal[Context]()
+
   /**
    * Returns the context object for the request.
    */
-  implicit def context: Context = Context(servletContext.getContextPath, LoginAccount, currentURL, request)
+  implicit def context: Context = {
-
+    contextCache.get match {
-  private def currentURL: String = {
+      case null => {
-    val queryString = request.getQueryString
+        val context = Context(loadSystemSettings(), LoginAccount, request)
-    request.getRequestURI + (if(queryString != null) "?" + queryString else "")
+        contextCache.set(context)
-  }
+        context
-
+      }
-  private def LoginAccount: Option[Account] = {
+      case context => context
-    session.get("LOGIN_ACCOUNT") match {
-      case Some(x: Account) => Some(x)
-      case _ => None
     }
   }
 
-  def ajaxGet(path : String)(action : => Any) : Route = {
+  private def LoginAccount: Option[Account] = session.getAs[Account](Keys.Session.LoginAccount)
+
+  def ajaxGet(path : String)(action : => Any) : Route =
     super.get(path){
-      request.setAttribute("AJAX", "true")
+      request.setAttribute(Keys.Request.Ajax, "true")
       action
     }
-  }
 
-  override def ajaxGet[T](path : String, form : MappingValueType[T])(action : T => Any) : Route = {
+  override def ajaxGet[T](path : String, form : ValueType[T])(action : T => Any) : Route =
     super.ajaxGet(path, form){ form =>
-      request.setAttribute("AJAX", "true")
+      request.setAttribute(Keys.Request.Ajax, "true")
       action(form)
     }
-  }
 
-  def ajaxPost(path : String)(action : => Any) : Route = {
+  def ajaxPost(path : String)(action : => Any) : Route =
     super.post(path){
-      request.setAttribute("AJAX", "true")
+      request.setAttribute(Keys.Request.Ajax, "true")
       action
     }
-  }
 
-  override def ajaxPost[T](path : String, form : MappingValueType[T])(action : T => Any) : Route = {
+  override def ajaxPost[T](path : String, form : ValueType[T])(action : T => Any) : Route =
     super.ajaxPost(path, form){ form =>
-      request.setAttribute("AJAX", "true")
+      request.setAttribute(Keys.Request.Ajax, "true")
       action(form)
     }
-  }
 
-  protected def NotFound() = {
+  protected def NotFound() =
-    if(request.getAttribute("AJAX") == null){
+    if(request.hasAttribute(Keys.Request.Ajax)){
-      org.scalatra.NotFound(html.error("Not Found"))
-    } else {
       org.scalatra.NotFound()
+    } else {
+      org.scalatra.NotFound(html.error("Not Found"))
     }
-  }
 
-  protected def Unauthorized()(implicit context: app.Context) = {
+  protected def Unauthorized()(implicit context: app.Context) =
-    if(request.getAttribute("AJAX") == null){
+    if(request.hasAttribute(Keys.Request.Ajax)){
+      org.scalatra.Unauthorized()
+    } else {
       if(context.loginAccount.isDefined){
         org.scalatra.Unauthorized(redirect("/"))
       } else {
-        org.scalatra.Unauthorized(redirect("/signin?" + currentURL))
+        if(request.getMethod.toUpperCase == "POST"){
+          org.scalatra.Unauthorized(redirect("/signin"))
+        } else {
+          org.scalatra.Unauthorized(redirect("/signin?redirect=" + StringUtil.urlEncode(
+            defining(request.getQueryString){ queryString =>
+              request.getRequestURI.substring(request.getContextPath.length) + (if(queryString != null) "?" + queryString else "")
+            }
+          )))
+        }
       }
-    } else {
-      org.scalatra.Unauthorized()
     }
-  }
 
-  protected def baseUrl = {
+  override def fullUrl(path: String, params: Iterable[(String, Any)] = Iterable.empty,
-    val url = request.getRequestURL.toString
+                       includeContextPath: Boolean = true, includeServletPath: Boolean = true)
-    url.substring(0, url.length - (request.getRequestURI.length - request.getContextPath.length))
+                      (implicit request: HttpServletRequest, response: HttpServletResponse) =
-  }
+    if (path.startsWith("http")) path
+    else baseUrl + url(path, params, false, false, false)
 
 }
 
 /**
  * Context object for the current request.
  */
-case class Context(path: String, loginAccount: Option[Account], currentUrl: String, request: HttpServletRequest){
+case class Context(settings: SystemSettingsService.SystemSettings, loginAccount: Option[Account], request: HttpServletRequest){
+
+  lazy val path = settings.baseUrl.getOrElse(request.getServletContext.getContextPath)
+
+  lazy val currentPath = request.getRequestURI.substring(request.getContextPath.length)
 
   /**
    * Get object from cache.
@@ -132,13 +149,14 @@ case class Context(path: String, loginAccount: Option[Account], currentUrl: Stri
    * If object has not been cached with the specified key then retrieves by given action.
    * Cached object are available during a request.
    */
-  def cache[A](key: String)(action: => A): A = {
+  def cache[A](key: String)(action: => A): A =
-    Option(request.getAttribute("cache." + key).asInstanceOf[A]).getOrElse {
+    defining(Keys.Request.Cache(key)){ cacheKey =>
-      val newObject = action
+      Option(request.getAttribute(cacheKey).asInstanceOf[A]).getOrElse {
-      request.setAttribute("cache." + key, newObject)
+        val newObject = action
-      newObject
+        request.setAttribute(cacheKey, newObject)
+        newObject
+      }
     }
-  }
 
 }
 
@@ -148,7 +166,7 @@ case class Context(path: String, loginAccount: Option[Account], currentUrl: Stri
 trait AccountManagementControllerBase extends ControllerBase with FileUploadControllerBase {
   self: AccountService  =>
 
-  protected def updateImage(userName: String, fileId: Option[String], clearImage: Boolean): Unit = {
+  protected def updateImage(userName: String, fileId: Option[String], clearImage: Boolean): Unit =
     if(clearImage){
       getAccountByUserName(userName).flatMap(_.image).map { image =>
         new java.io.File(getUserUploadDir(userName), image).delete()
@@ -164,16 +182,15 @@ trait AccountManagementControllerBase extends ControllerBase with FileUploadCont
         updateAvatarImage(userName, Some(filename))
       }
     }
-  }
 
   protected def uniqueUserName: Constraint = new Constraint(){
-    def validate(name: String, value: String): Option[String] =
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
-      getAccountByUserName(value).map { _ => "User already exists." }
+      getAccountByUserName(value, true).map { _ => "User already exists." }
   }
 
   protected def uniqueMailAddress(paramName: String = ""): Constraint = new Constraint(){
-    def validate(name: String, value: String): Option[String] =
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
-      getAccountByMailAddress(value)
+      getAccountByMailAddress(value, true)
         .filter { x => if(paramName.isEmpty) true else Some(x.userName) != params.get(paramName) }
         .map    { _ => "Mail address is already registered." }
   }
@@ -200,12 +217,7 @@ trait FileUploadControllerBase {
   def removeTemporaryFiles()(implicit session: HttpSession): Unit =
     FileUtils.deleteDirectory(TemporaryDir)
 
-  def getUploadedFilename(fileId: String)(implicit session: HttpSession): Option[String] = {
+  def getUploadedFilename(fileId: String)(implicit session: HttpSession): Option[String] =
-    val filename = Option(session.getAttribute("upload_" + fileId).asInstanceOf[String])
+    session.getAndRemove[String](Keys.Session.Upload(fileId))
-    if(filename.isDefined){
-      session.removeAttribute("upload_" + fileId)
-    }
-    filename
-  }
 
 }

src/main/scala/app/CreateRepositoryController.scala

@@ -1,123 +0,0 @@
-package app
-
-import util.Directory._
-import util.{JGitUtil, UsersAuthenticator}
-import service._
-import java.io.File
-import org.eclipse.jgit.api.Git
-import org.apache.commons.io._
-import jp.sf.amateras.scalatra.forms._
-
-class CreateRepositoryController extends CreateRepositoryControllerBase
-  with RepositoryService with AccountService with WikiService with LabelsService with ActivityService
-  with UsersAuthenticator
-
-/**
- * Creates new repository.
- */
-trait CreateRepositoryControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with WikiService with LabelsService with ActivityService
-    with UsersAuthenticator =>
-
-  case class RepositoryCreationForm(owner: String, name: String, description: Option[String], isPrivate: Boolean, createReadme: Boolean)
-
-  val form = mapping(
-    "owner"        -> trim(label("Owner"          , text(required, maxlength(40), identifier, existsAccount))),
-    "name"         -> trim(label("Repository name", text(required, maxlength(40), identifier, unique))),
-    "description"  -> trim(label("Description"    , optional(text()))),
-    "isPrivate"    -> trim(label("Repository Type", boolean())),
-    "createReadme" -> trim(label("Create README"  , boolean()))
-  )(RepositoryCreationForm.apply)
-
-  /**
-   * Show the new repository form.
-   */
-  get("/new")(usersOnly {
-    html.newrepo(getGroupsByUserName(context.loginAccount.get.userName))
-  })
-  
-  /**
-   * Create new repository.
-   */
-  post("/new", form)(usersOnly { form =>
-    val ownerAccount  = getAccountByUserName(form.owner).get
-    val loginAccount  = context.loginAccount.get
-    val loginUserName = loginAccount.userName
-
-    // Insert to the database at first
-    createRepository(form.name, form.owner, form.description, form.isPrivate)
-
-    // Add collaborators for group repository
-    if(ownerAccount.isGroupAccount){
-      getGroupMembers(form.owner).foreach { userName =>
-        addCollaborator(form.owner, form.name, userName)
-      }
-    }
-
-    // Insert default labels
-    createLabel(form.owner, form.name, "bug", "fc2929")
-    createLabel(form.owner, form.name, "duplicate", "cccccc")
-    createLabel(form.owner, form.name, "enhancement", "84b6eb")
-    createLabel(form.owner, form.name, "invalid", "e6e6e6")
-    createLabel(form.owner, form.name, "question", "cc317c")
-    createLabel(form.owner, form.name, "wontfix", "ffffff")
-
-    // Create the actual repository
-    val gitdir = getRepositoryDir(form.owner, form.name)
-    JGitUtil.initRepository(gitdir)
-
-    if(form.createReadme){
-      val tmpdir = getInitRepositoryDir(form.owner, form.name)
-      try {
-        // Clone the repository
-        Git.cloneRepository.setURI(gitdir.toURI.toString).setDirectory(tmpdir).call
-
-        // Create README.md
-        FileUtils.writeStringToFile(new File(tmpdir, "README.md"),
-          if(form.description.nonEmpty){
-            form.name + "\n" +
-            "===============\n" +
-            "\n" +
-            form.description.get
-          } else {
-            form.name + "\n" +
-            "===============\n"
-          }, "UTF-8")
-
-        val git = Git.open(tmpdir)
-        git.add.addFilepattern("README.md").call
-        git.commit.setCommitter(loginAccount.userName, loginAccount.mailAddress).setMessage("Initial commit").call
-        git.push.call
-
-      } finally {
-        FileUtils.deleteDirectory(tmpdir)
-      }
-    }
-
-    // Create Wiki repository
-    createWikiRepository(loginAccount, form.owner, form.name)
-
-    // Record activity
-    recordCreateRepositoryActivity(form.owner, form.name, loginUserName)
-
-    // redirect to the repository
-    redirect(s"/${form.owner}/${form.name}")
-  })
-
-  private def existsAccount: Constraint = new Constraint(){
-    def validate(name: String, value: String): Option[String] =
-      if(getAccountByUserName(value).isEmpty) Some("User or group does not exist.") else None
-  }
-
-  
-  /**
-   * Duplicate check for the repository name.
-   */
-  private def unique: Constraint = new Constraint(){
-    def validate(name: String, value: String): Option[String] =
-      params.get("owner").flatMap { userName =>
-        getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.")
-      }
-  }
-  
-}

src/main/scala/app/DashboardController.scala

@@ -1,14 +1,15 @@
 package app
 
 import service._
-import util.UsersAuthenticator
+import util.{UsersAuthenticator, Keys}
+import util.Implicits._
 
 class DashboardController extends DashboardControllerBase
-  with IssuesService with RepositoryService with AccountService
+  with IssuesService with PullRequestService with RepositoryService with AccountService
   with UsersAuthenticator
 
 trait DashboardControllerBase extends ControllerBase {
-  self: IssuesService with RepositoryService with UsersAuthenticator =>
+  self: IssuesService with PullRequestService with RepositoryService with UsersAuthenticator =>
 
   get("/dashboard/issues/repos")(usersOnly {
     searchIssues("all")
@@ -22,36 +23,87 @@ trait DashboardControllerBase extends ControllerBase {
     searchIssues("created_by")
   })
 
+  get("/dashboard/pulls")(usersOnly {
+    searchPullRequests("created_by", None)
+  })
+
+  get("/dashboard/pulls/owned")(usersOnly {
+    searchPullRequests("created_by", None)
+  })
+
+  get("/dashboard/pulls/public")(usersOnly {
+    searchPullRequests("not_created_by", None)
+  })
+
+  get("/dashboard/pulls/for/:owner/:repository")(usersOnly {
+    searchPullRequests("all", Some(params("owner") + "/" + params("repository")))
+  })
+
   private def searchIssues(filter: String) = {
     import IssuesService._
 
     // condition
-    val sessionKey = "dashboard/issues"
+    val condition = session.putAndGet(Keys.Session.DashboardIssues,
-    val condition = if(request.getQueryString == null)
+      if(request.hasQueryString) IssueSearchCondition(request)
-      session.get(sessionKey).getOrElse(IssueSearchCondition()).asInstanceOf[IssueSearchCondition]
+      else session.getAs[IssueSearchCondition](Keys.Session.DashboardIssues).getOrElse(IssueSearchCondition())
-    else IssueSearchCondition(request)
+    )
 
-    session.put(sessionKey, condition)
-
     val userName = context.loginAccount.get.userName
     val repositories = getUserRepositories(userName, baseUrl).map(repo => repo.owner -> repo.name)
     val filterUser = Map(filter -> userName)
-    val page = IssueSearchCondition.page(request)
+    val page = IssueSearchCondition.page(request)
     // 
     dashboard.html.issues(
         issues.html.listparts(
-            searchIssue(condition, filterUser, (page - 1) * IssueLimit, IssueLimit, repositories: _*),
+            searchIssue(condition, filterUser, false, (page - 1) * IssueLimit, IssueLimit, repositories: _*),
             page,
-            countIssue(condition.copy(state = "open"), filterUser, repositories: _*),
+            countIssue(condition.copy(state = "open"), filterUser, false, repositories: _*),
-            countIssue(condition.copy(state = "closed"), filterUser, repositories: _*),
+            countIssue(condition.copy(state = "closed"), filterUser, false, repositories: _*),
             condition),
-        countIssue(condition, Map.empty, repositories: _*),
+        countIssue(condition, Map.empty, false, repositories: _*),
-        countIssue(condition, Map("assigned" -> userName), repositories: _*),
+        countIssue(condition, Map("assigned" -> userName), false, repositories: _*),
-        countIssue(condition, Map("created_by" -> userName), repositories: _*),
+        countIssue(condition, Map("created_by" -> userName), false, repositories: _*),
-        countIssueGroupByRepository(condition, filterUser, repositories: _*),
+        countIssueGroupByRepository(condition, filterUser, false, repositories: _*),
         condition,
         filter)    
     
   }
 
-}
+  private def searchPullRequests(filter: String, repository: Option[String]) = {
+    import IssuesService._
+    import PullRequestService._
+
+    // condition
+    val condition = session.putAndGet(Keys.Session.DashboardPulls, {
+      if(request.hasQueryString) IssueSearchCondition(request)
+      else session.getAs[IssueSearchCondition](Keys.Session.DashboardPulls).getOrElse(IssueSearchCondition())
+    }.copy(repo = repository))
+
+    val userName = context.loginAccount.get.userName
+    val repositories = getUserRepositories(userName, baseUrl).map(repo => repo.owner -> repo.name)
+    val filterUser = Map(filter -> userName)
+    val page = IssueSearchCondition.page(request)
+
+    val counts = countIssueGroupByRepository(
+      IssueSearchCondition().copy(state = condition.state), Map.empty, true, repositories: _*)
+
+    dashboard.html.pulls(
+      pulls.html.listparts(
+        searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, repositories: _*),
+        page,
+        countIssue(condition.copy(state = "open"), filterUser, true, repositories: _*),
+        countIssue(condition.copy(state = "closed"), filterUser, true, repositories: _*),
+        condition,
+        None,
+        false),
+      getPullRequestCountGroupByUser(condition.state == "closed", userName, None),
+      getRepositoryNamesOfUser(userName).map { RepoName =>
+        (userName, RepoName, counts.collectFirst { case (_, RepoName, count) => count }.getOrElse(0))
+      }.sortBy(_._3).reverse,
+      condition,
+      filter)
+
+  }
+
+
+}

src/main/scala/app/FileUploadController.scala

@@ -1,6 +1,7 @@
 package app
 
-import util.{FileUtil}
+import _root_.util.{Keys, FileUtil}
+import util.ControlUtil._
 import org.scalatra._
 import org.scalatra.servlet.{MultipartConfig, FileUploadSupport}
 import org.apache.commons.io.FileUtils
@@ -11,17 +12,15 @@ import org.apache.commons.io.FileUtils
  * This servlet saves uploaded file as temporary file and returns the unique id.
  * You can get uploaded file using [[app.FileUploadControllerBase#getTemporaryFile()]] with this id.
  */
-class FileUploadController extends ScalatraServlet
+class FileUploadController extends ScalatraServlet with FileUploadSupport with FileUploadControllerBase {
-  with FileUploadSupport with FlashMapSupport with FileUploadControllerBase {
 
   configureMultipartHandling(MultipartConfig(maxFileSize = Some(3 * 1024 * 1024)))
 
   post("/image"){
     fileParams.get("file") match {
-      case Some(file) if(FileUtil.isImage(file.name)) => {
+      case Some(file) if(FileUtil.isImage(file.name)) => defining(generateFileId){ fileId =>
-        val fileId  = generateFileId
         FileUtils.writeByteArrayToFile(getTemporaryFile(fileId), file.get)
-        session += "upload_" + fileId -> file.name
+        session += Keys.Session.Upload(fileId) -> file.name
         Ok(fileId)
       }
       case None => BadRequest

src/main/scala/app/IndexController.scala

@@ -5,23 +5,65 @@ import service._
 import jp.sf.amateras.scalatra.forms._
 
 class IndexController extends IndexControllerBase 
-  with RepositoryService with SystemSettingsService with ActivityService with AccountService
+  with RepositoryService with ActivityService with AccountService with UsersAuthenticator
-with UsersAuthenticator
 
 trait IndexControllerBase extends ControllerBase {
-  self: RepositoryService with SystemSettingsService with ActivityService with AccountService
+  self: RepositoryService with ActivityService with AccountService with UsersAuthenticator =>
-  with UsersAuthenticator =>
+
+  case class SignInForm(userName: String, password: String)
+
+  val form = mapping(
+    "userName" -> trim(label("Username", text(required))),
+    "password" -> trim(label("Password", text(required)))
+  )(SignInForm.apply)
 
   get("/"){
     val loginAccount = context.loginAccount
 
     html.index(getRecentActivities(),
       getVisibleRepositories(loginAccount, baseUrl),
-      loadSystemSettings(),
       loginAccount.map{ account => getUserRepositories(account.userName, baseUrl) }.getOrElse(Nil)
     )
   }
 
+  get("/signin"){
+    val redirect = params.get("redirect")
+    if(redirect.isDefined && redirect.get.startsWith("/")){
+      flash += Keys.Flash.Redirect -> redirect.get
+    }
+    html.signin()
+  }
+
+  post("/signin", form){ form =>
+    authenticate(context.settings, form.userName, form.password) match {
+      case Some(account) => signin(account)
+      case None          => redirect("/signin")
+    }
+  }
+
+  get("/signout"){
+    session.invalidate
+    redirect("/")
+  }
+
+  /**
+   * Set account information into HttpSession and redirect.
+   */
+  private def signin(account: model.Account) = {
+    session.setAttribute(Keys.Session.LoginAccount, account)
+    updateLastLoginDate(account.userName)
+
+    flash.get(Keys.Flash.Redirect).asInstanceOf[Option[String]].map { redirectUrl =>
+      if(redirectUrl.replaceFirst("/$", "") == request.getContextPath){
+        redirect("/")
+      } else {
+        redirect(redirectUrl)
+      }
+    }.getOrElse {
+      redirect("/")
+    }
+  }
+
   /**
    * JSON API for collaborator completion.
    *
@@ -30,7 +72,7 @@ trait IndexControllerBase extends ControllerBase {
   get("/_user/proposals")(usersOnly {
     contentType = formats("json")
     org.json4s.jackson.Serialization.write(
-      Map("options" -> getAllUsers.filter(!_.isGroupAccount).map(_.userName).toArray)
+      Map("options" -> getAllUsers().filter(!_.isGroupAccount).map(_.userName).toArray)
     )
   })
 

src/main/scala/app/IssuesController.scala

@@ -4,15 +4,18 @@ import jp.sf.amateras.scalatra.forms._
 
 import service._
 import IssuesService._
-import util.{CollaboratorsAuthenticator, ReferrerAuthenticator, ReadableUsersAuthenticator}
+import util._
+import util.Implicits._
+import util.ControlUtil._
 import org.scalatra.Ok
+import model.Issue
 
 class IssuesController extends IssuesControllerBase
   with IssuesService with RepositoryService with AccountService with LabelsService with MilestonesService with ActivityService
   with ReadableUsersAuthenticator with ReferrerAuthenticator with CollaboratorsAuthenticator
 
 trait IssuesControllerBase extends ControllerBase {
-  self: IssuesService with RepositoryService with LabelsService with MilestonesService with ActivityService
+  self: IssuesService with RepositoryService with AccountService with LabelsService with MilestonesService with ActivityService
     with ReadableUsersAuthenticator with ReferrerAuthenticator with CollaboratorsAuthenticator =>
 
   case class IssueCreateForm(title: String, content: Option[String],
@@ -57,98 +60,119 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/issues/:id")(referrersOnly { repository =>
-    val owner   = repository.owner
+    defining(repository.owner, repository.name, params("id")){ case (owner, name, issueId) =>
-    val name    = repository.name
+      getIssue(owner, name, issueId) map {
-    val issueId = params("id")
+        issues.html.issue(
-
-    getIssue(owner, name, issueId) map {
-      issues.html.issue(
           _,
           getComments(owner, name, issueId.toInt),
           getIssueLabels(owner, name, issueId.toInt),
-          (getCollaborators(owner, name) :+ owner).sorted,
+          (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).get.isGroupAccount) Nil else List(owner))).sorted,
           getMilestonesWithIssueCount(owner, name),
           getLabels(owner, name),
           hasWritePermission(owner, name, context.loginAccount),
           repository)
-    } getOrElse NotFound
+      } getOrElse NotFound
+    }
   })
 
   get("/:owner/:repository/issues/new")(readableUsersOnly { repository =>
-    val owner = repository.owner
+    defining(repository.owner, repository.name){ case (owner, name) =>
-    val name  = repository.name
+      issues.html.create(
-
+        (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).get.isGroupAccount) Nil else List(owner))).sorted,
-    issues.html.create(
+          getMilestones(owner, name),
-        (getCollaborators(owner, name) :+ owner).sorted,
+          getLabels(owner, name),
-        getMilestones(owner, name),
+          hasWritePermission(owner, name, context.loginAccount),
-        getLabels(owner, name),
+          repository)
-        hasWritePermission(owner, name, context.loginAccount),
+    }
-        repository)
   })
 
   post("/:owner/:repository/issues/new", issueCreateForm)(readableUsersOnly { (form, repository) =>
-    val owner    = repository.owner
+    defining(repository.owner, repository.name){ case (owner, name) =>
-    val name     = repository.name
+      val writable = hasWritePermission(owner, name, context.loginAccount)
-    val writable = hasWritePermission(owner, name, context.loginAccount)
+      val userName = context.loginAccount.get.userName
-    val userName = context.loginAccount.get.userName
 
-    // insert issue
+      // insert issue
-    val issueId = createIssue(owner, name, userName, form.title, form.content,
+      val issueId = createIssue(owner, name, userName, form.title, form.content,
-      if(writable) form.assignedUserName else None,
+        if(writable) form.assignedUserName else None,
-      if(writable) form.milestoneId else None)
+        if(writable) form.milestoneId else None)
 
-    // insert labels
+      // insert labels
-    if(writable){
+      if(writable){
-      form.labelNames.map { value =>
+        form.labelNames.map { value =>
-        val labels = getLabels(owner, name)
+          val labels = getLabels(owner, name)
-        value.split(",").foreach { labelName =>
+          value.split(",").foreach { labelName =>
-          labels.find(_.labelName == labelName).map { label =>
+            labels.find(_.labelName == labelName).map { label =>
-            registerIssueLabel(owner, name, issueId, label.labelId)
+              registerIssueLabel(owner, name, issueId, label.labelId)
+            }
           }
         }
       }
+
+      // record activity
+      recordCreateIssueActivity(owner, name, userName, issueId, form.title)
+
+      // extract references and create refer comment
+      getIssue(owner, name, issueId.toString).foreach { issue =>
+        createReferComment(owner, name, issue, form.title + " " + form.content.getOrElse(""))
+      }
+
+      // notifications
+      Notifier().toNotify(repository, issueId, form.content.getOrElse("")){
+        Notifier.msgIssue(s"${baseUrl}/${owner}/${name}/issues/${issueId}")
+      }
+
+      redirect(s"/${owner}/${name}/issues/${issueId}")
     }
-
-    // record activity
-    recordCreateIssueActivity(owner, name, userName, issueId, form.title)
-
-    redirect(s"/${owner}/${name}/issues/${issueId}")
   })
 
   ajaxPost("/:owner/:repository/issues/edit/:id", issueEditForm)(readableUsersOnly { (form, repository) =>
-    val owner = repository.owner
+    defining(repository.owner, repository.name){ case (owner, name) =>
-    val name  = repository.name
+      getIssue(owner, name, params("id")).map { issue =>
+        if(isEditable(owner, name, issue.openedUserName)){
+          // update issue
+          updateIssue(owner, name, issue.issueId, form.title, form.content)
+          // extract references and create refer comment
+          createReferComment(owner, name, issue, form.title + " " + form.content.getOrElse(""))
 
-    getIssue(owner, name, params("id")).map { issue =>
+          redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
-      if(isEditable(owner, name, issue.openedUserName)){
+        } else Unauthorized
-        updateIssue(owner, name, issue.issueId, form.title, form.content)
+      } getOrElse NotFound
-        redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
+    }
-      } else Unauthorized
-    } getOrElse NotFound
   })
 
   post("/:owner/:repository/issue_comments/new", commentForm)(readableUsersOnly { (form, repository) =>
-    handleComment(form.issueId, Some(form.content), repository)() map { id =>
+    handleComment(form.issueId, Some(form.content), repository)() map { case (issue, id) =>
-      redirect(s"/${repository.owner}/${repository.name}/issues/${form.issueId}#comment-${id}")
+      redirect(s"/${repository.owner}/${repository.name}/${
+        if(issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}")
     } getOrElse NotFound
   })
 
   post("/:owner/:repository/issue_comments/state", issueStateForm)(readableUsersOnly { (form, repository) =>
-    handleComment(form.issueId, form.content, repository)() map { id =>
+    handleComment(form.issueId, form.content, repository)() map { case (issue, id) =>
-      redirect(s"/${repository.owner}/${repository.name}/issues/${form.issueId}#comment-${id}")
+      redirect(s"/${repository.owner}/${repository.name}/${
+        if(issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}")
     } getOrElse NotFound
   })
 
   ajaxPost("/:owner/:repository/issue_comments/edit/:id", commentForm)(readableUsersOnly { (form, repository) =>
-    val owner = repository.owner
+    defining(repository.owner, repository.name){ case (owner, name) =>
-    val name  = repository.name
+      getComment(owner, name, params("id")).map { comment =>
+        if(isEditable(owner, name, comment.commentedUserName)){
+          updateComment(comment.commentId, form.content)
+          redirect(s"/${owner}/${name}/issue_comments/_data/${comment.commentId}")
+        } else Unauthorized
+      } getOrElse NotFound
+    }
+  })
 
-    getComment(owner, name, params("id")).map { comment =>
+  ajaxPost("/:owner/:repository/issue_comments/delete/:id")(readableUsersOnly { repository =>
-      if(isEditable(owner, name, comment.commentedUserName)){
+    defining(repository.owner, repository.name){ case (owner, name) =>
-        updateComment(comment.commentId, form.content)
+      getComment(owner, name, params("id")).map { comment =>
-        redirect(s"/${owner}/${name}/issue_comments/_data/${comment.commentId}")
+        if(isEditable(owner, name, comment.commentedUserName)){
-      } else Unauthorized
+          Ok(deleteComment(comment.commentId))
-    } getOrElse NotFound
+        } else Unauthorized
+      } getOrElse NotFound
+    }
   })
 
   ajaxGet("/:owner/:repository/issues/_data/:id")(readableUsersOnly { repository =>
@@ -187,17 +211,17 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   ajaxPost("/:owner/:repository/issues/:id/label/new")(collaboratorsOnly { repository =>
-    val issueId = params("id").toInt
+    defining(params("id").toInt){ issueId =>
-
+      registerIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt)
-    registerIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt)
+      issues.html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
-    issues.html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
+    }
   })
 
   ajaxPost("/:owner/:repository/issues/:id/label/delete")(collaboratorsOnly { repository =>
-    val issueId = params("id").toInt
+    defining(params("id").toInt){ issueId =>
-
+      deleteIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt)
-    deleteIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt)
+      issues.html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
-    issues.html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
+    }
   })
 
   ajaxPost("/:owner/:repository/issues/:id/assign")(collaboratorsOnly { repository =>
@@ -216,41 +240,41 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/issues/batchedit/state")(collaboratorsOnly { repository =>
-    val action = params.get("value")
+    defining(params.get("value")){ action =>
-
+      executeBatch(repository) {
-    executeBatch(repository) {
+        handleComment(_, None, repository)( _ => action)
-      handleComment(_, None, repository)( _ => action)
-    }
-  })
-
-  post("/:owner/:repository/issues/batchedit/label")(collaboratorsOnly { repository =>
-    val labelId = params("value").toInt
-
-    executeBatch(repository) { issueId =>
-      getIssueLabel(repository.owner, repository.name, issueId, labelId) getOrElse {
-        registerIssueLabel(repository.owner, repository.name, issueId, labelId)
       }
     }
   })
 
-  post("/:owner/:repository/issues/batchedit/assign")(collaboratorsOnly { repository =>
+  post("/:owner/:repository/issues/batchedit/label")(collaboratorsOnly { repository =>
-    val value = assignedUserName("value")
+    params("value").toIntOpt.map{ labelId =>
+      executeBatch(repository) { issueId =>
+        getIssueLabel(repository.owner, repository.name, issueId, labelId) getOrElse {
+          registerIssueLabel(repository.owner, repository.name, issueId, labelId)
+        }
+      }
+    } getOrElse NotFound
+  })
 
-    executeBatch(repository) {
+  post("/:owner/:repository/issues/batchedit/assign")(collaboratorsOnly { repository =>
-      updateAssignedUserName(repository.owner, repository.name, _, value)
+    defining(assignedUserName("value")){ value =>
+      executeBatch(repository) {
+        updateAssignedUserName(repository.owner, repository.name, _, value)
+      }
     }
   })
 
   post("/:owner/:repository/issues/batchedit/milestone")(collaboratorsOnly { repository =>
-    val value = milestoneId("value")
+    defining(milestoneId("value")){ value =>
-
+      executeBatch(repository) {
-    executeBatch(repository) {
+        updateMilestoneId(repository.owner, repository.name, _, value)
-      updateMilestoneId(repository.owner, repository.name, _, value)
+      }
     }
   })
 
   val assignedUserName = (key: String) => params.get(key) filter (_.trim != "")
-  val milestoneId      = (key: String) => params.get(key) collect { case x if x.trim != "" => x.toInt }
+  val milestoneId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
 
   private def isEditable(owner: String, repository: String, author: String)(implicit context: app.Context): Boolean =
     hasWritePermission(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
@@ -260,74 +284,109 @@ trait IssuesControllerBase extends ControllerBase {
     redirect(s"/${repository.owner}/${repository.name}/issues")
   }
 
+  private def createReferComment(owner: String, repository: String, fromIssue: Issue, message: String) = {
+    StringUtil.extractIssueId(message).foreach { issueId =>
+      if(getIssue(owner, repository, issueId).isDefined){
+        createComment(owner, repository, context.loginAccount.get.userName, issueId.toInt,
+                      fromIssue.issueId + ":" + fromIssue.title, "refer")
+      }
+    }
+  }
+
   /**
    * @see [[https://github.com/takezoe/gitbucket/wiki/CommentAction]]
    */
   private def handleComment(issueId: Int, content: Option[String], repository: RepositoryService.RepositoryInfo)
       (getAction: model.Issue => Option[String] =
            p1 => params.get("action").filter(_ => isEditable(p1.userName, p1.repositoryName, p1.openedUserName))) = {
-    val owner    = repository.owner
-    val name     = repository.name
-    val userName = context.loginAccount.get.userName
 
-    getIssue(owner, name, issueId.toString) map { issue =>
+    defining(repository.owner, repository.name){ case (owner, name) =>
-      val (action, recordActivity) =
+      val userName = context.loginAccount.get.userName
-        getAction(issue)
+
-          .collect {
+      getIssue(owner, name, issueId.toString) map { issue =>
-            case "close"  => true  -> (Some("close")  -> Some(recordCloseIssueActivity _))
+        val (action, recordActivity) =
-            case "reopen" => false -> (Some("reopen") -> Some(recordReopenIssueActivity _))
+          getAction(issue)
+            .collect {
+            case "close"  => true  -> (Some("close")  ->
+              Some(if(issue.isPullRequest) recordClosePullRequestActivity _ else recordCloseIssueActivity _))
+            case "reopen" => false -> (Some("reopen") ->
+              Some(recordReopenIssueActivity _))
           }
-          .map { case (closed, t) =>
+            .map { case (closed, t) =>
             updateClosed(owner, name, issueId, closed)
             t
           }
-          .getOrElse(None -> None)
+            .getOrElse(None -> None)
 
-      val commentId = content
+        val commentId = content
           .map       ( _ -> action.map( _ + "_comment" ).getOrElse("comment") )
           .getOrElse ( action.get.capitalize -> action.get )
-          match {
+        match {
-            case (content, action) => createComment(owner, name, userName, issueId, content, action)
+          case (content, action) => createComment(owner, name, userName, issueId, content, action)
-          }
+        }
 
-      // record activity
+        // record activity
-      content foreach ( recordCommentIssueActivity(owner, name, userName, issueId, _) )
+        content foreach {
-      recordActivity foreach ( _ (owner, name, userName, issueId, issue.title) )
+          (if(issue.isPullRequest) recordCommentPullRequestActivity _ else recordCommentIssueActivity _)
+          (owner, name, userName, issueId, _)
+        }
+        recordActivity foreach ( _ (owner, name, userName, issueId, issue.title) )
 
-      commentId
+        // extract references and create refer comment
+        content.map { content =>
+          createReferComment(owner, name, issue, content)
+        }
+
+        // notifications
+        Notifier() match {
+          case f =>
+            content foreach {
+              f.toNotify(repository, issueId, _){
+                Notifier.msgComment(s"${baseUrl}/${owner}/${name}/${
+                  if(issue.isPullRequest) "pull" else "issues"}/${issueId}#comment-${commentId}")
+              }
+            }
+            action foreach {
+              f.toNotify(repository, issueId, _){
+                Notifier.msgStatus(s"${baseUrl}/${owner}/${name}/issues/${issueId}")
+              }
+            }
+        }
+
+        issue -> commentId
+      }
     }
   }
 
   private def searchIssues(filter: String, repository: RepositoryService.RepositoryInfo) = {
-    val owner      = repository.owner
+    defining(repository.owner, repository.name){ case (owner, repoName) =>
-    val repoName   = repository.name
+      val filterUser = Map(filter -> params.getOrElse("userName", ""))
-    val filterUser = Map(filter -> params.getOrElse("userName", ""))
+      val page       = IssueSearchCondition.page(request)
-    val page = IssueSearchCondition.page(request)
+      val sessionKey = Keys.Session.Issues(owner, repoName)
-    val sessionKey = s"${owner}/${repoName}/issues"
 
-    // retrieve search condition
+      // retrieve search condition
-    val condition = if(request.getQueryString == null){
+      val condition = session.putAndGet(sessionKey,
-      session.get(sessionKey).getOrElse(IssueSearchCondition()).asInstanceOf[IssueSearchCondition]
+        if(request.hasQueryString) IssueSearchCondition(request)
-    } else IssueSearchCondition(request)
+        else session.getAs[IssueSearchCondition](sessionKey).getOrElse(IssueSearchCondition())
+      )
 
-    session.put(sessionKey, condition)
+      issues.html.list(
-
+          searchIssue(condition, filterUser, false, (page - 1) * IssueLimit, IssueLimit, owner -> repoName),
-    issues.html.list(
+          page,
-        searchIssue(condition, filterUser, (page - 1) * IssueLimit, IssueLimit, owner -> repoName),
+          (getCollaborators(owner, repoName) :+ owner).sorted,
-        page,
+          getMilestones(owner, repoName),
-        (getCollaborators(owner, repoName) :+ owner).sorted,
+          getLabels(owner, repoName),
-        getMilestones(owner, repoName),
+          countIssue(condition.copy(state = "open"), filterUser, false, owner -> repoName),
-        getLabels(owner, repoName),
+          countIssue(condition.copy(state = "closed"), filterUser, false, owner -> repoName),
-        countIssue(condition.copy(state = "open"), filterUser, owner -> repoName),
+          countIssue(condition, Map.empty, false, owner -> repoName),
-        countIssue(condition.copy(state = "closed"), filterUser, owner -> repoName),
+          context.loginAccount.map(x => countIssue(condition, Map("assigned" -> x.userName), false, owner -> repoName)),
-        countIssue(condition, Map.empty, owner -> repoName),
+          context.loginAccount.map(x => countIssue(condition, Map("created_by" -> x.userName), false, owner -> repoName)),
-        context.loginAccount.map(x => countIssue(condition, Map("assigned" -> x.userName), owner -> repoName)),
+          countIssueGroupByLabels(owner, repoName, condition, filterUser),
-        context.loginAccount.map(x => countIssue(condition, Map("created_by" -> x.userName), owner -> repoName)),
+          condition,
-        countIssueGroupByLabels(owner, repoName, condition, filterUser),
+          filter,
-        condition,
+          repository,
-        filter,
+          hasWritePermission(owner, repoName, context.loginAccount))
-        repository,
+    }
-        hasWritePermission(owner, repoName, context.loginAccount))
   }
 
 }

src/main/scala/app/LabelsController.scala

@@ -3,6 +3,7 @@ package app
 import jp.sf.amateras.scalatra.forms._
 import service._
 import util.CollaboratorsAuthenticator
+import org.scalatra.i18n.Messages
 
 class LabelsController extends LabelsControllerBase
   with LabelsService with RepositoryService with AccountService with CollaboratorsAuthenticator
@@ -51,7 +52,7 @@ trait LabelsControllerBase extends ControllerBase {
    * Constraint for the identifier such as user name, repository name or page name.
    */
   private def labelName: Constraint = new Constraint(){
-    def validate(name: String, value: String): Option[String] =
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
       if(!value.matches("^[^,]+$")){
         Some(s"${name} contains invalid character.")
       } else if(value.startsWith("_") || value.startsWith("-")){

src/main/scala/app/MilestonesController.scala

@@ -4,6 +4,7 @@ import jp.sf.amateras.scalatra.forms._
 
 import service._
 import util.{CollaboratorsAuthenticator, ReferrerAuthenticator}
+import util.Implicits._
 
 class MilestonesController extends MilestonesControllerBase
   with MilestonesService with RepositoryService with AccountService
@@ -39,34 +40,44 @@ trait MilestonesControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/edit")(collaboratorsOnly { repository =>
-    issues.milestones.html.edit(getMilestone(repository.owner, repository.name, params("milestoneId").toInt), repository)
+    params("milestoneId").toIntOpt.map{ milestoneId =>
+      issues.milestones.html.edit(getMilestone(repository.owner, repository.name, milestoneId), repository)
+    } getOrElse NotFound
   })
 
   post("/:owner/:repository/issues/milestones/:milestoneId/edit", milestoneForm)(collaboratorsOnly { (form, repository) =>
-    getMilestone(repository.owner, repository.name, params("milestoneId").toInt).map { milestone =>
+    params("milestoneId").toIntOpt.flatMap{ milestoneId =>
-      updateMilestone(milestone.copy(title = form.title, description = form.description, dueDate = form.dueDate))
+      getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
-      redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
+        updateMilestone(milestone.copy(title = form.title, description = form.description, dueDate = form.dueDate))
+        redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
+      }
     } getOrElse NotFound
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/close")(collaboratorsOnly { repository =>
-    getMilestone(repository.owner, repository.name, params("milestoneId").toInt).map { milestone =>
+    params("milestoneId").toIntOpt.flatMap{ milestoneId =>
-      closeMilestone(milestone)
+      getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
-      redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
+        closeMilestone(milestone)
+        redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
+      }
     } getOrElse NotFound
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/open")(collaboratorsOnly { repository =>
-    getMilestone(repository.owner, repository.name, params("milestoneId").toInt).map { milestone =>
+    params("milestoneId").toIntOpt.flatMap{ milestoneId =>
-      openMilestone(milestone)
+      getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
-      redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
+        openMilestone(milestone)
+        redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
+      }
     } getOrElse NotFound
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/delete")(collaboratorsOnly { repository =>
-    getMilestone(repository.owner, repository.name, params("milestoneId").toInt).map { milestone =>
+    params("milestoneId").toIntOpt.flatMap{ milestoneId =>
-      deleteMilestone(repository.owner, repository.name, milestone.milestoneId)
+      getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
-      redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
+        deleteMilestone(repository.owner, repository.name, milestone.milestoneId)
+        redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
+      }
     } getOrElse NotFound
   })
 

src/main/scala/app/PullRequestsController.scala

@@ -0,0 +1,503 @@
+package app
+
+import util.{LockUtil, CollaboratorsAuthenticator, JGitUtil, ReferrerAuthenticator, Notifier, Keys}
+import util.Directory._
+import util.Implicits._
+import util.ControlUtil._
+import service._
+import org.eclipse.jgit.api.Git
+import jp.sf.amateras.scalatra.forms._
+import org.eclipse.jgit.transport.RefSpec
+import scala.collection.JavaConverters._
+import org.eclipse.jgit.lib.{ObjectId, CommitBuilder, PersonIdent}
+import service.IssuesService._
+import service.PullRequestService._
+import util.JGitUtil.DiffInfo
+import service.RepositoryService.RepositoryTreeNode
+import util.JGitUtil.CommitInfo
+import org.slf4j.LoggerFactory
+import org.eclipse.jgit.merge.MergeStrategy
+import org.eclipse.jgit.errors.NoMergeBaseException
+import service.WebHookService.WebHookPayload
+
+class PullRequestsController extends PullRequestsControllerBase
+  with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService with LabelsService
+  with ActivityService with WebHookService with ReferrerAuthenticator with CollaboratorsAuthenticator
+
+trait PullRequestsControllerBase extends ControllerBase {
+  self: RepositoryService with AccountService with IssuesService with MilestonesService with LabelsService
+    with ActivityService with PullRequestService with WebHookService with ReferrerAuthenticator with CollaboratorsAuthenticator =>
+
+  private val logger = LoggerFactory.getLogger(classOf[PullRequestsControllerBase])
+
+  val pullRequestForm = mapping(
+    "title"                 -> trim(label("Title"  , text(required, maxlength(100)))),
+    "content"               -> trim(label("Content", optional(text()))),
+    "targetUserName"        -> trim(text(required, maxlength(100))),
+    "targetBranch"          -> trim(text(required, maxlength(100))),
+    "requestUserName"       -> trim(text(required, maxlength(100))),
+    "requestRepositoryName" -> trim(text(required, maxlength(100))),
+    "requestBranch"         -> trim(text(required, maxlength(100))),
+    "commitIdFrom"          -> trim(text(required, maxlength(40))),
+    "commitIdTo"            -> trim(text(required, maxlength(40)))
+  )(PullRequestForm.apply)
+
+  val mergeForm = mapping(
+    "message" -> trim(label("Message", text(required)))
+  )(MergeForm.apply)
+
+  case class PullRequestForm(
+    title: String,
+    content: Option[String],
+    targetUserName: String,
+    targetBranch: String,
+    requestUserName: String,
+    requestRepositoryName: String,
+    requestBranch: String,
+    commitIdFrom: String,
+    commitIdTo: String)
+
+  case class MergeForm(message: String)
+
+  get("/:owner/:repository/pulls")(referrersOnly { repository =>
+    searchPullRequests(None, repository)
+  })
+
+  get("/:owner/:repository/pulls/:userName")(referrersOnly { repository =>
+    searchPullRequests(Some(params("userName")), repository)
+  })
+
+  get("/:owner/:repository/pull/:id")(referrersOnly { repository =>
+    params("id").toIntOpt.flatMap{ issueId =>
+      val owner = repository.owner
+      val name = repository.name
+      getPullRequest(owner, name, issueId) map { case(issue, pullreq) =>
+        using(Git.open(getRepositoryDir(owner, name))){ git =>
+          val (commits, diffs) =
+            getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo)
+
+          pulls.html.pullreq(
+            issue, pullreq,
+            getComments(owner, name, issueId),
+            getIssueLabels(owner, name, issueId),
+            (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).get.isGroupAccount) Nil else List(owner))).sorted,
+            getMilestonesWithIssueCount(owner, name),
+            getLabels(owner, name),
+            commits,
+            diffs,
+            hasWritePermission(owner, name, context.loginAccount),
+            repository)
+        }
+      }
+    } getOrElse NotFound
+  })
+
+  ajaxGet("/:owner/:repository/pull/:id/mergeguide")(collaboratorsOnly { repository =>
+    params("id").toIntOpt.flatMap{ issueId =>
+      val owner = repository.owner
+      val name  = repository.name
+      getPullRequest(owner, name, issueId) map { case(issue, pullreq) =>
+        pulls.html.mergeguide(
+          checkConflictInPullRequest(owner, name, pullreq.branch, pullreq.requestUserName, name, pullreq.requestBranch, issueId),
+          pullreq,
+          s"${baseUrl}/git/${pullreq.requestUserName}/${pullreq.requestRepositoryName}.git")
+      }
+    } getOrElse NotFound
+  })
+
+  get("/:owner/:repository/pull/:id/delete/*")(collaboratorsOnly { repository =>
+    params("id").toIntOpt.map { issueId =>
+      val branchName = multiParams("splat").head
+      val userName   = context.loginAccount.get.userName
+      if(repository.repository.defaultBranch != branchName){
+        using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+          git.branchDelete().setBranchNames(branchName).call()
+          recordDeleteBranchActivity(repository.owner, repository.name, userName, branchName)
+        }
+      }
+      createComment(repository.owner, repository.name, userName, issueId, branchName, "delete_branch")
+      redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+    } getOrElse NotFound
+  })
+
+  post("/:owner/:repository/pull/:id/merge", mergeForm)(collaboratorsOnly { (form, repository) =>
+    params("id").toIntOpt.flatMap { issueId =>
+      val owner = repository.owner
+      val name  = repository.name
+      LockUtil.lock(s"${owner}/${name}/merge"){
+        getPullRequest(owner, name, issueId).map { case (issue, pullreq) =>
+          using(Git.open(getRepositoryDir(owner, name))) { git =>
+            // mark issue as merged and close.
+            val loginAccount = context.loginAccount.get
+            createComment(owner, name, loginAccount.userName, issueId, form.message, "merge")
+            createComment(owner, name, loginAccount.userName, issueId, "Close", "close")
+            updateClosed(owner, name, issueId, true)
+
+            // record activity
+            recordMergeActivity(owner, name, loginAccount.userName, issueId, form.message)
+
+            // merge
+            val mergeBaseRefName = s"refs/heads/${pullreq.branch}"
+            val merger = MergeStrategy.RECURSIVE.newMerger(git.getRepository, true)
+            val mergeBaseTip = git.getRepository.resolve(mergeBaseRefName)
+            val mergeTip = git.getRepository.resolve(s"refs/pull/${issueId}/head")
+            val conflicted = try {
+              !merger.merge(mergeBaseTip, mergeTip)
+            } catch {
+              case e: NoMergeBaseException => true
+            }
+            if (conflicted) {
+              throw new RuntimeException("This pull request can't merge automatically.")
+            }
+
+            // creates merge commit
+            val mergeCommit = new CommitBuilder()
+            mergeCommit.setTreeId(merger.getResultTreeId)
+            mergeCommit.setParentIds(Array[ObjectId](mergeBaseTip, mergeTip): _*)
+            val personIdent = new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
+            mergeCommit.setAuthor(personIdent)
+            mergeCommit.setCommitter(personIdent)
+            mergeCommit.setMessage(s"Merge pull request #${issueId} from ${pullreq.requestUserName}/${pullreq.requestRepositoryName}\n\n" +
+                                   form.message)
+
+            // insertObject and got mergeCommit Object Id
+            val inserter = git.getRepository.newObjectInserter
+            val mergeCommitId = inserter.insert(mergeCommit)
+            inserter.flush()
+            inserter.release()
+
+            // update refs
+            val refUpdate = git.getRepository.updateRef(mergeBaseRefName)
+            refUpdate.setNewObjectId(mergeCommitId)
+            refUpdate.setForceUpdate(false)
+            refUpdate.setRefLogIdent(personIdent)
+            refUpdate.setRefLogMessage("merged", true)
+            refUpdate.update()
+
+            val (commits, _) = getRequestCompareInfo(owner, name, pullreq.commitIdFrom,
+              pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.commitIdTo)
+
+            commits.flatten.foreach { commit =>
+              if(!existsCommitId(owner, name, commit.id)){
+                insertCommitId(owner, name, commit.id)
+              }
+            }
+
+            // close issue by content of pull request
+            val defaultBranch = getRepository(owner, name, baseUrl).get.repository.defaultBranch
+            if(pullreq.branch == defaultBranch){
+              commits.flatten.foreach { commit =>
+                closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name)
+              }
+              issue.content match {
+                case Some(content) => closeIssuesFromMessage(content, loginAccount.userName, owner, name)
+                case _ =>
+              }
+              closeIssuesFromMessage(form.message, loginAccount.userName, owner, name)
+            }
+            // call web hook
+            getWebHookURLs(owner, name) match {
+              case webHookURLs if(webHookURLs.nonEmpty) =>
+                for(ownerAccount <- getAccountByUserName(owner)){
+                  callWebHook(owner, name, webHookURLs,
+                    WebHookPayload(git, loginAccount, mergeBaseRefName, repository, commits.flatten.toList, ownerAccount))
+                }
+              case _ =>
+            }
+
+            // notifications
+            Notifier().toNotify(repository, issueId, "merge"){
+              Notifier.msgStatus(s"${baseUrl}/${owner}/${name}/pull/${issueId}")
+            }
+
+            redirect(s"/${owner}/${name}/pull/${issueId}")
+          }
+        }
+      }
+    } getOrElse NotFound
+  })
+
+  get("/:owner/:repository/compare")(referrersOnly { forkedRepository =>
+    (forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
+      case (Some(originUserName), Some(originRepositoryName)) => {
+        getRepository(originUserName, originRepositoryName, baseUrl).map { originRepository =>
+          using(
+            Git.open(getRepositoryDir(originUserName, originRepositoryName)),
+            Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
+          ){ (oldGit, newGit) =>
+            val oldBranch = JGitUtil.getDefaultBranch(oldGit, originRepository).get._2
+            val newBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository).get._2
+
+            redirect(s"/${forkedRepository.owner}/${forkedRepository.name}/compare/${originUserName}:${oldBranch}...${newBranch}")
+          }
+        } getOrElse NotFound
+      }
+      case _ => {
+        using(Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))){ git =>
+          JGitUtil.getDefaultBranch(git, forkedRepository).map { case (_, defaultBranch) =>
+            redirect(s"/${forkedRepository.owner}/${forkedRepository.name}/compare/${defaultBranch}...${defaultBranch}")
+          } getOrElse {
+            redirect(s"/${forkedRepository.owner}/${forkedRepository.name}")
+          }
+        }
+      }
+    }
+  })
+
+  get("/:owner/:repository/compare/*...*")(referrersOnly { forkedRepository =>
+    val Seq(origin, forked) = multiParams("splat")
+    val (originOwner, tmpOriginBranch) = parseCompareIdentifie(origin, forkedRepository.owner)
+    val (forkedOwner, tmpForkedBranch) = parseCompareIdentifie(forked, forkedRepository.owner)
+
+    (for(
+      originRepositoryName <- if(originOwner == forkedOwner){
+        Some(forkedRepository.name)
+      } else {
+        forkedRepository.repository.originRepositoryName.orElse {
+          getForkedRepositories(forkedRepository.owner, forkedRepository.name).find(_._1 == originOwner).map(_._2)
+        }
+      };
+      originRepository <- getRepository(originOwner, originRepositoryName, baseUrl)
+    ) yield {
+      using(
+        Git.open(getRepositoryDir(originRepository.owner, originRepository.name)),
+        Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
+      ){ case (oldGit, newGit) =>
+        val originBranch = JGitUtil.getDefaultBranch(oldGit, originRepository, tmpOriginBranch).get._2
+        val forkedBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository, tmpForkedBranch).get._2
+
+        val forkedId = getForkedCommitId(oldGit, newGit,
+          originRepository.owner, originRepository.name, originBranch,
+          forkedRepository.owner, forkedRepository.name, forkedBranch)
+
+        val oldId = oldGit.getRepository.resolve(forkedId)
+        val newId = newGit.getRepository.resolve(forkedBranch)
+
+        val (commits, diffs) = getRequestCompareInfo(
+          originRepository.owner, originRepository.name, oldId.getName,
+          forkedRepository.owner, forkedRepository.name, newId.getName)
+
+        pulls.html.compare(
+          commits,
+          diffs,
+          (forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
+            case (Some(userName), Some(repositoryName)) => (userName, repositoryName) :: getForkedRepositories(userName, repositoryName)
+            case _ => (forkedRepository.owner, forkedRepository.name) :: getForkedRepositories(forkedRepository.owner, forkedRepository.name)
+          },
+          originBranch,
+          forkedBranch,
+          oldId.getName,
+          newId.getName,
+          forkedRepository,
+          originRepository,
+          forkedRepository,
+          hasWritePermission(forkedRepository.owner, forkedRepository.name, context.loginAccount))
+      }
+    }) getOrElse NotFound
+  })
+
+  ajaxGet("/:owner/:repository/compare/*...*/mergecheck")(collaboratorsOnly { forkedRepository =>
+    val Seq(origin, forked) = multiParams("splat")
+    val (originOwner, tmpOriginBranch) = parseCompareIdentifie(origin, forkedRepository.owner)
+    val (forkedOwner, tmpForkedBranch) = parseCompareIdentifie(forked, forkedRepository.owner)
+
+    (for(
+      originRepositoryName <- if(originOwner == forkedOwner){
+        Some(forkedRepository.name)
+      } else {
+        forkedRepository.repository.originRepositoryName.orElse {
+          getForkedRepositories(forkedRepository.owner, forkedRepository.name).find(_._1 == originOwner).map(_._2)
+        }
+      };
+      originRepository <- getRepository(originOwner, originRepositoryName, baseUrl)
+    ) yield {
+      using(
+        Git.open(getRepositoryDir(originRepository.owner, originRepository.name)),
+        Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
+      ){ case (oldGit, newGit) =>
+        val originBranch = JGitUtil.getDefaultBranch(oldGit, originRepository, tmpOriginBranch).get._2
+        val forkedBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository, tmpForkedBranch).get._2
+
+        pulls.html.mergecheck(
+          checkConflict(originRepository.owner, originRepository.name, originBranch,
+                        forkedRepository.owner, forkedRepository.name, forkedBranch))
+      }
+    }) getOrElse NotFound
+  })
+
+  post("/:owner/:repository/pulls/new", pullRequestForm)(referrersOnly { (form, repository) =>
+    val loginUserName = context.loginAccount.get.userName
+
+    val issueId = createIssue(
+      owner            = repository.owner,
+      repository       = repository.name,
+      loginUser        = loginUserName,
+      title            = form.title,
+      content          = form.content,
+      assignedUserName = None,
+      milestoneId      = None,
+      isPullRequest    = true)
+
+    createPullRequest(
+      originUserName        = repository.owner,
+      originRepositoryName  = repository.name,
+      issueId               = issueId,
+      originBranch          = form.targetBranch,
+      requestUserName       = form.requestUserName,
+      requestRepositoryName = form.requestRepositoryName,
+      requestBranch         = form.requestBranch,
+      commitIdFrom          = form.commitIdFrom,
+      commitIdTo            = form.commitIdTo)
+
+    // fetch requested branch
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+      git.fetch
+        .setRemote(getRepositoryDir(form.requestUserName, form.requestRepositoryName).toURI.toString)
+        .setRefSpecs(new RefSpec(s"refs/heads/${form.requestBranch}:refs/pull/${issueId}/head"))
+        .call
+    }
+
+    // record activity
+    recordPullRequestActivity(repository.owner, repository.name, loginUserName, issueId, form.title)
+
+    // notifications
+    Notifier().toNotify(repository, issueId, form.content.getOrElse("")){
+      Notifier.msgPullRequest(s"${baseUrl}/${repository.owner}/${repository.name}/pull/${issueId}")
+    }
+
+    redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+  })
+
+  /**
+   * Checks whether conflict will be caused in merging. Returns true if conflict will be caused.
+   */
+  private def checkConflict(userName: String, repositoryName: String, branch: String,
+                            requestUserName: String, requestRepositoryName: String, requestBranch: String): Boolean = {
+    LockUtil.lock(s"${userName}/${repositoryName}/merge-check"){
+      using(Git.open(getRepositoryDir(requestUserName, requestRepositoryName))) { git =>
+        val remoteRefName = s"refs/heads/${branch}"
+        val tmpRefName = s"refs/merge-check/${userName}/${branch}"
+        val refSpec = new RefSpec(s"${remoteRefName}:${tmpRefName}").setForceUpdate(true)
+        try {
+          // fetch objects from origin repository branch
+          git.fetch
+             .setRemote(getRepositoryDir(userName, repositoryName).toURI.toString)
+             .setRefSpecs(refSpec)
+             .call
+
+          // merge conflict check
+          val merger = MergeStrategy.RECURSIVE.newMerger(git.getRepository, true)
+          val mergeBaseTip = git.getRepository.resolve(s"refs/heads/${requestBranch}")
+          val mergeTip = git.getRepository.resolve(tmpRefName)
+          try {
+            !merger.merge(mergeBaseTip, mergeTip)
+          } catch {
+            case e: NoMergeBaseException =>  true
+          }
+        } finally {
+          val refUpdate = git.getRepository.updateRef(refSpec.getDestination)
+          refUpdate.setForceUpdate(true)
+          refUpdate.delete()
+        }
+      }
+    }
+  }
+
+  /**
+   * Checks whether conflict will be caused in merging within pull request. Returns true if conflict will be caused.
+   */
+  private def checkConflictInPullRequest(userName: String, repositoryName: String, branch: String,
+                                         requestUserName: String, requestRepositoryName: String, requestBranch: String,
+                                         issueId: Int): Boolean = {
+    LockUtil.lock(s"${userName}/${repositoryName}/merge") {
+      using(Git.open(getRepositoryDir(userName, repositoryName))) { git =>
+        // merge
+        val merger = MergeStrategy.RECURSIVE.newMerger(git.getRepository, true)
+        val mergeBaseTip = git.getRepository.resolve(s"refs/heads/${branch}")
+        val mergeTip = git.getRepository.resolve(s"refs/pull/${issueId}/head")
+        try {
+          !merger.merge(mergeBaseTip, mergeTip)
+        } catch {
+          case e: NoMergeBaseException => true
+        }
+      }
+    }
+  }
+
+  /**
+   * Parses branch identifier and extracts owner and branch name as tuple.
+   *
+   * - "owner:branch" to ("owner", "branch")
+   * - "branch" to ("defaultOwner", "branch")
+   */
+  private def parseCompareIdentifie(value: String, defaultOwner: String): (String, String) =
+    if(value.contains(':')){
+      val array = value.split(":")
+      (array(0), array(1))
+    } else {
+      (defaultOwner, value)
+    }
+
+  /**
+   * Extracts all repository names from [[service.RepositoryService.RepositoryTreeNode]] as flat list.
+   */
+  private def getRepositoryNames(node: RepositoryTreeNode): List[String] =
+    node.owner :: node.children.map { child => getRepositoryNames(child) }.flatten
+
+  /**
+   * Returns the identifier of the root commit (or latest merge commit) of the specified branch.
+   */
+  private def getForkedCommitId(oldGit: Git, newGit: Git, userName: String, repositoryName: String, branch: String,
+      requestUserName: String, requestRepositoryName: String, requestBranch: String): String =
+    JGitUtil.getCommitLogs(newGit, requestBranch, true){ commit =>
+      existsCommitId(userName, repositoryName, commit.getName) && JGitUtil.getBranchesOfCommit(oldGit, commit.getName).contains(branch)
+    }.head.id
+
+  private def getRequestCompareInfo(userName: String, repositoryName: String, branch: String,
+      requestUserName: String, requestRepositoryName: String, requestCommitId: String): (Seq[Seq[CommitInfo]], Seq[DiffInfo]) = {
+
+    using(
+      Git.open(getRepositoryDir(userName, repositoryName)),
+      Git.open(getRepositoryDir(requestUserName, requestRepositoryName))
+    ){ (oldGit, newGit) =>
+      val oldId = oldGit.getRepository.resolve(branch)
+      val newId = newGit.getRepository.resolve(requestCommitId)
+
+      val commits = newGit.log.addRange(oldId, newId).call.iterator.asScala.map { revCommit =>
+        new CommitInfo(revCommit)
+      }.toList.splitWith { (commit1, commit2) =>
+        view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
+      }
+
+      val diffs = JGitUtil.getDiffs(newGit, oldId.getName, newId.getName, true)
+
+      (commits, diffs)
+    }
+  }
+
+  private def searchPullRequests(userName: Option[String], repository: RepositoryService.RepositoryInfo) =
+    defining(repository.owner, repository.name){ case (owner, repoName) =>
+      val filterUser = userName.map { x => Map("created_by" -> x) } getOrElse Map("all" -> "")
+      val page       = IssueSearchCondition.page(request)
+      val sessionKey = Keys.Session.Pulls(owner, repoName)
+
+      // retrieve search condition
+      val condition = session.putAndGet(sessionKey,
+        if(request.hasQueryString) IssueSearchCondition(request)
+        else session.getAs[IssueSearchCondition](sessionKey).getOrElse(IssueSearchCondition())
+      )
+
+      pulls.html.list(
+        searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, owner -> repoName),
+        getPullRequestCountGroupByUser(condition.state == "closed", owner, Some(repoName)),
+        userName,
+        page,
+        countIssue(condition.copy(state = "open"  ), filterUser, true, owner -> repoName),
+        countIssue(condition.copy(state = "closed"), filterUser, true, owner -> repoName),
+        countIssue(condition, Map.empty, true, owner -> repoName),
+        condition,
+        repository,
+        hasWritePermission(owner, repoName, context.loginAccount))
+    }
+
+}

src/main/scala/app/RepositorySettingsController.scala

@@ -5,28 +5,51 @@ import util.Directory._
 import util.{UsersAuthenticator, OwnerAuthenticator}
 import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils
-import org.scalatra.FlashMapSupport
+import org.scalatra.i18n.Messages
+import service.WebHookService.WebHookPayload
+import util.JGitUtil.CommitInfo
+import util.ControlUtil._
+import org.eclipse.jgit.api.Git
 
 class RepositorySettingsController extends RepositorySettingsControllerBase
-  with RepositoryService with AccountService with OwnerAuthenticator with UsersAuthenticator
+  with RepositoryService with AccountService with WebHookService
+  with OwnerAuthenticator with UsersAuthenticator
 
-trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSupport {
+trait RepositorySettingsControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with OwnerAuthenticator with UsersAuthenticator =>
+  self: RepositoryService with AccountService with WebHookService
+    with OwnerAuthenticator with UsersAuthenticator =>
 
-  case class OptionsForm(description: Option[String], defaultBranch: String, isPrivate: Boolean)
+  // for repository options
+  case class OptionsForm(repositoryName: String, description: Option[String], defaultBranch: String, isPrivate: Boolean)
   
   val optionsForm = mapping(
-    "description"   -> trim(label("Description"    , optional(text()))),
+    "repositoryName" -> trim(label("Description"    , text(required, maxlength(40), identifier, renameRepositoryName))),
-    "defaultBranch" -> trim(label("Default Branch" , text(required, maxlength(100)))),
+    "description"    -> trim(label("Description"    , optional(text()))),
-    "isPrivate"     -> trim(label("Repository Type", boolean()))
+    "defaultBranch"  -> trim(label("Default Branch" , text(required, maxlength(100)))),
+    "isPrivate"      -> trim(label("Repository Type", boolean()))
   )(OptionsForm.apply)
-  
+
+  // for collaborator addition
   case class CollaboratorForm(userName: String)
 
   val collaboratorForm = mapping(
     "userName" -> trim(label("Username", text(required, collaborator)))
   )(CollaboratorForm.apply)
 
+  // for web hook url addition
+  case class WebHookForm(url: String)
+
+  val webHookForm = mapping(
+    "url" -> trim(label("url", text(required, webHook)))
+  )(WebHookForm.apply)
+
+  // for transfer ownership
+  case class TransferOwnerShipForm(newOwner: String)
+
+  val transferForm = mapping(
+    "newOwner" -> trim(label("New owner", text(required, transferUser)))
+  )(TransferOwnerShipForm.apply)
+
   /**
    * Redirect to the Options page.
    */
@@ -45,9 +68,30 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
    * Save the repository options.
    */
   post("/:owner/:repository/settings/options", optionsForm)(ownerOnly { (form, repository) =>
-    saveRepositoryOptions(repository.owner, repository.name, form.description, form.defaultBranch, form.isPrivate)
+    saveRepositoryOptions(
+      repository.owner,
+      repository.name,
+      form.description,
+      form.defaultBranch,
+      repository.repository.parentUserName.map { _ =>
+        repository.repository.isPrivate
+      } getOrElse form.isPrivate
+    )
+    // Change repository name
+    if(repository.name != form.repositoryName){
+      // Update database
+      renameRepository(repository.owner, repository.name, repository.owner, form.repositoryName)
+      // Move git repository
+      defining(getRepositoryDir(repository.owner, repository.name)){ dir =>
+        FileUtils.moveDirectory(dir, getRepositoryDir(repository.owner, form.repositoryName))
+      }
+      // Move wiki repository
+      defining(getWikiRepositoryDir(repository.owner, repository.name)){ dir =>
+        FileUtils.moveDirectory(dir, getWikiRepositoryDir(repository.owner, form.repositoryName))
+      }
+    }
     flash += "info" -> "Repository settings has been updated."
-    redirect(s"/${repository.owner}/${repository.name}/settings/options")
+    redirect(s"/${repository.owner}/${form.repositoryName}/settings/options")
   })
   
   /**
@@ -81,10 +125,78 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
   })
 
   /**
-   * Display the delete repository page.
+   * Display the web hook page.
    */
-  get("/:owner/:repository/settings/delete")(ownerOnly {
+  get("/:owner/:repository/settings/hooks")(ownerOnly { repository =>
-    settings.html.delete(_)
+    settings.html.hooks(getWebHookURLs(repository.owner, repository.name), repository, flash.get("info"))
+  })
+
+  /**
+   * Add the web hook URL.
+   */
+  post("/:owner/:repository/settings/hooks/add", webHookForm)(ownerOnly { (form, repository) =>
+    addWebHookURL(repository.owner, repository.name, form.url)
+    redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
+  })
+
+  /**
+   * Delete the web hook URL.
+   */
+  get("/:owner/:repository/settings/hooks/delete")(ownerOnly { repository =>
+    deleteWebHookURL(repository.owner, repository.name, params("url"))
+    redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
+  })
+
+  /**
+   * Send the test request to registered web hook URLs.
+   */
+  get("/:owner/:repository/settings/hooks/test")(ownerOnly { repository =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+      import scala.collection.JavaConverters._
+      val commits = git.log
+        .add(git.getRepository.resolve(repository.repository.defaultBranch))
+        .setMaxCount(3)
+        .call.iterator.asScala.map(new CommitInfo(_))
+
+      getWebHookURLs(repository.owner, repository.name) match {
+        case webHookURLs if(webHookURLs.nonEmpty) =>
+          for(ownerAccount <- getAccountByUserName(repository.owner)){
+            callWebHook(repository.owner, repository.name, webHookURLs,
+              WebHookPayload(git, ownerAccount, "refs/heads/" + repository.repository.defaultBranch, repository, commits.toList, ownerAccount))
+          }
+        case _ =>
+      }
+
+      flash += "info" -> "Test payload deployed!"
+    }
+    redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
+  })
+
+  /**
+   * Display the danger zone.
+   */
+  get("/:owner/:repository/settings/danger")(ownerOnly {
+    settings.html.danger(_)
+  })
+
+  /**
+   * Transfer repository ownership.
+   */
+  post("/:owner/:repository/settings/transfer", transferForm)(ownerOnly { (form, repository) =>
+    // Change repository owner
+    if(repository.owner != form.newOwner){
+      // Update database
+      renameRepository(repository.owner, repository.name, form.newOwner, repository.name)
+      // Move git repository
+      defining(getRepositoryDir(repository.owner, repository.name)){ dir =>
+        FileUtils.moveDirectory(dir, getRepositoryDir(form.newOwner, repository.name))
+      }
+      // Move wiki repository
+      defining(getWikiRepositoryDir(repository.owner, repository.name)){ dir =>
+        FileUtils.moveDirectory(dir, getWikiRepositoryDir(form.newOwner, repository.name))
+      }
+    }
+    redirect(s"/${form.newOwner}/${repository.name}")
   })
 
   /**
@@ -100,19 +212,55 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
     redirect(s"/${repository.owner}")
   })
 
+  /**
+   * Provides duplication check for web hook url.
+   */
+  private def webHook: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      getWebHookURLs(params("owner"), params("repository")).map(_.url).find(_ == value).map(_ => "URL had been registered already.")
+  }
+
   /**
    * Provides Constraint to validate the collaborator name.
    */
   private def collaborator: Constraint = new Constraint(){
-    def validate(name: String, value: String): Option[String] = {
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
-      val paths = request.getRequestURI.split("/")
       getAccountByUserName(value) match {
         case None => Some("User does not exist.")
-        case Some(x) if(x.userName == paths(1) || getCollaborators(paths(1), paths(2)).contains(x.userName))
+        case Some(x) if(x.isGroupAccount)
+                  => Some("User does not exist.")
+        case Some(x) if(x.userName == params("owner") || getCollaborators(params("owner"), params("repository")).contains(x.userName))
                   => Some("User can access this repository already.")
         case _    => None
       }
-    }
   }
 
+  /**
+   * Duplicate check for the rename repository name.
+   */
+  private def renameRepositoryName: Constraint = new Constraint(){
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
+      params.get("repository").filter(_ != value).flatMap { _ =>
+        params.get("owner").flatMap { userName =>
+          getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.")
+        }
+      }
+  }
+
+  /**
+   * Provides Constraint to validate the repository transfer user.
+   */
+  private def transferUser: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      getAccountByUserName(value) match {
+        case None    => Some("User does not exist.")
+        case Some(x) => if(x.userName == params("owner")){
+          Some("This is current repository owner.")
+        } else {
+          params.get("repository").flatMap { repositoryName =>
+            getRepositoryNamesOfUser(x.userName).find(_ == repositoryName).map{ _ => "User already has same repository." }
+          }
+        }
+      }
+  }
 }

src/main/scala/app/RepositoryViewerController.scala

@@ -2,7 +2,8 @@ package app
 
 import util.Directory._
 import util.Implicits._
-import _root_.util.{ReferrerAuthenticator, JGitUtil, FileUtil}
+import util.ControlUtil._
+import _root_.util._
 import service._
 import org.scalatra._
 import java.io.File
@@ -10,15 +11,17 @@ import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib._
 import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.treewalk._
+import java.util.zip.{ZipEntry, ZipOutputStream}
+import scala.Some
 
 class RepositoryViewerController extends RepositoryViewerControllerBase 
-  with RepositoryService with AccountService with ReferrerAuthenticator
+  with RepositoryService with AccountService with ActivityService with ReferrerAuthenticator with CollaboratorsAuthenticator
 
 /**
  * The repository viewer.
  */
 trait RepositoryViewerControllerBase extends ControllerBase { 
-  self: RepositoryService with AccountService with ReferrerAuthenticator =>
+  self: RepositoryService with AccountService with ActivityService with ReferrerAuthenticator with CollaboratorsAuthenticator =>
 
   /**
    * Returns converted HTML from Markdown for preview.
@@ -36,7 +39,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   get("/:owner/:repository")(referrersOnly {
     fileList(_)
   })
-  
+
   /**
    * Displays the file list of the specified path and branch.
    */
@@ -48,15 +51,15 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       fileList(repository, id, path)
     }
   })
-  
+
   /**
    * Displays the commit list of the specified resource.
    */
   get("/:owner/:repository/commits/*")(referrersOnly { repository =>
     val (branchName, path) = splitPath(repository, multiParams("splat").head)
-    val page = params.getOrElse("page", "1").toInt
+    val page = params.get("page").flatMap(_.toIntOpt).getOrElse(1)
 
-    JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
       JGitUtil.getCommitLog(git, branchName, page, 30, path) match {
         case Right((logs, hasNext)) =>
           repo.html.commits(if(path.isEmpty) Nil else path.split("/").toList, branchName, repository,
@@ -75,80 +78,112 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     val (id, path) = splitPath(repository, multiParams("splat").head)
     val raw = params.get("raw").getOrElse("false").toBoolean
 
-    JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
       val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
 
       @scala.annotation.tailrec
-      def getPathObjectId(path: String, walk: TreeWalk): ObjectId = walk.next match {
+      def getPathObjectId(path: String, walk: TreeWalk): Option[ObjectId] = walk.next match {
-        case true if(walk.getPathString == path) => walk.getObjectId(0)
+        case true if(walk.getPathString == path) => Some(walk.getObjectId(0))
-        case true => getPathObjectId(path, walk)
+        case true  => getPathObjectId(path, walk)
+        case false => None
       }
 
-      val treeWalk = new TreeWalk(git.getRepository)
+      using(new TreeWalk(git.getRepository)){ treeWalk =>
-      val objectId = try {
         treeWalk.addTree(revCommit.getTree)
         treeWalk.setRecursive(true)
         getPathObjectId(path, treeWalk)
-      } finally {
+      } map { objectId =>
-        treeWalk.release
+        if(raw){
-      }
+          // Download
-
+          defining(JGitUtil.getContentFromId(git, objectId, false).get){ bytes =>
-      if(raw){
+            contentType = FileUtil.getContentType(path, bytes)
-        // Download
+            bytes
-        contentType = "application/octet-stream"
-        JGitUtil.getContent(git, objectId, false).get
-      } else {
-        // Viewer
-        val large  = FileUtil.isLarge(git.getRepository.getObjectDatabase.open(objectId).getSize)
-        val viewer = if(FileUtil.isImage(path)) "image" else if(large) "large" else "other"
-        val bytes  = if(viewer == "other") JGitUtil.getContent(git, objectId, false) else None
-
-        val content = if(viewer == "other"){
-          if(bytes.isDefined && FileUtil.isText(bytes.get)){
-            // text
-            JGitUtil.ContentInfo("text", bytes.map(new String(_, "UTF-8")))
-          } else {
-            // binary
-            JGitUtil.ContentInfo("binary", None)
           }
         } else {
-          // image or large
+          // Viewer
-          JGitUtil.ContentInfo(viewer, None)
+          val large  = FileUtil.isLarge(git.getRepository.getObjectDatabase.open(objectId).getSize)
-        }
+          val viewer = if(FileUtil.isImage(path)) "image" else if(large) "large" else "other"
+          val bytes  = if(viewer == "other") JGitUtil.getContentFromId(git, objectId, false) else None
 
-        repo.html.blob(id, repository, path.split("/").toList, content, new JGitUtil.CommitInfo(revCommit))
+          val content = if(viewer == "other"){
-      }
+            if(bytes.isDefined && FileUtil.isText(bytes.get)){
+              // text
+              JGitUtil.ContentInfo("text", bytes.map(StringUtil.convertFromByteArray))
+            } else {
+              // binary
+              JGitUtil.ContentInfo("binary", None)
+            }
+          } else {
+            // image or large
+            JGitUtil.ContentInfo(viewer, None)
+          }
+
+          repo.html.blob(id, repository, path.split("/").toList, content, new JGitUtil.CommitInfo(revCommit))
+        }
+      } getOrElse NotFound
     }
   })
-  
+
   /**
    * Displays details of the specified commit.
    */
   get("/:owner/:repository/commit/:id")(referrersOnly { repository =>
     val id = params("id")
 
-    JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
+      defining(JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))){ revCommit =>
-
+        JGitUtil.getDiffs(git, id) match { case (diffs, oldCommitId) =>
-      repo.html.commit(id, new JGitUtil.CommitInfo(revCommit),
+          repo.html.commit(id, new JGitUtil.CommitInfo(revCommit),
-        JGitUtil.getBranchesOfCommit(git, revCommit.getName), JGitUtil.getTagsOfCommit(git, revCommit.getName),
+            JGitUtil.getBranchesOfCommit(git, revCommit.getName),
-        repository, JGitUtil.getDiffs(git, id))
+            JGitUtil.getTagsOfCommit(git, revCommit.getName),
+            repository, diffs, oldCommitId)
+        }
+      }
     }
   })
-  
+
+  /**
+   * Displays branches.
+   */
+  get("/:owner/:repository/branches")(referrersOnly { repository =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+      // retrieve latest update date of each branch
+      val branchInfo = repository.branchList.map { branchName =>
+        val revCommit = git.log.add(git.getRepository.resolve(branchName)).setMaxCount(1).call.iterator.next
+        (branchName, revCommit.getCommitterIdent.getWhen)
+      }
+      repo.html.branches(branchInfo, hasWritePermission(repository.owner, repository.name, context.loginAccount), repository)
+    }
+  })
+
+  /**
+   * Deletes branch.
+   */
+  get("/:owner/:repository/delete/*")(collaboratorsOnly { repository =>
+    val branchName = multiParams("splat").head
+    val userName   = context.loginAccount.get.userName
+    if(repository.repository.defaultBranch != branchName){
+      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+        git.branchDelete().setBranchNames(branchName).call()
+        recordDeleteBranchActivity(repository.owner, repository.name, userName, branchName)
+      }
+    }
+    redirect(s"/${repository.owner}/${repository.name}/branches")
+  })
+
   /**
    * Displays tags.
    */
   get("/:owner/:repository/tags")(referrersOnly {
     repo.html.tags(_)
   })
-  
+
   /**
    * Download repository contents as an archive.
    */
-  get("/:owner/:repository/archive/:name")(referrersOnly { repository =>
+  get("/:owner/:repository/archive/*")(referrersOnly { repository =>
-    val name = params("name")
+    val name = multiParams("splat").head
-    
+
     if(name.endsWith(".zip")){
       val revision = name.replaceFirst("\\.zip$", "")
       val workDir = getDownloadWorkDir(repository.owner, repository.name, session.getId)
@@ -156,42 +191,69 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         FileUtils.deleteDirectory(workDir)
       }
       workDir.mkdirs
-      
+
-      // clone the repository
+      val zipFile = new File(workDir, repository.name + "-" +
-      val cloneDir = new File(workDir, revision)
+        (if(revision.length == 40) revision.substring(0, 10) else revision).replace('/', '_') + ".zip")
-      JGitUtil.withGit(Git.cloneRepository
+
-          .setURI(getRepositoryDir(repository.owner, repository.name).toURI.toString)
+      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-          .setDirectory(cloneDir)
+        val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision))
-          .call){ git =>
+        using(new TreeWalk(git.getRepository)){ walk =>
-      
+          val reader   = walk.getObjectReader
-        // checkout the specified revision
+          val objectId = new MutableObjectId
-        git.checkout.setName(revision).call
+
+          using(new ZipOutputStream(new java.io.FileOutputStream(zipFile))){ out =>
+            walk.addTree(revCommit.getTree)
+            walk.setRecursive(true)
+
+            while(walk.next){
+              val name = walk.getPathString
+              val mode = walk.getFileMode(0)
+              if(mode == FileMode.REGULAR_FILE || mode == FileMode.EXECUTABLE_FILE){
+                walk.getObjectId(objectId, 0)
+                val entry = new ZipEntry(name)
+                val loader = reader.open(objectId)
+                entry.setSize(loader.getSize)
+                out.putNextEntry(entry)
+                loader.copyTo(out)
+              }
+            }
+          }
+        }
       }
-      
+
-      // remove .git
-      FileUtils.deleteDirectory(new File(cloneDir, ".git"))
-      
-      // create zip file
-      val zipFile = new File(workDir, (if(revision.length == 40) revision.substring(0, 10) else revision) + ".zip")
-      FileUtil.createZipFile(zipFile, cloneDir)
-      
       contentType = "application/octet-stream"
+      response.setHeader("Content-Disposition", s"attachment; filename=${zipFile.getName}")
       zipFile
     } else {
       BadRequest
     }
   })
 
+  get("/:owner/:repository/network/members")(referrersOnly { repository =>
+    repo.html.forked(
+      getRepository(
+        repository.repository.originUserName.getOrElse(repository.owner),
+        repository.repository.originRepositoryName.getOrElse(repository.name),
+        baseUrl),
+      getForkedRepositories(
+        repository.repository.originUserName.getOrElse(repository.owner),
+        repository.repository.originRepositoryName.getOrElse(repository.name)),
+      repository)
+  })
+  
   private def splitPath(repository: service.RepositoryService.RepositoryInfo, path: String): (String, String) = {
     val id = repository.branchList.collectFirst {
       case branch if(path == branch || path.startsWith(branch + "/")) => branch
     } orElse repository.tags.collectFirst {
       case tag if(path == tag.name || path.startsWith(tag.name + "/")) => tag.name
-    } orElse Some(path) get
+    } orElse Some(path.split("/")(0)) get
 
     (id, path.substring(id.length).replaceFirst("^/", ""))
   }
 
+
+  private val readmeFiles = Seq("readme.md", "readme.markdown")
+
   /**
    * Provides HTML of the file list.
    * 
@@ -204,26 +266,29 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     if(repository.commitCount == 0){
       repo.html.guide(repository)
     } else {
-      JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
+      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-        val revisions = Seq(if(revstr.isEmpty) repository.repository.defaultBranch else revstr, repository.branchList.head)
+        //val revisions = Seq(if(revstr.isEmpty) repository.repository.defaultBranch else revstr, repository.branchList.head)
         // get specified commit
-        revisions.map { rev => (git.getRepository.resolve(rev), rev)}.find(_._1 != null).map { case (objectId, revision) =>
+        JGitUtil.getDefaultBranch(git, repository, revstr).map { case (objectId, revision) =>
-          val revCommit = JGitUtil.getRevCommitFromId(git, objectId)
+          defining(JGitUtil.getRevCommitFromId(git, objectId)){ revCommit =>
-
           // get files
-          val files = JGitUtil.getFileList(git, revision, path)
+            val files = JGitUtil.getFileList(git, revision, path)
-          // process README.md
+            // process README.md or README.markdown
-          val readme = files.find(_.name == "README.md").map { file =>
+            val readme = files.find { file =>
-            new String(JGitUtil.getContent(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get, "UTF-8")
+              readmeFiles.contains(file.name.toLowerCase)
-          }
+            }.map { file =>
+              file -> StringUtil.convertFromByteArray(JGitUtil.getContentFromId(
+                Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get)
+            }
 
-          repo.html.files(revision, repository,
+            repo.html.files(revision, repository,
-            if(path == ".") Nil else path.split("/").toList, // current path
+              if(path == ".") Nil else path.split("/").toList, // current path
-            new JGitUtil.CommitInfo(revCommit), // latest commit
+              new JGitUtil.CommitInfo(revCommit), // latest commit
-            files, readme)
+              files, readme)
+          }
         } getOrElse NotFound
       }
     }
   }
   
-}
+}

src/main/scala/app/SearchController.scala

@@ -1,17 +1,15 @@
 package app
 
 import util._
+import ControlUtil._
 import service._
 import jp.sf.amateras.scalatra.forms._
 
 class SearchController extends SearchControllerBase
-with RepositoryService with AccountService with SystemSettingsService with ActivityService
+  with RepositoryService with AccountService with ActivityService with RepositorySearchService with IssuesService with ReferrerAuthenticator
-with RepositorySearchService with IssuesService
-with ReferrerAuthenticator
 
 trait SearchControllerBase extends ControllerBase { self: RepositoryService
-  with SystemSettingsService with ActivityService with RepositorySearchService
+  with ActivityService with RepositorySearchService with ReferrerAuthenticator =>
-  with ReferrerAuthenticator =>
 
   val searchForm = mapping(
     "query"      -> trim(text(required)),
@@ -26,25 +24,25 @@ trait SearchControllerBase extends ControllerBase { self: RepositoryService
   }
 
   get("/:owner/:repository/search")(referrersOnly { repository =>
-    val query  = params("q").trim
+    defining(params("q").trim, params.getOrElse("type", "code")){ case (query, target) =>
-    val target = params.getOrElse("type", "code")
+      val page   = try {
-    val page   = try {
+        val i = params.getOrElse("page", "1").toInt
-      val i = params.getOrElse("page", "1").toInt
+        if(i <= 0) 1 else i
-      if(i <= 0) 1 else i
+      } catch {
-    } catch {
+        case e: NumberFormatException => 1
-      case e: NumberFormatException => 1
+      }
-    }
 
-    target.toLowerCase match {
+      target.toLowerCase match {
-      case "issue" => search.html.issues(
+        case "issue" => search.html.issues(
-        searchIssues(repository.owner, repository.name, query),
+          searchIssues(repository.owner, repository.name, query),
-        countFiles(repository.owner, repository.name, query),
+          countFiles(repository.owner, repository.name, query),
-        query, page, repository)
+          query, page, repository)
 
-      case _ => search.html.code(
+        case _ => search.html.code(
-        searchFiles(repository.owner, repository.name, query),
+          searchFiles(repository.owner, repository.name, query),
-        countIssues(repository.owner, repository.name, query),
+          countIssues(repository.owner, repository.name, query),
-        query, page, repository)
+          query, page, repository)
+      }
     }
   })
 

src/main/scala/app/SignInController.scala

@@ -1,47 +0,0 @@
-package app
-
-import service._
-import util.StringUtil._
-import jp.sf.amateras.scalatra.forms._
-
-class SignInController extends SignInControllerBase with SystemSettingsService with AccountService
-
-trait SignInControllerBase extends ControllerBase { self: SystemSettingsService with AccountService =>
-  
-  case class SignInForm(userName: String, password: String)
-  
-  val form = mapping(
-    "userName" -> trim(label("Username", text(required))),
-    "password" -> trim(label("Password", text(required)))
-  )(SignInForm.apply)
-  
-  get("/signin"){
-    val queryString = request.getQueryString
-    if(queryString != null && queryString.startsWith("/")){
-      session.setAttribute("REDIRECT", queryString)
-    }
-    html.signin(loadSystemSettings())
-  }
-
-  post("/signin", form){ form =>
-    getAccountByUserName(form.userName).collect {
-      case account if(!account.isGroupAccount && account.password == sha1(form.password)) => {
-        session.setAttribute("LOGIN_ACCOUNT", account)
-        updateLastLoginDate(account.userName)
-
-        session.get("REDIRECT").map { redirectUrl =>
-          session.removeAttribute("REDIRECT")
-          redirect(redirectUrl.asInstanceOf[String])
-        }.getOrElse {
-          redirect("/")
-        }
-      }
-    } getOrElse redirect("/signin")
-  }
-
-  get("/signout"){
-    session.invalidate
-    redirect("/")
-  }
-
-}

src/main/scala/app/SystemSettingsController.scala

@@ -4,27 +4,65 @@ import service.{AccountService, SystemSettingsService}
 import SystemSettingsService._
 import util.AdminAuthenticator
 import jp.sf.amateras.scalatra.forms._
-import org.scalatra.FlashMapSupport
+import ssh.SshServer
 
 class SystemSettingsController extends SystemSettingsControllerBase
-  with SystemSettingsService with AccountService with AdminAuthenticator
+  with AccountService with AdminAuthenticator
 
-trait SystemSettingsControllerBase extends ControllerBase with FlashMapSupport {
+trait SystemSettingsControllerBase extends ControllerBase {
-  self: SystemSettingsService with AccountService with AdminAuthenticator =>
+  self: AccountService with AdminAuthenticator =>
-
-  private case class SystemSettingsForm(allowAccountRegistration: Boolean)
 
   private val form = mapping(
-    "allowAccountRegistration" -> trim(label("Account registration", boolean()))
+    "baseUrl"                  -> trim(label("Base URL", optional(text()))),
-  )(SystemSettingsForm.apply)
+    "allowAccountRegistration" -> trim(label("Account registration", boolean())),
+    "gravatar"                 -> trim(label("Gravatar", boolean())),
+    "notification"             -> trim(label("Notification", boolean())),
+    "ssh"                      -> trim(label("SSH access", boolean())),
+    "sshPort"                  -> trim(label("SSH port", optional(number()))),
+    "smtp"                     -> optionalIfNotChecked("notification", mapping(
+        "host"                     -> trim(label("SMTP Host", text(required))),
+        "port"                     -> trim(label("SMTP Port", optional(number()))),
+        "user"                     -> trim(label("SMTP User", optional(text()))),
+        "password"                 -> trim(label("SMTP Password", optional(text()))),
+        "ssl"                      -> trim(label("Enable SSL", optional(boolean()))),
+        "fromAddress"              -> trim(label("FROM Address", optional(text()))),
+        "fromName"                 -> trim(label("FROM Name", optional(text())))
+    )(Smtp.apply)),
+    "ldapAuthentication"       -> trim(label("LDAP", boolean())),
+    "ldap"                     -> optionalIfNotChecked("ldapAuthentication", mapping(
+        "host"                     -> trim(label("LDAP host", text(required))),
+        "port"                     -> trim(label("LDAP port", optional(number()))),
+        "bindDN"                   -> trim(label("Bind DN", optional(text()))),
+        "bindPassword"             -> trim(label("Bind Password", optional(text()))),
+        "baseDN"                   -> trim(label("Base DN", text(required))),
+        "userNameAttribute"        -> trim(label("User name attribute", text(required))),
+        "fullNameAttribute"        -> trim(label("Full name attribute", optional(text()))),
+        "mailAttribute"            -> trim(label("Mail address attribute", text(required))),
+        "tls"                      -> trim(label("Enable TLS", optional(boolean()))),
+        "keystore"                 -> trim(label("Keystore", optional(text())))
+    )(Ldap.apply))
+  )(SystemSettings.apply).verifying { settings =>
+    if(settings.ssh && settings.baseUrl.isEmpty){
+      Seq("baseUrl" -> "Base URL is required if SSH access is enabled.")
+    } else Nil
+  }
 
 
   get("/admin/system")(adminOnly {
-    admin.html.system(loadSystemSettings(), flash.get("info"))
+    admin.html.system(flash.get("info"))
   })
 
   post("/admin/system", form)(adminOnly { form =>
-    saveSystemSettings(SystemSettings(form.allowAccountRegistration))
+    saveSystemSettings(form)
+
+    if(form.ssh && !SshServer.isActive && form.baseUrl.isDefined){
+      SshServer.start(request.getServletContext,
+        form.sshPort.getOrElse(SystemSettingsService.DefaultSshPort),
+        form.baseUrl.get)
+    } else if(!form.ssh && SshServer.isActive){
+      SshServer.stop()
+    }
+
     flash += "info" -> "System settings has been updated."
     redirect("/admin/system")
   })

src/main/scala/app/UserManagementController.scala

@@ -3,7 +3,11 @@ package app
 import service._
 import util.AdminAuthenticator
 import util.StringUtil._
+import util.ControlUtil._
 import jp.sf.amateras.scalatra.forms._
+import org.scalatra.i18n.Messages
+import org.apache.commons.io.FileUtils
+import util.Directory._
 
 class UserManagementController extends UserManagementControllerBase
   with AccountService with RepositoryService with AdminAuthenticator
@@ -11,58 +15,66 @@ class UserManagementController extends UserManagementControllerBase
 trait UserManagementControllerBase extends AccountManagementControllerBase {
   self: AccountService with RepositoryService with AdminAuthenticator =>
   
-  case class NewUserForm(userName: String, password: String, mailAddress: String, isAdmin: Boolean,
+  case class NewUserForm(userName: String, password: String, fullName: String,
+                         mailAddress: String, isAdmin: Boolean,
                          url: Option[String], fileId: Option[String])
 
-  case class EditUserForm(userName: String, password: Option[String], mailAddress: String, isAdmin: Boolean,
+  case class EditUserForm(userName: String, password: Option[String], fullName: String,
-                          url: Option[String], fileId: Option[String], clearImage: Boolean)
+                          mailAddress: String, isAdmin: Boolean, url: Option[String],
+                          fileId: Option[String], clearImage: Boolean, isRemoved: Boolean)
 
   case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String],
-                          memberNames: Option[String])
+                          members: String)
 
   case class EditGroupForm(groupName: String, url: Option[String], fileId: Option[String],
-                           memberNames: Option[String], clearImage: Boolean)
+                           members: String, clearImage: Boolean, isRemoved: Boolean)
 
   val newUserForm = mapping(
-    "userName"    -> trim(label("Username"     , text(required, maxlength(100), identifier, uniqueUserName))),
+    "userName"    -> trim(label("Username"     ,text(required, maxlength(100), identifier, uniqueUserName))),
-    "password"    -> trim(label("Password"     , text(required, maxlength(20)))),
+    "password"    -> trim(label("Password"     ,text(required, maxlength(20)))),
-    "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress()))),
+    "fullName"    -> trim(label("Full Name"    ,text(required, maxlength(100)))),
-    "isAdmin"     -> trim(label("User Type"    , boolean())),
+    "mailAddress" -> trim(label("Mail Address" ,text(required, maxlength(100), uniqueMailAddress()))),
-    "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
+    "isAdmin"     -> trim(label("User Type"    ,boolean())),
-    "fileId"      -> trim(label("File ID"      , optional(text())))
+    "url"         -> trim(label("URL"          ,optional(text(maxlength(200))))),
+    "fileId"      -> trim(label("File ID"      ,optional(text())))
   )(NewUserForm.apply)
 
   val editUserForm = mapping(
-    "userName"    -> trim(label("Username"     , text(required, maxlength(100), identifier))),
+    "userName"    -> trim(label("Username"     ,text(required, maxlength(100), identifier))),
-    "password"    -> trim(label("Password"     , optional(text(maxlength(20))))),
+    "password"    -> trim(label("Password"     ,optional(text(maxlength(20))))),
-    "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress("userName")))),
+    "fullName"    -> trim(label("Full Name"    ,text(required, maxlength(100)))),
-    "isAdmin"     -> trim(label("User Type"    , boolean())),
+    "mailAddress" -> trim(label("Mail Address" ,text(required, maxlength(100), uniqueMailAddress("userName")))),
-    "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
+    "isAdmin"     -> trim(label("User Type"    ,boolean())),
-    "fileId"      -> trim(label("File ID"      , optional(text()))),
+    "url"         -> trim(label("URL"          ,optional(text(maxlength(200))))),
-    "clearImage"  -> trim(label("Clear image"  , boolean()))
+    "fileId"      -> trim(label("File ID"      ,optional(text()))),
+    "clearImage"  -> trim(label("Clear image"  ,boolean())),
+    "removed"     -> trim(label("Disable"      ,boolean()))
   )(EditUserForm.apply)
 
   val newGroupForm = mapping(
-    "groupName"   -> trim(label("Group name"   , text(required, maxlength(100), identifier))),
+    "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName))),
-    "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
+    "url"       -> trim(label("URL"        ,optional(text(maxlength(200))))),
-    "fileId"      -> trim(label("File ID"      , optional(text()))),
+    "fileId"    -> trim(label("File ID"    ,optional(text()))),
-    "memberNames" -> trim(label("Member Names" , optional(text())))
+    "members"   -> trim(label("Members"    ,text(required, members)))
   )(NewGroupForm.apply)
 
   val editGroupForm = mapping(
-    "groupName"   -> trim(label("Group name"   , text(required, maxlength(100), identifier))),
+    "groupName"  -> trim(label("Group name"  ,text(required, maxlength(100), identifier))),
-    "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
+    "url"        -> trim(label("URL"         ,optional(text(maxlength(200))))),
-    "fileId"      -> trim(label("File ID"      , optional(text()))),
+    "fileId"     -> trim(label("File ID"     ,optional(text()))),
-    "memberNames" -> trim(label("Member Names" , optional(text()))),
+    "members"    -> trim(label("Members"     ,text(required, members))),
-    "clearImage"  -> trim(label("Clear image"  , boolean()))
+    "clearImage" -> trim(label("Clear image" ,boolean())),
+    "removed"    -> trim(label("Disable"     ,boolean()))
   )(EditGroupForm.apply)
 
   get("/admin/users")(adminOnly {
-    val users = getAllUsers()
+    val includeRemoved = params.get("includeRemoved").map(_.toBoolean).getOrElse(false)
-    val members = users.collect { case account if(account.isGroupAccount) =>
+    val users          = getAllUsers(includeRemoved)
-      account.userName -> getGroupMembers(account.userName)
+    val members        = users.collect { case account if(account.isGroupAccount) =>
+      account.userName -> getGroupMembers(account.userName).map(_.userName)
     }.toMap
-    admin.users.html.list(users, members)
+
+    admin.users.html.list(users, members, includeRemoved)
   })
   
   get("/admin/users/_newuser")(adminOnly {
@@ -70,24 +82,39 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
   })
   
   post("/admin/users/_newuser", newUserForm)(adminOnly { form =>
-    createAccount(form.userName, sha1(form.password), form.mailAddress, form.isAdmin, form.url)
+    createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, form.isAdmin, form.url)
     updateImage(form.userName, form.fileId, false)
     redirect("/admin/users")
   })
   
   get("/admin/users/:userName/_edituser")(adminOnly {
     val userName = params("userName")
-    admin.users.html.user(getAccountByUserName(userName))
+    admin.users.html.user(getAccountByUserName(userName, true))
   })
   
   post("/admin/users/:name/_edituser", editUserForm)(adminOnly { form =>
     val userName = params("userName")
-    getAccountByUserName(userName).map { account =>
+    getAccountByUserName(userName, true).map { account =>
-      updateAccount(getAccountByUserName(userName).get.copy(
+
+      if(form.isRemoved){
+        // Remove repositories
+        getRepositoryNamesOfUser(userName).foreach { repositoryName =>
+          deleteRepository(userName, repositoryName)
+          FileUtils.deleteDirectory(getRepositoryDir(userName, repositoryName))
+          FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName))
+          FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName))
+        }
+        // Remove from GROUP_MEMBER, COLLABORATOR and REPOSITORY
+        removeUserRelatedData(userName)
+      }
+
+      updateAccount(account.copy(
         password     = form.password.map(sha1).getOrElse(account.password),
+        fullName     = form.fullName,
         mailAddress  = form.mailAddress,
         isAdmin      = form.isAdmin,
-        url          = form.url))
+        url          = form.url,
+        isRemoved    = form.isRemoved))
 
       updateImage(userName, form.fileId, form.clearImage)
       redirect("/admin/users")
@@ -101,39 +128,70 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
 
   post("/admin/users/_newgroup", newGroupForm)(adminOnly { form =>
     createGroup(form.groupName, form.url)
-    updateGroupMembers(form.groupName, form.memberNames.map(_.split(",").toList).getOrElse(Nil))
+    updateGroupMembers(form.groupName, form.members.split(",").map {
+      _.split(":") match {
+        case Array(userName, isManager) => (userName, isManager.toBoolean)
+      }
+    }.toList)
     updateImage(form.groupName, form.fileId, false)
     redirect("/admin/users")
   })
 
   get("/admin/users/:groupName/_editgroup")(adminOnly {
-    val groupName = params("groupName")
+    defining(params("groupName")){ groupName =>
-    admin.users.html.group(getAccountByUserName(groupName), getGroupMembers(groupName))
+      admin.users.html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName))
+    }
   })
 
   post("/admin/users/:groupName/_editgroup", editGroupForm)(adminOnly { form =>
-    val groupName = params("groupName")
+    defining(params("groupName"), form.members.split(",").map {
-    getAccountByUserName(groupName).map { account =>
+      _.split(":") match {
-      updateGroup(groupName, form.url)
+        case Array(userName, isManager) => (userName, isManager.toBoolean)
-
-      val memberNames = form.memberNames.map(_.split(",").toList).getOrElse(Nil)
-      updateGroupMembers(form.groupName, memberNames)
-
-      getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
-        removeCollaborators(form.groupName, repositoryName)
-        memberNames.foreach { userName =>
-          addCollaborator(form.groupName, repositoryName, userName)
-        }
       }
+    }.toList){ case (groupName, members) =>
+      getAccountByUserName(groupName, true).map { account =>
+        updateGroup(groupName, form.url, form.isRemoved)
 
-      updateImage(form.groupName, form.fileId, form.clearImage)
+        if(form.isRemoved){
-      redirect("/admin/users")
+          // Remove from GROUP_MEMBER
+          updateGroupMembers(form.groupName, Nil)
+          // Remove repositories
+          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
+            deleteRepository(groupName, repositoryName)
+            FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName))
+            FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
+            FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
+          }
+        } else {
+          // Update GROUP_MEMBER
+          updateGroupMembers(form.groupName, members)
+          // Update COLLABORATOR for group repositories
+          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
+            removeCollaborators(form.groupName, repositoryName)
+            members.foreach { case (userName, isManager) =>
+              addCollaborator(form.groupName, repositoryName, userName)
+            }
+          }
+        }
 
-    } getOrElse NotFound
+        updateImage(form.groupName, form.fileId, form.clearImage)
+        redirect("/admin/users")
+
+      } getOrElse NotFound
+    }
   })
 
-  post("/admin/users/_usercheck")(adminOnly {
+  // TODO Move to other generic controller?
+  post("/admin/users/_usercheck"){
     getAccountByUserName(params("userName")).isDefined
-  })
+  }
 
-}
+  private def members: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] = {
+      if(value.split(",").exists {
+        _.split(":") match { case Array(userName, isManager) => isManager.toBoolean }
+      }) None else Some("Must select one manager at least.")
+    }
+  }
+
+}

src/main/scala/app/WikiController.scala

@@ -1,32 +1,37 @@
 package app
 
 import service._
-import util.{CollaboratorsAuthenticator, ReferrerAuthenticator, JGitUtil, StringUtil}
+import util._
 import util.Directory._
+import util.ControlUtil._
 import jp.sf.amateras.scalatra.forms._
+import org.eclipse.jgit.api.Git
+import org.scalatra.i18n.Messages
+import scala.Some
+import java.util.ResourceBundle
 
 class WikiController extends WikiControllerBase 
-  with WikiService with RepositoryService with AccountService with ActivityService
+  with WikiService with RepositoryService with AccountService with ActivityService with CollaboratorsAuthenticator with ReferrerAuthenticator
-  with CollaboratorsAuthenticator with ReferrerAuthenticator
 
 trait WikiControllerBase extends ControllerBase {
-  self: WikiService with RepositoryService with ActivityService
+  self: WikiService with RepositoryService with ActivityService with CollaboratorsAuthenticator with ReferrerAuthenticator =>
-    with CollaboratorsAuthenticator with ReferrerAuthenticator =>
 
-  case class WikiPageEditForm(pageName: String, content: String, message: Option[String], currentPageName: String)
+  case class WikiPageEditForm(pageName: String, content: String, message: Option[String], currentPageName: String, id: String)
   
   val newForm = mapping(
-    "pageName"        -> trim(label("Page name"          , text(required, maxlength(40), pagename, unique))),
+    "pageName"        -> trim(label("Page name"         , text(required, maxlength(40), pagename, unique))),
-    "content"         -> trim(label("Content"            , text(required))),
+    "content"         -> trim(label("Content"           , text(required, conflictForNew))),
-    "message"         -> trim(label("Message"            , optional(text()))),
+    "message"         -> trim(label("Message"           , optional(text()))),
-    "currentPageName" -> trim(label("Current page name"  , text()))
+    "currentPageName" -> trim(label("Current page name" , text())),
+    "id"              -> trim(label("Latest commit id"  , text()))
   )(WikiPageEditForm.apply)
   
   val editForm = mapping(
-    "pageName"        -> trim(label("Page name"          , text(required, maxlength(40), pagename))),
+    "pageName"        -> trim(label("Page name"         , text(required, maxlength(40), pagename))),
-    "content"         -> trim(label("Content"            , text(required))),
+    "content"         -> trim(label("Content"           , text(required, conflictForEdit))),
-    "message"         -> trim(label("Message"            , optional(text()))),
+    "message"         -> trim(label("Message"           , optional(text()))),
-    "currentPageName" -> trim(label("Current page name"  , text(required)))
+    "currentPageName" -> trim(label("Current page name" , text(required))),
+    "id"              -> trim(label("Latest commit id"  , text(required)))
   )(WikiPageEditForm.apply)
   
   get("/:owner/:repository/wiki")(referrersOnly { repository =>
@@ -40,13 +45,13 @@ trait WikiControllerBase extends ControllerBase {
 
     getWikiPage(repository.owner, repository.name, pageName).map { page =>
       wiki.html.page(pageName, page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
-    } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${pageName}/_edit") // TODO URLEncode
+    } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_edit")
   })
   
   get("/:owner/:repository/wiki/:page/_history")(referrersOnly { repository =>
     val pageName = StringUtil.urlDecode(params("page"))
 
-    JGitUtil.withGit(getWikiRepositoryDir(repository.owner, repository.name)){ git =>
+    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
       JGitUtil.getCommitLog(git, "master", path = pageName + ".md") match {
         case Right((logs, hasNext)) => wiki.html.history(Some(pageName), logs, repository)
         case Left(_) => NotFound
@@ -56,36 +61,60 @@ trait WikiControllerBase extends ControllerBase {
   
   get("/:owner/:repository/wiki/:page/_compare/:commitId")(referrersOnly { repository =>
     val pageName = StringUtil.urlDecode(params("page"))
-    val commitId = params("commitId").split("\\.\\.\\.")
+    val Array(from, to) = params("commitId").split("\\.\\.\\.")
 
-    JGitUtil.withGit(getWikiRepositoryDir(repository.owner, repository.name)){ git =>
+    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
-      wiki.html.compare(Some(pageName), getWikiDiffs(git, commitId(0), commitId(1)), repository)
+      wiki.html.compare(Some(pageName), from, to, JGitUtil.getDiffs(git, from, to, true).filter(_.newPath == pageName + ".md"), repository,
+        hasWritePermission(repository.owner, repository.name, context.loginAccount), flash.get("info"))
     }
   })
   
   get("/:owner/:repository/wiki/_compare/:commitId")(referrersOnly { repository =>
-    val commitId   = params("commitId").split("\\.\\.\\.")
+    val Array(from, to) = params("commitId").split("\\.\\.\\.")
 
-    JGitUtil.withGit(getWikiRepositoryDir(repository.owner, repository.name)){ git =>
+    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
-      wiki.html.compare(None, getWikiDiffs(git, commitId(0), commitId(1)), repository)
+      wiki.html.compare(None, from, to, JGitUtil.getDiffs(git, from, to, true), repository,
+        hasWritePermission(repository.owner, repository.name, context.loginAccount), flash.get("info"))
     }
   })
-  
+
+  get("/:owner/:repository/wiki/:page/_revert/:commitId")(collaboratorsOnly { repository =>
+    val pageName = StringUtil.urlDecode(params("page"))
+    val Array(from, to) = params("commitId").split("\\.\\.\\.")
+
+    if(revertWikiPage(repository.owner, repository.name, from, to, context.loginAccount.get, Some(pageName))){
+      redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}")
+    } else {
+      flash += "info" -> "This patch was not able to be reversed."
+      redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_compare/${from}...${to}")
+    }
+  })
+
+  get("/:owner/:repository/wiki/_revert/:commitId")(collaboratorsOnly { repository =>
+    val Array(from, to) = params("commitId").split("\\.\\.\\.")
+
+    if(revertWikiPage(repository.owner, repository.name, from, to, context.loginAccount.get, None)){
+      redirect(s"/${repository.owner}/${repository.name}/wiki/")
+    } else {
+      flash += "info" -> "This patch was not able to be reversed."
+      redirect(s"/${repository.owner}/${repository.name}/wiki/_compare/${from}...${to}")
+    }
+  })
+
   get("/:owner/:repository/wiki/:page/_edit")(collaboratorsOnly { repository =>
     val pageName = StringUtil.urlDecode(params("page"))
     wiki.html.edit(pageName, getWikiPage(repository.owner, repository.name, pageName), repository)
   })
   
   post("/:owner/:repository/wiki/_edit", editForm)(collaboratorsOnly { (form, repository) =>
-    val loginAccount = context.loginAccount.get
+    defining(context.loginAccount.get){ loginAccount =>
-    
+      saveWikiPage(repository.owner, repository.name, form.currentPageName, form.pageName,
-    saveWikiPage(repository.owner, repository.name, form.currentPageName, form.pageName,
+          form.content, loginAccount, form.message.getOrElse(""), Some(form.id)).map { commitId =>
-        form.content, loginAccount, form.message.getOrElse(""))
+        updateLastActivityDate(repository.owner, repository.name)
-    
+        recordEditWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName, commitId)
-    updateLastActivityDate(repository.owner, repository.name)
+      }
-    recordEditWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
+      redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
-
+    }
-    redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
   })
   
   get("/:owner/:repository/wiki/_new")(collaboratorsOnly {
@@ -93,24 +122,26 @@ trait WikiControllerBase extends ControllerBase {
   })
   
   post("/:owner/:repository/wiki/_new", newForm)(collaboratorsOnly { (form, repository) =>
-    val loginAccount = context.loginAccount.get
+    defining(context.loginAccount.get){ loginAccount =>
-    
+      saveWikiPage(repository.owner, repository.name, form.currentPageName, form.pageName,
-    saveWikiPage(repository.owner, repository.name, form.currentPageName, form.pageName,
+          form.content, loginAccount, form.message.getOrElse(""), None)
-        form.content, context.loginAccount.get, form.message.getOrElse(""))
-    
-    updateLastActivityDate(repository.owner, repository.name)
-    recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
 
-    redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
+      updateLastActivityDate(repository.owner, repository.name)
+      recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
+
+      redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
+    }
   })
   
   get("/:owner/:repository/wiki/:page/_delete")(collaboratorsOnly { repository =>
-      val pageName = StringUtil.urlDecode(params("page"))
+    val pageName = StringUtil.urlDecode(params("page"))
-    
-    deleteWikiPage(repository.owner, repository.name, pageName, context.loginAccount.get.userName, s"Delete ${pageName}")
-    updateLastActivityDate(repository.owner, repository.name)
 
-    redirect(s"/${repository.owner}/${repository.name}/wiki")
+    defining(context.loginAccount.get){ loginAccount =>
+      deleteWikiPage(repository.owner, repository.name, pageName, loginAccount.fullName, loginAccount.mailAddress, s"Destroyed ${pageName}")
+      updateLastActivityDate(repository.owner, repository.name)
+
+      redirect(s"/${repository.owner}/${repository.name}/wiki")
+    }
   })
   
   get("/:owner/:repository/wiki/_pages")(referrersOnly { repository =>
@@ -119,7 +150,7 @@ trait WikiControllerBase extends ControllerBase {
   })
   
   get("/:owner/:repository/wiki/_history")(referrersOnly { repository =>
-    JGitUtil.withGit(getWikiRepositoryDir(repository.owner, repository.name)){ git =>
+    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
       JGitUtil.getCommitLog(git, "master") match {
         case Right((logs, hasNext)) => wiki.html.history(None, logs, repository)
         case Left(_) => NotFound
@@ -128,19 +159,21 @@ trait WikiControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/wiki/_blob/*")(referrersOnly { repository =>
-    getFileContent(repository.owner, repository.name, multiParams("splat").head).map { content =>
+    val path = multiParams("splat").head
-        contentType = "application/octet-stream"
+
-        content
+    getFileContent(repository.owner, repository.name, path).map { bytes =>
+      contentType = FileUtil.getContentType(path, bytes)
+      bytes
     } getOrElse NotFound
   })
 
   private def unique: Constraint = new Constraint(){
-    def validate(name: String, value: String): Option[String] =
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
       getWikiPageList(params("owner"), params("repository")).find(_ == value).map(_ => "Page already exists.")
   }
 
   private def pagename: Constraint = new Constraint(){
-    def validate(name: String, value: String): Option[String] =
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
       if(value.exists("\\/:*?\"<>|".contains(_))){
         Some(s"${name} contains invalid character.")
       } else if(value.startsWith("_") || value.startsWith("-")){
@@ -150,5 +183,22 @@ trait WikiControllerBase extends ControllerBase {
       }
   }
 
+  private def conflictForNew: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] = {
+      targetWikiPage.map { _ =>
+        "Someone has created the wiki since you started. Please reload this page and re-apply your changes."
+      }
+    }
+  }
 
-}
+  private def conflictForEdit: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] = {
+      targetWikiPage.filter(_.id != params("id")).map{ _ =>
+        "Someone has edited the wiki since you started. Please reload this page and re-apply your changes."
+      }
+    }
+  }
+
+  private def targetWikiPage = getWikiPage(params("owner"), params("repository"), params("pageName"))
+
+}

src/main/scala/model/Account.scala

@@ -4,6 +4,7 @@ import scala.slick.driver.H2Driver.simple._
 
 object Accounts extends Table[Account]("ACCOUNT") {
   def userName = column[String]("USER_NAME", O PrimaryKey)
+  def fullName = column[String]("FULL_NAME")
   def mailAddress = column[String]("MAIL_ADDRESS")
   def password = column[String]("PASSWORD")
   def isAdmin = column[Boolean]("ADMINISTRATOR")
@@ -13,11 +14,13 @@ object Accounts extends Table[Account]("ACCOUNT") {
   def lastLoginDate = column[java.util.Date]("LAST_LOGIN_DATE")
   def image = column[String]("IMAGE")
   def groupAccount = column[Boolean]("GROUP_ACCOUNT")
-  def * = userName ~ mailAddress ~ password ~ isAdmin ~ url.? ~ registeredDate ~ updatedDate ~ lastLoginDate.? ~ image.? ~ groupAccount <> (Account, Account.unapply _)
+  def removed = column[Boolean]("REMOVED")
+  def * = userName ~ fullName ~ mailAddress ~ password ~ isAdmin ~ url.? ~ registeredDate ~ updatedDate ~ lastLoginDate.? ~ image.? ~ groupAccount ~ removed <> (Account, Account.unapply _)
 }
 
 case class Account(
     userName: String,
+    fullName: String,
     mailAddress: String,
     password: String,
     isAdmin: Boolean,
@@ -26,5 +29,6 @@ case class Account(
     updatedDate: java.util.Date,
     lastLoginDate: Option[java.util.Date],
     image: Option[String],
-    isGroupAccount: Boolean
+    isGroupAccount: Boolean,
+    isRemoved: Boolean
 )

src/main/scala/model/GroupMembers.scala

@@ -5,10 +5,12 @@ import scala.slick.driver.H2Driver.simple._
 object GroupMembers extends Table[GroupMember]("GROUP_MEMBER") {
   def groupName = column[String]("GROUP_NAME", O PrimaryKey)
   def userName = column[String]("USER_NAME", O PrimaryKey)
-  def * = groupName ~ userName <> (GroupMember, GroupMember.unapply _)
+  def isManager = column[Boolean]("MANAGER")
+  def * = groupName ~ userName ~ isManager <> (GroupMember, GroupMember.unapply _)
 }
 
 case class GroupMember(
   groupName: String,
-  userName: String
+  userName: String,
+  isManager: Boolean
 )

src/main/scala/model/Issue.scala

@@ -20,7 +20,8 @@ object Issues extends Table[Issue]("ISSUE") with IssueTemplate with MilestoneTem
   def closed = column[Boolean]("CLOSED")
   def registeredDate = column[java.util.Date]("REGISTERED_DATE")
   def updatedDate = column[java.util.Date]("UPDATED_DATE")
-  def * = userName ~ repositoryName ~ issueId ~ openedUserName ~ milestoneId.? ~ assignedUserName.? ~ title ~ content.? ~ closed ~ registeredDate ~ updatedDate <> (Issue, Issue.unapply _)
+  def pullRequest = column[Boolean]("PULL_REQUEST")
+  def * = userName ~ repositoryName ~ issueId ~ openedUserName ~ milestoneId.? ~ assignedUserName.? ~ title ~ content.? ~ closed ~ registeredDate ~ updatedDate ~ pullRequest <> (Issue, Issue.unapply _)
 
   def byPrimaryKey(owner: String, repository: String, issueId: Int) = byIssue(owner, repository, issueId)
 }
@@ -36,4 +37,5 @@ case class Issue(
     content: Option[String],
     closed: Boolean,
     registeredDate: java.util.Date,
-    updatedDate: java.util.Date)
+    updatedDate: java.util.Date,
+    isPullRequest: Boolean)

src/main/scala/model/PullRequest.scala

@@ -0,0 +1,28 @@
+package model
+
+import scala.slick.driver.H2Driver.simple._
+
+object PullRequests extends Table[PullRequest]("PULL_REQUEST") with IssueTemplate {
+  def branch = column[String]("BRANCH")
+  def requestUserName = column[String]("REQUEST_USER_NAME")
+  def requestRepositoryName = column[String]("REQUEST_REPOSITORY_NAME")
+  def requestBranch = column[String]("REQUEST_BRANCH")
+  def commitIdFrom = column[String]("COMMIT_ID_FROM")
+  def commitIdTo = column[String]("COMMIT_ID_TO")
+  def * = userName ~ repositoryName ~ issueId ~ branch ~ requestUserName ~ requestRepositoryName ~ requestBranch ~ commitIdFrom ~ commitIdTo <> (PullRequest, PullRequest.unapply _)
+
+  def byPrimaryKey(userName: String, repositoryName: String, issueId: Int) = byIssue(userName, repositoryName, issueId)
+  def byPrimaryKey(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) = byIssue(userName, repositoryName, issueId)
+}
+
+case class PullRequest(
+  userName: String,
+  repositoryName: String,
+  issueId: Int,
+  branch: String,
+  requestUserName: String,
+  requestRepositoryName: String,
+  requestBranch: String,
+  commitIdFrom: String,
+  commitIdTo: String
+)

src/main/scala/model/Repository.scala

@@ -9,7 +9,11 @@ object Repositories extends Table[Repository]("REPOSITORY") with BasicTemplate {
   def registeredDate = column[java.util.Date]("REGISTERED_DATE")
   def updatedDate = column[java.util.Date]("UPDATED_DATE")
   def lastActivityDate = column[java.util.Date]("LAST_ACTIVITY_DATE")
-  def * = userName ~ repositoryName ~ isPrivate ~ description.? ~ defaultBranch ~ registeredDate ~ updatedDate ~ lastActivityDate <> (Repository, Repository.unapply _)
+  def originUserName = column[String]("ORIGIN_USER_NAME")
+  def originRepositoryName = column[String]("ORIGIN_REPOSITORY_NAME")
+  def parentUserName = column[String]("PARENT_USER_NAME")
+  def parentRepositoryName = column[String]("PARENT_REPOSITORY_NAME")
+  def * = userName ~ repositoryName ~ isPrivate ~ description.? ~ defaultBranch ~ registeredDate ~ updatedDate ~ lastActivityDate ~ originUserName.? ~ originRepositoryName.? ~ parentUserName.? ~ parentRepositoryName.? <> (Repository, Repository.unapply _)
 
   def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
 }
@@ -22,5 +26,9 @@ case class Repository(
   defaultBranch: String,
   registeredDate: java.util.Date,
   updatedDate: java.util.Date,
-  lastActivityDate: java.util.Date
+  lastActivityDate: java.util.Date,
+  originUserName: Option[String],
+  originRepositoryName: Option[String],
+  parentUserName: Option[String],
+  parentRepositoryName: Option[String]
 )

src/main/scala/model/SshKey.scala

@@ -0,0 +1,22 @@
+package model
+
+import scala.slick.driver.H2Driver.simple._
+
+object SshKeys extends Table[SshKey]("SSH_KEY") {
+  def userName = column[String]("USER_NAME")
+  def sshKeyId = column[Int]("SSH_KEY_ID", O AutoInc)
+  def title = column[String]("TITLE")
+  def publicKey = column[String]("PUBLIC_KEY")
+
+  def ins = userName ~ title ~ publicKey returning sshKeyId
+  def * = userName ~ sshKeyId ~ title ~ publicKey <> (SshKey, SshKey.unapply _)
+
+  def byPrimaryKey(userName: String, sshKeyId: Int) = (this.userName is userName.bind) && (this.sshKeyId is sshKeyId.bind)
+}
+
+case class SshKey(
+  userName: String,
+  sshKeyId: Int,
+  title: String,
+  publicKey: String
+)

src/main/scala/model/WebHook.scala

@@ -0,0 +1,16 @@
+package model
+
+import scala.slick.driver.H2Driver.simple._
+
+object WebHooks extends Table[WebHook]("WEB_HOOK") with BasicTemplate {
+  def url = column[String]("URL")
+  def * = userName ~ repositoryName ~ url <> (WebHook, WebHook.unapply _)
+
+  def byPrimaryKey(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url is url.bind)
+}
+
+case class WebHook(
+  userName: String,
+  repositoryName: String,
+  url: String
+)

src/main/scala/service/AccountService.scala

@@ -3,21 +3,76 @@ package service
 import model._
 import scala.slick.driver.H2Driver.simple._
 import Database.threadLocalSession
+import service.SystemSettingsService.SystemSettings
+import util.StringUtil._
+import model.GroupMember
+import scala.Some
+import model.Account
+import util.LDAPUtil
+import org.slf4j.LoggerFactory
 
 trait AccountService {
 
-  def getAccountByUserName(userName: String): Option[Account] = 
+  private val logger = LoggerFactory.getLogger(classOf[AccountService])
-    Query(Accounts) filter(_.userName is userName.bind) firstOption
 
-  def getAccountByMailAddress(mailAddress: String): Option[Account] =
+  def authenticate(settings: SystemSettings, userName: String, password: String): Option[Account] =
-    Query(Accounts) filter(_.mailAddress is mailAddress.bind) firstOption
+    if(settings.ldapAuthentication){
+      ldapAuthentication(settings, userName, password)
+    } else {
+      defaultAuthentication(userName, password)
+    }
 
-  def getAllUsers(): List[Account] = Query(Accounts) sortBy(_.userName) list
+  /**
+   * Authenticate by internal database.
+   */
+  private def defaultAuthentication(userName: String, password: String) = {
+    getAccountByUserName(userName).collect {
+      case account if(!account.isGroupAccount && account.password == sha1(password)) => Some(account)
+    } getOrElse None
+  }
+
+  /**
+   * Authenticate by LDAP.
+   */
+  private def ldapAuthentication(settings: SystemSettings, userName: String, password: String) = {
+    LDAPUtil.authenticate(settings.ldap.get, userName, password) match {
+      case Right(ldapUserInfo) => {
+        // Create or update account by LDAP information
+        getAccountByUserName(userName, true) match {
+          case Some(x) if(!x.isRemoved) => updateAccount(x.copy(mailAddress = ldapUserInfo.mailAddress, fullName = ldapUserInfo.fullName))
+          case Some(x) if(x.isRemoved)  => {
+            logger.info(s"LDAP Authentication Failed: Account is already registered but disabled..")
+            defaultAuthentication(userName, password)
+          }
+          case None => createAccount(userName, "", ldapUserInfo.fullName, ldapUserInfo.mailAddress, false, None)
+        }
+        getAccountByUserName(userName)
+      }
+      case Left(errorMessage) => {
+        logger.info(s"LDAP Authentication Failed: ${errorMessage}")
+        defaultAuthentication(userName, password)
+      }
+    }
+  }
+
+  def getAccountByUserName(userName: String, includeRemoved: Boolean = false): Option[Account] =
+    Query(Accounts) filter(t => (t.userName is userName.bind) && (t.removed is false.bind, !includeRemoved)) firstOption
+
+  def getAccountByMailAddress(mailAddress: String, includeRemoved: Boolean = false): Option[Account] =
+    Query(Accounts) filter(t => (t.mailAddress.toLowerCase is mailAddress.toLowerCase.bind) && (t.removed is false.bind, !includeRemoved)) firstOption
+
+  def getAllUsers(includeRemoved: Boolean = true): List[Account] =
+    if(includeRemoved){
+      Query(Accounts) sortBy(_.userName) list
+    } else {
+      Query(Accounts) filter (_.removed is false.bind) sortBy(_.userName) list
+    }
     
-  def createAccount(userName: String, password: String, mailAddress: String, isAdmin: Boolean, url: Option[String]): Unit =
+  def createAccount(userName: String, password: String, fullName: String, mailAddress: String, isAdmin: Boolean, url: Option[String]): Unit =
     Accounts insert Account(
       userName       = userName,
       password       = password,
+      fullName       = fullName,
       mailAddress    = mailAddress,
       isAdmin        = isAdmin,
       url            = url,
@@ -25,20 +80,23 @@ trait AccountService {
       updatedDate    = currentDate,
       lastLoginDate  = None,
       image          = None,
-      isGroupAccount = false)
+      isGroupAccount = false,
+      isRemoved      = false)
 
   def updateAccount(account: Account): Unit = 
     Accounts
       .filter { a => a.userName is account.userName.bind }
-      .map    { a => a.password ~ a.mailAddress ~ a.isAdmin ~ a.url.? ~ a.registeredDate ~ a.updatedDate ~ a.lastLoginDate.? }
+      .map    { a => a.password ~ a.fullName ~ a.mailAddress ~ a.isAdmin ~ a.url.? ~ a.registeredDate ~ a.updatedDate ~ a.lastLoginDate.? ~ a.removed }
       .update (
         account.password, 
+        account.fullName, 
         account.mailAddress, 
         account.isAdmin,
         account.url,
         account.registeredDate,
         currentDate,
-        account.lastLoginDate)
+        account.lastLoginDate,
+        account.isRemoved)
 
   def updateAvatarImage(userName: String, image: Option[String]): Unit =
     Accounts.filter(_.userName is userName.bind).map(_.image.?).update(image)
@@ -50,6 +108,7 @@ trait AccountService {
     Accounts insert Account(
       userName       = groupName,
       password       = "",
+      fullName       = groupName,
       mailAddress    = groupName + "@devnull",
       isAdmin        = false,
       url            = url,
@@ -57,23 +116,23 @@ trait AccountService {
       updatedDate    = currentDate,
       lastLoginDate  = None,
       image          = None,
-      isGroupAccount = true)
+      isGroupAccount = true,
+      isRemoved      = false)
 
-  def updateGroup(groupName: String, url: Option[String]): Unit =
+  def updateGroup(groupName: String, url: Option[String], removed: Boolean): Unit =
-    Accounts.filter(_.userName is groupName.bind).map(_.url.?).update(url)
+    Accounts.filter(_.userName is groupName.bind).map(t => t.url.? ~ t.removed).update(url, removed)
 
-  def updateGroupMembers(groupName: String, members: List[String]): Unit = {
+  def updateGroupMembers(groupName: String, members: List[(String, Boolean)]): Unit = {
     Query(GroupMembers).filter(_.groupName is groupName.bind).delete
-    members.foreach { userName =>
+    members.foreach { case (userName, isManager) =>
-      GroupMembers insert GroupMember (groupName, userName)
+      GroupMembers insert GroupMember (groupName, userName, isManager)
     }
   }
 
-  def getGroupMembers(groupName: String): List[String] =
+  def getGroupMembers(groupName: String): List[GroupMember] =
     Query(GroupMembers)
       .filter(_.groupName is groupName.bind)
       .sortBy(_.userName)
-      .map(_.userName)
       .list
 
   def getGroupsByUserName(userName: String): List[String] =
@@ -83,4 +142,12 @@ trait AccountService {
       .map(_.groupName)
       .list
 
+  def removeUserRelatedData(userName: String): Unit = {
+    Query(GroupMembers).filter(_.userName is userName.bind).delete
+    Query(Collaborators).filter(_.collaboratorName is userName.bind).delete
+    Query(Repositories).filter(_.userName is userName.bind).delete
+  }
+
 }
+
+object AccountService extends AccountService

src/main/scala/service/ActivityService.scala

@@ -6,23 +6,23 @@ import Database.threadLocalSession
 
 trait ActivityService {
 
-  def getActivitiesByUser(activityUserName: String, isPublic: Boolean): List[Activity] = {
+  def getActivitiesByUser(activityUserName: String, isPublic: Boolean): List[Activity] =
-    val q = Query(Activities)
+    Activities
       .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
+      .filter { case (t1, t2) =>
+        if(isPublic){
+          (t1.activityUserName is activityUserName.bind) && (t2.isPrivate is false.bind)
+        } else {
+          (t1.activityUserName is activityUserName.bind)
+        }
+      }
+      .sortBy { case (t1, t2) => t1.activityId desc }
+      .map    { case (t1, t2) => t1 }
+      .take(30)
+      .list
 
-    (if(isPublic){
-      q filter { case (t1, t2) => (t1.activityUserName is activityUserName.bind) && (t2.isPrivate is false.bind) }
-    } else {
-      q filter { case (t1, t2) => t1.activityUserName is activityUserName.bind }
-    })
-    .sortBy { case (t1, t2) => t1.activityId desc }
-    .map    { case (t1, t2) => t1 }
-    .take(30)
-    .list
-  }
-  
   def getRecentActivities(): List[Activity] =
-    Query(Activities)
+    Activities
       .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
       .filter { case (t1, t2) => t2.isPrivate is false.bind }
       .sortBy { case (t1, t2) => t1.activityId desc }
@@ -52,6 +52,13 @@ trait ActivityService {
       Some(title),
       currentDate)
 
+  def recordClosePullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
+    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      "close_issue",
+      s"[user:${activityUserName}] closed pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
+      Some(title),
+      currentDate)
+
   def recordReopenIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
     Activities.autoInc insert(userName, repositoryName, activityUserName,
       "reopen_issue",
@@ -65,7 +72,14 @@ trait ActivityService {
       s"[user:${activityUserName}] commented on issue [issue:${userName}/${repositoryName}#${issueId}]",
       Some(cut(comment, 200)),
       currentDate)
-  
+
+  def recordCommentPullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, comment: String): Unit =
+    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      "comment_issue",
+      s"[user:${activityUserName}] commented on pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
+      Some(cut(comment, 200)),
+      currentDate)
+
   def recordCreateWikiPageActivity(userName: String, repositoryName: String, activityUserName: String, pageName: String) =
     Activities.autoInc insert(userName, repositoryName, activityUserName,
       "create_wiki",
@@ -73,11 +87,11 @@ trait ActivityService {
       Some(pageName),
       currentDate)
   
-  def recordEditWikiPageActivity(userName: String, repositoryName: String, activityUserName: String, pageName: String) =
+  def recordEditWikiPageActivity(userName: String, repositoryName: String, activityUserName: String, pageName: String, commitId: String) =
     Activities.autoInc insert(userName, repositoryName, activityUserName,
       "edit_wiki",
       s"[user:${activityUserName}] edited the [repo:${userName}/${repositoryName}] wiki",
-      Some(pageName),
+      Some(pageName + ":" + commitId),
       currentDate)
   
   def recordPushActivity(userName: String, repositoryName: String, activityUserName: String, 
@@ -95,18 +109,60 @@ trait ActivityService {
       s"[user:${activityUserName}] created tag [tag:${userName}/${repositoryName}#${tagName}] at [repo:${userName}/${repositoryName}]",
       None,
       currentDate)
-  
+
-  def recordCreateBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String) =
+  def recordDeleteTagActivity(userName: String, repositoryName: String, activityUserName: String,
+                              tagName: String, commits: List[util.JGitUtil.CommitInfo]) =
     Activities.autoInc insert(userName, repositoryName, activityUserName,
-      "create_tag",
+      "delete_tag",
-      s"[user:${activityUserName}] created branch [tag:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
+      s"[user:${activityUserName}] deleted tag ${tagName} at [repo:${userName}/${repositoryName}]",
       None,
       currentDate)
-  
+
+  def recordCreateBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String) =
+    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      "create_branch",
+      s"[user:${activityUserName}] created branch [branch:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
+      None,
+      currentDate)
+
+  def recordDeleteBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String) =
+    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      "delete_branch",
+      s"[user:${activityUserName}] deleted branch ${branchName} at [repo:${userName}/${repositoryName}]",
+      None,
+      currentDate)
+
+  def recordForkActivity(userName: String, repositoryName: String, activityUserName: String) =
+    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      "fork",
+      s"[user:${activityUserName}] forked [repo:${userName}/${repositoryName}] to [repo:${activityUserName}/${repositoryName}]",
+      None,
+      currentDate)
+
+  def recordPullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
+    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      "open_pullreq",
+      s"[user:${activityUserName}] opened pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
+      Some(title),
+      currentDate)
+
+  def recordMergeActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, message: String): Unit =
+    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      "merge_pullreq",
+      s"[user:${activityUserName}] merged pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
+      Some(message),
+      currentDate)
+
   def insertCommitId(userName: String, repositoryName: String, commitId: String) = {
     CommitLog insert (userName, repositoryName, commitId)
   }
-  
+
+  def insertAllCommitIds(userName: String, repositoryName: String, commitIds: List[String]) =
+    CommitLog insertAll (commitIds.map(commitId => (userName, repositoryName, commitId)): _*)
+
+  def getAllCommitIds(userName: String, repositoryName: String): List[String] =
+    Query(CommitLog).filter(_.byRepository(userName, repositoryName)).map(_.commitId).list
+
   def existsCommitId(userName: String, repositoryName: String, commitId: String): Boolean =
     Query(CommitLog).filter(_.byPrimaryKey(userName, repositoryName, commitId)).firstOption.isDefined
   

src/main/scala/service/IssuesService.scala

@@ -44,15 +44,13 @@ trait IssuesService {
    *
    * @param condition the search condition
    * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name)
+   * @param onlyPullRequest if true then counts only pull request, false then counts both of issue and pull request.
    * @param repos Tuple of the repository owner and the repository name
    * @return the count of the search result
    */
-  def countIssue(condition: IssueSearchCondition, filterUser: Map[String, String], repos: (String, String)*): Int = {
+  def countIssue(condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean,
-    // TODO It must be _.length instead of map (_.issueId) list).length.
+                 repos: (String, String)*): Int =
-    //       But it does not work on Slick 1.0.1 (worked on Slick 1.0.0).
+    Query(searchIssueQuery(repos, condition, filterUser, onlyPullRequest).length).first
-    //       https://github.com/slick/slick/issues/170
-    (searchIssueQuery(repos, condition, filterUser) map (_.issueId) list).length
-  }
   /**
    * Returns the Map which contains issue count for each labels.
    *
@@ -65,7 +63,7 @@ trait IssuesService {
   def countIssueGroupByLabels(owner: String, repository: String, condition: IssueSearchCondition,
                               filterUser: Map[String, String]): Map[String, Int] = {
 
-    searchIssueQuery(Seq(owner -> repository), condition.copy(labels = Set.empty), filterUser)
+    searchIssueQuery(Seq(owner -> repository), condition.copy(labels = Set.empty), filterUser, false)
       .innerJoin(IssueLabels).on { (t1, t2) =>
         t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
       }
@@ -86,19 +84,21 @@ trait IssuesService {
    *
    * @param condition the search condition
    * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name)
+   * @param onlyPullRequest if true then returns only pull request, false then returns both of issue and pull request.
    * @param repos Tuple of the repository owner and the repository name
    * @return list which contains issue count for each repository
    */
-  def countIssueGroupByRepository(condition: IssueSearchCondition, filterUser: Map[String, String],
+  def countIssueGroupByRepository(
-                              repos: (String, String)*): List[(String, String, Int)] = {
+      condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean,
-    searchIssueQuery(repos, condition.copy(repo = None), filterUser)
+      repos: (String, String)*): List[(String, String, Int)] = {
+    searchIssueQuery(repos, condition.copy(repo = None), filterUser, onlyPullRequest)
       .groupBy { t =>
         t.userName ~ t.repositoryName
       }
       .map { case (repo, t) =>
         repo ~ t.length
       }
-      .filter (_._3 > 0.bind)
+      .sortBy(_._3 desc)
       .list
   }
 
@@ -106,28 +106,23 @@ trait IssuesService {
    * Returns the search result against  issues.
    *
    * @param condition the search condition
-   * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name)
+   * @param filterUser the filter user name (key is "all", "assigned", "created_by" or "not_created_by", value is the user name)
+   * @param onlyPullRequest if true then returns only pull request, false then returns both of issue and pull request.
    * @param offset the offset for pagination
    * @param limit the limit for pagination
    * @param repos Tuple of the repository owner and the repository name
    * @return the search result (list of tuples which contain issue, labels and comment count)
    */
-  def searchIssue(condition: IssueSearchCondition, filterUser: Map[String, String],
+  def searchIssue(condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean,
                   offset: Int, limit: Int, repos: (String, String)*): List[(Issue, List[Label], Int)] = {
 
     // get issues and comment count and labels
-    searchIssueQuery(repos, condition, filterUser)
+    searchIssueQuery(repos, condition, filterUser, onlyPullRequest)
         .innerJoin(IssueOutline).on { (t1, t2) => t1.byIssue(t2.userName, t2.repositoryName, t2.issueId) }
-        .leftJoin (IssueLabels) .on { case ((t1, t2), t3) => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) }
+        .sortBy { case (t1, t2) =>
-        .leftJoin (Labels)      .on { case (((t1, t2), t3), t4) => t3.byLabel(t4.userName, t4.repositoryName, t4.labelId) }
-        .map { case (((t1, t2), t3), t4) =>
-          (t1, t2.commentCount, t4.labelId.?, t4.labelName.?, t4.color.?)
-        }
-        .sortBy(_._4)	// labelName
-        .sortBy { case (t1, commentCount, _,_,_) =>
           (condition.sort match {
             case "created"  => t1.registeredDate
-            case "comments" => commentCount
+            case "comments" => t2.commentCount
             case "updated"  => t1.updatedDate
           }) match {
             case sort => condition.direction match {
@@ -137,6 +132,11 @@ trait IssuesService {
           }
         }
         .drop(offset).take(limit)
+        .leftJoin (IssueLabels) .on { case ((t1, t2), t3) => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) }
+        .leftJoin (Labels)      .on { case (((t1, t2), t3), t4) => t3.byLabel(t4.userName, t4.repositoryName, t4.labelId) }
+        .map { case (((t1, t2), t3), t4) =>
+          (t1, t2.commentCount, t4.labelId.?, t4.labelName.?, t4.color.?)
+        }
         .list
         .splitWith { (c1, c2) =>
           c1._1.userName == c2._1.userName &&
@@ -156,17 +156,21 @@ trait IssuesService {
   /**
    * Assembles query for conditional issue searching.
    */
-  private def searchIssueQuery(repos: Seq[(String, String)], condition: IssueSearchCondition, filterUser: Map[String, String]) =
+  private def searchIssueQuery(repos: Seq[(String, String)], condition: IssueSearchCondition,
+                               filterUser: Map[String, String], onlyPullRequest: Boolean) =
     Query(Issues) filter { t1 =>
-      (condition.repo
+      condition.repo
           .map { _.split('/') match { case array => Seq(array(0) -> array(1)) } }
           .getOrElse (repos)
-          .map { case (owner, repository) => t1.byRepository(owner, repository) } reduceLeft ( _ || _ ) ) &&
+          .map { case (owner, repository) => t1.byRepository(owner, repository) }
+          .foldLeft[Column[Boolean]](false) ( _ || _ ) &&
       (t1.closed           is (condition.state == "closed").bind) &&
       (t1.milestoneId      is condition.milestoneId.get.get.bind, condition.milestoneId.flatten.isDefined) &&
       (t1.milestoneId      isNull, condition.milestoneId == Some(None)) &&
       (t1.assignedUserName is filterUser("assigned").bind, filterUser.get("assigned").isDefined) &&
       (t1.openedUserName   is filterUser("created_by").bind, filterUser.get("created_by").isDefined) &&
+      (t1.openedUserName   isNot filterUser("not_created_by").bind, filterUser.get("not_created_by").isDefined) &&
+      (t1.pullRequest      is true.bind, onlyPullRequest) &&
       (IssueLabels filter { t2 =>
         (t2.byIssue(t1.userName, t1.repositoryName, t1.issueId)) &&
         (t2.labelId in
@@ -178,7 +182,7 @@ trait IssuesService {
     }
 
   def createIssue(owner: String, repository: String, loginUser: String, title: String, content: Option[String],
-                  assignedUserName: Option[String], milestoneId: Option[Int]) =
+                  assignedUserName: Option[String], milestoneId: Option[Int], isPullRequest: Boolean = false) =
     // next id number
     sql"SELECT ISSUE_ID + 1 FROM ISSUE_ID WHERE USER_NAME = $owner AND REPOSITORY_NAME = $repository FOR UPDATE".as[Int]
         .firstOption.filter { id =>
@@ -193,7 +197,8 @@ trait IssuesService {
           content,
           false,
           currentDate,
-          currentDate)
+          currentDate,
+          isPullRequest)
 
       // increment issue id
       IssueId
@@ -243,6 +248,9 @@ trait IssuesService {
       }
       .update (content, currentDate)
 
+  def deleteComment(commentId: Int) =
+    IssueComments filter (_.byPrimaryKey(commentId)) delete
+
   def updateClosed(owner: String, repository: String, issueId: Int, closed: Boolean) =
     Issues
       .filter (_.byPrimaryKey(owner, repository, issueId))
@@ -305,6 +313,14 @@ trait IssuesService {
     }.toList
   }
 
+  def closeIssuesFromMessage(message: String, userName: String, owner: String, repository: String) = {
+    extractCloseId(message).foreach { issueId =>
+      for(issue <- getIssue(owner, repository, issueId) if !issue.closed){
+        createComment(owner, repository, userName, issue.issueId, "Close", "close")
+        updateClosed(owner, repository, issue.issueId, true)
+      }
+    }
+  }
 }
 
 object IssuesService {
@@ -322,7 +338,7 @@ object IssuesService {
 
     def toURL: String =
       "?" + List(
-        if(labels.isEmpty) None else Some("labels=" + urlEncode(labels.mkString(" "))),
+        if(labels.isEmpty) None else Some("labels=" + urlEncode(labels.mkString(","))),
         milestoneId.map { id => "milestone=" + (id match {
           case Some(x) => x.toString
           case None    => "none"
@@ -343,11 +359,11 @@ object IssuesService {
 
     def apply(request: HttpServletRequest): IssueSearchCondition =
       IssueSearchCondition(
-        param(request, "labels").map(_.split(" ").toSet).getOrElse(Set.empty),
+        param(request, "labels").map(_.split(",").toSet).getOrElse(Set.empty),
-        param(request, "milestone").map(_ match {
+        param(request, "milestone").map{
           case "none" => None
-          case x      => Some(x.toInt)
+          case x      => x.toIntOpt
-        }),
+        },
         param(request, "for"),
         param(request, "state",     Seq("open", "closed")).getOrElse("open"),
         param(request, "sort",      Seq("created", "comments", "updated")).getOrElse("created"),

src/main/scala/service/PullRequestService.scala

@@ -0,0 +1,69 @@
+package service
+
+import scala.slick.driver.H2Driver.simple._
+import Database.threadLocalSession
+import model._
+import util.ControlUtil._
+
+trait PullRequestService { self: IssuesService =>
+  import PullRequestService._
+
+  def getPullRequest(owner: String, repository: String, issueId: Int): Option[(Issue, PullRequest)] =
+    getIssue(owner, repository, issueId.toString).flatMap{ issue =>
+      Query(PullRequests).filter(_.byPrimaryKey(owner, repository, issueId)).firstOption.map{
+        pullreq => (issue, pullreq)
+      }
+    }
+
+  def updateCommitIdTo(owner: String, repository: String, issueId: Int, commitIdTo: String): Unit =
+    Query(PullRequests).filter(_.byPrimaryKey(owner, repository, issueId)).map(_.commitIdTo).update(commitIdTo)
+
+  def getPullRequestCountGroupByUser(closed: Boolean, owner: String, repository: Option[String]): List[PullRequestCount] =
+    Query(PullRequests)
+      .innerJoin(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) }
+      .filter { case (t1, t2) =>
+        (t2.closed         is closed.bind) &&
+        (t1.userName       is owner.bind) &&
+        (t1.repositoryName is repository.get.bind, repository.isDefined)
+      }
+      .groupBy { case (t1, t2) => t2.openedUserName }
+      .map { case (userName, t) => userName ~ t.length }
+      .sortBy(_._2 desc)
+      .list
+      .map { x => PullRequestCount(x._1, x._2) }
+
+  def createPullRequest(originUserName: String, originRepositoryName: String, issueId: Int,
+        originBranch: String, requestUserName: String, requestRepositoryName: String, requestBranch: String,
+        commitIdFrom: String, commitIdTo: String): Unit =
+    PullRequests insert (PullRequest(
+      originUserName,
+      originRepositoryName,
+      issueId,
+      originBranch,
+      requestUserName,
+      requestRepositoryName,
+      requestBranch,
+      commitIdFrom,
+      commitIdTo))
+
+  def getPullRequestsByRequest(userName: String, repositoryName: String, branch: String, closed: Boolean): List[PullRequest] =
+    Query(PullRequests)
+      .innerJoin(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) }
+      .filter { case (t1, t2) =>
+        (t1.requestUserName       is userName.bind) &&
+        (t1.requestRepositoryName is repositoryName.bind) &&
+        (t1.requestBranch         is branch.bind) &&
+        (t2.closed                is closed.bind)
+      }
+      .map { case (t1, t2) => t1 }
+      .list
+
+}
+
+object PullRequestService {
+
+  val PullRequestLimit = 25
+
+  case class PullRequestCount(userName: String, count: Int)
+
+}

src/main/scala/service/RepositorySearchService.scala

@@ -1,8 +1,8 @@
 package service
 
-import model.Issue
 import util.{FileUtil, StringUtil, JGitUtil}
 import util.Directory._
+import util.ControlUtil._
 import model.Issue
 import org.eclipse.jgit.revwalk.RevWalk
 import org.eclipse.jgit.treewalk.TreeWalk
@@ -10,7 +10,8 @@ import scala.collection.mutable.ListBuffer
 import org.eclipse.jgit.lib.FileMode
 import org.eclipse.jgit.api.Git
 
-trait RepositorySearchService { self: IssuesService =>
+trait
+RepositorySearchService { self: IssuesService =>
   import RepositorySearchService._
 
   def countIssues(owner: String, repository: String, query: String): Int =
@@ -28,12 +29,12 @@ trait RepositorySearchService { self: IssuesService =>
     }
 
   def countFiles(owner: String, repository: String, query: String): Int =
-    JGitUtil.withGit(getRepositoryDir(owner, repository)){ git =>
+    using(Git.open(getRepositoryDir(owner, repository))){ git =>
       if(JGitUtil.isEmpty(git)) 0 else searchRepositoryFiles(git, query).length
     }
 
   def searchFiles(owner: String, repository: String, query: String): List[FileSearchResult] =
-    JGitUtil.withGit(getRepositoryDir(owner, repository)){ git =>
+    using(Git.open(getRepositoryDir(owner, repository))){ git =>
       if(JGitUtil.isEmpty(git)){
         Nil
       } else {
@@ -62,10 +63,11 @@ trait RepositorySearchService { self: IssuesService =>
     val list = new ListBuffer[(String, String)]
 
     while (treeWalk.next()) {
-      if(treeWalk.getFileMode(0) != FileMode.TREE){
+      val mode = treeWalk.getFileMode(0)
-        JGitUtil.getContent(git, treeWalk.getObjectId(0), false).foreach { bytes =>
+      if(mode == FileMode.REGULAR_FILE || mode == FileMode.EXECUTABLE_FILE){
+        JGitUtil.getContentFromId(git, treeWalk.getObjectId(0), false).foreach { bytes =>
           if(FileUtil.isText(bytes)){
-            val text      = new String(bytes, "UTF-8")
+            val text      = StringUtil.convertFromByteArray(bytes)
             val lowerText = text.toLowerCase
             val indices   = keywords.map(lowerText.indexOf _)
             if(!indices.exists(_ < 0)){
@@ -97,7 +99,7 @@ object RepositorySearchService {
       val lineNumber = content.substring(0, indices.min).split("\n").size - 1
       val highlightText = StringUtil.escapeHtml(content.split("\n").drop(lineNumber).take(5).mkString("\n"))
         .replaceAll("(?i)(" + keywords.map("\\Q" + _ + "\\E").mkString("|") +  ")",
-        "<span style=\"background-color: #ffff88;;\">$1</span>")
+        "<span class=\"highlight\">$1</span>")
       (highlightText, lineNumber + 1)
     } else {
       (content.split("\n").take(5).mkString("\n"), 1)

src/main/scala/service/RepositoryService.scala

@@ -15,22 +15,91 @@ trait RepositoryService { self: AccountService =>
    * @param userName the user name of the repository owner
    * @param description the repository description
    * @param isPrivate the repository type (private is true, otherwise false)
+   * @param originRepositoryName specify for the forked repository. (default is None)
+   * @param originUserName specify for the forked repository. (default is None)
    */
-  def createRepository(repositoryName: String, userName: String, description: Option[String], isPrivate: Boolean): Unit = {
+  def createRepository(repositoryName: String, userName: String, description: Option[String], isPrivate: Boolean,
+                       originRepositoryName: Option[String] = None, originUserName: Option[String] = None,
+                       parentRepositoryName: Option[String] = None, parentUserName: Option[String] = None): Unit = {
     Repositories insert
       Repository(
-        userName         = userName,
+        userName             = userName,
-        repositoryName   = repositoryName,
+        repositoryName       = repositoryName,
-        isPrivate        = isPrivate,
+        isPrivate            = isPrivate,
-        description      = description,
+        description          = description,
-        defaultBranch    = "master",
+        defaultBranch        = "master",
-        registeredDate   = currentDate,
+        registeredDate       = currentDate,
-        updatedDate      = currentDate,
+        updatedDate          = currentDate,
-        lastActivityDate = currentDate)
+        lastActivityDate     = currentDate,
-    
+        originUserName       = originUserName,
+        originRepositoryName = originRepositoryName,
+        parentUserName       = parentUserName,
+        parentRepositoryName = parentRepositoryName)
+
     IssueId insert (userName, repositoryName, 0)
   }
 
+  def renameRepository(oldUserName: String, oldRepositoryName: String, newUserName: String, newRepositoryName: String): Unit = {
+    (Query(Repositories) filter { t => t.byRepository(oldUserName, oldRepositoryName) } firstOption).map { repository =>
+      Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName)
+
+      val webHooks      = Query(WebHooks     ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val milestones    = Query(Milestones   ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val issueId       = Query(IssueId      ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val issues        = Query(Issues       ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val pullRequests  = Query(PullRequests ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val labels        = Query(Labels       ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val issueComments = Query(IssueComments).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val issueLabels   = Query(IssueLabels  ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val collaborators = Query(Collaborators).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val commitLog     = Query(CommitLog    ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val activities    = Query(Activities   ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+
+      Repositories.filter { t =>
+        (t.originUserName is oldUserName.bind) && (t.originRepositoryName is oldRepositoryName.bind)
+      }.map { t => t.originUserName ~ t.originRepositoryName }.update(newUserName, newRepositoryName)
+
+      Repositories.filter { t =>
+        (t.parentUserName is oldUserName.bind) && (t.parentRepositoryName is oldRepositoryName.bind)
+      }.map { t => t.originUserName ~ t.originRepositoryName }.update(newUserName, newRepositoryName)
+
+      PullRequests.filter { t =>
+        t.requestRepositoryName is oldRepositoryName.bind
+      }.map { t => t.requestUserName ~ t.requestRepositoryName }.update(newUserName, newRepositoryName)
+
+      deleteRepository(oldUserName, oldRepositoryName)
+
+      WebHooks      .insertAll(webHooks      .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      Milestones    .insertAll(milestones    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      IssueId       .insertAll(issueId       .map(_.copy(_1       = newUserName, _2             = newRepositoryName)) :_*)
+      Issues        .insertAll(issues        .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      PullRequests  .insertAll(pullRequests  .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      IssueComments .insertAll(issueComments .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      Labels        .insertAll(labels        .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      IssueLabels   .insertAll(issueLabels   .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      Collaborators .insertAll(collaborators .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      CommitLog     .insertAll(commitLog     .map(_.copy(_1       = newUserName, _2             = newRepositoryName)) :_*)
+      Activities    .insertAll(activities    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+
+      // Update activity messages
+      val updateActivities = Activities.filter { t =>
+        (t.message like s"%:${oldUserName}/${oldRepositoryName}]%") ||
+        (t.message like s"%:${oldUserName}/${oldRepositoryName}#%")
+      }.map { t => t.activityId ~ t.message }.list
+
+      updateActivities.foreach { case (activityId, message) =>
+        Activities.filter(_.activityId is activityId.bind).map(_.message).update(
+          message
+            .replace(s"[repo:${oldUserName}/${oldRepositoryName}]"   ,s"[repo:${newUserName}/${newRepositoryName}]")
+            .replace(s"[branch:${oldUserName}/${oldRepositoryName}#" ,s"[branch:${newUserName}/${newRepositoryName}#")
+            .replace(s"[tag:${oldUserName}/${oldRepositoryName}#"    ,s"[tag:${newUserName}/${newRepositoryName}#")
+            .replace(s"[pullreq:${oldUserName}/${oldRepositoryName}#",s"[pullreq:${newUserName}/${newRepositoryName}#")
+            .replace(s"[issue:${oldUserName}/${oldRepositoryName}#"  ,s"[issue:${newUserName}/${newRepositoryName}#")
+        )
+      }
+    }
+  }
+
   def deleteRepository(userName: String, repositoryName: String): Unit = {
     Activities    .filter(_.byRepository(userName, repositoryName)).delete
     CommitLog     .filter(_.byRepository(userName, repositoryName)).delete
@@ -38,9 +107,11 @@ trait RepositoryService { self: AccountService =>
     IssueLabels   .filter(_.byRepository(userName, repositoryName)).delete
     Labels        .filter(_.byRepository(userName, repositoryName)).delete
     IssueComments .filter(_.byRepository(userName, repositoryName)).delete
+    PullRequests  .filter(_.byRepository(userName, repositoryName)).delete
     Issues        .filter(_.byRepository(userName, repositoryName)).delete
     IssueId       .filter(_.byRepository(userName, repositoryName)).delete
     Milestones    .filter(_.byRepository(userName, repositoryName)).delete
+    WebHooks      .filter(_.byRepository(userName, repositoryName)).delete
     Repositories  .filter(_.byRepository(userName, repositoryName)).delete
   }
 
@@ -63,27 +134,44 @@ trait RepositoryService { self: AccountService =>
    */
   def getRepository(userName: String, repositoryName: String, baseUrl: String): Option[RepositoryInfo] = {
     (Query(Repositories) filter { t => t.byRepository(userName, repositoryName) } firstOption) map { repository =>
-      new RepositoryInfo(JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl), repository)
+      // for getting issue count and pull request count
+      val issues = Query(Issues).filter { t =>
+        t.byRepository(repository.userName, repository.repositoryName) && (t.closed is false.bind)
+      }.map(_.pullRequest).list
+
+      new RepositoryInfo(
+        JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl),
+        repository,
+        issues.size,
+        issues.filter(_ == true).size,
+        getForkedCount(
+          repository.originUserName.getOrElse(repository.userName),
+          repository.originRepositoryName.getOrElse(repository.repositoryName)
+        ),
+        getRepositoryManagers(repository.userName))
     }
   }
 
-  /**
-   * Returns the list of specified user's repositories.
-   * It contains own repositories and collaboration repositories.
-   */
   def getUserRepositories(userName: String, baseUrl: String): List[RepositoryInfo] = {
     Query(Repositories).filter { t1 =>
       (t1.userName is userName.bind) ||
         (Query(Collaborators).filter { t2 => t2.byRepository(t1.userName, t1.repositoryName) && (t2.collaboratorName is userName.bind)} exists)
     }.sortBy(_.lastActivityDate desc).list.map{ repository =>
-      new RepositoryInfo(JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl), repository)
+      new RepositoryInfo(
+        JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl),
+        repository,
+        getForkedCount(
+          repository.originUserName.getOrElse(repository.userName),
+          repository.originRepositoryName.getOrElse(repository.repositoryName)
+        ),
+        getRepositoryManagers(repository.userName))
     }
   }
 
   /**
    * Returns the list of visible repositories for the specified user.
    * If repositoryUserName is given then filters results by repository owner.
-   * 
+   *
    * @param loginAccount the logged in account
    * @param baseUrl the base url of this application
    * @param repositoryUserName the repository owner (if None then returns all repositories which are visible for logged in user)
@@ -95,7 +183,7 @@ trait RepositoryService { self: AccountService =>
       case Some(x) if(x.isAdmin) => Query(Repositories)
       // for Normal Users
       case Some(x) if(!x.isAdmin) =>
-        Query(Repositories) filter { t => (t.isPrivate is false.bind) ||
+        Query(Repositories) filter { t => (t.isPrivate is false.bind) || (t.userName is x.userName) ||
           (Query(Collaborators).filter { t2 => t2.byRepository(t.userName, t.repositoryName) && (t2.collaboratorName is x.userName.bind)} exists)
         }
       // for Guests
@@ -103,10 +191,24 @@ trait RepositoryService { self: AccountService =>
     }).filter { t =>
       repositoryUserName.map { userName => t.userName is userName.bind } getOrElse ConstColumn.TRUE
     }.sortBy(_.lastActivityDate desc).list.map{ repository =>
-      new RepositoryInfo(JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl), repository)
+      new RepositoryInfo(
+        JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl),
+        repository,
+        getForkedCount(
+          repository.originUserName.getOrElse(repository.userName),
+          repository.originRepositoryName.getOrElse(repository.repositoryName)
+        ),
+        getRepositoryManagers(repository.userName))
     }
   }
 
+  private def getRepositoryManagers(userName: String): Seq[String] =
+    if(getAccountByUserName(userName).exists(_.isGroupAccount)){
+      getGroupMembers(userName).collect { case x if(x.isManager) => x.userName }
+    } else {
+      Seq(userName)
+    }
+
   /**
    * Updates the last activity date of the repository.
    */
@@ -170,17 +272,43 @@ trait RepositoryService { self: AccountService =>
     }
   }
 
+  private def getForkedCount(userName: String, repositoryName: String): Int =
+    Query(Repositories.filter { t =>
+      (t.originUserName is userName.bind) && (t.originRepositoryName is repositoryName.bind)
+    }.length).first
+
+
+  def getForkedRepositories(userName: String, repositoryName: String): List[(String, String)] =
+    Query(Repositories).filter { t =>
+      (t.originUserName is userName.bind) && (t.originRepositoryName is repositoryName.bind)
+    }
+    .sortBy(_.userName asc).map(t => t.userName ~ t.repositoryName).list
+
 }
 
 object RepositoryService {
 
-  case class RepositoryInfo(owner: String, name: String, url: String, repository: Repository,
+  case class RepositoryInfo(owner: String, name: String, httpUrl: String, repository: Repository,
-    commitCount: Int, branchList: List[String], tags: List[util.JGitUtil.TagInfo]){
+    issueCount: Int, pullCount: Int, commitCount: Int, forkedCount: Int,
+    branchList: Seq[String], tags: Seq[util.JGitUtil.TagInfo], managers: Seq[String]){
 
-    def this(repo: JGitUtil.RepositoryInfo, model: Repository) = {
+    lazy val host = """^https?://(.+?)(:\d+)?/""".r.findFirstMatchIn(httpUrl).get.group(1)
-      this(repo.owner, repo.name, repo.url, model, repo.commitCount, repo.branchList, repo.tags)
-    }
 
+    def sshUrl(port: Int, userName: String) = s"ssh://${userName}@${host}:${port}/${owner}/${name}.git"
+
+    /**
+     * Creates instance with issue count and pull request count.
+     */
+    def this(repo: JGitUtil.RepositoryInfo, model: Repository, issueCount: Int, pullCount: Int, forkedCount: Int, managers: Seq[String]) =
+      this(repo.owner, repo.name, repo.url, model, issueCount, pullCount, repo.commitCount, forkedCount, repo.branchList, repo.tags, managers)
+
+    /**
+     * Creates instance without issue count and pull request count.
+     */
+    def this(repo: JGitUtil.RepositoryInfo, model: Repository, forkedCount: Int, managers: Seq[String]) =
+      this(repo.owner, repo.name, repo.url, model, 0, 0, repo.commitCount, forkedCount, repo.branchList, repo.tags, managers)
   }
 
+  case class RepositoryTreeNode(owner: String, name: String, children: List[RepositoryTreeNode])
+
 }

src/main/scala/service/RequestCache.scala

@@ -8,19 +8,24 @@ import model._
  * It may be called many times in one request, so each method stores
  * its result into the cache which available during a request.
  */
-trait RequestCache {
+trait RequestCache extends SystemSettingsService with AccountService with IssuesService {
 
   def getIssue(userName: String, repositoryName: String, issueId: String)(implicit context: app.Context): Option[Issue] = {
     context.cache(s"issue.${userName}/${repositoryName}#${issueId}"){
-      new IssuesService {}.getIssue(userName, repositoryName, issueId)
+      super.getIssue(userName, repositoryName, issueId)
     }
   }
 
   def getAccountByUserName(userName: String)(implicit context: app.Context): Option[Account] = {
     context.cache(s"account.${userName}"){
-      new AccountService {}.getAccountByUserName(userName)
+      super.getAccountByUserName(userName)
     }
   }
 
+  def getAccountByMailAddress(mailAddress: String)(implicit context: app.Context): Option[Account] = {
+    context.cache(s"account.${mailAddress}"){
+      super.getAccountByMailAddress(mailAddress)
+    }
+  }
 }
 

src/main/scala/service/SshKeyService.scala

@@ -0,0 +1,19 @@
+package service
+
+import model._
+import scala.slick.driver.H2Driver.simple._
+import Database.threadLocalSession
+
+trait SshKeyService {
+
+  def addPublicKey(userName: String, title: String, publicKey: String): Unit =
+    SshKeys.ins insert (userName, title, publicKey)
+
+  def getPublicKeys(userName: String): List[SshKey] =
+    Query(SshKeys).filter(_.userName is userName.bind).sortBy(_.sshKeyId).list
+
+  def deletePublicKey(userName: String, sshKeyId: Int): Unit =
+    SshKeys filter (_.byPrimaryKey(userName, sshKeyId)) delete
+
+
+}

src/main/scala/service/SystemSettingsService.scala

@@ -1,40 +1,184 @@
-package service
+package service
-
+
-import util.Directory._
+import util.Directory._
-import SystemSettingsService._
+import util.ControlUtil._
-
+import SystemSettingsService._
-trait SystemSettingsService {
+import javax.servlet.http.HttpServletRequest
-
+
-  def saveSystemSettings(settings: SystemSettings): Unit = {
+trait SystemSettingsService {
-    val props = new java.util.Properties()
+
-    props.setProperty(AllowAccountRegistration, settings.allowAccountRegistration.toString)
+  def baseUrl(implicit request: HttpServletRequest): String = loadSystemSettings().baseUrl.getOrElse {
-    props.store(new java.io.FileOutputStream(GitBucketConf), null)
+    defining(request.getRequestURL.toString){ url =>
-  }
+      url.substring(0, url.length - (request.getRequestURI.length - request.getContextPath.length))
-
+    }
-
+  }.replaceFirst("/$", "")
-  def loadSystemSettings(): SystemSettings = {
+
-    val props = new java.util.Properties()
+  def saveSystemSettings(settings: SystemSettings): Unit = {
-    if(GitBucketConf.exists){
+    defining(new java.util.Properties()){ props =>
-      props.load(new java.io.FileInputStream(GitBucketConf))
+      settings.baseUrl.foreach(x => props.setProperty(BaseURL, x.replaceFirst("/\\Z", "")))
-    }
+      props.setProperty(AllowAccountRegistration, settings.allowAccountRegistration.toString)
-    SystemSettings(getBoolean(props, "allow_account_registration"))
+      props.setProperty(Gravatar, settings.gravatar.toString)
-  }
+      props.setProperty(Notification, settings.notification.toString)
-
+      props.setProperty(Ssh, settings.ssh.toString)
-}
+      settings.sshPort.foreach(x => props.setProperty(SshPort, x.toString))
-
+      if(settings.notification) {
-object SystemSettingsService {
+        settings.smtp.foreach { smtp =>
-
+          props.setProperty(SmtpHost, smtp.host)
-  case class SystemSettings(allowAccountRegistration: Boolean)
+          smtp.port.foreach(x => props.setProperty(SmtpPort, x.toString))
-
+          smtp.user.foreach(props.setProperty(SmtpUser, _))
-  private val AllowAccountRegistration = "allow_account_registration"
+          smtp.password.foreach(props.setProperty(SmtpPassword, _))
-
+          smtp.ssl.foreach(x => props.setProperty(SmtpSsl, x.toString))
-  private def getBoolean(props: java.util.Properties, key: String, default: Boolean = false): Boolean = {
+          smtp.fromAddress.foreach(props.setProperty(SmtpFromAddress, _))
-    val value = props.getProperty(key)
+          smtp.fromName.foreach(props.setProperty(SmtpFromName, _))
-    if(value == null || value.isEmpty){
+        }
-      default
+      }
-    } else {
+      props.setProperty(LdapAuthentication, settings.ldapAuthentication.toString)
-      value.toBoolean
+      if(settings.ldapAuthentication){
-    }
+        settings.ldap.map { ldap =>
-  }
+          props.setProperty(LdapHost, ldap.host)
-
+          ldap.port.foreach(x => props.setProperty(LdapPort, x.toString))
-}
+          ldap.bindDN.foreach(x => props.setProperty(LdapBindDN, x))
+          ldap.bindPassword.foreach(x => props.setProperty(LdapBindPassword, x))
+          props.setProperty(LdapBaseDN, ldap.baseDN)
+          props.setProperty(LdapUserNameAttribute, ldap.userNameAttribute)
+          ldap.fullNameAttribute.foreach(x => props.setProperty(LdapFullNameAttribute, x))
+          props.setProperty(LdapMailAddressAttribute, ldap.mailAttribute)
+          ldap.tls.foreach(x => props.setProperty(LdapTls, x.toString))
+          ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x))
+        }
+      }
+      props.store(new java.io.FileOutputStream(GitBucketConf), null)
+    }
+  }
+
+
+  def loadSystemSettings(): SystemSettings = {
+    defining(new java.util.Properties()){ props =>
+      if(GitBucketConf.exists){
+        props.load(new java.io.FileInputStream(GitBucketConf))
+      }
+      SystemSettings(
+        getOptionValue[String](props, BaseURL, None).map(x => x.replaceFirst("/\\Z", "")),
+        getValue(props, AllowAccountRegistration, false),
+        getValue(props, Gravatar, true),
+        getValue(props, Notification, false),
+        getValue(props, Ssh, false),
+        getOptionValue(props, SshPort, Some(DefaultSshPort)),
+        if(getValue(props, Notification, false)){
+          Some(Smtp(
+            getValue(props, SmtpHost, ""),
+            getOptionValue(props, SmtpPort, Some(DefaultSmtpPort)),
+            getOptionValue(props, SmtpUser, None),
+            getOptionValue(props, SmtpPassword, None),
+            getOptionValue[Boolean](props, SmtpSsl, None),
+            getOptionValue(props, SmtpFromAddress, None),
+            getOptionValue(props, SmtpFromName, None)))
+        } else {
+          None
+        },
+        getValue(props, LdapAuthentication, false),
+        if(getValue(props, LdapAuthentication, false)){
+          Some(Ldap(
+            getValue(props, LdapHost, ""),
+            getOptionValue(props, LdapPort, Some(DefaultLdapPort)),
+            getOptionValue(props, LdapBindDN, None),
+            getOptionValue(props, LdapBindPassword, None),
+            getValue(props, LdapBaseDN, ""),
+            getValue(props, LdapUserNameAttribute, ""),
+            getOptionValue(props, LdapFullNameAttribute, None),
+            getValue(props, LdapMailAddressAttribute, ""),
+            getOptionValue[Boolean](props, LdapTls, None),
+            getOptionValue(props, LdapKeystore, None)))
+        } else {
+          None
+        }
+      )
+    }
+  }
+
+}
+
+object SystemSettingsService {
+  import scala.reflect.ClassTag
+
+  case class SystemSettings(
+    baseUrl: Option[String],
+    allowAccountRegistration: Boolean,
+    gravatar: Boolean,
+    notification: Boolean,
+    ssh: Boolean,
+    sshPort: Option[Int],
+    smtp: Option[Smtp],
+    ldapAuthentication: Boolean,
+    ldap: Option[Ldap])
+
+  case class Ldap(
+    host: String,
+    port: Option[Int],
+    bindDN: Option[String],
+    bindPassword: Option[String],
+    baseDN: String,
+    userNameAttribute: String,
+    fullNameAttribute: Option[String],
+    mailAttribute: String,
+    tls: Option[Boolean],
+    keystore: Option[String])
+
+  case class Smtp(
+    host: String,
+    port: Option[Int],
+    user: Option[String],
+    password: Option[String],
+    ssl: Option[Boolean],
+    fromAddress: Option[String],
+    fromName: Option[String])
+
+  val DefaultSshPort = 29418
+  val DefaultSmtpPort = 25
+  val DefaultLdapPort = 389
+
+  private val BaseURL = "base_url"
+  private val AllowAccountRegistration = "allow_account_registration"
+  private val Gravatar = "gravatar"
+  private val Notification = "notification"
+  private val Ssh = "ssh"
+  private val SshPort = "ssh.port"
+  private val SmtpHost = "smtp.host"
+  private val SmtpPort = "smtp.port"
+  private val SmtpUser = "smtp.user"
+  private val SmtpPassword = "smtp.password"
+  private val SmtpSsl = "smtp.ssl"
+  private val SmtpFromAddress = "smtp.from_address"
+  private val SmtpFromName = "smtp.from_name"
+  private val LdapAuthentication = "ldap_authentication"
+  private val LdapHost = "ldap.host"
+  private val LdapPort = "ldap.port"
+  private val LdapBindDN = "ldap.bindDN"
+  private val LdapBindPassword = "ldap.bind_password"
+  private val LdapBaseDN = "ldap.baseDN"
+  private val LdapUserNameAttribute = "ldap.username_attribute"
+  private val LdapFullNameAttribute = "ldap.fullname_attribute"
+  private val LdapMailAddressAttribute = "ldap.mail_attribute"
+  private val LdapTls = "ldap.tls"
+  private val LdapKeystore = "ldap.keystore"
+
+  private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A =
+    defining(props.getProperty(key)){ value =>
+      if(value == null || value.isEmpty) default
+      else convertType(value).asInstanceOf[A]
+    }
+
+  private def getOptionValue[A: ClassTag](props: java.util.Properties, key: String, default: Option[A]): Option[A] =
+    defining(props.getProperty(key)){ value =>
+      if(value == null || value.isEmpty) default
+      else Some(convertType(value)).asInstanceOf[Option[A]]
+    }
+
+  private def convertType[A: ClassTag](value: String) =
+    defining(implicitly[ClassTag[A]].runtimeClass){ c =>
+      if(c == classOf[Boolean])  value.toBoolean
+      else if(c == classOf[Int]) value.toInt
+      else value
+    }
+
+}

src/main/scala/service/WebHookService.scala

@@ -0,0 +1,145 @@
+package service
+
+import scala.slick.driver.H2Driver.simple._
+import Database.threadLocalSession
+
+import model._
+import org.slf4j.LoggerFactory
+import service.RepositoryService.RepositoryInfo
+import util.JGitUtil
+import org.eclipse.jgit.diff.DiffEntry
+import util.JGitUtil.CommitInfo
+import org.eclipse.jgit.api.Git
+import org.apache.http.message.BasicNameValuePair
+import org.apache.http.client.entity.UrlEncodedFormEntity
+import org.apache.http.protocol.HTTP
+import org.apache.http.NameValuePair
+
+trait WebHookService {
+  import WebHookService._
+
+  private val logger = LoggerFactory.getLogger(classOf[WebHookService])
+
+  def getWebHookURLs(owner: String, repository: String): List[WebHook] =
+    Query(WebHooks).filter(_.byRepository(owner, repository)).sortBy(_.url).list
+
+  def addWebHookURL(owner: String, repository: String, url :String): Unit =
+    WebHooks.insert(WebHook(owner, repository, url))
+
+  def deleteWebHookURL(owner: String, repository: String, url :String): Unit =
+    Query(WebHooks).filter(_.byPrimaryKey(owner, repository, url)).delete
+
+  def callWebHook(owner: String, repository: String, webHookURLs: List[WebHook], payload: WebHookPayload): Unit = {
+    import org.json4s._
+    import org.json4s.jackson.Serialization
+    import org.json4s.jackson.Serialization.{read, write}
+    import org.apache.http.client.methods.HttpPost
+    import org.apache.http.impl.client.HttpClientBuilder
+    import scala.concurrent._
+    import ExecutionContext.Implicits.global
+
+    logger.debug("start callWebHook")
+    implicit val formats = Serialization.formats(NoTypeHints)
+
+    if(webHookURLs.nonEmpty){
+      val json = write(payload)
+      val httpClient = HttpClientBuilder.create.build
+
+      webHookURLs.foreach { webHookUrl =>
+        val f = future {
+          logger.debug(s"start web hook invocation for ${webHookUrl}")
+          val httpPost = new HttpPost(webHookUrl.url)
+
+          val params: java.util.List[NameValuePair] = new java.util.ArrayList()
+          params.add(new BasicNameValuePair("payload", json))
+          httpPost.setEntity(new UrlEncodedFormEntity(params, "UTF-8"))
+
+          httpClient.execute(httpPost)
+          httpPost.releaseConnection()
+          logger.debug(s"end web hook invocation for ${webHookUrl}")
+        }
+        f.onSuccess {
+          case s => logger.debug(s"Success: web hook request to ${webHookUrl.url}")
+        }
+        f.onFailure {
+          case t => logger.error(s"Failed: web hook request to ${webHookUrl.url}", t)
+        }
+      }
+    }
+    logger.debug("end callWebHook")
+  }
+
+}
+
+object WebHookService {
+
+  case class WebHookPayload(
+    pusher: WebHookUser,
+    ref: String,
+    commits: List[WebHookCommit],
+    repository: WebHookRepository)
+
+  object WebHookPayload {
+    def apply(git: Git, pusher: Account, refName: String, repositoryInfo: RepositoryInfo,
+              commits: List[CommitInfo], repositoryOwner: Account): WebHookPayload =
+      WebHookPayload(
+        WebHookUser(pusher.fullName, pusher.mailAddress),
+        refName,
+        commits.map { commit =>
+          val diffs = JGitUtil.getDiffs(git, commit.id, false)
+          val commitUrl = repositoryInfo.httpUrl.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/commit/" + commit.id
+
+          WebHookCommit(
+            id        = commit.id,
+            message   = commit.fullMessage,
+            timestamp = commit.time.toString,
+            url       = commitUrl,
+            added     = diffs._1.collect { case x if(x.changeType == DiffEntry.ChangeType.ADD)    => x.newPath },
+            removed   = diffs._1.collect { case x if(x.changeType == DiffEntry.ChangeType.DELETE) => x.oldPath },
+            modified  = diffs._1.collect { case x if(x.changeType != DiffEntry.ChangeType.ADD &&
+              x.changeType != DiffEntry.ChangeType.DELETE) => x.newPath },
+            author    = WebHookUser(
+              name  = commit.committer,
+              email = commit.mailAddress
+            )
+          )
+        }.toList,
+        WebHookRepository(
+          name        = repositoryInfo.name,
+          url         = repositoryInfo.httpUrl,
+          description = repositoryInfo.repository.description.getOrElse(""),
+          watchers    = 0,
+          forks       = repositoryInfo.forkedCount,
+          `private`   = repositoryInfo.repository.isPrivate,
+          owner = WebHookUser(
+            name  = repositoryOwner.userName,
+            email = repositoryOwner.mailAddress
+          )
+        )
+      )
+  }
+
+  case class WebHookCommit(
+    id: String,
+    message: String,
+    timestamp: String,
+    url: String,
+    added: List[String],
+    removed: List[String],
+    modified: List[String],
+    author: WebHookUser)
+
+  case class WebHookRepository(
+    name: String,
+    url: String,
+    description: String,
+    watchers: Int,
+    forks: Int,
+    `private`: Boolean,
+    owner: WebHookUser)
+
+  case class WebHookUser(
+    name: String,
+    email: String)
+
+}

src/main/scala/service/WikiService.scala

@@ -1,13 +1,22 @@
 package service
 
-import java.io.File
 import java.util.Date
 import org.eclipse.jgit.api.Git
 import org.apache.commons.io.FileUtils
-import util.JGitUtil.DiffInfo
+import util._
-import util.{Directory, JGitUtil}
+import _root_.util.ControlUtil._
-import org.eclipse.jgit.treewalk.CanonicalTreeParser
+import org.eclipse.jgit.treewalk.{TreeWalk, CanonicalTreeParser}
-import java.util.concurrent.ConcurrentHashMap
+import org.eclipse.jgit.lib._
+import org.eclipse.jgit.dircache.{DirCache, DirCacheEntry}
+import org.eclipse.jgit.revwalk.RevWalk
+import org.eclipse.jgit.diff.{DiffEntry, DiffFormatter}
+import java.io.ByteArrayInputStream
+import org.eclipse.jgit.patch._
+import org.eclipse.jgit.api.errors.PatchFormatException
+import scala.collection.JavaConverters._
+import scala.Some
+import service.RepositoryService.RepositoryInfo
+
 
 object WikiService {
   
@@ -18,8 +27,9 @@ object WikiService {
    * @param content the page content
    * @param committer the last committer
    * @param time the last modified time
+   * @param id the latest commit id
    */
-  case class WikiPageInfo(name: String, content: String, committer: String, time: Date)
+  case class WikiPageInfo(name: String, content: String, committer: String, time: Date, id: String)
   
   /**
    * The model for wiki page history.
@@ -31,61 +41,34 @@ object WikiService {
    */
   case class WikiPageHistoryInfo(name: String, committer: String, message: String, date: Date)
 
-  /**
+  def httpUrl(repository: RepositoryInfo) = repository.httpUrl.replaceFirst("\\.git\\Z", ".wiki.git")
-   * lock objects
-   */
-  private val locks = new ConcurrentHashMap[String, AnyRef]()
-
-  /**
-   * Returns the lock object for the specified repository.
-   */
-  private def getLockObject(owner: String, repository: String): AnyRef = synchronized {
-    val key = owner + "/" + repository
-    if(!locks.containsKey(key)){
-      locks.put(key, new AnyRef())
-    }
-    locks.get(key)
-  }
-
-  /**
-   * Synchronizes a given function which modifies the working copy of the wiki repository.
-   *
-   * @param owner the repository owner
-   * @param repository the repository name
-   * @param f the function which modifies the working copy of the wiki repository
-   * @tparam T the return type of the given function
-   * @return the result of the given function
-   */
-  def lock[T](owner: String, repository: String)(f: => T): T = getLockObject(owner, repository).synchronized(f)
 
+  def sshUrl(repository: RepositoryInfo, settings: SystemSettingsService.SystemSettings, userName: String) =
+    repository.sshUrl(settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort), userName).replaceFirst("\\.git\\Z", ".wiki.git")
 }
 
 trait WikiService {
   import WikiService._
 
-  def createWikiRepository(loginAccount: model.Account, owner: String, repository: String): Unit = {
+  def createWikiRepository(loginAccount: model.Account, owner: String, repository: String): Unit =
-    lock(owner, repository){
+    LockUtil.lock(s"${owner}/${repository}/wiki"){
-      val dir = Directory.getWikiRepositoryDir(owner, repository)
+      defining(Directory.getWikiRepositoryDir(owner, repository)){ dir =>
-      if(!dir.exists){
+        if(!dir.exists){
-        try {
           JGitUtil.initRepository(dir)
-          saveWikiPage(owner, repository, "Home", "Home", s"Welcome to the ${repository} wiki!!", loginAccount, "Initial Commit")
+          saveWikiPage(owner, repository, "Home", "Home", s"Welcome to the ${repository} wiki!!", loginAccount, "Initial Commit", None)
-        } finally {
-          // once delete cloned repository because initial cloned repository does not have 'branch.master.merge'
-          FileUtils.deleteDirectory(Directory.getWikiWorkDir(owner, repository))
         }
       }
     }
-  }
+
-  
   /**
    * Returns the wiki page.
    */
   def getWikiPage(owner: String, repository: String, pageName: String): Option[WikiPageInfo] = {
-    JGitUtil.withGit(Directory.getWikiRepositoryDir(owner, repository)){ git =>
+    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
       if(!JGitUtil.isEmpty(git)){
         JGitUtil.getFileList(git, "master", ".").find(_.name == pageName + ".md").map { file =>
-          WikiPageInfo(file.name, new String(git.getRepository.open(file.id).getBytes, "UTF-8"), file.committer, file.time)
+          WikiPageInfo(file.name, StringUtil.convertFromByteArray(git.getRepository.open(file.id).getBytes),
+                       file.committer, file.time, file.commitId)
         }
       } else None
     }
@@ -94,8 +77,8 @@ trait WikiService {
   /**
    * Returns the content of the specified file.
    */
-  def getFileContent(owner: String, repository: String, path: String): Option[Array[Byte]] = {
+  def getFileContent(owner: String, repository: String, path: String): Option[Array[Byte]] =
-    JGitUtil.withGit(Directory.getWikiRepositoryDir(owner, repository)){ git =>
+    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
       if(!JGitUtil.isEmpty(git)){
         val index = path.lastIndexOf('/')
         val parentPath = if(index < 0) "."  else path.substring(0, index)
@@ -106,55 +89,181 @@ trait WikiService {
         }
       } else None
     }
-  }
 
   /**
    * Returns the list of wiki page names.
    */
   def getWikiPageList(owner: String, repository: String): List[String] = {
-    JGitUtil.withGit(Directory.getWikiRepositoryDir(owner, repository)){ git =>
+    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
       JGitUtil.getFileList(git, "master", ".")
         .filter(_.name.endsWith(".md"))
         .map(_.name.replaceFirst("\\.md$", ""))
         .sortBy(x => x)
     }
   }
-  
+
+  /**
+   * Reverts specified changes.
+   */
+  def revertWikiPage(owner: String, repository: String, from: String, to: String,
+                     committer: model.Account, pageName: Option[String]): Boolean = {
+
+    case class RevertInfo(operation: String, filePath: String, source: String)
+
+    try {
+      LockUtil.lock(s"${owner}/${repository}/wiki"){
+        using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
+
+          val reader = git.getRepository.newObjectReader
+          val oldTreeIter = new CanonicalTreeParser
+          oldTreeIter.reset(reader, git.getRepository.resolve(from + "^{tree}"))
+
+          val newTreeIter = new CanonicalTreeParser
+          newTreeIter.reset(reader, git.getRepository.resolve(to + "^{tree}"))
+
+          val diffs = git.diff.setNewTree(oldTreeIter).setOldTree(newTreeIter).call.asScala.filter { diff =>
+            pageName match {
+              case Some(x) => diff.getNewPath == x + ".md"
+              case None    => true
+            }
+          }
+
+          val patch = using(new java.io.ByteArrayOutputStream()){ out =>
+            val formatter = new DiffFormatter(out)
+            formatter.setRepository(git.getRepository)
+            formatter.format(diffs.asJava)
+            new String(out.toByteArray, "UTF-8")
+          }
+
+          val p = new Patch()
+          p.parse(new ByteArrayInputStream(patch.getBytes("UTF-8")))
+          if(!p.getErrors.isEmpty){
+            throw new PatchFormatException(p.getErrors())
+          }
+          val revertInfo = (p.getFiles.asScala.map { fh =>
+            fh.getChangeType match {
+              case DiffEntry.ChangeType.MODIFY => {
+                val source = getWikiPage(owner, repository, fh.getNewPath.replaceFirst("\\.md$", "")).map(_.content).getOrElse("")
+                val applied = PatchUtil.apply(source, patch, fh)
+                if(applied != null){
+                  Seq(RevertInfo("ADD", fh.getNewPath, applied))
+                } else Nil
+              }
+              case DiffEntry.ChangeType.ADD => {
+                val applied = PatchUtil.apply("", patch, fh)
+                if(applied != null){
+                  Seq(RevertInfo("ADD", fh.getNewPath, applied))
+                } else Nil
+              }
+              case DiffEntry.ChangeType.DELETE => {
+                Seq(RevertInfo("DELETE", fh.getNewPath, ""))
+              }
+              case DiffEntry.ChangeType.RENAME => {
+                val applied = PatchUtil.apply("", patch, fh)
+                if(applied != null){
+                  Seq(RevertInfo("DELETE", fh.getOldPath, ""), RevertInfo("ADD", fh.getNewPath, applied))
+                } else {
+                  Seq(RevertInfo("DELETE", fh.getOldPath, ""))
+                }
+              }
+              case _ => Nil
+            }
+          }).flatten
+
+          if(revertInfo.nonEmpty){
+            val builder  = DirCache.newInCore.builder()
+            val inserter = git.getRepository.newObjectInserter()
+            val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
+
+            using(new RevWalk(git.getRepository)){ revWalk =>
+              using(new TreeWalk(git.getRepository)){ treeWalk =>
+                val index = treeWalk.addTree(revWalk.parseTree(headId))
+                treeWalk.setRecursive(true)
+                while(treeWalk.next){
+                  val path = treeWalk.getPathString
+                  val tree = treeWalk.getTree(index, classOf[CanonicalTreeParser])
+                  if(revertInfo.find(x => x.filePath == path).isEmpty){
+                    builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+                  }
+                }
+              }
+            }
+
+            revertInfo.filter(_.operation == "ADD").foreach { x =>
+              builder.add(JGitUtil.createDirCacheEntry(x.filePath, FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, x.source.getBytes("UTF-8"))))
+            }
+            builder.finish()
+
+            JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), committer.fullName, committer.mailAddress,
+              pageName match {
+                case Some(x) => s"Revert ${from} ... ${to} on ${x}"
+                case None    => s"Revert ${from} ... ${to}"
+              })
+          }
+        }
+      }
+      true
+    } catch {
+      case e: Exception => {
+        e.printStackTrace()
+        false
+      }
+    }
+  }
+
   /**
    * Save the wiki page.
    */
   def saveWikiPage(owner: String, repository: String, currentPageName: String, newPageName: String,
-      content: String, committer: model.Account, message: String): Unit = {
+      content: String, committer: model.Account, message: String, currentId: Option[String]): Option[String] = {
+    LockUtil.lock(s"${owner}/${repository}/wiki"){
+      using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
+        val builder  = DirCache.newInCore.builder()
+        val inserter = git.getRepository.newObjectInserter()
+        val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
+        var created  = true
+        var updated  = false
+        var removed  = false
 
-    lock(owner, repository){
+        if(headId != null){
-      // clone working copy
+          using(new RevWalk(git.getRepository)){ revWalk =>
-      val workDir = Directory.getWikiWorkDir(owner, repository)
+            using(new TreeWalk(git.getRepository)){ treeWalk =>
-      cloneOrPullWorkingCopy(workDir, owner, repository)
+              val index = treeWalk.addTree(revWalk.parseTree(headId))
-
+              treeWalk.setRecursive(true)
-      // write as file
+              while(treeWalk.next){
-      JGitUtil.withGit(workDir){ git =>
+                val path = treeWalk.getPathString
-        val file = new File(workDir, newPageName + ".md")
+                val tree = treeWalk.getTree(index, classOf[CanonicalTreeParser])
-        val added = if(!file.exists || FileUtils.readFileToString(file, "UTF-8") != content){
+                if(path == currentPageName + ".md" && currentPageName != newPageName){
-          FileUtils.writeStringToFile(file, content, "UTF-8")
+                  removed = true
-          git.add.addFilepattern(file.getName).call
+                } else if(path != newPageName + ".md"){
-          true
+                  builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
-        } else {
+                } else {
-          false
+                  created = false
+                  updated = JGitUtil.getContentFromId(git, tree.getEntryObjectId, true).map(new String(_, "UTF-8") != content).getOrElse(false)
+                }
+              }
+            }
+          }
         }
 
-        // delete file
+        if(created || updated || removed){
-        val deleted = if(currentPageName != "" && currentPageName != newPageName){
+          builder.add(JGitUtil.createDirCacheEntry(newPageName + ".md", FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, content.getBytes("UTF-8"))))
-          git.rm.addFilepattern(currentPageName + ".md").call
+          builder.finish()
-          true
+          val newHeadId = JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), committer.fullName, committer.mailAddress,
-        } else {
+            if(message.trim.length == 0) {
-          false
+              if(removed){
-        }
+                s"Rename ${currentPageName} to ${newPageName}"
+              } else if(created){
+                s"Created ${newPageName}"
+              } else {
+                s"Updated ${newPageName}"
+              }
+            } else {
+              message
+            })
 
-        // commit and push
+          Some(newHeadId)
-        if(added || deleted){
+        } else None
-          git.commit.setCommitter(committer.userName, committer.mailAddress).setMessage(message).call
-          git.push.call
-        }
       }
     }
   }
@@ -162,60 +271,37 @@ trait WikiService {
   /**
    * Delete the wiki page.
    */
-  def deleteWikiPage(owner: String, repository: String, pageName: String, committer: String, message: String): Unit = {
+  def deleteWikiPage(owner: String, repository: String, pageName: String,
-    lock(owner, repository){
+                     committer: String, mailAddress: String, message: String): Unit = {
-      // clone working copy
+    LockUtil.lock(s"${owner}/${repository}/wiki"){
-      val workDir = Directory.getWikiWorkDir(owner, repository)
+      using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-      cloneOrPullWorkingCopy(workDir, owner, repository)
+        val builder  = DirCache.newInCore.builder()
+        val inserter = git.getRepository.newObjectInserter()
+        val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
+        var removed  = false
 
-      // delete file
+        using(new RevWalk(git.getRepository)){ revWalk =>
-      new File(workDir, pageName + ".md").delete
+          using(new TreeWalk(git.getRepository)){ treeWalk =>
-    
+            val index = treeWalk.addTree(revWalk.parseTree(headId))
-      JGitUtil.withGit(workDir){ git =>
+            treeWalk.setRecursive(true)
-        git.rm.addFilepattern(pageName + ".md").call
+            while(treeWalk.next){
-    
+              val path = treeWalk.getPathString
-        // commit and push
+              val tree = treeWalk.getTree(index, classOf[CanonicalTreeParser])
-        // TODO committer's mail address
+              if(path != pageName + ".md"){
-        git.commit.setAuthor(committer, committer + "@devnull").setMessage(message).call
+                builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
-        git.push.call
+              } else {
+                removed = true
+              }
+            }
+          }
+
+          if(removed){
+            builder.finish()
+            JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), committer, mailAddress, message)
+          }
+        }
       }
     }
   }
 
-  /**
+}
-   * Returns differences between specified commits.
-   */
-  def getWikiDiffs(git: Git, commitId1: String, commitId2: String): List[DiffInfo] = {
-      // get diff between specified commit and its previous commit
-      val reader = git.getRepository.newObjectReader
-      
-      val oldTreeIter = new CanonicalTreeParser
-      oldTreeIter.reset(reader, git.getRepository.resolve(commitId1 + "^{tree}"))
-      
-      val newTreeIter = new CanonicalTreeParser
-      newTreeIter.reset(reader, git.getRepository.resolve(commitId2 + "^{tree}"))
-      
-      import scala.collection.JavaConverters._
-      git.diff.setNewTree(newTreeIter).setOldTree(oldTreeIter).call.asScala.map { diff =>
-        DiffInfo(diff.getChangeType, diff.getOldPath, diff.getNewPath,
-            JGitUtil.getContent(git, diff.getOldId.toObjectId, false).map(new String(_, "UTF-8")), 
-            JGitUtil.getContent(git, diff.getNewId.toObjectId, false).map(new String(_, "UTF-8")))
-      }.toList
-  }
-
-  private def cloneOrPullWorkingCopy(workDir: File, owner: String, repository: String): Unit = {
-    if(!workDir.exists){
-      val git =
-        Git.cloneRepository
-          .setURI(Directory.getWikiRepositoryDir(owner, repository).toURI.toString)
-          .setDirectory(workDir)
-          .call
-      git.getRepository.close  // close .git resources.
-    } else {
-      JGitUtil.withGit(workDir){ git =>
-        git.pull.call
-      }
-    }
-  }
-
-}

src/main/scala/servlet/AutoUpdateListener.scala

@@ -1,12 +1,14 @@
 package servlet
 
 import java.io.File
-import java.sql.Connection
+import java.sql.{DriverManager, Connection}
 import org.apache.commons.io.FileUtils
-import javax.servlet.ServletContextEvent
+import javax.servlet.{ServletContext, ServletContextListener, ServletContextEvent}
 import org.apache.commons.io.IOUtils
 import org.slf4j.LoggerFactory
-import util.Directory
+import util.Directory._
+import util.ControlUtil._
+import org.eclipse.jgit.api.Git
 
 object AutoUpdate {
   
@@ -26,15 +28,14 @@ object AutoUpdate {
      */
     def update(conn: Connection): Unit = {
       val sqlPath = s"update/${majorVersion}_${minorVersion}.sql"
-      val in = Thread.currentThread.getContextClassLoader.getResourceAsStream(sqlPath)
+
-      if(in != null){
+      using(Thread.currentThread.getContextClassLoader.getResourceAsStream(sqlPath)){ in =>
-        val sql = IOUtils.toString(in, "UTF-8")
+        if(in != null){
-        val stmt = conn.createStatement()
+          val sql = IOUtils.toString(in, "UTF-8")
-        try {
+          using(conn.createStatement()){ stmt =>
-          logger.debug(sqlPath + "=" + sql)
+            logger.debug(sqlPath + "=" + sql)
-          stmt.executeUpdate(sql)
+            stmt.executeUpdate(sql)
-        } finally {
+          }
-          stmt.close()
         }
       }
     }
@@ -49,27 +50,37 @@ object AutoUpdate {
    * The history of versions. A head of this sequence is the current BitBucket version.
    */
   val versions = Seq(
+    Version(1, 12),
+    Version(1, 11),
+    Version(1, 10),
+    Version(1, 9),
+    Version(1, 8),
+    Version(1, 7),
+    Version(1, 6),
+    Version(1, 5),
     Version(1, 4),
     new Version(1, 3){
       override def update(conn: Connection): Unit = {
         super.update(conn)
         // Fix wiki repository configuration
-        val rs = conn.createStatement.executeQuery("SELECT USER_NAME, REPOSITORY_NAME FROM REPOSITORY")
+        using(conn.createStatement.executeQuery("SELECT USER_NAME, REPOSITORY_NAME FROM REPOSITORY")){ rs =>
-        while(rs.next){
+          while(rs.next){
-          val wikidir = Directory.getWikiRepositoryDir(rs.getString("USER_NAME"), rs.getString("REPOSITORY_NAME"))
+            using(Git.open(getWikiRepositoryDir(rs.getString("USER_NAME"), rs.getString("REPOSITORY_NAME")))){ git =>
-          val repository = org.eclipse.jgit.api.Git.open(wikidir).getRepository
+              defining(git.getRepository.getConfig){ config =>
-          val config = repository.getConfig
+                if(!config.getBoolean("http", "receivepack", false)){
-          if(!config.getBoolean("http", "receivepack", false)){
+                  config.setBoolean("http", null, "receivepack", true)
-            config.setBoolean("http", null, "receivepack", true)
+                  config.save
-            config.save
+                }
+              }
+            }
           }
-          repository.close
         }
       }
     },
     Version(1, 2),
     Version(1, 1),
-    Version(1, 0)
+    Version(1, 0),
+    Version(0, 0)
   )
   
   /**
@@ -80,14 +91,14 @@ object AutoUpdate {
   /**
    * The version file (GITBUCKET_HOME/version).
    */
-  val versionFile = new File(Directory.GitBucketHome, "version")
+  lazy val versionFile = new File(GitBucketHome, "version")
   
   /**
    * Returns the current version from the version file.
    */
   def getCurrentVersion(): Version = {
     if(versionFile.exists){
-      FileUtils.readFileToString(versionFile, "UTF-8").split("\\.") match {
+      FileUtils.readFileToString(versionFile, "UTF-8").trim.split("\\.") match {
         case Array(majorVersion, minorVersion) => {
           versions.find { v => 
             v.majorVersion == majorVersion.toInt && v.minorVersion == minorVersion.toInt
@@ -95,45 +106,60 @@ object AutoUpdate {
         }
         case _ => Version(0, 0)
       }
-    } else {
+    } else Version(0, 0)
-      Version(0, 0)
+  }
-    }
-    
-  }  
   
 }
 
 /**
- * Start H2 database and update schema automatically.
+ * Update database schema automatically in the context initializing.
  */
-class AutoUpdateListener extends org.h2.server.web.DbStarter {
+class AutoUpdateListener extends ServletContextListener {
   import AutoUpdate._
   private val logger = LoggerFactory.getLogger(classOf[AutoUpdateListener])
   
   override def contextInitialized(event: ServletContextEvent): Unit = {
-    super.contextInitialized(event)
+    val datadir = event.getServletContext.getInitParameter("gitbucket.home")
-    logger.debug("H2 started")
+    if(datadir != null){
-    
+      System.setProperty("gitbucket.home", datadir)
+    }
+    org.h2.Driver.load()
+    event.getServletContext.setInitParameter("db.url", s"jdbc:h2:${DatabaseHome};MVCC=true")
+
     logger.debug("Start schema update")
-    val conn = getConnection()
+    defining(getConnection(event.getServletContext)){ conn =>
-    try {
+      try {
-      val currentVersion = getCurrentVersion()
+        defining(getCurrentVersion()){ currentVersion =>
-      if(currentVersion == headVersion){
+          if(currentVersion == headVersion){
-        logger.debug("No update")
+            logger.debug("No update")
-      } else {
+          } else if(!versions.contains(currentVersion)){
-        versions.takeWhile(_ != currentVersion).reverse.foreach(_.update(conn))
+            logger.warn(s"Skip migration because ${currentVersion.versionString} is illegal version.")
-        FileUtils.writeStringToFile(versionFile, headVersion.versionString, "UTF-8")
+          } else {
-        conn.commit()
+            versions.takeWhile(_ != currentVersion).reverse.foreach(_.update(conn))
-        logger.debug("Updated from " + currentVersion.versionString + " to " + headVersion.versionString)
+            FileUtils.writeStringToFile(versionFile, headVersion.versionString, "UTF-8")
-      }
+            conn.commit()
-    } catch {
+            logger.debug(s"Updated from ${currentVersion.versionString} to ${headVersion.versionString}")
-      case ex: Throwable => {
+          }
-        logger.error("Failed to schema update", ex)
+        }
-        ex.printStackTrace()
+      } catch {
-        conn.rollback()
+        case ex: Throwable => {
+          logger.error("Failed to schema update", ex)
+          ex.printStackTrace()
+          conn.rollback()
+        }
       }
     }
     logger.debug("End schema update")
   }
-  
+
-}
+  def contextDestroyed(sce: ServletContextEvent): Unit = {
+    // Nothing to do.
+  }
+
+  private def getConnection(servletContext: ServletContext): Connection =
+    DriverManager.getConnection(
+      servletContext.getInitParameter("db.url"),
+      servletContext.getInitParameter("db.user"),
+      servletContext.getInitParameter("db.password"))
+
+}

src/main/scala/servlet/BasicAuthenticationFilter.scala

@@ -2,14 +2,16 @@ package servlet
 
 import javax.servlet._
 import javax.servlet.http._
-import util.StringUtil._
+import service.{SystemSettingsService, AccountService, RepositoryService}
-import service.{AccountService, RepositoryService}
 import org.slf4j.LoggerFactory
+import util.Implicits._
+import util.ControlUtil._
+import util.Keys
 
 /**
  * Provides BASIC Authentication for [[servlet.GitRepositoryServlet]].
  */
-class BasicAuthenticationFilter extends Filter with RepositoryService with AccountService {
+class BasicAuthenticationFilter extends Filter with RepositoryService with AccountService with SystemSettingsService {
 
   private val logger = LoggerFactory.getLogger(classOf[BasicAuthenticationFilter])
 
@@ -26,29 +28,30 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou
     }
 
     try {
-      val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
+      defining(request.paths){ case Array(_, repositoryOwner, repositoryName, _*) =>
-      val repositoryOwner = paths(2)
+        getRepository(repositoryOwner, repositoryName.replaceFirst("\\.wiki\\.git$|\\.git$", ""), "") match {
-      val repositoryName  = paths(3).replaceFirst("\\.git$", "")
+          case Some(repository) => {
-
+            if(!request.getRequestURI.endsWith("/git-receive-pack") &&
-      getRepository(repositoryOwner, repositoryName.replaceFirst("\\.wiki", ""), "") match {
-        case Some(repository) => {
-          if(!request.getRequestURI.endsWith("/git-receive-pack") &&
               !"service=git-receive-pack".equals(request.getQueryString) && !repository.repository.isPrivate){
-            chain.doFilter(req, wrappedResponse)
+              chain.doFilter(req, wrappedResponse)
-          } else {
+            } else {
-            request.getHeader("Authorization") match {
+              request.getHeader("Authorization") match {
-              case null => requireAuth(response)
+                case null => requireAuth(response)
-              case auth => decodeAuthHeader(auth).split(":") match {
+                case auth => decodeAuthHeader(auth).split(":") match {
-                case Array(username, password) if(isWritableUser(username, password, repository)) => {
+                  case Array(username, password) if(isWritableUser(username, password, repository)) => {
-                  request.setAttribute("USER_NAME", username)
+                    request.setAttribute(Keys.Request.UserName, username)
-                  chain.doFilter(req, wrappedResponse)
+                    chain.doFilter(req, wrappedResponse)
+                  }
+                  case _ => requireAuth(response)
                 }
-                case _ => requireAuth(response)
               }
             }
           }
+          case None => {
+            logger.debug(s"Repository ${repositoryOwner}/${repositoryName} is not found.")
+            response.sendError(HttpServletResponse.SC_NOT_FOUND)
+          }
         }
-        case None => response.sendError(HttpServletResponse.SC_NOT_FOUND)
       }
     } catch {
       case ex: Exception => {
@@ -58,12 +61,12 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou
     }
   }
 
-  private def isWritableUser(username: String, password: String, repository: RepositoryService.RepositoryInfo): Boolean = {
+  private def isWritableUser(username: String, password: String, repository: RepositoryService.RepositoryInfo): Boolean =
-    getAccountByUserName(username).map { account =>
+    authenticate(loadSystemSettings(), username, password) match {
-      account.password == sha1(password) && hasWritePermission(repository.owner, repository.name, Some(account))
+      case Some(account) => hasWritePermission(repository.owner, repository.name, Some(account))
-    } getOrElse false
+      case None => false
-  }
+    }
-  
+
   private def requireAuth(response: HttpServletResponse): Unit = {
     response.setHeader("WWW-Authenticate", "BASIC realm=\"GitBucket\"")
     response.sendError(HttpServletResponse.SC_UNAUTHORIZED)

src/main/scala/servlet/GitRepositoryServlet.scala

@@ -8,9 +8,14 @@ import org.slf4j.LoggerFactory
 
 import javax.servlet.ServletConfig
 import javax.servlet.ServletContext
-import javax.servlet.http.HttpServletRequest
+import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
-import util.{JGitUtil, Directory}
+import util.{StringUtil, Keys, JGitUtil, Directory}
+import util.ControlUtil._
+import util.Implicits._
 import service._
+import WebHookService._
+import org.eclipse.jgit.api.Git
+import util.JGitUtil.CommitInfo
 
 /**
  * Provides Git repository via HTTP.
@@ -18,13 +23,13 @@ import service._
  * This servlet provides only Git repository functionality.
  * Authentication is provided by [[servlet.BasicAuthenticationFilter]].
  */
-class GitRepositoryServlet extends GitServlet {
+class GitRepositoryServlet extends GitServlet with SystemSettingsService {
 
   private val logger = LoggerFactory.getLogger(classOf[GitRepositoryServlet])
   
   override def init(config: ServletConfig): Unit = {
     setReceivePackFactory(new GitBucketReceivePackFactory())
-    
+
     // TODO are there any other ways...?
     super.init(new ServletConfig(){
       def getInitParameter(name: String): String = name match {
@@ -33,84 +38,181 @@ class GitRepositoryServlet extends GitServlet {
         case name => config.getInitParameter(name)
       }
       def getInitParameterNames(): java.util.Enumeration[String] = {
-        config.getInitParameterNames
+         config.getInitParameterNames
       }
-      
+
       def getServletContext(): ServletContext = config.getServletContext
       def getServletName(): String = config.getServletName
-    });
+    })
+
+    super.init(config)
+  }
+
+  override def service(req: HttpServletRequest, res: HttpServletResponse): Unit = {
+    val agent = req.getHeader("USER-AGENT")
+    val index = req.getRequestURI.indexOf(".git")
+    if(index >= 0 && (agent == null || agent.toLowerCase.indexOf("git/") < 0)){
+      // redirect for browsers
+      val paths = req.getRequestURI.substring(0, index).split("/")
+      res.sendRedirect(baseUrl(req) + "/" + paths.dropRight(1).last + "/" + paths.last)
+    } else {
+      // response for git client
+      super.service(req, res)
+    }
   }
-  
 }
 
-class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest] {
+class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest] with SystemSettingsService {
   
   private val logger = LoggerFactory.getLogger(classOf[GitBucketReceivePackFactory])
-  
+
   override def create(request: HttpServletRequest, db: Repository): ReceivePack = {
     val receivePack = new ReceivePack(db)
-    val userName = request.getAttribute("USER_NAME").asInstanceOf[String]
+    val pusher = request.getAttribute(Keys.Request.UserName).asInstanceOf[String]
 
     logger.debug("requestURI: " + request.getRequestURI)
-    logger.debug("userName:" + userName)
+    logger.debug("pusher:" + pusher)
 
-    val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
+    defining(request.paths){ paths =>
-    val owner      = paths(2)
+      val owner      = paths(1)
-    val repository = paths(3).replaceFirst("\\.git$", "")
+      val repository = paths(2).replaceFirst("\\.git$", "")
-    
-    logger.debug("repository:" + owner + "/" + repository)
 
-    receivePack.setPostReceiveHook(new CommitLogHook(owner, repository, userName))
+      logger.debug("repository:" + owner + "/" + repository)
-    receivePack
+
+      if(!repository.endsWith(".wiki")){
+        receivePack.setPostReceiveHook(new CommitLogHook(owner, repository, pusher, baseUrl(request)))
+      }
+      receivePack
+    }
   }
 }
 
 import scala.collection.JavaConverters._
 
-class CommitLogHook(owner: String, repository: String, userName: String) extends PostReceiveHook
+class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String) extends PostReceiveHook
-  with RepositoryService with AccountService with IssuesService with ActivityService {
+  with RepositoryService with AccountService with IssuesService with ActivityService with PullRequestService with WebHookService {
   
   private val logger = LoggerFactory.getLogger(classOf[CommitLogHook])
   
   def onPostReceive(receivePack: ReceivePack, commands: java.util.Collection[ReceiveCommand]): Unit = {
-    JGitUtil.withGit(Directory.getRepositoryDir(owner, repository)) { git =>
+    try {
-      commands.asScala.foreach { command =>
+      using(Git.open(Directory.getRepositoryDir(owner, repository))) { git =>
-        val commits = JGitUtil.getCommitLog(git, command.getOldId.name, command.getNewId.name)
+        commands.asScala.foreach { command =>
-        val refName = command.getRefName.split("/")
+          logger.debug(s"commandType: ${command.getType}, refName: ${command.getRefName}")
-        
+          val refName = command.getRefName.split("/")
-        // apply issue comment
+          val branchName = refName.drop(2).mkString("/")
-        val newCommits = commits.flatMap { commit =>
+          val commits = if (refName(1) == "tags") {
-          if(!existsCommitId(owner, repository, commit.id)){
+            Nil
-            insertCommitId(owner, repository, commit.id)
+          } else {
-            "(^|\\W)#(\\d+)(\\W|$)".r.findAllIn(commit.fullMessage).matchData.foreach { matchData =>
+            command.getType match {
-              val issueId = matchData.group(2)
+              case ReceiveCommand.Type.DELETE => Nil
-              if(getAccountByUserName(commit.committer).isDefined && getIssue(owner, repository, issueId).isDefined){
+              case _ => JGitUtil.getCommitLog(git, command.getOldId.name, command.getNewId.name)
-                createComment(owner, repository, commit.committer, issueId.toInt, commit.fullMessage, "commit")
-              }
             }
-            Some(commit)
-          } else None
-        }.toList
-        
-        // record activity
-        if(refName(1) == "heads"){
-          command.getType match {
-            case ReceiveCommand.Type.CREATE => {
-              recordCreateBranchActivity(owner, repository, userName, refName(2))
-              recordPushActivity(owner, repository, userName, refName(2), newCommits)
-            }
-            case ReceiveCommand.Type.UPDATE => recordPushActivity(owner, repository, userName, refName(2), newCommits)
-            case _ =>
           }
-        } else if(refName(1) == "tags"){
+
-          command.getType match {
+          // Extract new commit and apply issue comment
-            case ReceiveCommand.Type.CREATE => recordCreateTagActivity(owner, repository, userName, refName(2), newCommits)
+          val newCommits = if(commits.size > 1000){
+            val existIds = getAllCommitIds(owner, repository)
+            commits.flatMap { commit =>
+              if(!existIds.contains(commit.id)){
+                createIssueComment(commit)
+                Some(commit)
+              } else None
+            }
+          } else {
+            commits.flatMap { commit =>
+              if(!existsCommitId(owner, repository, commit.id)){
+                createIssueComment(commit)
+                Some(commit)
+              } else None
+            }
+          }
+
+          // batch insert all new commit id
+          insertAllCommitIds(owner, repository, newCommits.map(_.id))
+
+          // record activity
+          if(refName(1) == "heads"){
+            command.getType match {
+              case ReceiveCommand.Type.CREATE => recordCreateBranchActivity(owner, repository, pusher, branchName)
+              case ReceiveCommand.Type.UPDATE => recordPushActivity(owner, repository, pusher, branchName, newCommits)
+              case ReceiveCommand.Type.DELETE => recordDeleteBranchActivity(owner, repository, pusher, branchName)
+              case _ =>
+            }
+          } else if(refName(1) == "tags"){
+            command.getType match {
+              case ReceiveCommand.Type.CREATE => recordCreateTagActivity(owner, repository, pusher, branchName, newCommits)
+              case ReceiveCommand.Type.DELETE => recordDeleteTagActivity(owner, repository, pusher, branchName, newCommits)
+              case _ =>
+            }
+          }
+
+          if(refName(1) == "heads"){
+            command.getType match {
+              case ReceiveCommand.Type.CREATE |
+                   ReceiveCommand.Type.UPDATE |
+                   ReceiveCommand.Type.UPDATE_NONFASTFORWARD =>
+                updatePullRequests(branchName)
+              case _ =>
+            }
+          }
+
+          // close issues
+          val defaultBranch = getRepository(owner, repository, baseUrl).get.repository.defaultBranch
+          if(refName(1) == "heads" && branchName == defaultBranch && command.getType == ReceiveCommand.Type.UPDATE){
+            git.log.addRange(command.getOldId, command.getNewId).call.asScala.foreach { commit =>
+              closeIssuesFromMessage(commit.getFullMessage, pusher, owner, repository)
+            }
+          }
+
+          // call web hook
+          getWebHookURLs(owner, repository) match {
+            case webHookURLs if(webHookURLs.nonEmpty) =>
+              for(pusherAccount <- getAccountByUserName(pusher);
+                  ownerAccount   <- getAccountByUserName(owner);
+                  repositoryInfo <- getRepository(owner, repository, baseUrl)){
+                callWebHook(owner, repository, webHookURLs,
+                  WebHookPayload(git, pusherAccount, command.getRefName, repositoryInfo, newCommits, ownerAccount))
+              }
             case _ =>
           }
         }
       }
+      // update repository last modified time.
+      updateLastActivityDate(owner, repository)
+    } catch {
+      case ex: Exception => {
+        logger.error(ex.toString, ex)
+        throw ex
+      }
     }
-    // update repository last modified time.
-    updateLastActivityDate(owner, repository)
   }
+
+  private def createIssueComment(commit: CommitInfo) = {
+    StringUtil.extractIssueId(commit.fullMessage).foreach { issueId =>
+      if(getIssue(owner, repository, issueId).isDefined){
+        getAccountByMailAddress(commit.mailAddress).foreach { account =>
+          createComment(owner, repository, account.userName, issueId.toInt, commit.fullMessage + " " + commit.id, "commit")
+        }
+      }
+    }
+  }
+
+  /**
+   * Fetch pull request contents into refs/pull/${issueId}/head and update pull request table.
+   */
+  private def updatePullRequests(branch: String) =
+    getPullRequestsByRequest(owner, repository, branch, false).foreach { pullreq =>
+      if(getRepository(pullreq.userName, pullreq.repositoryName, baseUrl).isDefined){
+        using(Git.open(Directory.getRepositoryDir(pullreq.userName, pullreq.repositoryName))){ git =>
+          git.fetch
+            .setRemote(Directory.getRepositoryDir(owner, repository).toURI.toString)
+            .setRefSpecs(new RefSpec(s"refs/heads/${branch}:refs/pull/${pullreq.issueId}/head").setForceUpdate(true))
+            .call
+
+          val commitIdTo = git.getRepository.resolve(s"refs/pull/${pullreq.issueId}/head").getName
+          updateCommitIdTo(pullreq.userName, pullreq.repositoryName, pullreq.issueId, commitIdTo)
+        }
+      }
+    }
 }

src/main/scala/servlet/TransactionFilter.scala

@@ -3,7 +3,6 @@ package servlet
 import javax.servlet._
 import org.slf4j.LoggerFactory
 import javax.servlet.http.HttpServletRequest
-import scala.slick.session.Database
 
 /**
  * Controls the transaction with the open session in view pattern.
@@ -21,15 +20,19 @@ class TransactionFilter extends Filter {
       // assets don't need transaction
       chain.doFilter(req, res)
     } else {
-      val context = req.getServletContext
+      Database(req.getServletContext) withTransaction {
-      Database.forURL(context.getInitParameter("db.url"),
+        logger.debug("begin transaction")
-          context.getInitParameter("db.user"),
-          context.getInitParameter("db.password")) withTransaction {
-        logger.debug("TODO begin transaction")
         chain.doFilter(req, res)
-        logger.debug("TODO end transaction")
+        logger.debug("end transaction")
       }
     }
   }
-  
+
-}
+}
+
+object Database {
+  def apply(context: ServletContext): scala.slick.session.Database =
+    scala.slick.session.Database.forURL(context.getInitParameter("db.url"),
+        context.getInitParameter("db.user"),
+        context.getInitParameter("db.password"))
+}

src/main/scala/ssh/GitCommand.scala

@@ -0,0 +1,130 @@
+package ssh
+
+import org.apache.sshd.server.{CommandFactory, Environment, ExitCallback, Command}
+import org.slf4j.LoggerFactory
+import java.io.{InputStream, OutputStream}
+import util.ControlUtil._
+import org.eclipse.jgit.api.Git
+import util.Directory._
+import org.eclipse.jgit.transport.{ReceivePack, UploadPack}
+import org.apache.sshd.server.command.UnknownCommand
+import servlet.{Database, CommitLogHook}
+import service.{AccountService, RepositoryService, SystemSettingsService}
+import org.eclipse.jgit.errors.RepositoryNotFoundException
+import javax.servlet.ServletContext
+
+
+object GitCommand {
+  val CommandRegex = """\Agit-(upload|receive)-pack '/([a-zA-Z0-9\-_.]+)/([a-zA-Z0-9\-_.]+).git'\Z""".r
+}
+
+abstract class GitCommand(val context: ServletContext, val owner: String, val repoName: String) extends Command {
+  self: RepositoryService with AccountService =>
+
+  private val logger = LoggerFactory.getLogger(classOf[GitCommand])
+  protected var err: OutputStream = null
+  protected var in: InputStream = null
+  protected var out: OutputStream = null
+  protected var callback: ExitCallback = null
+
+  protected def runTask(user: String): Unit
+
+  private def newTask(user: String): Runnable = new Runnable {
+    override def run(): Unit = {
+      Database(context) withTransaction {
+        try {
+          runTask(user)
+          callback.onExit(0)
+        } catch {
+          case e: RepositoryNotFoundException =>
+            logger.info(e.getMessage)
+            callback.onExit(1, "Repository Not Found")
+          case e: Throwable =>
+            logger.error(e.getMessage, e)
+            callback.onExit(1)
+        }
+      }
+    }
+  }
+
+  override def start(env: Environment): Unit = {
+    val user = env.getEnv.get("USER")
+    val thread = new Thread(newTask(user))
+    thread.start()
+  }
+
+  override def destroy(): Unit = {}
+
+  override def setExitCallback(callback: ExitCallback): Unit = {
+    this.callback = callback
+  }
+
+  override def setErrorStream(err: OutputStream): Unit = {
+    this.err = err
+  }
+
+  override def setOutputStream(out: OutputStream): Unit = {
+    this.out = out
+  }
+
+  override def setInputStream(in: InputStream): Unit = {
+    this.in = in
+  }
+
+  protected def isWritableUser(username: String, repositoryInfo: RepositoryService.RepositoryInfo): Boolean =
+    getAccountByUserName(username) match {
+      case Some(account) => hasWritePermission(repositoryInfo.owner, repositoryInfo.name, Some(account))
+      case None => false
+    }
+
+}
+
+class GitUploadPack(context: ServletContext, owner: String, repoName: String, baseUrl: String) extends GitCommand(context, owner, repoName)
+    with RepositoryService with AccountService {
+
+  override protected def runTask(user: String): Unit = {
+    getRepository(owner, repoName.replaceFirst("\\.wiki\\Z", ""), baseUrl).foreach { repositoryInfo =>
+      if(!repositoryInfo.repository.isPrivate || isWritableUser(user, repositoryInfo)){
+        using(Git.open(getRepositoryDir(owner, repoName))) { git =>
+          val repository = git.getRepository
+          val upload = new UploadPack(repository)
+          upload.upload(in, out, err)
+        }
+      }
+    }
+  }
+
+}
+
+class GitReceivePack(context: ServletContext, owner: String, repoName: String, baseUrl: String) extends GitCommand(context, owner, repoName)
+    with SystemSettingsService with RepositoryService with AccountService {
+
+  override protected def runTask(user: String): Unit = {
+    getRepository(owner, repoName.replaceFirst("\\.wiki\\Z", ""), baseUrl).foreach { repositoryInfo =>
+      if(isWritableUser(user, repositoryInfo)){
+        using(Git.open(getRepositoryDir(owner, repoName))) { git =>
+          val repository = git.getRepository
+          val receive = new ReceivePack(repository)
+          if(!repoName.endsWith(".wiki")){
+            receive.setPostReceiveHook(new CommitLogHook(owner, repoName, user, baseUrl))
+          }
+          receive.receive(in, out, err)
+        }
+      }
+    }
+  }
+
+}
+
+class GitCommandFactory(context: ServletContext, baseUrl: String) extends CommandFactory {
+  private val logger = LoggerFactory.getLogger(classOf[GitCommandFactory])
+
+  override def createCommand(command: String): Command = {
+    logger.debug(s"command: $command")
+    command match {
+      case GitCommand.CommandRegex("upload", owner, repoName) => new GitUploadPack(context, owner, repoName, baseUrl)
+      case GitCommand.CommandRegex("receive", owner, repoName) => new GitReceivePack(context, owner, repoName, baseUrl)
+      case _ => new UnknownCommand(command)
+    }
+  }
+}

src/main/scala/ssh/NoShell.scala

@@ -0,0 +1,62 @@
+package ssh
+
+import org.apache.sshd.common.Factory
+import org.apache.sshd.server.{Environment, ExitCallback, Command}
+import java.io.{OutputStream, InputStream}
+import org.eclipse.jgit.lib.Constants
+import service.SystemSettingsService
+
+class NoShell extends Factory[Command] with SystemSettingsService {
+  override def create(): Command = new Command() {
+    private var in: InputStream = null
+    private var out: OutputStream = null
+    private var err: OutputStream = null
+    private var callback: ExitCallback = null
+
+    override def start(env: Environment): Unit = {
+      val user = env.getEnv.get("USER")
+      val port = loadSystemSettings().sshPort.getOrElse(SystemSettingsService.DefaultSshPort)
+      val message =
+        """
+          | Welcome to
+          |   _____   _   _     ____                   _             _
+          |  / ____| (_) | |   |  _ \                 | |           | |
+          | | |  __   _  | |_  | |_) |  _   _    ___  | | __   ___  | |_
+          | | | |_ | | | | __| |  _ <  | | | |  / __| | |/ /  / _ \ | __|
+          | | |__| | | | | |_  | |_) | | |_| | | (__  |   <  |  __/ | |_
+          |  \_____| |_|  \__| |____/   \__,_|  \___| |_|\_\  \___|  \__|
+          |
+          | Successfully SSH Access.
+          | But interactive shell is disabled.
+          |
+          | Please use:
+          |
+          | git clone ssh://%s@GITBUCKET_HOST:%d/OWNER/REPOSITORY_NAME.git
+        """.stripMargin.format(user, port).replace("\n", "\r\n") + "\r\n"
+      err.write(Constants.encode(message))
+      err.flush()
+      in.close()
+      out.close()
+      err.close()
+      callback.onExit(127)
+    }
+
+    override def destroy(): Unit = {}
+
+    override def setInputStream(in: InputStream): Unit = {
+      this.in = in
+    }
+
+    override def setOutputStream(out: OutputStream): Unit = {
+      this.out = out
+    }
+
+    override def setErrorStream(err: OutputStream): Unit = {
+      this.err = err
+    }
+
+    override def setExitCallback(callback: ExitCallback): Unit = {
+      this.callback = callback
+    }
+  }
+}

src/main/scala/ssh/PublicKeyAuthenticator.scala

@@ -0,0 +1,23 @@
+package ssh
+
+import org.apache.sshd.server.PublickeyAuthenticator
+import org.apache.sshd.server.session.ServerSession
+import java.security.PublicKey
+import service.SshKeyService
+import servlet.Database
+import javax.servlet.ServletContext
+
+class PublicKeyAuthenticator(context: ServletContext) extends PublickeyAuthenticator with SshKeyService {
+
+  override def authenticate(username: String, key: PublicKey, session: ServerSession): Boolean = {
+    Database(context) withTransaction {
+      getPublicKeys(username).exists { sshKey =>
+        SshUtil.str2PublicKey(sshKey.publicKey) match {
+          case Some(publicKey) => key.equals(publicKey)
+          case _ => false
+        }
+      }
+    }
+  }
+
+}

src/main/scala/ssh/SshServerListener.scala

@@ -0,0 +1,68 @@
+package ssh
+
+import javax.servlet.{ServletContext, ServletContextEvent, ServletContextListener}
+import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider
+import org.slf4j.LoggerFactory
+import util.Directory
+import service.SystemSettingsService
+import java.util.concurrent.atomic.AtomicBoolean
+
+object SshServer {
+  private val logger = LoggerFactory.getLogger(SshServer.getClass)
+  private val server = org.apache.sshd.SshServer.setUpDefaultServer()
+  private val active = new AtomicBoolean(false)
+
+  private def configure(context: ServletContext, port: Int, baseUrl: String) = {
+    server.setPort(port)
+    server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(s"${Directory.GitBucketHome}/gitbucket.ser"))
+    server.setPublickeyAuthenticator(new PublicKeyAuthenticator(context))
+    server.setCommandFactory(new GitCommandFactory(context, baseUrl))
+    server.setShellFactory(new NoShell)
+  }
+
+  def start(context: ServletContext, port: Int, baseUrl: String) = {
+    if(active.compareAndSet(false, true)){
+      configure(context, port, baseUrl)
+      server.start()
+      logger.info(s"Start SSH Server Listen on ${server.getPort}")
+    }
+  }
+
+  def stop() = {
+    if(active.compareAndSet(true, false)){
+      server.stop(true)
+    }
+  }
+
+  def isActive = active.get
+}
+
+/*
+ * Start a SSH Server Daemon
+ *
+ * How to use:
+ * git clone ssh://username@host_or_ip:29418/owner/repository_name.git
+ */
+class SshServerListener extends ServletContextListener with SystemSettingsService {
+
+  override def contextInitialized(sce: ServletContextEvent): Unit = {
+    val settings = loadSystemSettings()
+    if(settings.ssh){
+      if(settings.baseUrl.isEmpty){
+        // TODO use logger?
+        println("Could not start SshServer because the baseUrl is not configured.")
+      } else {
+        SshServer.start(sce.getServletContext,
+          settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort),
+          settings.baseUrl.get)
+      }
+    }
+  }
+
+  override def contextDestroyed(sce: ServletContextEvent): Unit = {
+    if(loadSystemSettings().ssh){
+      SshServer.stop()
+    }
+  }
+
+}

src/main/scala/ssh/SshUtil.scala

@@ -0,0 +1,33 @@
+package ssh
+
+import java.security.PublicKey
+import org.slf4j.LoggerFactory
+import org.apache.commons.codec.binary.Base64
+import org.eclipse.jgit.lib.Constants
+import org.apache.sshd.common.util.{KeyUtils, Buffer}
+
+object SshUtil {
+
+  private val logger = LoggerFactory.getLogger(SshUtil.getClass)
+
+  def str2PublicKey(key: String): Option[PublicKey] = {
+    // TODO RFC 4716 Public Key is not supported...
+    val parts = key.split(" ")
+    if (parts.size < 2) {
+      logger.debug(s"Invalid PublicKey Format: key")
+      return None
+    }
+    try {
+      val encodedKey = parts(1)
+      val decode = Base64.decodeBase64(Constants.encodeASCII(encodedKey))
+      Some(new Buffer(decode).getRawPublicKey)
+    } catch {
+      case e: Throwable =>
+        logger.debug(e.getMessage, e)
+        None
+    }
+  }
+
+  def fingerPrint(key: String): String = KeyUtils.getFingerPrint(str2PublicKey(key).get)
+
+}

src/main/scala/util/Authenticator.scala

@@ -3,6 +3,8 @@ package util
 import app.ControllerBase
 import service._
 import RepositoryService.RepositoryInfo
+import util.Implicits._
+import util.ControlUtil._
 
 /**
  * Allows only oneself and administrators.
@@ -13,11 +15,12 @@ trait OneselfAuthenticator { self: ControllerBase =>
 
   private def authenticate(action: => Any) = {
     {
-      val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
+      defining(request.paths){ paths =>
-      context.loginAccount match {
+        context.loginAccount match {
-        case Some(x) if(x.isAdmin) => action
+          case Some(x) if(x.isAdmin) => action
-        case Some(x) if(paths(1) == x.userName) => action
+          case Some(x) if(paths(0) == x.userName) => action
-        case _ => Unauthorized()
+          case _ => Unauthorized()
+        }
       }
     }
   }
@@ -26,20 +29,24 @@ trait OneselfAuthenticator { self: ControllerBase =>
 /**
  * Allows only the repository owner and administrators.
  */
-trait OwnerAuthenticator { self: ControllerBase with RepositoryService =>
+trait OwnerAuthenticator { self: ControllerBase with RepositoryService with AccountService =>
   protected def ownerOnly(action: (RepositoryInfo) => Any) = { authenticate(action) }
   protected def ownerOnly[T](action: (T, RepositoryInfo) => Any) = (form: T) => { authenticate(action(form, _)) }
 
   private def authenticate(action: (RepositoryInfo) => Any) = {
     {
-      val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
+      defining(request.paths){ paths =>
-      getRepository(paths(1), paths(2), baseUrl).map { repository =>
+        getRepository(paths(0), paths(1), baseUrl).map { repository =>
-        context.loginAccount match {
+          context.loginAccount match {
-          case Some(x) if(x.isAdmin) => action(repository)
+            case Some(x) if(x.isAdmin) => action(repository)
-          case Some(x) if(repository.owner == x.userName) => action(repository)
+            case Some(x) if(repository.owner == x.userName) => action(repository)
-          case _ => Unauthorized()
+            case Some(x) if(getGroupMembers(repository.owner).exists { member =>
-        }
+              member.userName == x.userName && member.isManager == true
-      } getOrElse NotFound()
+            }) => action(repository)
+            case _ => Unauthorized()
+          }
+        } getOrElse NotFound()
+      }
     }
   }
 }
@@ -87,21 +94,22 @@ trait CollaboratorsAuthenticator { self: ControllerBase with RepositoryService =
 
   private def authenticate(action: (RepositoryInfo) => Any) = {
     {
-      val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
+      defining(request.paths){ paths =>
-      getRepository(paths(1), paths(2), baseUrl).map { repository =>
+        getRepository(paths(0), paths(1), baseUrl).map { repository =>
-        context.loginAccount match {
+          context.loginAccount match {
-          case Some(x) if(x.isAdmin) => action(repository)
+            case Some(x) if(x.isAdmin) => action(repository)
-          case Some(x) if(paths(1) == x.userName) => action(repository)
+            case Some(x) if(paths(0) == x.userName) => action(repository)
-          case Some(x) if(getCollaborators(paths(1), paths(2)).contains(x.userName)) => action(repository)
+            case Some(x) if(getCollaborators(paths(0), paths(1)).contains(x.userName)) => action(repository)
-          case _ => Unauthorized()
+            case _ => Unauthorized()
-        }
+          }
-      } getOrElse NotFound()
+        } getOrElse NotFound()
+      }
     }
   }
 }
 
 /**
- * Allows only the repository owner and administrators.
+ * Allows only the repository owner (or manager for group repository) and administrators.
  */
 trait ReferrerAuthenticator { self: ControllerBase with RepositoryService =>
   protected def referrersOnly(action: (RepositoryInfo) => Any) = { authenticate(action) }
@@ -109,19 +117,20 @@ trait ReferrerAuthenticator { self: ControllerBase with RepositoryService =>
 
   private def authenticate(action: (RepositoryInfo) => Any) = {
     {
-      val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
+      defining(request.paths){ paths =>
-      getRepository(paths(1), paths(2), baseUrl).map { repository =>
+        getRepository(paths(0), paths(1), baseUrl).map { repository =>
-        if(!repository.repository.isPrivate){
+          if(!repository.repository.isPrivate){
-          action(repository)
+            action(repository)
-        } else {
+          } else {
-          context.loginAccount match {
+            context.loginAccount match {
-            case Some(x) if(x.isAdmin) => action(repository)
+              case Some(x) if(x.isAdmin) => action(repository)
-            case Some(x) if(paths(1) == x.userName) => action(repository)
+              case Some(x) if(paths(0) == x.userName) => action(repository)
-            case Some(x) if(getCollaborators(paths(1), paths(2)).contains(x.userName)) => action(repository)
+              case Some(x) if(getCollaborators(paths(0), paths(1)).contains(x.userName)) => action(repository)
-            case _ => Unauthorized()
+              case _ => Unauthorized()
+            }
           }
-        }
+        } getOrElse NotFound()
-      } getOrElse NotFound()
+      }
     }
   }
 }
@@ -135,16 +144,38 @@ trait ReadableUsersAuthenticator { self: ControllerBase with RepositoryService =
 
   private def authenticate(action: (RepositoryInfo) => Any) = {
     {
-      val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
+      defining(request.paths){ paths =>
-      getRepository(paths(1), paths(2), baseUrl).map { repository =>
+        getRepository(paths(0), paths(1), baseUrl).map { repository =>
-        context.loginAccount match {
+          context.loginAccount match {
-          case Some(x) if(x.isAdmin) => action(repository)
+            case Some(x) if(x.isAdmin) => action(repository)
-          case Some(x) if(!repository.repository.isPrivate) => action(repository)
+            case Some(x) if(!repository.repository.isPrivate) => action(repository)
-          case Some(x) if(paths(1) == x.userName) => action(repository)
+            case Some(x) if(paths(0) == x.userName) => action(repository)
-          case Some(x) if(getCollaborators(paths(1), paths(2)).contains(x.userName)) => action(repository)
+            case Some(x) if(getCollaborators(paths(0), paths(1)).contains(x.userName)) => action(repository)
-          case _ => Unauthorized()
+            case _ => Unauthorized()
-        }
+          }
-      } getOrElse NotFound()
+        } getOrElse NotFound()
+      }
+    }
+  }
+}
+
+/**
+ * Allows only the group managers.
+ */
+trait GroupManagerAuthenticator { self: ControllerBase with AccountService =>
+  protected def managersOnly(action: => Any) = { authenticate(action) }
+  protected def managersOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) }
+
+  private def authenticate(action: => Any) = {
+    {
+      defining(request.paths){ paths =>
+        context.loginAccount match {
+          case Some(x) if(getGroupMembers(paths(0)).exists { member =>
+            member.userName == x.userName && member.isManager
+          }) => action
+          case _ => Unauthorized()
+        }
+      }
     }
   }
 }

src/main/scala/util/ControlUtil.scala

@@ -0,0 +1,51 @@
+package util
+
+import org.eclipse.jgit.api.Git
+import org.eclipse.jgit.revwalk.RevWalk
+import org.eclipse.jgit.treewalk.TreeWalk
+import scala.util.control.Exception._
+import scala.language.reflectiveCalls
+
+/**
+ * Provides control facilities.
+ */
+object ControlUtil {
+
+  def defining[A, B](value: A)(f: A => B): B = f(value)
+
+  def using[A <% { def close(): Unit }, B](resource: A)(f: A => B): B =
+    try f(resource) finally {
+      if(resource != null){
+        ignoring(classOf[Throwable]) {
+          resource.close()
+        }
+      }
+    }
+
+  def using[T](git: Git)(f: Git => T): T =
+    try f(git) finally git.getRepository.close()
+
+  def using[T](git1: Git, git2: Git)(f: (Git, Git) => T): T =
+    try f(git1, git2) finally {
+      git1.getRepository.close()
+      git2.getRepository.close()
+    }
+
+  def using[T](revWalk: RevWalk)(f: RevWalk => T): T =
+    try f(revWalk) finally revWalk.release()
+
+  def using[T](treeWalk: TreeWalk)(f: TreeWalk => T): T =
+    try f(treeWalk) finally treeWalk.release()
+
+
+//  def withTmpRefSpec[T](ref: RefSpec, git: Git)(f: RefSpec => T): T = {
+//    try {
+//      f(ref)
+//    } finally {
+//      val refUpdate = git.getRepository.updateRef(ref.getDestination)
+//      refUpdate.setForceUpdate(true)
+//      refUpdate.delete()
+//    }
+//  }
+
+}

src/main/scala/util/Directory.scala

@@ -1,32 +1,53 @@
 package util
 
 import java.io.File
+import util.ControlUtil._
+import org.apache.commons.io.FileUtils
 
 /**
  * Provides directories used by GitBucket.
  */
 object Directory {
 
-  val GitBucketHome = new File(System.getProperty("user.home"), "gitbucket").getAbsolutePath
+  val GitBucketHome = (System.getProperty("gitbucket.home") match {
+    // -Dgitbucket.home=<path>
+    case path if(path != null) => new File(path)
+    case _ => scala.util.Properties.envOrNone("GITBUCKET_HOME") match {
+      // environment variable GITBUCKET_HOME
+      case Some(env) => new File(env)
+      // default is HOME/.gitbucket
+      case None => {
+        val oldHome = new File(System.getProperty("user.home"), "gitbucket")
+        if(oldHome.exists && oldHome.isDirectory && new File(oldHome, "version").exists){
+          //FileUtils.moveDirectory(oldHome, newHome)
+          oldHome
+        } else {
+          new File(System.getProperty("user.home"), ".gitbucket")
+        }
+      }
+    }
+  }).getAbsolutePath
 
   val GitBucketConf = new File(GitBucketHome, "gitbucket.conf")
   
   val RepositoryHome = s"${GitBucketHome}/repositories"
+
+  val DatabaseHome = s"${GitBucketHome}/data"
   
   /**
    * Repository names of the specified user.
    */
-  def getRepositories(owner: String): List[String] = {
+  def getRepositories(owner: String): List[String] =
-    val dir = new File(s"${RepositoryHome}/${owner}")
+    defining(new File(s"${RepositoryHome}/${owner}")){ dir =>
-    if(dir.exists){
+      if(dir.exists){
-      dir.listFiles.filter { file =>
+        dir.listFiles.filter { file =>
-        file.isDirectory && !file.getName.endsWith(".wiki.git") 
+          file.isDirectory && !file.getName.endsWith(".wiki.git")
-      }.map(_.getName.replaceFirst("\\.git$", "")).toList
+        }.map(_.getName.replaceFirst("\\.git$", "")).toList
-    } else {
+      } else {
-      Nil
+        Nil
+      }
     }
-  }
+
-  
   /**
    * Substance directory of the repository.
    */
@@ -50,25 +71,10 @@ object Directory {
   def getDownloadWorkDir(owner: String, repository: String, sessionId: String): File = 
     new File(getTemporaryDir(owner, repository), s"download/${sessionId}")
   
-  /**
-   * Temporary directory which is used in the repository creation.
-   *
-   * GitBucket generates initial repository contents in this directory and push them.
-   * This directory is removed after the repository creation.
-   */
-  def getInitRepositoryDir(owner: String, repository: String): File =
-    new File(getTemporaryDir(owner, repository), "init")
-  
   /**
    * Substance directory of the wiki repository.
    */
   def getWikiRepositoryDir(owner: String, repository: String): File =
     new File(s"${RepositoryHome}/${owner}/${repository}.wiki.git")
-  
-  /**
-   * Wiki working directory which is cloned from the wiki repository.
-   */
-  def getWikiWorkDir(owner: String, repository: String): File =
-    new File(getTemporaryDir(owner, repository), "wiki")
 
 }

src/main/scala/util/FileUtil.scala

@@ -1,56 +1,72 @@
 package util
 
-import org.apache.commons.io.{IOUtils, FileUtils}
+import org.apache.commons.io.FileUtils
 import java.net.URLConnection
 import java.io.File
-import org.apache.commons.compress.archivers.zip.{ZipArchiveEntry, ZipArchiveOutputStream}
+import util.ControlUtil._
 
 object FileUtil {
   
-  def getMimeType(name: String): String = {
+  def getMimeType(name: String): String =
-    val fileNameMap = URLConnection.getFileNameMap()
+    defining(URLConnection.getFileNameMap()){ fileNameMap =>
-    val mimeType = fileNameMap.getContentTypeFor(name)
+      fileNameMap.getContentTypeFor(name) match {
-    if(mimeType == null){
+        case null     => "application/octet-stream"
-      "application/octeat-stream"
+        case mimeType => mimeType
-    } else {
+      }
-      mimeType
+    }
+
+  def getContentType(name: String, bytes: Array[Byte]): String = {
+    defining(getMimeType(name)){ mimeType =>
+      if(mimeType == "application/octet-stream" && isText(bytes)){
+        "text/plain"
+      } else {
+        mimeType
+      }
     }
   }
-  
+
   def isImage(name: String): Boolean = getMimeType(name).startsWith("image/")
   
   def isLarge(size: Long): Boolean = (size > 1024 * 1000)
   
   def isText(content: Array[Byte]): Boolean = !content.contains(0)
 
-  def createZipFile(dest: File, dir: File): Unit = {
+//  def createZipFile(dest: File, dir: File): Unit = {
-    def addDirectoryToZip(out: ZipArchiveOutputStream, dir: File, path: String): Unit = {
+//    def addDirectoryToZip(out: ZipArchiveOutputStream, dir: File, path: String): Unit = {
-      dir.listFiles.map { file =>
+//      dir.listFiles.map { file =>
-        if(file.isFile){
+//        if(file.isFile){
-          out.putArchiveEntry(new ZipArchiveEntry(path + "/" + file.getName))
+//          out.putArchiveEntry(new ZipArchiveEntry(path + "/" + file.getName))
-          out.write(FileUtils.readFileToByteArray(file))
+//          out.write(FileUtils.readFileToByteArray(file))
-          out.closeArchiveEntry
+//          out.closeArchiveEntry
-        } else if(file.isDirectory){
+//        } else if(file.isDirectory){
-          addDirectoryToZip(out, file, path + "/" + file.getName)
+//          addDirectoryToZip(out, file, path + "/" + file.getName)
-        }
+//        }
-      }
+//      }
+//    }
+//
+//    using(new ZipArchiveOutputStream(dest)){ out =>
+//      addDirectoryToZip(out, dir, dir.getName)
+//    }
+//  }
+
+  def getFileName(path: String): String = defining(path.lastIndexOf('/')){ i =>
+    if(i >= 0) path.substring(i + 1) else path
+  }
+
+  def getExtension(name: String): String =
+    name.lastIndexOf('.') match {
+      case i if(i >= 0) => name.substring(i + 1)
+      case _ => ""
     }
 
-    val out = new ZipArchiveOutputStream(dest)
+  def withTmpDir[A](dir: File)(action: File => A): A = {
+    if(dir.exists()){
+      FileUtils.deleteDirectory(dir)
+    }
     try {
-      addDirectoryToZip(out, dir, dir.getName)
+      action(dir)
     } finally {
-      IOUtils.closeQuietly(out)
+      FileUtils.deleteDirectory(dir)
     }
   }
-
+}
-  def getExtension(name: String): String = {
-    val index = name.lastIndexOf('.')
-    if(index >= 0){
-      name.substring(index + 1)
-    } else {
-      ""
-    }
-  }
-
-}

src/main/scala/util/Implicits.scala

@@ -1,6 +1,8 @@
 package util
 
 import scala.util.matching.Regex
+import scala.util.control.Exception._
+import javax.servlet.http.{HttpSession, HttpServletRequest}
 
 /**
  * Provides some usable implicit conversions.
@@ -12,7 +14,7 @@ object Implicits {
     def splitWith(condition: (A, A) => Boolean): Seq[Seq[A]] = split(seq)(condition)
 
     @scala.annotation.tailrec
-    private def split[A](list: Seq[A], result: Seq[Seq[A]] = Nil)(condition: (A, A) => Boolean): Seq[Seq[A]] = {
+    private def split[A](list: Seq[A], result: Seq[Seq[A]] = Nil)(condition: (A, A) => Boolean): Seq[Seq[A]] =
       list match {
         case x :: xs => {
           xs.span(condition(x, _)) match {
@@ -21,7 +23,6 @@ object Implicits {
         }
         case Nil => result
       }
-    }
   }
 
   implicit class RichString(value: String){
@@ -41,6 +42,36 @@ object Implicits {
       }
       sb.toString
     }
+
+    def toIntOpt: Option[Int] = catching(classOf[NumberFormatException]) opt {
+      Integer.parseInt(value)
+    }
   }
 
-}
+  implicit class RichRequest(request: HttpServletRequest){
+
+    def paths: Array[String] = request.getRequestURI.substring(request.getContextPath.length + 1).split("/")
+
+    def hasQueryString: Boolean = request.getQueryString != null
+
+    def hasAttribute(name: String): Boolean = request.getAttribute(name) != null
+
+  }
+
+  implicit class RichSession(session: HttpSession){
+
+    def putAndGet[T](key: String, value: T): T = {
+      session.setAttribute(key, value)
+      value
+    }
+
+    def getAndRemove[T](key: String): Option[T] = {
+      val value = session.getAttribute(key).asInstanceOf[T]
+      if(value == null){
+        session.removeAttribute(key)
+      }
+      Option(value)
+    }
+  }
+
+}

src/main/scala/util/JGitUtil.scala

@@ -2,25 +2,29 @@ package util
 
 import org.eclipse.jgit.api.Git
 import util.Directory._
+import util.StringUtil._
+import util.ControlUtil._
 import scala.collection.JavaConverters._
-import javax.servlet.ServletContext
 import org.eclipse.jgit.lib._
 import org.eclipse.jgit.revwalk._
 import org.eclipse.jgit.revwalk.filter._
 import org.eclipse.jgit.treewalk._
 import org.eclipse.jgit.treewalk.filter._
-import org.eclipse.jgit.diff._
 import org.eclipse.jgit.diff.DiffEntry.ChangeType
-import org.eclipse.jgit.util.io.DisabledOutputStream
+import org.eclipse.jgit.errors.{ConfigInvalidException, MissingObjectException}
-import org.eclipse.jgit.errors.MissingObjectException
 import java.util.Date
 import org.eclipse.jgit.api.errors.NoHeadException
+import service.RepositoryService
+import org.eclipse.jgit.dircache.DirCacheEntry
+import org.slf4j.LoggerFactory
 
 /**
  * Provides complex JGit operations.
  */
 object JGitUtil {
 
+  private val logger = LoggerFactory.getLogger(JGitUtil.getClass)
+
   /**
    * The repository data.
    *
@@ -43,8 +47,11 @@ object JGitUtil {
    * @param message the last commit message
    * @param commitId the last commit id
    * @param committer the last committer name
+   * @param mailAddress the committer's mail address
+   * @param linkUrl the url of submodule
    */
-  case class FileInfo(id: ObjectId, isDirectory: Boolean, name: String, time: Date, message: String, commitId: String, committer: String)
+  case class FileInfo(id: ObjectId, isDirectory: Boolean, name: String, time: Date, message: String, commitId: String,
+                      committer: String, mailAddress: String, linkUrl: Option[String])
 
   /**
    * The commit data.
@@ -69,29 +76,13 @@ object JGitUtil {
         rev.getFullMessage,
         rev.getParents().map(_.name).toList)
 
-    val summary = {
+    val summary = getSummaryMessage(fullMessage, shortMessage)
-      val i = fullMessage.trim.indexOf("\n")
-      val firstLine = if(i >= 0){
-        fullMessage.trim.substring(0, i).trim
-      } else {
-        fullMessage
-      }
-      if(firstLine.length > shortMessage.length){
-        shortMessage
-      } else {
-        firstLine
-      }
-    }
 
-    val description = {
+    val description = defining(fullMessage.trim.indexOf("\n")){ i =>
-      val i = fullMessage.trim.indexOf("\n")
       if(i >= 0){
         Some(fullMessage.trim.substring(i).trim)
-      } else {
+      } else None
-        None
-      }
     }
-
   }
 
   case class DiffInfo(changeType: ChangeType, oldPath: String, newPath: String, oldContent: Option[String], newContent: Option[String])
@@ -114,33 +105,27 @@ object JGitUtil {
   case class TagInfo(name: String, time: Date, id: String)
 
   /**
-   * Use this method to use the Git object.
+   * The submodule data
-   * Repository resources are released certainly after processing.
+   *
+   * @param name the module name
+   * @param path the path in the repository
+   * @param url the repository url of this module
    */
-  def withGit[T](dir: java.io.File)(f: Git => T): T = withGit(Git.open(dir))(f)
+  case class SubmoduleInfo(name: String, path: String, url: String)
-  
+
   /**
-   * Use this method to use the Git object.
+   * Returns RevCommit from the commit or tag id.
-   * Repository resources are released certainly after processing.
-   */
-  def withGit[T](git: Git)(f: Git => T): T = {
-    try {
-      f(git)
-    } finally {
-      git.getRepository.close
-    }
-  }
-  
-  /**
-   * Returns RevCommit from the commit id.
    * 
    * @param git the Git object
-   * @param commitId the ObjectId of the commit
+   * @param objectId the ObjectId of the commit or tag
-   * @return the RevCommit for the specified commit
+   * @return the RevCommit for the specified commit or tag
    */
-  def getRevCommitFromId(git: Git, commitId: ObjectId): RevCommit = {
+  def getRevCommitFromId(git: Git, objectId: ObjectId): RevCommit = {
     val revWalk = new RevWalk(git.getRepository)
-    val revCommit = revWalk.parseCommit(commitId)
+    val revCommit = revWalk.parseAny(objectId) match {
+      case r: RevTag => revWalk.parseCommit(r.getObject)
+      case _         => revWalk.parseCommit(objectId)
+    }
     revWalk.dispose
     revCommit
   }
@@ -149,15 +134,10 @@ object JGitUtil {
    * Returns the repository information. It contains branch names and tag names.
    */
   def getRepositoryInfo(owner: String, repository: String, baseUrl: String): RepositoryInfo = {
-    withGit(getRepositoryDir(owner, repository)){ git =>
+    using(Git.open(getRepositoryDir(owner, repository))){ git =>
       try {
         // get commit count
-        val i = git.log.all.call.iterator
+        val commitCount = git.log.all.call.iterator.asScala.map(_ => 1).take(10000).sum
-        var commitCount = 0
-        while(i.hasNext && commitCount <= 1000){
-          i.next
-          commitCount = commitCount + 1
-        }
 
         RepositoryInfo(
           owner, repository, s"${baseUrl}/git/${owner}/${repository}.git",
@@ -181,7 +161,7 @@ object JGitUtil {
       }
     }
   }
-  
+
   /**
    * Returns the file list of the specified path.
    * 
@@ -191,56 +171,63 @@ object JGitUtil {
    * @return HTML of the file list
    */
   def getFileList(git: Git, revision: String, path: String = "."): List[FileInfo] = {
-    val revWalk = new RevWalk(git.getRepository)
+    val list = new scala.collection.mutable.ListBuffer[(ObjectId, FileMode, String, String, Option[String])]
-    val objectId = git.getRepository.resolve(revision)
-    val revCommit = revWalk.parseCommit(objectId)
-      
-    val treeWalk = new TreeWalk(git.getRepository)
-    treeWalk.addTree(revCommit.getTree)
-    if(path != "."){
-      treeWalk.setRecursive(true)
-      treeWalk.setFilter(new TreeFilter(){
 
-        var stopRecursive = false
+    using(new RevWalk(git.getRepository)){ revWalk =>
+      val objectId  = git.getRepository.resolve(revision)
+      val revCommit = revWalk.parseCommit(objectId)
 
-        def include(walker: TreeWalk): Boolean = {
+      using(new TreeWalk(git.getRepository)){ treeWalk =>
-          val targetPath = walker.getPathString
+        treeWalk.addTree(revCommit.getTree)
-          if((path + "/").startsWith(targetPath)){
+        if(path != "."){
-            true
+          treeWalk.setRecursive(true)
-          } else if(targetPath.startsWith(path + "/") && targetPath.substring(path.length + 1).indexOf("/") < 0){
+          treeWalk.setFilter(new TreeFilter(){
-            stopRecursive = true
+
-            treeWalk.setRecursive(false)
+            var stopRecursive = false
-            true
+
-          } else {
+            def include(walker: TreeWalk): Boolean = {
-            false
+              val targetPath = walker.getPathString
-          }
+              if((path + "/").startsWith(targetPath)){
+                true
+              } else if(targetPath.startsWith(path + "/") && targetPath.substring(path.length + 1).indexOf("/") < 0){
+                stopRecursive = true
+                treeWalk.setRecursive(false)
+                true
+              } else {
+                false
+              }
+            }
+
+            def shouldBeRecursive(): Boolean = !stopRecursive
+
+            override def clone: TreeFilter = return this
+          })
         }
+        while (treeWalk.next()) {
+          // submodule
+          val linkUrl = if(treeWalk.getFileMode(0) == FileMode.GITLINK){
+            getSubmodules(git, revCommit.getTree).find(_.path == treeWalk.getPathString).map(_.url)
+          } else None
 
-        def shouldBeRecursive(): Boolean = !stopRecursive
+          list.append((treeWalk.getObjectId(0), treeWalk.getFileMode(0), treeWalk.getPathString, treeWalk.getNameString, linkUrl))
-
+        }
-        override def clone: TreeFilter = return this
+      }
-      })
     }
-      
-    val list = new scala.collection.mutable.ListBuffer[(ObjectId, FileMode, String, String)]
-    
-    while (treeWalk.next()) {
-      list.append((treeWalk.getObjectId(0), treeWalk.getFileMode(0), treeWalk.getPathString, treeWalk.getNameString))
-    }
-    
-    treeWalk.release
-    revWalk.dispose
 
     val commits = getLatestCommitFromPaths(git, list.toList.map(_._3), revision)
-    list.map { case (objectId, fileMode, path, name) =>
+    list.map { case (objectId, fileMode, path, name, linkUrl) =>
-      FileInfo(
+      defining(commits(path)){ commit =>
-        objectId,
+        FileInfo(
-        fileMode == FileMode.TREE,
+          objectId,
-        name,
+          fileMode == FileMode.TREE || fileMode == FileMode.GITLINK,
-        commits(path).getCommitterIdent.getWhen,
+          name,
-        commits(path).getShortMessage,
+          commit.getCommitterIdent.getWhen,
-        commits(path).getName,
+          getSummaryMessage(commit.getFullMessage, commit.getShortMessage),
-        commits(path).getCommitterIdent.getName)
+          commit.getName,
+          commit.getCommitterIdent.getName,
+          commit.getCommitterIdent.getEmailAddress,
+          linkUrl)
+      }
     }.sortWith { (file1, file2) =>
       (file1.isDirectory, file2.isDirectory) match {
         case (true , false) => true
@@ -249,7 +236,18 @@ object JGitUtil {
       }
     }.toList
   }
-  
+
+  /**
+   * Returns the first line of the commit message.
+   */
+  private def getSummaryMessage(fullMessage: String, shortMessage: String): String = {
+    defining(fullMessage.trim.indexOf("\n")){ i =>
+      defining(if(i >= 0) fullMessage.trim.substring(0, i).trim else fullMessage){ firstLine =>
+        if(firstLine.length > shortMessage.length) shortMessage else firstLine
+      }
+    }
+  }
+
   /**
    * Returns the commit list of the specified branch.
    * 
@@ -258,7 +256,7 @@ object JGitUtil {
    * @param page the page number (1-)
    * @param limit the number of commit info per page. 0 (default) means unlimited.
    * @param path filters by this path. default is no filter.
-   * @return a tuple of the commit list and whether has next
+   * @return a tuple of the commit list and whether has next, or the error message
    */
   def getCommitLog(git: Git, revision: String, page: Int = 1, limit: Int = 0, path: String = ""): Either[String, (List[CommitInfo], Boolean)] = {
     val fixedPage = if(page <= 0) 1 else page
@@ -273,27 +271,48 @@ object JGitUtil {
         case _ => (logs, i.hasNext)
       }
     
-    val revWalk = new RevWalk(git.getRepository)
+    using(new RevWalk(git.getRepository)){ revWalk =>
-    val objectId = git.getRepository.resolve(revision)
+      defining(git.getRepository.resolve(revision)){ objectId =>
-    if(objectId == null){
+        if(objectId == null){
-      Left(s"${revision} can't be resolved.")
+          Left(s"${revision} can't be resolved.")
-    } else {
+        } else {
-      revWalk.markStart(revWalk.parseCommit(objectId))
+          revWalk.markStart(revWalk.parseCommit(objectId))
-      if(path.nonEmpty){
+          if(path.nonEmpty){
-        revWalk.setRevFilter(new RevFilter(){
+            revWalk.setRevFilter(new RevFilter(){
-          def include(walk: RevWalk, commit: RevCommit): Boolean = {
+              def include(walk: RevWalk, commit: RevCommit): Boolean = {
-            getDiffs(git, commit.getName, false).find(_.newPath == path).nonEmpty
+                getDiffs(git, commit.getName, false)._1.find(_.newPath == path).nonEmpty
+              }
+              override def clone(): RevFilter = this
+            })
           }
-          override def clone(): RevFilter = this
+          Right(getCommitLog(revWalk.iterator, 0, Nil))
-        })
+        }
       }
-
-      val commits = getCommitLog(revWalk.iterator, 0, Nil)
-      revWalk.release
-
-      Right(commits)
     }
   }
+
+  def getCommitLogs(git: Git, begin: String, includesLastCommit: Boolean = false)
+                   (endCondition: RevCommit => Boolean): List[CommitInfo] = {
+    @scala.annotation.tailrec
+    def getCommitLog(i: java.util.Iterator[RevCommit], logs: List[CommitInfo]): List[CommitInfo] =
+      i.hasNext match {
+        case true  => {
+          val revCommit = i.next
+          if(endCondition(revCommit)){
+            if(includesLastCommit) logs :+ new CommitInfo(revCommit) else logs
+          } else {
+            getCommitLog(i, logs :+ new CommitInfo(revCommit))
+          }
+        }
+        case false => logs
+      }
+
+    using(new RevWalk(git.getRepository)){ revWalk =>
+      revWalk.markStart(revWalk.parseCommit(git.getRepository.resolve(begin)))
+      getCommitLog(revWalk.iterator, Nil).reverse
+    }
+  }
+
   
   /**
    * Returns the commit list between two revisions.
@@ -303,30 +322,9 @@ object JGitUtil {
    * @param to the to revision
    * @return the commit list
    */
-  def getCommitLog(git: Git, from: String, to: String): List[CommitInfo] = {
+  // TODO swap parameters 'from' and 'to'!?
-    @scala.annotation.tailrec
+  def getCommitLog(git: Git, from: String, to: String): List[CommitInfo] =
-    def getCommitLog(i: java.util.Iterator[RevCommit], logs: List[CommitInfo]): List[CommitInfo] =
+    getCommitLogs(git, to)(_.getName == from)
-      i.hasNext match {
-        case true  => {
-          val revCommit = i.next
-          if(revCommit.name == from){
-            logs 
-          } else {
-            getCommitLog(i, logs :+ new CommitInfo(revCommit))
-          }
-        }
-        case false => logs
-      }
-    
-    val revWalk = new RevWalk(git.getRepository)
-    revWalk.markStart(revWalk.parseCommit(git.getRepository.resolve(to)))
-    
-    val commits = getCommitLog(revWalk.iterator, Nil)
-    revWalk.release
-    
-    commits.reverse
-  }
-  
   
   /**
    * Returns the latest RevCommit of the specified path.
@@ -348,7 +346,7 @@ object JGitUtil {
    * @return the list of latest commit
    */
   def getLatestCommitFromPaths(git: Git, paths: List[String], revision: String): Map[String, RevCommit] = {
-    val start = git.getRepository.resolve(revision)
+    val start = getRevCommitFromId(git, git.getRepository.resolve(revision))
     paths.map { path =>
       val commit = git.log.add(start).addPath(path).setMaxCount(1).call.iterator.next
       (path, commit)
@@ -356,140 +354,220 @@ object JGitUtil {
   }
 
   /**
-   * Get object content of the given id as String from the Git repository.
+   * Returns the tuple of diff of the given commit and the previous commit id.
-   * 
-   * @param git the Git object
-   * @param id the object id
-   * @param large if false then returns None for the large file
-   * @return the object or None if object does not exist
    */
-  def getContent(git: Git, id: ObjectId, large: Boolean): Option[Array[Byte]] = try {
+  def getDiffs(git: Git, id: String, fetchContent: Boolean = true): (List[DiffInfo], Option[String]) = {
-    val loader = git.getRepository.getObjectDatabase.open(id)
-    if(large == false && FileUtil.isLarge(loader.getSize)){
-      None
-    } else {
-      val db = git.getRepository.getObjectDatabase
-      try {
-        Some(db.open(id).getBytes)
-      } finally {
-        db.close
-      }
-    }
-  } catch {
-    case e: MissingObjectException => None
-  }
-  
-  def getDiffs(git: Git, id: String, fetchContent: Boolean = true): List[DiffInfo] = {
     @scala.annotation.tailrec
     def getCommitLog(i: java.util.Iterator[RevCommit], logs: List[RevCommit]): List[RevCommit] =
       i.hasNext match {
         case true if(logs.size < 2) => getCommitLog(i, logs :+ i.next)
         case _ => logs
       }
-    
+
-    val revWalk = new RevWalk(git.getRepository)
+    using(new RevWalk(git.getRepository)){ revWalk =>
-    revWalk.markStart(revWalk.parseCommit(git.getRepository.resolve(id)))
+      revWalk.markStart(revWalk.parseCommit(git.getRepository.resolve(id)))
-    
+      val commits   = getCommitLog(revWalk.iterator, Nil)
-    val commits = getCommitLog(revWalk.iterator, Nil)
+      val revCommit = commits(0)
-    revWalk.release
+
-    
+      if(commits.length >= 2){
-    val revCommit = commits(0)
+        // not initial commit
-    
+        val oldCommit = commits(1)
-    if(commits.length >= 2){
+        (getDiffs(git, oldCommit.getName, id, fetchContent), Some(oldCommit.getName))
-      // not initial commit
+
-      val oldCommit = commits(1)
+      } else {
-      
+        // initial commit
-      // get diff between specified commit and its previous commit
+        using(new TreeWalk(git.getRepository)){ treeWalk =>
-      val reader = git.getRepository.newObjectReader
+          treeWalk.addTree(revCommit.getTree)
-      
+          val buffer = new scala.collection.mutable.ListBuffer[DiffInfo]()
-      val oldTreeIter = new CanonicalTreeParser
+          while(treeWalk.next){
-      oldTreeIter.reset(reader, git.getRepository.resolve(oldCommit.name + "^{tree}"))
+            buffer.append((if(!fetchContent){
-      
+              DiffInfo(ChangeType.ADD, null, treeWalk.getPathString, None, None)
-      val newTreeIter = new CanonicalTreeParser
+            } else {
-      newTreeIter.reset(reader, git.getRepository.resolve(id + "^{tree}"))
+              DiffInfo(ChangeType.ADD, null, treeWalk.getPathString, None,
-      
+                JGitUtil.getContentFromId(git, treeWalk.getObjectId(0), false).filter(FileUtil.isText).map(convertFromByteArray))
-      import scala.collection.JavaConverters._
+            }))
-      git.diff.setNewTree(newTreeIter).setOldTree(oldTreeIter).call.asScala.map { diff =>
+          }
-        if(!fetchContent || FileUtil.isImage(diff.getOldPath) || FileUtil.isImage(diff.getNewPath)){
+          (buffer.toList, None)
-          DiffInfo(diff.getChangeType, diff.getOldPath, diff.getNewPath, None, None)
-        } else {
-          DiffInfo(diff.getChangeType, diff.getOldPath, diff.getNewPath,
-            JGitUtil.getContent(git, diff.getOldId.toObjectId, false).filter(FileUtil.isText).map(new String(_, "UTF-8")),
-            JGitUtil.getContent(git, diff.getNewId.toObjectId, false).filter(FileUtil.isText).map(new String(_, "UTF-8")))
         }
-      }.toList
-    } else {
-      // initial commit
-      val walk = new TreeWalk(git.getRepository)
-      walk.addTree(revCommit.getTree)
-      val buffer = new scala.collection.mutable.ListBuffer[DiffInfo]()
-      while(walk.next){
-        buffer.append((if(!fetchContent){
-          DiffInfo(ChangeType.ADD, null, walk.getPathString, None, None)
-        } else {
-          DiffInfo(ChangeType.ADD, null, walk.getPathString, None, 
-              JGitUtil.getContent(git, walk.getObjectId(0), false).filter(FileUtil.isText).map(new String(_, "UTF-8")))
-        }))
       }
-      walk.release
-      buffer.toList
     }
   }
 
+  def getDiffs(git: Git, from: String, to: String, fetchContent: Boolean): List[DiffInfo] = {
+    val reader = git.getRepository.newObjectReader
+    val oldTreeIter = new CanonicalTreeParser
+    oldTreeIter.reset(reader, git.getRepository.resolve(from + "^{tree}"))
+
+    val newTreeIter = new CanonicalTreeParser
+    newTreeIter.reset(reader, git.getRepository.resolve(to + "^{tree}"))
+
+    import scala.collection.JavaConverters._
+    git.diff.setNewTree(newTreeIter).setOldTree(oldTreeIter).call.asScala.map { diff =>
+      if(!fetchContent || FileUtil.isImage(diff.getOldPath) || FileUtil.isImage(diff.getNewPath)){
+        DiffInfo(diff.getChangeType, diff.getOldPath, diff.getNewPath, None, None)
+      } else {
+        DiffInfo(diff.getChangeType, diff.getOldPath, diff.getNewPath,
+          JGitUtil.getContentFromId(git, diff.getOldId.toObjectId, false).filter(FileUtil.isText).map(convertFromByteArray),
+          JGitUtil.getContentFromId(git, diff.getNewId.toObjectId, false).filter(FileUtil.isText).map(convertFromByteArray))
+      }
+    }.toList
+  }
+
+
   /**
    * Returns the list of branch names of the specified commit.
    */
-  def getBranchesOfCommit(git: Git, commitId: String): List[String] = {
+  def getBranchesOfCommit(git: Git, commitId: String): List[String] =
-    val walk = new org.eclipse.jgit.revwalk.RevWalk(git.getRepository)
+    using(new RevWalk(git.getRepository)){ revWalk =>
-    try {
+      defining(revWalk.parseCommit(git.getRepository.resolve(commitId + "^0"))){ commit =>
-      val commit = walk.parseCommit(git.getRepository.resolve(commitId + "^0"))
+        git.getRepository.getAllRefs.entrySet.asScala.filter { e =>
-
+          (e.getKey.startsWith(Constants.R_HEADS) && revWalk.isMergedInto(commit, revWalk.parseCommit(e.getValue.getObjectId)))
-      git.getRepository.getAllRefs.entrySet.asScala.filter { e =>
+        }.map { e =>
-        (e.getKey.startsWith(Constants.R_HEADS) && walk.isMergedInto(commit, walk.parseCommit(e.getValue.getObjectId)))
+          e.getValue.getName.substring(org.eclipse.jgit.lib.Constants.R_HEADS.length)
-      }.map { e =>
+        }.toList.sorted
-        e.getValue.getName.substring(org.eclipse.jgit.lib.Constants.R_HEADS.length)
+      }
-      }.toList.sorted
-
-    } finally {
-      walk.release
     }
-  }
 
   /**
    * Returns the list of tags of the specified commit.
    */
-  def getTagsOfCommit(git: Git, commitId: String): List[String] = {
+  def getTagsOfCommit(git: Git, commitId: String): List[String] =
-    val walk = new org.eclipse.jgit.revwalk.RevWalk(git.getRepository)
+    using(new RevWalk(git.getRepository)){ revWalk =>
-    try {
+      defining(revWalk.parseCommit(git.getRepository.resolve(commitId + "^0"))){ commit =>
-      val commit = walk.parseCommit(git.getRepository.resolve(commitId + "^0"))
+        git.getRepository.getAllRefs.entrySet.asScala.filter { e =>
-
+          (e.getKey.startsWith(Constants.R_TAGS) && revWalk.isMergedInto(commit, revWalk.parseCommit(e.getValue.getObjectId)))
-      git.getRepository.getAllRefs.entrySet.asScala.filter { e =>
+        }.map { e =>
-        (e.getKey.startsWith(Constants.R_TAGS) && walk.isMergedInto(commit, walk.parseCommit(e.getValue.getObjectId)))
+          e.getValue.getName.substring(org.eclipse.jgit.lib.Constants.R_TAGS.length)
-      }.map { e =>
+        }.toList.sorted.reverse
-        e.getValue.getName.substring(org.eclipse.jgit.lib.Constants.R_TAGS.length)
+      }
-      }.toList.sorted.reverse
-
-    } finally {
-      walk.release
     }
-  }
 
-  def initRepository(dir: java.io.File): Unit = {
+  def initRepository(dir: java.io.File): Unit =
-    val repository = new RepositoryBuilder().setGitDir(dir).setBare.build
+    using(new RepositoryBuilder().setGitDir(dir).setBare.build){ repository =>
-    try {
       repository.create
       setReceivePack(repository)
-    } finally {
-      repository.close
     }
-  }
+
+  def cloneRepository(from: java.io.File, to: java.io.File): Unit =
+    using(Git.cloneRepository.setURI(from.toURI.toString).setDirectory(to).setBare(true).call){ git =>
+      setReceivePack(git.getRepository)
+    }
 
   def isEmpty(git: Git): Boolean = git.getRepository.resolve(Constants.HEAD) == null
 
-  private def setReceivePack(repository: org.eclipse.jgit.lib.Repository): Unit = {
+  private def setReceivePack(repository: org.eclipse.jgit.lib.Repository): Unit =
-    val config = repository.getConfig
+    defining(repository.getConfig){ config =>
-    config.setBoolean("http", null, "receivepack", true)
+      config.setBoolean("http", null, "receivepack", true)
-    config.save
+      config.save
+    }
+
+  def getDefaultBranch(git: Git, repository: RepositoryService.RepositoryInfo,
+                       revstr: String = ""): Option[(ObjectId, String)] = {
+    Seq(
+      Some(if(revstr.isEmpty) repository.repository.defaultBranch else revstr),
+      repository.branchList.headOption
+    ).flatMap {
+      case Some(rev) => Some((git.getRepository.resolve(rev), rev))
+      case None      => None
+    }.find(_._1 != null)
+  }
+
+  def createDirCacheEntry(path: String, mode: FileMode, objectId: ObjectId): DirCacheEntry = {
+    val entry = new DirCacheEntry(path)
+    entry.setFileMode(mode)
+    entry.setObjectId(objectId)
+    entry
+  }
+
+  def createNewCommit(git: Git, inserter: ObjectInserter, headId: AnyObjectId, treeId: AnyObjectId,
+                              fullName: String, mailAddress: String, message: String): String = {
+    val newCommit = new CommitBuilder()
+    newCommit.setCommitter(new PersonIdent(fullName, mailAddress))
+    newCommit.setAuthor(new PersonIdent(fullName, mailAddress))
+    newCommit.setMessage(message)
+    if(headId != null){
+      newCommit.setParentIds(List(headId).asJava)
+    }
+    newCommit.setTreeId(treeId)
+
+    val newHeadId = inserter.insert(newCommit)
+    inserter.flush()
+    inserter.release()
+
+    val refUpdate = git.getRepository.updateRef(Constants.HEAD)
+    refUpdate.setNewObjectId(newHeadId)
+    refUpdate.update()
+
+    newHeadId.getName
+  }
+
+  /**
+   * Read submodule information from .gitmodules
+   */
+  def getSubmodules(git: Git, tree: RevTree): List[SubmoduleInfo] = {
+    val repository = git.getRepository
+    getContentFromPath(git, tree, ".gitmodules", true).map { bytes =>
+      (try {
+        val config = new BlobBasedConfig(repository.getConfig(), bytes)
+        config.getSubsections("submodule").asScala.map { module =>
+          val path = config.getString("submodule", module, "path")
+          val url  = config.getString("submodule", module, "url")
+          SubmoduleInfo(module, path, url)
+        }
+      } catch {
+        case e: ConfigInvalidException => {
+          logger.error("Failed to load .gitmodules file for " + repository.getDirectory(), e)
+          Nil
+        }
+      }).toList
+    } getOrElse Nil
+	}
+
+  /**
+   * Get object content of the given path as byte array from the Git repository.
+   *
+   * @param git the Git object
+   * @param revTree the rev tree
+   * @param path the path
+   * @param fetchLargeFile if false then returns None for the large file
+   * @return the byte array of content or None if object does not exist
+   */
+  def getContentFromPath(git: Git, revTree: RevTree, path: String, fetchLargeFile: Boolean): Option[Array[Byte]] = {
+    @scala.annotation.tailrec
+    def getPathObjectId(path: String, walk: TreeWalk): Option[ObjectId] = walk.next match {
+      case true if(walk.getPathString == path) => Some(walk.getObjectId(0))
+      case true  => getPathObjectId(path, walk)
+      case false => None
+    }
+
+    using(new TreeWalk(git.getRepository)){ treeWalk =>
+      treeWalk.addTree(revTree)
+      treeWalk.setRecursive(true)
+      getPathObjectId(path, treeWalk)
+    } flatMap { objectId =>
+      getContentFromId(git, objectId, fetchLargeFile)
+    }
+  }
+
+  /**
+   * Get object content of the given object id as byte array from the Git repository.
+   *
+   * @param git the Git object
+   * @param id the object id
+   * @param fetchLargeFile if false then returns None for the large file
+   * @return the byte array of content or None if object does not exist
+   */
+  def getContentFromId(git: Git, id: ObjectId, fetchLargeFile: Boolean): Option[Array[Byte]] = try {
+    val loader = git.getRepository.getObjectDatabase.open(id)
+    if(fetchLargeFile == false && FileUtil.isLarge(loader.getSize)){
+      None
+    } else {
+      using(git.getRepository.getObjectDatabase){ db =>
+        Some(db.open(id).getBytes)
+      }
+    }
+  } catch {
+    case e: MissingObjectException => None
   }
 
 }

src/main/scala/util/Keys.scala

@@ -0,0 +1,81 @@
+package util
+
+/**
+ * Define key strings for request attributes, session attributes or flash attributes.
+ */
+object Keys {
+
+  /**
+   * Define session keys.
+   */
+  object Session {
+
+    /**
+     * Session key for the logged in account information.
+     */
+    val LoginAccount = "loginAccount"
+
+    /**
+     * Session key for the issue search condition in dashboard.
+     */
+    val DashboardIssues = "dashboard/issues"
+
+    /**
+     * Session key for the pull request search condition in dashboard.
+     */
+    val DashboardPulls = "dashboard/pulls"
+
+    /**
+     * Generate session key for the issue search condition.
+     */
+    def Issues(owner: String, name: String) = s"${owner}/${name}/issues"
+
+    /**
+     * Generate session key for the pull request search condition.
+     */
+    def Pulls(owner: String, name: String) = s"${owner}/${name}/pulls"
+
+    /**
+     * Generate session key for the upload filename.
+     */
+    def Upload(fileId: String) = s"upload_${fileId}"
+
+  }
+
+  object Flash {
+
+    /**
+     * Flash key for the redirect URL.
+     */
+    val Redirect = "redirect"
+
+    /**
+     * Flash key for the information message.
+     */
+    val Info = "info"
+
+  }
+
+  /**
+   * Define request keys.
+   */
+  object Request {
+
+    /**
+     * Request key for the Ajax request flag.
+     */
+    val Ajax = "AJAX"
+
+    /**
+     * Request key for the username which is used during Git repository access.
+     */
+    val UserName = "USER_NAME"
+
+    /**
+     * Generate request key for the request cache.
+     */
+    def Cache(key: String) = s"cache.${key}"
+
+  }
+
+}

src/main/scala/util/LDAPUtil.scala

@@ -0,0 +1,142 @@
+package util
+
+import util.ControlUtil._
+import service.SystemSettingsService
+import com.novell.ldap._
+import java.security.Security
+import org.slf4j.LoggerFactory
+import service.SystemSettingsService.Ldap
+import scala.annotation.tailrec
+
+/**
+ * Utility for LDAP authentication.
+ */
+object LDAPUtil {
+
+  private val LDAP_VERSION: Int = LDAPConnection.LDAP_V3
+  private val logger = LoggerFactory.getLogger(getClass().getName())
+
+  /**
+   * Try authentication by LDAP using given configuration.
+   * Returns Right(LDAPUserInfo) if authentication is successful, otherwise  Left(errorMessage).
+   */
+  def authenticate(ldapSettings: Ldap, userName: String, password: String): Either[String, LDAPUserInfo] = {
+    bind(
+      host     = ldapSettings.host,
+      port     = ldapSettings.port.getOrElse(SystemSettingsService.DefaultLdapPort),
+      dn       = ldapSettings.bindDN.getOrElse(""),
+      password = ldapSettings.bindPassword.getOrElse(""),
+      tls      = ldapSettings.tls.getOrElse(false),
+      keystore = ldapSettings.keystore.getOrElse(""),
+      error    = "System LDAP authentication failed."
+    ){ conn =>
+      findUser(conn, userName, ldapSettings.baseDN, ldapSettings.userNameAttribute) match {
+        case Some(userDN) => userAuthentication(ldapSettings, userDN, userName, password)
+        case None         => Left("User does not exist.")
+      }
+    }
+  }
+
+  private def userAuthentication(ldapSettings: Ldap, userDN: String, userName: String, password: String): Either[String, LDAPUserInfo] = {
+    bind(
+      host     = ldapSettings.host,
+      port     = ldapSettings.port.getOrElse(SystemSettingsService.DefaultLdapPort),
+      dn       = userDN,
+      password = password,
+      tls      = ldapSettings.tls.getOrElse(false),
+      keystore = ldapSettings.keystore.getOrElse(""),
+      error    = "User LDAP Authentication Failed."
+    ){ conn =>
+      findMailAddress(conn, userDN, ldapSettings.mailAttribute) match {
+        case Some(mailAddress) => Right(LDAPUserInfo(
+          userName    = userName,
+          fullName    = ldapSettings.fullNameAttribute.flatMap { fullNameAttribute =>
+            findFullName(conn, userDN, fullNameAttribute)
+          }.getOrElse(userName),
+          mailAddress = mailAddress))
+        case None => Left("Can't find mail address.")
+      }
+    }
+  }
+
+  private def bind[A](host: String, port: Int, dn: String, password: String, tls: Boolean, keystore: String, error: String)
+                  (f: LDAPConnection => Either[String, A]): Either[String, A] = {
+    if (tls) {
+      // Dynamically set Sun as the security provider
+      Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider())
+
+      if (keystore.compareTo("") != 0) {
+        // Dynamically set the property that JSSE uses to identify
+        // the keystore that holds trusted root certificates
+        System.setProperty("javax.net.ssl.trustStore", keystore)
+      }
+    }
+
+    val conn: LDAPConnection = new LDAPConnection(new LDAPJSSEStartTLSFactory())
+    try {
+      // Connect to the server
+      conn.connect(host, port)
+
+      if (tls) {
+        // Secure the connection
+        conn.startTLS()
+      }
+
+      // Bind to the server
+      conn.bind(LDAP_VERSION, dn, password.getBytes)
+
+      // Execute a given function and returns a its result
+      f(conn)
+
+    } catch {
+      case e: Exception => {
+        // Provide more information if something goes wrong
+        logger.info("" + e)
+
+        if (conn.isConnected) {
+          conn.disconnect()
+        }
+        // Returns an error message
+        Left(error)
+      }
+    }
+  }
+
+  /**
+   * Search a specified user and returns userDN if exists.
+   */
+  private def findUser(conn: LDAPConnection, userName: String, baseDN: String, userNameAttribute: String): Option[String] = {
+    @tailrec
+    def getEntries(results: LDAPSearchResults, entries: List[Option[LDAPEntry]] = Nil): List[LDAPEntry] = {
+      if(results.hasMore){
+        getEntries(results, entries :+ (try {
+          Option(results.next)
+        } catch {
+          case ex: LDAPReferralException => None // NOTE(tanacasino): Referral follow is off. so ignores it.(for AD)
+        }))
+      } else {
+        entries.flatten
+      }
+    }
+    getEntries(conn.search(baseDN, LDAPConnection.SCOPE_SUB, userNameAttribute + "=" + userName, null, false)).collectFirst {
+      case x => x.getDN
+    }
+  }
+
+  private def findMailAddress(conn: LDAPConnection, userDN: String, mailAttribute: String): Option[String] =
+    defining(conn.search(userDN, LDAPConnection.SCOPE_BASE, null, Array[String](mailAttribute), false)){ results =>
+      if(results.hasMore) {
+        Option(results.next.getAttribute(mailAttribute)).map(_.getStringValue)
+      } else None
+    }
+
+  private def findFullName(conn: LDAPConnection, userDN: String, nameAttribute: String): Option[String] =
+    defining(conn.search(userDN, LDAPConnection.SCOPE_BASE, null, Array[String](nameAttribute), false)){ results =>
+      if(results.hasMore) {
+        Option(results.next.getAttribute(nameAttribute)).map(_.getStringValue)
+      } else None
+    }
+
+  case class LDAPUserInfo(userName: String, fullName: String, mailAddress: String)
+
+}

src/main/scala/util/LockUtil.scala

@@ -0,0 +1,36 @@
+package util
+
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.locks.{ReentrantLock, Lock}
+import util.ControlUtil._
+
+object LockUtil {
+
+  /**
+   * lock objects
+   */
+  private val locks = new ConcurrentHashMap[String, Lock]()
+
+  /**
+   * Returns the lock object for the specified repository.
+   */
+  private def getLockObject(key: String): Lock = synchronized {
+    if(!locks.containsKey(key)){
+      locks.put(key, new ReentrantLock())
+    }
+    locks.get(key)
+  }
+
+  /**
+   * Synchronizes a given function which modifies the working copy of the wiki repository.
+   */
+  def lock[T](key: String)(f: => T): T = defining(getLockObject(key)){ lock =>
+    try {
+      lock.lock()
+      f
+    } finally {
+      lock.unlock()
+    }
+  }
+
+}

src/main/scala/util/Notifier.scala

@@ -0,0 +1,116 @@
+package util
+
+import scala.concurrent._
+import ExecutionContext.Implicits.global
+import org.apache.commons.mail.{DefaultAuthenticator, HtmlEmail}
+import org.slf4j.LoggerFactory
+
+import app.Context
+import service.{AccountService, RepositoryService, IssuesService, SystemSettingsService}
+import servlet.Database
+import SystemSettingsService.Smtp
+import _root_.util.ControlUtil.defining
+
+trait Notifier extends RepositoryService with AccountService with IssuesService {
+  def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String)
+      (msg: String => String)(implicit context: Context): Unit
+
+  protected def recipients(issue: model.Issue)(notify: String => Unit)(implicit context: Context) =
+    (
+        // individual repository's owner
+        issue.userName ::
+        // collaborators
+        getCollaborators(issue.userName, issue.repositoryName) :::
+        // participants
+        issue.openedUserName ::
+        getComments(issue.userName, issue.repositoryName, issue.issueId).map(_.commentedUserName)
+    )
+    .distinct
+    .withFilter ( _ != context.loginAccount.get.userName )	// the operation in person is excluded
+    .foreach ( getAccountByUserName(_) filterNot (_.isGroupAccount) foreach (x => notify(x.mailAddress)) )
+
+}
+
+object Notifier {
+  // TODO We want to be able to switch to mock.
+  def apply(): Notifier = new SystemSettingsService {}.loadSystemSettings match {
+    case settings if settings.notification => new Mailer(settings.smtp.get)
+    case _ => new MockMailer
+  }
+
+  def msgIssue(url: String) = (content: String) => s"""
+    |${content}<br/>
+    |--<br/>
+    |<a href="${url}">View it on GitBucket</a>
+    """.stripMargin
+
+  def msgPullRequest(url: String) = (content: String) => s"""
+    |${content}<hr/>
+    |View, comment on, or merge it at:<br/>
+    |<a href="${url}">${url}</a>
+    """.stripMargin
+
+  def msgComment(url: String) = (content: String) => s"""
+    |${content}<br/>
+    |--<br/>
+    |<a href="${url}">View it on GitBucket</a>
+    """.stripMargin
+
+  def msgStatus(url: String) = (content: String) => s"""
+    |${content} <a href="${url}">#${url split('/') last}</a>
+    """.stripMargin
+}
+
+class Mailer(private val smtp: Smtp) extends Notifier {
+  private val logger = LoggerFactory.getLogger(classOf[Mailer])
+
+  def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String)
+      (msg: String => String)(implicit context: Context) = {
+    val database = Database(context.request.getServletContext)
+
+    val f = future {
+      // TODO Can we use the Database Session in other than Transaction Filter?
+      database withSession {
+        getIssue(r.owner, r.name, issueId.toString) foreach { issue =>
+          defining(
+              s"[${r.name}] ${issue.title} (#${issueId})" ->
+              msg(view.Markdown.toHtml(content, r, false, true))) { case (subject, msg) =>
+            recipients(issue) { to =>
+              val email = new HtmlEmail
+              email.setHostName(smtp.host)
+              email.setSmtpPort(smtp.port.get)
+              smtp.user.foreach { user =>
+                email.setAuthenticator(new DefaultAuthenticator(user, smtp.password.getOrElse("")))
+              }
+              smtp.ssl.foreach { ssl =>
+                email.setSSLOnConnect(ssl)
+              }
+              smtp.fromAddress
+                .map (_ -> smtp.fromName.orNull)
+                .orElse (Some("notifications@gitbucket.com" -> context.loginAccount.get.userName))
+                .foreach { case (address, name) =>
+                  email.setFrom(address, name)
+                }
+              email.setCharset("UTF-8")
+              email.setSubject(subject)
+              email.setHtmlMsg(msg)
+
+              email.addTo(to).send
+            }
+          }
+        }
+      }
+      "Notifications Successful."
+    }
+    f onSuccess {
+      case s => logger.debug(s)
+    }
+    f onFailure {
+      case t => logger.error("Notifications Failed.", t)
+    }
+  }
+}
+class MockMailer extends Notifier {
+  def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String)
+      (msg: String => String)(implicit context: Context): Unit = {}
+}

src/main/scala/util/StringUtil.scala

@@ -1,14 +1,18 @@
 package util
 
 import java.net.{URLDecoder, URLEncoder}
+import org.mozilla.universalchardet.UniversalDetector
+import util.ControlUtil._
+import org.apache.commons.io.input.BOMInputStream
+import org.apache.commons.io.IOUtils
 
 object StringUtil {
 
-  def sha1(value: String): String = {
+  def sha1(value: String): String =
-    val md = java.security.MessageDigest.getInstance("SHA-1")
+    defining(java.security.MessageDigest.getInstance("SHA-1")){ md =>
-    md.update(value.getBytes)
+      md.update(value.getBytes)
-    md.digest.map(b => "%02x".format(b)).mkString
+      md.digest.map(b => "%02x".format(b)).mkString
-  }
+    }
 
   def md5(value: String): String = {
     val md = java.security.MessageDigest.getInstance("MD5")
@@ -25,4 +29,39 @@ object StringUtil {
   def escapeHtml(value: String): String =
     value.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;")
 
+  /**
+   * Make string from byte array. Character encoding is detected automatically by [[util.StringUtil.detectEncoding]].
+   * And if given bytes contains UTF-8 BOM, it's removed from returned string.
+   */
+  def convertFromByteArray(content: Array[Byte]): String =
+    IOUtils.toString(new BOMInputStream(new java.io.ByteArrayInputStream(content)), detectEncoding(content))
+
+  def detectEncoding(content: Array[Byte]): String =
+    defining(new UniversalDetector(null)){ detector =>
+      detector.handleData(content, 0, content.length)
+      detector.dataEnd()
+      detector.getDetectedCharset match {
+        case null => "UTF-8"
+        case e    => e
+      }
+    }
+
+  /**
+   * Extract issue id like ```#issueId``` from the given message.
+   *
+   *@param message the message which may contains issue id
+   * @return the iterator of issue id
+   */
+  def extractIssueId(message: String): Iterator[String] =
+    "(^|\\W)#(\\d+)(\\W|$)".r.findAllIn(message).matchData.map(_.group(2))
+
+  /**
+   * Extract close issue id like ```close #issueId ``` from the given message.
+   *
+   * @param message the message which may contains close command
+   * @return the iterator of issue id
+   */
+  def extractCloseId(message: String): Iterator[String] =
+    "(?i)(?<!\\w)(?:fix(?:e[sd])?|resolve[sd]?|close[sd]?)\\s+#(\\d+)(?!\\w)".r.findAllIn(message).matchData.map(_.group(1))
+
 }

src/main/scala/util/Validations.scala

@@ -1,6 +1,7 @@
 package util
 
 import jp.sf.amateras.scalatra.forms._
+import org.scalatra.i18n.Messages
 
 trait Validations {
 
@@ -8,8 +9,8 @@ trait Validations {
    * Constraint for the identifier such as user name, repository name or page name.
    */
   def identifier: Constraint = new Constraint(){
-    def validate(name: String, value: String): Option[String] =
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
-      if(!value.matches("^[a-zA-Z0-9\\-_]+$")){
+      if(!value.matches("^[a-zA-Z0-9\\-_.]+$")){
         Some(s"${name} contains invalid character.")
       } else if(value.startsWith("_") || value.startsWith("-")){
         Some(s"${name} starts with invalid character.")
@@ -25,10 +26,7 @@ trait Validations {
    */
   def date(constraints: Constraint*): SingleValueType[java.util.Date] =
     new SingleValueType[java.util.Date]((pattern("\\d{4}-\\d{2}-\\d{2}") +: constraints): _*){
-      def convert(value: String): java.util.Date = {
+      def convert(value: String, messages: Messages): java.util.Date = new java.text.SimpleDateFormat("yyyy-MM-dd").parse(value)
-        val formatter = new java.text.SimpleDateFormat("yyyy-MM-dd")
-        formatter.parse(value)
-      }
     }
 
 }

src/main/scala/view/AvatarImageProvider.scala

@@ -13,19 +13,34 @@ trait AvatarImageProvider { self: RequestCache =>
   protected def getAvatarImageHtml(userName: String, size: Int,
       mailAddress: String = "", tooltip: Boolean = false)(implicit context: app.Context): Html = {
 
-    val src = getAccountByUserName(userName).map { account =>
+    val src = if(mailAddress.isEmpty){
-      if(account.image.isEmpty){
+      // by user name
-        s"""http://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress)}?s=${size}"""
+      getAccountByUserName(userName).map { account =>
-      } else {
+        if(account.image.isEmpty && context.settings.gravatar){
-        s"""${context.path}/${userName}/_avatar"""
+          s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}"""
+        } else {
+          s"""${context.path}/${account.userName}/_avatar"""
+        }
+      } getOrElse {
+        s"""${context.path}/_unknown/_avatar"""
       }
-    } getOrElse {
+    } else {
-      if(mailAddress.nonEmpty){
+      // by mail address
-        s"""http://www.gravatar.com/avatar/${StringUtil.md5(mailAddress)}?s=${size}"""
+      getAccountByMailAddress(mailAddress).map { account =>
-      } else {
+        if(account.image.isEmpty && context.settings.gravatar){
-        s"""${context.path}/${userName}/_avatar"""
+          s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}"""
+        } else {
+          s"""${context.path}/${account.userName}/_avatar"""
+        }
+      } getOrElse {
+        if(context.settings.gravatar){
+          s"""https://www.gravatar.com/avatar/${StringUtil.md5(mailAddress.toLowerCase)}?s=${size}"""
+        } else {
+          s"""${context.path}/_unknown/_avatar"""
+        }
       }
     }
+
     if(tooltip){
       Html(s"""<img src="${src}" class="avatar" style="width: ${size}px; height: ${size}px;" data-toggle="tooltip" title="${userName}"/>""")
     } else {

src/main/scala/view/LinkConverter.scala

@@ -14,20 +14,21 @@ trait LinkConverter { self: RequestCache =>
       // escape HTML tags
       .replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\"", "&quot;")
       // convert issue id to link
-      .replaceBy(("(^|\\W)" + issueIdPrefix + "(\\d+)(\\W|$)").r){ m =>
+      .replaceBy(("(?<=(^|\\W))" + issueIdPrefix + "([0-9]+)(?=(\\W|$))").r){ m =>
-        if(getIssue(repository.owner, repository.name, m.group(2)).isDefined){
+        getIssue(repository.owner, repository.name, m.group(2)) match {
-          Some(s"""${m.group(1)}<a href="${context.path}/${repository.owner}/${repository.name}/issues/${m.group(2)}">#${m.group(2)}</a>${m.group(3)}""")
+          case Some(issue) if(issue.isPullRequest)
-        } else {
+                       => Some(s"""<a href="${context.path}/${repository.owner}/${repository.name}/pull/${m.group(2)}">#${m.group(2)}</a>""")
-          Some(s"""${m.group(1)}#${m.group(2)}${m.group(3)}""")
+          case Some(_) => Some(s"""<a href="${context.path}/${repository.owner}/${repository.name}/issues/${m.group(2)}">#${m.group(2)}</a>""")
+          case None    => Some(s"""#${m.group(2)}""")
         }
       }
       // convert @username to link
-      .replaceBy("(^|\\W)@([a-zA-Z0-9\\-_]+)(\\W|$)".r){ m =>
+      .replaceBy("(?<=(^|\\W))@([a-zA-Z0-9\\-_]+)(?=(\\W|$))".r){ m =>
         getAccountByUserName(m.group(2)).map { _ =>
-          s"""${m.group(1)}<a href="${context.path}/${m.group(2)}">@${m.group(2)}</a>${m.group(3)}"""
+          s"""<a href="${context.path}/${m.group(2)}">@${m.group(2)}</a>"""
         }
       }
       // convert commit id to link
-      .replaceAll("(^|\\W)([a-f0-9]{40})(\\W|$)", s"""$$1<a href="${context.path}/${repository.owner}/${repository.name}/commit/$$2">$$2</a>$$3""")
+      .replaceAll("(?<=(^|\\W))([a-f0-9]{40})(?=(\\W|$))", s"""<a href="${context.path}/${repository.owner}/${repository.name}/commit/$$2">$$2</a>""")
   }
 }

src/main/scala/view/Markdown.scala

@@ -1,12 +1,16 @@
 package view
 
 import util.StringUtil
+import util.ControlUtil._
+import util.Directory._
 import org.parboiled.common.StringUtils
 import org.pegdown._
 import org.pegdown.ast._
 import org.pegdown.LinkRenderer.Rendering
+import java.text.Normalizer
+import java.util.Locale
 import scala.collection.JavaConverters._
-import service.RequestCache
+import service.{RequestCache, WikiService}
 
 object Markdown {
 
@@ -17,11 +21,11 @@ object Markdown {
              enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): String = {
     // escape issue id
     val source = if(enableRefsLink){
-      markdown.replaceAll("(^|\\W)#([0-9]+)(\\W|$)", "$1issue:$2$3")
+      markdown.replaceAll("(?<=(\\W|^))#(\\d+)(?=(\\W|$))", "issue:$2")
     } else markdown
 
     val rootNode = new PegDownProcessor(
-      Extensions.AUTOLINKS | Extensions.WIKILINKS | Extensions.FENCED_CODE_BLOCKS | Extensions.TABLES
+      Extensions.AUTOLINKS | Extensions.WIKILINKS | Extensions.FENCED_CODE_BLOCKS | Extensions.TABLES | Extensions.HARDWRAPS
     ).parseMarkdown(source.toCharArray)
 
     new GitBucketHtmlSerializer(markdown, repository, enableWikiLink, enableRefsLink).toHtml(rootNode)
@@ -29,7 +33,7 @@ object Markdown {
 }
 
 class GitBucketLinkRender(context: app.Context, repository: service.RepositoryService.RepositoryInfo,
-                          enableWikiLink: Boolean) extends LinkRenderer {
+                          enableWikiLink: Boolean) extends LinkRenderer with WikiService {
   override def render(node: WikiLinkNode): Rendering = {
     if(enableWikiLink){
       try {
@@ -40,8 +44,14 @@ class GitBucketLinkRender(context: app.Context, repository: service.RepositorySe
         } else {
           (text, text)
         }
-        val url = repository.url.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/wiki/" + StringUtil.urlEncode(page)
+
-        new Rendering(url, label)
+        val url = repository.httpUrl.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/wiki/" + StringUtil.urlEncode(page)
+
+        if(getWikiPage(repository.owner, repository.name, page).isDefined){
+          new Rendering(url, label)
+        } else {
+          new Rendering(url, label).withAttribute("class", "absent")
+        }
       } catch {
         case e: java.io.UnsupportedEncodingException => throw new IllegalStateException
       }
@@ -52,7 +62,7 @@ class GitBucketLinkRender(context: app.Context, repository: service.RepositorySe
 }
 
 class GitBucketVerbatimSerializer extends VerbatimSerializer {
-  def serialize(node: VerbatimNode, printer: Printer) {
+  def serialize(node: VerbatimNode, printer: Printer): Unit = {
     printer.println.print("<pre")
     if (!StringUtils.isEmpty(node.getType)) {
       printer.print(" class=").print('"').print("prettyprint ").print(node.getType).print('"')
@@ -94,15 +104,30 @@ class GitBucketHtmlSerializer(
     if(!enableWikiLink || url.startsWith("http://") || url.startsWith("https://")){
       url
     } else {
-      repository.url.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/wiki/_blob/" + url
+      repository.httpUrl.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/wiki/_blob/" + url
     }
   }
 
-  private def printAttribute(name: String, value: String) {
+  private def printAttribute(name: String, value: String): Unit = {
     printer.print(' ').print(name).print('=').print('"').print(value).print('"')
   }
 
-  override def visit(node: TextNode) {
+  private def printHeaderTag(node: HeaderNode): Unit = {
+    val tag = s"h${node.getLevel}"
+    val headerTextString = printChildrenToString(node)
+    val anchorName = GitBucketHtmlSerializer.generateAnchorName(headerTextString)
+    printer.print(s"""<$tag class="markdown-head">""")
+    printer.print(s"""<a class="markdown-anchor-link" href="#$anchorName"></a>""")
+    printer.print(s"""<a class="markdown-anchor" name="$anchorName"></a>""")
+    visitChildren(node)
+    printer.print(s"</$tag>")
+  }
+
+  override def visit(node: HeaderNode): Unit = {
+    printHeaderTag(node)
+  }
+
+  override def visit(node: TextNode): Unit =  {
     // convert commit id and username to link.
     val text = if(enableRefsLink) convertRefsLinks(node.getText, repository, "issue:") else node.getText
 
@@ -112,5 +137,16 @@ class GitBucketHtmlSerializer(
       printWithAbbreviations(text)
     }
   }
+}
 
-}
+object GitBucketHtmlSerializer {
+
+  private val Whitespace = "[\\s]".r
+
+  def generateAnchorName(text: String): String = {
+    val noWhitespace = Whitespace.replaceAllIn(text, "-")
+    val normalized = Normalizer.normalize(noWhitespace, Normalizer.Form.NFD)
+    val noSpecialChars = StringUtil.urlEncode(normalized)
+    noSpecialChars.toLowerCase(Locale.ENGLISH)
+  }
+}

src/main/scala/view/helpers.scala

@@ -9,12 +9,12 @@ import service.RequestCache
  * Provides helper methods for Twirl templates.
  */
 object helpers extends AvatarImageProvider with LinkConverter with RequestCache {
-  
+
   /**
    * Format java.util.Date to "yyyy-MM-dd HH:mm:ss".
    */
   def datetime(date: Date): String = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date)
-  
+
   /**
    * Format java.util.Date to "yyyy-MM-dd".
    */
@@ -31,17 +31,20 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
    * Converts Markdown of Wiki pages to HTML.
    */
   def markdown(value: String, repository: service.RepositoryService.RepositoryInfo,
-               enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): Html = {
+               enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): Html =
     Html(Markdown.toHtml(value, repository, enableWikiLink, enableRefsLink))
-  }
 
   /**
-   * Returns <img> which displays the avatar icon.
+   * Returns <img> which displays the avatar icon for the given user name.
-   * Looks up Gravatar if avatar icon has not been configured in user settings.
+   * This method looks up Gravatar if avatar icon has not been configured in user settings.
    */
   def avatar(userName: String, size: Int, tooltip: Boolean = false)(implicit context: app.Context): Html =
     getAvatarImageHtml(userName, size, "", tooltip)
 
+  /**
+   * Returns <img> which displays the avatar icon for the given mail address.
+   * This method looks up Gravatar if avatar icon has not been configured in user settings.
+   */
   def avatar(commit: util.JGitUtil.CommitInfo, size: Int)(implicit context: app.Context): Html =
     getAvatarImageHtml(commit.committer, size, commit.mailAddress)
 
@@ -51,15 +54,38 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
   def link(value: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): Html =
     Html(convertRefsLinks(value, repository))
 
+  def cut(value: String, length: Int): String =
+    if(value.length > length){
+      value.substring(0, length) + "..."
+    } else {
+      value
+    }
+
+  import scala.util.matching.Regex._
+  implicit class RegexReplaceString(s: String) {
+    def replaceAll(pattern: String, replacer: (Match) => String): String = {
+      pattern.r.replaceAllIn(s, replacer)
+    }
+  }
+
+  /**
+   * Convert link notations in the activity message.
+   */
   def activityMessage(message: String)(implicit context: app.Context): Html =
     Html(message
       .replaceAll("\\[issue:([^\\s]+?)/([^\\s]+?)#((\\d+))\\]"   , s"""<a href="${context.path}/$$1/$$2/issues/$$3">$$1/$$2#$$3</a>""")
+      .replaceAll("\\[pullreq:([^\\s]+?)/([^\\s]+?)#((\\d+))\\]" , s"""<a href="${context.path}/$$1/$$2/pull/$$3">$$1/$$2#$$3</a>""")
       .replaceAll("\\[repo:([^\\s]+?)/([^\\s]+?)\\]"             , s"""<a href="${context.path}/$$1/$$2\">$$1/$$2</a>""")
-      .replaceAll("\\[branch:([^\\s]+?)/([^\\s]+?)#([^\\s]+?)\\]", s"""<a href="${context.path}/$$1/$$2/tree/$$3">$$3</a>""")
+      .replaceAll("\\[branch:([^\\s]+?)/([^\\s]+?)#([^\\s]+?)\\]", (m: Match) => s"""<a href="${context.path}/${m.group(1)}/${m.group(2)}/tree/${encodeRefName(m.group(3))}">${m.group(3)}</a>""")
-      .replaceAll("\\[tag:([^\\s]+?)/([^\\s]+?)#([^\\s]+?)\\]"   , s"""<a href="${context.path}/$$1/$$2/tree/$$3">$$3</a>""")
+      .replaceAll("\\[tag:([^\\s]+?)/([^\\s]+?)#([^\\s]+?)\\]"   , (m: Match) => s"""<a href="${context.path}/${m.group(1)}/${m.group(2)}/tree/${encodeRefName(m.group(3))}">${m.group(3)}</a>""")
-      .replaceAll("\\[user:([^\\s]+?)\\]"                        , s"""<a href="${context.path}/$$1">$$1</a>""")
+      .replaceAll("\\[user:([^\\s]+?)\\]"                        , (m: Match) => user(m.group(1)).body)
     )
 
+  /**
+   * URL encode except '/'.
+   */
+  def encodeRefName(value: String): String = StringUtil.urlEncode(value).replace("%2F", "/")
+
   def urlEncode(value: String): String = StringUtil.urlEncode(value)
 
   def urlEncode(value: Option[String]): String = value.map(urlEncode).getOrElse("")
@@ -73,15 +99,40 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
   /**
    * Generates the url to the account page.
    */
-  def url(userName: String)(implicit context: app.Context): String =
+  def url(userName: String)(implicit context: app.Context): String = s"${context.path}/${userName}"
-    s"${context.path}/${userName}"
 
   /**
    * Returns the url to the root of assets.
    */
-  def assets(implicit context: app.Context): String =
+  def assets(implicit context: app.Context): String = s"${context.path}/assets"
-    s"${context.path}/assets"
 
+  /**
+   * Generates the text link to the account page.
+   * If user does not exist or disabled, this method returns user name as text without link.
+   */
+  def user(userName: String, mailAddress: String = "", styleClass: String = "")(implicit context: app.Context): Html =
+    userWithContent(userName, mailAddress, styleClass)(Html(userName))
+
+  /**
+   * Generates the avatar link to the account page.
+   * If user does not exist or disabled, this method returns avatar image without link.
+   */
+  def avatarLink(userName: String, size: Int, mailAddress: String = "", tooltip: Boolean = false)(implicit context: app.Context): Html =
+    userWithContent(userName, mailAddress)(avatar(userName, size, tooltip))
+
+  private def userWithContent(userName: String, mailAddress: String = "", styleClass: String = "")(content: Html)(implicit context: app.Context): Html =
+    (if(mailAddress.isEmpty){
+      getAccountByUserName(userName)
+    } else {
+      getAccountByMailAddress(mailAddress)
+    }).map { account =>
+      Html(s"""<a href="${url(account.userName)}" class="${styleClass}">${content}</a>""")
+    } getOrElse content
+
+
+  /**
+   * Test whether the given Date is past date.
+   */
   def isPast(date: Date): Boolean = System.currentTimeMillis > date.getTime
 
   /**

src/main/twirl/account/edit.scala.html

@@ -1,57 +1,67 @@
-@(account: Option[model.Account], info: Option[Any])(implicit context: app.Context)
+@(account: model.Account, info: Option[Any])(implicit context: app.Context)
 @import context._
 @import view.helpers._
-@html.main((if(account.isDefined) "Edit your profile" else "Create your account")){
+@html.main("Edit your profile"){
-  @if(account.isDefined){
+<div class="row-fluid">
-    <h3>Edit your profile</h3>
+  <div class="span3">
-  } else {
+    @menu("profile", settings.ssh)
-    <h3>Create your account</h3>
+  </div>
-  }
+  <div class="span9">
-  @helper.html.information(info)
+    @helper.html.information(info)
-  <form action="@if(account.isDefined){@url(account.get.userName)/_edit}else{@path/register}" method="POST" validate="true">
+    <form action="@url(account.userName)/_edit" method="POST" validate="true">
-    <div class="row-fluid">
+    <div class="box">
-      <div class="span6">
+      <div class="box-header">Profile</div>
-        @if(account.isEmpty){
+      <div class="box-content">
-          <fieldset>
+        <div class="row-fluid">
-            <label for="userName"><strong>User name</strong></label>
+          <div class="span6">
-            <input type="text" name="userName" id="userName" value=""/>
+            @if(account.password.nonEmpty){
-            <span id="error-userName" class="error"></span>
+              <fieldset>
-          </fieldset>
+                <label for="password" class="strong">
-        }
+                  Password (input to change password):
-        <fieldset>
+                </label>
-          <label for="password"><strong>Password</strong>
+                <input type="password" name="password" id="password" value=""/>
-            @if(account.nonEmpty){
+                <span id="error-password" class="error"></span>
-              (Input to change password)
+              </fieldset>
             }
-          </label>
+            <fieldset>
-          <input type="password" name="password" id="password" value=""/>
+              <label for="fullName" class="strong">Full Name:</label>
-          <span id="error-password" class="error"></span>
+              <input type="text" name="fullName" id="fullName" value="@account.fullName"/>
-        </fieldset>
+              <span id="error-fullName" class="error"></span>
-        <fieldset>
+            </fieldset>
-          <label for="mailAddress"><strong>Mail Address</strong></label>
+            <fieldset>
-          <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
+              <label for="mailAddress" class="strong">Mail Address:</label>
-          <span id="error-mailAddress" class="error"></span>
+              <input type="text" name="mailAddress" id="mailAddress" value="@account.mailAddress"/>
-        </fieldset>
+              <span id="error-mailAddress" class="error"></span>
-        <fieldset>
+            </fieldset>
-          <label for="url"><strong>URL (Optional)</strong></label>
+            <fieldset>
-          <input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/>
+              <label for="url" class="strong">URL (optional):</label>
-          <span id="error-url" class="error"></span>
+              <input type="text" name="url" id="url" style="width: 300px;" value="@account.url"/>
-        </fieldset>
+              <span id="error-url" class="error"></span>
-      </div>
+            </fieldset>
-      <div class="span6">
+          </div>
-        <fieldset>
+          <div class="span6">
-          <label for="avatar"><strong>Image (Optional)</strong></label>
+            <fieldset>
-          @helper.html.uploadavatar(account)
+              <label for="avatar" class="strong">Image (optional):</label>
-        </fieldset>
+              @helper.html.uploadavatar(Some(account))
+            </fieldset>
+          </div>
+        </div>
+        <div style="margin-top: 20px;">
+          <div class="pull-right">
+            <a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
+          </div>
+          <input type="submit" class="btn btn-success" value="Save"/>
+          <a href="@url(account.userName)" class="btn">Cancel</a>
+        </div>
       </div>
     </div>
-    <fieldset class="margin">
-      @if(account.isDefined){
-        <input type="submit" class="btn btn-success" value="Save"/>
-        <a href="@url(account.get.userName)" class="btn">Cancel</a>
-      } else {
-        <input type="submit" class="btn btn-success" value="Create account"/>
-      }
-    </fieldset>
   </form>
+</div>
 }
+<script>
+$(function(){
+  $('#delete').click(function(){
+    return confirm('Once you delete your account, there is no going back.\nAre you sure?');
+  });
+});
+</script>

src/main/twirl/account/group.scala.html

@@ -0,0 +1,140 @@
+@(account: Option[model.Account], members: List[model.GroupMember])(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main(if(account.isEmpty) "Create group" else "Edit group"){
+<div>
+  <form id="form" method="post" action="@if(account.isEmpty){@path/groups/new} else {@path/@account.get.userName/_editgroup}" validate="true">
+      <div class="row-fluid">
+        <div class="span5">
+          <fieldset>
+            <label for="groupName" class="strong">Group name</label>
+            <div>
+              <span id="error-groupName" class="error"></span>
+            </div>
+            <input type="text" name="groupName" id="groupName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
+          </fieldset>
+          <fieldset>
+            <label class="strong">URL (Optional)</label>
+            <div>
+              <span id="error-url" class="error"></span>
+            </div>
+            <input type="text" name="url" id="url" style="width: 300px;" value="@account.map(_.url)"/>
+          </fieldset>
+          <fieldset>
+            <label for="avatar" class="strong">Image (Optional)</label>
+            @helper.html.uploadavatar(account)
+          </fieldset>
+        </div>
+        <div class="span7">
+          <fieldset>
+            <label class="strong">Members</label>
+            <ul id="member-list" class="collaborator">
+            </ul>
+            @helper.html.account("memberName", 200)
+            <input type="button" class="btn" value="Add" id="addMember"/>
+            <input type="hidden" id="members" name="members" value="@members.map(member => member.userName + ":" + member.isManager).mkString(",")"/>
+            <div>
+              <span class="error" id="error-members"></span>
+            </div>
+          </fieldset>
+        </div>
+      </div>
+      <fieldset class="margin">
+        @if(account.isDefined){
+          <div class="pull-right">
+            <a href="@url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger">Delete Group</a>
+          </div>
+        }
+        <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create Group} else {Update Group}"/>
+        @if(account.isDefined){
+          <a href="@url(account.get.userName)" class="btn">Cancel</a>
+        }
+      </fieldset>
+  </form>
+</div>
+}
+<script>
+$(function(){
+  $('input[type=submit]').click(function(){
+    updateMembers();
+  });
+
+  $('#addMember').click(function(){
+    $('#error-memberName').text('');
+    var userName = $('#memberName').val();
+
+    // check empty
+    if($.trim(userName) == ''){
+      return false;
+    }
+
+    // check duplication
+    var exists = $('#member-list li').filter(function(){
+      return $(this).data('name') == userName;
+    }).length > 0;
+    if(exists){
+      $('#error-memberName').text('User has been already added.');
+      return false;
+    }
+
+    // check existence
+    $.post('@path/admin/users/_usercheck', {
+      'userName': userName
+    }, function(data, status){
+      if(data == 'true'){
+        addMemberHTML(userName, false);
+      } else {
+        $('#error-memberName').text('User does not exist.');
+      }
+    });
+  });
+
+  $(document).on('click', '.remove', function(){
+    $(this).parent().remove();
+  });
+
+  // Don't submit form by ENTER key
+  $('#memberName').keypress(function(e){
+    return !(e.keyCode == 13);
+  });
+
+  $('#delete').click(function(){
+    return confirm('Once you delete this group, there is no going back.\nAre you sure?');
+  });
+
+  @members.map { member =>
+    addMemberHTML('@member.userName', @member.isManager);
+  }
+
+  function addMemberHTML(userName, isManager){
+    var memberButton = $('<button type="button" class="btn btn-default btn-mini" value="false">Member</button>').data('name', userName);
+    if(!isManager){
+      memberButton.addClass('active');
+    }
+    var managerButton = $('<button type="button" class="btn btn-default btn-mini" value="true">Manager</button>').data('name', userName);
+    if(isManager){
+      managerButton.addClass('active');
+    }
+
+    $('#member-list').append($('<li>')
+      .data('name', userName)
+      .append($('<div class="btn-group is_manager" data-toggle="buttons-radio">')
+        .append(memberButton)
+        .append(managerButton))
+      .append(' ')
+      .append($('<a>').attr('href', '@path/' + userName).text(userName))
+      .append(' ')
+      .append($('<a href="#" class="remove pull-right">(remove)</a>')));
+  }
+
+  function updateMembers(){
+    var members = $('#member-list li').map(function(i, e){
+      var userName = $(e).data('name');
+      return userName + ':' + $('button.active').filter(function(i, e){
+        return $(e).data('name') == userName;
+      }).attr('value');
+    }).get().join(',');
+    $('#members').val(members);
+  }
+});
+</script>

src/main/twirl/account/main.scala.html

@@ -1,4 +1,5 @@
-@(account: model.Account, groupNames: List[String], active: String)(body: Html)(implicit context: app.Context)
+@(account: model.Account, groupNames: List[String], active: String,
+  isGroupManager: Boolean = false)(body: Html)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @html.main(account.userName){
@@ -7,7 +8,8 @@
       <div class="span4">
         <div class="block">
           <div class="account-image">@avatar(account.userName, 200)</div>
-          <div class="block-header">@account.userName</div>
+          <div class="account-fullname">@account.fullName</div>
+          <div class="account-username">@account.userName</div>
         </div>
         <div class="block">
           @if(account.url.isDefined){
@@ -40,6 +42,13 @@
               </div>
             </li>
           }
+          @if(loginAccount.isDefined && account.isGroupAccount && isGroupManager){
+            <li class="pull-right">
+              <div class="button-group">
+                <a href="@url(account.userName)/_editgroup" class="btn">Edit Group</a>
+              </div>
+            </li>
+          }
         </ul>
         @body
       </div>