Skip to content

The Unified and Autonomous Development Platform

Reorganize GitPlex server projects

robin shineb8ca356829de
diff --git a/antlr/pom.xml b/antlr/pom.xml
deleted file mode 100644
index 955b194f78..0000000000
--- a/antlr/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>server-antlr</artifactId>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>server-parent</artifactId>
- <version>1.0-EAP-build26</version>
- <relativePath>../parent</relativePath>
- </parent>
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.antlr</groupId>
- <artifactId>antlr4-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/Lex*.g4</exclude>
- </excludes>
- <libDirectory>${basedir}/src/main/java/com/gitplex/commons/antlr</libDirectory>
- <listener>false</listener>
- <visitor>false</visitor>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-util</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- </dependencies>
- <properties>
- <moduleClass>com.gitplex.commons.antlr.PluginModule</moduleClass>
- </properties>
-</project>
\ No newline at end of file
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/ANTLRv4Lexer.g4 b/antlr/src/main/java/com/gitplex/commons/antlr/ANTLRv4Lexer.g4
deleted file mode 100644
index 083daa18f3..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/ANTLRv4Lexer.g4
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * [The "BSD license"]
- * Copyright (c) 2012-2015 Terence Parr
- * Copyright (c) 2012-2015 Sam Harwell
- * Copyright (c) 2015 Gerald Rosenberg
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * A grammar for ANTLR v4 implemented using v4 syntax
- *
- * Modified 2015.06.16 gbr
- * -- update for compatibility with Antlr v4.5
- */
-
-lexer grammar ANTLRv4Lexer;
-
-options {
- superClass = LexerAdaptor ;
-}
-
-import LexBasic; // Standard set of fragments
-
-tokens {
- TOKEN_REF,
- RULE_REF,
- LEXER_CHAR_SET
-}
-
-channels {
- OFF_CHANNEL // non-default channel for whitespace and comments
-}
-
-
-// ======================================================
-// Lexer specification
-//
-
-// -------------------------
-// Comments
-
-DOC_COMMENT
- : DocComment
- ;
-
-BLOCK_COMMENT
- : BlockComment -> channel(OFF_CHANNEL)
- ;
-
-LINE_COMMENT
- : LineComment -> channel(OFF_CHANNEL)
- ;
-
-
-// -------------------------
-// Integer
-//
-
-INT : DecimalNumeral
- ;
-
-
-// -------------------------
-// Literal string
-//
-// ANTLR makes no distinction between a single character literal and a
-// multi-character string. All literals are single quote delimited and
-// may contain unicode escape sequences of the form \uxxxx, where x
-// is a valid hexadecimal number (per Unicode standard).
-
-STRING_LITERAL
- : SQuoteLiteral
- ;
-
-UNTERMINATED_STRING_LITERAL
- : USQuoteLiteral
- ;
-
-
-// -------------------------
-// Arguments
-//
-// Certain argument lists, such as those specifying call parameters
-// to a rule invocation, or input parameters to a rule specification
-// are contained within square brackets.
-
-BEGIN_ARGUMENT
- : LBrack { handleBeginArgument(); }
- ;
-
-
-// -------------------------
-// Actions
-
-BEGIN_ACTION
- : LBrace -> pushMode(Action)
- ;
-
-
-// -------------------------
-// Keywords
-//
-// Keywords may not be used as labels for rules or in any other context where
-// they would be ambiguous with the keyword vs some other identifier. OPTIONS,
-// TOKENS, & CHANNELS blocks are handled idiomatically in dedicated lexical modes.
-
-OPTIONS : 'options' -> pushMode(Options) ;
-TOKENS : 'tokens' -> pushMode(Tokens) ;
-CHANNELS : 'channels' -> pushMode(Channels) ;
-
-IMPORT : 'import' ;
-FRAGMENT : 'fragment' ;
-LEXER : 'lexer' ;
-PARSER : 'parser' ;
-GRAMMAR : 'grammar' ;
-PROTECTED : 'protected' ;
-PUBLIC : 'public' ;
-PRIVATE : 'private' ;
-RETURNS : 'returns' ;
-LOCALS : 'locals' ;
-THROWS : 'throws' ;
-CATCH : 'catch' ;
-FINALLY : 'finally' ;
-MODE : 'mode' ;
-
-
-// -------------------------
-// Punctuation
-
-COLON : Colon ;
-COLONCOLON : DColon ;
-COMMA : Comma ;
-SEMI : Semi ;
-LPAREN : LParen ;
-RPAREN : RParen ;
-LBRACE : LBrace ;
-RBRACE : RBrace ;
-RARROW : RArrow ;
-LT : Lt ;
-GT : Gt ;
-ASSIGN : Equal ;
-QUESTION : Question ;
-STAR : Star ;
-PLUS_ASSIGN : PlusAssign ;
-PLUS : Plus ;
-OR : Pipe ;
-DOLLAR : Dollar ;
-RANGE : Range ;
-DOT : Dot ;
-AT : At ;
-POUND : Pound ;
-NOT : Tilde ;
-
-
-// -------------------------
-// Identifiers - allows unicode rule/token names
-
-ID : Id
- ;
-
-
-// -------------------------
-// Whitespace
-
-WS : ( Hws | Vws )+ -> channel(OFF_CHANNEL) ;
-
-
-// -------------------------
-// Illegal Characters
-//
-// This is an illegal character trap which is always the last rule in the
-// lexer specification. It matches a single character of any value and being
-// the last rule in the file will match when no other rule knows what to do
-// about the character. It is reported as an error but is not passed on to the
-// parser. This means that the parser to deal with the gramamr file anyway
-// but we will not try to analyse or code generate from a file with lexical
-// errors.
-//
-// Comment this rule out to allow the error to be propagated to the parser
-
-ERRCHAR
- : . -> channel(HIDDEN)
- ;
-
-
-// ======================================================
-// Lexer modes
-
-// -------------------------
-// Arguments
-
-mode Argument; // E.g., [int x, List<String> a[]]
-
- NESTED_ARGUMENT : LBrack -> type(ARGUMENT_CONTENT), pushMode(Argument) ;
-
- ARGUMENT_ESCAPE : EscAny -> type(ARGUMENT_CONTENT) ;
-
- ARGUMENT_STRING_LITERAL : DQuoteLiteral -> type(ARGUMENT_CONTENT) ;
- ARGUMENT_CHAR_LITERAL : SQuoteLiteral -> type(ARGUMENT_CONTENT) ;
-
- END_ARGUMENT : RBrack { handleEndArgument(); } ;
-
- // added this to return non-EOF token type here. EOF does something weird
- UNTERMINATED_ARGUMENT : EOF -> popMode ;
-
- ARGUMENT_CONTENT : . ;
-
-
-// -------------------------
-// Actions
-//
-// Many language targets use {} as block delimiters and so we
-// must recursively match {} delimited blocks to balance the
-// braces. Additionally, we must make some assumptions about
-// literal string representation in the target language. We assume
-// that they are delimited by ' or " and so consume these
-// in their own alts so as not to inadvertantly match {}.
-
-mode Action;
-
- NESTED_ACTION : LBrace -> type(ACTION_CONTENT), pushMode(Action) ;
-
- ACTION_ESCAPE : EscAny -> type(ACTION_CONTENT) ;
-
- ACTION_STRING_LITERAL : DQuoteLiteral -> type(ACTION_CONTENT) ;
- ACTION_CHAR_LITERAL : SQuoteLiteral -> type(ACTION_CONTENT) ;
-
- ACTION_DOC_COMMENT : DocComment -> type(ACTION_CONTENT) ;
- ACTION_BLOCK_COMMENT : BlockComment -> type(ACTION_CONTENT) ;
- ACTION_LINE_COMMENT : LineComment -> type(ACTION_CONTENT) ;
-
- END_ACTION : RBrace { handleEndAction(); } ;
-
- UNTERMINATED_ACTION : EOF -> popMode ;
-
- ACTION_CONTENT : . ;
-
-
-// -------------------------
-
-mode Options;
-
- OPT_DOC_COMMENT : DocComment -> type(DOC_COMMENT), channel(OFF_CHANNEL) ;
- OPT_BLOCK_COMMENT : BlockComment -> type(BLOCK_COMMENT), channel(OFF_CHANNEL) ;
- OPT_LINE_COMMENT : LineComment -> type(LINE_COMMENT), channel(OFF_CHANNEL) ;
-
- OPT_LBRACE : LBrace -> type(LBRACE) ;
- OPT_RBRACE : RBrace -> type(RBRACE), popMode ;
-
- OPT_ID : Id -> type(ID) ;
- OPT_DOT : Dot -> type(DOT) ;
- OPT_ASSIGN : Equal -> type(ASSIGN) ;
- OPT_STRING_LITERAL : SQuoteLiteral -> type(STRING_LITERAL) ;
- OPT_INT : Int -> type(INT) ;
- OPT_STAR : Star -> type(STAR) ;
- OPT_SEMI : Semi -> type(SEMI) ;
-
- OPT_WS : ( Hws | Vws )+ -> type(WS), channel(OFF_CHANNEL) ;
-
-
-// -------------------------
-
-mode Tokens;
-
- TOK_DOC_COMMENT : DocComment -> type(DOC_COMMENT), channel(OFF_CHANNEL) ;
- TOK_BLOCK_COMMENT : BlockComment -> type(BLOCK_COMMENT), channel(OFF_CHANNEL) ;
- TOK_LINE_COMMENT : LineComment -> type(LINE_COMMENT), channel(OFF_CHANNEL) ;
-
- TOK_LBRACE : LBrace -> type(LBRACE) ;
- TOK_RBRACE : RBrace -> type(RBRACE), popMode ;
-
- TOK_ID : Id -> type(ID) ;
- TOK_DOT : Dot -> type(DOT) ;
- TOK_COMMA : Comma -> type(COMMA) ;
-
- TOK_WS : ( Hws | Vws )+ -> type(WS), channel(OFF_CHANNEL) ;
-
-
-// -------------------------
-
-mode Channels; // currently same as Tokens mode; distinguished by keyword
-
- CHN_DOC_COMMENT : DocComment -> type(DOC_COMMENT), channel(OFF_CHANNEL) ;
- CHN_BLOCK_COMMENT : BlockComment -> type(BLOCK_COMMENT), channel(OFF_CHANNEL) ;
- CHN_LINE_COMMENT : LineComment -> type(LINE_COMMENT), channel(OFF_CHANNEL) ;
-
- CHN_LBRACE : LBrace -> type(LBRACE) ;
- CHN_RBRACE : RBrace -> type(RBRACE), popMode ;
-
- CHN_ID : Id -> type(ID) ;
- CHN_DOT : Dot -> type(DOT) ;
- CHN_COMMA : Comma -> type(COMMA) ;
-
- CHN_WS : ( Hws | Vws )+ -> type(WS), channel(OFF_CHANNEL) ;
-
-
-// -------------------------
-
-mode LexerCharSet;
-
- LEXER_CHAR_SET_BODY
- : ( ~[\]\\]
- | EscAny
- )+ -> more
- ;
-
- LEXER_CHAR_SET
- : RBrack -> popMode
- ;
-
- UNTERMINATED_CHAR_SET
- : EOF -> popMode
- ;
-
-
-// ------------------------------------------------------------------------------
-// Grammar specific Keywords, Punctuation, etc.
-
-fragment Id : NameStartChar NameChar* ;
-
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/ANTLRv4Parser.g4 b/antlr/src/main/java/com/gitplex/commons/antlr/ANTLRv4Parser.g4
deleted file mode 100644
index 6c9966f48f..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/ANTLRv4Parser.g4
+++ /dev/null
@@ -1,423 +0,0 @@
-/*
- * [The "BSD license"]
- * Copyright (c) 2012-2014 Terence Parr
- * Copyright (c) 2012-2014 Sam Harwell
- * Copyright (c) 2015 Gerald Rosenberg
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* A grammar for ANTLR v4 written in ANTLR v4.
- *
- * Modified 2015.06.16 gbr
- * -- update for compatibility with Antlr v4.5
- * -- add mode for channels
- * -- moved members to LexerAdaptor
- * -- move fragments to imports
- */
-
-parser grammar ANTLRv4Parser;
-
-options {
- tokenVocab = ANTLRv4Lexer ;
-}
-
-// The main entry point for parsing a v4 grammar.
-grammarSpec
- : DOC_COMMENT?
- grammarType id SEMI
- prequelConstruct*
- rules
- modeSpec*
- EOF
- ;
-
-grammarType
- : ( LEXER GRAMMAR
- | PARSER GRAMMAR
- | GRAMMAR
- )
- ;
-
-// This is the list of all constructs that can be declared before
-// the set of rules that compose the grammar, and is invoked 0..n
-// times by the grammarPrequel rule.
-prequelConstruct
- : optionsSpec
- | delegateGrammars
- | tokensSpec
- | channelsSpec
- | action
- ;
-
-
-// ------------
-// Options - things that affect analysis and/or code generation
-
-optionsSpec
- : OPTIONS LBRACE (option SEMI)* RBRACE
- ;
-
-option
- : id ASSIGN optionValue
- ;
-
-optionValue
- : id (DOT id)*
- | STRING_LITERAL
- | actionBlock // TODO: is this valid?
- | INT
- ;
-
-// ------------
-// Delegates
-
-delegateGrammars
- : IMPORT delegateGrammar (COMMA delegateGrammar)* SEMI
- ;
-
-delegateGrammar
- : id ASSIGN id
- | id
- ;
-
-
-// ------------
-// Tokens & Channels
-
-tokensSpec
- : TOKENS LBRACE idList? RBRACE
- ;
-
-channelsSpec
- : CHANNELS LBRACE idList? RBRACE
- ;
-
-idList
- : id ( COMMA id )* COMMA?
- ;
-
-
-// Match stuff like @parser::members {int i;}
-action
- : AT (actionScopeName COLONCOLON)? id actionBlock
- ;
-
-// Scope names could collide with keywords; allow them as ids for action scopes
-actionScopeName
- : id
- | LEXER
- | PARSER
- ;
-
-actionBlock
- : BEGIN_ACTION ACTION_CONTENT* END_ACTION
- ;
-
-argActionBlock
- : BEGIN_ARGUMENT ARGUMENT_CONTENT* END_ARGUMENT
- ;
-
-modeSpec
- : MODE id SEMI lexerRuleSpec*
- ;
-
-rules
- : ruleSpec*
- ;
-
-ruleSpec
- : parserRuleSpec
- | lexerRuleSpec
- ;
-
-parserRuleSpec
- : DOC_COMMENT?
- ruleModifiers? RULE_REF argActionBlock? ruleReturns? throwsSpec?
- localsSpec?
- rulePrequel*
- COLON
- ruleBlock
- SEMI
- exceptionGroup
- ;
-
-exceptionGroup
- : exceptionHandler* finallyClause?
- ;
-
-exceptionHandler
- : CATCH argActionBlock actionBlock
- ;
-
-finallyClause
- : FINALLY actionBlock
- ;
-
-rulePrequel
- : optionsSpec
- | ruleAction
- ;
-
-ruleReturns
- : RETURNS argActionBlock
- ;
-
-// --------------
-// Exception spec
-
-throwsSpec
- : THROWS id (COMMA id)*
- ;
-
-localsSpec
- : LOCALS argActionBlock
- ;
-
-/** Match stuff like @init {int i;} */
-ruleAction
- : AT id actionBlock
- ;
-
-ruleModifiers
- : ruleModifier+
- ;
-
-// An individual access modifier for a rule. The 'fragment' modifier
-// is an internal indication for lexer rules that they do not match
-// from the input but are like subroutines for other lexer rules to
-// reuse for certain lexical patterns. The other modifiers are passed
-// to the code generation templates and may be ignored by the template
-// if they are of no use in that language.
-ruleModifier
- : PUBLIC
- | PRIVATE
- | PROTECTED
- | FRAGMENT
- ;
-
-ruleBlock
- : ruleAltList
- ;
-
-ruleAltList
- : labeledAlt (OR labeledAlt)*
- ;
-
-labeledAlt
- : alternative (POUND id)?
- ;
-
-// --------------------
-// Lexer rules
-
-lexerRuleSpec
- : DOC_COMMENT? FRAGMENT?
- TOKEN_REF COLON lexerRuleBlock SEMI
- ;
-
-lexerRuleBlock
- : lexerAltList
- ;
-
-lexerAltList
- : lexerAlt (OR lexerAlt)*
- ;
-
-lexerAlt
- : lexerElements lexerCommands?
- | // explicitly allow empty alts
- ;
-
-lexerElements
- : lexerElement+
- ;
-
-lexerElement
- : labeledLexerElement ebnfSuffix?
- | lexerAtom ebnfSuffix?
- | lexerBlock ebnfSuffix?
- | actionBlock QUESTION? // actions only allowed at end of outer alt actually,
- ; // but preds can be anywhere
-
-labeledLexerElement
- : id (ASSIGN|PLUS_ASSIGN)
- ( lexerAtom
- | block
- )
- ;
-
-lexerBlock
- : LPAREN lexerAltList RPAREN
- ;
-
-// E.g., channel(HIDDEN), skip, more, mode(INSIDE), push(INSIDE), pop
-lexerCommands
- : RARROW lexerCommand (COMMA lexerCommand)*
- ;
-
-lexerCommand
- : lexerCommandName LPAREN lexerCommandExpr RPAREN
- | lexerCommandName
- ;
-
-lexerCommandName
- : id
- | MODE
- ;
-
-lexerCommandExpr
- : id
- | INT
- ;
-
-// --------------------
-// Rule Alts
-
-altList
- : alternative (OR alternative)*
- ;
-
-alternative
- : elementOptions? element+
- | // explicitly allow empty alts
- ;
-
-element
- : labeledElement
- ( ebnfSuffix
- |
- )
- | atom
- ( ebnfSuffix
- |
- )
- | ebnf
- | actionBlock QUESTION? // SEMPRED is actionBlock followed by QUESTION
- ;
-
-labeledElement
- : id ( ASSIGN | PLUS_ASSIGN )
- ( atom
- | block
- )
- ;
-
-// --------------------
-// EBNF and blocks
-
-ebnf
- : block blockSuffix?
- ;
-
-blockSuffix
- : ebnfSuffix // Standard EBNF
- ;
-
-ebnfSuffix
- : QUESTION QUESTION?
- | STAR QUESTION?
- | PLUS QUESTION?
- ;
-
-lexerAtom
- : range
- | terminal
- | RULE_REF
- | notSet
- | LEXER_CHAR_SET
- | DOT elementOptions?
- ;
-
-atom
- : range // Range x..y - only valid in lexers
- | terminal
- | ruleref
- | notSet
- | DOT elementOptions?
- ;
-
-// --------------------
-// Inverted element set
-
-notSet
- : NOT setElement
- | NOT blockSet
- ;
-
-blockSet
- : LPAREN setElement (OR setElement)* RPAREN
- ;
-
-setElement
- : TOKEN_REF elementOptions?
- | STRING_LITERAL elementOptions?
- | range
- | LEXER_CHAR_SET
- ;
-
-// -------------
-// Grammar Block
-
-block
- : LPAREN
- ( optionsSpec? ruleAction* COLON )?
- altList
- RPAREN
- ;
-
-// ----------------
-// Parser rule ref
-
-ruleref
- : RULE_REF argActionBlock? elementOptions?
- ;
-
-// ---------------
-// Character Range
-
-range
- : STRING_LITERAL RANGE STRING_LITERAL
- ;
-
-terminal
- : TOKEN_REF elementOptions?
- | STRING_LITERAL elementOptions?
- ;
-
-// Terminals may be adorned with certain options when
-// reference in the grammar: TOK<,,,>
-elementOptions
- : LT elementOption (COMMA elementOption)* GT
- ;
-
-elementOption
- : id // default node option
- | id ASSIGN (id | STRING_LITERAL) // option assignment
- ;
-
-id : RULE_REF
- | TOKEN_REF
- ;
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/AntlrUtils.java b/antlr/src/main/java/com/gitplex/commons/antlr/AntlrUtils.java
deleted file mode 100644
index a1f07b2dd3..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/AntlrUtils.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.gitplex.commons.antlr;
-
-import org.antlr.v4.runtime.Lexer;
-import org.antlr.v4.runtime.Parser;
-
-public class AntlrUtils {
-
- public static String getDefaultGrammarFile(Class<?> lexerClass) {
- String lexerName = lexerClass.getName().replace(".", "/");
- return lexerName.substring(0, lexerName.length() - "Lexer".length()) + ".g4";
- }
-
- public static String getDefaultTokenFile(Class<?> lexerClass) {
- return lexerClass.getSimpleName() + ".tokens";
- }
-
- @SuppressWarnings("unchecked")
- public static Class<? extends Lexer> getLexerClass(Class<? extends Parser> parserClass) {
- String parserClassName = parserClass.getName();
- String lexerClassName = parserClassName.substring(0, parserClassName.length()-"Parser".length()) + "Lexer";
- try {
- return (Class<? extends Lexer>) Class.forName(lexerClassName);
- } catch (ClassNotFoundException e) {
- throw new RuntimeException(e);
- }
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/LexBasic.g4 b/antlr/src/main/java/com/gitplex/commons/antlr/LexBasic.g4
deleted file mode 100644
index 1422d120cf..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/LexBasic.g4
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * [The "BSD license"]
- * Copyright (c) 2014-2015 Gerald Rosenberg
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * A generally reusable set of fragments for import in to Lexer grammars.
- *
- * Modified 2015.06.16 gbr -
- * -- generalized for inclusion into the ANTLRv4 grammar distribution
- *
- */
-
-lexer grammar LexBasic;
-
-import LexUnicode; // Formal set of Unicode ranges
-
-
-// ======================================================
-// Lexer fragments
-//
-
-
-// -----------------------------------
-// Whitespace & Comments
-
-fragment Ws : Hws | Vws ;
-fragment Hws : [ \t] ;
-fragment Vws : [\r\n\f] ;
-
-fragment DocComment : '/**' .*? ('*/' | EOF) ;
-fragment BlockComment : '/*' .*? ('*/' | EOF) ;
-
-fragment LineComment : '//' ~[\r\n]* ;
-fragment LineCommentExt : '//' ~'\n'* ( '\n' Hws* '//' ~'\n'* )* ;
-
-
-// -----------------------------------
-// Escapes
-
-// Any kind of escaped character that we can embed within ANTLR literal strings.
-fragment EscSeq
- : Esc
- ( [btnfr"'\\] // The standard escaped character set such as tab, newline, etc.
- | UnicodeEsc // A Unicode escape sequence
- | . // Invalid escape character
- | EOF // Incomplete at EOF
- )
- ;
-
-fragment EscAny
- : Esc .
- ;
-
-fragment UnicodeEsc
- : 'u' (HexDigit (HexDigit (HexDigit HexDigit?)?)?)?
- ;
-
-fragment OctalEscape
- : OctalDigit
- | OctalDigit OctalDigit
- | [0-3] OctalDigit OctalDigit
- ;
-
-
-// -----------------------------------
-// Numerals
-
-fragment HexNumeral
- : '0' [xX] HexDigits
- ;
-
-fragment OctalNumeral
- : '0' '_' OctalDigits
- ;
-
-fragment DecimalNumeral
- : '0'
- | [1-9] DecDigit*
- ;
-
-fragment BinaryNumeral
- : '0' [bB] BinaryDigits
- ;
-
-
-// -----------------------------------
-// Digits
-
-fragment HexDigits : HexDigit+ ;
-fragment DecDigits : DecDigit+ ;
-fragment OctalDigits : OctalDigit+ ;
-fragment BinaryDigits : BinaryDigit+ ;
-
-fragment HexDigit : [0-9a-fA-F] ;
-fragment DecDigit : [0-9] ;
-fragment OctalDigit : [0-7] ;
-fragment BinaryDigit : [01] ;
-
-
-// -----------------------------------
-// Literals
-
-fragment BoolLiteral : True | False ;
-
-fragment CharLiteral : SQuote ( EscSeq | ~['\r\n\\] ) SQuote ;
-fragment SQuoteLiteral : SQuote ( EscSeq | ~['\r\n\\] )* SQuote ;
-fragment DQuoteLiteral : DQuote ( EscSeq | ~["\r\n\\] )* DQuote ;
-fragment USQuoteLiteral : SQuote ( EscSeq | ~['\r\n\\] )* ;
-
-fragment DecimalFloatingPointLiteral
- : DecDigits DOT DecDigits? ExponentPart? FloatTypeSuffix?
- | DOT DecDigits ExponentPart? FloatTypeSuffix?
- | DecDigits ExponentPart FloatTypeSuffix?
- | DecDigits FloatTypeSuffix
- ;
-
-fragment ExponentPart
- : [eE] [+-]? DecDigits
- ;
-
-fragment FloatTypeSuffix
- : [fFdD]
- ;
-
-fragment HexadecimalFloatingPointLiteral
- : HexSignificand BinaryExponent FloatTypeSuffix?
- ;
-
-fragment HexSignificand
- : HexNumeral DOT?
- | '0' [xX] HexDigits? DOT HexDigits
- ;
-
-fragment BinaryExponent
- : [pP] [+-]? DecDigits
- ;
-
-
-// -----------------------------------
-// Character ranges
-
-fragment NameChar
- : NameStartChar
- | '0'..'9'
- | Underscore
- | '\u00B7'
- | '\u0300'..'\u036F'
- | '\u203F'..'\u2040'
- ;
-
-fragment NameStartChar
- : 'A'..'Z'
- | 'a'..'z'
- | '\u00C0'..'\u00D6'
- | '\u00D8'..'\u00F6'
- | '\u00F8'..'\u02FF'
- | '\u0370'..'\u037D'
- | '\u037F'..'\u1FFF'
- | '\u200C'..'\u200D'
- | '\u2070'..'\u218F'
- | '\u2C00'..'\u2FEF'
- | '\u3001'..'\uD7FF'
- | '\uF900'..'\uFDCF'
- | '\uFDF0'..'\uFFFD'
- ; // ignores | ['\u10000-'\uEFFFF] ;
-
-
-fragment JavaLetter
- : [a-zA-Z$_] // "java letters" below 0xFF
- | JavaUnicodeChars
- ;
-
-fragment JavaLetterOrDigit
- : [a-zA-Z0-9$_] // "java letters or digits" below 0xFF
- | JavaUnicodeChars
- ;
-
-// covers all characters above 0xFF which are not a surrogate
-// and UTF-16 surrogate pairs encodings for U+10000 to U+10FFFF
-fragment JavaUnicodeChars
- : ~[\u0000-\u00FF\uD800-\uDBFF] {Character.isJavaIdentifierPart(_input.LA(-1))}?
- | [\uD800-\uDBFF] [\uDC00-\uDFFF] {Character.isJavaIdentifierPart(Character.toCodePoint((char)_input.LA(-2), (char)_input.LA(-1)))}?
- ;
-
-
-// -----------------------------------
-// Types
-
-fragment Boolean : 'boolean' ;
-fragment Byte : 'byte' ;
-fragment Short : 'short' ;
-fragment Int : 'int' ;
-fragment Long : 'long' ;
-fragment Char : 'char' ;
-fragment Float : 'float' ;
-fragment Double : 'double' ;
-
-fragment True : 'true' ;
-fragment False : 'false' ;
-
-
-// -----------------------------------
-// Symbols
-
-fragment Esc : '\\' ;
-fragment Colon : ':' ;
-fragment DColon : '::' ;
-fragment SQuote : '\'' ;
-fragment DQuote : '"' ;
-fragment BQuote : '`' ;
-fragment LParen : '(' ;
-fragment RParen : ')' ;
-fragment LBrace : '{' ;
-fragment RBrace : '}' ;
-fragment LBrack : '[' ;
-fragment RBrack : ']' ;
-fragment RArrow : '->' ;
-fragment Lt : '<' ;
-fragment Gt : '>' ;
-fragment Lte : '<=' ;
-fragment Gte : '>=' ;
-fragment Equal : '=' ;
-fragment NotEqual : '!=' ;
-fragment Question : '?' ;
-fragment Bang : '!' ;
-fragment Star : '*' ;
-fragment Slash : '/' ;
-fragment Percent : '%' ;
-fragment Caret : '^' ;
-fragment Plus : '+' ;
-fragment Minus : '-' ;
-fragment PlusAssign : '+=' ;
-fragment MinusAssign : '-=' ;
-fragment MulAssign : '*=' ;
-fragment DivAssign : '/=' ;
-fragment AndAssign : '&=' ;
-fragment OrAssign : '|=' ;
-fragment XOrAssign : '^=' ;
-fragment ModAssign : '%=' ;
-fragment LShiftAssign : '<<=' ;
-fragment RShiftAssign : '>>=' ;
-fragment URShiftAssign : '>>>=';
-fragment Underscore : '_' ;
-fragment Pipe : '|' ;
-fragment Amp : '&' ;
-fragment And : '&&' ;
-fragment Or : '||' ;
-fragment Inc : '++' ;
-fragment Dec : '--' ;
-fragment LShift : '<<' ;
-fragment RShift : '>>' ;
-fragment Dollar : '$' ;
-fragment Comma : ',' ;
-fragment Semi : ';' ;
-fragment Dot : '.' ;
-fragment Range : '..' ;
-fragment Ellipsis : '...' ;
-fragment At : '@' ;
-fragment Pound : '#' ;
-fragment Tilde : '~' ;
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/LexUnicode.g4 b/antlr/src/main/java/com/gitplex/commons/antlr/LexUnicode.g4
deleted file mode 100644
index 8aeb0e0a70..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/LexUnicode.g4
+++ /dev/null
@@ -1,643 +0,0 @@
-/*
- * [The "BSD license"]
- * Copyright (c) 2014-2015 Gerald Rosenberg
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * A generally reusable Unicode character set description for import in to Lexer grammars.
- *
- * Modified 2015.06.16 gbr -
- * -- generalized for inclusion into the ANTLRv4 grammar distribution
- *
- */
-
-lexer grammar LexUnicode;
-
-// ======================================================
-// Lexer fragments
-//
-
-fragment UnicodeLetter
- : UnicodeClass_LU
- | UnicodeClass_LL
- | UnicodeClass_LT
- | UnicodeClass_LM
- | UnicodeClass_LO
- ;
-
-fragment UnicodeClass_LU
- : '\u0041'..'\u005a'
- | '\u00c0'..'\u00de'
- | '\u00d8'..'\u00de'
- | '\u0100'..'\u0136'
- | '\u0139'..'\u0147'
- | '\u014a'..'\u0178'
- | '\u0179'..'\u017d'
- | '\u0181'..'\u0182'
- | '\u0184'..'\u0186'
- | '\u0187'..'\u0189'
- | '\u018a'..'\u018b'
- | '\u018e'..'\u0191'
- | '\u0193'..'\u0194'
- | '\u0196'..'\u0198'
- | '\u019c'..'\u019d'
- | '\u019f'..'\u01a0'
- | '\u01a2'..'\u01a6'
- | '\u01a7'..'\u01a9'
- | '\u01ac'..'\u01ae'
- | '\u01af'..'\u01b1'
- | '\u01b2'..'\u01b3'
- | '\u01b5'..'\u01b7'
- | '\u01b8'..'\u01bc'
- | '\u01c4'..'\u01cd'
- | '\u01cf'..'\u01db'
- | '\u01de'..'\u01ee'
- | '\u01f1'..'\u01f4'
- | '\u01f6'..'\u01f8'
- | '\u01fa'..'\u0232'
- | '\u023a'..'\u023b'
- | '\u023d'..'\u023e'
- | '\u0241'..'\u0243'
- | '\u0244'..'\u0246'
- | '\u0248'..'\u024e'
- | '\u0370'..'\u0372'
- | '\u0376'..'\u037f'
- | '\u0386'..'\u0388'
- | '\u0389'..'\u038a'
- | '\u038c'..'\u038e'
- | '\u038f'..'\u0391'
- | '\u0392'..'\u03a1'
- | '\u03a3'..'\u03ab'
- | '\u03cf'..'\u03d2'
- | '\u03d3'..'\u03d4'
- | '\u03d8'..'\u03ee'
- | '\u03f4'..'\u03f7'
- | '\u03f9'..'\u03fa'
- | '\u03fd'..'\u042f'
- | '\u0460'..'\u0480'
- | '\u048a'..'\u04c0'
- | '\u04c1'..'\u04cd'
- | '\u04d0'..'\u052e'
- | '\u0531'..'\u0556'
- | '\u10a0'..'\u10c5'
- | '\u10c7'..'\u10cd'
- | '\u1e00'..'\u1e94'
- | '\u1e9e'..'\u1efe'
- | '\u1f08'..'\u1f0f'
- | '\u1f18'..'\u1f1d'
- | '\u1f28'..'\u1f2f'
- | '\u1f38'..'\u1f3f'
- | '\u1f48'..'\u1f4d'
- | '\u1f59'..'\u1f5f'
- | '\u1f68'..'\u1f6f'
- | '\u1fb8'..'\u1fbb'
- | '\u1fc8'..'\u1fcb'
- | '\u1fd8'..'\u1fdb'
- | '\u1fe8'..'\u1fec'
- | '\u1ff8'..'\u1ffb'
- | '\u2102'..'\u2107'
- | '\u210b'..'\u210d'
- | '\u2110'..'\u2112'
- | '\u2115'..'\u2119'
- | '\u211a'..'\u211d'
- | '\u2124'..'\u212a'
- | '\u212b'..'\u212d'
- | '\u2130'..'\u2133'
- | '\u213e'..'\u213f'
- | '\u2145'..'\u2183'
- | '\u2c00'..'\u2c2e'
- | '\u2c60'..'\u2c62'
- | '\u2c63'..'\u2c64'
- | '\u2c67'..'\u2c6d'
- | '\u2c6e'..'\u2c70'
- | '\u2c72'..'\u2c75'
- | '\u2c7e'..'\u2c80'
- | '\u2c82'..'\u2ce2'
- | '\u2ceb'..'\u2ced'
- | '\u2cf2'..'\ua640'
- | '\ua642'..'\ua66c'
- | '\ua680'..'\ua69a'
- | '\ua722'..'\ua72e'
- | '\ua732'..'\ua76e'
- | '\ua779'..'\ua77d'
- | '\ua77e'..'\ua786'
- | '\ua78b'..'\ua78d'
- | '\ua790'..'\ua792'
- | '\ua796'..'\ua7aa'
- | '\ua7ab'..'\ua7ad'
- | '\ua7b0'..'\ua7b1'
- | '\uff21'..'\uff3a'
- ;
-
-fragment UnicodeClass_LL
- : '\u0061'..'\u007A'
- | '\u00b5'..'\u00df'
- | '\u00e0'..'\u00f6'
- | '\u00f8'..'\u00ff'
- | '\u0101'..'\u0137'
- | '\u0138'..'\u0148'
- | '\u0149'..'\u0177'
- | '\u017a'..'\u017e'
- | '\u017f'..'\u0180'
- | '\u0183'..'\u0185'
- | '\u0188'..'\u018c'
- | '\u018d'..'\u0192'
- | '\u0195'..'\u0199'
- | '\u019a'..'\u019b'
- | '\u019e'..'\u01a1'
- | '\u01a3'..'\u01a5'
- | '\u01a8'..'\u01aa'
- | '\u01ab'..'\u01ad'
- | '\u01b0'..'\u01b4'
- | '\u01b6'..'\u01b9'
- | '\u01ba'..'\u01bd'
- | '\u01be'..'\u01bf'
- | '\u01c6'..'\u01cc'
- | '\u01ce'..'\u01dc'
- | '\u01dd'..'\u01ef'
- | '\u01f0'..'\u01f3'
- | '\u01f5'..'\u01f9'
- | '\u01fb'..'\u0233'
- | '\u0234'..'\u0239'
- | '\u023c'..'\u023f'
- | '\u0240'..'\u0242'
- | '\u0247'..'\u024f'
- | '\u0250'..'\u0293'
- | '\u0295'..'\u02af'
- | '\u0371'..'\u0373'
- | '\u0377'..'\u037b'
- | '\u037c'..'\u037d'
- | '\u0390'..'\u03ac'
- | '\u03ad'..'\u03ce'
- | '\u03d0'..'\u03d1'
- | '\u03d5'..'\u03d7'
- | '\u03d9'..'\u03ef'
- | '\u03f0'..'\u03f3'
- | '\u03f5'..'\u03fb'
- | '\u03fc'..'\u0430'
- | '\u0431'..'\u045f'
- | '\u0461'..'\u0481'
- | '\u048b'..'\u04bf'
- | '\u04c2'..'\u04ce'
- | '\u04cf'..'\u052f'
- | '\u0561'..'\u0587'
- | '\u1d00'..'\u1d2b'
- | '\u1d6b'..'\u1d77'
- | '\u1d79'..'\u1d9a'
- | '\u1e01'..'\u1e95'
- | '\u1e96'..'\u1e9d'
- | '\u1e9f'..'\u1eff'
- | '\u1f00'..'\u1f07'
- | '\u1f10'..'\u1f15'
- | '\u1f20'..'\u1f27'
- | '\u1f30'..'\u1f37'
- | '\u1f40'..'\u1f45'
- | '\u1f50'..'\u1f57'
- | '\u1f60'..'\u1f67'
- | '\u1f70'..'\u1f7d'
- | '\u1f80'..'\u1f87'
- | '\u1f90'..'\u1f97'
- | '\u1fa0'..'\u1fa7'
- | '\u1fb0'..'\u1fb4'
- | '\u1fb6'..'\u1fb7'
- | '\u1fbe'..'\u1fc2'
- | '\u1fc3'..'\u1fc4'
- | '\u1fc6'..'\u1fc7'
- | '\u1fd0'..'\u1fd3'
- | '\u1fd6'..'\u1fd7'
- | '\u1fe0'..'\u1fe7'
- | '\u1ff2'..'\u1ff4'
- | '\u1ff6'..'\u1ff7'
- | '\u210a'..'\u210e'
- | '\u210f'..'\u2113'
- | '\u212f'..'\u2139'
- | '\u213c'..'\u213d'
- | '\u2146'..'\u2149'
- | '\u214e'..'\u2184'
- | '\u2c30'..'\u2c5e'
- | '\u2c61'..'\u2c65'
- | '\u2c66'..'\u2c6c'
- | '\u2c71'..'\u2c73'
- | '\u2c74'..'\u2c76'
- | '\u2c77'..'\u2c7b'
- | '\u2c81'..'\u2ce3'
- | '\u2ce4'..'\u2cec'
- | '\u2cee'..'\u2cf3'
- | '\u2d00'..'\u2d25'
- | '\u2d27'..'\u2d2d'
- | '\ua641'..'\ua66d'
- | '\ua681'..'\ua69b'
- | '\ua723'..'\ua72f'
- | '\ua730'..'\ua731'
- | '\ua733'..'\ua771'
- | '\ua772'..'\ua778'
- | '\ua77a'..'\ua77c'
- | '\ua77f'..'\ua787'
- | '\ua78c'..'\ua78e'
- | '\ua791'..'\ua793'
- | '\ua794'..'\ua795'
- | '\ua797'..'\ua7a9'
- | '\ua7fa'..'\uab30'
- | '\uab31'..'\uab5a'
- | '\uab64'..'\uab65'
- | '\ufb00'..'\ufb06'
- | '\ufb13'..'\ufb17'
- | '\uff41'..'\uff5a'
- ;
-
-fragment UnicodeClass_LT
- : '\u01c5'..'\u01cb'
- | '\u01f2'..'\u1f88'
- | '\u1f89'..'\u1f8f'
- | '\u1f98'..'\u1f9f'
- | '\u1fa8'..'\u1faf'
- | '\u1fbc'..'\u1fcc'
- | '\u1ffc'..'\u1ffc'
- ;
-
-fragment UnicodeClass_LM
- : '\u02b0'..'\u02c1'
- | '\u02c6'..'\u02d1'
- | '\u02e0'..'\u02e4'
- | '\u02ec'..'\u02ee'
- | '\u0374'..'\u037a'
- | '\u0559'..'\u0640'
- | '\u06e5'..'\u06e6'
- | '\u07f4'..'\u07f5'
- | '\u07fa'..'\u081a'
- | '\u0824'..'\u0828'
- | '\u0971'..'\u0e46'
- | '\u0ec6'..'\u10fc'
- | '\u17d7'..'\u1843'
- | '\u1aa7'..'\u1c78'
- | '\u1c79'..'\u1c7d'
- | '\u1d2c'..'\u1d6a'
- | '\u1d78'..'\u1d9b'
- | '\u1d9c'..'\u1dbf'
- | '\u2071'..'\u207f'
- | '\u2090'..'\u209c'
- | '\u2c7c'..'\u2c7d'
- | '\u2d6f'..'\u2e2f'
- | '\u3005'..'\u3031'
- | '\u3032'..'\u3035'
- | '\u303b'..'\u309d'
- | '\u309e'..'\u30fc'
- | '\u30fd'..'\u30fe'
- | '\ua015'..'\ua4f8'
- | '\ua4f9'..'\ua4fd'
- | '\ua60c'..'\ua67f'
- | '\ua69c'..'\ua69d'
- | '\ua717'..'\ua71f'
- | '\ua770'..'\ua788'
- | '\ua7f8'..'\ua7f9'
- | '\ua9cf'..'\ua9e6'
- | '\uaa70'..'\uaadd'
- | '\uaaf3'..'\uaaf4'
- | '\uab5c'..'\uab5f'
- | '\uff70'..'\uff9e'
- | '\uff9f'..'\uff9f'
- ;
-
-fragment UnicodeClass_LO
- : '\u00aa'..'\u00ba'
- | '\u01bb'..'\u01c0'
- | '\u01c1'..'\u01c3'
- | '\u0294'..'\u05d0'
- | '\u05d1'..'\u05ea'
- | '\u05f0'..'\u05f2'
- | '\u0620'..'\u063f'
- | '\u0641'..'\u064a'
- | '\u066e'..'\u066f'
- | '\u0671'..'\u06d3'
- | '\u06d5'..'\u06ee'
- | '\u06ef'..'\u06fa'
- | '\u06fb'..'\u06fc'
- | '\u06ff'..'\u0710'
- | '\u0712'..'\u072f'
- | '\u074d'..'\u07a5'
- | '\u07b1'..'\u07ca'
- | '\u07cb'..'\u07ea'
- | '\u0800'..'\u0815'
- | '\u0840'..'\u0858'
- | '\u08a0'..'\u08b2'
- | '\u0904'..'\u0939'
- | '\u093d'..'\u0950'
- | '\u0958'..'\u0961'
- | '\u0972'..'\u0980'
- | '\u0985'..'\u098c'
- | '\u098f'..'\u0990'
- | '\u0993'..'\u09a8'
- | '\u09aa'..'\u09b0'
- | '\u09b2'..'\u09b6'
- | '\u09b7'..'\u09b9'
- | '\u09bd'..'\u09ce'
- | '\u09dc'..'\u09dd'
- | '\u09df'..'\u09e1'
- | '\u09f0'..'\u09f1'
- | '\u0a05'..'\u0a0a'
- | '\u0a0f'..'\u0a10'
- | '\u0a13'..'\u0a28'
- | '\u0a2a'..'\u0a30'
- | '\u0a32'..'\u0a33'
- | '\u0a35'..'\u0a36'
- | '\u0a38'..'\u0a39'
- | '\u0a59'..'\u0a5c'
- | '\u0a5e'..'\u0a72'
- | '\u0a73'..'\u0a74'
- | '\u0a85'..'\u0a8d'
- | '\u0a8f'..'\u0a91'
- | '\u0a93'..'\u0aa8'
- | '\u0aaa'..'\u0ab0'
- | '\u0ab2'..'\u0ab3'
- | '\u0ab5'..'\u0ab9'
- | '\u0abd'..'\u0ad0'
- | '\u0ae0'..'\u0ae1'
- | '\u0b05'..'\u0b0c'
- | '\u0b0f'..'\u0b10'
- | '\u0b13'..'\u0b28'
- | '\u0b2a'..'\u0b30'
- | '\u0b32'..'\u0b33'
- | '\u0b35'..'\u0b39'
- | '\u0b3d'..'\u0b5c'
- | '\u0b5d'..'\u0b5f'
- | '\u0b60'..'\u0b61'
- | '\u0b71'..'\u0b83'
- | '\u0b85'..'\u0b8a'
- | '\u0b8e'..'\u0b90'
- | '\u0b92'..'\u0b95'
- | '\u0b99'..'\u0b9a'
- | '\u0b9c'..'\u0b9e'
- | '\u0b9f'..'\u0ba3'
- | '\u0ba4'..'\u0ba8'
- | '\u0ba9'..'\u0baa'
- | '\u0bae'..'\u0bb9'
- | '\u0bd0'..'\u0c05'
- | '\u0c06'..'\u0c0c'
- | '\u0c0e'..'\u0c10'
- | '\u0c12'..'\u0c28'
- | '\u0c2a'..'\u0c39'
- | '\u0c3d'..'\u0c58'
- | '\u0c59'..'\u0c60'
- | '\u0c61'..'\u0c85'
- | '\u0c86'..'\u0c8c'
- | '\u0c8e'..'\u0c90'
- | '\u0c92'..'\u0ca8'
- | '\u0caa'..'\u0cb3'
- | '\u0cb5'..'\u0cb9'
- | '\u0cbd'..'\u0cde'
- | '\u0ce0'..'\u0ce1'
- | '\u0cf1'..'\u0cf2'
- | '\u0d05'..'\u0d0c'
- | '\u0d0e'..'\u0d10'
- | '\u0d12'..'\u0d3a'
- | '\u0d3d'..'\u0d4e'
- | '\u0d60'..'\u0d61'
- | '\u0d7a'..'\u0d7f'
- | '\u0d85'..'\u0d96'
- | '\u0d9a'..'\u0db1'
- | '\u0db3'..'\u0dbb'
- | '\u0dbd'..'\u0dc0'
- | '\u0dc1'..'\u0dc6'
- | '\u0e01'..'\u0e30'
- | '\u0e32'..'\u0e33'
- | '\u0e40'..'\u0e45'
- | '\u0e81'..'\u0e82'
- | '\u0e84'..'\u0e87'
- | '\u0e88'..'\u0e8a'
- | '\u0e8d'..'\u0e94'
- | '\u0e95'..'\u0e97'
- | '\u0e99'..'\u0e9f'
- | '\u0ea1'..'\u0ea3'
- | '\u0ea5'..'\u0ea7'
- | '\u0eaa'..'\u0eab'
- | '\u0ead'..'\u0eb0'
- | '\u0eb2'..'\u0eb3'
- | '\u0ebd'..'\u0ec0'
- | '\u0ec1'..'\u0ec4'
- | '\u0edc'..'\u0edf'
- | '\u0f00'..'\u0f40'
- | '\u0f41'..'\u0f47'
- | '\u0f49'..'\u0f6c'
- | '\u0f88'..'\u0f8c'
- | '\u1000'..'\u102a'
- | '\u103f'..'\u1050'
- | '\u1051'..'\u1055'
- | '\u105a'..'\u105d'
- | '\u1061'..'\u1065'
- | '\u1066'..'\u106e'
- | '\u106f'..'\u1070'
- | '\u1075'..'\u1081'
- | '\u108e'..'\u10d0'
- | '\u10d1'..'\u10fa'
- | '\u10fd'..'\u1248'
- | '\u124a'..'\u124d'
- | '\u1250'..'\u1256'
- | '\u1258'..'\u125a'
- | '\u125b'..'\u125d'
- | '\u1260'..'\u1288'
- | '\u128a'..'\u128d'
- | '\u1290'..'\u12b0'
- | '\u12b2'..'\u12b5'
- | '\u12b8'..'\u12be'
- | '\u12c0'..'\u12c2'
- | '\u12c3'..'\u12c5'
- | '\u12c8'..'\u12d6'
- | '\u12d8'..'\u1310'
- | '\u1312'..'\u1315'
- | '\u1318'..'\u135a'
- | '\u1380'..'\u138f'
- | '\u13a0'..'\u13f4'
- | '\u1401'..'\u166c'
- | '\u166f'..'\u167f'
- | '\u1681'..'\u169a'
- | '\u16a0'..'\u16ea'
- | '\u16f1'..'\u16f8'
- | '\u1700'..'\u170c'
- | '\u170e'..'\u1711'
- | '\u1720'..'\u1731'
- | '\u1740'..'\u1751'
- | '\u1760'..'\u176c'
- | '\u176e'..'\u1770'
- | '\u1780'..'\u17b3'
- | '\u17dc'..'\u1820'
- | '\u1821'..'\u1842'
- | '\u1844'..'\u1877'
- | '\u1880'..'\u18a8'
- | '\u18aa'..'\u18b0'
- | '\u18b1'..'\u18f5'
- | '\u1900'..'\u191e'
- | '\u1950'..'\u196d'
- | '\u1970'..'\u1974'
- | '\u1980'..'\u19ab'
- | '\u19c1'..'\u19c7'
- | '\u1a00'..'\u1a16'
- | '\u1a20'..'\u1a54'
- | '\u1b05'..'\u1b33'
- | '\u1b45'..'\u1b4b'
- | '\u1b83'..'\u1ba0'
- | '\u1bae'..'\u1baf'
- | '\u1bba'..'\u1be5'
- | '\u1c00'..'\u1c23'
- | '\u1c4d'..'\u1c4f'
- | '\u1c5a'..'\u1c77'
- | '\u1ce9'..'\u1cec'
- | '\u1cee'..'\u1cf1'
- | '\u1cf5'..'\u1cf6'
- | '\u2135'..'\u2138'
- | '\u2d30'..'\u2d67'
- | '\u2d80'..'\u2d96'
- | '\u2da0'..'\u2da6'
- | '\u2da8'..'\u2dae'
- | '\u2db0'..'\u2db6'
- | '\u2db8'..'\u2dbe'
- | '\u2dc0'..'\u2dc6'
- | '\u2dc8'..'\u2dce'
- | '\u2dd0'..'\u2dd6'
- | '\u2dd8'..'\u2dde'
- | '\u3006'..'\u303c'
- | '\u3041'..'\u3096'
- | '\u309f'..'\u30a1'
- | '\u30a2'..'\u30fa'
- | '\u30ff'..'\u3105'
- | '\u3106'..'\u312d'
- | '\u3131'..'\u318e'
- | '\u31a0'..'\u31ba'
- | '\u31f0'..'\u31ff'
- | '\u3400'..'\u4db5'
- | '\u4e00'..'\u9fcc'
- | '\ua000'..'\ua014'
- | '\ua016'..'\ua48c'
- | '\ua4d0'..'\ua4f7'
- | '\ua500'..'\ua60b'
- | '\ua610'..'\ua61f'
- | '\ua62a'..'\ua62b'
- | '\ua66e'..'\ua6a0'
- | '\ua6a1'..'\ua6e5'
- | '\ua7f7'..'\ua7fb'
- | '\ua7fc'..'\ua801'
- | '\ua803'..'\ua805'
- | '\ua807'..'\ua80a'
- | '\ua80c'..'\ua822'
- | '\ua840'..'\ua873'
- | '\ua882'..'\ua8b3'
- | '\ua8f2'..'\ua8f7'
- | '\ua8fb'..'\ua90a'
- | '\ua90b'..'\ua925'
- | '\ua930'..'\ua946'
- | '\ua960'..'\ua97c'
- | '\ua984'..'\ua9b2'
- | '\ua9e0'..'\ua9e4'
- | '\ua9e7'..'\ua9ef'
- | '\ua9fa'..'\ua9fe'
- | '\uaa00'..'\uaa28'
- | '\uaa40'..'\uaa42'
- | '\uaa44'..'\uaa4b'
- | '\uaa60'..'\uaa6f'
- | '\uaa71'..'\uaa76'
- | '\uaa7a'..'\uaa7e'
- | '\uaa7f'..'\uaaaf'
- | '\uaab1'..'\uaab5'
- | '\uaab6'..'\uaab9'
- | '\uaaba'..'\uaabd'
- | '\uaac0'..'\uaac2'
- | '\uaadb'..'\uaadc'
- | '\uaae0'..'\uaaea'
- | '\uaaf2'..'\uab01'
- | '\uab02'..'\uab06'
- | '\uab09'..'\uab0e'
- | '\uab11'..'\uab16'
- | '\uab20'..'\uab26'
- | '\uab28'..'\uab2e'
- | '\uabc0'..'\uabe2'
- | '\uac00'..'\ud7a3'
- | '\ud7b0'..'\ud7c6'
- | '\ud7cb'..'\ud7fb'
- | '\uf900'..'\ufa6d'
- | '\ufa70'..'\ufad9'
- | '\ufb1d'..'\ufb1f'
- | '\ufb20'..'\ufb28'
- | '\ufb2a'..'\ufb36'
- | '\ufb38'..'\ufb3c'
- | '\ufb3e'..'\ufb40'
- | '\ufb41'..'\ufb43'
- | '\ufb44'..'\ufb46'
- | '\ufb47'..'\ufbb1'
- | '\ufbd3'..'\ufd3d'
- | '\ufd50'..'\ufd8f'
- | '\ufd92'..'\ufdc7'
- | '\ufdf0'..'\ufdfb'
- | '\ufe70'..'\ufe74'
- | '\ufe76'..'\ufefc'
- | '\uff66'..'\uff6f'
- | '\uff71'..'\uff9d'
- | '\uffa0'..'\uffbe'
- | '\uffc2'..'\uffc7'
- | '\uffca'..'\uffcf'
- | '\uffd2'..'\uffd7'
- | '\uffda'..'\uffdc'
- ;
-
-fragment UnicodeDigit // UnicodeClass_ND
- : '\u0030'..'\u0039'
- | '\u0660'..'\u0669'
- | '\u06f0'..'\u06f9'
- | '\u07c0'..'\u07c9'
- | '\u0966'..'\u096f'
- | '\u09e6'..'\u09ef'
- | '\u0a66'..'\u0a6f'
- | '\u0ae6'..'\u0aef'
- | '\u0b66'..'\u0b6f'
- | '\u0be6'..'\u0bef'
- | '\u0c66'..'\u0c6f'
- | '\u0ce6'..'\u0cef'
- | '\u0d66'..'\u0d6f'
- | '\u0de6'..'\u0def'
- | '\u0e50'..'\u0e59'
- | '\u0ed0'..'\u0ed9'
- | '\u0f20'..'\u0f29'
- | '\u1040'..'\u1049'
- | '\u1090'..'\u1099'
- | '\u17e0'..'\u17e9'
- | '\u1810'..'\u1819'
- | '\u1946'..'\u194f'
- | '\u19d0'..'\u19d9'
- | '\u1a80'..'\u1a89'
- | '\u1a90'..'\u1a99'
- | '\u1b50'..'\u1b59'
- | '\u1bb0'..'\u1bb9'
- | '\u1c40'..'\u1c49'
- | '\u1c50'..'\u1c59'
- | '\ua620'..'\ua629'
- | '\ua8d0'..'\ua8d9'
- | '\ua900'..'\ua909'
- | '\ua9d0'..'\ua9d9'
- | '\ua9f0'..'\ua9f9'
- | '\uaa50'..'\uaa59'
- | '\uabf0'..'\uabf9'
- | '\uff10'..'\uff19'
- ;
-
\ No newline at end of file
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/LexerAdaptor.java b/antlr/src/main/java/com/gitplex/commons/antlr/LexerAdaptor.java
deleted file mode 100644
index a38b5c8c69..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/LexerAdaptor.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.gitplex.commons.antlr;
-
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.Lexer;
-import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.misc.Interval;
-
-import com.gitplex.commons.antlr.ANTLRv4Lexer;
-
-public abstract class LexerAdaptor extends Lexer {
-
- public LexerAdaptor(CharStream input) {
- super(input);
- }
-
- /**
- * Track whether we are inside of a rule and whether it is lexical parser. _currentRuleType==Token.INVALID_TYPE
- * means that we are outside of a rule. At the first sign of a rule name reference and _currentRuleType==invalid, we
- * can assume that we are starting a parser rule. Similarly, seeing a token reference when not already in rule means
- * starting a token rule. The terminating ';' of a rule, flips this back to invalid type.
- *
- * This is not perfect logic but works. For example, "grammar T;" means that we start and stop a lexical rule for
- * the "T;". Dangerous but works.
- *
- * The whole point of this state information is to distinguish between [..arg actions..] and [charsets]. Char sets
- * can only occur in lexical rules and arg actions cannot occur.
- */
- private int _currentRuleType = Token.INVALID_TYPE;
-
- public int getCurrentRuleType() {
- return _currentRuleType;
- }
-
- public void setCurrentRuleType(int ruleType) {
- this._currentRuleType = ruleType;
- }
-
- protected void handleBeginArgument() {
- if (inLexerRule()) {
- pushMode(ANTLRv4Lexer.LexerCharSet);
- more();
- } else {
- pushMode(ANTLRv4Lexer.Argument);
- }
- }
-
- protected void handleEndArgument() {
- popMode();
- if (_modeStack.size() > 0) {
- setType(ANTLRv4Lexer.ARGUMENT_CONTENT);
- }
- }
-
- protected void handleEndAction() {
- popMode();
- if (_modeStack.size() > 0) {
- setType(ANTLRv4Lexer.ACTION_CONTENT);
- }
- }
-
- @Override
- public Token emit() {
- if (_type == ANTLRv4Lexer.ID) {
- String firstChar = _input.getText(Interval.of(_tokenStartCharIndex, _tokenStartCharIndex));
- if (Character.isUpperCase(firstChar.charAt(0))) {
- _type = ANTLRv4Lexer.TOKEN_REF;
- } else {
- _type = ANTLRv4Lexer.RULE_REF;
- }
-
- if (_currentRuleType == Token.INVALID_TYPE) { // if outside of rule def
- _currentRuleType = _type; // set to inside lexer or parser rule
- }
- } else if (_type == ANTLRv4Lexer.SEMI) { // exit rule def
- _currentRuleType = Token.INVALID_TYPE;
- }
-
- return super.emit();
- }
-
- private boolean inLexerRule() {
- return _currentRuleType == ANTLRv4Lexer.TOKEN_REF;
- }
-
- @SuppressWarnings("unused")
- private boolean inParserRule() { // not used, but added for clarity
- return _currentRuleType == ANTLRv4Lexer.RULE_REF;
- }
-}
\ No newline at end of file
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/PluginModule.java b/antlr/src/main/java/com/gitplex/commons/antlr/PluginModule.java
deleted file mode 100644
index 5c9774b441..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/PluginModule.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.gitplex.commons.antlr;
-
-import com.gitplex.calla.loader.AbstractPluginModule;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class PluginModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- // put your guice bindings here
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/CodeAssist.java b/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/CodeAssist.java
deleted file mode 100644
index 37fe143951..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/CodeAssist.java
+++ /dev/null
@@ -1,585 +0,0 @@
-package com.gitplex.commons.antlr.codeassist;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
-import org.antlr.v4.runtime.Lexer;
-import org.antlr.v4.runtime.Token;
-
-import com.gitplex.commons.antlr.grammar.AlternativeSpec;
-import com.gitplex.commons.antlr.grammar.ElementSpec;
-import com.gitplex.commons.antlr.grammar.Grammar;
-import com.gitplex.commons.antlr.grammar.RuleRefElementSpec;
-import com.gitplex.commons.antlr.grammar.RuleSpec;
-import com.gitplex.commons.antlr.grammar.TokenElementSpec;
-import com.gitplex.commons.antlr.parser.Chart;
-import com.gitplex.commons.antlr.parser.EarleyParser;
-import com.gitplex.commons.antlr.parser.Element;
-import com.gitplex.commons.antlr.parser.State;
-import com.gitplex.commons.util.StringUtils;
-import com.google.common.base.Preconditions;
-
-public abstract class CodeAssist implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private final Grammar grammar;
-
- public CodeAssist(Grammar grammar) {
- this.grammar = grammar;
- }
-
- /**
- * Code assist constructor
- * @param lexerClass
- * lexer class to be used to lex code. Other required information such as
- * grammar files and token file will be derived from the lexer class
- */
- public CodeAssist(Class<? extends Lexer> lexerClass) {
- this(new Grammar(lexerClass));
- }
-
- /**
- * Code assist constructor.
- *
- * @param lexerClass
- * lexer class to be used to lex code
- * @param grammarFiles
- * grammar files in class path, relative to class path root
- * @param tokenFile
- * generated tokens file in class path, relative to class path root
- */
- public CodeAssist(Class<? extends Lexer> lexerClass, String grammarFiles[], String tokenFile) {
- this(new Grammar(lexerClass, grammarFiles, tokenFile));
- }
-
- public List<String> getHints(InputStatus inputStatus, String ruleName) {
- RuleSpec rule = Preconditions.checkNotNull(grammar.getRule(ruleName));
- List<Token> tokens = grammar.lex(inputStatus.getContentBeforeCaret());
- EarleyParser parser = new EarleyParser(rule, tokens);
-
- Set<String> hints = new LinkedHashSet<>();
- for (Chart chart: getTerminatingCharts(parser)) {
- String matchWith = getMatchWith(chart, inputStatus);
- for (List<ParentedElement> expectChain: getExpectChains(chart)) {
- for (ParentedElement element: expectChain)
- hints.addAll(getHints(element, matchWith));
- }
- }
- return new ArrayList<>(hints);
- }
-
- private String appendMandatories(InputStatus inputStatus, ElementCompletion completion) {
- String inputContent = inputStatus.getContent();
- String content = inputContent.substring(0, completion.getReplaceBegin())
- + completion.getReplaceContent();
- if (completion.isComplete() && completion.getReplaceEnd() == inputStatus.getCaret()) {
- ParentedElement parentElement = completion.getExpectedElement().getParent();
- ElementSpec elementSpec = completion.getExpectedElement().getSpec();
- for (String mandatory: getMandatoriesAfter(parentElement, elementSpec)) {
- String prevContent = content;
- content += mandatory;
-
- if (grammar.getTokenTypeByLiteral(mandatory) != null) {
- /*
- * if mandatory can be appended without space, the last token
- * position should remain unchanged in concatenated content
- */
- List<Token> tokens = grammar.lex(content);
- if (!tokens.isEmpty()) {
- Token lastToken = tokens.get(tokens.size()-1);
- if (lastToken.getStartIndex() != content.length() - mandatory.length()
- || lastToken.getStopIndex() != content.length()-1) {
- content = prevContent + " " + mandatory;
- }
- } else {
- content = prevContent + " " + mandatory;
- }
- }
- }
- }
- return content + inputContent.substring(completion.getReplaceEnd());
- }
-
- public List<InputCompletion> suggest(InputStatus inputStatus, String ruleName, int count) {
- RuleSpec rule = Preconditions.checkNotNull(grammar.getRule(ruleName));
-
- List<InputCompletion> inputCompletions = new ArrayList<>();
-
- Map<String, List<ElementCompletion>> label2completions = new LinkedHashMap<>();
- for (ElementCompletion completion: suggest(rule, inputStatus, count)) {
- List<ElementCompletion> completionsWithLabel = label2completions.get(completion.getLabel());
- if (completionsWithLabel == null) {
- completionsWithLabel = new ArrayList<>();
- label2completions.put(completion.getLabel(), completionsWithLabel);
- }
- completionsWithLabel.add(completion);
- }
- String inputContent = inputStatus.getContent();
- for (Map.Entry<String, List<ElementCompletion>> entry: label2completions.entrySet()) {
- ElementCompletion completion = entry.getValue().get(0);
- String content = appendMandatories(inputStatus, completion);
- for (int i=1; i<entry.getValue().size(); i++) {
- String eachContent = appendMandatories(inputStatus, entry.getValue().get(i));
- if (!eachContent.equals(content)) {
- // we have multiple mandatories attached to same label, so they are no longer
- // mandatories any more
- content = completion.complete(inputStatus).getContent();
- break;
- }
- }
-
- /*
- * Adjust caret to move it to next place expecting user input if suggestion is
- * complete, that is, we move it after all mandatory tokens after the replacement,
- * unless user puts caret explicitly in the middle of replacement via suggestion,
- * indicating the replacement has some place holders expecting user input.
- */
- int caret = completion.getCaret();
- if (completion.isComplete() && caret == -1) {
- // caret is not at the middle of replacement, so we need to move it to
- // be after mandatory tokens if provided suggestion is complete
- caret = content.length() - inputContent.length() + completion.getReplaceEnd();
- if (content.equals(completion.complete(inputStatus).getContent())) {
- // in case mandatory tokens are not added after replacement,
- // we skip existing mandatory tokens in current input
- String contentAfterCaret = content.substring(caret);
- ParentedElement parentElement = completion.getExpectedElement().getParent();
- ElementSpec elementSpec = completion.getExpectedElement().getSpec();
- caret += skipMandatories(contentAfterCaret, getMandatoriesAfter(parentElement, elementSpec));
- }
- } else {
- if (caret == -1)
- caret = completion.getReplaceContent().length();
- caret += completion.getReplaceBegin();
- }
-
- String replaceContent = content.substring(completion.getReplaceBegin(),
- content.length()-inputContent.length()+completion.getReplaceEnd());
- inputCompletions.add(new InputCompletion(completion.getReplaceBegin(),
- completion.getReplaceEnd(), replaceContent, caret, completion.getLabel(),
- completion.getDescription(), completion.getMatchRange()));
- }
-
- /*
- * remove duplicate suggestions
- */
- Set<String> suggestedContents = new HashSet<>();
-
- boolean hasNonWhitespaceSuggestions = false;
- for (Iterator<InputCompletion> it = inputCompletions.iterator(); it.hasNext();) {
- InputCompletion completion = it.next();
- if (!StringUtils.isWhitespace(completion.getReplaceContent()))
- hasNonWhitespaceSuggestions = true;
- String content = completion.complete(inputStatus).getContent();
- if (suggestedContents.contains(content))
- it.remove();
- else
- suggestedContents.add(content);
- }
-
- /*
- * Preserve whitespace suggestions if there are no other suggestions as we may need to
- * insert a white space for other suggestions to appear
- */
- if (hasNonWhitespaceSuggestions) {
- for (Iterator<InputCompletion> it = inputCompletions.iterator(); it.hasNext();) {
- if (it.next().getReplaceContent().trim().length() == 0)
- it.remove();
- }
- }
-
- if (inputCompletions.size() > count)
- return inputCompletions.subList(0, count);
- else
- return inputCompletions;
- }
-
- private ParentedElement getElementExpectingTerminal(ParentedElement parent, Element element) {
- parent = new ParentedElement(parent, element);
- State state = element.getState();
- if (state != null) {
- // the last element is always the element assumed completed
- element = state.getElements().get(state.getElements().size()-1);
- return getElementExpectingTerminal(parent, element);
- } else {
- return parent;
- }
- }
-
- private void assumeCompleted(EarleyParser parser, State state, int position, Set<State> statesAssumeCompleted) {
- Chart startChart = parser.getCharts().get(state.getOriginPosition());
- for (State startState: startChart.getStates()) {
- if (!startState.isCompleted()) {
- ElementSpec nextElement = startState.getExpectedElementSpec();
- if (nextElement instanceof RuleRefElementSpec) {
- RuleRefElementSpec ruleRefElement = (RuleRefElementSpec) nextElement;
- if (ruleRefElement.getRuleName().equals(state.getRuleSpec().getName())) {
- List<Element> elements = new ArrayList<>(startState.getElements());
- elements.add(new Element(parser, ruleRefElement, position, state));
- State parentState = new State(startState.getOriginPosition(),
- startState.getRuleSpec(), startState.getAlternativeSpecIndex(),
- startState.getExpectedElementSpecIndex(),
- startState.isExpectedElementSpecMatchedOnce(),
- elements);
- if (statesAssumeCompleted.add(parentState))
- assumeCompleted(parser, parentState, position, statesAssumeCompleted);
- }
- }
- }
- }
- }
-
- private List<List<ParentedElement>> getExpectChains(Chart chart) {
- int position = chart.getPosition();
- EarleyParser parser = chart.getParser();
- List<List<ParentedElement>> expectChains = new ArrayList<>();
- for (State stateExpectingTerminal: chart.getStatesExpectingTerminal()) {
- List<Element> elements = new ArrayList<>(stateExpectingTerminal.getElements());
- elements.add(new Element(parser, stateExpectingTerminal.getExpectedElementSpec(), 0, null));
- stateExpectingTerminal = new State(stateExpectingTerminal.getOriginPosition(), stateExpectingTerminal.getRuleSpec(),
- stateExpectingTerminal.getAlternativeSpecIndex(), stateExpectingTerminal.getExpectedElementSpecIndex(),
- stateExpectingTerminal.isExpectedElementSpecMatchedOnce(), elements);
-
- /*
- * Calculate all states assuming completed, this way we can get to the root state to
- * construct a partial parse tree to provide suggestion contexts
- */
- Set<State> statesAssumeCompleted = new HashSet<>();
- if (statesAssumeCompleted.add(stateExpectingTerminal))
- assumeCompleted(parser, stateExpectingTerminal, position, statesAssumeCompleted);
-
- for (State stateAssumeCompleted: statesAssumeCompleted) {
- if (stateAssumeCompleted.getRuleSpec().getName().equals(parser.getRule().getName())
- && stateAssumeCompleted.getOriginPosition() == 0) {
- Element rootElement = new Element(parser, null, position, stateAssumeCompleted);
- List<ParentedElement> expectChain = new ArrayList<>();
-
- ParentedElement elementExpectingTerminal = getElementExpectingTerminal(null, rootElement);
- expectChain.add(elementExpectingTerminal);
-
- /*
- * Find out all parent elements not containing any matched tokens, and we will
- * ask if there are suggestions for these parent elements later. For instance,
- * if we input "Math.", we can provide suggestion for whole method element like
- * "max(a, b)"; otherwise, we can only provide suggestion for method name "max".
- */
- ParentedElement expectedElement = elementExpectingTerminal.getParent();
- while (expectedElement != null) {
- if (expectedElement.getState().getElements().size() == 1) {
- expectChain.add(expectedElement);
- expectedElement = expectedElement.getParent();
- } else {
- break;
- }
- }
-
- expectChains.add(expectChain);
- }
- }
- }
- return expectChains;
- }
-
- private String getMatchWith(Chart chart, InputStatus inputStatus) {
- String matchWith;
- Token token = chart.getOriginatingToken();
- int endCharIndex;
- if (token != null) {
- endCharIndex = token.getStopIndex()+1;
- } else {
- endCharIndex = 0;
- }
- matchWith = inputStatus.getContent().substring(endCharIndex, inputStatus.getCaret());
- for (Token each: chart.getParser().getTokens()) {
- if (each.getStartIndex() == endCharIndex) {
- // we can not trim leading space as it is not optional
- return matchWith;
- }
- }
- return StringUtils.trimStart(matchWith);
- }
-
- private List<ElementSuggestion> suggest(Chart chart, InputStatus inputStatus, int count) {
- List<ElementSuggestion> suggestions = new ArrayList<>();
- String matchWith = getMatchWith(chart, inputStatus);
-
- int numSuggested = 0;
- for (List<ParentedElement> expectChain: getExpectChains(chart)) {
- // goes through the expect chain to check if there are suggestions for expected element
- List<InputSuggestion> inputSuggestions = null;
- for (ParentedElement element: expectChain) {
- inputSuggestions = suggest(element, matchWith, count - numSuggested);
- if (inputSuggestions != null) {
- if (!inputSuggestions.isEmpty()) {
- suggestions.add(new ElementSuggestion(element, matchWith, inputSuggestions));
- numSuggested += inputSuggestions.size();
- }
- break;
- }
- }
-
- ParentedElement elementExpectingTerminal = expectChain.get(0);
- if (inputSuggestions == null && elementExpectingTerminal.getSpec() instanceof TokenElementSpec) {
- // no suggestions, let's see if we can provide some default suggestions
- inputSuggestions = new ArrayList<>();
- TokenElementSpec spec = (TokenElementSpec) elementExpectingTerminal.getSpec();
- for (String leadingLiteral: spec.getPossiblePrefixes()) {
- if (leadingLiteral.startsWith(matchWith) && leadingLiteral.length()>matchWith.length()) {
- List<Token> tokens = grammar.lex(leadingLiteral);
- boolean complete = tokens.size() == 1 && tokens.get(0).getType() == spec.getTokenType();
- InputSuggestion suggestion = wrapAsSuggestion(elementExpectingTerminal, leadingLiteral, complete);
- if (suggestion != null) {
- inputSuggestions.add(suggestion);
- if (++numSuggested >= count)
- break;
- }
- }
- }
- if (!inputSuggestions.isEmpty())
- suggestions.add(new ElementSuggestion(elementExpectingTerminal, matchWith, inputSuggestions));
- }
-
- if (numSuggested >= count)
- break;
- }
-
- return suggestions;
- }
-
- private List<Chart> getTerminatingCharts(EarleyParser parser) {
- List<Chart> terminatingCharts = new ArrayList<>();
-
- /*
- * Use the second last chart in order to not considering the last matched token.
- * This is useful for below cases:
- * 1. when the last token matches either a keyword or part of an identifier.
- * For instance, the last token can be keyword 'for', but can also match
- * identifier 'forme' if the spec allows.
- * 2. assume we have a query rule containing multiple criterias, with each
- * criteria composed of key/value pair key:value. value needs to be quoted
- * if it contains spaces. In this case, we want to achieve the effect that
- * if user input value containing spaces without surrounding quotes, we
- * suggest the user to quote the value.
- */
- if (parser.getCharts().size() >= 2)
- terminatingCharts.add(parser.getCharts().get(parser.getCharts().size()-2));
-
- if (parser.getCharts().size() >= 1)
- terminatingCharts.add(parser.getCharts().get(parser.getCharts().size()-1));
-
- return terminatingCharts;
- }
-
- private List<ElementCompletion> suggest(RuleSpec spec, InputStatus inputStatus, int count) {
- List<ElementCompletion> completions = new ArrayList<>();
-
- List<ElementSuggestion> suggestions = new ArrayList<>();
-
- List<Token> tokens = grammar.lex(inputStatus.getContentBeforeCaret());
- EarleyParser parser = new EarleyParser(spec, tokens);
-
- int numSuggested = 0;
- for (Chart chart: getTerminatingCharts(parser)) {
- List<ElementSuggestion> chartSuggestions = suggest(chart, inputStatus, count-numSuggested);
- suggestions.addAll(chartSuggestions);
- for (ElementSuggestion each: chartSuggestions)
- numSuggested += each.getInputSuggestions().size();
- if (numSuggested >= count)
- break;
- }
-
- String inputContent = inputStatus.getContent();
- for (ElementSuggestion suggestion: suggestions) {
- int replaceBegin = inputStatus.getCaret() - suggestion.getMatchWith().length();
- int replaceEnd = inputStatus.getCaret();
-
- /*
- * if input around the caret matches spec of the suggestion, we then replace
- * the matched text with suggestion, instead of simply inserting the
- * suggested content
- */
- ElementSpec elementSpec = suggestion.getExpectedElement().getSpec();
- String contentAfterReplaceBegin = inputContent.substring(replaceBegin);
-
- int endOfMatch = getEndOfMatch(elementSpec, contentAfterReplaceBegin) + replaceBegin;
- tokens = grammar.lex(contentAfterReplaceBegin);
- if (endOfMatch > replaceEnd)
- replaceEnd = endOfMatch;
-
- String before = inputContent.substring(0, replaceBegin);
-
- for (InputSuggestion inputSuggestion: suggestion.getInputSuggestions()) {
- int position = suggestion.getExpectedElement().getRoot().getPosition();
- if (position != 0) {
- int lastMatchedTokenIndex = position-1;
- Token lastMatchedToken = parser.getTokens().get(lastMatchedTokenIndex);
- tokens = grammar.lex(before + inputSuggestion.getContent());
-
- /*
- * ignore the suggestion if we can not append the suggested content directly.
- * This normally indicates that a space is required before the suggestion,
- * and we will show the suggestion when user presses the space to make the
- * suggestion list less confusing
- */
- if (tokens.size() > lastMatchedTokenIndex) {
- Token newToken = tokens.get(lastMatchedTokenIndex);
- if (lastMatchedToken.getStartIndex() != newToken.getStartIndex()
- || lastMatchedToken.getStopIndex() != newToken.getStopIndex()) {
- continue;
- }
- } else {
- continue;
- }
- }
-
- completions.add(new ElementCompletion(suggestion.getExpectedElement(), replaceBegin,
- // replace only if provided suggestion is a complete representation of the element
- inputSuggestion.isComplete()?replaceEnd:inputStatus.getCaret(),
- inputSuggestion.getContent(), inputSuggestion.getCaret(),
- inputSuggestion.isComplete(), inputSuggestion.getLabel(),
- inputSuggestion.getDescription(), inputSuggestion.getMatchRange()));
- }
- }
- return completions;
- }
-
- private int skipMandatories(String content, List<String> mandatories) {
- String mandatory = StringUtils.join(mandatories, "");
- mandatory = StringUtils.deleteWhitespace(mandatory);
- if (mandatory.length() != 0 && content.length() != 0) {
- int mandatoryIndex = 0;
- int contentIndex = 0;
- while (true) {
- char contentChar = content.charAt(contentIndex);
- /*
- * space may exist between mandatories in user input, but should
- * not exist in ANTLR grammar
- */
- if (!Character.isWhitespace(contentChar)) {
- if (contentChar != mandatory.charAt(mandatoryIndex))
- break;
- mandatoryIndex++;
- }
- contentIndex++;
- if (mandatoryIndex == mandatory.length() || contentIndex == content.length())
- break;
- }
- if (mandatoryIndex == mandatory.length())
- return contentIndex;
- else
- return 0;
- } else {
- return 0;
- }
- }
-
- /*
- * Get mandatory literals after specified element. For instance a method may have
- * below rule:
- * methodName '(' argList ')'
- * The mandatories after element methodName will be '('. When a method name is
- * suggested, we should add '(' and moves caret after '(' to avoid unnecessary
- * key strokes
- */
- private List<String> getMandatoriesAfter(ParentedElement parentElement, ElementSpec elementSpec) {
- List<String> literals = new ArrayList<>();
- if (parentElement != null && elementSpec != null && !elementSpec.isMultiple()) {
- AlternativeSpec alternativeSpec = parentElement.getState().getAlternativeSpec();
- int specIndex = alternativeSpec.getElements().indexOf(elementSpec);
- if (specIndex == alternativeSpec.getElements().size()-1) {
- elementSpec = parentElement.getSpec();
- parentElement = parentElement.getParent();
- return getMandatoriesAfter(parentElement, elementSpec);
- } else {
- elementSpec = alternativeSpec.getElements().get(specIndex+1);
- if (!elementSpec.isOptional()) {
- MandatoryScan scan = elementSpec.scanMandatories();
- literals = scan.getMandatories();
- if (!scan.isStop())
- literals.addAll(getMandatoriesAfter(parentElement, elementSpec));
- }
- }
- }
- return literals;
- }
-
- public Grammar getGrammar() {
- return grammar;
- }
-
- /**
- * Provide suggestions for expected element matching specified string
- *
- * @param expectedElement
- * the element to expect.
- * @param matchWith
- * the string the suggestion has to match with
- * @param count
- * maximum number of suggestions to return
- * @return
- * a list of suggestions. If you do not have any suggestions and want code assist to
- * drill down the element to provide default suggestions, return a <tt>null</tt> value
- * instead of an empty list
- */
- @Nullable
- protected abstract List<InputSuggestion> suggest(ParentedElement expectedElement, String matchWith, int count);
-
- protected List<String> getHints(ParentedElement expectedElement, String matchWith) {
- return new ArrayList<>();
- }
-
- /**
- * Get index of next character after the match.
- *
- * @param spec
- * spec to be matched
- * @param content
- * content to match against
- * @return
- * index of next character after the match, or 0 if the rule
- * does not match any part of the string
- */
- protected int getEndOfMatch(ElementSpec spec, String content) {
- int endOfMatch = 0;
- List<Token> tokens = grammar.lex(content);
- if (!tokens.isEmpty() && tokens.get(0).getStartIndex() == 0) {
- endOfMatch = spec.getEndOfMatch(tokens);
- if (endOfMatch > 0) // there exist an element match
- endOfMatch = tokens.get(endOfMatch-1).getStopIndex()+1; // convert to char index
- }
- return endOfMatch;
- }
-
- /**
- * Wrap specified literal of specified terminal element as suggestion.
- *
- * @param expectedElement
- * terminal element expecting to be matched next
- * @param suggestedLiteral
- * a proposed literal of above terminal element defined in grammar
- * @param complete
- * whether or not above literal is a complete representation of the
- * expected terminal element
- * @return
- * suggestion of the literal, or <tt>null</tt> to suppress this suggestion
- */
- @Nullable
- protected InputSuggestion wrapAsSuggestion(ParentedElement expectedElement,
- String suggestedLiteral, boolean complete) {
- if (StringUtils.isNotBlank(suggestedLiteral))
- return new InputSuggestion(suggestedLiteral, -1, complete, null, null);
- else
- return new InputSuggestion(suggestedLiteral, -1, complete, "space", null);
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/ElementCompletion.java b/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/ElementCompletion.java
deleted file mode 100644
index 4ad9aeaaed..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/ElementCompletion.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.gitplex.commons.antlr.codeassist;
-
-import javax.annotation.Nullable;
-
-import com.gitplex.jsymbol.Range;
-
-public class ElementCompletion extends InputCompletion {
-
- private static final long serialVersionUID = 1L;
-
- private final boolean complete;
-
- private final ParentedElement expectedElement;
-
- public ElementCompletion(ParentedElement expectedElement, int replaceBegin,
- int replaceEnd, String replaceContent, int caret, boolean complete,
- @Nullable String label, @Nullable String description, @Nullable Range highlight) {
- super(replaceBegin, replaceEnd, replaceContent, caret, label, description, highlight);
-
- this.complete = complete;
- this.expectedElement = expectedElement;
- }
-
- public ParentedElement getExpectedElement() {
- return expectedElement;
- }
-
- public boolean isComplete() {
- return complete;
- }
-
-}
\ No newline at end of file
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/ElementSuggestion.java b/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/ElementSuggestion.java
deleted file mode 100644
index 002900471b..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/ElementSuggestion.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.gitplex.commons.antlr.codeassist;
-
-import java.util.List;
-
-public class ElementSuggestion {
-
- private final ParentedElement expectedElement;
-
- private final String matchWith;
-
- private final List<InputSuggestion> inputSuggestions;
-
- public ElementSuggestion(ParentedElement expectedElement,
- String matchWith, List<InputSuggestion> inputSuggestions) {
- this.expectedElement = expectedElement;
- this.matchWith = matchWith;
- this.inputSuggestions = inputSuggestions;
- }
-
- public ParentedElement getExpectedElement() {
- return expectedElement;
- }
-
- public String getMatchWith() {
- return matchWith;
- }
-
- public List<InputSuggestion> getInputSuggestions() {
- return inputSuggestions;
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/FenceAware.java b/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/FenceAware.java
deleted file mode 100644
index 186c22ac19..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/FenceAware.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.gitplex.commons.antlr.codeassist;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.antlr.v4.runtime.Token;
-
-import com.gitplex.commons.antlr.grammar.ElementSpec;
-import com.gitplex.commons.antlr.grammar.Grammar;
-import com.gitplex.jsymbol.Range;
-
-public abstract class FenceAware {
-
- private final Grammar grammar;
-
- private final String open;
-
- private final String close;
-
- public FenceAware(Grammar grammar, String open, String close) {
- this.grammar = grammar;
- this.open = open;
- this.close = close;
- }
-
- private boolean matches(ElementSpec spec, String content) {
- List<Token> tokens = grammar.lex(content);
- if (tokens.isEmpty()) {
- return content.length() == 0 && spec.isAllowEmpty();
- } else {
- int start = tokens.get(0).getStartIndex();
- int stop = tokens.get(tokens.size()-1).getStopIndex()+1;
- return start == 0 && stop == content.length() && spec.getEndOfMatch(tokens) == tokens.size();
- }
- }
-
- public List<InputSuggestion> suggest(ElementSpec spec, String matchWith, int count) {
- String unfencedMatchWith = matchWith;
- if (matchWith.startsWith(open))
- unfencedMatchWith = unfencedMatchWith.substring(open.length());
- unfencedMatchWith = unfencedMatchWith.trim();
-
- List<InputSuggestion> suggestions = match(unfencedMatchWith, count);
- if (suggestions != null) {
- List<InputSuggestion> checkedSuggestions = new ArrayList<>();
-
- for (InputSuggestion suggestion: suggestions) {
- String content = suggestion.getContent();
- int caret = suggestion.getCaret();
- if (!matches(spec, content)) {
- content = open + content + close;
- Range matchRange = suggestion.getMatchRange();
- if (caret != -1)
- caret += open.length();
- if (matchRange != null)
- matchRange = new Range(matchRange.getFrom()+open.length(), matchRange.getTo()+open.length());
- checkedSuggestions.add(new InputSuggestion(content, caret, true, suggestion.getDescription(), matchRange));
- } else {
- checkedSuggestions.add(suggestion);
- }
- }
-
- /*
- * Check to see if the matchWith should be surrounded and return as a suggestion if no other
- * suggestions. For instance, you may have a rule requiring that value containing spaces
- * should be quoted, in this case, below code will suggest you to quote the value if it
- * contains spaces as otherwise it will fail the match below
- */
- if (checkedSuggestions.isEmpty() && matchWith.length() != 0 && !matches(spec, unfencedMatchWith)) {
- unfencedMatchWith = open + unfencedMatchWith + close;
- if (matches(spec, unfencedMatchWith)) {
- Range matchRange = new Range(1, unfencedMatchWith.length()-1);
- checkedSuggestions.add(new InputSuggestion(unfencedMatchWith, getFencingDescription(), matchRange));
- }
- }
-
- if (checkedSuggestions.isEmpty() && matchWith.length() == 0)
- checkedSuggestions.add(new InputSuggestion(open, null, null));
- return checkedSuggestions;
- } else {
- return null;
- }
- }
-
- protected String getFencingDescription() {
- return null;
- }
-
- /**
- * Match with provided string to give a list of suggestions
- *
- * @param unfencedMatchWith
- * string with fencing literals removed
- * @return
- * a list of suggestions. If you do not have any suggestions and want code assist to
- * drill down the element to provide default suggestions, return a <tt>null</tt> value
- * instead of an empty list
- */
- @Nullable
- protected abstract List<InputSuggestion> match(String unfencedMatchWith, int count);
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/InputCompletion.java b/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/InputCompletion.java
deleted file mode 100644
index bd58960cdc..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/InputCompletion.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.gitplex.commons.antlr.codeassist;
-
-import java.io.Serializable;
-
-import javax.annotation.Nullable;
-
-import com.gitplex.jsymbol.Range;
-
-public class InputCompletion implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private final int replaceBegin;
-
- private final int replaceEnd;
-
- private final String replaceContent;
-
- private final int caret;
-
- private final String label;
-
- private final String description;
-
- private final Range matchRange;
-
- public InputCompletion(int replaceBegin, int replaceEnd, String replaceContent,
- int caret, @Nullable String label, @Nullable String description, @Nullable Range matchRange) {
- this.replaceBegin = replaceBegin;
- this.replaceEnd = replaceEnd;
- this.replaceContent = replaceContent;
- this.caret = caret;
- if (label != null)
- this.label = label;
- else
- this.label = replaceContent;
- this.description = description;
- this.matchRange = matchRange;
- }
-
- public InputCompletion(InputCompletion completion) {
- this(completion.getReplaceBegin(), completion.getReplaceEnd(), completion.getReplaceContent(),
- completion.getCaret(), completion.getLabel(), completion.getDescription(), completion.getMatchRange());
- }
-
- public int getReplaceBegin() {
- return replaceBegin;
- }
-
- public int getReplaceEnd() {
- return replaceEnd;
- }
-
- public String getReplaceContent() {
- return replaceContent;
- }
-
- public int getCaret() {
- return caret;
- }
-
- public String getLabel() {
- return label;
- }
-
- public String getDescription() {
- return description;
- }
-
- public Range getMatchRange() {
- return matchRange;
- }
-
- public InputStatus complete(InputStatus inputStatus) {
- String beforeContent = inputStatus.getContent().substring(0, replaceBegin);
- String afterContent = inputStatus.getContent().substring(replaceEnd, inputStatus.getContent().length());
- return new InputStatus(beforeContent + replaceContent + afterContent, caret);
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/InputStatus.java b/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/InputStatus.java
deleted file mode 100644
index 3bf3d22365..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/InputStatus.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.gitplex.commons.antlr.codeassist;
-
-import java.io.Serializable;
-
-public class InputStatus implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private final String content;
-
- private final int caret;
-
- public InputStatus(String content, int caret) {
- this.content = content;
- this.caret = caret;
- }
-
- public InputStatus(String content) {
- this(content, content.length());
- }
-
- public String getContent() {
- return content;
- }
-
- public int getCaret() {
- return caret;
- }
-
- public String getContentBeforeCaret() {
- return content.substring(0, caret);
- }
-
- public String getContentAfterCaret() {
- return content.substring(caret, content.length());
- }
-
- @Override
- public String toString() {
- return content + ":" + caret;
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/InputSuggestion.java b/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/InputSuggestion.java
deleted file mode 100644
index eea8c7668e..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/InputSuggestion.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.gitplex.commons.antlr.codeassist;
-
-import javax.annotation.Nullable;
-
-import com.gitplex.jsymbol.Range;
-
-public class InputSuggestion extends InputStatus {
-
- private static final long serialVersionUID = 1L;
-
- private final boolean complete;
-
- private final String label;
-
- private final String description;
-
- private final Range matchRange;
-
- /**
- * Construct the input suggestion.
- *
- * @param content
- * content of the suggestion
- * @param caret
- * caret of the suggestion
- * @param complete
- * whether or not the suggested content is a complete representation of
- * corresponding element spec
- * @param description
- * description of the suggestion
- * @param matchRange
- * optionally specifies range of the string being matched against user input
- */
- public InputSuggestion(String content, int caret, boolean complete, @Nullable String label,
- @Nullable String description, @Nullable Range matchRange) {
- super(content, caret);
- this.complete = complete;
- this.label = label;
- this.description = description;
- this.matchRange = matchRange;
- }
-
- public InputSuggestion(String content, int caret, boolean complete,
- @Nullable String description, @Nullable Range matchRange) {
- this(content, caret, complete, null, description, matchRange);
- }
-
- public InputSuggestion(String content, @Nullable String description, @Nullable Range highlight) {
- this(content, -1, true, description, highlight);
- }
-
- public InputSuggestion(String content, @Nullable Range matchRange) {
- this(content, null, matchRange);
- }
-
- public InputSuggestion(String content) {
- this(content, null);
- }
-
- public boolean isComplete() {
- return complete;
- }
-
- public String getLabel() {
- return label;
- }
-
- @Nullable
- public String getDescription() {
- return description;
- }
-
- @Nullable
- public Range getMatchRange() {
- return matchRange;
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/MandatoryScan.java b/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/MandatoryScan.java
deleted file mode 100644
index ae1bf89c89..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/MandatoryScan.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.gitplex.commons.antlr.codeassist;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-public class MandatoryScan implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private final List<String> mandatories;
-
- private final boolean stop;
-
- /**
- * Construct mandatory scan object
- *
- * @param mandatories
- * list of mandatory literals
- * @param stop
- * sign to whether or not the mandatory scan should be
- * stopped
- */
- public MandatoryScan(List<String> mandatories, boolean stop) {
- this.mandatories = mandatories;
- this.stop = stop;
- }
-
- public List<String> getMandatories() {
- return mandatories;
- }
-
- public boolean isStop() {
- return stop;
- }
-
- public static MandatoryScan stop() {
- return new MandatoryScan(new ArrayList<String>(), true);
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/ParentedElement.java b/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/ParentedElement.java
deleted file mode 100644
index 647aa6d8e4..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/ParentedElement.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.gitplex.commons.antlr.codeassist;
-
-import javax.annotation.Nullable;
-
-import com.gitplex.commons.antlr.parser.Element;
-
-public class ParentedElement extends Element {
-
- private final ParentedElement parent;
-
- public ParentedElement(@Nullable ParentedElement parent, Element element) {
- super(element.getParser(), element.getSpec(), element.getPosition(), element.getState());
-
- this.parent = parent;
- }
-
- /**
- * Get parent element
- *
- * @return
- * parent element, or <tt>null</tt> if current element is root
- */
- @Nullable
- public ParentedElement getParent() {
- return parent;
- }
-
- @Nullable
- public ParentedElement findParentByLabel(String label) {
- ParentedElement current = parent;
- while (current != null) {
- if (label.equals(current.getLabel()))
- return current;
- current = current.parent;
- }
- return null;
- }
-
- @Nullable
- public ParentedElement findParentByRule(String ruleName) {
- ParentedElement current = parent;
- while (current != null) {
- if (ruleName.equals(current.getState().getRuleSpec().getName()))
- return current;
- current = current.parent;
- }
- return null;
- }
-
- /**
- * Get root element
- *
- * @return
- * root element
- */
- public ParentedElement getRoot() {
- if (parent == null)
- return this;
- else
- return parent.getRoot();
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/Suggester.java b/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/Suggester.java
deleted file mode 100644
index 6917309681..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/Suggester.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.gitplex.commons.antlr.codeassist;
-
-import java.util.List;
-
-public interface Suggester {
- List<InputSuggestion> suggest(String matchWith);
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest1.g4 b/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest1.g4
deleted file mode 100644
index 6029e26456..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest1.g4
+++ /dev/null
@@ -1,13 +0,0 @@
-grammar CodeAssistTest1;
-
-selfReference: 'ab' | selfReference 'cd';
-
-mandatories: 'ab' 'c' | 'ab' 'c' | ('cd' ('ef' 'g')) 'h';
-
-notRealAmbiguity: NUMBER+ NUMBER;
-
-NUMBER: [1-9]+;
-
-ID: [a-z]+;
-
-WS: [ \t\r\n]+ -> skip;
\ No newline at end of file
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest2.g4 b/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest2.g4
deleted file mode 100644
index 253360858e..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest2.g4
+++ /dev/null
@@ -1,44 +0,0 @@
-grammar CodeAssistTest2;
-
-query: criteria+ EOF;
-
-criteria: revisionCriteria | before | after | committer | author | path | message;
-
-revisionCriteria
- : revision # SingleRevision
- | EXCLUDE revision # RevisionExclusion
- | revision Range revision # RevisionRange
- ;
-
-revision: (BRANCH|TAG|ID) Value;
-
-before: BEFORE Value;
-
-after: AFTER Value;
-
-committer: COMMITTER Value;
-
-author: AUTHOR Value;
-
-path: PATH Value;
-
-message: MESSAGE Value;
-
-BRANCH: 'branch';
-TAG: 'tag';
-ID: 'id';
-BEFORE: 'before';
-AFTER: 'after';
-MESSAGE: 'message';
-COMMITTER: 'committer';
-AUTHOR: 'author';
-PATH: 'path';
-EXCLUDE: '^';
-
-Range: '..' | '...';
-Value: '(' (ESCAPE|~[()\\])+? ')';
-
-fragment
-ESCAPE: '\\'[()\\];
-
-WS: [ \t\r\n]+ -> skip;
\ No newline at end of file
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest3.g4 b/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest3.g4
deleted file mode 100644
index f426925b91..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest3.g4
+++ /dev/null
@@ -1,15 +0,0 @@
-grammar CodeAssistTest3;
-
-query: criteria+ EOF;
-
-criteria: ('title'|'author') ':' value;
-
-value: QuotedValue|NQuotedValue;
-
-QuotedValue: '"' (ESCAPE|~["\\])+? '"';
-NQuotedValue: [a-zA-Z1-9_]+;
-
-fragment
-ESCAPE: '\\'["\\];
-
-WS: [ \t\r\n]+ -> skip;
\ No newline at end of file
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest4.g4 b/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest4.g4
deleted file mode 100644
index be02f7f3b5..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest4.g4
+++ /dev/null
@@ -1,7 +0,0 @@
-grammar CodeAssistTest4;
-
-stat: expr ';' | ID '=' expr ';' | ';';
-expr: INT | ID | expr ('+'|'-'|'*'|'/') expr | '(' expr ')';
-ID: [a-zA-Z]+;
-INT: [0-9]+;
-WS: [ \t\n]+ -> skip;
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest5Lexer.g4 b/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest5Lexer.g4
deleted file mode 100644
index c222be39a7..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest5Lexer.g4
+++ /dev/null
@@ -1,383 +0,0 @@
-
-lexer grammar CodeAssistTest5Lexer;
-@ header {
- }
-
-SELECT
- : 'select'
- ;
-
-
-FROM
- : 'from'
- ;
-
-
-WHERE
- : 'where'
- ;
-
-
-AND
- : 'and' | '&&'
- ;
-
-
-OR
- : 'or' | '||'
- ;
-
-
-XOR
- : 'xor'
- ;
-
-
-IS
- : 'is'
- ;
-
-
-NULL
- : 'null'
- ;
-
-
-LIKE
- : 'like'
- ;
-
-
-IN
- : 'in'
- ;
-
-
-EXISTS
- : 'exists'
- ;
-
-
-ALL
- : 'all'
- ;
-
-
-ANY
- : 'any'
- ;
-
-
-TRUE
- : 'true'
- ;
-
-
-FALSE
- : 'false'
- ;
-
-
-DIVIDE
- : 'div' | '/'
- ;
-
-
-MOD
- : 'mod' | '%'
- ;
-
-
-BETWEEN
- : 'between'
- ;
-
-
-REGEXP
- : 'regexp'
- ;
-
-
-PLUS
- : '+'
- ;
-
-
-MINUS
- : '-'
- ;
-
-
-NEGATION
- : '~'
- ;
-
-
-VERTBAR
- : '|'
- ;
-
-
-BITAND
- : '&'
- ;
-
-
-POWER_OP
- : '^'
- ;
-
-
-BINARY
- : 'binary'
- ;
-
-
-SHIFT_LEFT
- : '<<'
- ;
-
-
-SHIFT_RIGHT
- : '>>'
- ;
-
-
-ESCAPE
- : 'escape'
- ;
-
-
-ASTERISK
- : '*'
- ;
-
-
-RPAREN
- : ')'
- ;
-
-
-LPAREN
- : '('
- ;
-
-
-RBRACK
- : ']'
- ;
-
-
-LBRACK
- : '['
- ;
-
-
-COLON
- : ':'
- ;
-
-
-ALL_FIELDS
- : '.*'
- ;
-
-
-EQ
- : '='
- ;
-
-
-LTH
- : '<'
- ;
-
-
-GTH
- : '>'
- ;
-
-
-NOT_EQ
- : '!='
- ;
-
-
-NOT
- : 'not'
- ;
-
-
-LET
- : '<='
- ;
-
-
-GET
- : '>='
- ;
-
-
-SEMI
- : ';'
- ;
-
-
-COMMA
- : ','
- ;
-
-
-DOT
- : '.'
- ;
-
-
-COLLATE
- : 'collate'
- ;
-
-
-INNER
- : 'inner'
- ;
-
-
-OUTER
- : 'outer'
- ;
-
-
-JOIN
- : 'join'
- ;
-
-
-CROSS
- : 'cross'
- ;
-
-
-USING
- : 'using'
- ;
-
-
-INDEX
- : 'index'
- ;
-
-
-KEY
- : 'key'
- ;
-
-
-ORDER
- : 'order'
- ;
-
-
-GROUP
- : 'group'
- ;
-
-
-BY
- : 'by'
- ;
-
-
-FOR
- : 'for'
- ;
-
-
-USE
- : 'use'
- ;
-
-
-IGNORE
- : 'ignore'
- ;
-
-
-PARTITION
- : 'partition'
- ;
-
-
-STRAIGHT_JOIN
- : 'straight_join'
- ;
-
-
-NATURAL
- : 'natural'
- ;
-
-
-LEFT
- : 'left'
- ;
-
-
-RIGHT
- : 'right'
- ;
-
-
-OJ
- : 'oj'
- ;
-
-
-ON
- : 'on'
- ;
-
-
-ID
- : ( 'a' .. 'z' | 'A' .. 'Z' | '_' )+
- ;
-
-
-INT
- : '0' .. '9'+
- ;
-
-
-NEWLINE
- : '\r'? '\n' -> skip
- ;
-
-
-WS
- : ( ' ' | '\t' | '\n' | '\r' )+ -> skip
- ;
-
-
-USER_VAR
- : '@' ( USER_VAR_SUBFIX1 | USER_VAR_SUBFIX2 | USER_VAR_SUBFIX3 | USER_VAR_SUBFIX4 )
- ;
-
-
-fragment USER_VAR_SUBFIX1
- : ( '`' ( ~ '`' )+ '`' )
- ;
-
-
-fragment USER_VAR_SUBFIX2
- : ( '\'' ( ~ '\'' )+ '\'' )
- ;
-
-
-fragment USER_VAR_SUBFIX3
- : ( '\"' ( ~ '\"' )+ '\"' )
- ;
-
-
-fragment USER_VAR_SUBFIX4
- : ( 'A' .. 'Z' | 'a' .. 'z' | '_' | '$' | '0' .. '9' | DOT )+
- ;
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest5Parser.g4 b/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest5Parser.g4
deleted file mode 100644
index 25c98459c4..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest5Parser.g4
+++ /dev/null
@@ -1,169 +0,0 @@
-
-parser grammar CodeAssistTest5Parser;
-
-options
- { tokenVocab = CodeAssistTest5Lexer; }
-
-stat
- : select_clause+
- ;
-
-schema_name
- : ID
- ;
-
-select_clause
- : SELECT column_list_clause ( FROM table_references )? ( where_clause )?
- ;
-
-table_name
- : ID
- ;
-
-table_alias
- : ID
- ;
-
-column_name
- : ( ( schema_name DOT )? tableName=ID DOT )? columnName=ID ( column_name_alias )? | ( table_alias DOT )? ID | USER_VAR ( column_name_alias )?
- ;
-
-column_name_alias
- : ID
- ;
-
-index_name
- : ID
- ;
-
-column_list
- : LPAREN column_name ( COMMA column_name )* RPAREN
- ;
-
-column_list_clause
- : column_name ( COMMA column_name )*
- ;
-
-from_clause
- : FROM table_name ( COMMA table_name )*
- ;
-
-select_key
- : SELECT
- ;
-
-where_clause
- : WHERE expression
- ;
-
-expression
- : simple_expression ( expr_op simple_expression )*
- ;
-
-element
- : USER_VAR | ID | ( '|' ID '|' ) | INT | column_name
- ;
-
-right_element
- : element
- ;
-
-left_element
- : element
- ;
-
-target_element
- : element
- ;
-
-relational_op
- : EQ | LTH | GTH | NOT_EQ | LET | GET
- ;
-
-expr_op
- : AND | XOR | OR | NOT
- ;
-
-between_op
- : BETWEEN
- ;
-
-is_or_is_not
- : IS | IS NOT
- ;
-
-simple_expression
- : left_element relational_op right_element | target_element between_op left_element AND right_element | target_element is_or_is_not NULL
- ;
-
-table_references
- : table_reference ( ( COMMA table_reference ) | join_clause )*
- ;
-
-table_reference
- : table_factor1 | table_atom
- ;
-
-table_factor1
- : table_factor2 ( ( INNER | CROSS )? JOIN table_atom ( join_condition )? )?
- ;
-
-table_factor2
- : table_factor3 ( STRAIGHT_JOIN table_atom ( ON expression )? )?
- ;
-
-table_factor3
- : table_factor4 ( ( LEFT | RIGHT ) ( OUTER )? JOIN table_factor4 join_condition )?
- ;
-
-table_factor4
- : table_atom ( NATURAL ( ( LEFT | RIGHT ) ( OUTER )? )? JOIN table_atom )?
- ;
-
-table_atom
- : ( table_name ( partition_clause )? ( table_alias )? ( index_hint_list )? ) | ( subquery subquery_alias ) | ( LPAREN table_references RPAREN ) | ( OJ table_reference LEFT OUTER JOIN table_reference ON expression )
- ;
-
-join_clause
- : ( ( INNER | CROSS )? JOIN table_atom ( join_condition )? ) | ( STRAIGHT_JOIN table_atom ( ON expression )? ) | ( ( LEFT | RIGHT ) ( OUTER )? JOIN table_factor4 join_condition ) | ( NATURAL ( ( LEFT | RIGHT ) ( OUTER )? )? JOIN table_atom )
- ;
-
-join_condition
- : ( ON expression ( expr_op expression )* ) | ( USING column_list )
- ;
-
-index_hint_list
- : index_hint ( COMMA index_hint )*
- ;
-
-index_options
- : ( INDEX | KEY ) ( FOR ( ( JOIN ) | ( ORDER BY ) | ( GROUP BY ) ) )?
- ;
-
-index_hint
- : USE index_options LPAREN ( index_list )? RPAREN | IGNORE index_options LPAREN index_list RPAREN
- ;
-
-index_list
- : index_name ( COMMA index_name )*
- ;
-
-partition_clause
- : PARTITION LPAREN partition_names RPAREN
- ;
-
-partition_names
- : partition_name ( COMMA partition_name )*
- ;
-
-partition_name
- : ID
- ;
-
-subquery_alias
- : ID
- ;
-
-subquery
- : LPAREN select_clause RPAREN
- ;
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest6.g4 b/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest6.g4
deleted file mode 100644
index 6feac12bd9..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/codeassist/test/CodeAssistTest6.g4
+++ /dev/null
@@ -1,1780 +0,0 @@
-/*
- * [The "BSD license"]
- * Copyright (c) 2014 Terence Parr
- * Copyright (c) 2014 Sam Harwell
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * A Java 8 grammar for ANTLR 4 derived from the Java Language Specification
- * chapter 19.
- *
- * NOTE: This grammar results in a generated parser that is much slower
- * than the Java 7 grammar in the grammars-v4/java directory. This
- * one is, however, extremely close to the spec.
- *
- * You can test with
- *
- * $ antlr4 Java8.g4
- * $ javac *.java
- * $ grun Java8 compilationUnit *.java
- *
- * Or,
-~/antlr/code/grammars-v4/java8 $ java Test .
-/Users/parrt/antlr/code/grammars-v4/java8/./Java8BaseListener.java
-/Users/parrt/antlr/code/grammars-v4/java8/./Java8Lexer.java
-/Users/parrt/antlr/code/grammars-v4/java8/./Java8Listener.java
-/Users/parrt/antlr/code/grammars-v4/java8/./Java8Parser.java
-/Users/parrt/antlr/code/grammars-v4/java8/./Test.java
-Total lexer+parser time 30844ms.
- */
-grammar CodeAssistTest6;
-
-/*
- * Productions from §3 (Lexical Structure)
- */
-
-literal
- : IntegerLiteral
- | FloatingPointLiteral
- | BooleanLiteral
- | CharacterLiteral
- | StringLiteral
- | NullLiteral
- ;
-
-/*
- * Productions from §4 (Types, Values, and Variables)
- */
-
-
-type
- : primitiveType
- | referenceType
- ;
-
-primitiveType
- : annotation* numericType
- | annotation* 'boolean'
- ;
-
-numericType
- : integralType
- | floatingPointType
- ;
-
-integralType
- : 'byte'
- | 'short'
- | 'int'
- | 'long'
- | 'char'
- ;
-
-floatingPointType
- : 'float'
- | 'double'
- ;
-
-referenceType
- : classOrInterfaceType
- | typeVariable
- | arrayType
- ;
-
-classOrInterfaceType
- : ( classType_lfno_classOrInterfaceType
- | interfaceType_lfno_classOrInterfaceType
- )
- ( classType_lf_classOrInterfaceType
- | interfaceType_lf_classOrInterfaceType
- )*
- ;
-
-classType
- : annotation* Identifier typeArguments?
- | classOrInterfaceType '.' annotation* Identifier typeArguments?
- ;
-
-classType_lf_classOrInterfaceType
- : '.' annotation* Identifier typeArguments?
- ;
-
-classType_lfno_classOrInterfaceType
- : annotation* Identifier typeArguments?
- ;
-
-interfaceType
- : classType
- ;
-
-interfaceType_lf_classOrInterfaceType
- : classType_lf_classOrInterfaceType
- ;
-
-interfaceType_lfno_classOrInterfaceType
- : classType_lfno_classOrInterfaceType
- ;
-
-typeVariable
- : annotation* Identifier
- ;
-
-arrayType
- : primitiveType dims
- | classOrInterfaceType dims
- | typeVariable dims
- ;
-
-dims
- : annotation* '[' ']' (annotation* '[' ']')*
- ;
-
-typeParameter
- : typeParameterModifier* Identifier typeBound?
- ;
-
-typeParameterModifier
- : annotation
- ;
-
-typeBound
- : 'extends' typeVariable
- | 'extends' classOrInterfaceType additionalBound*
- ;
-
-additionalBound
- : '&' interfaceType
- ;
-
-typeArguments
- : '<' typeArgumentList '>'
- ;
-
-typeArgumentList
- : typeArgument (',' typeArgument)*
- ;
-
-typeArgument
- : referenceType
- | wildcard
- ;
-
-wildcard
- : annotation* '?' wildcardBounds?
- ;
-
-wildcardBounds
- : 'extends' referenceType
- | 'super' referenceType
- ;
-
-/*
- * Productions from §6 (Names)
- */
-
-packageName
- : Identifier
- | packageName '.' Identifier
- ;
-
-typeName
- : Identifier
- | packageOrTypeName '.' Identifier
- ;
-
-packageOrTypeName
- : Identifier
- | packageOrTypeName '.' Identifier
- ;
-
-expressionName
- : Identifier
- | ambiguousName '.' Identifier
- ;
-
-methodName
- : Identifier
- ;
-
-ambiguousName
- : Identifier
- | ambiguousName '.' Identifier
- ;
-
-/*
- * Productions from §7 (Packages)
- */
-
-compilationUnit
- : packageDeclaration? importDeclaration* typeDeclaration* EOF
- ;
-
-packageDeclaration
- : packageModifier* 'package' Identifier ('.' Identifier)* ';'
- ;
-
-packageModifier
- : annotation
- ;
-
-importDeclaration
- : singleTypeImportDeclaration
- | typeImportOnDemandDeclaration
- | singleStaticImportDeclaration
- | staticImportOnDemandDeclaration
- ;
-
-singleTypeImportDeclaration
- : 'import' typeName ';'
- ;
-
-typeImportOnDemandDeclaration
- : 'import' packageOrTypeName '.' '*' ';'
- ;
-
-singleStaticImportDeclaration
- : 'import' 'static' typeName '.' Identifier ';'
- ;
-
-staticImportOnDemandDeclaration
- : 'import' 'static' typeName '.' '*' ';'
- ;
-
-typeDeclaration
- : classDeclaration
- | interfaceDeclaration
- | ';'
- ;
-
-/*
- * Productions from §8 (Classes)
- */
-
-classDeclaration
- : normalClassDeclaration
- | enumDeclaration
- ;
-
-normalClassDeclaration
- : classModifier* 'class' Identifier typeParameters? superclass? superinterfaces? classBody
- ;
-
-classModifier
- : annotation
- | 'public'
- | 'protected'
- | 'private'
- | 'abstract'
- | 'static'
- | 'final'
- | 'strictfp'
- ;
-
-typeParameters
- : '<' typeParameterList '>'
- ;
-
-typeParameterList
- : typeParameter (',' typeParameter)*
- ;
-
-superclass
- : 'extends' classType
- ;
-
-superinterfaces
- : 'implements' interfaceTypeList
- ;
-
-interfaceTypeList
- : interfaceType (',' interfaceType)*
- ;
-
-classBody
- : '{' classBodyDeclaration* '}'
- ;
-
-classBodyDeclaration
- : classMemberDeclaration
- | instanceInitializer
- | staticInitializer
- | constructorDeclaration
- ;
-
-classMemberDeclaration
- : fieldDeclaration
- | methodDeclaration
- | classDeclaration
- | interfaceDeclaration
- | ';'
- ;
-
-fieldDeclaration
- : fieldModifier* unannType variableDeclaratorList ';'
- ;
-
-fieldModifier
- : annotation
- | 'public'
- | 'protected'
- | 'private'
- | 'static'
- | 'final'
- | 'transient'
- | 'volatile'
- ;
-
-variableDeclaratorList
- : variableDeclarator (',' variableDeclarator)*
- ;
-
-variableDeclarator
- : variableDeclaratorId ('=' variableInitializer)?
- ;
-
-variableDeclaratorId
- : Identifier dims?
- ;
-
-variableInitializer
- : expression
- | arrayInitializer
- ;
-
-unannType
- : unannPrimitiveType
- | unannReferenceType
- ;
-
-unannPrimitiveType
- : numericType
- | 'boolean'
- ;
-
-unannReferenceType
- : unannClassOrInterfaceType
- | unannTypeVariable
- | unannArrayType
- ;
-
-unannClassOrInterfaceType
- : ( unannClassType_lfno_unannClassOrInterfaceType
- | unannInterfaceType_lfno_unannClassOrInterfaceType
- )
- ( unannClassType_lf_unannClassOrInterfaceType
- | unannInterfaceType_lf_unannClassOrInterfaceType
- )*
- ;
-
-unannClassType
- : Identifier typeArguments?
- | unannClassOrInterfaceType '.' annotation* Identifier typeArguments?
- ;
-
-unannClassType_lf_unannClassOrInterfaceType
- : '.' annotation* Identifier typeArguments?
- ;
-
-unannClassType_lfno_unannClassOrInterfaceType
- : Identifier typeArguments?
- ;
-
-unannInterfaceType
- : unannClassType
- ;
-
-unannInterfaceType_lf_unannClassOrInterfaceType
- : unannClassType_lf_unannClassOrInterfaceType
- ;
-
-unannInterfaceType_lfno_unannClassOrInterfaceType
- : unannClassType_lfno_unannClassOrInterfaceType
- ;
-
-unannTypeVariable
- : Identifier
- ;
-
-unannArrayType
- : unannPrimitiveType dims
- | unannClassOrInterfaceType dims
- | unannTypeVariable dims
- ;
-
-methodDeclaration
- : methodModifier* methodHeader methodBody
- ;
-
-methodModifier
- : annotation
- | 'public'
- | 'protected'
- | 'private'
- | 'abstract'
- | 'static'
- | 'final'
- | 'synchronized'
- | 'native'
- | 'strictfp'
- ;
-
-methodHeader
- : result methodDeclarator throws_?
- | typeParameters annotation* result methodDeclarator throws_?
- ;
-
-result
- : unannType
- | 'void'
- ;
-
-methodDeclarator
- : Identifier '(' formalParameterList? ')' dims?
- ;
-
-formalParameterList
- : formalParameters ',' lastFormalParameter
- | lastFormalParameter
- ;
-
-formalParameters
- : formalParameter (',' formalParameter)*
- | receiverParameter (',' formalParameter)*
- ;
-
-formalParameter
- : variableModifier* unannType variableDeclaratorId
- ;
-
-variableModifier
- : annotation
- | 'final'
- ;
-
-lastFormalParameter
- : variableModifier* unannType annotation* '...' variableDeclaratorId
- | formalParameter
- ;
-
-receiverParameter
- : annotation* unannType (Identifier '.')? 'this'
- ;
-
-throws_
- : 'throws' exceptionTypeList
- ;
-
-exceptionTypeList
- : exceptionType (',' exceptionType)*
- ;
-
-exceptionType
- : classType
- | typeVariable
- ;
-
-methodBody
- : block
- | ';'
- ;
-
-instanceInitializer
- : block
- ;
-
-staticInitializer
- : 'static' block
- ;
-
-constructorDeclaration
- : constructorModifier* constructorDeclarator throws_? constructorBody
- ;
-
-constructorModifier
- : annotation
- | 'public'
- | 'protected'
- | 'private'
- ;
-
-constructorDeclarator
- : typeParameters? simpleTypeName '(' formalParameterList? ')'
- ;
-
-simpleTypeName
- : Identifier
- ;
-
-constructorBody
- : '{' explicitConstructorInvocation? blockStatements? '}'
- ;
-
-explicitConstructorInvocation
- : typeArguments? 'this' '(' argumentList? ')' ';'
- | typeArguments? 'super' '(' argumentList? ')' ';'
- | expressionName '.' typeArguments? 'super' '(' argumentList? ')' ';'
- | primary '.' typeArguments? 'super' '(' argumentList? ')' ';'
- ;
-
-enumDeclaration
- : classModifier* 'enum' Identifier superinterfaces? enumBody
- ;
-
-enumBody
- : '{' enumConstantList? ','? enumBodyDeclarations? '}'
- ;
-
-enumConstantList
- : enumConstant (',' enumConstant)*
- ;
-
-enumConstant
- : enumConstantModifier* Identifier ('(' argumentList? ')')? classBody?
- ;
-
-enumConstantModifier
- : annotation
- ;
-
-enumBodyDeclarations
- : ';' classBodyDeclaration*
- ;
-
-/*
- * Productions from §9 (Interfaces)
- */
-
-interfaceDeclaration
- : normalInterfaceDeclaration
- | annotationTypeDeclaration
- ;
-
-normalInterfaceDeclaration
- : interfaceModifier* 'interface' Identifier typeParameters? extendsInterfaces? interfaceBody
- ;
-
-interfaceModifier
- : annotation
- | 'public'
- | 'protected'
- | 'private'
- | 'abstract'
- | 'static'
- | 'strictfp'
- ;
-
-extendsInterfaces
- : 'extends' interfaceTypeList
- ;
-
-interfaceBody
- : '{' interfaceMemberDeclaration* '}'
- ;
-
-interfaceMemberDeclaration
- : constantDeclaration
- | interfaceMethodDeclaration
- | classDeclaration
- | interfaceDeclaration
- | ';'
- ;
-
-constantDeclaration
- : constantModifier* unannType variableDeclaratorList ';'
- ;
-
-constantModifier
- : annotation
- | 'public'
- | 'static'
- | 'final'
- ;
-
-interfaceMethodDeclaration
- : interfaceMethodModifier* methodHeader methodBody
- ;
-
-interfaceMethodModifier
- : annotation
- | 'public'
- | 'abstract'
- | 'default'
- | 'static'
- | 'strictfp'
- ;
-
-annotationTypeDeclaration
- : interfaceModifier* '@' 'interface' Identifier annotationTypeBody
- ;
-
-annotationTypeBody
- : '{' annotationTypeMemberDeclaration* '}'
- ;
-
-annotationTypeMemberDeclaration
- : annotationTypeElementDeclaration
- | constantDeclaration
- | classDeclaration
- | interfaceDeclaration
- | ';'
- ;
-
-annotationTypeElementDeclaration
- : annotationTypeElementModifier* unannType Identifier '(' ')' dims? defaultValue? ';'
- ;
-
-annotationTypeElementModifier
- : annotation
- | 'public'
- | 'abstract'
- ;
-
-defaultValue
- : 'default' elementValue
- ;
-
-annotation
- : normalAnnotation
- | markerAnnotation
- | singleElementAnnotation
- ;
-
-normalAnnotation
- : '@' typeName '(' elementValuePairList? ')'
- ;
-
-elementValuePairList
- : elementValuePair (',' elementValuePair)*
- ;
-
-elementValuePair
- : Identifier '=' elementValue
- ;
-
-elementValue
- : conditionalExpression
- | elementValueArrayInitializer
- | annotation
- ;
-
-elementValueArrayInitializer
- : '{' elementValueList? ','? '}'
- ;
-
-elementValueList
- : elementValue (',' elementValue)*
- ;
-
-markerAnnotation
- : '@' typeName
- ;
-
-singleElementAnnotation
- : '@' typeName '(' elementValue ')'
- ;
-
-/*
- * Productions from §10 (Arrays)
- */
-
-arrayInitializer
- : '{' variableInitializerList? ','? '}'
- ;
-
-variableInitializerList
- : variableInitializer (',' variableInitializer)*
- ;
-
-/*
- * Productions from §14 (Blocks and Statements)
- */
-
-block
- : '{' blockStatements? '}'
- ;
-
-blockStatements
- : blockStatement blockStatement*
- ;
-
-blockStatement
- : localVariableDeclarationStatement
- | classDeclaration
- | statement
- ;
-
-localVariableDeclarationStatement
- : localVariableDeclaration ';'
- ;
-
-localVariableDeclaration
- : variableModifier* unannType variableDeclaratorList
- ;
-
-statement
- : statementWithoutTrailingSubstatement
- | labeledStatement
- | ifThenStatement
- | ifThenElseStatement
- | whileStatement
- | forStatement
- ;
-
-statementNoShortIf
- : statementWithoutTrailingSubstatement
- | labeledStatementNoShortIf
- | ifThenElseStatementNoShortIf
- | whileStatementNoShortIf
- | forStatementNoShortIf
- ;
-
-statementWithoutTrailingSubstatement
- : block
- | emptyStatement
- | expressionStatement
- | assertStatement
- | switchStatement
- | doStatement
- | breakStatement
- | continueStatement
- | returnStatement
- | synchronizedStatement
- | throwStatement
- | tryStatement
- ;
-
-emptyStatement
- : ';'
- ;
-
-labeledStatement
- : Identifier ':' statement
- ;
-
-labeledStatementNoShortIf
- : Identifier ':' statementNoShortIf
- ;
-
-expressionStatement
- : statementExpression ';'
- ;
-
-statementExpression
- : assignment
- | preIncrementExpression
- | preDecrementExpression
- | postIncrementExpression
- | postDecrementExpression
- | methodInvocation
- | classInstanceCreationExpression
- ;
-
-ifThenStatement
- : 'if' '(' expression ')' statement
- ;
-
-ifThenElseStatement
- : 'if' '(' expression ')' statementNoShortIf 'else' statement
- ;
-
-ifThenElseStatementNoShortIf
- : 'if' '(' expression ')' statementNoShortIf 'else' statementNoShortIf
- ;
-
-assertStatement
- : 'assert' expression ';'
- | 'assert' expression ':' expression ';'
- ;
-
-switchStatement
- : 'switch' '(' expression ')' switchBlock
- ;
-
-switchBlock
- : '{' switchBlockStatementGroup* switchLabel* '}'
- ;
-
-switchBlockStatementGroup
- : switchLabels blockStatements
- ;
-
-switchLabels
- : switchLabel switchLabel*
- ;
-
-switchLabel
- : 'case' constantExpression ':'
- | 'case' enumConstantName ':'
- | 'default' ':'
- ;
-
-enumConstantName
- : Identifier
- ;
-
-whileStatement
- : 'while' '(' expression ')' statement
- ;
-
-whileStatementNoShortIf
- : 'while' '(' expression ')' statementNoShortIf
- ;
-
-doStatement
- : 'do' statement 'while' '(' expression ')' ';'
- ;
-
-forStatement
- : basicForStatement
- | enhancedForStatement
- ;
-
-forStatementNoShortIf
- : basicForStatementNoShortIf
- | enhancedForStatementNoShortIf
- ;
-
-basicForStatement
- : 'for' '(' forInit? ';' expression? ';' forUpdate? ')' statement
- ;
-
-basicForStatementNoShortIf
- : 'for' '(' forInit? ';' expression? ';' forUpdate? ')' statementNoShortIf
- ;
-
-forInit
- : statementExpressionList
- | localVariableDeclaration
- ;
-
-forUpdate
- : statementExpressionList
- ;
-
-statementExpressionList
- : statementExpression (',' statementExpression)*
- ;
-
-enhancedForStatement
- : 'for' '(' variableModifier* unannType variableDeclaratorId ':' expression ')' statement
- ;
-
-enhancedForStatementNoShortIf
- : 'for' '(' variableModifier* unannType variableDeclaratorId ':' expression ')' statementNoShortIf
- ;
-
-breakStatement
- : 'break' Identifier? ';'
- ;
-
-continueStatement
- : 'continue' Identifier? ';'
- ;
-
-returnStatement
- : 'return' expression? ';'
- ;
-
-throwStatement
- : 'throw' expression ';'
- ;
-
-synchronizedStatement
- : 'synchronized' '(' expression ')' block
- ;
-
-tryStatement
- : 'try' block catches
- | 'try' block catches? finally_
- | tryWithResourcesStatement
- ;
-
-catches
- : catchClause catchClause*
- ;
-
-catchClause
- : 'catch' '(' catchFormalParameter ')' block
- ;
-
-catchFormalParameter
- : variableModifier* catchType variableDeclaratorId
- ;
-
-catchType
- : unannClassType ('|' classType)*
- ;
-
-finally_
- : 'finally' block
- ;
-
-tryWithResourcesStatement
- : 'try' resourceSpecification block catches? finally_?
- ;
-
-resourceSpecification
- : '(' resourceList ';'? ')'
- ;
-
-resourceList
- : resource (';' resource)*
- ;
-
-resource
- : variableModifier* unannType variableDeclaratorId '=' expression
- ;
-
-/*
- * Productions from §15 (Expressions)
- */
-
-primary
- : ( primaryNoNewArray_lfno_primary
- | arrayCreationExpression
- )
- ( primaryNoNewArray_lf_primary
- )*
- ;
-
-primaryNoNewArray
- : literal
- | typeName ('[' ']')* '.' 'class'
- | 'void' '.' 'class'
- | 'this'
- | typeName '.' 'this'
- | '(' expression ')'
- | classInstanceCreationExpression
- | fieldAccess
- | arrayAccess
- | methodInvocation
- | methodReference
- ;
-
-primaryNoNewArray_lf_arrayAccess
- :
- ;
-
-primaryNoNewArray_lfno_arrayAccess
- : literal
- | typeName ('[' ']')* '.' 'class'
- | 'void' '.' 'class'
- | 'this'
- | typeName '.' 'this'
- | '(' expression ')'
- | classInstanceCreationExpression
- | fieldAccess
- | methodInvocation
- | methodReference
- ;
-
-primaryNoNewArray_lf_primary
- : classInstanceCreationExpression_lf_primary
- | fieldAccess_lf_primary
- | arrayAccess_lf_primary
- | methodInvocation_lf_primary
- | methodReference_lf_primary
- ;
-
-primaryNoNewArray_lf_primary_lf_arrayAccess_lf_primary
- :
- ;
-
-primaryNoNewArray_lf_primary_lfno_arrayAccess_lf_primary
- : classInstanceCreationExpression_lf_primary
- | fieldAccess_lf_primary
- | methodInvocation_lf_primary
- | methodReference_lf_primary
- ;
-
-primaryNoNewArray_lfno_primary
- : literal
- | typeName ('[' ']')* '.' 'class'
- | unannPrimitiveType ('[' ']')* '.' 'class'
- | 'void' '.' 'class'
- | 'this'
- | typeName '.' 'this'
- | '(' expression ')'
- | classInstanceCreationExpression_lfno_primary
- | fieldAccess_lfno_primary
- | arrayAccess_lfno_primary
- | methodInvocation_lfno_primary
- | methodReference_lfno_primary
- ;
-
-primaryNoNewArray_lfno_primary_lf_arrayAccess_lfno_primary
- :
- ;
-
-primaryNoNewArray_lfno_primary_lfno_arrayAccess_lfno_primary
- : literal
- | typeName ('[' ']')* '.' 'class'
- | unannPrimitiveType ('[' ']')* '.' 'class'
- | 'void' '.' 'class'
- | 'this'
- | typeName '.' 'this'
- | '(' expression ')'
- | classInstanceCreationExpression_lfno_primary
- | fieldAccess_lfno_primary
- | methodInvocation_lfno_primary
- | methodReference_lfno_primary
- ;
-
-classInstanceCreationExpression
- : 'new' typeArguments? annotation* Identifier ('.' annotation* Identifier)* typeArgumentsOrDiamond? '(' argumentList? ')' classBody?
- | expressionName '.' 'new' typeArguments? annotation* Identifier typeArgumentsOrDiamond? '(' argumentList? ')' classBody?
- | primary '.' 'new' typeArguments? annotation* Identifier typeArgumentsOrDiamond? '(' argumentList? ')' classBody?
- ;
-
-classInstanceCreationExpression_lf_primary
- : '.' 'new' typeArguments? annotation* Identifier typeArgumentsOrDiamond? '(' argumentList? ')' classBody?
- ;
-
-classInstanceCreationExpression_lfno_primary
- : 'new' typeArguments? annotation* Identifier ('.' annotation* Identifier)* typeArgumentsOrDiamond? '(' argumentList? ')' classBody?
- | expressionName '.' 'new' typeArguments? annotation* Identifier typeArgumentsOrDiamond? '(' argumentList? ')' classBody?
- ;
-
-typeArgumentsOrDiamond
- : typeArguments
- | '<' '>'
- ;
-
-fieldAccess
- : primary '.' Identifier
- | 'super' '.' Identifier
- | typeName '.' 'super' '.' Identifier
- ;
-
-fieldAccess_lf_primary
- : '.' Identifier
- ;
-
-fieldAccess_lfno_primary
- : 'super' '.' Identifier
- | typeName '.' 'super' '.' Identifier
- ;
-
-arrayAccess
- : ( expressionName '[' expression ']'
- | primaryNoNewArray_lfno_arrayAccess '[' expression ']'
- )
- ( primaryNoNewArray_lf_arrayAccess '[' expression ']'
- )*
- ;
-
-arrayAccess_lf_primary
- : ( primaryNoNewArray_lf_primary_lfno_arrayAccess_lf_primary '[' expression ']'
- )
- ( primaryNoNewArray_lf_primary_lf_arrayAccess_lf_primary '[' expression ']'
- )*
- ;
-
-arrayAccess_lfno_primary
- : ( expressionName '[' expression ']'
- | primaryNoNewArray_lfno_primary_lfno_arrayAccess_lfno_primary '[' expression ']'
- )
- ( primaryNoNewArray_lfno_primary_lf_arrayAccess_lfno_primary '[' expression ']'
- )*
- ;
-
-methodInvocation
- : methodName '(' argumentList? ')'
- | typeName '.' typeArguments? Identifier '(' argumentList? ')'
- | expressionName '.' typeArguments? Identifier '(' argumentList? ')'
- | primary '.' typeArguments? Identifier '(' argumentList? ')'
- | 'super' '.' typeArguments? Identifier '(' argumentList? ')'
- | typeName '.' 'super' '.' typeArguments? Identifier '(' argumentList? ')'
- ;
-
-methodInvocation_lf_primary
- : '.' typeArguments? Identifier '(' argumentList? ')'
- ;
-
-methodInvocation_lfno_primary
- : methodName '(' argumentList? ')'
- | typeName '.' typeArguments? Identifier '(' argumentList? ')'
- | expressionName '.' typeArguments? Identifier '(' argumentList? ')'
- | 'super' '.' typeArguments? Identifier '(' argumentList? ')'
- | typeName '.' 'super' '.' typeArguments? Identifier '(' argumentList? ')'
- ;
-
-argumentList
- : expression (',' expression)*
- ;
-
-methodReference
- : expressionName '::' typeArguments? Identifier
- | referenceType '::' typeArguments? Identifier
- | primary '::' typeArguments? Identifier
- | 'super' '::' typeArguments? Identifier
- | typeName '.' 'super' '::' typeArguments? Identifier
- | classType '::' typeArguments? 'new'
- | arrayType '::' 'new'
- ;
-
-methodReference_lf_primary
- : '::' typeArguments? Identifier
- ;
-
-methodReference_lfno_primary
- : expressionName '::' typeArguments? Identifier
- | referenceType '::' typeArguments? Identifier
- | 'super' '::' typeArguments? Identifier
- | typeName '.' 'super' '::' typeArguments? Identifier
- | classType '::' typeArguments? 'new'
- | arrayType '::' 'new'
- ;
-
-arrayCreationExpression
- : 'new' primitiveType dimExprs dims?
- | 'new' classOrInterfaceType dimExprs dims?
- | 'new' primitiveType dims arrayInitializer
- | 'new' classOrInterfaceType dims arrayInitializer
- ;
-
-dimExprs
- : dimExpr dimExpr*
- ;
-
-dimExpr
- : annotation* '[' expression ']'
- ;
-
-constantExpression
- : expression
- ;
-
-expression
- : lambdaExpression
- | assignmentExpression
- ;
-
-lambdaExpression
- : lambdaParameters '->' lambdaBody
- ;
-
-lambdaParameters
- : Identifier
- | '(' formalParameterList? ')'
- | '(' inferredFormalParameterList ')'
- ;
-
-inferredFormalParameterList
- : Identifier (',' Identifier)*
- ;
-
-lambdaBody
- : expression
- | block
- ;
-
-assignmentExpression
- : conditionalExpression
- | assignment
- ;
-
-assignment
- : leftHandSide assignmentOperator expression
- ;
-
-leftHandSide
- : expressionName
- | fieldAccess
- | arrayAccess
- ;
-
-assignmentOperator
- : '='
- | '*='
- | '/='
- | '%='
- | '+='
- | '-='
- | '<<='
- | '>>='
- | '>>>='
- | '&='
- | '^='
- | '|='
- ;
-
-conditionalExpression
- : conditionalOrExpression
- | conditionalOrExpression '?' expression ':' conditionalExpression
- ;
-
-conditionalOrExpression
- : conditionalAndExpression
- | conditionalOrExpression '||' conditionalAndExpression
- ;
-
-conditionalAndExpression
- : inclusiveOrExpression
- | conditionalAndExpression '&&' inclusiveOrExpression
- ;
-
-inclusiveOrExpression
- : exclusiveOrExpression
- | inclusiveOrExpression '|' exclusiveOrExpression
- ;
-
-exclusiveOrExpression
- : andExpression
- | exclusiveOrExpression '^' andExpression
- ;
-
-andExpression
- : equalityExpression
- | andExpression '&' equalityExpression
- ;
-
-equalityExpression
- : relationalExpression
- | equalityExpression '==' relationalExpression
- | equalityExpression '!=' relationalExpression
- ;
-
-relationalExpression
- : shiftExpression
- | relationalExpression '<' shiftExpression
- | relationalExpression '>' shiftExpression
- | relationalExpression '<=' shiftExpression
- | relationalExpression '>=' shiftExpression
- | relationalExpression 'instanceof' referenceType
- ;
-
-shiftExpression
- : additiveExpression
- | shiftExpression '<' '<' additiveExpression
- | shiftExpression '>' '>' additiveExpression
- | shiftExpression '>' '>' '>' additiveExpression
- ;
-
-additiveExpression
- : multiplicativeExpression
- | additiveExpression '+' multiplicativeExpression
- | additiveExpression '-' multiplicativeExpression
- ;
-
-multiplicativeExpression
- : unaryExpression
- | multiplicativeExpression '*' unaryExpression
- | multiplicativeExpression '/' unaryExpression
- | multiplicativeExpression '%' unaryExpression
- ;
-
-unaryExpression
- : preIncrementExpression
- | preDecrementExpression
- | '+' unaryExpression
- | '-' unaryExpression
- | unaryExpressionNotPlusMinus
- ;
-
-preIncrementExpression
- : '++' unaryExpression
- ;
-
-preDecrementExpression
- : '--' unaryExpression
- ;
-
-unaryExpressionNotPlusMinus
- : postfixExpression
- | '~' unaryExpression
- | '!' unaryExpression
- | castExpression
- ;
-
-postfixExpression
- : ( primary
- | expressionName
- )
- ( postIncrementExpression_lf_postfixExpression
- | postDecrementExpression_lf_postfixExpression
- )*
- ;
-
-postIncrementExpression
- : postfixExpression '++'
- ;
-
-postIncrementExpression_lf_postfixExpression
- : '++'
- ;
-
-postDecrementExpression
- : postfixExpression '--'
- ;
-
-postDecrementExpression_lf_postfixExpression
- : '--'
- ;
-
-castExpression
- : '(' primitiveType ')' unaryExpression
- | '(' referenceType additionalBound* ')' unaryExpressionNotPlusMinus
- | '(' referenceType additionalBound* ')' lambdaExpression
- ;
-
-// LEXER
-
-// §3.9 Keywords
-
-ABSTRACT : 'abstract';
-ASSERT : 'assert';
-BOOLEAN : 'boolean';
-BREAK : 'break';
-BYTE : 'byte';
-CASE : 'case';
-CATCH : 'catch';
-CHAR : 'char';
-CLASS : 'class';
-CONST : 'const';
-CONTINUE : 'continue';
-DEFAULT : 'default';
-DO : 'do';
-DOUBLE : 'double';
-ELSE : 'else';
-ENUM : 'enum';
-EXTENDS : 'extends';
-FINAL : 'final';
-FINALLY : 'finally';
-FLOAT : 'float';
-FOR : 'for';
-IF : 'if';
-GOTO : 'goto';
-IMPLEMENTS : 'implements';
-IMPORT : 'import';
-INSTANCEOF : 'instanceof';
-INT : 'int';
-INTERFACE : 'interface';
-LONG : 'long';
-NATIVE : 'native';
-NEW : 'new';
-PACKAGE : 'package';
-PRIVATE : 'private';
-PROTECTED : 'protected';
-PUBLIC : 'public';
-RETURN : 'return';
-SHORT : 'short';
-STATIC : 'static';
-STRICTFP : 'strictfp';
-SUPER : 'super';
-SWITCH : 'switch';
-SYNCHRONIZED : 'synchronized';
-THIS : 'this';
-THROW : 'throw';
-THROWS : 'throws';
-TRANSIENT : 'transient';
-TRY : 'try';
-VOID : 'void';
-VOLATILE : 'volatile';
-WHILE : 'while';
-
-// §3.10.1 Integer Literals
-
-IntegerLiteral
- : DecimalIntegerLiteral
- | HexIntegerLiteral
- | OctalIntegerLiteral
- | BinaryIntegerLiteral
- ;
-
-fragment
-DecimalIntegerLiteral
- : DecimalNumeral IntegerTypeSuffix?
- ;
-
-fragment
-HexIntegerLiteral
- : HexNumeral IntegerTypeSuffix?
- ;
-
-fragment
-OctalIntegerLiteral
- : OctalNumeral IntegerTypeSuffix?
- ;
-
-fragment
-BinaryIntegerLiteral
- : BinaryNumeral IntegerTypeSuffix?
- ;
-
-fragment
-IntegerTypeSuffix
- : [lL]
- ;
-
-fragment
-DecimalNumeral
- : '0'
- | NonZeroDigit (Digits? | Underscores Digits)
- ;
-
-fragment
-Digits
- : Digit (DigitsAndUnderscores? Digit)?
- ;
-
-fragment
-Digit
- : '0'
- | NonZeroDigit
- ;
-
-fragment
-NonZeroDigit
- : [1-9]
- ;
-
-fragment
-DigitsAndUnderscores
- : DigitOrUnderscore+
- ;
-
-fragment
-DigitOrUnderscore
- : Digit
- | '_'
- ;
-
-fragment
-Underscores
- : '_'+
- ;
-
-fragment
-HexNumeral
- : '0' [xX] HexDigits
- ;
-
-fragment
-HexDigits
- : HexDigit (HexDigitsAndUnderscores? HexDigit)?
- ;
-
-fragment
-HexDigit
- : [0-9a-fA-F]
- ;
-
-fragment
-HexDigitsAndUnderscores
- : HexDigitOrUnderscore+
- ;
-
-fragment
-HexDigitOrUnderscore
- : HexDigit
- | '_'
- ;
-
-fragment
-OctalNumeral
- : '0' Underscores? OctalDigits
- ;
-
-fragment
-OctalDigits
- : OctalDigit (OctalDigitsAndUnderscores? OctalDigit)?
- ;
-
-fragment
-OctalDigit
- : [0-7]
- ;
-
-fragment
-OctalDigitsAndUnderscores
- : OctalDigitOrUnderscore+
- ;
-
-fragment
-OctalDigitOrUnderscore
- : OctalDigit
- | '_'
- ;
-
-fragment
-BinaryNumeral
- : '0' [bB] BinaryDigits
- ;
-
-fragment
-BinaryDigits
- : BinaryDigit (BinaryDigitsAndUnderscores? BinaryDigit)?
- ;
-
-fragment
-BinaryDigit
- : [01]
- ;
-
-fragment
-BinaryDigitsAndUnderscores
- : BinaryDigitOrUnderscore+
- ;
-
-fragment
-BinaryDigitOrUnderscore
- : BinaryDigit
- | '_'
- ;
-
-// §3.10.2 Floating-Point Literals
-
-FloatingPointLiteral
- : DecimalFloatingPointLiteral
- | HexadecimalFloatingPointLiteral
- ;
-
-fragment
-DecimalFloatingPointLiteral
- : Digits '.' Digits? ExponentPart? FloatTypeSuffix?
- | '.' Digits ExponentPart? FloatTypeSuffix?
- | Digits ExponentPart FloatTypeSuffix?
- | Digits FloatTypeSuffix
- ;
-
-fragment
-ExponentPart
- : ExponentIndicator SignedInteger
- ;
-
-fragment
-ExponentIndicator
- : [eE]
- ;
-
-fragment
-SignedInteger
- : Sign? Digits
- ;
-
-fragment
-Sign
- : [+-]
- ;
-
-fragment
-FloatTypeSuffix
- : [fFdD]
- ;
-
-fragment
-HexadecimalFloatingPointLiteral
- : HexSignificand BinaryExponent FloatTypeSuffix?
- ;
-
-fragment
-HexSignificand
- : HexNumeral '.'?
- | '0' [xX] HexDigits? '.' HexDigits
- ;
-
-fragment
-BinaryExponent
- : BinaryExponentIndicator SignedInteger
- ;
-
-fragment
-BinaryExponentIndicator
- : [pP]
- ;
-
-// §3.10.3 Boolean Literals
-
-BooleanLiteral
- : 'true'
- | 'false'
- ;
-
-// §3.10.4 Character Literals
-
-CharacterLiteral
- : '\'' SingleCharacter '\''
- | '\'' EscapeSequence '\''
- ;
-
-fragment
-SingleCharacter
- : ~['\\]
- ;
-
-// §3.10.5 String Literals
-
-StringLiteral
- : '"' StringCharacters? '"'
- ;
-
-fragment
-StringCharacters
- : StringCharacter+
- ;
-
-fragment
-StringCharacter
- : ~["\\]
- | EscapeSequence
- ;
-
-// §3.10.6 Escape Sequences for Character and String Literals
-
-fragment
-EscapeSequence
- : '\\' [btnfr"'\\]
- | OctalEscape
- | UnicodeEscape // This is not in the spec but prevents having to preprocess the input
- ;
-
-fragment
-OctalEscape
- : '\\' OctalDigit
- | '\\' OctalDigit OctalDigit
- | '\\' ZeroToThree OctalDigit OctalDigit
- ;
-
-fragment
-ZeroToThree
- : [0-3]
- ;
-
-// This is not in the spec but prevents having to preprocess the input
-fragment
-UnicodeEscape
- : '\\' 'u' HexDigit HexDigit HexDigit HexDigit
- ;
-
-// §3.10.7 The Null Literal
-
-NullLiteral
- : 'null'
- ;
-
-// §3.11 Separators
-
-LPAREN : '(';
-RPAREN : ')';
-LBRACE : '{';
-RBRACE : '}';
-LBRACK : '[';
-RBRACK : ']';
-SEMI : ';';
-COMMA : ',';
-DOT : '.';
-
-// §3.12 Operators
-
-ASSIGN : '=';
-GT : '>';
-LT : '<';
-BANG : '!';
-TILDE : '~';
-QUESTION : '?';
-COLON : ':';
-EQUAL : '==';
-LE : '<=';
-GE : '>=';
-NOTEQUAL : '!=';
-AND : '&&';
-OR : '||';
-INC : '++';
-DEC : '--';
-ADD : '+';
-SUB : '-';
-MUL : '*';
-DIV : '/';
-BITAND : '&';
-BITOR : '|';
-CARET : '^';
-MOD : '%';
-ARROW : '->';
-COLONCOLON : '::';
-
-ADD_ASSIGN : '+=';
-SUB_ASSIGN : '-=';
-MUL_ASSIGN : '*=';
-DIV_ASSIGN : '/=';
-AND_ASSIGN : '&=';
-OR_ASSIGN : '|=';
-XOR_ASSIGN : '^=';
-MOD_ASSIGN : '%=';
-LSHIFT_ASSIGN : '<<=';
-RSHIFT_ASSIGN : '>>=';
-URSHIFT_ASSIGN : '>>>=';
-
-// §3.8 Identifiers (must appear after all keywords in the grammar)
-
-Identifier
- : JavaLetter JavaLetterOrDigit*
- ;
-
-fragment
-JavaLetter
- : [a-zA-Z$_] // these are the "java letters" below 0xFF
- | // covers all characters above 0xFF which are not a surrogate
- ~[\u0000-\u00FF\uD800-\uDBFF]
- {Character.isJavaIdentifierStart(_input.LA(-1))}?
- | // covers UTF-16 surrogate pairs encodings for U+10000 to U+10FFFF
- [\uD800-\uDBFF] [\uDC00-\uDFFF]
- {Character.isJavaIdentifierStart(Character.toCodePoint((char)_input.LA(-2), (char)_input.LA(-1)))}?
- ;
-
-fragment
-JavaLetterOrDigit
- : [a-zA-Z0-9$_] // these are the "java letters or digits" below 0xFF
- | // covers all characters above 0xFF which are not a surrogate
- ~[\u0000-\u00FF\uD800-\uDBFF]
- {Character.isJavaIdentifierPart(_input.LA(-1))}?
- | // covers UTF-16 surrogate pairs encodings for U+10000 to U+10FFFF
- [\uD800-\uDBFF] [\uDC00-\uDFFF]
- {Character.isJavaIdentifierPart(Character.toCodePoint((char)_input.LA(-2), (char)_input.LA(-1)))}?
- ;
-
-//
-// Additional symbols not defined in the lexical specification
-//
-
-AT : '@';
-ELLIPSIS : '...';
-
-//
-// Whitespace and comments
-//
-
-WS : [ \t\r\n\u000C]+ -> channel(HIDDEN)
- ;
-
-COMMENT
- : '/*' .*? '*/' -> channel(HIDDEN)
- ;
-
-LINE_COMMENT
- : '//' ~[\r\n]* -> channel(HIDDEN)
- ;
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/AlternativeSpec.java b/antlr/src/main/java/com/gitplex/commons/antlr/grammar/AlternativeSpec.java
deleted file mode 100644
index d3a2e90a1c..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/AlternativeSpec.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gitplex.commons.antlr.grammar;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-
-public class AlternativeSpec implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private final String label;
-
- private final List<ElementSpec> elements;
-
- public AlternativeSpec(String label, List<ElementSpec> elements) {
- this.label = label;
- this.elements = elements;
- }
-
- public String getLabel() {
- return label;
- }
-
- public List<ElementSpec> getElements() {
- return elements;
- }
-
- @Override
- public String toString() {
- List<String> elementStrings = new ArrayList<>();
- for (ElementSpec element: elements)
- elementStrings.add(element.toString());
- return StringUtils.join(elementStrings, " ");
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/AnyTokenElementSpec.java b/antlr/src/main/java/com/gitplex/commons/antlr/grammar/AnyTokenElementSpec.java
deleted file mode 100644
index f704c34820..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/AnyTokenElementSpec.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.gitplex.commons.antlr.grammar;
-
-import java.util.Set;
-
-import com.gitplex.commons.antlr.codeassist.MandatoryScan;
-import com.google.common.collect.Sets;
-
-public class AnyTokenElementSpec extends TerminalElementSpec {
-
- private static final long serialVersionUID = 1L;
-
- public AnyTokenElementSpec(String label, Multiplicity multiplicity) {
- super(label, multiplicity);
- }
-
- @Override
- public MandatoryScan scanMandatories() {
- return MandatoryScan.stop();
- }
-
- @Override
- protected String toStringOnce() {
- return ".";
- }
-
- @Override
- public boolean isToken(int tokenType) {
- return true;
- }
-
- @Override
- public Set<String> getPossiblePrefixes() {
- return Sets.newLinkedHashSet();
- }
-
- @Override
- protected boolean isAllowEmptyOnce() {
- return false;
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/ElementSpec.java b/antlr/src/main/java/com/gitplex/commons/antlr/grammar/ElementSpec.java
deleted file mode 100644
index 64b6cbad97..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/ElementSpec.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.gitplex.commons.antlr.grammar;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Set;
-
-import org.antlr.v4.runtime.Token;
-
-import com.gitplex.commons.antlr.codeassist.MandatoryScan;
-
-public abstract class ElementSpec implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public enum Multiplicity{ONE, ZERO_OR_ONE, ZERO_OR_MORE, ONE_OR_MORE};
-
- private final String label;
-
- private final Multiplicity multiplicity;
-
- public ElementSpec(String label, Multiplicity multiplicity) {
- this.label = label;
- this.multiplicity = multiplicity;
- }
-
- public String getLabel() {
- return label;
- }
-
- public Multiplicity getMultiplicity() {
- return multiplicity;
- }
-
- public boolean isOptional() {
- return multiplicity == Multiplicity.ZERO_OR_MORE || multiplicity == Multiplicity.ZERO_OR_ONE;
- }
-
- public boolean isMultiple() {
- return multiplicity == Multiplicity.ONE_OR_MORE || multiplicity == Multiplicity.ZERO_OR_MORE;
- }
-
- public abstract Set<String> getPossiblePrefixes();
-
- protected abstract boolean isAllowEmptyOnce();
-
- public boolean isAllowEmpty() {
- if (isOptional())
- return true;
- else
- return isAllowEmptyOnce();
- }
-
- public abstract MandatoryScan scanMandatories();
-
- public final String toString() {
- if (multiplicity == Multiplicity.ONE)
- return toStringOnce();
- else if (multiplicity == Multiplicity.ONE_OR_MORE)
- return toStringOnce() + "+";
- else if (multiplicity == Multiplicity.ZERO_OR_MORE)
- return toStringOnce() + "*";
- else
- return toStringOnce() + "?";
- }
-
- /**
- * Get the next token index after match of current spec.
- *
- * @param tokens
- * tokens to match against
- * @return
- * index of next token after the match, or 0 if the spec does not
- * match any tokens
- */
- public abstract int getEndOfMatch(List<Token> tokens);
-
- protected abstract String toStringOnce();
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/Grammar.java b/antlr/src/main/java/com/gitplex/commons/antlr/grammar/Grammar.java
deleted file mode 100644
index 5e84dda45e..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/Grammar.java
+++ /dev/null
@@ -1,422 +0,0 @@
-package com.gitplex.commons.antlr.grammar;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Serializable;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.annotation.Nullable;
-
-import org.antlr.v4.runtime.ANTLRInputStream;
-import org.antlr.v4.runtime.BailErrorStrategy;
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.Lexer;
-import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.tree.TerminalNode;
-import org.apache.commons.io.IOUtils;
-
-import com.gitplex.commons.antlr.ANTLRv4Lexer;
-import com.gitplex.commons.antlr.ANTLRv4Parser;
-import com.gitplex.commons.antlr.AntlrUtils;
-import com.gitplex.commons.antlr.ANTLRv4Parser.AlternativeContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.AtomContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.BlockContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.EbnfContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.EbnfSuffixContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.ElementContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.GrammarSpecContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.LabeledAltContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.LabeledElementContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.LabeledLexerElementContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.LexerAltContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.LexerAtomContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.LexerBlockContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.LexerElementContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.LexerRuleBlockContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.LexerRuleSpecContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.ModeSpecContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.NotSetContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.ParserRuleSpecContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.RuleBlockContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.RuleSpecContext;
-import com.gitplex.commons.antlr.ANTLRv4Parser.SetElementContext;
-import com.gitplex.commons.antlr.grammar.ElementSpec.Multiplicity;
-import com.gitplex.commons.util.StringUtils;
-
-public class Grammar implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private final Class<? extends Lexer> lexerClass;
-
- private transient Constructor<? extends Lexer> lexerCtor;
-
- private final Map<String, RuleSpec> rules = new HashMap<>();
-
- private final Map<String, Integer> tokenTypesByLiteral = new HashMap<>();
-
- private final Map<String, Integer> tokenTypesByRule = new HashMap<>();
-
- private final Set<String> blockRuleNames = new HashSet<>();
-
- /**
- * Code assist constructor
- * @param lexerClass
- * lexer class to be used to lex code. Other required information such as
- * grammar files and token file will be derived from the lexer class
- */
- public Grammar(Class<? extends Lexer> lexerClass) {
- this(lexerClass, new String[]{AntlrUtils.getDefaultGrammarFile(lexerClass)},
- AntlrUtils.getDefaultTokenFile(lexerClass));
- }
-
- /**
- * Code assist constructor.
- *
- * @param lexerClass
- * lexer class to be used to lex code
- * @param grammarFiles
- * grammar files in class path, relative to class path root
- * @param tokenFile
- * generated tokens file in class path, relative to class path root
- */
- public Grammar(Class<? extends Lexer> lexerClass, String grammarFiles[], String tokenFile) {
- this.lexerClass = lexerClass;
- tokenTypesByRule.put("EOF", Token.EOF);
-
- try (InputStream is = getClass().getClassLoader().getResourceAsStream(tokenFile)) {
- for (String line: IOUtils.readLines(is)) {
- String key = StringUtils.substringBeforeLast(line, "=");
- Integer value = Integer.valueOf(StringUtils.substringAfterLast(line, "="));
- if (key.startsWith("'"))
- tokenTypesByLiteral.put(key.substring(1, key.length()-1), value);
- else
- tokenTypesByRule.put(key, value);
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
-
- for (String grammarFile: grammarFiles) {
- try (InputStream is = getClass().getClassLoader().getResourceAsStream(grammarFile)) {
- ANTLRv4Lexer lexer = new ANTLRv4Lexer(new ANTLRInputStream(is));
- CommonTokenStream tokens = new CommonTokenStream(lexer);
- ANTLRv4Parser parser = new ANTLRv4Parser(tokens);
- parser.removeErrorListeners();
- parser.setErrorHandler(new BailErrorStrategy());
- GrammarSpecContext grammarSpecContext = parser.grammarSpec();
- for (RuleSpecContext ruleSpecContext: grammarSpecContext.rules().ruleSpec()) {
- RuleSpec rule = newRule(ruleSpecContext);
- rules.put(rule.getName(), rule);
- }
- for (ModeSpecContext modeSpecContext: grammarSpecContext.modeSpec()) {
- for (LexerRuleSpecContext lexerRuleSpecContext: modeSpecContext.lexerRuleSpec()) {
- RuleSpec rule = newRule(lexerRuleSpecContext);
- rules.put(rule.getName(), rule);
- }
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- // initialize rule properties to avoid changing grammar after
- // the constructor
- for (RuleSpec rule: rules.values()) {
- rule.isAllowEmpty();
- rule.getPossiblePrefixes();
- rule.scanMandatories();
- }
- }
-
- private Constructor<? extends Lexer> getLexerCtor() {
- if (lexerCtor == null) {
- try {
- lexerCtor = lexerClass.getConstructor(CharStream.class);
- } catch (NoSuchMethodException | SecurityException e) {
- throw new RuntimeException(e);
- }
- }
- return lexerCtor;
- }
-
- private RuleSpec newRule(RuleSpecContext ruleSpecContext) {
- ParserRuleSpecContext parserRuleSpecContext = ruleSpecContext.parserRuleSpec();
- if (parserRuleSpecContext != null) {
- String name = parserRuleSpecContext.RULE_REF().getText();
- List<AlternativeSpec> alternatives = new ArrayList<>();
- RuleBlockContext ruleBlockContext = parserRuleSpecContext.ruleBlock();
- for (LabeledAltContext labeledAltContext: ruleBlockContext.ruleAltList().labeledAlt())
- alternatives.add(newAltenative(labeledAltContext));
- return new RuleSpec(name, alternatives);
- } else {
- return newRule(ruleSpecContext.lexerRuleSpec());
- }
- }
-
- private RuleSpec newRule(LexerRuleSpecContext lexerRuleSpecContext) {
- String name;
- List<AlternativeSpec> alternatives = new ArrayList<>();
- name = lexerRuleSpecContext.TOKEN_REF().getText();
- LexerRuleBlockContext lexerRuleBlockContext = lexerRuleSpecContext.lexerRuleBlock();
- for (LexerAltContext lexerAltContext: lexerRuleBlockContext.lexerAltList().lexerAlt())
- alternatives.add(newAltenative(lexerAltContext));
- return new RuleSpec(name, alternatives);
- }
-
- private AlternativeSpec newAltenative(LexerAltContext lexerAltContext) {
- List<ElementSpec> elements = new ArrayList<>();
- if (lexerAltContext.lexerElements() != null) {
- for (LexerElementContext lexerElementContext: lexerAltContext.lexerElements().lexerElement()) {
- ElementSpec element = newElement(lexerElementContext);
- if (element != null)
- elements.add(element);
- }
- }
-
- return new AlternativeSpec(null, elements);
- }
-
- private AlternativeSpec newAltenative(LabeledAltContext labeledAltContext) {
- String label;
- if (labeledAltContext.id() != null)
- label = labeledAltContext.id().getText();
- else
- label = null;
-
- return newAltenative(label, labeledAltContext.alternative());
- }
-
- @Nullable
- private ElementSpec newElement(LexerElementContext lexerElementContext) {
- LabeledLexerElementContext labeledLexerElementContext = lexerElementContext.labeledLexerElement();
- if (labeledLexerElementContext != null) {
- String label = labeledLexerElementContext.id().getText();
- LexerAtomContext lexerAtomContext = labeledLexerElementContext.lexerAtom();
- if (lexerAtomContext != null)
- return newElement(label, lexerAtomContext, lexerElementContext.ebnfSuffix());
- else
- return newElement(label, labeledLexerElementContext.block(), lexerElementContext.ebnfSuffix());
- } else if (lexerElementContext.lexerAtom() != null) {
- return newElement(null, lexerElementContext.lexerAtom(), lexerElementContext.ebnfSuffix());
- } else if (lexerElementContext.lexerBlock() != null) {
- return newElement(null, lexerElementContext.lexerBlock(), lexerElementContext.ebnfSuffix());
- } else {
- return null;
- }
- }
-
- private AlternativeSpec newAltenative(@Nullable String label, AlternativeContext alternativeContext) {
- List<ElementSpec> elements = new ArrayList<>();
- for (ElementContext elementContext: alternativeContext.element()) {
- ElementSpec element = newElement(elementContext);
- if (element != null)
- elements.add(element);
- }
-
- return new AlternativeSpec(label, elements);
- }
-
- @Nullable
- private ElementSpec newElement(ElementContext elementContext) {
- LabeledElementContext labeledElementContext = elementContext.labeledElement();
- if (labeledElementContext != null) {
- String label = labeledElementContext.id().getText();
- AtomContext atomContext = labeledElementContext.atom();
- if (atomContext != null)
- return newElement(label, atomContext, elementContext.ebnfSuffix());
- else
- return newElement(label, labeledElementContext.block(), elementContext.ebnfSuffix());
- } else if (elementContext.atom() != null) {
- return newElement(null, elementContext.atom(), elementContext.ebnfSuffix());
- } else if (elementContext.ebnf() != null) {
- return newElement(elementContext.ebnf());
- } else {
- return null;
- }
- }
-
- @Nullable
- private ElementSpec newElement(String label, AtomContext atomContext, EbnfSuffixContext ebnfSuffixContext) {
- Multiplicity multiplicity = newMultiplicity(ebnfSuffixContext);
- if (atomContext.terminal() != null) {
- if (atomContext.terminal().TOKEN_REF() != null) {
- String ruleName = atomContext.terminal().TOKEN_REF().getText();
- int tokenType = tokenTypesByRule.get(ruleName);
- if (tokenType != Token.EOF)
- return new LexerRuleRefElementSpec(this ,label, multiplicity, tokenType, ruleName);
- else
- return null;
- } else {
- String literal = getLiteral(atomContext.terminal().STRING_LITERAL());
- int tokenType = tokenTypesByLiteral.get(literal);
- return new LiteralElementSpec(label, multiplicity, tokenType, literal);
- }
- } else if (atomContext.ruleref() != null) {
- return new RuleRefElementSpec(this, label, multiplicity, atomContext.ruleref().RULE_REF().getText());
- } else if (atomContext.notSet() != null) {
- return new NotTokenElementSpec(this, label, multiplicity, getNegativeTokenTypes(atomContext.notSet()));
- } else if (atomContext.DOT() != null) {
- return new AnyTokenElementSpec(label, multiplicity);
- } else {
- throw new IllegalStateException();
- }
- }
-
- private String getLiteral(TerminalNode terminal) {
- String literal = terminal.getText();
- return literal.substring(1, literal.length()-1);
- }
-
- @Nullable
- private ElementSpec newElement(String label, LexerAtomContext lexerAtomContext, EbnfSuffixContext ebnfSuffixContext) {
- Multiplicity multiplicity = newMultiplicity(ebnfSuffixContext);
- if (lexerAtomContext.terminal() != null) {
- if (lexerAtomContext.terminal().TOKEN_REF() != null) {
- String ruleName = lexerAtomContext.terminal().TOKEN_REF().getText();
- Integer tokenType = tokenTypesByRule.get(ruleName);
- if (tokenType == null) // fragment rule
- tokenType = 0;
- if (tokenType != Token.EOF)
- return new LexerRuleRefElementSpec(this, label, multiplicity, tokenType, ruleName);
- else
- return null;
- } else {
- String literal = getLiteral(lexerAtomContext.terminal().STRING_LITERAL());
- Integer tokenType = tokenTypesByLiteral.get(literal);
- if (tokenType == null)
- tokenType = 0;
- return new LiteralElementSpec(label, multiplicity, tokenType, literal);
- }
- } else if (lexerAtomContext.RULE_REF() != null) {
- return new RuleRefElementSpec(this, label, multiplicity, lexerAtomContext.RULE_REF().getText());
- } else if (lexerAtomContext.notSet() != null
- || lexerAtomContext.DOT() != null
- || lexerAtomContext.LEXER_CHAR_SET()!=null
- || lexerAtomContext.range() != null) {
- // Use AnyTokenElementSpec here to as it does not affect our code assist analysis
- return new AnyTokenElementSpec(label, multiplicity);
- } else {
- throw new IllegalStateException();
- }
- }
-
- private Set<Integer> getNegativeTokenTypes(NotSetContext notSetContext) {
- Set<Integer> negativeTokenTypes = new HashSet<>();
- if (notSetContext.setElement() != null) {
- negativeTokenTypes.add(getTokenType(notSetContext.setElement()));
- } else {
- for (SetElementContext setElementContext: notSetContext.blockSet().setElement())
- negativeTokenTypes.add(getTokenType(setElementContext));
- }
- return negativeTokenTypes;
- }
-
- private int getTokenType(SetElementContext setElementContext) {
- Integer tokenType;
- if (setElementContext.STRING_LITERAL() != null)
- tokenType = tokenTypesByLiteral.get(getLiteral(setElementContext.STRING_LITERAL()));
- else if (setElementContext.TOKEN_REF() != null)
- tokenType = tokenTypesByRule.get(setElementContext.TOKEN_REF().getText());
- else
- tokenType = null;
- if (tokenType != null)
- return tokenType;
- else
- throw new IllegalStateException();
- }
-
- private Multiplicity newMultiplicity(@Nullable EbnfSuffixContext ebnfSuffixContext) {
- if (ebnfSuffixContext != null) {
- if (ebnfSuffixContext.STAR() != null)
- return Multiplicity.ZERO_OR_MORE;
- else if (ebnfSuffixContext.PLUS() != null)
- return Multiplicity.ONE_OR_MORE;
- else
- return Multiplicity.ZERO_OR_ONE;
- } else {
- return Multiplicity.ONE;
- }
- }
-
- private ElementSpec newElement(@Nullable String label, BlockContext blockContext, @Nullable EbnfSuffixContext ebnfSuffixContext) {
- List<AlternativeSpec> alternatives = new ArrayList<>();
- for (AlternativeContext alternativeContext: blockContext.altList().alternative())
- alternatives.add(newAltenative(null, alternativeContext));
- String ruleName = UUID.randomUUID().toString();
- blockRuleNames.add(ruleName);
- RuleSpec rule = new RuleSpec(ruleName, alternatives);
- rules.put(ruleName, rule);
- return new RuleRefElementSpec(this, label, newMultiplicity(ebnfSuffixContext), ruleName);
- }
-
- private ElementSpec newElement(@Nullable String label, LexerBlockContext lexerBlockContext, @Nullable EbnfSuffixContext ebnfSuffixContext) {
- List<AlternativeSpec> alternatives = new ArrayList<>();
- for (LexerAltContext lexerAltContext: lexerBlockContext.lexerAltList().lexerAlt())
- alternatives.add(newAltenative(lexerAltContext));
- String ruleName = UUID.randomUUID().toString();
- blockRuleNames.add(ruleName);
- RuleSpec rule = new RuleSpec(ruleName, alternatives);
- rules.put(ruleName, rule);
- return new RuleRefElementSpec(this, label, newMultiplicity(ebnfSuffixContext), ruleName);
- }
-
- private ElementSpec newElement(EbnfContext ebnfContext) {
- if (ebnfContext.blockSuffix() != null)
- return newElement(null, ebnfContext.block(), ebnfContext.blockSuffix().ebnfSuffix());
- else
- return newElement(null, ebnfContext.block(), null);
- }
-
- public boolean isBlockRule(String ruleName) {
- return blockRuleNames.contains(ruleName);
- }
-
- @Nullable
- public String getTokenNameByType(int tokenType) {
- for (Map.Entry<String, Integer> entry: tokenTypesByRule.entrySet()) {
- if (entry.getValue() == tokenType)
- return entry.getKey();
- }
- return null;
- }
-
- @Nullable
- public Integer getTokenTypeByLiteral(String literal) {
- return tokenTypesByLiteral.get(literal);
- }
-
- @Nullable
- public RuleSpec getRule(String ruleName) {
- return rules.get(ruleName);
- }
-
- public final List<Token> lex(String content) {
- try {
- List<Token> tokens = new ArrayList<>();
- Lexer lexer = getLexerCtor().newInstance(new ANTLRInputStream(content));
- lexer.removeErrorListeners();
- Token token = lexer.nextToken();
- while (token.getType() != Token.EOF) {
- if (token.getChannel() == Token.DEFAULT_CHANNEL)
- tokens.add(token);
- token = lexer.nextToken();
- }
-
- return tokens;
- } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
- | InvocationTargetException e) {
- throw new RuntimeException(e);
- }
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/LexerRuleRefElementSpec.java b/antlr/src/main/java/com/gitplex/commons/antlr/grammar/LexerRuleRefElementSpec.java
deleted file mode 100644
index 306f92cd32..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/LexerRuleRefElementSpec.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.gitplex.commons.antlr.grammar;
-
-import java.util.Set;
-
-import com.gitplex.commons.antlr.codeassist.MandatoryScan;
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
-
-public class LexerRuleRefElementSpec extends TokenElementSpec {
-
- private static final long serialVersionUID = 1L;
-
- private final Grammar grammar;
-
- private final String ruleName;
-
- private transient Optional<RuleSpec> rule;
-
- public LexerRuleRefElementSpec(Grammar grammar, String label, Multiplicity multiplicity,
- int tokenType, String ruleName) {
- super(label, multiplicity, tokenType);
-
- this.grammar = grammar;
- this.ruleName = ruleName;
- }
-
- public String getRuleName() {
- return ruleName;
- }
-
- public RuleSpec getRule() {
- if (rule == null)
- rule = Optional.fromNullable(grammar.getRule(ruleName));
- return rule.orNull();
- }
-
- @Override
- public MandatoryScan scanMandatories() {
- if (getRule() != null)
- return getRule().scanMandatories();
- else
- return MandatoryScan.stop();
- }
-
- @Override
- protected String toStringOnce() {
- if (grammar.isBlockRule(ruleName))
- return "(" + Preconditions.checkNotNull(getRule()) + ")";
- else
- return ruleName;
- }
-
- @Override
- public Set<String> getPossiblePrefixes() {
- if (getRule() != null)
- return getRule().getPossiblePrefixes();
- else
- return Sets.newLinkedHashSet();
- }
-
- @Override
- protected boolean isAllowEmptyOnce() {
- if (getRule() != null)
- return getRule().isAllowEmpty();
- else
- return false;
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/LiteralElementSpec.java b/antlr/src/main/java/com/gitplex/commons/antlr/grammar/LiteralElementSpec.java
deleted file mode 100644
index 7a3079dca2..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/LiteralElementSpec.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.gitplex.commons.antlr.grammar;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import com.gitplex.commons.antlr.codeassist.MandatoryScan;
-import com.google.common.collect.Lists;
-
-public class LiteralElementSpec extends TokenElementSpec {
-
- private static final long serialVersionUID = 1L;
-
- private final String literal;
-
- public LiteralElementSpec(String label, Multiplicity multiplicity,
- int tokenType, String literal) {
- super(label, multiplicity, tokenType);
-
- this.literal = literal;
- }
-
- public String getLiteral() {
- return literal;
- }
-
- @Override
- public MandatoryScan scanMandatories() {
- return new MandatoryScan(Lists.newArrayList(literal), false);
- }
-
- @Override
- protected String toStringOnce() {
- return "'" + literal + "'";
- }
-
- @Override
- public Set<String> getPossiblePrefixes() {
- Set<String> possiblePrefixes = new LinkedHashSet<>();
- possiblePrefixes.add(literal);
- return possiblePrefixes;
- }
-
- @Override
- protected boolean isAllowEmptyOnce() {
- return false;
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/NotTokenElementSpec.java b/antlr/src/main/java/com/gitplex/commons/antlr/grammar/NotTokenElementSpec.java
deleted file mode 100644
index dbe93ea116..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/NotTokenElementSpec.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.gitplex.commons.antlr.grammar;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.gitplex.commons.antlr.codeassist.MandatoryScan;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
-
-public class NotTokenElementSpec extends TerminalElementSpec {
-
- private static final long serialVersionUID = 1L;
-
- private final Grammar grammar;
-
- private final Set<Integer> notTokenTypes;
-
- public NotTokenElementSpec(Grammar grammar, String label,
- Multiplicity multiplicity, Set<Integer> notTokenTypes) {
- super(label, multiplicity);
-
- this.grammar = grammar;
- this.notTokenTypes = notTokenTypes;
- }
-
- public Set<Integer> getNotTokenTypes() {
- return notTokenTypes;
- }
-
- @Override
- public MandatoryScan scanMandatories() {
- return MandatoryScan.stop();
- }
-
- @Override
- protected String toStringOnce() {
- List<String> notTokenNames = new ArrayList<>();
- for (int notTokenType: notTokenTypes)
- notTokenNames.add(Preconditions.checkNotNull(grammar.getTokenNameByType(notTokenType)));
- return StringUtils.join(notTokenNames, " ");
- }
-
- @Override
- public Set<String> getPossiblePrefixes() {
- return Sets.newLinkedHashSet();
- }
-
- @Override
- protected boolean isAllowEmptyOnce() {
- return false;
- }
-
- @Override
- public boolean isToken(int tokenType) {
- return !notTokenTypes.contains(tokenType);
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/RuleRefElementSpec.java b/antlr/src/main/java/com/gitplex/commons/antlr/grammar/RuleRefElementSpec.java
deleted file mode 100644
index 92804af61a..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/RuleRefElementSpec.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.gitplex.commons.antlr.grammar;
-
-import java.util.List;
-import java.util.Set;
-
-import org.antlr.v4.runtime.Token;
-
-import com.gitplex.commons.antlr.codeassist.MandatoryScan;
-import com.gitplex.commons.antlr.parser.EarleyParser;
-import com.google.common.base.Preconditions;
-
-public class RuleRefElementSpec extends ElementSpec {
-
- private static final long serialVersionUID = 1L;
-
- private final Grammar grammar;
-
- private final String ruleName;
-
- private transient RuleSpec rule;
-
- public RuleRefElementSpec(Grammar grammar, String label, Multiplicity multiplicity, String ruleName) {
- super(label, multiplicity);
-
- this.grammar = grammar;
- this.ruleName = ruleName;
- }
-
- public RuleSpec getRule() {
- if (rule == null)
- rule = Preconditions.checkNotNull(grammar.getRule(ruleName));
- return rule;
- }
-
- public String getRuleName() {
- return ruleName;
- }
-
- @Override
- public MandatoryScan scanMandatories() {
- return getRule().scanMandatories();
- }
-
- @Override
- protected String toStringOnce() {
- if (grammar.isBlockRule(ruleName))
- return "(" + Preconditions.checkNotNull(getRule()) + ")";
- else
- return ruleName;
- }
-
- @Override
- public int getEndOfMatch(List<Token> tokens) {
- return new EarleyParser(getRule(), tokens).getEndOfMatch();
- }
-
- @Override
- public Set<String> getPossiblePrefixes() {
- return getRule().getPossiblePrefixes();
- }
-
- @Override
- protected boolean isAllowEmptyOnce() {
- return getRule().isAllowEmpty();
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/RuleSpec.java b/antlr/src/main/java/com/gitplex/commons/antlr/grammar/RuleSpec.java
deleted file mode 100644
index 02877be29c..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/RuleSpec.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.gitplex.commons.antlr.grammar;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.gitplex.commons.antlr.codeassist.MandatoryScan;
-import com.gitplex.commons.antlr.grammar.ElementSpec.Multiplicity;
-
-public class RuleSpec implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private final String name;
-
- private final List<AlternativeSpec> alternatives;
-
- private Set<String> possiblePrefixes;
-
- private Boolean allowEmpty;
-
- private MandatoryScan mandatoryScan;
-
- public RuleSpec(String name, List<AlternativeSpec> alternatives) {
- this.name = name;
- this.alternatives = alternatives;
- }
-
- public String getName() {
- return name;
- }
-
- public List<AlternativeSpec> getAlternatives() {
- return alternatives;
- }
-
- private MandatoryScan doScanMandatories() {
- List<AlternativeSpec> alternatives = getAlternatives();
- // nothing will be mandatory if we have multiple alternatives
- if (alternatives.size() == 1) {
- List<String> mandatories = new ArrayList<>();
- for (ElementSpec elementSpec: alternatives.get(0).getElements()) {
- if (elementSpec.getMultiplicity() == Multiplicity.ZERO_OR_ONE
- || elementSpec.getMultiplicity() == Multiplicity.ZERO_OR_MORE) {
- // next input can either be current element, or other elements, so
- // mandatory scan can be stopped
- return new MandatoryScan(mandatories, true);
- } else if (elementSpec.getMultiplicity() == Multiplicity.ONE_OR_MORE) {
- MandatoryScan scan = elementSpec.scanMandatories();
- mandatories.addAll(scan.getMandatories());
- // next input can either be current element, or other elements, so
- // mandatory scan can be stopped
- return new MandatoryScan(mandatories, true);
- } else {
- MandatoryScan scan = elementSpec.scanMandatories();
- mandatories.addAll(scan.getMandatories());
- // if internal of the element tells use to stop, let's stop
- if (scan.isStop())
- return new MandatoryScan(mandatories, true);
- }
- }
- return new MandatoryScan(mandatories, false);
- } else {
- return MandatoryScan.stop();
- }
- }
-
- public MandatoryScan scanMandatories() {
- if (mandatoryScan == null) {
- // initialize this to return a meaningful value in case this method is
- // invoked recursively
- mandatoryScan = MandatoryScan.stop();
-
- mandatoryScan = doScanMandatories();
- }
- return mandatoryScan;
- }
-
- private Set<String> doGetPossiblePrefixes() {
- Set<String> possiblePrefixes = new LinkedHashSet<>();
-
- for (AlternativeSpec alternative: alternatives) {
- for (ElementSpec elementSpec: alternative.getElements()) {
- possiblePrefixes.addAll(elementSpec.getPossiblePrefixes());
- if (!elementSpec.isAllowEmpty())
- break;
- }
- }
- return possiblePrefixes;
- }
-
- public Set<String> getPossiblePrefixes() {
- if (possiblePrefixes == null) {
- // initialize this to return a meaningful value in case this method is
- // invoked recursively
- possiblePrefixes = new LinkedHashSet<>();
-
- possiblePrefixes = doGetPossiblePrefixes();
- }
- return possiblePrefixes;
- }
-
- private boolean doIsAllowEmpty() {
- for (AlternativeSpec alternative: getAlternatives()) {
- boolean allowEmpty = true;
- for (ElementSpec elementSpec: alternative.getElements()) {
- if (!elementSpec.isAllowEmpty()) {
- allowEmpty = false;
- break;
- }
- }
- if (allowEmpty)
- return true;
- }
- return false;
- }
-
- public boolean isAllowEmpty() {
- if (allowEmpty == null) {
- // initialize this to return a meaningful value in case this method is
- // invoked recursively
- allowEmpty = false;
-
- allowEmpty = doIsAllowEmpty();
- }
- return allowEmpty;
- }
-
- @Override
- public String toString() {
- List<String> alternativeStrings = new ArrayList<>();
- for (AlternativeSpec alternative: alternatives)
- alternativeStrings.add(alternative.toString());
- return StringUtils.join(alternativeStrings, " | ");
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/TerminalElementSpec.java b/antlr/src/main/java/com/gitplex/commons/antlr/grammar/TerminalElementSpec.java
deleted file mode 100644
index f825a3e067..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/TerminalElementSpec.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.gitplex.commons.antlr.grammar;
-
-import java.util.List;
-
-import org.antlr.v4.runtime.Token;
-
-public abstract class TerminalElementSpec extends ElementSpec {
-
- private static final long serialVersionUID = 1L;
-
- public TerminalElementSpec(String label, Multiplicity multiplicity) {
- super(label, multiplicity);
- }
-
- public abstract boolean isToken(int tokenType);
-
- @Override
- public int getEndOfMatch(List<Token> tokens) {
- if (!tokens.isEmpty() && isToken(tokens.get(0).getType()))
- return 1;
- else
- return -1;
- }
-
-}
\ No newline at end of file
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/TokenElementSpec.java b/antlr/src/main/java/com/gitplex/commons/antlr/grammar/TokenElementSpec.java
deleted file mode 100644
index 03b1c54269..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/grammar/TokenElementSpec.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.gitplex.commons.antlr.grammar;
-
-public abstract class TokenElementSpec extends TerminalElementSpec {
-
- private static final long serialVersionUID = 1L;
-
- private final int tokenType;
-
- public TokenElementSpec(String label, Multiplicity multiplicity, int tokenType) {
- super(label, multiplicity);
-
- this.tokenType = tokenType;
- }
-
- public int getTokenType() {
- return tokenType;
- }
-
- @Override
- public boolean isToken(int tokenType) {
- return tokenType == this.tokenType;
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/parser/Chart.java b/antlr/src/main/java/com/gitplex/commons/antlr/parser/Chart.java
deleted file mode 100644
index 3a8f92ebc9..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/parser/Chart.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.gitplex.commons.antlr.parser;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
-import org.antlr.v4.runtime.Token;
-
-import com.gitplex.commons.antlr.grammar.ElementSpec;
-import com.gitplex.commons.antlr.grammar.TerminalElementSpec;
-
-/**
- * Represent a chart (or state set) as mentioned in https://en.wikipedia.org/wiki/Earley_parser
- *
- * @author robin
- *
- */
-public class Chart {
-
- private final EarleyParser parser;
-
- private final int position;
-
- private final Set<State> states;
-
- /**
- * Construct a Earley chart.
- *
- * @param parser
- * current Earley parser instance
- * @param position
- * position of the chart, representing index of next token to be matched for this chart
- * @param states
- * states in this chart
- */
- public Chart(EarleyParser parser, int endTokenIndex, Set<State> states) {
- this.parser = parser;
- this.position = endTokenIndex;
- this.states = states;
- }
-
- public EarleyParser getParser() {
- return parser;
- }
-
- /**
- * Get position of this chart
- *
- * @return
- * position of the chart, representing index of next token to be matched for this chart
- */
- public int getPosition() {
- return position;
- }
-
- /**
- * Get the token being scanned to create this chart.
- *
- * @return
- * the token being scanned to create this chart, or <tt>null</tt> for initial chart
- */
- @Nullable
- public Token getOriginatingToken() {
- if (position > 0)
- return parser.getTokens().get(position-1);
- else
- return null;
- }
-
- /**
- * Get set of states in this chart
- *
- * @return
- * set of states in this chart
- */
- public Set<State> getStates() {
- return states;
- }
-
- /**
- * Get matched states in this chart.
- *
- * @return
- * matched states in this chart
- */
- public List<State> getMatches() {
- List<State> matches = new ArrayList<>();
- for (State state: states) {
- if (state.getRuleSpec().getName().equals(parser.getRule().getName())
- && state.getOriginPosition() == 0 && state.isCompleted()) {
- matches.add(state);
- }
- }
- return matches;
- }
-
- public List<State> getStatesExpectingTerminal() {
- List<State> statesExpectingTerminal = new ArrayList<>();
- for (State state: states) {
- ElementSpec expectingSpec = state.getExpectedElementSpec();
- if (expectingSpec instanceof TerminalElementSpec)
- statesExpectingTerminal.add(state);
- }
- return statesExpectingTerminal;
- }
-
- @Override
- public String toString() {
- StringBuffer buffer = new StringBuffer();
- for (State state: states)
- buffer.append(state).append("\n");
- return buffer.toString();
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/parser/EarleyParser.java b/antlr/src/main/java/com/gitplex/commons/antlr/parser/EarleyParser.java
deleted file mode 100644
index 95c6137d33..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/parser/EarleyParser.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package com.gitplex.commons.antlr.parser;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
-import org.antlr.v4.runtime.Token;
-
-import com.gitplex.commons.antlr.grammar.ElementSpec;
-import com.gitplex.commons.antlr.grammar.RuleRefElementSpec;
-import com.gitplex.commons.antlr.grammar.RuleSpec;
-import com.gitplex.commons.antlr.grammar.TerminalElementSpec;
-import com.google.common.collect.Lists;
-
-/**
- * A Earley parser (https://en.wikipedia.org/wiki/Earley_parser) to parse user inputs.
- * It is very suited for code assistance purpose as it can provide partial
- * parse results and tell us what terminals are expected next. Note that for large
- * inputs (thousands of lines for example), our earley implementation performs bad
- * and consumes a lot of memory, but it serves our purpose to provide a mini code
- * assistance for web input
- *
- * @author robin
- *
- */
-public class EarleyParser {
-
- private final RuleSpec rule;
-
- private final List<Token> tokens;
-
- private int tokenIndex = 0;
-
- private final List<Chart> charts = new ArrayList<>();
-
- public EarleyParser(RuleSpec rule, List<Token> tokens) {
- this.rule = rule;
- this.tokens = tokens;
-
- Set<State> states = new LinkedHashSet<>();
- for (int i=0; i<rule.getAlternatives().size(); i++)
- states.add(new State(tokenIndex, rule, i, 0, false, new ArrayList<Element>()));
-
- while (!states.isEmpty()) {
- Chart chart = new Chart(this, tokenIndex, states);
- charts.add(chart);
- for (State state: Lists.newArrayList(chart.getStates())) // avoid concurrent modification
- process(state, chart);
-
- if (tokenIndex == tokens.size())
- break;
-
- states = new LinkedHashSet<>();
- for (State state: chart.getStates())
- scan(state, states);
- tokenIndex++;
- }
- }
-
- private void process(State state, Chart chart) {
- if (!state.isCompleted()) { // predict
- ElementSpec expectedElementSpec = state.getExpectedElementSpec();
- if (expectedElementSpec instanceof RuleRefElementSpec) {
- RuleRefElementSpec ruleRefElement = (RuleRefElementSpec) expectedElementSpec;
- RuleSpec elementRule = ruleRefElement.getRule();
- for (int i=0; i<elementRule.getAlternatives().size(); i++) {
- State predictedState = new State(tokenIndex,
- elementRule, i, 0, false, new ArrayList<Element>());
- if (chart.getStates().add(predictedState))
- process(predictedState, chart);
- }
- }
- if (expectedElementSpec.isOptional() || state.isExpectedElementSpecMatchedOnce()) {
- State advancedState = new State(state.getOriginPosition(), state.getRuleSpec(),
- state.getAlternativeSpecIndex(), state.getExpectedElementSpecIndex()+1, false,
- new ArrayList<>(state.getElements()));
- if (chart.getStates().add(advancedState))
- process(advancedState, chart);
- }
- } else { // complete
- Chart startChart = charts.get(state.getOriginPosition());
- Collection<State> startStates;
- if (state.getOriginPosition() == chart.getPosition())
- startStates = Lists.newArrayList(startChart.getStates()); // avoid concurrent modification
- else
- startStates = startChart.getStates();
- for (State startState: startStates) {
- if (!startState.isCompleted()) {
- ElementSpec expectedElementSpec = startState.getExpectedElementSpec();
- if (expectedElementSpec instanceof RuleRefElementSpec) {
- RuleRefElementSpec ruleRefElement = (RuleRefElementSpec) expectedElementSpec;
- if (ruleRefElement.getRuleName().equals(state.getRuleSpec().getName())) {
- State advancedState;
- List<Element> elements = new ArrayList<>(startState.getElements());
- if (!state.getElements().isEmpty())
- elements.add(new Element(this, ruleRefElement, chart.getPosition(), state));
- if (!expectedElementSpec.isMultiple()) {
- advancedState = new State(startState.getOriginPosition(),
- startState.getRuleSpec(), startState.getAlternativeSpecIndex(),
- startState.getExpectedElementSpecIndex()+1, false, elements);
- } else {
- advancedState = new State(startState.getOriginPosition(),
- startState.getRuleSpec(), startState.getAlternativeSpecIndex(),
- startState.getExpectedElementSpecIndex(), true, elements);
- }
- if (chart.getStates().add(advancedState))
- process(advancedState, chart);
- }
- }
- }
- }
- }
- }
-
- private void scan(State state, Set<State> nextStates) {
- if (!state.isCompleted()) {
- ElementSpec expectedElementSpec = state.getExpectedElementSpec();
- int tokenType = tokens.get(tokenIndex).getType();
- if ((expectedElementSpec instanceof TerminalElementSpec)
- && ((TerminalElementSpec)expectedElementSpec).isToken(tokenType)) {
- State scannedState;
- List<Element> elements = new ArrayList<>(state.getElements());
- elements.add(new Element(this, expectedElementSpec, tokenIndex+1, null));
- if (!expectedElementSpec.isMultiple()) {
- scannedState = new State(state.getOriginPosition(), state.getRuleSpec(),
- state.getAlternativeSpecIndex(), state.getExpectedElementSpecIndex()+1,
- false, elements);
- } else {
- scannedState = new State(state.getOriginPosition(), state.getRuleSpec(),
- state.getAlternativeSpecIndex(), state.getExpectedElementSpecIndex(),
- true, elements);
- }
- nextStates.add(scannedState);
- }
- }
- }
-
- public List<Chart> getCharts() {
- return charts;
- }
-
- public RuleSpec getRule() {
- return rule;
- }
-
- public List<Token> getTokens() {
- return tokens;
- }
-
- public List<State> getMatches() {
- if (charts.size() == tokens.size()+1)
- return charts.get(tokens.size()).getMatches();
- else
- return new ArrayList<>();
- }
-
- public boolean matches() {
- return !getMatches().isEmpty();
- }
-
- @Nullable
- public Token getLastMatchedToken() {
- int endOfMatch = getEndOfMatch();
- if (endOfMatch > 0)
- return tokens.get(endOfMatch-1);
- else
- return null;
- }
-
- public List<Token> getMatchedTokens() {
- int endOfMatch = getEndOfMatch();
- if (endOfMatch > 0)
- return tokens.subList(0, endOfMatch);
- else
- return new ArrayList<>();
- }
-
- /**
- * Get the next token index after the match.
- *
- * @param tokens
- * tokens to match against
- * @return
- * index of next token after the match, or 0 if the rule does not match any tokens
- */
- public int getEndOfMatch() {
- for (int i=charts.size()-1; i>=0; i--) {
- Chart state = charts.get(i);
- if (!state.getMatches().isEmpty())
- return i;
- }
- return 0;
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/parser/Element.java b/antlr/src/main/java/com/gitplex/commons/antlr/parser/Element.java
deleted file mode 100644
index bd6ab66ad0..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/parser/Element.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package com.gitplex.commons.antlr.parser;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.antlr.v4.runtime.Token;
-
-import com.gitplex.commons.antlr.grammar.ElementSpec;
-
-/**
- * Represent a matched element.
- *
- * @author robin
- *
- */
-public class Element {
-
- private final ElementSpec spec;
-
- private final int position;
-
- private final State state;
-
- private final EarleyParser parser;
-
- public Element(EarleyParser parser, @Nullable ElementSpec spec, int position, @Nullable State state) {
- this.parser = parser;
- this.spec = spec;
- this.position = position;
- this.state = state;
- }
-
- /**
- * Get spec of this element
- *
- * @return
- * spec of this element, or <tt>null</tt> for root element, as root element
- * is a pseudo element wrapping the root state
- */
- @Nullable
- public ElementSpec getSpec() {
- return spec;
- }
-
- public boolean isRoot() {
- return spec == null;
- }
-
- public boolean isTerminal() {
- return state == null;
- }
-
- /**
- * Get label of this element defined in grammar
- *
- * @return
- * label of this element, or <tt>null</tt> if there is no label associated
- * with the element
- */
- @Nullable
- public String getLabel() {
- return spec!=null?spec.getLabel():null;
- }
-
- /**
- * Get position of the chart the element is matched in
- *
- * @return
- * position of the chart the element is matched in. It also represents index of
- * next token after matching of this element
- */
- public int getPosition() {
- return position;
- }
-
- /**
- * Get associated state of the element
- *
- * @return
- * associated state of the element, or <tt>null</tt> if this element represents
- * a terminal element which will be created by scanning a matched token
- */
- @Nullable
- public State getState() {
- return state;
- }
-
- /**
- * Get tokens matched by this element so far.
- *
- * @return
- * tokens matched by this element so far, or empty if this element does not
- * match any tokens yet
- */
- public List<Token> getMatchedTokens() {
- if (state != null)
- return parser.getTokens().subList(state.getOriginPosition(), position);
- else if (position > 0)
- return parser.getTokens().subList(position-1, position);
- else
- return new ArrayList<>();
- }
-
- /**
- * Get the first token matched by this element.
- *
- * @return
- * first token matched by this element, or <tt>null</tt> if this element
- * does not match any tokens yet
- */
- @Nullable
- public Token getFirstMatchedToken() {
- if (state != null) {
- if (position > state.getOriginPosition())
- return parser.getTokens().get(state.getOriginPosition());
- else
- return null;
- } else if (position > 0) {
- return parser.getTokens().get(position-1);
- } else {
- return null;
- }
- }
-
- /**
- * Get the last token matched by this element.
- *
- * @return
- * last token matched by this element, or <tt>null</tt> if this element does not
- * match any tokens yet
- */
- @Nullable
- public Token getLastMatchedToken() {
- if (state != null) {
- if (position > state.getOriginPosition())
- return parser.getTokens().get(position-1);
- else
- return null;
- } else if (position > 0) {
- return parser.getTokens().get(position-1);
- } else {
- return null;
- }
- }
-
- public String getMatchedText() {
- StringBuilder builder = new StringBuilder();
- for (Token token: getMatchedTokens())
- builder.append(token.getText());
- return builder.toString();
- }
-
- /**
- * Find children by label defined in grammar
- *
- * @param label
- * element label defined in grammar
- * @param recursive
- * whether or not search recursively
- * @return
- * list of children with specified label
- */
- public List<Element> findChildrenByLabel(String label, boolean recursive) {
- List<Element> children = new ArrayList<>();
- if (state != null) {
- for (Element child: state.getElements()) {
- if (label.equals(child.getLabel()))
- children.add(child);
- if (recursive)
- children.addAll(child.findChildrenByLabel(label, recursive));
- }
- }
- return children;
- }
-
- /**
- * Find children by rule name
- *
- * @param ruleName
- * name of the rule
- * @param recursive
- * whether or not search recursively
- * @return
- * list of children with specified rule name
- */
- public List<Element> findChildrenByRule(String ruleName, boolean recursive) {
- List<Element> children = new ArrayList<>();
- if (state != null) {
- for (Element child: state.getElements()) {
- if (child.getState() != null && ruleName.equals(child.getState().getRuleSpec().getName()))
- children.add(child);
- if (recursive)
- children.addAll(child.findChildrenByRule(ruleName, recursive));
- }
- }
- return children;
- }
-
- public EarleyParser getParser() {
- return parser;
- }
-
- @Override
- public String toString() {
- StringBuilder builder = new StringBuilder("(");
- if (spec != null)
- builder.append("spec: " + spec + ", ");
- if (state != null)
- builder.append("state: " + state + ", ");
- builder.append("endTokenIndex: " + position + ")");
- return builder.toString();
- }
-
-}
diff --git a/antlr/src/main/java/com/gitplex/commons/antlr/parser/State.java b/antlr/src/main/java/com/gitplex/commons/antlr/parser/State.java
deleted file mode 100644
index afd41d8a74..0000000000
--- a/antlr/src/main/java/com/gitplex/commons/antlr/parser/State.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package com.gitplex.commons.antlr.parser;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-
-import com.gitplex.commons.antlr.grammar.AlternativeSpec;
-import com.gitplex.commons.antlr.grammar.ElementSpec;
-import com.gitplex.commons.antlr.grammar.RuleSpec;
-
-/**
- * Represents a Earley state as mentioned in https://en.wikipedia.org/wiki/Earley_parser
- *
- * @author robin
- *
- */
-public class State {
-
- private final int originPosition;
-
- private final RuleSpec ruleSpec;
-
- private final int alternativeSpecIndex;
-
- private final int expectedElementSpecIndex;
-
- private final boolean expectedElementSpecMatchedOnce;
-
- private final List<Element> elements;
-
- private transient AlternativeSpec alternativeSpec;
-
- private transient List<ElementSpec> elementSpecs;
-
- /**
- * Construct a Earley state.
- *
- * @param originPosition
- * position of the chart originating this state. Representing index of first token matched by the state
- * @param ruleSpec
- * rule spec of the state
- * @param alternativeSpecIndex
- * index of alternative spec above rule
- * @param expectedElementSpecIndex
- * index of element spec expecting to be matched, representing dot position
- * of the state
- * @param expectedElementSpecMatchedOnce
- * whether or not the expected element spec has been matched at least once to
- * facilitate handling of element multiplicity (* and +)
- * @param elements
- * already matched elements in this state
- */
- public State(int originPosition, RuleSpec ruleSpec, int alternativeSpecIndex, int expectedElementSpecIndex,
- boolean expectedElementSpecMatchedOnce, List<Element> elements) {
- this.originPosition = originPosition;
- this.ruleSpec = ruleSpec;
- this.alternativeSpecIndex = alternativeSpecIndex;
- this.expectedElementSpecIndex = expectedElementSpecIndex;
- this.expectedElementSpecMatchedOnce = expectedElementSpecMatchedOnce;
- this.elements = elements;
- }
-
- /**
- * Get origin position of this state
- *
- * @return
- * position of the chart originating this state. Representing index of first token matched by the state
- */
- public int getOriginPosition() {
- return originPosition;
- }
-
- public RuleSpec getRuleSpec() {
- return ruleSpec;
- }
-
- public int getAlternativeSpecIndex() {
- return alternativeSpecIndex;
- }
-
- public int getExpectedElementSpecIndex() {
- return expectedElementSpecIndex;
- }
-
- public boolean isExpectedElementSpecMatchedOnce() {
- return expectedElementSpecMatchedOnce;
- }
-
- /**
- * Get expected element spec
- *
- * @return
- * element spec expected to be matched next, or <tt>null</tt> if
- * the state is completed
- */
- @Nullable
- public ElementSpec getExpectedElementSpec() {
- if (isCompleted())
- return null;
- else
- return getElementSpecs().get(expectedElementSpecIndex);
- }
-
- /**
- * Get elements already matched in this state
- *
- * @return
- * elements already matched in this state
- */
- public List<Element> getElements() {
- return elements;
- }
-
- public AlternativeSpec getAlternativeSpec() {
- if (alternativeSpec == null)
- alternativeSpec = ruleSpec.getAlternatives().get(alternativeSpecIndex);
- return alternativeSpec;
- }
-
- public List<ElementSpec> getElementSpecs() {
- if (elementSpecs == null)
- elementSpecs = getAlternativeSpec().getElements();
- return elementSpecs;
- }
-
- public boolean isCompleted() {
- return expectedElementSpecIndex == getElementSpecs().size();
- }
-
- public State getScannedState(EarleyParser parser, int tokenIndex) {
- ElementSpec expectedElementSpec = getExpectedElementSpec();
- List<Element> elements = new ArrayList<>(getElements());
- elements.add(new Element(parser, expectedElementSpec, tokenIndex+1, null));
- if (!expectedElementSpec.isMultiple()) {
- return new State(getOriginPosition(), getRuleSpec(),
- getAlternativeSpecIndex(), getExpectedElementSpecIndex()+1,
- false, elements);
- } else {
- return new State(getOriginPosition(), getRuleSpec(),
- getAlternativeSpecIndex(), getExpectedElementSpecIndex(),
- true, elements);
- }
- }
-
- @Override
- public boolean equals(Object other) {
- if (!(other instanceof State))
- return false;
- if (this == other)
- return true;
- State otherState = (State) other;
-
- /*
- * The standard Earley parser should also consider parsed elements into
- * account when compare state, however it will cause state to increase
- * quickly in case of ambiguity rules. By excluding parsed elements from
- * comparison, we normally get only the first possibility amongst all
- * the ambiguity possibilities, which is totally acceptable for our
- * code assistance purpose
- */
- return new EqualsBuilder()
- .append(originPosition, otherState.originPosition)
- .append(ruleSpec.getName(), otherState.ruleSpec.getName())
- .append(alternativeSpecIndex, otherState.alternativeSpecIndex)
- .append(expectedElementSpecIndex, otherState.expectedElementSpecIndex)
- .append(expectedElementSpecMatchedOnce, otherState.expectedElementSpecMatchedOnce)
- .isEquals();
- }
-
- @Override
- public int hashCode() {
- return new HashCodeBuilder(17, 37)
- .append(originPosition)
- .append(ruleSpec.getName())
- .append(alternativeSpecIndex)
- .append(expectedElementSpecIndex)
- .append(expectedElementSpecMatchedOnce)
- .toHashCode();
- }
-
- @Override
- public String toString() {
- StringBuffer buffer = new StringBuffer();
- for (int i=0; i<expectedElementSpecIndex; i++)
- buffer.append(getElementSpecs().get(i)).append(" ");
- buffer.append(expectedElementSpecMatchedOnce?"~ ":"^ ");
- for (int i=expectedElementSpecIndex; i<getElementSpecs().size(); i++)
- buffer.append(getElementSpecs().get(i)).append(" ");
-
- return ruleSpec.getName() + " -> " + buffer.toString() + ": " + originPosition;
- }
-
-}
diff --git a/antlr/src/main/resources/META-INF/maven/archetype-metadata.xml b/antlr/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 904fb7a4bb..0000000000
--- a/antlr/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archetype-descriptor name="archetype.plugin">
- <fileSets>
- <fileSet filtered="true" packaged="true">
- <directory>src/main/java</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/main/resources</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/test/java</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/test/resources</directory>
- </fileSet>
- </fileSets>
-</archetype-descriptor>
\ No newline at end of file
diff --git a/antlr/src/main/resources/archetype-resource/pom.xml b/antlr/src/main/resources/archetype-resource/pom.xml
deleted file mode 100644
index 61659b0c40..0000000000
--- a/antlr/src/main/resources/archetype-resource/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-#if (\${groupId} != "com.gitplex")
- <groupId>\${groupId}</groupId>
-#end
- <artifactId>\${artifactId}</artifactId>
- <version>\${version}</version>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>parent.general</artifactId>
- <version>1.0.0</version>
- </parent>
-
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <repositories>
- <repository>
- <id>pmeaseRepo</id>
- <name>PMEase Repository</name>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- <url>http://artifact.pmease.com/</url>
- </repository>
- </repositories>
-
- <properties>
- <moduleClass>\${package}.PluginModule</moduleClass>
- </properties>
-
-</project>
diff --git a/antlr/src/main/resources/archetype-resource/src/main/java/PluginModule.java b/antlr/src/main/resources/archetype-resource/src/main/java/PluginModule.java
deleted file mode 100644
index 1f5b6ae3e2..0000000000
--- a/antlr/src/main/resources/archetype-resource/src/main/java/PluginModule.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package ${package};
-
-import com.gitplex.calla.loader.AbstractPlugin;
-import com.gitplex.calla.loader.AbstractPluginModule;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class PluginModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- // put your guice bindings here
- }
-
-}
diff --git a/antlr/src/test/java/com/gitplex/commons/antlr/codeassist/EarleyParserTest.java b/antlr/src/test/java/com/gitplex/commons/antlr/codeassist/EarleyParserTest.java
deleted file mode 100644
index 7366e8d0ef..0000000000
--- a/antlr/src/test/java/com/gitplex/commons/antlr/codeassist/EarleyParserTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.gitplex.commons.antlr.codeassist;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-import com.gitplex.commons.antlr.codeassist.test.CodeAssistTest1Lexer;
-import com.gitplex.commons.antlr.codeassist.test.CodeAssistTest4Lexer;
-import com.gitplex.commons.antlr.codeassist.test.CodeAssistTest6Lexer;
-import com.gitplex.commons.antlr.grammar.Grammar;
-import com.gitplex.commons.antlr.parser.EarleyParser;
-
-public class EarleyParserTest {
-
- private Grammar grammar;
-
- private boolean matches(String ruleName, String text) {
- return new EarleyParser(grammar.getRule(ruleName), grammar.lex(text)).matches();
- }
-
- @Test
- public void test() {
- grammar = new Grammar(CodeAssistTest1Lexer.class);
- assertFalse(matches("notRealAmbiguity", "1"));
- assertTrue(matches("notRealAmbiguity", "1 2"));
- assertTrue(matches("notRealAmbiguity", "1 2 3"));
-
- grammar = new Grammar(CodeAssistTest4Lexer.class);
- assertTrue(matches("expr", "(1+2)+3"));
- assertTrue(matches("expr", "1+(2*3)"));
- assertFalse(matches("expr", "(1+2)+"));
- assertFalse(matches("expr", "1(2*3)"));
- assertFalse(matches("expr", "1/2+3)"));
-
- grammar = new Grammar(CodeAssistTest6Lexer.class);
- assertTrue(matches("compilationUnit", ""));
- assertTrue(matches("compilationUnit", ""
- + "public class A {"
- + " public static void main(String[] args) {"
- + " System.out.println(\"hello world\");"
- + " }"
- + "}"));
- }
-
-}
diff --git a/antlr/src/test/java/com/gitplex/commons/antlr/codeassist/TestCodeAssist1.java b/antlr/src/test/java/com/gitplex/commons/antlr/codeassist/TestCodeAssist1.java
deleted file mode 100644
index e41d882ff9..0000000000
--- a/antlr/src/test/java/com/gitplex/commons/antlr/codeassist/TestCodeAssist1.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.gitplex.commons.antlr.codeassist;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.gitplex.commons.antlr.codeassist.CodeAssist;
-import com.gitplex.commons.antlr.codeassist.InputCompletion;
-import com.gitplex.commons.antlr.codeassist.InputStatus;
-import com.gitplex.commons.antlr.codeassist.InputSuggestion;
-import com.gitplex.commons.antlr.codeassist.ParentedElement;
-import com.gitplex.commons.antlr.codeassist.test.CodeAssistTest1Lexer;
-
-public class TestCodeAssist1 {
-
- private CodeAssist codeAssist = new CodeAssist(CodeAssistTest1Lexer.class) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected List<InputSuggestion> suggest(ParentedElement element, String matchWith, int count) {
- return null;
- }
-
- };
-
- private List<InputStatus> suggest(InputStatus inputStatus, String ruleName) {
- List<InputStatus> suggestions = new ArrayList<>();
- for (InputCompletion completion: codeAssist.suggest(inputStatus, ruleName, Integer.MAX_VALUE))
- suggestions.add(completion.complete(inputStatus));
- return suggestions;
- }
-
- @Test
- public void test() {
- List<InputStatus> suggestions;
-
- suggestions = suggest(new InputStatus(""), "selfReference");
- assertEquals(1, suggestions.size());
- assertEquals("ab:2", suggestions.get(0).toString());
-
- suggestions = suggest(new InputStatus("ab"), "selfReference");
- assertEquals(0, suggestions.size());
-
- suggestions = suggest(new InputStatus("ab "), "selfReference");
- assertEquals(1, suggestions.size());
-
- assertEquals("ab cd:5", suggestions.get(0).toString());
-
- suggestions = suggest(new InputStatus(""), "mandatories");
- assertEquals(2, suggestions.size());
- assertEquals("ab c:4", suggestions.get(0).toString());
- assertEquals("cd ef g h:9", suggestions.get(1).toString());
-
- suggestions = suggest(new InputStatus("cd "), "mandatories");
- assertEquals(1, suggestions.size());
- assertEquals("cd ef g h:9", suggestions.get(0).toString());
- }
-
-}
diff --git a/antlr/src/test/java/com/gitplex/commons/antlr/codeassist/TestCodeAssist2.java b/antlr/src/test/java/com/gitplex/commons/antlr/codeassist/TestCodeAssist2.java
deleted file mode 100644
index 21006153ad..0000000000
--- a/antlr/src/test/java/com/gitplex/commons/antlr/codeassist/TestCodeAssist2.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.gitplex.commons.antlr.codeassist;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.gitplex.commons.antlr.codeassist.CodeAssist;
-import com.gitplex.commons.antlr.codeassist.FenceAware;
-import com.gitplex.commons.antlr.codeassist.InputCompletion;
-import com.gitplex.commons.antlr.codeassist.InputStatus;
-import com.gitplex.commons.antlr.codeassist.InputSuggestion;
-import com.gitplex.commons.antlr.codeassist.ParentedElement;
-import com.gitplex.commons.antlr.codeassist.test.CodeAssistTest2Lexer;
-import com.gitplex.commons.antlr.grammar.LexerRuleRefElementSpec;
-
-public class TestCodeAssist2 {
-
- private static final String[] BRANCHS = new String[]{"master", "dev", "feature1", "feature2"};
-
- private CodeAssist codeAssist = new CodeAssist(CodeAssistTest2Lexer.class) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected List<InputSuggestion> suggest(ParentedElement element, String matchWith, int count) {
- if (element.getSpec() instanceof LexerRuleRefElementSpec) {
- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) element.getSpec();
- if (spec.getRuleName().equals("Value")) {
- return new FenceAware(codeAssist.getGrammar(), "(", ")") {
-
- @Override
- protected List<InputSuggestion> match(String matchWith, int count) {
- if (element.getRoot().getLastMatchedToken().getType() == CodeAssistTest2Lexer.BRANCH) {
- List<InputSuggestion> suggestions = new ArrayList<>();
- for (String value: BRANCHS) {
- if (value.toLowerCase().contains(matchWith.toLowerCase()))
- suggestions.add(new InputSuggestion(value));
- }
- return suggestions;
- } else {
- return null;
- }
- }
-
- }.suggest(element.getSpec(), matchWith, count);
- }
- }
- return null;
- }
-
- };
-
- private List<InputStatus> suggest(InputStatus inputStatus, String ruleName) {
- List<InputStatus> suggestions = new ArrayList<>();
- for (InputCompletion completion: codeAssist.suggest(inputStatus, ruleName, Integer.MAX_VALUE))
- suggestions.add(completion.complete(inputStatus));
- return suggestions;
- }
-
- @Test
- public void test() {
- List<InputStatus> suggestions;
-
- suggestions = suggest(new InputStatus("message"), "query");
- assertEquals(1, suggestions.size());
- assertEquals("message(:8", suggestions.get(0).toString());
-
- suggestions = suggest(new InputStatus("branch"), "query");
- assertEquals(4, suggestions.size());
- assertEquals("branch(master):14", suggestions.get(0).toString());
- assertEquals("branch(dev):11", suggestions.get(1).toString());
- assertEquals("branch(feature1):16", suggestions.get(2).toString());
- assertEquals("branch(feature2):16", suggestions.get(3).toString());
-
- suggestions = suggest(new InputStatus("branch(feature)"), "query");
- assertEquals(12, suggestions.size());
- assertEquals("branch(feature)branch(:22", suggestions.get(0).toString());
- assertEquals("branch(feature)tag(:19", suggestions.get(1).toString());
- assertEquals("branch(feature)id(:18", suggestions.get(2).toString());
- assertEquals("branch(feature)^:16", suggestions.get(3).toString());
- assertEquals("branch(feature)before(:22", suggestions.get(4).toString());
- assertEquals("branch(feature)after(:21", suggestions.get(5).toString());
- assertEquals("branch(feature)committer(:25", suggestions.get(6).toString());
- assertEquals("branch(feature)author(:22", suggestions.get(7).toString());
- assertEquals("branch(feature)path(:20", suggestions.get(8).toString());
- assertEquals("branch(feature)message(:23", suggestions.get(9).toString());
- assertEquals("branch(feature)..:17", suggestions.get(10).toString());
- assertEquals("branch(feature)...:18", suggestions.get(11).toString());
-
- suggestions = suggest(new InputStatus(""), "revisionCriteria");
- assertEquals(4, suggestions.size());
- assertEquals("^:1", suggestions.get(0).toString());
- assertEquals("branch(:7", suggestions.get(1).toString());
- assertEquals("tag(:4", suggestions.get(2).toString());
- assertEquals("id(:3", suggestions.get(3).toString());
-
- suggestions = suggest(new InputStatus("branch(master)"), "revisionCriteria");
- assertEquals(2, suggestions.size());
- assertEquals("branch(master)..:16", suggestions.get(0).toString());
- assertEquals("branch(master)...:17", suggestions.get(1).toString());
-
- suggestions = suggest(new InputStatus("br"), "query");
- assertEquals(1, suggestions.size());
- assertEquals("branch(:7", suggestions.get(0).toString());
-
- suggestions = suggest(new InputStatus("branch("), "query");
- assertEquals(4, suggestions.size());
- assertEquals("branch(master):14", suggestions.get(0).toString());
- assertEquals("branch(dev):11", suggestions.get(1).toString());
- assertEquals("branch(feature1):16", suggestions.get(2).toString());
- assertEquals("branch(feature2):16", suggestions.get(3).toString());
-
- suggestions = suggest(new InputStatus("branch( fea"), "query");
- assertEquals(2, suggestions.size());
- assertEquals("branch(feature1):16", suggestions.get(0).toString());
- assertEquals("branch(feature2):16", suggestions.get(1).toString());
-
- suggestions = suggest(new InputStatus("tag"), "query");
- assertEquals(1, suggestions.size());
- assertEquals("tag(:4", suggestions.get(0).toString());
-
- suggestions = suggest(new InputStatus("branch(master)t"), "query");
- assertEquals(1, suggestions.size());
- assertEquals("branch(master)tag(:18", suggestions.get(0).toString());
- }
-
-}
diff --git a/antlr/src/test/java/com/gitplex/commons/antlr/codeassist/TestCodeAssist3.java b/antlr/src/test/java/com/gitplex/commons/antlr/codeassist/TestCodeAssist3.java
deleted file mode 100644
index f285ec82c2..0000000000
--- a/antlr/src/test/java/com/gitplex/commons/antlr/codeassist/TestCodeAssist3.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.gitplex.commons.antlr.codeassist;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.gitplex.commons.antlr.codeassist.CodeAssist;
-import com.gitplex.commons.antlr.codeassist.FenceAware;
-import com.gitplex.commons.antlr.codeassist.InputCompletion;
-import com.gitplex.commons.antlr.codeassist.InputStatus;
-import com.gitplex.commons.antlr.codeassist.InputSuggestion;
-import com.gitplex.commons.antlr.codeassist.ParentedElement;
-import com.gitplex.commons.antlr.codeassist.test.CodeAssistTest3Lexer;
-import com.gitplex.commons.antlr.grammar.RuleRefElementSpec;
-import com.gitplex.commons.antlr.parser.Element;
-
-public class TestCodeAssist3 {
-
- private static final String[] AUTHORS = new String[]{"robin shen", "steve luo", "justin"};
-
- private CodeAssist codeAssist = new CodeAssist(CodeAssistTest3Lexer.class) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected List<InputSuggestion> suggest(final ParentedElement element, String matchWith, int count) {
- if (element.getSpec() instanceof RuleRefElementSpec) {
- RuleRefElementSpec spec = (RuleRefElementSpec) element.getSpec();
- if (spec.getRuleName().equals("value")) {
- return new FenceAware(codeAssist.getGrammar(), "\"", "\"") {
-
- @Override
- protected List<InputSuggestion> match(String matchWith, int count) {
- List<InputSuggestion> suggestions = new ArrayList<>();
- Element criteriaElement = element.findParentByRule("criteria");
- if (criteriaElement.getFirstMatchedToken().getText().equals("author")) {
- for (String value: AUTHORS) {
- if (value.toLowerCase().contains(matchWith.toLowerCase()))
- suggestions.add(new InputSuggestion(value));
- }
- }
- return suggestions;
- }
-
- }.suggest(element.getSpec(), matchWith, count);
- }
- }
- return null;
- }
-
- };
-
- private List<InputStatus> suggest(InputStatus inputStatus, String ruleName) {
- List<InputStatus> suggestions = new ArrayList<>();
- for (InputCompletion completion: codeAssist.suggest(inputStatus, ruleName, Integer.MAX_VALUE))
- suggestions.add(completion.complete(inputStatus));
- return suggestions;
- }
-
- @Test
- public void test() {
- List<InputStatus> suggestions;
-
- suggestions = suggest(new InputStatus("title: hello author:"), "query");
- assertEquals(3, suggestions.size());
- assertEquals("title: hello author:\"robin shen\":32", suggestions.get(0).toString());
- assertEquals("title: hello author:\"steve luo\":31", suggestions.get(1).toString());
- assertEquals("title: hello author:justin:26", suggestions.get(2).toString());
-
- suggestions = suggest(new InputStatus("title: hello world"), "query");
- assertEquals(1, suggestions.size());
- assertEquals("title: \"hello world\":20", suggestions.get(0).toString());
-
- suggestions = suggest(new InputStatus(""), "query");
- assertEquals(2, suggestions.size());
- assertEquals("title::6", suggestions.get(0).toString());
- assertEquals("author::7", suggestions.get(1).toString());
-
- suggestions = suggest(new InputStatus("title:"), "query");
- assertEquals(1, suggestions.size());
- assertEquals("title:\":7", suggestions.get(0).toString());
-
- suggestions = suggest(new InputStatus("author: dustin"), "query");
- assertEquals(0, suggestions.size());
-
- suggestions = suggest(new InputStatus("author: dustin "), "query");
- assertEquals(2, suggestions.size());
- assertEquals("author: dustin title::21", suggestions.get(0).toString());
- assertEquals("author: dustin author::22", suggestions.get(1).toString());
-
- suggestions = suggest(new InputStatus("author: \"robin shen\""), "query");
- assertEquals(2, suggestions.size());
- assertEquals("author: \"robin shen\"title::26", suggestions.get(0).toString());
- assertEquals("author: \"robin shen\"author::27", suggestions.get(1).toString());
-
- suggestions = suggest(new InputStatus("title: hello"), "query");
- assertEquals(0, suggestions.size());
-
- suggestions = suggest(new InputStatus("title: hello "), "query");
- assertEquals(2, suggestions.size());
- assertEquals("title: hello title::19", suggestions.get(0).toString());
- assertEquals("title: hello author::20", suggestions.get(1).toString());
- }
-
-}
diff --git a/antlr/src/test/java/com/gitplex/commons/antlr/codeassist/TestCodeAssist4.java b/antlr/src/test/java/com/gitplex/commons/antlr/codeassist/TestCodeAssist4.java
deleted file mode 100644
index 9ada0e34a0..0000000000
--- a/antlr/src/test/java/com/gitplex/commons/antlr/codeassist/TestCodeAssist4.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.gitplex.commons.antlr.codeassist;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.gitplex.commons.antlr.codeassist.CodeAssist;
-import com.gitplex.commons.antlr.codeassist.InputCompletion;
-import com.gitplex.commons.antlr.codeassist.InputStatus;
-import com.gitplex.commons.antlr.codeassist.InputSuggestion;
-import com.gitplex.commons.antlr.codeassist.ParentedElement;
-import com.gitplex.commons.antlr.codeassist.test.CodeAssistTest4Lexer;
-
-public class TestCodeAssist4 {
-
- private CodeAssist codeAssist = new CodeAssist(CodeAssistTest4Lexer.class) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected List<InputSuggestion> suggest(ParentedElement element, String matchWith, int count) {
- return null;
- }
-
- };
-
- private List<InputStatus> suggest(InputStatus inputStatus, String ruleName) {
- List<InputStatus> suggestions = new ArrayList<>();
- for (InputCompletion completion: codeAssist.suggest(inputStatus, ruleName, Integer.MAX_VALUE))
- suggestions.add(completion.complete(inputStatus));
- return suggestions;
- }
-
- @Test
- public void test() {
- List<InputStatus> suggestions;
-
- suggestions = suggest(new InputStatus("a"), "stat");
- assertEquals(6, suggestions.size());
- assertEquals("a=:2", suggestions.get(0).toString());
- assertEquals("a;:2", suggestions.get(1).toString());
- assertEquals("a+:2", suggestions.get(2).toString());
- assertEquals("a-:2", suggestions.get(3).toString());
- assertEquals("a*:2", suggestions.get(4).toString());
- assertEquals("a/:2", suggestions.get(5).toString());
-
- suggestions = suggest(new InputStatus(""), "stat");
- assertEquals(2, suggestions.size());
- assertEquals(";:1", suggestions.get(0).toString());
- assertEquals("(:1", suggestions.get(1).toString());
-
- suggestions = suggest(new InputStatus("5*"), "stat");
- assertEquals(1, suggestions.size());
- assertEquals("5*(:3", suggestions.get(0).toString());
-
- suggestions = suggest(new InputStatus("5"), "stat");
- assertEquals(5, suggestions.size());
- assertEquals("5;:2", suggestions.get(0).toString());
- assertEquals("5+:2", suggestions.get(1).toString());
- assertEquals("5-:2", suggestions.get(2).toString());
- assertEquals("5*:2", suggestions.get(3).toString());
- assertEquals("5/:2", suggestions.get(4).toString());
- }
-
-}
diff --git a/antlr/src/test/java/com/gitplex/commons/antlr/codeassist/TestCodeAssist5.java b/antlr/src/test/java/com/gitplex/commons/antlr/codeassist/TestCodeAssist5.java
deleted file mode 100644
index 64d7b5e7d3..0000000000
--- a/antlr/src/test/java/com/gitplex/commons/antlr/codeassist/TestCodeAssist5.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.gitplex.commons.antlr.codeassist;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Test;
-
-import com.google.common.collect.Lists;
-import com.gitplex.commons.antlr.codeassist.CodeAssist;
-import com.gitplex.commons.antlr.codeassist.InputCompletion;
-import com.gitplex.commons.antlr.codeassist.InputStatus;
-import com.gitplex.commons.antlr.codeassist.InputSuggestion;
-import com.gitplex.commons.antlr.codeassist.ParentedElement;
-import com.gitplex.commons.antlr.codeassist.test.CodeAssistTest5Lexer;
-import com.gitplex.commons.antlr.grammar.ElementSpec;
-import com.gitplex.commons.antlr.grammar.LexerRuleRefElementSpec;
-import com.gitplex.commons.antlr.grammar.RuleRefElementSpec;
-import com.gitplex.commons.antlr.parser.Element;
-
-/**
- * This test case uses MySQL select grammar.
- *
- * @author robin
- *
- */
-public class TestCodeAssist5 {
-
- private static final Map<String, List<String>> SCHEMA_TABLES = new LinkedHashMap<>();
-
- private static final Map<String, List<String>> TABLE_COLUMNS = new LinkedHashMap<>();
-
- private static final String DEFAULT_SCHEMA = "schemaA";
-
- static {
- SCHEMA_TABLES.put("schemaA", Lists.newArrayList("tableA", "tableB"));
- SCHEMA_TABLES.put("schemaB", Lists.newArrayList("tableC", "tableD"));
- TABLE_COLUMNS.put("tableA", Lists.newArrayList("columnA", "columnB"));
- TABLE_COLUMNS.put("tableB", Lists.newArrayList("columnC", "columnD"));
- TABLE_COLUMNS.put("tableC", Lists.newArrayList("columnE", "columnF"));
- TABLE_COLUMNS.put("tableD", Lists.newArrayList("columnG", "columnH"));
- }
-
- private CodeAssist codeAssist = new CodeAssist(CodeAssistTest5Lexer.class,
- new String[]{
- "com/gitplex/commons/antlr/codeassist/test/CodeAssistTest5Lexer.g4",
- "com/gitplex/commons/antlr/codeassist/test/CodeAssistTest5Parser.g4"},
- "CodeAssistTest5Parser.tokens") {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected List<InputSuggestion> suggest(final ParentedElement element, String matchWith, int count) {
- ElementSpec spec = element.getSpec();
- if (spec instanceof RuleRefElementSpec) {
- RuleRefElementSpec ruleElementSpec = (RuleRefElementSpec) spec;
- if (ruleElementSpec.getRuleName().equals("schema_name")) {
- List<InputSuggestion> suggestions = new ArrayList<>();
- for (String schemaName: SCHEMA_TABLES.keySet()) {
- if (schemaName.startsWith(matchWith))
- suggestions.add(new InputSuggestion(schemaName));
- }
- return suggestions;
- }
- } else if (spec instanceof LexerRuleRefElementSpec) {
- LexerRuleRefElementSpec lexerRuleRefElementSpec = (LexerRuleRefElementSpec) spec;
- if ("tableName".equals(lexerRuleRefElementSpec.getLabel())) {
- List<InputSuggestion> suggestions = new ArrayList<>();
- Element columnNameElement = element.findParentByRule("column_name");
- String schemaName;
- List<Element> schemaNameElements = columnNameElement.findChildrenByRule("schema_name", true);
- if (!schemaNameElements.isEmpty())
- schemaName = schemaNameElements.get(0).getMatchedText();
- else
- schemaName = DEFAULT_SCHEMA;
- if (SCHEMA_TABLES.containsKey(schemaName)) {
- for (String tableName: SCHEMA_TABLES.get(schemaName)) {
- if (tableName.startsWith(matchWith))
- suggestions.add(new InputSuggestion(tableName));
- }
- }
- return suggestions;
- } else if ("columnName".equals(lexerRuleRefElementSpec.getLabel())) {
- List<InputSuggestion> suggestions = new ArrayList<>();
- Element columnNameElement = element.findParentByRule("column_name");
- List<Element> tableNameElements = columnNameElement.findChildrenByLabel("tableName", true);
- if (!tableNameElements.isEmpty()) {
- String tableName = tableNameElements.get(0).getMatchedText();
- if (TABLE_COLUMNS.containsKey(tableName)) {
- for (String columnName: TABLE_COLUMNS.get(tableName)) {
- if (columnName.startsWith(matchWith))
- suggestions.add(new InputSuggestion(columnName));
- }
- }
- }
- return suggestions;
- }
- }
- return null;
- }
-
- @Override
- protected InputSuggestion wrapAsSuggestion(ParentedElement expectedElement, String literal, boolean complete) {
- if (literal.length() > 1)
- return super.wrapAsSuggestion(expectedElement, literal, complete);
- else
- return null;
- }
-
- };
-
- private List<InputStatus> suggest(InputStatus inputStatus, String ruleName) {
- List<InputStatus> suggestions = new ArrayList<>();
- for (InputCompletion completion: codeAssist.suggest(inputStatus, ruleName, Integer.MAX_VALUE))
- suggestions.add(completion.complete(inputStatus));
- return suggestions;
- }
-
- @Test
- public void test() {
- List<InputStatus> suggestions;
-
- suggestions = suggest(new InputStatus("select tableC."), "stat");
- assertEquals(2, suggestions.size());
- assertEquals("select tableC.columnE:21", suggestions.get(0).toString());
- assertEquals("select tableC.columnF:21", suggestions.get(1).toString());
-
- suggestions = suggest(new InputStatus("select schemaB."), "stat");
- assertEquals(2, suggestions.size());
- assertEquals("select schemaB.tableC.:22", suggestions.get(0).toString());
- assertEquals("select schemaB.tableD.:22", suggestions.get(1).toString());
-
- suggestions = suggest(new InputStatus("select schema"), "stat");
- assertEquals(2, suggestions.size());
- assertEquals("select schemaA.:15", suggestions.get(0).toString());
- assertEquals("select schemaB.:15", suggestions.get(1).toString());
-
- suggestions = suggest(new InputStatus("select table"), "stat");
- assertEquals(2, suggestions.size());
- assertEquals("select tableA.:14", suggestions.get(0).toString());
- assertEquals("select tableB.:14", suggestions.get(1).toString());
- }
-
-}
diff --git a/core/pom.xml b/core/pom.xml
index 9b40e4fe27..ad22876fc7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -6,7 +6,6 @@
<groupId>com.gitplex</groupId>
<artifactId>server-parent</artifactId>
<version>1.0-EAP-build26</version>
- <relativePath>../parent</relativePath>
</parent>
<build>
<plugins>
@@ -14,9 +13,6 @@
<groupId>com.gitplex</groupId>
<artifactId>plugin-maven</artifactId>
</plugin>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- </plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
</plugin>
@@ -31,38 +27,248 @@
</build>
<dependencies>
<dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-wicket</artifactId>
- <version>1.0-EAP-build26</version>
+ <groupId>org.jetbrains.xodus</groupId>
+ <artifactId>xodus-entity-store</artifactId>
</dependency>
<dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-schedule</artifactId>
- <version>1.0-EAP-build26</version>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <version>${shiroVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-git</artifactId>
- <version>1.0-EAP-build26</version>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-web</artifactId>
+ <version>${shiroVersion}</version>
</dependency>
+ <dependency>
+ <groupId>com.pmease.security.shiro</groupId>
+ <artifactId>shiro-bcrypt</artifactId>
+ <version>1.0.2</version>
+ </dependency>
<dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-jersey</artifactId>
- <version>1.0-EAP-build26</version>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-guice</artifactId>
+ <version>${shiroVersion}</version>
</dependency>
<dependency>
- <groupId>org.jetbrains.xodus</groupId>
- <artifactId>xodus-entity-store</artifactId>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernateVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-ehcache</artifactId>
+ <version>${hibernateVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>${hibernateVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-hikaricp</artifactId>
+ <version>${hibernateVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP-java6</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP</artifactId>
+ <version>2.4.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.el</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>2.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>9.4.1208</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mariadb.jdbc</groupId>
+ <artifactId>mariadb-java-client</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.4.9</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.unbescape</groupId>
+ <artifactId>unbescape</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.gitplex</groupId>
- <artifactId>server-git</artifactId>
- <version>1.0-EAP-build26</version>
- <type>test-jar</type>
- <scope>test</scope>
+ <artifactId>launcher-bootstrap</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jsoup</groupId>
+ <artifactId>jsoup</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-email</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.juniversalchardet</groupId>
+ <artifactId>juniversalchardet</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.gitplex</groupId>
+ <artifactId>jsymbol</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.pegdown</groupId>
+ <artifactId>pegdown</artifactId>
+ <version>1.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.gitplex</groupId>
+ <artifactId>jsyntax</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-joda</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlets</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>websocket-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jgit</groupId>
+ <artifactId>org.eclipse.jgit.http.server</artifactId>
+ <version>${jgitVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jgit</groupId>
+ <artifactId>org.eclipse.jgit.archive</artifactId>
+ <version>${jgitVersion}</version>
</dependency>
- </dependencies>
+ </dependencies>
<properties>
- <moduleClass>com.gitplex.server.core.CoreModule</moduleClass>
+ <moduleClass>com.gitplex.server.CoreModule</moduleClass>
+ <hibernateVersion>5.1.0.Final</hibernateVersion>
+ <shiroVersion>1.2.2</shiroVersion>
+ <jgitVersion>4.4.1.201607150455-r</jgitVersion>
</properties>
</project>
\ No newline at end of file
diff --git a/core/src/main/java/com/gitplex/server/CoreModule.java b/core/src/main/java/com/gitplex/server/CoreModule.java
new file mode 100644
index 0000000000..4e98677816
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/CoreModule.java
@@ -0,0 +1,510 @@
+package com.gitplex.server;
+
+import java.io.Serializable;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.inject.Singleton;
+import javax.persistence.OneToMany;
+import javax.persistence.Transient;
+import javax.persistence.Version;
+import javax.validation.Configuration;
+import javax.validation.Validation;
+import javax.validation.Validator;
+import javax.validation.ValidatorFactory;
+
+import org.apache.shiro.authc.credential.PasswordService;
+import org.apache.shiro.guice.aop.ShiroAopModule;
+import org.apache.shiro.realm.AuthorizingRealm;
+import org.apache.shiro.web.filter.mgt.FilterChainManager;
+import org.apache.shiro.web.filter.mgt.FilterChainResolver;
+import org.apache.shiro.web.mgt.WebSecurityManager;
+import org.apache.shiro.web.servlet.ShiroFilter;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.hibernate.CallbackException;
+import org.hibernate.Interceptor;
+import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
+import org.hibernate.collection.internal.PersistentBag;
+import org.hibernate.type.Type;
+import org.pegdown.Parser;
+import org.pegdown.plugins.ToHtmlSerializerPlugin;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.gitplex.launcher.loader.AbstractPlugin;
+import com.gitplex.launcher.loader.AbstractPluginModule;
+import com.gitplex.launcher.loader.ImplementationProvider;
+import com.gitplex.launcher.loader.LoaderUtils;
+import com.gitplex.launcher.bootstrap.Bootstrap;
+import com.gitplex.launcher.bootstrap.Command;
+import com.gitplex.server.command.DefaultApplyDBConstraintsCommand;
+import com.gitplex.server.command.DefaultBackupCommand;
+import com.gitplex.server.command.DefaultCheckDataVersionCommand;
+import com.gitplex.server.command.DefaultCleanCommand;
+import com.gitplex.server.command.DefaultDBDialectCommand;
+import com.gitplex.server.command.DefaultRestoreCommand;
+import com.gitplex.server.command.DefaultUpgradeCommand;
+import com.gitplex.server.command.ResetAdminPasswordCommand;
+import com.gitplex.server.entity.EntityLocator;
+import com.gitplex.server.git.config.GitConfig;
+import com.gitplex.server.git.config.SpecifiedGit;
+import com.gitplex.server.git.config.SystemGit;
+import com.gitplex.server.git.jackson.GitObjectMapperConfigurator;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.AttachmentManager;
+import com.gitplex.server.manager.BatchWorkManager;
+import com.gitplex.server.manager.BranchWatchManager;
+import com.gitplex.server.manager.CodeCommentInfoManager;
+import com.gitplex.server.manager.CodeCommentManager;
+import com.gitplex.server.manager.CodeCommentRelationManager;
+import com.gitplex.server.manager.CodeCommentReplyManager;
+import com.gitplex.server.manager.CodeCommentStatusChangeManager;
+import com.gitplex.server.manager.CommitInfoManager;
+import com.gitplex.server.manager.ConfigManager;
+import com.gitplex.server.manager.DataManager;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.manager.MailManager;
+import com.gitplex.server.manager.OrganizationMembershipManager;
+import com.gitplex.server.manager.PullRequestCommentManager;
+import com.gitplex.server.manager.PullRequestInfoManager;
+import com.gitplex.server.manager.PullRequestManager;
+import com.gitplex.server.manager.PullRequestReferenceManager;
+import com.gitplex.server.manager.PullRequestReviewInvitationManager;
+import com.gitplex.server.manager.PullRequestReviewManager;
+import com.gitplex.server.manager.PullRequestStatusChangeManager;
+import com.gitplex.server.manager.PullRequestTaskManager;
+import com.gitplex.server.manager.PullRequestUpdateManager;
+import com.gitplex.server.manager.PullRequestVerificationManager;
+import com.gitplex.server.manager.PullRequestWatchManager;
+import com.gitplex.server.manager.StorageManager;
+import com.gitplex.server.manager.TeamAuthorizationManager;
+import com.gitplex.server.manager.TeamManager;
+import com.gitplex.server.manager.TeamMembershipManager;
+import com.gitplex.server.manager.UserAuthorizationManager;
+import com.gitplex.server.manager.VisitInfoManager;
+import com.gitplex.server.manager.WorkExecutor;
+import com.gitplex.server.manager.impl.DefaultAccountManager;
+import com.gitplex.server.manager.impl.DefaultAttachmentManager;
+import com.gitplex.server.manager.impl.DefaultBatchWorkManager;
+import com.gitplex.server.manager.impl.DefaultBranchWatchManager;
+import com.gitplex.server.manager.impl.DefaultCodeCommentInfoManager;
+import com.gitplex.server.manager.impl.DefaultCodeCommentManager;
+import com.gitplex.server.manager.impl.DefaultCodeCommentRelationManager;
+import com.gitplex.server.manager.impl.DefaultCodeCommentReplyManager;
+import com.gitplex.server.manager.impl.DefaultCodeCommentStatusChangeManager;
+import com.gitplex.server.manager.impl.DefaultCommitInfoManager;
+import com.gitplex.server.manager.impl.DefaultConfigManager;
+import com.gitplex.server.manager.impl.DefaultDataManager;
+import com.gitplex.server.manager.impl.DefaultDepotManager;
+import com.gitplex.server.manager.impl.DefaultMailManager;
+import com.gitplex.server.manager.impl.DefaultOrganizationMembershipManager;
+import com.gitplex.server.manager.impl.DefaultPullRequestCommentManager;
+import com.gitplex.server.manager.impl.DefaultPullRequestInfoManager;
+import com.gitplex.server.manager.impl.DefaultPullRequestManager;
+import com.gitplex.server.manager.impl.DefaultPullRequestReferenceManager;
+import com.gitplex.server.manager.impl.DefaultPullRequestReviewInvitationManager;
+import com.gitplex.server.manager.impl.DefaultPullRequestReviewManager;
+import com.gitplex.server.manager.impl.DefaultPullRequestStatusChangeManager;
+import com.gitplex.server.manager.impl.DefaultPullRequestTaskManager;
+import com.gitplex.server.manager.impl.DefaultPullRequestUpdateManager;
+import com.gitplex.server.manager.impl.DefaultPullRequestVerificationManager;
+import com.gitplex.server.manager.impl.DefaultPullRequestWatchManager;
+import com.gitplex.server.manager.impl.DefaultStorageManager;
+import com.gitplex.server.manager.impl.DefaultTeamAuthorizationManager;
+import com.gitplex.server.manager.impl.DefaultTeamManager;
+import com.gitplex.server.manager.impl.DefaultTeamMembershipManager;
+import com.gitplex.server.manager.impl.DefaultUserAuthorizationManager;
+import com.gitplex.server.manager.impl.DefaultVisitInfoManager;
+import com.gitplex.server.manager.impl.DefaultWorkExecutor;
+import com.gitplex.server.migration.DatabaseMigrator;
+import com.gitplex.server.migration.JpaConverter;
+import com.gitplex.server.migration.Migrator;
+import com.gitplex.server.migration.PersistentBagConverter;
+import com.gitplex.server.migration.VersionTable;
+import com.gitplex.server.persistence.AbstractEntity;
+import com.gitplex.server.persistence.DefaultIdManager;
+import com.gitplex.server.persistence.DefaultPersistManager;
+import com.gitplex.server.persistence.DefaultUnitOfWork;
+import com.gitplex.server.persistence.HibernateInterceptor;
+import com.gitplex.server.persistence.IdManager;
+import com.gitplex.server.persistence.ModelProvider;
+import com.gitplex.server.persistence.PersistListener;
+import com.gitplex.server.persistence.PersistManager;
+import com.gitplex.server.persistence.PrefixedNamingStrategy;
+import com.gitplex.server.persistence.SessionInterceptor;
+import com.gitplex.server.persistence.TransactionInterceptor;
+import com.gitplex.server.persistence.UnitOfWork;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.DefaultDao;
+import com.gitplex.server.security.BasicAuthenticationFilter;
+import com.gitplex.server.security.DefaultFilterChainResolver;
+import com.gitplex.server.security.DefaultWebSecurityManager;
+import com.gitplex.server.security.FilterChainConfigurator;
+import com.gitplex.server.security.SecurityRealm;
+import com.gitplex.server.util.ClassUtils;
+import com.gitplex.server.util.jackson.ObjectMapperConfigurator;
+import com.gitplex.server.util.jackson.ObjectMapperProvider;
+import com.gitplex.server.util.jackson.hibernate.HibernateObjectMapperConfigurator;
+import com.gitplex.server.util.jetty.DefaultJettyRunner;
+import com.gitplex.server.util.jetty.JettyRunner;
+import com.gitplex.server.util.markdown.DefaultMarkdownManager;
+import com.gitplex.server.util.markdown.HtmlTransformer;
+import com.gitplex.server.util.markdown.MarkdownExtension;
+import com.gitplex.server.util.markdown.MarkdownManager;
+import com.gitplex.server.util.markdown.NormalizeTransformer;
+import com.gitplex.server.util.schedule.DefaultTaskScheduler;
+import com.gitplex.server.util.schedule.TaskScheduler;
+import com.gitplex.server.util.validation.AccountNameReservation;
+import com.gitplex.server.util.validation.DefaultEntityValidator;
+import com.gitplex.server.util.validation.DepotNameReservation;
+import com.gitplex.server.util.validation.EntityValidator;
+import com.gitplex.server.util.validation.ValidatorProvider;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.google.inject.matcher.AbstractMatcher;
+import com.google.inject.matcher.Matchers;
+import com.pmease.security.shiro.bcrypt.BCryptPasswordService;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.annotations.XStreamOmitField;
+import com.thoughtworks.xstream.converters.basic.NullConverter;
+import com.thoughtworks.xstream.converters.extended.ISO8601DateConverter;
+import com.thoughtworks.xstream.converters.extended.ISO8601SqlTimestampConverter;
+import com.thoughtworks.xstream.converters.reflection.ReflectionProvider;
+import com.thoughtworks.xstream.core.JVM;
+import com.thoughtworks.xstream.mapper.MapperWrapper;
+
+/**
+ * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
+ *
+ */
+public class CoreModule extends AbstractPluginModule {
+
+ @Override
+ protected void configure() {
+ super.configure();
+
+ bind(JettyRunner.class).to(DefaultJettyRunner.class);
+ bind(ServletContextHandler.class).toProvider(DefaultJettyRunner.class);
+
+ bind(ObjectMapper.class).toProvider(ObjectMapperProvider.class).in(Singleton.class);
+
+ bind(ValidatorFactory.class).toProvider(new com.google.inject.Provider<ValidatorFactory>() {
+
+ @Override
+ public ValidatorFactory get() {
+ Configuration<?> configuration = Validation.byDefaultProvider().configure();
+ return configuration.buildValidatorFactory();
+ }
+
+ }).in(Singleton.class);
+
+ bind(Validator.class).toProvider(ValidatorProvider.class).in(Singleton.class);
+
+ // put your guice bindings here
+ bind(TaskScheduler.class).to(DefaultTaskScheduler.class);
+
+ contribute(MarkdownExtension.class, new MarkdownExtension() {
+
+ @Override
+ public Collection<Class<? extends Parser>> getInlineParsers() {
+ return null;
+ }
+
+ @Override
+ public Collection<ToHtmlSerializerPlugin> getHtmlSerializers() {
+ return null;
+ }
+
+ @Override
+ public Collection<Class<? extends Parser>> getBlockParsers() {
+ return null;
+ }
+
+ @Override
+ public Collection<HtmlTransformer> getHtmlTransformers() {
+ return Lists.newArrayList((HtmlTransformer)new NormalizeTransformer());
+ }
+
+ });
+ bind(MarkdownManager.class).to(DefaultMarkdownManager.class);
+
+ configurePersistence();
+
+ bind(Migrator.class).to(DatabaseMigrator.class);
+
+ contribute(ModelProvider.class, new ModelProvider() {
+
+ @Override
+ public Collection<Class<? extends AbstractEntity>> getModelClasses() {
+ Collection<Class<? extends AbstractEntity>> modelClasses =
+ new HashSet<Class<? extends AbstractEntity>>();
+ modelClasses.addAll(LoaderUtils.findImplementations(AbstractEntity.class, EntityLocator.class));
+ return modelClasses;
+ }
+
+ });
+
+ /*
+ * Contribute empty reservations to avoid Guice complain
+ */
+ contribute(AccountNameReservation.class, new AccountNameReservation() {
+
+ @Override
+ public Set<String> getReserved() {
+ return Sets.newHashSet();
+ }
+ });
+
+ /*
+ * Contribute empty reservations to avoid Guice complain
+ */
+ contribute(DepotNameReservation.class, new DepotNameReservation() {
+
+ @Override
+ public Set<String> getReserved() {
+ return Sets.newHashSet();
+ }
+ });
+
+ contribute(ImplementationProvider.class, new ImplementationProvider() {
+
+ @Override
+ public Collection<Class<?>> getImplementations() {
+ Collection<Class<?>> implementations = new HashSet<Class<?>>();
+ implementations.add(SystemGit.class);
+ implementations.add(SpecifiedGit.class);
+ return implementations;
+ }
+
+ @Override
+ public Class<?> getAbstractClass() {
+ return GitConfig.class;
+ }
+ });
+
+ bind(GitConfig.class).toProvider(GitConfigProvider.class);
+
+ /*
+ * Declare bindings explicitly instead of using ImplementedBy annotation as
+ * HK2 to guice bridge can only search in explicit bindings in Guice
+ */
+ bind(StorageManager.class).to(DefaultStorageManager.class);
+ bind(ConfigManager.class).to(DefaultConfigManager.class);
+ bind(DataManager.class).to(DefaultDataManager.class);
+ bind(PullRequestCommentManager.class).to(DefaultPullRequestCommentManager.class);
+ bind(CodeCommentManager.class).to(DefaultCodeCommentManager.class);
+ bind(PullRequestManager.class).to(DefaultPullRequestManager.class);
+ bind(PullRequestUpdateManager.class).to(DefaultPullRequestUpdateManager.class);
+ bind(DepotManager.class).to(DefaultDepotManager.class);
+ bind(AccountManager.class).to(DefaultAccountManager.class);
+ bind(PullRequestVerificationManager.class).to(DefaultPullRequestVerificationManager.class);
+ bind(PullRequestReviewInvitationManager.class).to(DefaultPullRequestReviewInvitationManager.class);
+ bind(PullRequestReviewManager.class).to(DefaultPullRequestReviewManager.class);
+ bind(MailManager.class).to(DefaultMailManager.class);
+ bind(BranchWatchManager.class).to(DefaultBranchWatchManager.class);
+ bind(PullRequestTaskManager.class).to(DefaultPullRequestTaskManager.class);
+ bind(PullRequestWatchManager.class).to(DefaultPullRequestWatchManager.class);
+ bind(CommitInfoManager.class).to(DefaultCommitInfoManager.class);
+ bind(PullRequestInfoManager.class).to(DefaultPullRequestInfoManager.class);
+ bind(CodeCommentInfoManager.class).to(DefaultCodeCommentInfoManager.class);
+ bind(VisitInfoManager.class).to(DefaultVisitInfoManager.class);
+ bind(BatchWorkManager.class).to(DefaultBatchWorkManager.class);
+ bind(TeamManager.class).to(DefaultTeamManager.class);
+ bind(OrganizationMembershipManager.class).to(DefaultOrganizationMembershipManager.class);
+ bind(TeamMembershipManager.class).to(DefaultTeamMembershipManager.class);
+ bind(TeamAuthorizationManager.class).to(DefaultTeamAuthorizationManager.class);
+ bind(UserAuthorizationManager.class).to(DefaultUserAuthorizationManager.class);
+ bind(PullRequestStatusChangeManager.class).to(DefaultPullRequestStatusChangeManager.class);
+ bind(CodeCommentReplyManager.class).to(DefaultCodeCommentReplyManager.class);
+ bind(AttachmentManager.class).to(DefaultAttachmentManager.class);
+ bind(CodeCommentRelationManager.class).to(DefaultCodeCommentRelationManager.class);
+ bind(CodeCommentStatusChangeManager.class).to(DefaultCodeCommentStatusChangeManager.class);
+ bind(PullRequestReferenceManager.class).to(DefaultPullRequestReferenceManager.class);
+ bind(WorkExecutor.class).to(DefaultWorkExecutor.class);
+
+ contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class);
+ contribute(ObjectMapperConfigurator.class, HibernateObjectMapperConfigurator.class);
+
+ bind(AuthorizingRealm.class).to(SecurityRealm.class);
+ bind(WebSecurityManager.class).to(DefaultWebSecurityManager.class);
+ bind(FilterChainResolver.class).to(DefaultFilterChainResolver.class);
+ bind(BasicAuthenticationFilter.class);
+ bind(PasswordService.class).to(BCryptPasswordService.class).in(Singleton.class);
+ bind(ShiroFilter.class);
+ install(new ShiroAopModule());
+ contribute(FilterChainConfigurator.class, new FilterChainConfigurator() {
+
+ @Override
+ public void configure(FilterChainManager filterChainManager) {
+ filterChainManager.createChain("/**/info/refs", "noSessionCreation, authcBasic");
+ filterChainManager.createChain("/**/git-upload-pack", "noSessionCreation, authcBasic");
+ filterChainManager.createChain("/**/git-receive-pack", "noSessionCreation, authcBasic");
+ }
+
+ });
+
+ bind(EntityValidator.class).to(DefaultEntityValidator.class);
+
+ if (Bootstrap.command != null
+ && Bootstrap.command.getName().equals("reset_admin_password")) {
+ bind(PersistManager.class).to(ResetAdminPasswordCommand.class);
+ }
+ }
+
+ private void configurePersistence() {
+ // Use an optional binding here in case our client does not like to
+ // start persist service provided by this plugin
+ bind(Interceptor.class).to(HibernateInterceptor.class);
+ bind(PhysicalNamingStrategy.class).toInstance(new PrefixedNamingStrategy("g_"));
+
+ bind(UnitOfWork.class).to(DefaultUnitOfWork.class);
+ bind(IdManager.class).to(DefaultIdManager.class);
+ bind(Dao.class).to(DefaultDao.class);
+
+ TransactionInterceptor transactionInterceptor = new TransactionInterceptor();
+ requestInjection(transactionInterceptor);
+
+ bindInterceptor(Matchers.any(), new AbstractMatcher<AnnotatedElement>() {
+
+ @Override
+ public boolean matches(AnnotatedElement element) {
+ return element.isAnnotationPresent(Transactional.class) && !((Method) element).isSynthetic();
+ }
+
+ }, transactionInterceptor);
+
+ SessionInterceptor sessionInterceptor = new SessionInterceptor();
+ requestInjection(sessionInterceptor);
+
+ bindInterceptor(Matchers.any(), new AbstractMatcher<AnnotatedElement>() {
+
+ @Override
+ public boolean matches(AnnotatedElement element) {
+ return element.isAnnotationPresent(Sessional.class) && !((Method) element).isSynthetic();
+ }
+
+ }, sessionInterceptor);
+
+ contribute(PersistListener.class, new PersistListener() {
+
+ @Override
+ public boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types)
+ throws CallbackException {
+ return false;
+ }
+
+ @Override
+ public boolean onLoad(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types)
+ throws CallbackException {
+ return false;
+ }
+
+ @Override
+ public boolean onFlushDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState,
+ String[] propertyNames, Type[] types) throws CallbackException {
+ return false;
+ }
+
+ @Override
+ public void onDelete(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types)
+ throws CallbackException {
+ }
+ });
+
+ contribute(ModelProvider.class, new ModelProvider() {
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public Collection<Class<? extends AbstractEntity>> getModelClasses() {
+ return Lists.newArrayList(VersionTable.class);
+ }
+
+ });
+
+ // put your guice bindings here
+ bind(XStream.class).toProvider(new com.google.inject.Provider<XStream>() {
+
+ @SuppressWarnings("rawtypes")
+ @Override
+ public XStream get() {
+ ReflectionProvider reflectionProvider = JVM.newReflectionProvider();
+ XStream xstream = new XStream(reflectionProvider) {
+
+ @Override
+ protected MapperWrapper wrapMapper(MapperWrapper next) {
+ return new MapperWrapper(next) {
+
+ @Override
+ public boolean shouldSerializeMember(Class definedIn, String fieldName) {
+ Field field = reflectionProvider.getField(definedIn, fieldName);
+
+ return field.getAnnotation(XStreamOmitField.class) == null &&
+ field.getAnnotation(Transient.class) == null &&
+ field.getAnnotation(OneToMany.class) == null &&
+ field.getAnnotation(Version.class) == null;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public String serializedClass(Class type) {
+ if (type == PersistentBag.class)
+ return super.serializedClass(ArrayList.class);
+ else if (type != null)
+ return super.serializedClass(ClassUtils.unproxy(type));
+ else
+ return super.serializedClass(type);
+ }
+
+ };
+ }
+
+ };
+
+ // register NullConverter as highest; otherwise NPE when unmarshal a map
+ // containing an entry with value set to null.
+ xstream.registerConverter(new NullConverter(), XStream.PRIORITY_VERY_HIGH);
+ xstream.registerConverter(new PersistentBagConverter(xstream.getMapper()), 200);
+ xstream.registerConverter(new JpaConverter(xstream.getMapper(), xstream.getReflectionProvider()));
+ xstream.registerConverter(new ISO8601DateConverter(), 100);
+ xstream.registerConverter(new ISO8601SqlTimestampConverter(), 100);
+ xstream.autodetectAnnotations(true);
+
+ return xstream;
+ }
+
+ }).in(Singleton.class);
+
+ if (Bootstrap.command != null) {
+ if (Command.RESTORE.equals(Bootstrap.command.getName()))
+ bind(PersistManager.class).to(DefaultRestoreCommand.class);
+ else if (Command.APPLY_DB_CONSTRAINTS.equals(Bootstrap.command.getName()))
+ bind(PersistManager.class).to(DefaultApplyDBConstraintsCommand.class);
+ else if (Command.BACKUP.equals(Bootstrap.command.getName()))
+ bind(PersistManager.class).to(DefaultBackupCommand.class);
+ else if (Command.CHECK_DATA_VERSION.equals(Bootstrap.command.getName()))
+ bind(PersistManager.class).to(DefaultCheckDataVersionCommand.class);
+ else if (Command.UPGRADE.equals(Bootstrap.command.getName()))
+ bind(PersistManager.class).to(DefaultUpgradeCommand.class);
+ else if (Command.CLEAN.equals(Bootstrap.command.getName()))
+ bind(PersistManager.class).to(DefaultCleanCommand.class);
+ else if (Command.DB_DIALECT.equals(Bootstrap.command.getName()))
+ bind(PersistManager.class).to(DefaultDBDialectCommand.class);
+ else
+ bind(PersistManager.class).to(DefaultPersistManager.class);
+ } else {
+ bind(PersistManager.class).to(DefaultPersistManager.class);
+ }
+ }
+
+ @Override
+ protected Class<? extends AbstractPlugin> getPluginClass() {
+ return GitPlex.class;
+ }
+
+}
diff --git a/core/src/main/java/com/gitplex/server/core/GitConfigProvider.java b/core/src/main/java/com/gitplex/server/GitConfigProvider.java
similarity index 76%
rename from core/src/main/java/com/gitplex/server/core/GitConfigProvider.java
rename to core/src/main/java/com/gitplex/server/GitConfigProvider.java
index ac12c6d0c5..8c6c183c2b 100644
--- a/core/src/main/java/com/gitplex/server/core/GitConfigProvider.java
+++ b/core/src/main/java/com/gitplex/server/GitConfigProvider.java
@@ -1,11 +1,11 @@
-package com.gitplex.server.core;
+package com.gitplex.server;
import javax.inject.Inject;
import javax.inject.Provider;
import javax.inject.Singleton;
-import com.gitplex.commons.git.GitConfig;
-import com.gitplex.server.core.manager.ConfigManager;
+import com.gitplex.server.git.config.GitConfig;
+import com.gitplex.server.manager.ConfigManager;
@Singleton
public class GitConfigProvider implements Provider<GitConfig> {
diff --git a/core/src/main/java/com/gitplex/server/core/GitPlex.java b/core/src/main/java/com/gitplex/server/GitPlex.java
similarity index 56%
rename from core/src/main/java/com/gitplex/server/core/GitPlex.java
rename to core/src/main/java/com/gitplex/server/GitPlex.java
index 2dc074c269..a96ec4764a 100644
--- a/core/src/main/java/com/gitplex/server/core/GitPlex.java
+++ b/core/src/main/java/com/gitplex/server/GitPlex.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core;
+package com.gitplex.server;
import java.io.ObjectStreamException;
import java.io.Serializable;
@@ -17,22 +17,27 @@ import org.apache.shiro.util.ThreadContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.hibernate.Sessional;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.calla.loader.AbstractPlugin;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.calla.loader.ListenerRegistry;
-import com.gitplex.calla.loader.ManagedSerializedForm;
-import com.gitplex.commons.util.init.InitStage;
-import com.gitplex.commons.util.init.ManualConfig;
-import com.gitplex.server.core.event.lifecycle.SystemStarted;
-import com.gitplex.server.core.event.lifecycle.SystemStarting;
-import com.gitplex.server.core.event.lifecycle.SystemStopped;
-import com.gitplex.server.core.event.lifecycle.SystemStopping;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.ConfigManager;
-import com.gitplex.server.core.manager.DataManager;
-import com.gitplex.server.core.setting.ServerConfig;
+import com.gitplex.launcher.loader.AbstractPlugin;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.launcher.loader.ListenerRegistry;
+import com.gitplex.launcher.loader.ManagedSerializedForm;
+import com.gitplex.launcher.bootstrap.Bootstrap;
+import com.gitplex.server.event.lifecycle.SystemStarted;
+import com.gitplex.server.event.lifecycle.SystemStarting;
+import com.gitplex.server.event.lifecycle.SystemStopped;
+import com.gitplex.server.event.lifecycle.SystemStopping;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.ConfigManager;
+import com.gitplex.server.manager.DataManager;
+import com.gitplex.server.persistence.PersistManager;
+import com.gitplex.server.persistence.UnitOfWork;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.util.init.InitStage;
+import com.gitplex.server.util.init.ManualConfig;
+import com.gitplex.server.util.jetty.JettyRunner;
+import com.gitplex.server.util.schedule.TaskScheduler;
+import com.gitplex.server.util.serverconfig.ServerConfig;
public class GitPlex extends AbstractPlugin implements Serializable {
@@ -40,8 +45,16 @@ public class GitPlex extends AbstractPlugin implements Serializable {
private static final Pattern DOCLINK_PATTERN = Pattern.compile("\\d+\\.\\d+");
+ private final JettyRunner jettyRunner;
+
+ private final TaskScheduler taskScheduler;
+
+ private final PersistManager persistManager;
+
private final Dao dao;
+ private final UnitOfWork unitOfWork;
+
private final ConfigManager configManager;
private final DataManager dataManager;
@@ -55,9 +68,14 @@ public class GitPlex extends AbstractPlugin implements Serializable {
private volatile InitStage initStage;
@Inject
- public GitPlex(Dao dao, ServerConfig serverConfig, DataManager dataManager, ConfigManager configManager,
- AccountManager accountManager, ListenerRegistry listenerRegistry) {
+ public GitPlex(JettyRunner jettyRunner, TaskScheduler taskScheduler, PersistManager persistManager,
+ Dao dao, UnitOfWork unitOfWork, ServerConfig serverConfig, DataManager dataManager,
+ ConfigManager configManager, AccountManager accountManager, ListenerRegistry listenerRegistry) {
+ this.jettyRunner = jettyRunner;
+ this.taskScheduler = taskScheduler;
+ this.persistManager = persistManager;
this.dao = dao;
+ this.unitOfWork = unitOfWork;
this.configManager = configManager;
this.dataManager = dataManager;
this.serverConfig = serverConfig;
@@ -68,23 +86,34 @@ public class GitPlex extends AbstractPlugin implements Serializable {
}
@Override
- @Sessional
public void start() {
- List<ManualConfig> manualConfigs = dataManager.init();
+ if (Bootstrap.command == null) {
+ jettyRunner.start();
+ taskScheduler.start();
+ }
+
+ persistManager.start();
- if (!manualConfigs.isEmpty()) {
- logger.warn("Please set up the server at " + guessServerUrl());
- initStage = new InitStage("Server Setup", manualConfigs);
+ unitOfWork.begin();
+ try {
+ List<ManualConfig> manualConfigs = dataManager.init();
- initStage.waitFor();
+ if (!manualConfigs.isEmpty()) {
+ logger.warn("Please set up the server at " + guessServerUrl());
+ initStage = new InitStage("Server Setup", manualConfigs);
+
+ initStage.waitFor();
+
+ // clear session in order to pick up changes made in interactive setup
+ dao.getSession().clear();
+ }
+
+ ThreadContext.bind(accountManager.getRoot().asSubject());
- // clear session in order to pick up changes made in interactive setup
- dao.getSession().clear();
+ listenerRegistry.post(new SystemStarting());
+ } finally {
+ unitOfWork.end();
}
-
- ThreadContext.bind(accountManager.getRoot().asSubject());
-
- listenerRegistry.post(new SystemStarting());
}
@Sessional
@@ -154,13 +183,21 @@ public class GitPlex extends AbstractPlugin implements Serializable {
listenerRegistry.post(new SystemStopping());
}
- @Sessional
@Override
public void stop() {
- listenerRegistry.post(new SystemStopped());
- ThreadContext.unbindSubject();
+ unitOfWork.begin();
+ try {
+ listenerRegistry.post(new SystemStopped());
+ ThreadContext.unbindSubject();
+ } finally {
+ unitOfWork.end();
+ }
+ persistManager.stop();
+
+ taskScheduler.stop();
+ jettyRunner.stop();
}
-
+
public Object writeReplace() throws ObjectStreamException {
return new ManagedSerializedForm(GitPlex.class);
}
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultApplyDBConstraintsCommand.java b/core/src/main/java/com/gitplex/server/command/DefaultApplyDBConstraintsCommand.java
similarity index 82%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultApplyDBConstraintsCommand.java
rename to core/src/main/java/com/gitplex/server/command/DefaultApplyDBConstraintsCommand.java
index 2da19ffa67..7e0fb8f582 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultApplyDBConstraintsCommand.java
+++ b/core/src/main/java/com/gitplex/server/command/DefaultApplyDBConstraintsCommand.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.command;
+package com.gitplex.server.command;
import java.io.BufferedReader;
import java.io.IOException;
@@ -15,14 +15,14 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.hibernate.DefaultPersistManager;
-import com.gitplex.commons.hibernate.EntityValidator;
-import com.gitplex.commons.hibernate.HibernateProperties;
-import com.gitplex.commons.hibernate.IdManager;
-import com.gitplex.commons.hibernate.ModelProvider;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.migration.Migrator;
-import com.gitplex.calla.bootstrap.Bootstrap;
+import com.gitplex.launcher.bootstrap.Bootstrap;
+import com.gitplex.server.migration.Migrator;
+import com.gitplex.server.persistence.DefaultPersistManager;
+import com.gitplex.server.persistence.HibernateProperties;
+import com.gitplex.server.persistence.IdManager;
+import com.gitplex.server.persistence.ModelProvider;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.util.validation.EntityValidator;
@Singleton
public class DefaultApplyDBConstraintsCommand extends DefaultPersistManager {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultBackupCommand.java b/core/src/main/java/com/gitplex/server/command/DefaultBackupCommand.java
similarity index 79%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultBackupCommand.java
rename to core/src/main/java/com/gitplex/server/command/DefaultBackupCommand.java
index 0720c3c9c9..e143b0e295 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultBackupCommand.java
+++ b/core/src/main/java/com/gitplex/server/command/DefaultBackupCommand.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.command;
+package com.gitplex.server.command;
import java.io.File;
import java.util.Set;
@@ -12,17 +12,17 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.hibernate.DefaultPersistManager;
-import com.gitplex.commons.hibernate.EntityValidator;
-import com.gitplex.commons.hibernate.HibernateProperties;
-import com.gitplex.commons.hibernate.IdManager;
-import com.gitplex.commons.hibernate.ModelProvider;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.migration.Migrator;
import com.google.common.base.Throwables;
-import com.gitplex.calla.bootstrap.Bootstrap;
-import com.gitplex.calla.bootstrap.BootstrapUtils;
-import com.gitplex.commons.util.FileUtils;
+import com.gitplex.launcher.bootstrap.Bootstrap;
+import com.gitplex.launcher.bootstrap.BootstrapUtils;
+import com.gitplex.server.migration.Migrator;
+import com.gitplex.server.persistence.DefaultPersistManager;
+import com.gitplex.server.persistence.HibernateProperties;
+import com.gitplex.server.persistence.IdManager;
+import com.gitplex.server.persistence.ModelProvider;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.server.util.validation.EntityValidator;
@Singleton
public class DefaultBackupCommand extends DefaultPersistManager {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultCheckDataVersionCommand.java b/core/src/main/java/com/gitplex/server/command/DefaultCheckDataVersionCommand.java
similarity index 74%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultCheckDataVersionCommand.java
rename to core/src/main/java/com/gitplex/server/command/DefaultCheckDataVersionCommand.java
index d9a49ed1b1..76cff53549 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultCheckDataVersionCommand.java
+++ b/core/src/main/java/com/gitplex/server/command/DefaultCheckDataVersionCommand.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.command;
+package com.gitplex.server.command;
import java.util.Set;
@@ -11,14 +11,14 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.calla.bootstrap.Bootstrap;
-import com.gitplex.commons.hibernate.DefaultPersistManager;
-import com.gitplex.commons.hibernate.EntityValidator;
-import com.gitplex.commons.hibernate.HibernateProperties;
-import com.gitplex.commons.hibernate.IdManager;
-import com.gitplex.commons.hibernate.ModelProvider;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.migration.Migrator;
+import com.gitplex.launcher.bootstrap.Bootstrap;
+import com.gitplex.server.migration.Migrator;
+import com.gitplex.server.persistence.DefaultPersistManager;
+import com.gitplex.server.persistence.HibernateProperties;
+import com.gitplex.server.persistence.IdManager;
+import com.gitplex.server.persistence.ModelProvider;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.util.validation.EntityValidator;
@Singleton
public class DefaultCheckDataVersionCommand extends DefaultPersistManager {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultCleanCommand.java b/core/src/main/java/com/gitplex/server/command/DefaultCleanCommand.java
similarity index 75%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultCleanCommand.java
rename to core/src/main/java/com/gitplex/server/command/DefaultCleanCommand.java
index 52fa83fcc1..92d3cae4f9 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultCleanCommand.java
+++ b/core/src/main/java/com/gitplex/server/command/DefaultCleanCommand.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.command;
+package com.gitplex.server.command;
import java.util.Set;
@@ -12,14 +12,14 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.hibernate.DefaultPersistManager;
-import com.gitplex.commons.hibernate.EntityValidator;
-import com.gitplex.commons.hibernate.HibernateProperties;
-import com.gitplex.commons.hibernate.IdManager;
-import com.gitplex.commons.hibernate.ModelProvider;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.migration.Migrator;
-import com.gitplex.calla.bootstrap.Bootstrap;
+import com.gitplex.launcher.bootstrap.Bootstrap;
+import com.gitplex.server.migration.Migrator;
+import com.gitplex.server.persistence.DefaultPersistManager;
+import com.gitplex.server.persistence.HibernateProperties;
+import com.gitplex.server.persistence.IdManager;
+import com.gitplex.server.persistence.ModelProvider;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.util.validation.EntityValidator;
@Singleton
public class DefaultCleanCommand extends DefaultPersistManager {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultDBDialectCommand.java b/core/src/main/java/com/gitplex/server/command/DefaultDBDialectCommand.java
similarity index 70%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultDBDialectCommand.java
rename to core/src/main/java/com/gitplex/server/command/DefaultDBDialectCommand.java
index 0e266abb06..932ce029d1 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultDBDialectCommand.java
+++ b/core/src/main/java/com/gitplex/server/command/DefaultDBDialectCommand.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.command;
+package com.gitplex.server.command;
import java.util.Set;
@@ -9,13 +9,13 @@ import org.hibernate.Interceptor;
import org.hibernate.SessionFactory;
import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
-import com.gitplex.commons.hibernate.DefaultPersistManager;
-import com.gitplex.commons.hibernate.EntityValidator;
-import com.gitplex.commons.hibernate.HibernateProperties;
-import com.gitplex.commons.hibernate.IdManager;
-import com.gitplex.commons.hibernate.ModelProvider;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.migration.Migrator;
+import com.gitplex.server.migration.Migrator;
+import com.gitplex.server.persistence.DefaultPersistManager;
+import com.gitplex.server.persistence.HibernateProperties;
+import com.gitplex.server.persistence.IdManager;
+import com.gitplex.server.persistence.ModelProvider;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.util.validation.EntityValidator;
@Singleton
public class DefaultDBDialectCommand extends DefaultPersistManager {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultRestoreCommand.java b/core/src/main/java/com/gitplex/server/command/DefaultRestoreCommand.java
similarity index 83%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultRestoreCommand.java
rename to core/src/main/java/com/gitplex/server/command/DefaultRestoreCommand.java
index ff0f4e8c2d..7e259a91d8 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultRestoreCommand.java
+++ b/core/src/main/java/com/gitplex/server/command/DefaultRestoreCommand.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.command;
+package com.gitplex.server.command;
import java.io.File;
import java.util.Set;
@@ -12,17 +12,17 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.hibernate.DefaultPersistManager;
-import com.gitplex.commons.hibernate.EntityValidator;
-import com.gitplex.commons.hibernate.HibernateProperties;
-import com.gitplex.commons.hibernate.IdManager;
-import com.gitplex.commons.hibernate.ModelProvider;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.migration.Migrator;
-import com.gitplex.calla.bootstrap.Bootstrap;
-import com.gitplex.calla.bootstrap.BootstrapUtils;
-import com.gitplex.calla.bootstrap.Command;
-import com.gitplex.commons.util.FileUtils;
+import com.gitplex.launcher.bootstrap.Bootstrap;
+import com.gitplex.launcher.bootstrap.BootstrapUtils;
+import com.gitplex.launcher.bootstrap.Command;
+import com.gitplex.server.migration.Migrator;
+import com.gitplex.server.persistence.DefaultPersistManager;
+import com.gitplex.server.persistence.HibernateProperties;
+import com.gitplex.server.persistence.IdManager;
+import com.gitplex.server.persistence.ModelProvider;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.server.util.validation.EntityValidator;
@Singleton
public class DefaultRestoreCommand extends DefaultPersistManager {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultUpgradeCommand.java b/core/src/main/java/com/gitplex/server/command/DefaultUpgradeCommand.java
similarity index 94%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultUpgradeCommand.java
rename to core/src/main/java/com/gitplex/server/command/DefaultUpgradeCommand.java
index 1d4b77b33b..0aa8bc798f 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultUpgradeCommand.java
+++ b/core/src/main/java/com/gitplex/server/command/DefaultUpgradeCommand.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.command;
+package com.gitplex.server.command;
import java.io.File;
import java.io.IOException;
@@ -17,19 +17,19 @@ import org.joda.time.format.DateTimeFormat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.hibernate.DefaultPersistManager;
-import com.gitplex.commons.hibernate.EntityValidator;
-import com.gitplex.commons.hibernate.HibernateProperties;
-import com.gitplex.commons.hibernate.IdManager;
-import com.gitplex.commons.hibernate.ModelProvider;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.migration.MigrationHelper;
-import com.gitplex.commons.hibernate.migration.Migrator;
-import com.gitplex.calla.bootstrap.Bootstrap;
-import com.gitplex.calla.loader.PluginManager;
-import com.gitplex.commons.util.FileUtils;
-import com.gitplex.commons.util.execution.Commandline;
-import com.gitplex.commons.util.execution.LineConsumer;
+import com.gitplex.launcher.loader.PluginManager;
+import com.gitplex.launcher.bootstrap.Bootstrap;
+import com.gitplex.server.migration.MigrationHelper;
+import com.gitplex.server.migration.Migrator;
+import com.gitplex.server.persistence.DefaultPersistManager;
+import com.gitplex.server.persistence.HibernateProperties;
+import com.gitplex.server.persistence.IdManager;
+import com.gitplex.server.persistence.ModelProvider;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.server.util.execution.Commandline;
+import com.gitplex.server.util.execution.LineConsumer;
+import com.gitplex.server.util.validation.EntityValidator;
@Singleton
public class DefaultUpgradeCommand extends DefaultPersistManager {
@@ -51,7 +51,7 @@ public class DefaultUpgradeCommand extends DefaultPersistManager {
protected Commandline buildCommandline(File upgradeDir, String command, String...commandArgs) {
Commandline cmdline= new Commandline(System.getProperty("java.home") + "/bin/java");
cmdline.addArgs("-Xmx" + Runtime.getRuntime().maxMemory()/1024/1024 + "m", "-classpath", "*",
- "com.gitplex.calla.bootstrap.Bootstrap", command);
+ "com.gitplex.launcher.bootstrap.Bootstrap", command);
cmdline.addArgs(commandArgs);
cmdline.workingDir(new File(upgradeDir, "boot"));
return cmdline;
diff --git a/core/src/main/java/com/gitplex/server/core/ResetAdminPasswordCommand.java b/core/src/main/java/com/gitplex/server/command/ResetAdminPasswordCommand.java
similarity index 80%
rename from core/src/main/java/com/gitplex/server/core/ResetAdminPasswordCommand.java
rename to core/src/main/java/com/gitplex/server/command/ResetAdminPasswordCommand.java
index e42848119a..633c52292e 100644
--- a/core/src/main/java/com/gitplex/server/core/ResetAdminPasswordCommand.java
+++ b/core/src/main/java/com/gitplex/server/command/ResetAdminPasswordCommand.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core;
+package com.gitplex.server.command;
import java.util.Set;
@@ -12,16 +12,16 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.calla.bootstrap.Bootstrap;
-import com.gitplex.commons.hibernate.DefaultPersistManager;
-import com.gitplex.commons.hibernate.EntityValidator;
-import com.gitplex.commons.hibernate.HibernateProperties;
-import com.gitplex.commons.hibernate.IdManager;
-import com.gitplex.commons.hibernate.ModelProvider;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.migration.Migrator;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
+import com.gitplex.launcher.bootstrap.Bootstrap;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.migration.Migrator;
+import com.gitplex.server.persistence.DefaultPersistManager;
+import com.gitplex.server.persistence.HibernateProperties;
+import com.gitplex.server.persistence.IdManager;
+import com.gitplex.server.persistence.ModelProvider;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.util.validation.EntityValidator;
@Singleton
public class ResetAdminPasswordCommand extends DefaultPersistManager {
diff --git a/core/src/main/java/com/gitplex/server/core/CoreEntityValidator.java b/core/src/main/java/com/gitplex/server/core/CoreEntityValidator.java
deleted file mode 100644
index d0e07eeed1..0000000000
--- a/core/src/main/java/com/gitplex/server/core/CoreEntityValidator.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gitplex.server.core;
-
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
-
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.commons.hibernate.DefaultEntityValidator;
-import com.gitplex.server.core.entity.Account;
-
-@Singleton
-public class CoreEntityValidator extends DefaultEntityValidator {
-
- @Inject
- public CoreEntityValidator(Validator validator) {
- super(validator);
- }
-
- @Override
- public void validate(AbstractEntity entity) {
- if (entity instanceof Account) {
- Account account = (Account) entity;
- Set<String> excludeProperties;
- if (account.isOrganization()) {
- excludeProperties = Account.getOrganizationExcludeProperties();
- } else {
- excludeProperties = Account.getUserExcludeProperties();
- }
- for (ConstraintViolation<?> violation: validator.validate(account)) {
- if (!excludeProperties.contains(violation.getPropertyPath().toString())) {
- reportError(account, violation);
- }
- }
- } else {
- super.validate(entity);
- }
- }
-
-}
diff --git a/core/src/main/java/com/gitplex/server/core/CoreModule.java b/core/src/main/java/com/gitplex/server/core/CoreModule.java
deleted file mode 100644
index 9d100411a7..0000000000
--- a/core/src/main/java/com/gitplex/server/core/CoreModule.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package com.gitplex.server.core;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
-
-import com.gitplex.calla.bootstrap.Bootstrap;
-import com.gitplex.calla.loader.AbstractPlugin;
-import com.gitplex.calla.loader.AbstractPluginModule;
-import com.gitplex.calla.loader.ImplementationProvider;
-import com.gitplex.calla.loader.LoaderUtils;
-import com.gitplex.commons.git.GitConfig;
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.commons.hibernate.EntityValidator;
-import com.gitplex.commons.hibernate.ModelProvider;
-import com.gitplex.commons.hibernate.PersistManager;
-import com.gitplex.commons.hibernate.PrefixedNamingStrategy;
-import com.gitplex.commons.hibernate.migration.Migrator;
-import com.gitplex.commons.jetty.ServletConfigurator;
-import com.gitplex.commons.shiro.AbstractRealm;
-import com.gitplex.server.core.commitmessagetransform.CommitMessageTransformer;
-import com.gitplex.server.core.commitmessagetransform.PatternCommitMessageTransformer;
-import com.gitplex.server.core.entity.EntityLocator;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.AttachmentManager;
-import com.gitplex.server.core.manager.BatchWorkManager;
-import com.gitplex.server.core.manager.BranchWatchManager;
-import com.gitplex.server.core.manager.CodeCommentInfoManager;
-import com.gitplex.server.core.manager.CodeCommentManager;
-import com.gitplex.server.core.manager.CodeCommentRelationManager;
-import com.gitplex.server.core.manager.CodeCommentReplyManager;
-import com.gitplex.server.core.manager.CodeCommentStatusChangeManager;
-import com.gitplex.server.core.manager.CommitInfoManager;
-import com.gitplex.server.core.manager.ConfigManager;
-import com.gitplex.server.core.manager.DataManager;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.manager.MailManager;
-import com.gitplex.server.core.manager.OrganizationMembershipManager;
-import com.gitplex.server.core.manager.PullRequestCommentManager;
-import com.gitplex.server.core.manager.PullRequestInfoManager;
-import com.gitplex.server.core.manager.PullRequestManager;
-import com.gitplex.server.core.manager.PullRequestReferenceManager;
-import com.gitplex.server.core.manager.PullRequestReviewInvitationManager;
-import com.gitplex.server.core.manager.PullRequestReviewManager;
-import com.gitplex.server.core.manager.PullRequestStatusChangeManager;
-import com.gitplex.server.core.manager.PullRequestTaskManager;
-import com.gitplex.server.core.manager.PullRequestUpdateManager;
-import com.gitplex.server.core.manager.PullRequestVerificationManager;
-import com.gitplex.server.core.manager.PullRequestWatchManager;
-import com.gitplex.server.core.manager.StorageManager;
-import com.gitplex.server.core.manager.TeamAuthorizationManager;
-import com.gitplex.server.core.manager.TeamManager;
-import com.gitplex.server.core.manager.TeamMembershipManager;
-import com.gitplex.server.core.manager.UserAuthorizationManager;
-import com.gitplex.server.core.manager.VisitInfoManager;
-import com.gitplex.server.core.manager.WorkExecutor;
-import com.gitplex.server.core.manager.impl.DefaultAccountManager;
-import com.gitplex.server.core.manager.impl.DefaultAttachmentManager;
-import com.gitplex.server.core.manager.impl.DefaultBatchWorkManager;
-import com.gitplex.server.core.manager.impl.DefaultBranchWatchManager;
-import com.gitplex.server.core.manager.impl.DefaultCodeCommentInfoManager;
-import com.gitplex.server.core.manager.impl.DefaultCodeCommentManager;
-import com.gitplex.server.core.manager.impl.DefaultCodeCommentRelationManager;
-import com.gitplex.server.core.manager.impl.DefaultCodeCommentReplyManager;
-import com.gitplex.server.core.manager.impl.DefaultCodeCommentStatusChangeManager;
-import com.gitplex.server.core.manager.impl.DefaultCommitInfoManager;
-import com.gitplex.server.core.manager.impl.DefaultConfigManager;
-import com.gitplex.server.core.manager.impl.DefaultDataManager;
-import com.gitplex.server.core.manager.impl.DefaultDepotManager;
-import com.gitplex.server.core.manager.impl.DefaultMailManager;
-import com.gitplex.server.core.manager.impl.DefaultOrganizationMembershipManager;
-import com.gitplex.server.core.manager.impl.DefaultPullRequestCommentManager;
-import com.gitplex.server.core.manager.impl.DefaultPullRequestInfoManager;
-import com.gitplex.server.core.manager.impl.DefaultPullRequestManager;
-import com.gitplex.server.core.manager.impl.DefaultPullRequestReferenceManager;
-import com.gitplex.server.core.manager.impl.DefaultPullRequestReviewInvitationManager;
-import com.gitplex.server.core.manager.impl.DefaultPullRequestReviewManager;
-import com.gitplex.server.core.manager.impl.DefaultPullRequestStatusChangeManager;
-import com.gitplex.server.core.manager.impl.DefaultPullRequestTaskManager;
-import com.gitplex.server.core.manager.impl.DefaultPullRequestUpdateManager;
-import com.gitplex.server.core.manager.impl.DefaultPullRequestVerificationManager;
-import com.gitplex.server.core.manager.impl.DefaultPullRequestWatchManager;
-import com.gitplex.server.core.manager.impl.DefaultStorageManager;
-import com.gitplex.server.core.manager.impl.DefaultTeamAuthorizationManager;
-import com.gitplex.server.core.manager.impl.DefaultTeamManager;
-import com.gitplex.server.core.manager.impl.DefaultTeamMembershipManager;
-import com.gitplex.server.core.manager.impl.DefaultUserAuthorizationManager;
-import com.gitplex.server.core.manager.impl.DefaultVisitInfoManager;
-import com.gitplex.server.core.manager.impl.DefaultWorkExecutor;
-import com.gitplex.server.core.migration.DatabaseMigrator;
-import com.gitplex.server.core.security.SecurityRealm;
-import com.gitplex.server.core.setting.SpecifiedGit;
-import com.gitplex.server.core.setting.SystemGit;
-import com.gitplex.server.core.util.validation.AccountNameReservation;
-import com.gitplex.server.core.util.validation.DepotNameReservation;
-import com.google.common.collect.Sets;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class CoreModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- bind(Migrator.class).to(DatabaseMigrator.class);
-
- bind(PhysicalNamingStrategy.class).toInstance(new PrefixedNamingStrategy("g_"));
-
- contribute(ModelProvider.class, new ModelProvider() {
-
- @Override
- public Collection<Class<? extends AbstractEntity>> getModelClasses() {
- Collection<Class<? extends AbstractEntity>> modelClasses =
- new HashSet<Class<? extends AbstractEntity>>();
- modelClasses.addAll(LoaderUtils.findImplementations(AbstractEntity.class, EntityLocator.class));
- return modelClasses;
- }
-
- });
-
- /*
- * Contribute empty reservations to avoid Guice complain
- */
- contribute(AccountNameReservation.class, new AccountNameReservation() {
-
- @Override
- public Set<String> getReserved() {
- return Sets.newHashSet();
- }
- });
-
- /*
- * Contribute empty reservations to avoid Guice complain
- */
- contribute(DepotNameReservation.class, new DepotNameReservation() {
-
- @Override
- public Set<String> getReserved() {
- return Sets.newHashSet();
- }
- });
-
- contribute(ServletConfigurator.class, CoreServletConfigurator.class);
-
- contribute(ImplementationProvider.class, new ImplementationProvider() {
-
- @Override
- public Collection<Class<?>> getImplementations() {
- Collection<Class<?>> implementations = new HashSet<Class<?>>();
- implementations.add(SystemGit.class);
- implementations.add(SpecifiedGit.class);
- return implementations;
- }
-
- @Override
- public Class<?> getAbstractClass() {
- return GitConfig.class;
- }
- });
-
- contribute(CommitMessageTransformer.class, PatternCommitMessageTransformer.class);
-
- bind(GitConfig.class).toProvider(GitConfigProvider.class);
-
- /*
- * Declare bindings explicitly instead of using ImplementedBy annotation as
- * HK2 to guice bridge can only search in explicit bindings in Guice
- */
- bind(StorageManager.class).to(DefaultStorageManager.class);
- bind(ConfigManager.class).to(DefaultConfigManager.class);
- bind(DataManager.class).to(DefaultDataManager.class);
- bind(PullRequestCommentManager.class).to(DefaultPullRequestCommentManager.class);
- bind(CodeCommentManager.class).to(DefaultCodeCommentManager.class);
- bind(PullRequestManager.class).to(DefaultPullRequestManager.class);
- bind(PullRequestUpdateManager.class).to(DefaultPullRequestUpdateManager.class);
- bind(DepotManager.class).to(DefaultDepotManager.class);
- bind(AccountManager.class).to(DefaultAccountManager.class);
- bind(PullRequestVerificationManager.class).to(DefaultPullRequestVerificationManager.class);
- bind(PullRequestReviewInvitationManager.class).to(DefaultPullRequestReviewInvitationManager.class);
- bind(PullRequestReviewManager.class).to(DefaultPullRequestReviewManager.class);
- bind(MailManager.class).to(DefaultMailManager.class);
- bind(BranchWatchManager.class).to(DefaultBranchWatchManager.class);
- bind(PullRequestTaskManager.class).to(DefaultPullRequestTaskManager.class);
- bind(PullRequestWatchManager.class).to(DefaultPullRequestWatchManager.class);
- bind(CommitInfoManager.class).to(DefaultCommitInfoManager.class);
- bind(PullRequestInfoManager.class).to(DefaultPullRequestInfoManager.class);
- bind(CodeCommentInfoManager.class).to(DefaultCodeCommentInfoManager.class);
- bind(VisitInfoManager.class).to(DefaultVisitInfoManager.class);
- bind(BatchWorkManager.class).to(DefaultBatchWorkManager.class);
- bind(TeamManager.class).to(DefaultTeamManager.class);
- bind(OrganizationMembershipManager.class).to(DefaultOrganizationMembershipManager.class);
- bind(TeamMembershipManager.class).to(DefaultTeamMembershipManager.class);
- bind(TeamAuthorizationManager.class).to(DefaultTeamAuthorizationManager.class);
- bind(UserAuthorizationManager.class).to(DefaultUserAuthorizationManager.class);
- bind(PullRequestStatusChangeManager.class).to(DefaultPullRequestStatusChangeManager.class);
- bind(CodeCommentReplyManager.class).to(DefaultCodeCommentReplyManager.class);
- bind(AttachmentManager.class).to(DefaultAttachmentManager.class);
- bind(CodeCommentRelationManager.class).to(DefaultCodeCommentRelationManager.class);
- bind(CodeCommentStatusChangeManager.class).to(DefaultCodeCommentStatusChangeManager.class);
- bind(PullRequestReferenceManager.class).to(DefaultPullRequestReferenceManager.class);
- bind(WorkExecutor.class).to(DefaultWorkExecutor.class);
-
- bind(AbstractRealm.class).to(SecurityRealm.class);
-
- bind(EntityValidator.class).to(CoreEntityValidator.class);
-
- if (Bootstrap.command != null
- && Bootstrap.command.getName().equals("reset_admin_password")) {
- bind(PersistManager.class).to(ResetAdminPasswordCommand.class);
- }
- }
-
- @Override
- protected Class<? extends AbstractPlugin> getPluginClass() {
- return GitPlex.class;
- }
-
-}
diff --git a/core/src/main/java/com/gitplex/server/core/CoreServletConfigurator.java b/core/src/main/java/com/gitplex/server/core/CoreServletConfigurator.java
deleted file mode 100644
index c5de5604b5..0000000000
--- a/core/src/main/java/com/gitplex/server/core/CoreServletConfigurator.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.gitplex.server.core;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-
-import com.gitplex.commons.jetty.ServletConfigurator;
-import com.gitplex.server.core.hookcallback.GitPostReceiveCallback;
-import com.gitplex.server.core.hookcallback.GitPreReceiveCallback;
-
-@Singleton
-public class CoreServletConfigurator implements ServletConfigurator {
-
- private final GitPreReceiveCallback preReceiveServlet;
-
- private final GitPostReceiveCallback postReceiveServlet;
-
- @Inject
- public CoreServletConfigurator(GitPreReceiveCallback preReceiveServlet, GitPostReceiveCallback postReceiveServlet) {
- this.preReceiveServlet = preReceiveServlet;
- this.postReceiveServlet = postReceiveServlet;
- }
-
- @Override
- public void configure(ServletContextHandler context) {
- ServletHolder servletHolder = new ServletHolder(preReceiveServlet);
- context.addServlet(servletHolder, GitPreReceiveCallback.PATH + "/*");
-
- servletHolder = new ServletHolder(postReceiveServlet);
- context.addServlet(servletHolder, GitPostReceiveCallback.PATH + "/*");
- }
-
-}
diff --git a/core/src/main/java/com/gitplex/server/core/commitmessagetransform/CommitMessageTransformer.java b/core/src/main/java/com/gitplex/server/core/commitmessagetransform/CommitMessageTransformer.java
deleted file mode 100644
index 59244bf48c..0000000000
--- a/core/src/main/java/com/gitplex/server/core/commitmessagetransform/CommitMessageTransformer.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.gitplex.server.core.commitmessagetransform;
-
-import com.gitplex.calla.loader.ExtensionPoint;
-import com.gitplex.server.core.entity.Depot;
-
-@ExtensionPoint
-public interface CommitMessageTransformer {
-
- String transform(Depot depot, String commitMessage);
-
-}
diff --git a/core/src/main/java/com/gitplex/server/core/entity/EntityLocator.java b/core/src/main/java/com/gitplex/server/core/entity/EntityLocator.java
deleted file mode 100644
index b9260d9ea9..0000000000
--- a/core/src/main/java/com/gitplex/server/core/entity/EntityLocator.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.gitplex.server.core.entity;
-
-public class EntityLocator {
-
-}
diff --git a/core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStarted.java b/core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStarted.java
deleted file mode 100644
index ce5ac0c55e..0000000000
--- a/core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStarted.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.gitplex.server.core.event.lifecycle;
-
-public class SystemStarted {
-
-}
diff --git a/core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStarting.java b/core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStarting.java
deleted file mode 100644
index f88e19c430..0000000000
--- a/core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStarting.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.gitplex.server.core.event.lifecycle;
-
-public class SystemStarting {
-
-}
diff --git a/core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStopped.java b/core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStopped.java
deleted file mode 100644
index fbb18280f7..0000000000
--- a/core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStopped.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.gitplex.server.core.event.lifecycle;
-
-public class SystemStopped {
-
-}
diff --git a/core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStopping.java b/core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStopping.java
deleted file mode 100644
index ac756f25dd..0000000000
--- a/core/src/main/java/com/gitplex/server/core/event/lifecycle/SystemStopping.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.gitplex.server.core.event.lifecycle;
-
-public class SystemStopping {
-
-}
diff --git a/core/src/main/java/com/gitplex/server/core/manager/BatchWorkManager.java b/core/src/main/java/com/gitplex/server/core/manager/BatchWorkManager.java
deleted file mode 100644
index 82b3f75710..0000000000
--- a/core/src/main/java/com/gitplex/server/core/manager/BatchWorkManager.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gitplex.server.core.manager;
-
-import com.gitplex.commons.util.concurrent.Prioritized;
-import com.gitplex.server.core.manager.support.BatchWorker;
-
-public interface BatchWorkManager {
-
- void submit(BatchWorker worker, Prioritized work);
-
-}
diff --git a/core/src/main/java/com/gitplex/server/core/manager/BranchWatchManager.java b/core/src/main/java/com/gitplex/server/core/manager/BranchWatchManager.java
deleted file mode 100644
index 6784b7eca7..0000000000
--- a/core/src/main/java/com/gitplex/server/core/manager/BranchWatchManager.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.gitplex.server.core.manager;
-
-import java.util.Collection;
-
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.BranchWatch;
-import com.gitplex.server.core.entity.Depot;
-
-public interface BranchWatchManager extends EntityManager<BranchWatch> {
-
- Collection<BranchWatch> find(Account user, Depot depot);
-
- Collection<BranchWatch> find(Depot depot, String branch);
-
-}
diff --git a/core/src/main/java/com/gitplex/server/core/manager/CodeCommentReplyManager.java b/core/src/main/java/com/gitplex/server/core/manager/CodeCommentReplyManager.java
deleted file mode 100644
index c2e56ee75e..0000000000
--- a/core/src/main/java/com/gitplex/server/core/manager/CodeCommentReplyManager.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gitplex.server.core.manager;
-
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.CodeCommentReply;
-
-public interface CodeCommentReplyManager extends EntityManager<CodeCommentReply> {
-
- void save(CodeCommentReply reply, boolean callListeners);
-
-}
diff --git a/core/src/main/java/com/gitplex/server/core/manager/CodeCommentStatusChangeManager.java b/core/src/main/java/com/gitplex/server/core/manager/CodeCommentStatusChangeManager.java
deleted file mode 100644
index d1093a8931..0000000000
--- a/core/src/main/java/com/gitplex/server/core/manager/CodeCommentStatusChangeManager.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.gitplex.server.core.manager;
-
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.CodeCommentStatusChange;
-
-public interface CodeCommentStatusChangeManager extends EntityManager<CodeCommentStatusChange> {
-
-}
diff --git a/core/src/main/java/com/gitplex/server/core/manager/PullRequestReferenceManager.java b/core/src/main/java/com/gitplex/server/core/manager/PullRequestReferenceManager.java
deleted file mode 100644
index 5f6890150e..0000000000
--- a/core/src/main/java/com/gitplex/server/core/manager/PullRequestReferenceManager.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.gitplex.server.core.manager;
-
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.PullRequestReference;
-
-public interface PullRequestReferenceManager extends EntityManager<PullRequestReference> {
-
-}
diff --git a/core/src/main/java/com/gitplex/server/core/manager/PullRequestStatusChangeManager.java b/core/src/main/java/com/gitplex/server/core/manager/PullRequestStatusChangeManager.java
deleted file mode 100644
index 492fe70b6c..0000000000
--- a/core/src/main/java/com/gitplex/server/core/manager/PullRequestStatusChangeManager.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.gitplex.server.core.manager;
-
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.PullRequestStatusChange;
-
-public interface PullRequestStatusChangeManager extends EntityManager<PullRequestStatusChange> {
-
-}
diff --git a/core/src/main/java/com/gitplex/server/core/manager/PullRequestTaskManager.java b/core/src/main/java/com/gitplex/server/core/manager/PullRequestTaskManager.java
deleted file mode 100644
index af3cbf786a..0000000000
--- a/core/src/main/java/com/gitplex/server/core/manager/PullRequestTaskManager.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.gitplex.server.core.manager;
-
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.PullRequestTask;
-
-public interface PullRequestTaskManager extends EntityManager<PullRequestTask> {
-
-}
diff --git a/core/src/main/java/com/gitplex/server/core/manager/PullRequestWatchManager.java b/core/src/main/java/com/gitplex/server/core/manager/PullRequestWatchManager.java
deleted file mode 100644
index f1d39d87d5..0000000000
--- a/core/src/main/java/com/gitplex/server/core/manager/PullRequestWatchManager.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.gitplex.server.core.manager;
-
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.PullRequestWatch;
-
-public interface PullRequestWatchManager extends EntityManager<PullRequestWatch> {
-
-}
diff --git a/core/src/main/java/com/gitplex/server/core/security/protectedobject/AccountBelonging.java b/core/src/main/java/com/gitplex/server/core/security/protectedobject/AccountBelonging.java
deleted file mode 100644
index e54da2e209..0000000000
--- a/core/src/main/java/com/gitplex/server/core/security/protectedobject/AccountBelonging.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.gitplex.server.core.security.protectedobject;
-
-import com.gitplex.server.core.entity.Account;
-
-public interface AccountBelonging extends ProtectedObject {
- Account getAccount();
-}
diff --git a/core/src/main/java/com/gitplex/server/core/entity/Account.java b/core/src/main/java/com/gitplex/server/entity/Account.java
similarity index 80%
rename from core/src/main/java/com/gitplex/server/core/entity/Account.java
rename to core/src/main/java/com/gitplex/server/entity/Account.java
index 6d7d257dae..e2e3d0666c 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/Account.java
+++ b/core/src/main/java/com/gitplex/server/entity/Account.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import java.util.ArrayList;
import java.util.Collection;
@@ -17,27 +17,34 @@ import javax.persistence.Table;
import javax.persistence.Version;
import javax.validation.constraints.NotNull;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authc.AuthenticationInfo;
+import org.apache.shiro.subject.PrincipalCollection;
+import org.apache.shiro.subject.SimplePrincipalCollection;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.web.mgt.WebSecurityManager;
import org.eclipse.jgit.lib.PersonIdent;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.validator.constraints.Email;
import org.hibernate.validator.constraints.NotEmpty;
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.commons.shiro.AbstractUser;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.commons.wicket.editable.annotation.ExcludeValues;
-import com.gitplex.commons.wicket.editable.annotation.Password;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.manager.TeamAuthorizationManager;
-import com.gitplex.server.core.manager.TeamMembershipManager;
-import com.gitplex.server.core.manager.UserAuthorizationManager;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
-import com.gitplex.server.core.security.protectedobject.AccountBelonging;
-import com.gitplex.server.core.security.protectedobject.ProtectedObject;
-import com.gitplex.server.core.util.validation.AccountName;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.manager.TeamAuthorizationManager;
+import com.gitplex.server.manager.TeamMembershipManager;
+import com.gitplex.server.manager.UserAuthorizationManager;
+import com.gitplex.server.persistence.AbstractEntity;
+import com.gitplex.server.security.privilege.DepotPrivilege;
+import com.gitplex.server.security.protectedobject.AccountBelonging;
+import com.gitplex.server.security.protectedobject.ProtectedObject;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.ExcludeValues;
+import com.gitplex.server.util.editable.annotation.Password;
+import com.gitplex.server.util.validation.annotation.AccountName;
import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
@Entity
@@ -46,13 +53,19 @@ import com.google.common.collect.Sets;
@Index(columnList="noSpaceName"), @Index(columnList="noSpaceFullName")})
@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
@Editable
-public class Account extends AbstractUser implements ProtectedObject {
+public class Account extends AbstractEntity implements AuthenticationInfo, ProtectedObject {
private static final long serialVersionUID = 1L;
public static final Long ADMINISTRATOR_ID = 1L;
- private boolean organization;
+ @Column(unique=true, nullable=false)
+ private String name;
+
+ @Column(length=1024)
+ private String password;
+
+ private boolean organization;
private String fullName;
@@ -145,17 +158,44 @@ public class Account extends AbstractUser implements ProtectedObject {
private transient Map<Account, OrganizationMembership> organizationMembersMap;
+ @Override
+ public PrincipalCollection getPrincipals() {
+ return new SimplePrincipalCollection(getId(), "");
+ }
+
+ @Override
+ public Object getCredentials() {
+ return password;
+ }
+
+ public Subject asSubject() {
+ return asSubject(getId());
+ }
+
+ public static Long getCurrentId() {
+ Object principal = SecurityUtils.getSubject().getPrincipal();
+ Preconditions.checkNotNull(principal);
+ return (Long) principal;
+ }
+
+ public static PrincipalCollection asPrincipal(Long userId) {
+ return new SimplePrincipalCollection(userId, "");
+ }
+
+ public static Subject asSubject(Long userId) {
+ WebSecurityManager securityManager = AppLoader.getInstance(WebSecurityManager.class);
+ return new Subject.Builder(securityManager).principals(asPrincipal(userId)).buildSubject();
+ }
+
@Editable(name="Account Name", order=100)
@AccountName
@NotEmpty
- @Override
public String getName() {
- return super.getName();
+ return name;
}
- @Override
public void setName(String name) {
- super.setName(name);
+ this.name = name;
noSpaceName = StringUtils.deleteWhitespace(name);
}
@@ -163,9 +203,23 @@ public class Account extends AbstractUser implements ProtectedObject {
@Password(confirmative=true)
@NotEmpty
public String getPassword() {
- return super.getPassword();
- }
-
+ return password;
+ }
+
+ /**
+ * Set password of this user.
+ *
+ * @param password
+ * password to set
+ */
+ public void setPassword(String password) {
+ if (password != null) {
+ this.password = password;
+ } else {
+ this.password = null;
+ }
+ }
+
@Editable(order=200)
public String getFullName() {
return fullName;
diff --git a/core/src/main/java/com/gitplex/server/core/entity/BranchWatch.java b/core/src/main/java/com/gitplex/server/entity/BranchWatch.java
similarity index 92%
rename from core/src/main/java/com/gitplex/server/core/entity/BranchWatch.java
rename to core/src/main/java/com/gitplex/server/entity/BranchWatch.java
index e728835f20..77b59758a6 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/BranchWatch.java
+++ b/core/src/main/java/com/gitplex/server/entity/BranchWatch.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -9,7 +9,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
@Entity
@Table(
diff --git a/core/src/main/java/com/gitplex/server/core/entity/CodeComment.java b/core/src/main/java/com/gitplex/server/entity/CodeComment.java
similarity index 90%
rename from core/src/main/java/com/gitplex/server/core/entity/CodeComment.java
rename to core/src/main/java/com/gitplex/server/entity/CodeComment.java
index b6172b9fef..32622c7cf2 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/CodeComment.java
+++ b/core/src/main/java/com/gitplex/server/entity/CodeComment.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import java.io.Serializable;
import java.util.ArrayList;
@@ -23,16 +23,16 @@ import javax.persistence.Version;
import org.hibernate.annotations.DynamicUpdate;
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.support.CodeCommentActivity;
-import com.gitplex.server.core.entity.support.CommentPos;
-import com.gitplex.server.core.entity.support.CompareContext;
-import com.gitplex.server.core.entity.support.LastEvent;
-import com.gitplex.server.core.event.codecomment.CodeCommentEvent;
-import com.gitplex.server.core.manager.VisitInfoManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.support.CodeCommentActivity;
+import com.gitplex.server.entity.support.CommentPos;
+import com.gitplex.server.entity.support.CompareContext;
+import com.gitplex.server.entity.support.LastEvent;
+import com.gitplex.server.event.codecomment.CodeCommentEvent;
+import com.gitplex.server.manager.VisitInfoManager;
+import com.gitplex.server.persistence.AbstractEntity;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.editable.EditableUtils;
/*
* @DynamicUpdate annotation here along with various @OptimisticLock annotations
diff --git a/core/src/main/java/com/gitplex/server/core/entity/CodeCommentRelation.java b/core/src/main/java/com/gitplex/server/entity/CodeCommentRelation.java
similarity index 92%
rename from core/src/main/java/com/gitplex/server/core/entity/CodeCommentRelation.java
rename to core/src/main/java/com/gitplex/server/entity/CodeCommentRelation.java
index ee73804f9f..32bc80079b 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/CodeCommentRelation.java
+++ b/core/src/main/java/com/gitplex/server/entity/CodeCommentRelation.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -11,7 +11,7 @@ import javax.persistence.UniqueConstraint;
import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
@Table(
indexes={@Index(columnList="g_request_id"), @Index(columnList="g_comment_id")},
diff --git a/core/src/main/java/com/gitplex/server/core/entity/CodeCommentReply.java b/core/src/main/java/com/gitplex/server/entity/CodeCommentReply.java
similarity index 89%
rename from core/src/main/java/com/gitplex/server/core/entity/CodeCommentReply.java
rename to core/src/main/java/com/gitplex/server/entity/CodeCommentReply.java
index 22ce016fcb..2d91df23c8 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/CodeCommentReply.java
+++ b/core/src/main/java/com/gitplex/server/entity/CodeCommentReply.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -8,7 +8,7 @@ import javax.persistence.Table;
import org.hibernate.annotations.DynamicUpdate;
-import com.gitplex.server.core.entity.support.CodeCommentActivity;
+import com.gitplex.server.entity.support.CodeCommentActivity;
/*
* @DynamicUpdate annotation here along with various @OptimisticLock annotations
diff --git a/core/src/main/java/com/gitplex/server/core/entity/CodeCommentStatusChange.java b/core/src/main/java/com/gitplex/server/entity/CodeCommentStatusChange.java
similarity index 86%
rename from core/src/main/java/com/gitplex/server/core/entity/CodeCommentStatusChange.java
rename to core/src/main/java/com/gitplex/server/entity/CodeCommentStatusChange.java
index 3e11d5bbd9..d9f1daad56 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/CodeCommentStatusChange.java
+++ b/core/src/main/java/com/gitplex/server/entity/CodeCommentStatusChange.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import javax.persistence.Entity;
import javax.persistence.Index;
@@ -6,7 +6,7 @@ import javax.persistence.Table;
import org.hibernate.annotations.DynamicUpdate;
-import com.gitplex.server.core.entity.support.CodeCommentActivity;
+import com.gitplex.server.entity.support.CodeCommentActivity;
@Entity
@Table(indexes={@Index(columnList="g_comment_id"), @Index(columnList="g_user_id")})
diff --git a/core/src/main/java/com/gitplex/server/core/entity/Config.java b/core/src/main/java/com/gitplex/server/entity/Config.java
similarity index 92%
rename from core/src/main/java/com/gitplex/server/core/entity/Config.java
rename to core/src/main/java/com/gitplex/server/entity/Config.java
index af400e5d4e..047729a681 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/Config.java
+++ b/core/src/main/java/com/gitplex/server/entity/Config.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import java.io.Serializable;
@@ -9,7 +9,7 @@ import javax.persistence.Lob;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
/**
* This entity stores object in serialized form, with one entity
diff --git a/core/src/main/java/com/gitplex/server/core/entity/Depot.java b/core/src/main/java/com/gitplex/server/entity/Depot.java
similarity index 94%
rename from core/src/main/java/com/gitplex/server/core/entity/Depot.java
rename to core/src/main/java/com/gitplex/server/entity/Depot.java
index ac69b53faf..72d0288b08 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/Depot.java
+++ b/core/src/main/java/com/gitplex/server/entity/Depot.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import java.io.File;
import java.io.IOException;
@@ -64,37 +64,37 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.validator.constraints.NotEmpty;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.calla.loader.ListenerRegistry;
-import com.gitplex.calla.loader.LoaderUtils;
-import com.gitplex.commons.git.Blob;
-import com.gitplex.commons.git.BlobIdent;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.git.RefInfo;
-import com.gitplex.commons.git.Submodule;
-import com.gitplex.commons.git.exception.GitObjectNotFoundException;
-import com.gitplex.commons.git.exception.NotGitFileException;
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.commons.hibernate.UnitOfWork;
-import com.gitplex.commons.util.FileUtils;
-import com.gitplex.commons.util.LockUtils;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.commons.wicket.editable.annotation.Markdown;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.support.CommitMessageTransformSetting;
-import com.gitplex.server.core.entity.support.IntegrationPolicy;
-import com.gitplex.server.core.event.RefUpdated;
-import com.gitplex.server.core.gatekeeper.AndGateKeeper;
-import com.gitplex.server.core.gatekeeper.GateKeeper;
-import com.gitplex.server.core.manager.ConfigManager;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.manager.StorageManager;
-import com.gitplex.server.core.manager.VisitInfoManager;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.core.security.protectedobject.AccountBelonging;
-import com.gitplex.server.core.security.protectedobject.ProtectedObject;
-import com.gitplex.server.core.util.validation.DepotName;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.launcher.loader.ListenerRegistry;
+import com.gitplex.launcher.loader.LoaderUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.support.CommitMessageTransformSetting;
+import com.gitplex.server.entity.support.IntegrationPolicy;
+import com.gitplex.server.event.RefUpdated;
+import com.gitplex.server.gatekeeper.AndGateKeeper;
+import com.gitplex.server.gatekeeper.GateKeeper;
+import com.gitplex.server.git.Blob;
+import com.gitplex.server.git.BlobIdent;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.git.RefInfo;
+import com.gitplex.server.git.Submodule;
+import com.gitplex.server.git.exception.GitObjectNotFoundException;
+import com.gitplex.server.git.exception.NotGitFileException;
+import com.gitplex.server.manager.ConfigManager;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.manager.StorageManager;
+import com.gitplex.server.manager.VisitInfoManager;
+import com.gitplex.server.persistence.AbstractEntity;
+import com.gitplex.server.persistence.UnitOfWork;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.security.protectedobject.AccountBelonging;
+import com.gitplex.server.security.protectedobject.ProtectedObject;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.server.util.LockUtils;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.Markdown;
+import com.gitplex.server.util.validation.annotation.DepotName;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
diff --git a/core/src/main/java/com/gitplex/server/entity/EntityLocator.java b/core/src/main/java/com/gitplex/server/entity/EntityLocator.java
new file mode 100644
index 0000000000..f6678da9b9
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/entity/EntityLocator.java
@@ -0,0 +1,5 @@
+package com.gitplex.server.entity;
+
+public class EntityLocator {
+
+}
diff --git a/core/src/main/java/com/gitplex/server/core/entity/OrganizationMembership.java b/core/src/main/java/com/gitplex/server/entity/OrganizationMembership.java
similarity index 92%
rename from core/src/main/java/com/gitplex/server/core/entity/OrganizationMembership.java
rename to core/src/main/java/com/gitplex/server/entity/OrganizationMembership.java
index 1dd93654f5..7ed0799c1f 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/OrganizationMembership.java
+++ b/core/src/main/java/com/gitplex/server/entity/OrganizationMembership.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -8,7 +8,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
@Entity
@Table(
diff --git a/core/src/main/java/com/gitplex/server/core/entity/PullRequest.java b/core/src/main/java/com/gitplex/server/entity/PullRequest.java
similarity index 95%
rename from core/src/main/java/com/gitplex/server/core/entity/PullRequest.java
rename to core/src/main/java/com/gitplex/server/entity/PullRequest.java
index a4143dccc4..986b41a5f2 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/PullRequest.java
+++ b/core/src/main/java/com/gitplex/server/entity/PullRequest.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import java.io.IOException;
import java.io.Serializable;
@@ -38,31 +38,31 @@ import org.hibernate.criterion.Criterion;
import org.hibernate.criterion.Restrictions;
import com.fasterxml.jackson.annotation.JsonView;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.support.CloseInfo;
+import com.gitplex.server.entity.support.CompareContext;
+import com.gitplex.server.entity.support.DepotAndBranch;
+import com.gitplex.server.entity.support.IntegrationPreview;
+import com.gitplex.server.entity.support.LastEvent;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentEvent;
+import com.gitplex.server.gatekeeper.checkresult.Failed;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.gatekeeper.checkresult.Pending;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.git.exception.GitObjectNotFoundException;
+import com.gitplex.server.manager.CodeCommentRelationManager;
+import com.gitplex.server.manager.PullRequestManager;
+import com.gitplex.server.manager.PullRequestReviewManager;
+import com.gitplex.server.manager.VisitInfoManager;
+import com.gitplex.server.persistence.AbstractEntity;
+import com.gitplex.server.persistence.UnitOfWork;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.security.ObjectPermission;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.diff.WhitespaceOption;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.util.jackson.ExternalView;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.git.exception.GitObjectNotFoundException;
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.commons.hibernate.UnitOfWork;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.jackson.ExternalView;
-import com.gitplex.commons.util.diff.WhitespaceOption;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.support.CloseInfo;
-import com.gitplex.server.core.entity.support.CompareContext;
-import com.gitplex.server.core.entity.support.DepotAndBranch;
-import com.gitplex.server.core.entity.support.IntegrationPreview;
-import com.gitplex.server.core.entity.support.LastEvent;
-import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentEvent;
-import com.gitplex.server.core.gatekeeper.checkresult.Failed;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
-import com.gitplex.server.core.gatekeeper.checkresult.Pending;
-import com.gitplex.server.core.manager.CodeCommentRelationManager;
-import com.gitplex.server.core.manager.PullRequestManager;
-import com.gitplex.server.core.manager.PullRequestReviewManager;
-import com.gitplex.server.core.manager.VisitInfoManager;
-import com.gitplex.server.core.security.ObjectPermission;
-import com.gitplex.server.core.security.SecurityUtils;
@Entity
/*
diff --git a/core/src/main/java/com/gitplex/server/core/entity/PullRequestComment.java b/core/src/main/java/com/gitplex/server/entity/PullRequestComment.java
similarity index 95%
rename from core/src/main/java/com/gitplex/server/core/entity/PullRequestComment.java
rename to core/src/main/java/com/gitplex/server/entity/PullRequestComment.java
index d7820a8689..8c39f0b5b9 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/PullRequestComment.java
+++ b/core/src/main/java/com/gitplex/server/entity/PullRequestComment.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import java.util.Date;
@@ -15,7 +15,7 @@ import javax.persistence.Version;
import org.hibernate.annotations.DynamicUpdate;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
/*
* @DynamicUpdate annotation here along with various @OptimisticLock annotations
diff --git a/core/src/main/java/com/gitplex/server/core/entity/PullRequestReference.java b/core/src/main/java/com/gitplex/server/entity/PullRequestReference.java
similarity index 94%
rename from core/src/main/java/com/gitplex/server/core/entity/PullRequestReference.java
rename to core/src/main/java/com/gitplex/server/entity/PullRequestReference.java
index f33b64cad0..27745c0455 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/PullRequestReference.java
+++ b/core/src/main/java/com/gitplex/server/entity/PullRequestReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import java.util.Date;
@@ -14,7 +14,7 @@ import javax.persistence.UniqueConstraint;
import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
@Table(
indexes={@Index(columnList="g_referenced_id"), @Index(columnList="g_referencedBy_id"), @Index(columnList="g_user_id")},
diff --git a/core/src/main/java/com/gitplex/server/core/entity/PullRequestReview.java b/core/src/main/java/com/gitplex/server/entity/PullRequestReview.java
similarity index 93%
rename from core/src/main/java/com/gitplex/server/core/entity/PullRequestReview.java
rename to core/src/main/java/com/gitplex/server/entity/PullRequestReview.java
index 78baae13db..65a13ba02f 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/PullRequestReview.java
+++ b/core/src/main/java/com/gitplex/server/entity/PullRequestReview.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import java.util.Date;
@@ -11,7 +11,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
@Entity
@Table(
diff --git a/core/src/main/java/com/gitplex/server/core/entity/PullRequestReviewInvitation.java b/core/src/main/java/com/gitplex/server/entity/PullRequestReviewInvitation.java
similarity index 93%
rename from core/src/main/java/com/gitplex/server/core/entity/PullRequestReviewInvitation.java
rename to core/src/main/java/com/gitplex/server/entity/PullRequestReviewInvitation.java
index 18359173cc..a87e8e0995 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/PullRequestReviewInvitation.java
+++ b/core/src/main/java/com/gitplex/server/entity/PullRequestReviewInvitation.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import java.util.Date;
@@ -11,7 +11,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
@Entity
@Table(
diff --git a/core/src/main/java/com/gitplex/server/core/entity/PullRequestStatusChange.java b/core/src/main/java/com/gitplex/server/entity/PullRequestStatusChange.java
similarity index 96%
rename from core/src/main/java/com/gitplex/server/core/entity/PullRequestStatusChange.java
rename to core/src/main/java/com/gitplex/server/entity/PullRequestStatusChange.java
index a52dd953aa..c9a0acbb27 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/PullRequestStatusChange.java
+++ b/core/src/main/java/com/gitplex/server/entity/PullRequestStatusChange.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import java.util.Date;
@@ -14,7 +14,7 @@ import javax.persistence.Version;
import org.hibernate.annotations.DynamicUpdate;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
@Entity
@Table(indexes={@Index(columnList="g_request_id"), @Index(columnList="g_user_id")})
diff --git a/core/src/main/java/com/gitplex/server/core/entity/PullRequestTask.java b/core/src/main/java/com/gitplex/server/entity/PullRequestTask.java
similarity index 94%
rename from core/src/main/java/com/gitplex/server/core/entity/PullRequestTask.java
rename to core/src/main/java/com/gitplex/server/entity/PullRequestTask.java
index 17c75f7bc3..7a44ac5825 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/PullRequestTask.java
+++ b/core/src/main/java/com/gitplex/server/entity/PullRequestTask.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import java.util.Date;
@@ -11,7 +11,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
@Entity
@Table(
diff --git a/core/src/main/java/com/gitplex/server/core/entity/PullRequestUpdate.java b/core/src/main/java/com/gitplex/server/entity/PullRequestUpdate.java
similarity index 97%
rename from core/src/main/java/com/gitplex/server/core/entity/PullRequestUpdate.java
rename to core/src/main/java/com/gitplex/server/entity/PullRequestUpdate.java
index 36a25fddb9..fbeb6d42d0 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/PullRequestUpdate.java
+++ b/core/src/main/java/com/gitplex/server/entity/PullRequestUpdate.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import java.io.IOException;
import java.util.ArrayList;
@@ -31,10 +31,10 @@ import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.manager.impl.DefaultCodeCommentRelationManager;
+import com.gitplex.server.persistence.AbstractEntity;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.server.core.manager.impl.DefaultCodeCommentRelationManager;
@Entity
@Table(indexes={@Index(columnList="g_request_id"), @Index(columnList="uuid"), @Index(columnList="date")})
diff --git a/core/src/main/java/com/gitplex/server/core/entity/PullRequestVerification.java b/core/src/main/java/com/gitplex/server/entity/PullRequestVerification.java
similarity index 95%
rename from core/src/main/java/com/gitplex/server/core/entity/PullRequestVerification.java
rename to core/src/main/java/com/gitplex/server/entity/PullRequestVerification.java
index 88ed0769cc..9d0298aa63 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/PullRequestVerification.java
+++ b/core/src/main/java/com/gitplex/server/entity/PullRequestVerification.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import java.util.Date;
@@ -11,7 +11,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
@Entity
@Table(
diff --git a/core/src/main/java/com/gitplex/server/core/entity/PullRequestWatch.java b/core/src/main/java/com/gitplex/server/entity/PullRequestWatch.java
similarity index 93%
rename from core/src/main/java/com/gitplex/server/core/entity/PullRequestWatch.java
rename to core/src/main/java/com/gitplex/server/entity/PullRequestWatch.java
index 77b71243e1..0260c4cb67 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/PullRequestWatch.java
+++ b/core/src/main/java/com/gitplex/server/entity/PullRequestWatch.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import javax.annotation.Nullable;
import javax.persistence.Entity;
@@ -9,7 +9,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
@Entity
@Table(
diff --git a/core/src/main/java/com/gitplex/server/core/entity/Team.java b/core/src/main/java/com/gitplex/server/entity/Team.java
similarity index 91%
rename from core/src/main/java/com/gitplex/server/core/entity/Team.java
rename to core/src/main/java/com/gitplex/server/entity/Team.java
index 36b4900eeb..433a72b158 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/Team.java
+++ b/core/src/main/java/com/gitplex/server/entity/Team.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import java.util.ArrayList;
import java.util.Collection;
@@ -20,10 +20,10 @@ import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.validator.constraints.NotEmpty;
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.commons.wicket.editable.annotation.Markdown;
-import com.gitplex.server.core.util.validation.DepotName;
+import com.gitplex.server.persistence.AbstractEntity;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.Markdown;
+import com.gitplex.server.util.validation.annotation.DepotName;
@Entity
@Table(
diff --git a/core/src/main/java/com/gitplex/server/core/entity/TeamAuthorization.java b/core/src/main/java/com/gitplex/server/entity/TeamAuthorization.java
similarity index 88%
rename from core/src/main/java/com/gitplex/server/core/entity/TeamAuthorization.java
rename to core/src/main/java/com/gitplex/server/entity/TeamAuthorization.java
index 99aa113807..974f684ebb 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/TeamAuthorization.java
+++ b/core/src/main/java/com/gitplex/server/entity/TeamAuthorization.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -9,8 +9,8 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
+import com.gitplex.server.persistence.AbstractEntity;
+import com.gitplex.server.security.privilege.DepotPrivilege;
@Entity
@Table(
diff --git a/core/src/main/java/com/gitplex/server/core/entity/TeamMembership.java b/core/src/main/java/com/gitplex/server/entity/TeamMembership.java
similarity index 90%
rename from core/src/main/java/com/gitplex/server/core/entity/TeamMembership.java
rename to core/src/main/java/com/gitplex/server/entity/TeamMembership.java
index 47fb7a082d..3499a2ff2c 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/TeamMembership.java
+++ b/core/src/main/java/com/gitplex/server/entity/TeamMembership.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -8,7 +8,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
@Entity
@Table(
diff --git a/core/src/main/java/com/gitplex/server/core/entity/UserAuthorization.java b/core/src/main/java/com/gitplex/server/entity/UserAuthorization.java
similarity index 88%
rename from core/src/main/java/com/gitplex/server/core/entity/UserAuthorization.java
rename to core/src/main/java/com/gitplex/server/entity/UserAuthorization.java
index cc3148754f..87612be2cd 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/UserAuthorization.java
+++ b/core/src/main/java/com/gitplex/server/entity/UserAuthorization.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -9,8 +9,8 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
+import com.gitplex.server.persistence.AbstractEntity;
+import com.gitplex.server.security.privilege.DepotPrivilege;
@Entity
@Table(
diff --git a/core/src/main/java/com/gitplex/server/core/entity/support/CloseInfo.java b/core/src/main/java/com/gitplex/server/entity/support/CloseInfo.java
similarity index 91%
rename from core/src/main/java/com/gitplex/server/core/entity/support/CloseInfo.java
rename to core/src/main/java/com/gitplex/server/entity/support/CloseInfo.java
index 23901d3161..7adfb53aa5 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/support/CloseInfo.java
+++ b/core/src/main/java/com/gitplex/server/entity/support/CloseInfo.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity.support;
+package com.gitplex.server.entity.support;
import java.io.Serializable;
import java.util.Date;
@@ -9,7 +9,7 @@ import javax.persistence.ManyToOne;
import org.hibernate.annotations.OptimisticLock;
-import com.gitplex.server.core.entity.Account;
+import com.gitplex.server.entity.Account;
@Embeddable
public class CloseInfo implements Serializable {
diff --git a/core/src/main/java/com/gitplex/server/core/entity/support/CodeCommentActivity.java b/core/src/main/java/com/gitplex/server/entity/support/CodeCommentActivity.java
similarity index 86%
rename from core/src/main/java/com/gitplex/server/core/entity/support/CodeCommentActivity.java
rename to core/src/main/java/com/gitplex/server/entity/support/CodeCommentActivity.java
index bd11855ae7..599cc8158c 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/support/CodeCommentActivity.java
+++ b/core/src/main/java/com/gitplex/server/entity/support/CodeCommentActivity.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity.support;
+package com.gitplex.server.entity.support;
import java.util.Date;
@@ -10,10 +10,10 @@ import javax.persistence.ManyToOne;
import javax.persistence.MappedSuperclass;
import javax.persistence.Version;
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.CodeComment.ComparingInfo;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.CodeComment.ComparingInfo;
+import com.gitplex.server.persistence.AbstractEntity;
@MappedSuperclass
public abstract class CodeCommentActivity extends AbstractEntity {
diff --git a/core/src/main/java/com/gitplex/server/core/entity/support/CommentPos.java b/core/src/main/java/com/gitplex/server/entity/support/CommentPos.java
similarity index 98%
rename from core/src/main/java/com/gitplex/server/core/entity/support/CommentPos.java
rename to core/src/main/java/com/gitplex/server/entity/support/CommentPos.java
index d0e34b2e5d..a591a4ade0 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/support/CommentPos.java
+++ b/core/src/main/java/com/gitplex/server/entity/support/CommentPos.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity.support;
+package com.gitplex.server.entity.support;
import java.io.Serializable;
diff --git a/core/src/main/java/com/gitplex/server/core/entity/support/CommitMessageTransformSetting.java b/core/src/main/java/com/gitplex/server/entity/support/CommitMessageTransformSetting.java
similarity index 91%
rename from core/src/main/java/com/gitplex/server/core/entity/support/CommitMessageTransformSetting.java
rename to core/src/main/java/com/gitplex/server/entity/support/CommitMessageTransformSetting.java
index 4b0c6f50bb..80f6a48d5d 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/support/CommitMessageTransformSetting.java
+++ b/core/src/main/java/com/gitplex/server/entity/support/CommitMessageTransformSetting.java
@@ -1,10 +1,10 @@
-package com.gitplex.server.core.entity.support;
+package com.gitplex.server.entity.support;
import java.io.Serializable;
import org.hibernate.validator.constraints.NotEmpty;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable
public class CommitMessageTransformSetting implements Serializable {
diff --git a/core/src/main/java/com/gitplex/server/core/entity/support/CompareContext.java b/core/src/main/java/com/gitplex/server/entity/support/CompareContext.java
similarity index 95%
rename from core/src/main/java/com/gitplex/server/core/entity/support/CompareContext.java
rename to core/src/main/java/com/gitplex/server/entity/support/CompareContext.java
index af2747bb9a..0ad37a2ceb 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/support/CompareContext.java
+++ b/core/src/main/java/com/gitplex/server/entity/support/CompareContext.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity.support;
+package com.gitplex.server.entity.support;
import java.io.Serializable;
@@ -9,7 +9,7 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.hibernate.annotations.OptimisticLock;
-import com.gitplex.commons.util.diff.WhitespaceOption;
+import com.gitplex.server.util.diff.WhitespaceOption;
@Embeddable
public class CompareContext implements Serializable {
diff --git a/core/src/main/java/com/gitplex/server/core/entity/support/DepotAndBranch.java b/core/src/main/java/com/gitplex/server/entity/support/DepotAndBranch.java
similarity index 79%
rename from core/src/main/java/com/gitplex/server/core/entity/support/DepotAndBranch.java
rename to core/src/main/java/com/gitplex/server/entity/support/DepotAndBranch.java
index 004c971e97..47ff98cfa8 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/support/DepotAndBranch.java
+++ b/core/src/main/java/com/gitplex/server/entity/support/DepotAndBranch.java
@@ -1,7 +1,7 @@
-package com.gitplex.server.core.entity.support;
+package com.gitplex.server.entity.support;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.git.GitUtils;
public class DepotAndBranch extends DepotAndRevision {
diff --git a/core/src/main/java/com/gitplex/server/core/entity/support/DepotAndRevision.java b/core/src/main/java/com/gitplex/server/entity/support/DepotAndRevision.java
similarity index 93%
rename from core/src/main/java/com/gitplex/server/core/entity/support/DepotAndRevision.java
rename to core/src/main/java/com/gitplex/server/entity/support/DepotAndRevision.java
index 7d50a54fa6..ee7e66d4d7 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/support/DepotAndRevision.java
+++ b/core/src/main/java/com/gitplex/server/entity/support/DepotAndRevision.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity.support;
+package com.gitplex.server.entity.support;
import java.io.Serializable;
@@ -11,10 +11,10 @@ import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.revwalk.RevCommit;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.DepotManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.manager.DepotManager;
public class DepotAndRevision implements Serializable {
diff --git a/core/src/main/java/com/gitplex/server/core/entity/support/IntegrationPolicy.java b/core/src/main/java/com/gitplex/server/entity/support/IntegrationPolicy.java
similarity index 92%
rename from core/src/main/java/com/gitplex/server/core/entity/support/IntegrationPolicy.java
rename to core/src/main/java/com/gitplex/server/entity/support/IntegrationPolicy.java
index 2eb0440b8d..04a919eccd 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/support/IntegrationPolicy.java
+++ b/core/src/main/java/com/gitplex/server/entity/support/IntegrationPolicy.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity.support;
+package com.gitplex.server.entity.support;
import java.io.Serializable;
import java.util.ArrayList;
@@ -9,18 +9,18 @@ import javax.validation.constraints.Size;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.validator.constraints.NotEmpty;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.commons.wicket.editable.annotation.Horizontal;
-import com.gitplex.server.core.util.includeexclude.IncludeExcludeParser;
-import com.gitplex.server.core.annotation.BranchMatch;
-import com.gitplex.server.core.annotation.FullBranchMatch;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest.IntegrationStrategy;
-import com.gitplex.server.core.util.fullbranchmatch.FullBranchMatchUtils;
-import com.gitplex.server.core.util.includeexclude.IncludeExcludeUtils;
-import com.gitplex.server.core.util.fullbranchmatch.FullBranchMatchParser.CriteriaContext;
-import com.gitplex.server.core.util.fullbranchmatch.FullBranchMatchParser.FullBranchMatchContext;
+import com.gitplex.server.util.includeexclude.IncludeExcludeParser;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest.IntegrationStrategy;
+import com.gitplex.server.util.editable.annotation.BranchMatch;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.FullBranchMatch;
+import com.gitplex.server.util.editable.annotation.Horizontal;
+import com.gitplex.server.util.fullbranchmatch.FullBranchMatchUtils;
+import com.gitplex.server.util.includeexclude.IncludeExcludeUtils;
+import com.gitplex.server.util.fullbranchmatch.FullBranchMatchParser.CriteriaContext;
+import com.gitplex.server.util.fullbranchmatch.FullBranchMatchParser.FullBranchMatchContext;
@Editable
@Horizontal
diff --git a/core/src/main/java/com/gitplex/server/core/entity/support/IntegrationPreview.java b/core/src/main/java/com/gitplex/server/entity/support/IntegrationPreview.java
similarity index 92%
rename from core/src/main/java/com/gitplex/server/core/entity/support/IntegrationPreview.java
rename to core/src/main/java/com/gitplex/server/entity/support/IntegrationPreview.java
index 282c18198e..486d04bd97 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/support/IntegrationPreview.java
+++ b/core/src/main/java/com/gitplex/server/entity/support/IntegrationPreview.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity.support;
+package com.gitplex.server.entity.support;
import java.io.Serializable;
@@ -8,8 +8,8 @@ import javax.persistence.Embeddable;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequest.IntegrationStrategy;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequest.IntegrationStrategy;
@SuppressWarnings("serial")
@Embeddable
diff --git a/core/src/main/java/com/gitplex/server/core/entity/support/LastEvent.java b/core/src/main/java/com/gitplex/server/entity/support/LastEvent.java
similarity index 90%
rename from core/src/main/java/com/gitplex/server/core/entity/support/LastEvent.java
rename to core/src/main/java/com/gitplex/server/entity/support/LastEvent.java
index 254dc088e5..3a63207cc5 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/support/LastEvent.java
+++ b/core/src/main/java/com/gitplex/server/entity/support/LastEvent.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity.support;
+package com.gitplex.server.entity.support;
import java.io.Serializable;
import java.util.Date;
@@ -9,7 +9,7 @@ import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
-import com.gitplex.server.core.entity.Account;
+import com.gitplex.server.entity.Account;
@Embeddable
public class LastEvent implements Serializable {
diff --git a/core/src/main/java/com/gitplex/server/core/entity/support/TextRange.java b/core/src/main/java/com/gitplex/server/entity/support/TextRange.java
similarity index 98%
rename from core/src/main/java/com/gitplex/server/core/entity/support/TextRange.java
rename to core/src/main/java/com/gitplex/server/entity/support/TextRange.java
index 0a222eb71d..d1ee6d6924 100644
--- a/core/src/main/java/com/gitplex/server/core/entity/support/TextRange.java
+++ b/core/src/main/java/com/gitplex/server/entity/support/TextRange.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity.support;
+package com.gitplex.server.entity.support;
import java.io.Serializable;
diff --git a/core/src/main/java/com/gitplex/server/core/setting/BackupSetting.java b/core/src/main/java/com/gitplex/server/entity/support/setting/BackupSetting.java
similarity index 87%
rename from core/src/main/java/com/gitplex/server/core/setting/BackupSetting.java
rename to core/src/main/java/com/gitplex/server/entity/support/setting/BackupSetting.java
index 9516db53af..91461c98c0 100644
--- a/core/src/main/java/com/gitplex/server/core/setting/BackupSetting.java
+++ b/core/src/main/java/com/gitplex/server/entity/support/setting/BackupSetting.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.setting;
+package com.gitplex.server.entity.support.setting;
import java.io.Serializable;
import java.text.ParseException;
@@ -8,10 +8,10 @@ import javax.validation.ConstraintValidatorContext;
import org.hibernate.validator.constraints.NotEmpty;
import org.quartz.CronExpression;
-import com.gitplex.commons.validation.ClassValidating;
-import com.gitplex.commons.validation.Directory;
-import com.gitplex.commons.validation.Validatable;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.validation.Validatable;
+import com.gitplex.server.util.validation.annotation.ClassValidating;
+import com.gitplex.server.util.validation.annotation.Directory;
@Editable
@ClassValidating
diff --git a/core/src/main/java/com/gitplex/server/core/setting/MailSetting.java b/core/src/main/java/com/gitplex/server/entity/support/setting/MailSetting.java
similarity index 93%
rename from core/src/main/java/com/gitplex/server/core/setting/MailSetting.java
rename to core/src/main/java/com/gitplex/server/entity/support/setting/MailSetting.java
index e74308b4f6..fb2f8b8baa 100644
--- a/core/src/main/java/com/gitplex/server/core/setting/MailSetting.java
+++ b/core/src/main/java/com/gitplex/server/entity/support/setting/MailSetting.java
@@ -1,11 +1,11 @@
-package com.gitplex.server.core.setting;
+package com.gitplex.server.entity.support.setting;
import java.io.Serializable;
import org.hibernate.validator.constraints.NotEmpty;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.commons.wicket.editable.annotation.Password;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.Password;
@Editable
public class MailSetting implements Serializable {
diff --git a/core/src/main/java/com/gitplex/server/core/setting/SecuritySetting.java b/core/src/main/java/com/gitplex/server/entity/support/setting/SecuritySetting.java
similarity index 80%
rename from core/src/main/java/com/gitplex/server/core/setting/SecuritySetting.java
rename to core/src/main/java/com/gitplex/server/entity/support/setting/SecuritySetting.java
index 9641e54f6b..e8f32f775b 100644
--- a/core/src/main/java/com/gitplex/server/core/setting/SecuritySetting.java
+++ b/core/src/main/java/com/gitplex/server/entity/support/setting/SecuritySetting.java
@@ -1,8 +1,8 @@
-package com.gitplex.server.core.setting;
+package com.gitplex.server.entity.support.setting;
import java.io.Serializable;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable
public class SecuritySetting implements Serializable {
diff --git a/core/src/main/java/com/gitplex/server/core/setting/SystemSetting.java b/core/src/main/java/com/gitplex/server/entity/support/setting/SystemSetting.java
similarity index 83%
rename from core/src/main/java/com/gitplex/server/core/setting/SystemSetting.java
rename to core/src/main/java/com/gitplex/server/entity/support/setting/SystemSetting.java
index 16e99baafc..344fb2d1de 100644
--- a/core/src/main/java/com/gitplex/server/core/setting/SystemSetting.java
+++ b/core/src/main/java/com/gitplex/server/entity/support/setting/SystemSetting.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.setting;
+package com.gitplex.server.entity.support.setting;
import java.io.Serializable;
@@ -9,11 +9,12 @@ import javax.validation.constraints.NotNull;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.validator.constraints.NotEmpty;
-import com.gitplex.commons.git.GitConfig;
-import com.gitplex.commons.validation.ClassValidating;
-import com.gitplex.commons.validation.Directory;
-import com.gitplex.commons.validation.Validatable;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
+import com.gitplex.server.git.config.GitConfig;
+import com.gitplex.server.git.config.SystemGit;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.validation.Validatable;
+import com.gitplex.server.util.validation.annotation.ClassValidating;
+import com.gitplex.server.util.validation.annotation.Directory;
@Editable
@ClassValidating
diff --git a/core/src/main/java/com/gitplex/server/core/event/MarkdownAware.java b/core/src/main/java/com/gitplex/server/event/MarkdownAware.java
similarity index 72%
rename from core/src/main/java/com/gitplex/server/core/event/MarkdownAware.java
rename to core/src/main/java/com/gitplex/server/event/MarkdownAware.java
index 0512a65187..8d533f1056 100644
--- a/core/src/main/java/com/gitplex/server/core/event/MarkdownAware.java
+++ b/core/src/main/java/com/gitplex/server/event/MarkdownAware.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.event;
+package com.gitplex.server.event;
import javax.annotation.Nullable;
diff --git a/core/src/main/java/com/gitplex/server/core/event/RefUpdated.java b/core/src/main/java/com/gitplex/server/event/RefUpdated.java
similarity index 88%
rename from core/src/main/java/com/gitplex/server/core/event/RefUpdated.java
rename to core/src/main/java/com/gitplex/server/event/RefUpdated.java
index dcea89a1f6..c8a526c053 100644
--- a/core/src/main/java/com/gitplex/server/core/event/RefUpdated.java
+++ b/core/src/main/java/com/gitplex/server/event/RefUpdated.java
@@ -1,8 +1,8 @@
-package com.gitplex.server.core.event;
+package com.gitplex.server.event;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
public class RefUpdated {
diff --git a/core/src/main/java/com/gitplex/server/core/event/TaskChangeEvent.java b/core/src/main/java/com/gitplex/server/event/TaskChangeEvent.java
similarity index 67%
rename from core/src/main/java/com/gitplex/server/core/event/TaskChangeEvent.java
rename to core/src/main/java/com/gitplex/server/event/TaskChangeEvent.java
index 4de96148bc..59b3b6bd2f 100644
--- a/core/src/main/java/com/gitplex/server/core/event/TaskChangeEvent.java
+++ b/core/src/main/java/com/gitplex/server/event/TaskChangeEvent.java
@@ -1,6 +1,6 @@
-package com.gitplex.server.core.event;
+package com.gitplex.server.event;
-import com.gitplex.server.core.entity.Account;
+import com.gitplex.server.entity.Account;
public class TaskChangeEvent {
diff --git a/core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentActivityEvent.java b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentActivityEvent.java
similarity index 69%
rename from core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentActivityEvent.java
rename to core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentActivityEvent.java
index 0cac98dab7..ebad62650e 100644
--- a/core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentActivityEvent.java
+++ b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentActivityEvent.java
@@ -1,11 +1,11 @@
-package com.gitplex.server.core.event.codecomment;
+package com.gitplex.server.event.codecomment;
import java.util.Date;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.support.CodeCommentActivity;
-import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentActivityEvent;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.support.CodeCommentActivity;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;
public abstract class CodeCommentActivityEvent extends CodeCommentEvent {
diff --git a/core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentCreated.java b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentCreated.java
similarity index 66%
rename from core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentCreated.java
rename to core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentCreated.java
index ad8c092c15..b8681120ed 100644
--- a/core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentCreated.java
+++ b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentCreated.java
@@ -1,10 +1,10 @@
-package com.gitplex.server.core.event.codecomment;
+package com.gitplex.server.event.codecomment;
import java.util.Date;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.CodeComment;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable(name="created")
public class CodeCommentCreated extends CodeCommentEvent {
diff --git a/core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentEvent.java b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentEvent.java
similarity index 70%
rename from core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentEvent.java
rename to core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentEvent.java
index 0e9af02495..3a6fb851d9 100644
--- a/core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentEvent.java
+++ b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentEvent.java
@@ -1,10 +1,10 @@
-package com.gitplex.server.core.event.codecomment;
+package com.gitplex.server.event.codecomment;
import java.util.Date;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.event.MarkdownAware;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.event.MarkdownAware;
public abstract class CodeCommentEvent implements MarkdownAware {
diff --git a/core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentReplied.java b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentReplied.java
similarity index 53%
rename from core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentReplied.java
rename to core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentReplied.java
index c8904e3604..6bd1a37d1f 100644
--- a/core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentReplied.java
+++ b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentReplied.java
@@ -1,10 +1,10 @@
-package com.gitplex.server.core.event.codecomment;
+package com.gitplex.server.event.codecomment;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.CodeCommentReply;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentActivityEvent;
-import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentReplied;
+import com.gitplex.server.entity.CodeCommentReply;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentReplied;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable(name="replied")
public class CodeCommentReplied extends CodeCommentActivityEvent {
diff --git a/core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentResolved.java b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentResolved.java
similarity index 55%
rename from core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentResolved.java
rename to core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentResolved.java
index 7190ba9ec0..b79078c040 100644
--- a/core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentResolved.java
+++ b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentResolved.java
@@ -1,10 +1,10 @@
-package com.gitplex.server.core.event.codecomment;
+package com.gitplex.server.event.codecomment;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.CodeCommentStatusChange;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentActivityEvent;
-import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentResolved;
+import com.gitplex.server.entity.CodeCommentStatusChange;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentResolved;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable(name="resolved")
public class CodeCommentResolved extends CodeCommentActivityEvent {
diff --git a/core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentUnresolved.java b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentUnresolved.java
similarity index 55%
rename from core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentUnresolved.java
rename to core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentUnresolved.java
index 15fa5d6395..c62785f19c 100644
--- a/core/src/main/java/com/gitplex/server/core/event/codecomment/CodeCommentUnresolved.java
+++ b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentUnresolved.java
@@ -1,10 +1,10 @@
-package com.gitplex.server.core.event.codecomment;
+package com.gitplex.server.event.codecomment;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.CodeCommentStatusChange;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentActivityEvent;
-import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentUnresolved;
+import com.gitplex.server.entity.CodeCommentStatusChange;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentUnresolved;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable(name="unresolved")
public class CodeCommentUnresolved extends CodeCommentActivityEvent {
diff --git a/core/src/main/java/com/gitplex/server/core/event/depot/DepotDeleted.java b/core/src/main/java/com/gitplex/server/event/depot/DepotDeleted.java
similarity index 65%
rename from core/src/main/java/com/gitplex/server/core/event/depot/DepotDeleted.java
rename to core/src/main/java/com/gitplex/server/event/depot/DepotDeleted.java
index 016d697616..e23f6d43a2 100644
--- a/core/src/main/java/com/gitplex/server/core/event/depot/DepotDeleted.java
+++ b/core/src/main/java/com/gitplex/server/event/depot/DepotDeleted.java
@@ -1,6 +1,6 @@
-package com.gitplex.server.core.event.depot;
+package com.gitplex.server.event.depot;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
public class DepotDeleted {
diff --git a/core/src/main/java/com/gitplex/server/core/event/depot/DepotRenamed.java b/core/src/main/java/com/gitplex/server/event/depot/DepotRenamed.java
similarity index 76%
rename from core/src/main/java/com/gitplex/server/core/event/depot/DepotRenamed.java
rename to core/src/main/java/com/gitplex/server/event/depot/DepotRenamed.java
index 83776c8ebb..d45646cea7 100644
--- a/core/src/main/java/com/gitplex/server/core/event/depot/DepotRenamed.java
+++ b/core/src/main/java/com/gitplex/server/event/depot/DepotRenamed.java
@@ -1,6 +1,6 @@
-package com.gitplex.server.core.event.depot;
+package com.gitplex.server.event.depot;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
public class DepotRenamed {
diff --git a/core/src/main/java/com/gitplex/server/core/event/depot/DepotTransferred.java b/core/src/main/java/com/gitplex/server/event/depot/DepotTransferred.java
similarity index 70%
rename from core/src/main/java/com/gitplex/server/core/event/depot/DepotTransferred.java
rename to core/src/main/java/com/gitplex/server/event/depot/DepotTransferred.java
index daaa8a6db1..6ee542b1f2 100644
--- a/core/src/main/java/com/gitplex/server/core/event/depot/DepotTransferred.java
+++ b/core/src/main/java/com/gitplex/server/event/depot/DepotTransferred.java
@@ -1,7 +1,7 @@
-package com.gitplex.server.core.event.depot;
+package com.gitplex.server.event.depot;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
public class DepotTransferred {
diff --git a/core/src/main/java/com/gitplex/server/event/lifecycle/SystemStarted.java b/core/src/main/java/com/gitplex/server/event/lifecycle/SystemStarted.java
new file mode 100644
index 0000000000..0ec02dfaac
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/event/lifecycle/SystemStarted.java
@@ -0,0 +1,5 @@
+package com.gitplex.server.event.lifecycle;
+
+public class SystemStarted {
+
+}
diff --git a/core/src/main/java/com/gitplex/server/event/lifecycle/SystemStarting.java b/core/src/main/java/com/gitplex/server/event/lifecycle/SystemStarting.java
new file mode 100644
index 0000000000..153f275885
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/event/lifecycle/SystemStarting.java
@@ -0,0 +1,5 @@
+package com.gitplex.server.event.lifecycle;
+
+public class SystemStarting {
+
+}
diff --git a/core/src/main/java/com/gitplex/server/event/lifecycle/SystemStopped.java b/core/src/main/java/com/gitplex/server/event/lifecycle/SystemStopped.java
new file mode 100644
index 0000000000..162f4d9bc6
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/event/lifecycle/SystemStopped.java
@@ -0,0 +1,5 @@
+package com.gitplex.server.event.lifecycle;
+
+public class SystemStopped {
+
+}
diff --git a/core/src/main/java/com/gitplex/server/event/lifecycle/SystemStopping.java b/core/src/main/java/com/gitplex/server/event/lifecycle/SystemStopping.java
new file mode 100644
index 0000000000..9bcf08a0a5
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/event/lifecycle/SystemStopping.java
@@ -0,0 +1,5 @@
+package com.gitplex.server.event.lifecycle;
+
+public class SystemStopping {
+
+}
diff --git a/core/src/main/java/com/gitplex/server/core/event/pullrequest/IntegrationPreviewCalculated.java b/core/src/main/java/com/gitplex/server/event/pullrequest/IntegrationPreviewCalculated.java
similarity index 69%
rename from core/src/main/java/com/gitplex/server/core/event/pullrequest/IntegrationPreviewCalculated.java
rename to core/src/main/java/com/gitplex/server/event/pullrequest/IntegrationPreviewCalculated.java
index 0bde0007ba..a4cee3045c 100644
--- a/core/src/main/java/com/gitplex/server/core/event/pullrequest/IntegrationPreviewCalculated.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/IntegrationPreviewCalculated.java
@@ -1,9 +1,9 @@
-package com.gitplex.server.core.event.pullrequest;
+package com.gitplex.server.event.pullrequest;
import java.util.Date;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.PullRequest;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.PullRequest;
public class IntegrationPreviewCalculated extends PullRequestChangeEvent {
diff --git a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestChangeEvent.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestChangeEvent.java
similarity index 66%
rename from core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestChangeEvent.java
rename to core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestChangeEvent.java
index b96023e703..d2642159ba 100644
--- a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestChangeEvent.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestChangeEvent.java
@@ -1,11 +1,11 @@
-package com.gitplex.server.core.event.pullrequest;
+package com.gitplex.server.event.pullrequest;
import java.util.Date;
import javax.annotation.Nullable;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.PullRequest;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.PullRequest;
public abstract class PullRequestChangeEvent extends PullRequestEvent {
diff --git a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentActivityEvent.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentActivityEvent.java
similarity index 74%
rename from core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentActivityEvent.java
rename to core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentActivityEvent.java
index 9251d735d3..e1a215bec8 100644
--- a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentActivityEvent.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentActivityEvent.java
@@ -1,10 +1,10 @@
-package com.gitplex.server.core.event.pullrequest;
+package com.gitplex.server.event.pullrequest;
import java.util.Date;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.support.CodeCommentActivity;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.support.CodeCommentActivity;
public abstract class PullRequestCodeCommentActivityEvent extends PullRequestCodeCommentEvent {
diff --git a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentCreated.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentCreated.java
similarity index 61%
rename from core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentCreated.java
rename to core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentCreated.java
index 53cd84730b..196defdce3 100644
--- a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentCreated.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentCreated.java
@@ -1,12 +1,12 @@
-package com.gitplex.server.core.event.pullrequest;
+package com.gitplex.server.event.pullrequest;
import java.util.Date;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.event.MarkdownAware;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.event.MarkdownAware;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable(name="commented code")
public class PullRequestCodeCommentCreated extends PullRequestCodeCommentEvent implements MarkdownAware {
diff --git a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentEvent.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentEvent.java
similarity index 62%
rename from core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentEvent.java
rename to core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentEvent.java
index 468d6fb36b..4637c12e80 100644
--- a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentEvent.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentEvent.java
@@ -1,8 +1,8 @@
-package com.gitplex.server.core.event.pullrequest;
+package com.gitplex.server.event.pullrequest;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.event.MarkdownAware;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.event.MarkdownAware;
public abstract class PullRequestCodeCommentEvent extends PullRequestChangeEvent implements MarkdownAware {
diff --git a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentReplied.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentReplied.java
similarity index 60%
rename from core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentReplied.java
rename to core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentReplied.java
index 7ca1848b73..ada6f1af83 100644
--- a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentReplied.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentReplied.java
@@ -1,8 +1,8 @@
-package com.gitplex.server.core.event.pullrequest;
+package com.gitplex.server.event.pullrequest;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.CodeCommentReply;
-import com.gitplex.server.core.entity.PullRequest;
+import com.gitplex.server.entity.CodeCommentReply;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable(name="replied code comment")
public class PullRequestCodeCommentReplied extends PullRequestCodeCommentActivityEvent {
diff --git a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentResolved.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentResolved.java
similarity index 62%
rename from core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentResolved.java
rename to core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentResolved.java
index 323fc8f9f6..b2eac36cb1 100644
--- a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentResolved.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentResolved.java
@@ -1,8 +1,8 @@
-package com.gitplex.server.core.event.pullrequest;
+package com.gitplex.server.event.pullrequest;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.CodeCommentStatusChange;
-import com.gitplex.server.core.entity.PullRequest;
+import com.gitplex.server.entity.CodeCommentStatusChange;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable(name="resolved code comment")
public class PullRequestCodeCommentResolved extends PullRequestCodeCommentActivityEvent {
diff --git a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentUnresolved.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentUnresolved.java
similarity index 62%
rename from core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentUnresolved.java
rename to core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentUnresolved.java
index f221efab15..0366205807 100644
--- a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCodeCommentUnresolved.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentUnresolved.java
@@ -1,8 +1,8 @@
-package com.gitplex.server.core.event.pullrequest;
+package com.gitplex.server.event.pullrequest;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.CodeCommentStatusChange;
-import com.gitplex.server.core.entity.PullRequest;
+import com.gitplex.server.entity.CodeCommentStatusChange;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable(name="Unresolved code comment")
public class PullRequestCodeCommentUnresolved extends PullRequestCodeCommentActivityEvent {
diff --git a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCommentCreated.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCommentCreated.java
similarity index 69%
rename from core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCommentCreated.java
rename to core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCommentCreated.java
index 67d9e84009..c8b1f1b86a 100644
--- a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestCommentCreated.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCommentCreated.java
@@ -1,11 +1,11 @@
-package com.gitplex.server.core.event.pullrequest;
+package com.gitplex.server.event.pullrequest;
import java.util.Date;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.PullRequestComment;
-import com.gitplex.server.core.event.MarkdownAware;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.PullRequestComment;
+import com.gitplex.server.event.MarkdownAware;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable(name="commented")
public class PullRequestCommentCreated extends PullRequestChangeEvent implements MarkdownAware {
diff --git a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestEvent.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestEvent.java
similarity index 68%
rename from core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestEvent.java
rename to core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestEvent.java
index 00081382d2..3b720f8c2c 100644
--- a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestEvent.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestEvent.java
@@ -1,6 +1,6 @@
-package com.gitplex.server.core.event.pullrequest;
+package com.gitplex.server.event.pullrequest;
-import com.gitplex.server.core.entity.PullRequest;
+import com.gitplex.server.entity.PullRequest;
public abstract class PullRequestEvent {
diff --git a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestOpened.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestOpened.java
similarity index 63%
rename from core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestOpened.java
rename to core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestOpened.java
index 2c79fe0a5c..fb5efc2b4d 100644
--- a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestOpened.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestOpened.java
@@ -1,11 +1,11 @@
-package com.gitplex.server.core.event.pullrequest;
+package com.gitplex.server.event.pullrequest;
import java.util.Date;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.event.MarkdownAware;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.event.MarkdownAware;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable(name="opened")
public class PullRequestOpened extends PullRequestChangeEvent implements MarkdownAware {
diff --git a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestPendingApproval.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingApproval.java
similarity index 59%
rename from core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestPendingApproval.java
rename to core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingApproval.java
index 32f37b4837..60e4cd6e3f 100644
--- a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestPendingApproval.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingApproval.java
@@ -1,6 +1,6 @@
-package com.gitplex.server.core.event.pullrequest;
+package com.gitplex.server.event.pullrequest;
-import com.gitplex.server.core.entity.PullRequest;
+import com.gitplex.server.entity.PullRequest;
public class PullRequestPendingApproval extends PullRequestEvent {
diff --git a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestPendingIntegration.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingIntegration.java
similarity index 60%
rename from core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestPendingIntegration.java
rename to core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingIntegration.java
index bb8237c558..206bd920ea 100644
--- a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestPendingIntegration.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingIntegration.java
@@ -1,6 +1,6 @@
-package com.gitplex.server.core.event.pullrequest;
+package com.gitplex.server.event.pullrequest;
-import com.gitplex.server.core.entity.PullRequest;
+import com.gitplex.server.entity.PullRequest;
public class PullRequestPendingIntegration extends PullRequestEvent {
diff --git a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestPendingUpdate.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingUpdate.java
similarity index 59%
rename from core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestPendingUpdate.java
rename to core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingUpdate.java
index 262416d2a9..a3a2d4ac02 100644
--- a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestPendingUpdate.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestPendingUpdate.java
@@ -1,6 +1,6 @@
-package com.gitplex.server.core.event.pullrequest;
+package com.gitplex.server.event.pullrequest;
-import com.gitplex.server.core.entity.PullRequest;
+import com.gitplex.server.entity.PullRequest;
public class PullRequestPendingUpdate extends PullRequestEvent {
diff --git a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestReviewInvitationChanged.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestReviewInvitationChanged.java
similarity index 75%
rename from core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestReviewInvitationChanged.java
rename to core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestReviewInvitationChanged.java
index b18e425e22..abf3dfdfd2 100644
--- a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestReviewInvitationChanged.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestReviewInvitationChanged.java
@@ -1,6 +1,6 @@
-package com.gitplex.server.core.event.pullrequest;
+package com.gitplex.server.event.pullrequest;
-import com.gitplex.server.core.entity.PullRequestReviewInvitation;
+import com.gitplex.server.entity.PullRequestReviewInvitation;
public class PullRequestReviewInvitationChanged extends PullRequestEvent {
diff --git a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestStatusChangeEvent.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestStatusChangeEvent.java
similarity index 75%
rename from core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestStatusChangeEvent.java
rename to core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestStatusChangeEvent.java
index c94edd3f3d..b9be94777a 100644
--- a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestStatusChangeEvent.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestStatusChangeEvent.java
@@ -1,10 +1,10 @@
-package com.gitplex.server.core.event.pullrequest;
+package com.gitplex.server.event.pullrequest;
import java.util.Date;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.PullRequestStatusChange;
-import com.gitplex.server.core.event.MarkdownAware;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.PullRequestStatusChange;
+import com.gitplex.server.event.MarkdownAware;
public class PullRequestStatusChangeEvent extends PullRequestChangeEvent implements MarkdownAware {
diff --git a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestUpdated.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestUpdated.java
similarity index 68%
rename from core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestUpdated.java
rename to core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestUpdated.java
index 68a4c77ca0..335336459a 100644
--- a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestUpdated.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestUpdated.java
@@ -1,10 +1,10 @@
-package com.gitplex.server.core.event.pullrequest;
+package com.gitplex.server.event.pullrequest;
import java.util.Date;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.PullRequestUpdate;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.PullRequestUpdate;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable(name="has new commits")
public class PullRequestUpdated extends PullRequestChangeEvent {
diff --git a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestVerificationRunning.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationRunning.java
similarity index 72%
rename from core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestVerificationRunning.java
rename to core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationRunning.java
index 63ad028ae9..8b18cec4d8 100644
--- a/core/src/main/java/com/gitplex/server/core/event/pullrequest/PullRequestVerificationRunning.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationRunning.java
@@ -1,10 +1,10 @@
-package com.gitplex.server.core.event.pullrequest;
+package com.gitplex.server.event.pullrequest;
import java.util.Date;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.PullRequestVerification;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.PullRequestVerification;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable(name="ran verification", icon="fa fa-cog")
public class PullRequestVerificationRunning extends PullRequestChangeEvent {
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/AbstractGateKeeper.java b/core/src/main/java/com/gitplex/server/gatekeeper/AbstractGateKeeper.java
similarity index 85%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/AbstractGateKeeper.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/AbstractGateKeeper.java
index d5fbc223e9..b82e6ccbb6 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/AbstractGateKeeper.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/AbstractGateKeeper.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import java.util.List;
@@ -6,15 +6,15 @@ import javax.annotation.Nullable;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.gatekeeper.checkresult.Failed;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
-import com.gitplex.server.core.gatekeeper.checkresult.Ignored;
-import com.gitplex.server.core.gatekeeper.checkresult.Passed;
-import com.gitplex.server.core.gatekeeper.checkresult.Pending;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.gatekeeper.checkresult.Failed;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.gatekeeper.checkresult.Ignored;
+import com.gitplex.server.gatekeeper.checkresult.Passed;
+import com.gitplex.server.gatekeeper.checkresult.Pending;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable
public abstract class AbstractGateKeeper implements GateKeeper {
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/AndGateKeeper.java b/core/src/main/java/com/gitplex/server/gatekeeper/AndGateKeeper.java
similarity index 70%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/AndGateKeeper.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/AndGateKeeper.java
index 0313967a0b..1186be6172 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/AndGateKeeper.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/AndGateKeeper.java
@@ -1,14 +1,14 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import java.util.ArrayList;
import java.util.List;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.commons.wicket.editable.annotation.Horizontal;
-import com.gitplex.server.core.gatekeeper.checkresult.Failed;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
-import com.gitplex.server.core.gatekeeper.checkresult.Passed;
-import com.gitplex.server.core.gatekeeper.checkresult.Pending;
+import com.gitplex.server.gatekeeper.checkresult.Failed;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.gatekeeper.checkresult.Passed;
+import com.gitplex.server.gatekeeper.checkresult.Pending;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.Horizontal;
@Editable(name="And Composition", icon="fa-object-group", order=100,
category=GateKeeper.CATEGORY_COMPOSITION,
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/AndOrGateKeeper.java b/core/src/main/java/com/gitplex/server/gatekeeper/AndOrGateKeeper.java
similarity index 94%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/AndOrGateKeeper.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/AndOrGateKeeper.java
index eeee92463f..31c8489889 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/AndOrGateKeeper.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/AndOrGateKeeper.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import java.util.ArrayList;
import java.util.Iterator;
@@ -7,8 +7,8 @@ import java.util.List;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
public abstract class AndOrGateKeeper extends CompositeGateKeeper {
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/ApprovedBySpecifiedTeam.java b/core/src/main/java/com/gitplex/server/gatekeeper/ApprovedBySpecifiedTeam.java
similarity index 87%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/ApprovedBySpecifiedTeam.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/ApprovedBySpecifiedTeam.java
index 4ad7a59ded..719547719d 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/ApprovedBySpecifiedTeam.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/ApprovedBySpecifiedTeam.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import java.util.Collection;
@@ -6,13 +6,13 @@ import javax.validation.constraints.Min;
import org.eclipse.jgit.lib.ObjectId;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestReview;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.util.editable.annotation.Editable;
import com.google.common.collect.Lists;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestReview;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
@Editable(order=100, icon="fa-group", category=GateKeeper.CATEGORY_USER, description=
"This gatekeeper will be passed if the commit is approved by specified number of users "
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/ApprovedBySpecifiedUser.java b/core/src/main/java/com/gitplex/server/gatekeeper/ApprovedBySpecifiedUser.java
similarity index 82%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/ApprovedBySpecifiedUser.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/ApprovedBySpecifiedUser.java
index b65c241e7f..c14095b87b 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/ApprovedBySpecifiedUser.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/ApprovedBySpecifiedUser.java
@@ -1,20 +1,20 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import org.eclipse.jgit.lib.ObjectId;
import org.hibernate.validator.constraints.NotEmpty;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestReview;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.util.editable.annotation.AccountChoice;
+import com.gitplex.server.util.editable.annotation.Editable;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.annotation.AccountChoice;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestReview;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
-import com.gitplex.server.core.manager.AccountManager;
@Editable(order=200, icon="fa-user", category=GateKeeper.CATEGORY_USER, description=
"This gatekeeper will be passed if the commit is approved by specified user")
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/CompositeGateKeeper.java b/core/src/main/java/com/gitplex/server/gatekeeper/CompositeGateKeeper.java
similarity index 83%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/CompositeGateKeeper.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/CompositeGateKeeper.java
index f4822f653d..da6ce3dfd9 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/CompositeGateKeeper.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/CompositeGateKeeper.java
@@ -1,11 +1,11 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
public abstract class CompositeGateKeeper extends AbstractGateKeeper {
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/ConditionalGateKeeper.java b/core/src/main/java/com/gitplex/server/gatekeeper/ConditionalGateKeeper.java
similarity index 84%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/ConditionalGateKeeper.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/ConditionalGateKeeper.java
index 9b88f85998..a8dbe68e12 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/ConditionalGateKeeper.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/ConditionalGateKeeper.java
@@ -1,16 +1,16 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.commons.wicket.editable.annotation.Horizontal;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.gatekeeper.checkresult.Failed;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
-import com.gitplex.server.core.gatekeeper.checkresult.Passed;
-import com.gitplex.server.core.gatekeeper.checkresult.Pending;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.gatekeeper.checkresult.Failed;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.gatekeeper.checkresult.Passed;
+import com.gitplex.server.gatekeeper.checkresult.Pending;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.Horizontal;
@Editable(name="Conditional Composition", order=300, icon="fa-object-group",
category=GateKeeper.CATEGORY_COMPOSITION,
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/DefaultGateKeeper.java b/core/src/main/java/com/gitplex/server/gatekeeper/DefaultGateKeeper.java
similarity index 63%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/DefaultGateKeeper.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/DefaultGateKeeper.java
index ee17d17493..c1852fa165 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/DefaultGateKeeper.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/DefaultGateKeeper.java
@@ -1,12 +1,12 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable
public class DefaultGateKeeper extends AbstractGateKeeper {
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/DisapprovedBySpecifiedTeam.java b/core/src/main/java/com/gitplex/server/gatekeeper/DisapprovedBySpecifiedTeam.java
similarity index 85%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/DisapprovedBySpecifiedTeam.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/DisapprovedBySpecifiedTeam.java
index 0ac0adf348..4d968d8d3c 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/DisapprovedBySpecifiedTeam.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/DisapprovedBySpecifiedTeam.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import java.util.Collection;
@@ -6,13 +6,13 @@ import javax.validation.constraints.Min;
import org.eclipse.jgit.lib.ObjectId;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestReview;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.util.editable.annotation.Editable;
import com.google.common.collect.Lists;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestReview;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
@Editable(order=300, icon="fa-group", category=GateKeeper.CATEGORY_USER, description=
"This gatekeeper will be passed if the commit gets specified number "
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/DisapprovedBySpecifiedUser.java b/core/src/main/java/com/gitplex/server/gatekeeper/DisapprovedBySpecifiedUser.java
similarity index 78%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/DisapprovedBySpecifiedUser.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/DisapprovedBySpecifiedUser.java
index 69cb17876f..07ed26e247 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/DisapprovedBySpecifiedUser.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/DisapprovedBySpecifiedUser.java
@@ -1,19 +1,19 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import org.eclipse.jgit.lib.ObjectId;
import org.hibernate.validator.constraints.NotEmpty;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestReview;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.util.editable.annotation.AccountChoice;
+import com.gitplex.server.util.editable.annotation.Editable;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.annotation.AccountChoice;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestReview;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
-import com.gitplex.server.core.manager.AccountManager;
@Editable(order=300, icon="fa-user", category=GateKeeper.CATEGORY_USER, description=
"This gatekeeper will be passed if the commit is disapproved by specified user. "
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/GateKeeper.java b/core/src/main/java/com/gitplex/server/gatekeeper/GateKeeper.java
similarity index 86%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/GateKeeper.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/GateKeeper.java
index a003deb904..aecf65d137 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/GateKeeper.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/GateKeeper.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import java.io.Serializable;
@@ -6,11 +6,11 @@ import javax.annotation.Nullable;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable(name="Misc")
public interface GateKeeper extends Serializable {
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/NotGateKeeper.java b/core/src/main/java/com/gitplex/server/gatekeeper/NotGateKeeper.java
similarity index 81%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/NotGateKeeper.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/NotGateKeeper.java
index 6db837bdbf..45582db073 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/NotGateKeeper.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/NotGateKeeper.java
@@ -1,15 +1,15 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.commons.wicket.editable.annotation.Horizontal;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.gatekeeper.checkresult.Failed;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
-import com.gitplex.server.core.gatekeeper.checkresult.Passed;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.gatekeeper.checkresult.Failed;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.gatekeeper.checkresult.Passed;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.Horizontal;
@Editable(name="Not Composition", order=400, icon="fa-object-group", category=GateKeeper.CATEGORY_COMPOSITION,
description="This gatekeeper will be passed if contained gatekeeper is not passed")
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/OrGateKeeper.java b/core/src/main/java/com/gitplex/server/gatekeeper/OrGateKeeper.java
similarity index 70%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/OrGateKeeper.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/OrGateKeeper.java
index 04b46b56d4..d13f6a1cf7 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/OrGateKeeper.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/OrGateKeeper.java
@@ -1,14 +1,14 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import java.util.ArrayList;
import java.util.List;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.commons.wicket.editable.annotation.Horizontal;
-import com.gitplex.server.core.gatekeeper.checkresult.Failed;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
-import com.gitplex.server.core.gatekeeper.checkresult.Passed;
-import com.gitplex.server.core.gatekeeper.checkresult.Pending;
+import com.gitplex.server.gatekeeper.checkresult.Failed;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.gatekeeper.checkresult.Passed;
+import com.gitplex.server.gatekeeper.checkresult.Pending;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.Horizontal;
@Editable(name="Or Composition", order=200, icon="fa-object-group", category=GateKeeper.CATEGORY_COMPOSITION,
description="This gatekeeper will be passed if any of the contained gatekeepers is passed")
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/PerformSpecifiedOperations.java b/core/src/main/java/com/gitplex/server/gatekeeper/PerformSpecifiedOperations.java
similarity index 87%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/PerformSpecifiedOperations.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/PerformSpecifiedOperations.java
index d0c51c105d..61b12dfcaf 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/PerformSpecifiedOperations.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/PerformSpecifiedOperations.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import java.util.ArrayList;
import java.util.List;
@@ -7,14 +7,14 @@ import javax.validation.ConstraintValidatorContext;
import org.eclipse.jgit.lib.ObjectId;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.validation.Validatable;
+import com.gitplex.server.util.validation.annotation.ClassValidating;
import com.google.common.collect.Lists;
-import com.gitplex.commons.validation.ClassValidating;
-import com.gitplex.commons.validation.Validatable;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
@Editable(order=200, icon="fa-wrench", description=
"This gatekeeper will be passed if one of specified operations is performed")
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/PushWithoutRewritingHistory.java b/core/src/main/java/com/gitplex/server/gatekeeper/PushWithoutRewritingHistory.java
similarity index 79%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/PushWithoutRewritingHistory.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/PushWithoutRewritingHistory.java
index 860b562a0c..5c60375083 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/PushWithoutRewritingHistory.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/PushWithoutRewritingHistory.java
@@ -1,17 +1,17 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.lib.ObjectId;
import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.util.ExceptionUtils;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.util.ExceptionUtils;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable(order=2000, icon="fa-ext fa-repo-lock", description="This gatekeeper will be passed if the push "
+ "operation does not rewrite history of target branch. Rewriting history of public branches "
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/SubmitWithGerritStylePatch.java b/core/src/main/java/com/gitplex/server/gatekeeper/SubmitWithGerritStylePatch.java
similarity index 83%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/SubmitWithGerritStylePatch.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/SubmitWithGerritStylePatch.java
index 4b84678588..8e04b2924d 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/SubmitWithGerritStylePatch.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/SubmitWithGerritStylePatch.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import java.io.IOException;
@@ -7,12 +7,12 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.revwalk.RevWalkUtils;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.util.editable.annotation.Editable;
import com.google.common.collect.Lists;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
@Editable(order=3000, icon="fa-ext fa-file-diff", description="This gatekeeper will be passed if the pull request "
+ "is submitted with gerrit style patch, that is, only one commit is submitted for review at "
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/SubmittedBySpecifiedTeam.java b/core/src/main/java/com/gitplex/server/gatekeeper/SubmittedBySpecifiedTeam.java
similarity index 80%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/SubmittedBySpecifiedTeam.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/SubmittedBySpecifiedTeam.java
index e3ca252738..16cf8f8e42 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/SubmittedBySpecifiedTeam.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/SubmittedBySpecifiedTeam.java
@@ -1,15 +1,15 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import java.util.Collection;
import org.eclipse.jgit.lib.ObjectId;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.util.editable.annotation.Editable;
import com.google.common.collect.Lists;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
@Editable(order=500, icon="fa-group", category=GateKeeper.CATEGORY_USER, description=
"This gatekeeper will be passed if the commit is submitted by a member of specified team")
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/SubmittedBySpecifiedUser.java b/core/src/main/java/com/gitplex/server/gatekeeper/SubmittedBySpecifiedUser.java
similarity index 79%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/SubmittedBySpecifiedUser.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/SubmittedBySpecifiedUser.java
index 3e987b346c..d539dfdb03 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/SubmittedBySpecifiedUser.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/SubmittedBySpecifiedUser.java
@@ -1,18 +1,18 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import org.eclipse.jgit.lib.ObjectId;
import org.hibernate.validator.constraints.NotEmpty;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.util.editable.annotation.AccountChoice;
+import com.gitplex.server.util.editable.annotation.Editable;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.annotation.AccountChoice;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
-import com.gitplex.server.core.manager.AccountManager;
@Editable(order=600, icon="fa-user", category=GateKeeper.CATEGORY_USER, description=
"This gatekeeper will be passed if the commit is submitted by specified user")
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/TargetBranchIsMerged.java b/core/src/main/java/com/gitplex/server/gatekeeper/TargetBranchIsMerged.java
similarity index 77%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/TargetBranchIsMerged.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/TargetBranchIsMerged.java
index 0369b52425..ed8a1feac4 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/TargetBranchIsMerged.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/TargetBranchIsMerged.java
@@ -1,15 +1,15 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.util.editable.annotation.Editable;
import com.google.common.collect.Lists;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
@Editable(order=3100, icon="fa-ext fa-branch-merge", description="This gatekeeper will be passed if "
+ "head commit of target branch is merged into source branch of the pull request")
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/TeamAwareGateKeeper.java b/core/src/main/java/com/gitplex/server/gatekeeper/TeamAwareGateKeeper.java
similarity index 75%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/TeamAwareGateKeeper.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/TeamAwareGateKeeper.java
index 8e47af6db3..dbe47b7d99 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/TeamAwareGateKeeper.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/TeamAwareGateKeeper.java
@@ -1,19 +1,19 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import java.util.Collection;
import java.util.HashSet;
import org.hibernate.validator.constraints.NotEmpty;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.Team;
+import com.gitplex.server.entity.TeamMembership;
+import com.gitplex.server.manager.TeamManager;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.TeamChoice;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.annotation.TeamChoice;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.Team;
-import com.gitplex.server.core.entity.TeamMembership;
-import com.gitplex.server.core.manager.TeamManager;
public abstract class TeamAwareGateKeeper extends AbstractGateKeeper {
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/TouchSpecifiedFiles.java b/core/src/main/java/com/gitplex/server/gatekeeper/TouchSpecifiedFiles.java
similarity index 81%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/TouchSpecifiedFiles.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/TouchSpecifiedFiles.java
index 02c6460b72..062663ce6e 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/TouchSpecifiedFiles.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/TouchSpecifiedFiles.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import java.io.IOException;
@@ -9,17 +9,17 @@ import org.eclipse.jgit.treewalk.filter.TreeFilter;
import org.hibernate.validator.constraints.NotEmpty;
import com.google.common.collect.Lists;
-import com.gitplex.commons.util.match.PatternMatcher;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.annotation.PathMatch;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestUpdate;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
-import com.gitplex.server.core.util.ChildAwareMatcher;
-import com.gitplex.server.core.util.ParentAwareMatcher;
-import com.gitplex.server.core.util.includeexclude.IncludeExcludeUtils;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestUpdate;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.PathMatch;
+import com.gitplex.server.util.includeexclude.IncludeExcludeUtils;
+import com.gitplex.server.util.match.ChildAwareMatcher;
+import com.gitplex.server.util.match.ParentAwareMatcher;
+import com.gitplex.server.util.match.PatternMatcher;
@Editable(order=300, icon="fa-file-text", description=
"This gatekeeper will be passed if specified files are modified")
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/TouchSpecifiedRefs.java b/core/src/main/java/com/gitplex/server/gatekeeper/TouchSpecifiedRefs.java
similarity index 75%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/TouchSpecifiedRefs.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/TouchSpecifiedRefs.java
index 4ea2b4ff79..447169dc64 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/TouchSpecifiedRefs.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/TouchSpecifiedRefs.java
@@ -1,21 +1,21 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import org.eclipse.jgit.lib.ObjectId;
import org.hibernate.validator.constraints.NotEmpty;
import com.google.common.collect.Lists;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.util.match.PatternMatcher;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.util.includeexclude.IncludeExcludeParser;
-import com.gitplex.server.core.annotation.RefMatch;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
-import com.gitplex.server.core.util.ChildAwareMatcher;
-import com.gitplex.server.core.util.ParentAwareMatcher;
-import com.gitplex.server.core.util.includeexclude.IncludeExcludeUtils;
+import com.gitplex.server.util.includeexclude.IncludeExcludeParser;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.RefMatch;
+import com.gitplex.server.util.includeexclude.IncludeExcludeUtils;
+import com.gitplex.server.util.match.ChildAwareMatcher;
+import com.gitplex.server.util.match.ParentAwareMatcher;
+import com.gitplex.server.util.match.PatternMatcher;
@Editable(order=100, icon="fa-code-fork", description=
"This gatekeeper will be passed if specified refs is being touched")
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/VerifiedByBuilds.java b/core/src/main/java/com/gitplex/server/gatekeeper/VerifiedByBuilds.java
similarity index 85%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/VerifiedByBuilds.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/VerifiedByBuilds.java
index adb4e277af..0ae8a63996 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/VerifiedByBuilds.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/VerifiedByBuilds.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.gatekeeper;
+package com.gitplex.server.gatekeeper;
import java.util.Collection;
@@ -6,16 +6,16 @@ import javax.validation.constraints.Min;
import org.eclipse.jgit.lib.ObjectId;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestVerification;
+import com.gitplex.server.entity.support.IntegrationPreview;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.manager.PullRequestVerificationManager;
+import com.gitplex.server.util.editable.annotation.Editable;
import com.google.common.collect.Lists;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestVerification;
-import com.gitplex.server.core.entity.support.IntegrationPreview;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
-import com.gitplex.server.core.manager.PullRequestVerificationManager;
@Editable(icon="fa-check-circle", order=1000,
description="This gatekeeper will be satisfied if commit is verified successfully "
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Failed.java b/core/src/main/java/com/gitplex/server/gatekeeper/checkresult/Failed.java
similarity index 82%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Failed.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/checkresult/Failed.java
index e5cfc8a62f..93755c571e 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Failed.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/checkresult/Failed.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.gatekeeper.checkresult;
+package com.gitplex.server.gatekeeper.checkresult;
import java.util.List;
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/GateCheckResult.java b/core/src/main/java/com/gitplex/server/gatekeeper/checkresult/GateCheckResult.java
similarity index 92%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/GateCheckResult.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/checkresult/GateCheckResult.java
index 1b6c874f00..ef6d075046 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/GateCheckResult.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/checkresult/GateCheckResult.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.gatekeeper.checkresult;
+package com.gitplex.server.gatekeeper.checkresult;
import java.io.Serializable;
import java.util.List;
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Ignored.java b/core/src/main/java/com/gitplex/server/gatekeeper/checkresult/Ignored.java
similarity index 88%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Ignored.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/checkresult/Ignored.java
index ca36f6f440..dea20b1c0e 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Ignored.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/checkresult/Ignored.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.gatekeeper.checkresult;
+package com.gitplex.server.gatekeeper.checkresult;
import java.util.ArrayList;
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Passed.java b/core/src/main/java/com/gitplex/server/gatekeeper/checkresult/Passed.java
similarity index 82%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Passed.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/checkresult/Passed.java
index 6692b695ae..c7209218e4 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Passed.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/checkresult/Passed.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.gatekeeper.checkresult;
+package com.gitplex.server.gatekeeper.checkresult;
import java.util.List;
diff --git a/core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Pending.java b/core/src/main/java/com/gitplex/server/gatekeeper/checkresult/Pending.java
similarity index 84%
rename from core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Pending.java
rename to core/src/main/java/com/gitplex/server/gatekeeper/checkresult/Pending.java
index 8605de8bee..c584160738 100644
--- a/core/src/main/java/com/gitplex/server/core/gatekeeper/checkresult/Pending.java
+++ b/core/src/main/java/com/gitplex/server/gatekeeper/checkresult/Pending.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.gatekeeper.checkresult;
+package com.gitplex.server.gatekeeper.checkresult;
import java.util.List;
diff --git a/git/src/main/java/com/gitplex/commons/git/Blame.java b/core/src/main/java/com/gitplex/server/git/Blame.java
similarity index 95%
rename from git/src/main/java/com/gitplex/commons/git/Blame.java
rename to core/src/main/java/com/gitplex/server/git/Blame.java
index 26570f6fe0..7a8b82d6f6 100644
--- a/git/src/main/java/com/gitplex/commons/git/Blame.java
+++ b/core/src/main/java/com/gitplex/server/git/Blame.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git;
+package com.gitplex.server.git;
import java.util.List;
diff --git a/git/src/main/java/com/gitplex/commons/git/Blob.java b/core/src/main/java/com/gitplex/server/git/Blob.java
similarity index 97%
rename from git/src/main/java/com/gitplex/commons/git/Blob.java
rename to core/src/main/java/com/gitplex/server/git/Blob.java
index 90f0628143..1d06e83c3b 100644
--- a/git/src/main/java/com/gitplex/commons/git/Blob.java
+++ b/core/src/main/java/com/gitplex/server/git/Blob.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git;
+package com.gitplex.server.git;
import java.nio.charset.Charset;
import java.util.ArrayList;
@@ -9,7 +9,7 @@ import javax.annotation.Nullable;
import org.apache.tika.mime.MediaType;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.commons.util.ContentDetector;
+import com.gitplex.server.util.ContentDetector;
import com.google.common.base.Charsets;
import com.google.common.base.Optional;
diff --git a/git/src/main/java/com/gitplex/commons/git/BlobChange.java b/core/src/main/java/com/gitplex/server/git/BlobChange.java
similarity index 95%
rename from git/src/main/java/com/gitplex/commons/git/BlobChange.java
rename to core/src/main/java/com/gitplex/server/git/BlobChange.java
index 3a6e1062ec..90b54dfb46 100644
--- a/git/src/main/java/com/gitplex/commons/git/BlobChange.java
+++ b/core/src/main/java/com/gitplex/server/git/BlobChange.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git;
+package com.gitplex.server.git;
import java.io.Serializable;
import java.util.ArrayList;
@@ -11,11 +11,11 @@ import javax.annotation.Nullable;
import org.eclipse.jgit.diff.DiffEntry;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
-import com.gitplex.commons.util.diff.DiffBlock;
-import com.gitplex.commons.util.diff.DiffUtils;
-import com.gitplex.commons.util.diff.WhitespaceOption;
-import com.gitplex.commons.util.diff.DiffMatchPatch.Operation;
import com.gitplex.jsyntax.Token;
+import com.gitplex.server.util.diff.DiffBlock;
+import com.gitplex.server.util.diff.DiffUtils;
+import com.gitplex.server.util.diff.WhitespaceOption;
+import com.gitplex.server.util.diff.DiffMatchPatch.Operation;
import com.google.common.base.Preconditions;
@SuppressWarnings("serial")
diff --git a/git/src/main/java/com/gitplex/commons/git/BlobIdent.java b/core/src/main/java/com/gitplex/server/git/BlobIdent.java
similarity index 98%
rename from git/src/main/java/com/gitplex/commons/git/BlobIdent.java
rename to core/src/main/java/com/gitplex/server/git/BlobIdent.java
index 968a99ce46..69796e59f4 100644
--- a/git/src/main/java/com/gitplex/commons/git/BlobIdent.java
+++ b/core/src/main/java/com/gitplex/server/git/BlobIdent.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git;
+package com.gitplex.server.git;
import java.io.Serializable;
diff --git a/git/src/main/java/com/gitplex/commons/git/BriefCommit.java b/core/src/main/java/com/gitplex/server/git/BriefCommit.java
similarity index 98%
rename from git/src/main/java/com/gitplex/commons/git/BriefCommit.java
rename to core/src/main/java/com/gitplex/server/git/BriefCommit.java
index 65cc1e8ad4..8e42e364b0 100644
--- a/git/src/main/java/com/gitplex/commons/git/BriefCommit.java
+++ b/core/src/main/java/com/gitplex/server/git/BriefCommit.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git;
+package com.gitplex.server.git;
import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/git/src/main/java/com/gitplex/commons/git/Commit.java b/core/src/main/java/com/gitplex/server/git/Commit.java
similarity index 98%
rename from git/src/main/java/com/gitplex/commons/git/Commit.java
rename to core/src/main/java/com/gitplex/server/git/Commit.java
index 3e6bfa0a45..9c28a077f3 100644
--- a/git/src/main/java/com/gitplex/commons/git/Commit.java
+++ b/core/src/main/java/com/gitplex/server/git/Commit.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git;
+package com.gitplex.server.git;
import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/git/src/main/java/com/gitplex/commons/git/FileEdit.java b/core/src/main/java/com/gitplex/server/git/FileEdit.java
similarity index 95%
rename from git/src/main/java/com/gitplex/commons/git/FileEdit.java
rename to core/src/main/java/com/gitplex/server/git/FileEdit.java
index 78b9abd602..d64b90b1aa 100644
--- a/git/src/main/java/com/gitplex/commons/git/FileEdit.java
+++ b/core/src/main/java/com/gitplex/server/git/FileEdit.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git;
+package com.gitplex.server.git;
import java.io.IOException;
import java.io.Serializable;
@@ -22,11 +22,11 @@ import org.eclipse.jgit.revwalk.RevTree;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.treewalk.TreeWalk;
-import com.gitplex.commons.git.exception.GitObjectAlreadyExistsException;
-import com.gitplex.commons.git.exception.GitObjectNotFoundException;
-import com.gitplex.commons.git.exception.NotGitFileException;
-import com.gitplex.commons.git.exception.NotGitTreeException;
-import com.gitplex.commons.git.exception.ObsoleteCommitException;
+import com.gitplex.server.git.exception.GitObjectAlreadyExistsException;
+import com.gitplex.server.git.exception.GitObjectNotFoundException;
+import com.gitplex.server.git.exception.NotGitFileException;
+import com.gitplex.server.git.exception.NotGitTreeException;
+import com.gitplex.server.git.exception.ObsoleteCommitException;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
diff --git a/http/src/main/java/com/gitplex/server/http/GitFilter.java b/core/src/main/java/com/gitplex/server/git/GitFilter.java
similarity index 91%
rename from http/src/main/java/com/gitplex/server/http/GitFilter.java
rename to core/src/main/java/com/gitplex/server/git/GitFilter.java
index fdbde0fb50..bc04b4499f 100644
--- a/http/src/main/java/com/gitplex/server/http/GitFilter.java
+++ b/core/src/main/java/com/gitplex/server/git/GitFilter.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.http;
+package com.gitplex.server.git;
import java.io.File;
import java.io.IOException;
@@ -26,20 +26,20 @@ import org.eclipse.jgit.transport.PacketLineOut;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.git.command.AdvertiseReceiveRefsCommand;
-import com.gitplex.commons.git.command.AdvertiseUploadRefsCommand;
-import com.gitplex.commons.git.command.ReceiveCommand;
-import com.gitplex.commons.git.command.UploadCommand;
-import com.gitplex.commons.git.exception.GitException;
-import com.gitplex.commons.util.concurrent.PrioritizedRunnable;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.manager.StorageManager;
-import com.gitplex.server.core.manager.WorkExecutor;
-import com.gitplex.server.core.security.ObjectPermission;
-import com.gitplex.server.core.setting.ServerConfig;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.git.command.AdvertiseReceiveRefsCommand;
+import com.gitplex.server.git.command.AdvertiseUploadRefsCommand;
+import com.gitplex.server.git.command.ReceiveCommand;
+import com.gitplex.server.git.command.UploadCommand;
+import com.gitplex.server.git.exception.GitException;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.manager.StorageManager;
+import com.gitplex.server.manager.WorkExecutor;
+import com.gitplex.server.security.ObjectPermission;
+import com.gitplex.server.util.concurrent.PrioritizedRunnable;
+import com.gitplex.server.util.serverconfig.ServerConfig;
@Singleton
public class GitFilter implements Filter {
diff --git a/core/src/main/java/com/gitplex/server/core/hookcallback/GitPostReceiveCallback.java b/core/src/main/java/com/gitplex/server/git/GitPostReceiveCallback.java
similarity index 90%
rename from core/src/main/java/com/gitplex/server/core/hookcallback/GitPostReceiveCallback.java
rename to core/src/main/java/com/gitplex/server/git/GitPostReceiveCallback.java
index 4ca86eeaee..dd9bf326af 100644
--- a/core/src/main/java/com/gitplex/server/core/hookcallback/GitPostReceiveCallback.java
+++ b/core/src/main/java/com/gitplex/server/git/GitPostReceiveCallback.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.hookcallback;
+package com.gitplex.server.git;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -19,15 +19,14 @@ import org.eclipse.jgit.lib.RefUpdate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.calla.loader.ListenerRegistry;
-import com.gitplex.calla.loader.LoaderUtils;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.hibernate.UnitOfWork;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.event.RefUpdated;
-import com.gitplex.server.core.manager.DepotManager;
+import com.gitplex.launcher.loader.ListenerRegistry;
+import com.gitplex.launcher.loader.LoaderUtils;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.event.RefUpdated;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.persistence.UnitOfWork;
+import com.gitplex.server.util.StringUtils;
import com.google.common.base.Preconditions;
@SuppressWarnings("serial")
diff --git a/core/src/main/java/com/gitplex/server/core/hookcallback/GitPreReceiveCallback.java b/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java
similarity index 88%
rename from core/src/main/java/com/gitplex/server/core/hookcallback/GitPreReceiveCallback.java
rename to core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java
index bea1cc5c4a..5fed0b07f0 100644
--- a/core/src/main/java/com/gitplex/server/core/hookcallback/GitPreReceiveCallback.java
+++ b/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.hookcallback;
+package com.gitplex.server.git;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -17,18 +17,17 @@ import org.apache.commons.io.IOUtils;
import org.apache.shiro.SecurityUtils;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.calla.loader.LoaderUtils;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.gatekeeper.GateKeeper;
-import com.gitplex.server.core.gatekeeper.checkresult.Failed;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.security.ObjectPermission;
+import com.gitplex.launcher.loader.LoaderUtils;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.gatekeeper.GateKeeper;
+import com.gitplex.server.gatekeeper.checkresult.Failed;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.security.ObjectPermission;
+import com.gitplex.server.util.StringUtils;
import com.google.common.base.Preconditions;
@SuppressWarnings("serial")
diff --git a/git/src/main/java/com/gitplex/commons/git/GitUtils.java b/core/src/main/java/com/gitplex/server/git/GitUtils.java
similarity index 97%
rename from git/src/main/java/com/gitplex/commons/git/GitUtils.java
rename to core/src/main/java/com/gitplex/server/git/GitUtils.java
index e21187fe59..9a7cb774ea 100644
--- a/git/src/main/java/com/gitplex/commons/git/GitUtils.java
+++ b/core/src/main/java/com/gitplex/server/git/GitUtils.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git;
+package com.gitplex.server.git;
import java.io.File;
import java.io.IOException;
@@ -35,14 +35,14 @@ import org.eclipse.jgit.revwalk.RevWalkUtils;
import org.eclipse.jgit.revwalk.filter.RevFilter;
import org.eclipse.jgit.util.SystemReader;
-import com.gitplex.calla.bootstrap.BootstrapUtils;
-import com.gitplex.commons.git.command.CalcMergeBaseCommand;
-import com.gitplex.commons.git.command.CloneCommand;
-import com.gitplex.commons.git.command.FetchCommand;
-import com.gitplex.commons.git.exception.ObsoleteCommitException;
-import com.gitplex.commons.git.exception.RefUpdateException;
-import com.gitplex.commons.util.FileUtils;
-import com.gitplex.commons.util.LockUtils;
+import com.gitplex.launcher.bootstrap.BootstrapUtils;
+import com.gitplex.server.git.command.CalcMergeBaseCommand;
+import com.gitplex.server.git.command.CloneCommand;
+import com.gitplex.server.git.command.FetchCommand;
+import com.gitplex.server.git.exception.ObsoleteCommitException;
+import com.gitplex.server.git.exception.RefUpdateException;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.server.util.LockUtils;
import com.google.common.base.Joiner;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
diff --git a/git/src/main/java/com/gitplex/commons/git/GitVersion.java b/core/src/main/java/com/gitplex/server/git/GitVersion.java
similarity index 93%
rename from git/src/main/java/com/gitplex/commons/git/GitVersion.java
rename to core/src/main/java/com/gitplex/server/git/GitVersion.java
index c4e445c2d5..bf6abb3138 100644
--- a/git/src/main/java/com/gitplex/commons/git/GitVersion.java
+++ b/core/src/main/java/com/gitplex/server/git/GitVersion.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git;
+package com.gitplex.server.git;
import java.util.ArrayList;
import java.util.Collections;
@@ -6,8 +6,8 @@ import java.util.List;
import org.apache.commons.lang3.math.NumberUtils;
-import com.gitplex.calla.loader.LoaderUtils;
-import com.gitplex.commons.util.StringUtils;
+import com.gitplex.launcher.loader.LoaderUtils;
+import com.gitplex.server.util.StringUtils;
public class GitVersion implements Comparable<GitVersion> {
diff --git a/git/src/main/java/com/gitplex/commons/git/NameAndEmail.java b/core/src/main/java/com/gitplex/server/git/NameAndEmail.java
similarity index 97%
rename from git/src/main/java/com/gitplex/commons/git/NameAndEmail.java
rename to core/src/main/java/com/gitplex/server/git/NameAndEmail.java
index 196661194c..a18381ec07 100644
--- a/git/src/main/java/com/gitplex/commons/git/NameAndEmail.java
+++ b/core/src/main/java/com/gitplex/server/git/NameAndEmail.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git;
+package com.gitplex.server.git;
import java.io.Serializable;
diff --git a/core/src/main/java/com/gitplex/server/core/hookcallback/Output.java b/core/src/main/java/com/gitplex/server/git/Output.java
similarity index 93%
rename from core/src/main/java/com/gitplex/server/core/hookcallback/Output.java
rename to core/src/main/java/com/gitplex/server/git/Output.java
index 96088fc79c..b725b48a03 100644
--- a/core/src/main/java/com/gitplex/server/core/hookcallback/Output.java
+++ b/core/src/main/java/com/gitplex/server/git/Output.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.hookcallback;
+package com.gitplex.server.git;
import java.io.IOException;
diff --git a/git/src/main/java/com/gitplex/commons/git/PathAndContent.java b/core/src/main/java/com/gitplex/server/git/PathAndContent.java
similarity index 94%
rename from git/src/main/java/com/gitplex/commons/git/PathAndContent.java
rename to core/src/main/java/com/gitplex/server/git/PathAndContent.java
index 065b788122..2a80816e0f 100644
--- a/git/src/main/java/com/gitplex/commons/git/PathAndContent.java
+++ b/core/src/main/java/com/gitplex/server/git/PathAndContent.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git;
+package com.gitplex.server.git;
import java.io.Serializable;
diff --git a/git/src/main/java/com/gitplex/commons/git/RefInfo.java b/core/src/main/java/com/gitplex/server/git/RefInfo.java
similarity index 98%
rename from git/src/main/java/com/gitplex/commons/git/RefInfo.java
rename to core/src/main/java/com/gitplex/server/git/RefInfo.java
index 85bfa0d73c..d8a6e57adb 100644
--- a/git/src/main/java/com/gitplex/commons/git/RefInfo.java
+++ b/core/src/main/java/com/gitplex/server/git/RefInfo.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git;
+package com.gitplex.server.git;
import java.io.IOException;
import java.util.Date;
diff --git a/git/src/main/java/com/gitplex/commons/git/Submodule.java b/core/src/main/java/com/gitplex/server/git/Submodule.java
similarity index 96%
rename from git/src/main/java/com/gitplex/commons/git/Submodule.java
rename to core/src/main/java/com/gitplex/server/git/Submodule.java
index 636438cbc5..20a3c130f8 100644
--- a/git/src/main/java/com/gitplex/commons/git/Submodule.java
+++ b/core/src/main/java/com/gitplex/server/git/Submodule.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git;
+package com.gitplex.server.git;
import java.io.Serializable;
diff --git a/git/src/main/java/com/gitplex/commons/git/command/AdvertiseReceiveRefsCommand.java b/core/src/main/java/com/gitplex/server/git/command/AdvertiseReceiveRefsCommand.java
similarity index 85%
rename from git/src/main/java/com/gitplex/commons/git/command/AdvertiseReceiveRefsCommand.java
rename to core/src/main/java/com/gitplex/server/git/command/AdvertiseReceiveRefsCommand.java
index 0f773158c1..88f3eb044a 100644
--- a/git/src/main/java/com/gitplex/commons/git/command/AdvertiseReceiveRefsCommand.java
+++ b/core/src/main/java/com/gitplex/server/git/command/AdvertiseReceiveRefsCommand.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git.command;
+package com.gitplex.server.git.command;
import java.io.File;
import java.io.OutputStream;
@@ -6,8 +6,8 @@ import java.io.OutputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.util.execution.Commandline;
-import com.gitplex.commons.util.execution.LineConsumer;
+import com.gitplex.server.util.execution.Commandline;
+import com.gitplex.server.util.execution.LineConsumer;
import com.google.common.base.Preconditions;
public class AdvertiseReceiveRefsCommand extends GitCommand<Void> {
diff --git a/git/src/main/java/com/gitplex/commons/git/command/AdvertiseUploadRefsCommand.java b/core/src/main/java/com/gitplex/server/git/command/AdvertiseUploadRefsCommand.java
similarity index 85%
rename from git/src/main/java/com/gitplex/commons/git/command/AdvertiseUploadRefsCommand.java
rename to core/src/main/java/com/gitplex/server/git/command/AdvertiseUploadRefsCommand.java
index 94eff7a419..8e05897b5f 100644
--- a/git/src/main/java/com/gitplex/commons/git/command/AdvertiseUploadRefsCommand.java
+++ b/core/src/main/java/com/gitplex/server/git/command/AdvertiseUploadRefsCommand.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git.command;
+package com.gitplex.server.git.command;
import java.io.File;
import java.io.OutputStream;
@@ -6,8 +6,8 @@ import java.io.OutputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.util.execution.Commandline;
-import com.gitplex.commons.util.execution.LineConsumer;
+import com.gitplex.server.util.execution.Commandline;
+import com.gitplex.server.util.execution.LineConsumer;
import com.google.common.base.Preconditions;
public class AdvertiseUploadRefsCommand extends GitCommand<Void> {
diff --git a/git/src/main/java/com/gitplex/commons/git/command/BlameCommand.java b/core/src/main/java/com/gitplex/server/git/command/BlameCommand.java
similarity index 94%
rename from git/src/main/java/com/gitplex/commons/git/command/BlameCommand.java
rename to core/src/main/java/com/gitplex/server/git/command/BlameCommand.java
index 7e178eeef6..27cf7a9a97 100644
--- a/git/src/main/java/com/gitplex/commons/git/command/BlameCommand.java
+++ b/core/src/main/java/com/gitplex/server/git/command/BlameCommand.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git.command;
+package com.gitplex.server.git.command;
import java.io.File;
import java.util.ArrayList;
@@ -15,13 +15,13 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.git.Blame;
-import com.gitplex.commons.git.BriefCommit;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.util.execution.Commandline;
-import com.gitplex.commons.util.execution.ExecuteResult;
-import com.gitplex.commons.util.execution.LineConsumer;
import com.gitplex.jsymbol.Range;
+import com.gitplex.server.git.Blame;
+import com.gitplex.server.git.BriefCommit;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.util.execution.Commandline;
+import com.gitplex.server.util.execution.ExecuteResult;
+import com.gitplex.server.util.execution.LineConsumer;
import com.google.common.base.Preconditions;
public class BlameCommand extends GitCommand<Map<String, Blame>> {
diff --git a/git/src/main/java/com/gitplex/commons/git/command/CalcMergeBaseCommand.java b/core/src/main/java/com/gitplex/server/git/command/CalcMergeBaseCommand.java
similarity index 89%
rename from git/src/main/java/com/gitplex/commons/git/command/CalcMergeBaseCommand.java
rename to core/src/main/java/com/gitplex/server/git/command/CalcMergeBaseCommand.java
index 1a02ac1b41..016c7b534a 100644
--- a/git/src/main/java/com/gitplex/commons/git/command/CalcMergeBaseCommand.java
+++ b/core/src/main/java/com/gitplex/server/git/command/CalcMergeBaseCommand.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git.command;
+package com.gitplex.server.git.command;
import java.io.File;
@@ -7,8 +7,8 @@ import javax.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.util.execution.Commandline;
-import com.gitplex.commons.util.execution.LineConsumer;
+import com.gitplex.server.util.execution.Commandline;
+import com.gitplex.server.util.execution.LineConsumer;
import com.google.common.base.Preconditions;
public class CalcMergeBaseCommand extends GitCommand<String> {
diff --git a/git/src/main/java/com/gitplex/commons/git/command/CloneCommand.java b/core/src/main/java/com/gitplex/server/git/command/CloneCommand.java
similarity index 92%
rename from git/src/main/java/com/gitplex/commons/git/command/CloneCommand.java
rename to core/src/main/java/com/gitplex/server/git/command/CloneCommand.java
index a4d042f6f8..3a16ec9014 100644
--- a/git/src/main/java/com/gitplex/commons/git/command/CloneCommand.java
+++ b/core/src/main/java/com/gitplex/server/git/command/CloneCommand.java
@@ -1,12 +1,12 @@
-package com.gitplex.commons.git.command;
+package com.gitplex.server.git.command;
import java.io.File;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.util.execution.Commandline;
-import com.gitplex.commons.util.execution.LineConsumer;
+import com.gitplex.server.util.execution.Commandline;
+import com.gitplex.server.util.execution.LineConsumer;
import com.google.common.base.Preconditions;
public class CloneCommand extends GitCommand<Void> {
diff --git a/git/src/main/java/com/gitplex/commons/git/command/FetchCommand.java b/core/src/main/java/com/gitplex/server/git/command/FetchCommand.java
similarity index 89%
rename from git/src/main/java/com/gitplex/commons/git/command/FetchCommand.java
rename to core/src/main/java/com/gitplex/server/git/command/FetchCommand.java
index cb0b5b32fc..05a9e6465e 100644
--- a/git/src/main/java/com/gitplex/commons/git/command/FetchCommand.java
+++ b/core/src/main/java/com/gitplex/server/git/command/FetchCommand.java
@@ -1,12 +1,12 @@
-package com.gitplex.commons.git.command;
+package com.gitplex.server.git.command;
import java.io.File;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.util.execution.Commandline;
-import com.gitplex.commons.util.execution.LineConsumer;
+import com.gitplex.server.util.execution.Commandline;
+import com.gitplex.server.util.execution.LineConsumer;
import com.google.common.base.Preconditions;
public class FetchCommand extends GitCommand<Void> {
diff --git a/git/src/main/java/com/gitplex/commons/git/command/GitCommand.java b/core/src/main/java/com/gitplex/server/git/command/GitCommand.java
similarity index 88%
rename from git/src/main/java/com/gitplex/commons/git/command/GitCommand.java
rename to core/src/main/java/com/gitplex/server/git/command/GitCommand.java
index 575205f03b..d8dab280e0 100644
--- a/git/src/main/java/com/gitplex/commons/git/command/GitCommand.java
+++ b/core/src/main/java/com/gitplex/server/git/command/GitCommand.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git.command;
+package com.gitplex.server.git.command;
import java.io.File;
import java.util.Map;
@@ -10,12 +10,12 @@ import org.apache.commons.lang3.exception.ExceptionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.git.GitConfig;
-import com.gitplex.commons.git.GitVersion;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.commons.util.FileUtils;
-import com.gitplex.commons.util.execution.Commandline;
-import com.gitplex.commons.util.execution.LineConsumer;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.git.GitVersion;
+import com.gitplex.server.git.config.GitConfig;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.server.util.execution.Commandline;
+import com.gitplex.server.util.execution.LineConsumer;
public abstract class GitCommand<V> implements Callable<V> {
diff --git a/git/src/main/java/com/gitplex/commons/git/command/ReceiveCommand.java b/core/src/main/java/com/gitplex/server/git/command/ReceiveCommand.java
similarity index 87%
rename from git/src/main/java/com/gitplex/commons/git/command/ReceiveCommand.java
rename to core/src/main/java/com/gitplex/server/git/command/ReceiveCommand.java
index 15e1fdd98b..ee2a0d8a25 100644
--- a/git/src/main/java/com/gitplex/commons/git/command/ReceiveCommand.java
+++ b/core/src/main/java/com/gitplex/server/git/command/ReceiveCommand.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git.command;
+package com.gitplex.server.git.command;
import java.io.File;
import java.io.InputStream;
@@ -8,8 +8,8 @@ import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.util.execution.Commandline;
-import com.gitplex.commons.util.execution.LineConsumer;
+import com.gitplex.server.util.execution.Commandline;
+import com.gitplex.server.util.execution.LineConsumer;
import com.google.common.base.Preconditions;
public class ReceiveCommand extends GitCommand<Void> {
diff --git a/git/src/main/java/com/gitplex/commons/git/command/RevListCommand.java b/core/src/main/java/com/gitplex/server/git/command/RevListCommand.java
similarity index 96%
rename from git/src/main/java/com/gitplex/commons/git/command/RevListCommand.java
rename to core/src/main/java/com/gitplex/server/git/command/RevListCommand.java
index 3c887f591c..e199c6bed6 100644
--- a/git/src/main/java/com/gitplex/commons/git/command/RevListCommand.java
+++ b/core/src/main/java/com/gitplex/server/git/command/RevListCommand.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git.command;
+package com.gitplex.server.git.command;
import java.io.File;
import java.util.ArrayList;
@@ -9,8 +9,8 @@ import org.apache.commons.lang3.time.DateFormatUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.util.execution.Commandline;
-import com.gitplex.commons.util.execution.LineConsumer;
+import com.gitplex.server.util.execution.Commandline;
+import com.gitplex.server.util.execution.LineConsumer;
public class RevListCommand extends GitCommand<List<String>> {
diff --git a/git/src/main/java/com/gitplex/commons/git/command/UploadCommand.java b/core/src/main/java/com/gitplex/server/git/command/UploadCommand.java
similarity index 87%
rename from git/src/main/java/com/gitplex/commons/git/command/UploadCommand.java
rename to core/src/main/java/com/gitplex/server/git/command/UploadCommand.java
index de219ea3ba..2f0bbc891c 100644
--- a/git/src/main/java/com/gitplex/commons/git/command/UploadCommand.java
+++ b/core/src/main/java/com/gitplex/server/git/command/UploadCommand.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git.command;
+package com.gitplex.server.git.command;
import java.io.File;
import java.io.InputStream;
@@ -8,8 +8,8 @@ import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.util.execution.Commandline;
-import com.gitplex.commons.util.execution.LineConsumer;
+import com.gitplex.server.util.execution.Commandline;
+import com.gitplex.server.util.execution.LineConsumer;
import com.google.common.base.Preconditions;
public class UploadCommand extends GitCommand<Void> {
diff --git a/git/src/main/java/com/gitplex/commons/git/GitConfig.java b/core/src/main/java/com/gitplex/server/git/config/GitConfig.java
similarity index 75%
rename from git/src/main/java/com/gitplex/commons/git/GitConfig.java
rename to core/src/main/java/com/gitplex/server/git/config/GitConfig.java
index 0e83e4f668..908e1cd2fe 100644
--- a/git/src/main/java/com/gitplex/commons/git/GitConfig.java
+++ b/core/src/main/java/com/gitplex/server/git/config/GitConfig.java
@@ -1,13 +1,13 @@
-package com.gitplex.commons.git;
+package com.gitplex.server.git.config;
import java.io.Serializable;
import javax.validation.ConstraintValidatorContext;
-import com.gitplex.commons.git.command.GitCommand;
-import com.gitplex.commons.validation.ClassValidating;
-import com.gitplex.commons.validation.Validatable;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
+import com.gitplex.server.git.command.GitCommand;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.validation.Validatable;
+import com.gitplex.server.util.validation.annotation.ClassValidating;
/**
* Git relevant settings.
diff --git a/core/src/main/java/com/gitplex/server/core/setting/SpecifiedGit.java b/core/src/main/java/com/gitplex/server/git/config/SpecifiedGit.java
similarity index 77%
rename from core/src/main/java/com/gitplex/server/core/setting/SpecifiedGit.java
rename to core/src/main/java/com/gitplex/server/git/config/SpecifiedGit.java
index e58bcea9e7..f7dfae8052 100644
--- a/core/src/main/java/com/gitplex/server/core/setting/SpecifiedGit.java
+++ b/core/src/main/java/com/gitplex/server/git/config/SpecifiedGit.java
@@ -1,9 +1,8 @@
-package com.gitplex.server.core.setting;
+package com.gitplex.server.git.config;
import org.hibernate.validator.constraints.NotEmpty;
-import com.gitplex.commons.git.GitConfig;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable(name="Use Specified Git", order=200)
@SuppressWarnings("serial")
diff --git a/core/src/main/java/com/gitplex/server/core/setting/SystemGit.java b/core/src/main/java/com/gitplex/server/git/config/SystemGit.java
similarity index 56%
rename from core/src/main/java/com/gitplex/server/core/setting/SystemGit.java
rename to core/src/main/java/com/gitplex/server/git/config/SystemGit.java
index da89ef23b3..2c95c03760 100644
--- a/core/src/main/java/com/gitplex/server/core/setting/SystemGit.java
+++ b/core/src/main/java/com/gitplex/server/git/config/SystemGit.java
@@ -1,7 +1,6 @@
-package com.gitplex.server.core.setting;
+package com.gitplex.server.git.config;
-import com.gitplex.commons.git.GitConfig;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable(name="Use Git in System Path", order=100)
@SuppressWarnings("serial")
diff --git a/git/src/main/java/com/gitplex/commons/git/exception/GitException.java b/core/src/main/java/com/gitplex/server/git/exception/GitException.java
similarity index 88%
rename from git/src/main/java/com/gitplex/commons/git/exception/GitException.java
rename to core/src/main/java/com/gitplex/server/git/exception/GitException.java
index 87f8764443..1370edb2eb 100644
--- a/git/src/main/java/com/gitplex/commons/git/exception/GitException.java
+++ b/core/src/main/java/com/gitplex/server/git/exception/GitException.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git.exception;
+package com.gitplex.server.git.exception;
public class GitException extends RuntimeException {
diff --git a/git/src/main/java/com/gitplex/commons/git/exception/GitObjectAlreadyExistsException.java b/core/src/main/java/com/gitplex/server/git/exception/GitObjectAlreadyExistsException.java
similarity index 82%
rename from git/src/main/java/com/gitplex/commons/git/exception/GitObjectAlreadyExistsException.java
rename to core/src/main/java/com/gitplex/server/git/exception/GitObjectAlreadyExistsException.java
index b5b9cb3e4d..7834c104fa 100644
--- a/git/src/main/java/com/gitplex/commons/git/exception/GitObjectAlreadyExistsException.java
+++ b/core/src/main/java/com/gitplex/server/git/exception/GitObjectAlreadyExistsException.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git.exception;
+package com.gitplex.server.git.exception;
public class GitObjectAlreadyExistsException extends GitException {
diff --git a/git/src/main/java/com/gitplex/commons/git/exception/GitObjectNotFoundException.java b/core/src/main/java/com/gitplex/server/git/exception/GitObjectNotFoundException.java
similarity index 81%
rename from git/src/main/java/com/gitplex/commons/git/exception/GitObjectNotFoundException.java
rename to core/src/main/java/com/gitplex/server/git/exception/GitObjectNotFoundException.java
index ecb067edbb..6c299cf7ae 100644
--- a/git/src/main/java/com/gitplex/commons/git/exception/GitObjectNotFoundException.java
+++ b/core/src/main/java/com/gitplex/server/git/exception/GitObjectNotFoundException.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git.exception;
+package com.gitplex.server.git.exception;
public class GitObjectNotFoundException extends GitException {
diff --git a/git/src/main/java/com/gitplex/commons/git/exception/NotGitFileException.java b/core/src/main/java/com/gitplex/server/git/exception/NotGitFileException.java
similarity index 80%
rename from git/src/main/java/com/gitplex/commons/git/exception/NotGitFileException.java
rename to core/src/main/java/com/gitplex/server/git/exception/NotGitFileException.java
index 18c643936b..2506f2e77d 100644
--- a/git/src/main/java/com/gitplex/commons/git/exception/NotGitFileException.java
+++ b/core/src/main/java/com/gitplex/server/git/exception/NotGitFileException.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git.exception;
+package com.gitplex.server.git.exception;
public class NotGitFileException extends GitException {
diff --git a/git/src/main/java/com/gitplex/commons/git/exception/NotGitTreeException.java b/core/src/main/java/com/gitplex/server/git/exception/NotGitTreeException.java
similarity index 80%
rename from git/src/main/java/com/gitplex/commons/git/exception/NotGitTreeException.java
rename to core/src/main/java/com/gitplex/server/git/exception/NotGitTreeException.java
index 2325bdf5d4..a3a75524d5 100644
--- a/git/src/main/java/com/gitplex/commons/git/exception/NotGitTreeException.java
+++ b/core/src/main/java/com/gitplex/server/git/exception/NotGitTreeException.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git.exception;
+package com.gitplex.server.git.exception;
public class NotGitTreeException extends GitException {
diff --git a/git/src/main/java/com/gitplex/commons/git/exception/ObsoleteCommitException.java b/core/src/main/java/com/gitplex/server/git/exception/ObsoleteCommitException.java
similarity index 91%
rename from git/src/main/java/com/gitplex/commons/git/exception/ObsoleteCommitException.java
rename to core/src/main/java/com/gitplex/server/git/exception/ObsoleteCommitException.java
index 3556d002b6..3808121440 100644
--- a/git/src/main/java/com/gitplex/commons/git/exception/ObsoleteCommitException.java
+++ b/core/src/main/java/com/gitplex/server/git/exception/ObsoleteCommitException.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git.exception;
+package com.gitplex.server.git.exception;
import javax.annotation.Nullable;
diff --git a/git/src/main/java/com/gitplex/commons/git/exception/RefUpdateException.java b/core/src/main/java/com/gitplex/server/git/exception/RefUpdateException.java
similarity index 89%
rename from git/src/main/java/com/gitplex/commons/git/exception/RefUpdateException.java
rename to core/src/main/java/com/gitplex/server/git/exception/RefUpdateException.java
index 9a0dd8a051..25645e3e69 100644
--- a/git/src/main/java/com/gitplex/commons/git/exception/RefUpdateException.java
+++ b/core/src/main/java/com/gitplex/server/git/exception/RefUpdateException.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git.exception;
+package com.gitplex.server.git.exception;
import org.eclipse.jgit.lib.RefUpdate;
diff --git a/git/src/main/java/com/gitplex/commons/git/jackson/GitObjectMapperConfigurator.java b/core/src/main/java/com/gitplex/server/git/jackson/GitObjectMapperConfigurator.java
similarity index 84%
rename from git/src/main/java/com/gitplex/commons/git/jackson/GitObjectMapperConfigurator.java
rename to core/src/main/java/com/gitplex/server/git/jackson/GitObjectMapperConfigurator.java
index 7077339e53..f89ec36ec6 100644
--- a/git/src/main/java/com/gitplex/commons/git/jackson/GitObjectMapperConfigurator.java
+++ b/core/src/main/java/com/gitplex/server/git/jackson/GitObjectMapperConfigurator.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git.jackson;
+package com.gitplex.server.git.jackson;
import javax.inject.Singleton;
@@ -6,7 +6,7 @@ import org.eclipse.jgit.lib.ObjectId;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.gitplex.commons.jackson.ObjectMapperConfigurator;
+import com.gitplex.server.util.jackson.ObjectMapperConfigurator;
@Singleton
public class GitObjectMapperConfigurator implements ObjectMapperConfigurator {
diff --git a/git/src/main/java/com/gitplex/commons/git/jackson/ObjectIdDeserializer.java b/core/src/main/java/com/gitplex/server/git/jackson/ObjectIdDeserializer.java
similarity index 93%
rename from git/src/main/java/com/gitplex/commons/git/jackson/ObjectIdDeserializer.java
rename to core/src/main/java/com/gitplex/server/git/jackson/ObjectIdDeserializer.java
index 3f31c32145..edaa272546 100644
--- a/git/src/main/java/com/gitplex/commons/git/jackson/ObjectIdDeserializer.java
+++ b/core/src/main/java/com/gitplex/server/git/jackson/ObjectIdDeserializer.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git.jackson;
+package com.gitplex.server.git.jackson;
import java.io.IOException;
diff --git a/git/src/main/java/com/gitplex/commons/git/jackson/ObjectIdSerializer.java b/core/src/main/java/com/gitplex/server/git/jackson/ObjectIdSerializer.java
similarity index 93%
rename from git/src/main/java/com/gitplex/commons/git/jackson/ObjectIdSerializer.java
rename to core/src/main/java/com/gitplex/server/git/jackson/ObjectIdSerializer.java
index 92e6623eac..a01d88f00d 100644
--- a/git/src/main/java/com/gitplex/commons/git/jackson/ObjectIdSerializer.java
+++ b/core/src/main/java/com/gitplex/server/git/jackson/ObjectIdSerializer.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git.jackson;
+package com.gitplex.server.git.jackson;
import java.io.IOException;
diff --git a/core/src/main/java/com/gitplex/server/core/manager/AccountManager.java b/core/src/main/java/com/gitplex/server/manager/AccountManager.java
similarity index 92%
rename from core/src/main/java/com/gitplex/server/core/manager/AccountManager.java
rename to core/src/main/java/com/gitplex/server/manager/AccountManager.java
index 2cd1cc12e5..7ca8a00280 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/AccountManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/AccountManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.util.List;
@@ -6,8 +6,8 @@ import javax.annotation.Nullable;
import org.eclipse.jgit.lib.PersonIdent;
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.Account;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.persistence.dao.EntityManager;
public interface AccountManager extends EntityManager<Account> {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/AttachmentManager.java b/core/src/main/java/com/gitplex/server/manager/AttachmentManager.java
similarity index 80%
rename from core/src/main/java/com/gitplex/server/core/manager/AttachmentManager.java
rename to core/src/main/java/com/gitplex/server/manager/AttachmentManager.java
index a02317a24a..ab40f87af8 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/AttachmentManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/AttachmentManager.java
@@ -1,8 +1,8 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.io.File;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
public interface AttachmentManager {
diff --git a/core/src/main/java/com/gitplex/server/manager/BatchWorkManager.java b/core/src/main/java/com/gitplex/server/manager/BatchWorkManager.java
new file mode 100644
index 0000000000..785d33c554
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/manager/BatchWorkManager.java
@@ -0,0 +1,10 @@
+package com.gitplex.server.manager;
+
+import com.gitplex.server.manager.support.BatchWorker;
+import com.gitplex.server.util.concurrent.Prioritized;
+
+public interface BatchWorkManager {
+
+ void submit(BatchWorker worker, Prioritized work);
+
+}
diff --git a/core/src/main/java/com/gitplex/server/manager/BranchWatchManager.java b/core/src/main/java/com/gitplex/server/manager/BranchWatchManager.java
new file mode 100644
index 0000000000..64cfd87783
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/manager/BranchWatchManager.java
@@ -0,0 +1,16 @@
+package com.gitplex.server.manager;
+
+import java.util.Collection;
+
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.BranchWatch;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.persistence.dao.EntityManager;
+
+public interface BranchWatchManager extends EntityManager<BranchWatch> {
+
+ Collection<BranchWatch> find(Account user, Depot depot);
+
+ Collection<BranchWatch> find(Depot depot, String branch);
+
+}
diff --git a/core/src/main/java/com/gitplex/server/core/manager/CodeCommentInfoManager.java b/core/src/main/java/com/gitplex/server/manager/CodeCommentInfoManager.java
similarity index 76%
rename from core/src/main/java/com/gitplex/server/core/manager/CodeCommentInfoManager.java
rename to core/src/main/java/com/gitplex/server/manager/CodeCommentInfoManager.java
index b60e120cf3..8c08675c93 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/CodeCommentInfoManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/CodeCommentInfoManager.java
@@ -1,12 +1,12 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.util.List;
import java.util.Map;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.support.CompareContext;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.support.CompareContext;
public interface CodeCommentInfoManager {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/CodeCommentManager.java b/core/src/main/java/com/gitplex/server/manager/CodeCommentManager.java
similarity index 66%
rename from core/src/main/java/com/gitplex/server/core/manager/CodeCommentManager.java
rename to core/src/main/java/com/gitplex/server/manager/CodeCommentManager.java
index dab93cb766..0b8ff17701 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/CodeCommentManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/CodeCommentManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.util.Collection;
import java.util.List;
@@ -7,11 +7,11 @@ import javax.annotation.Nullable;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.CodeCommentStatusChange;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.event.codecomment.CodeCommentEvent;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.CodeCommentStatusChange;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.event.codecomment.CodeCommentEvent;
+import com.gitplex.server.persistence.dao.EntityManager;
public interface CodeCommentManager extends EntityManager<CodeComment> {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/CodeCommentRelationManager.java b/core/src/main/java/com/gitplex/server/manager/CodeCommentRelationManager.java
similarity index 51%
rename from core/src/main/java/com/gitplex/server/core/manager/CodeCommentRelationManager.java
rename to core/src/main/java/com/gitplex/server/manager/CodeCommentRelationManager.java
index cb3851003e..bbdb4ef963 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/CodeCommentRelationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/CodeCommentRelationManager.java
@@ -1,11 +1,11 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.util.List;
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.CodeCommentRelation;
-import com.gitplex.server.core.entity.PullRequest;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.CodeCommentRelation;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.persistence.dao.EntityManager;
public interface CodeCommentRelationManager extends EntityManager<CodeCommentRelation> {
diff --git a/core/src/main/java/com/gitplex/server/manager/CodeCommentReplyManager.java b/core/src/main/java/com/gitplex/server/manager/CodeCommentReplyManager.java
new file mode 100644
index 0000000000..286e45b97e
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/manager/CodeCommentReplyManager.java
@@ -0,0 +1,10 @@
+package com.gitplex.server.manager;
+
+import com.gitplex.server.entity.CodeCommentReply;
+import com.gitplex.server.persistence.dao.EntityManager;
+
+public interface CodeCommentReplyManager extends EntityManager<CodeCommentReply> {
+
+ void save(CodeCommentReply reply, boolean callListeners);
+
+}
diff --git a/core/src/main/java/com/gitplex/server/manager/CodeCommentStatusChangeManager.java b/core/src/main/java/com/gitplex/server/manager/CodeCommentStatusChangeManager.java
new file mode 100644
index 0000000000..c9f16c643e
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/manager/CodeCommentStatusChangeManager.java
@@ -0,0 +1,8 @@
+package com.gitplex.server.manager;
+
+import com.gitplex.server.entity.CodeCommentStatusChange;
+import com.gitplex.server.persistence.dao.EntityManager;
+
+public interface CodeCommentStatusChangeManager extends EntityManager<CodeCommentStatusChange> {
+
+}
diff --git a/core/src/main/java/com/gitplex/server/core/manager/CommitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.java
similarity index 89%
rename from core/src/main/java/com/gitplex/server/core/manager/CommitInfoManager.java
rename to core/src/main/java/com/gitplex/server/manager/CommitInfoManager.java
index 99fa843948..b6a5ac4ddc 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/CommitInfoManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.java
@@ -1,12 +1,12 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.util.List;
import java.util.Set;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.commons.git.NameAndEmail;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.git.NameAndEmail;
public interface CommitInfoManager {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/ConfigManager.java b/core/src/main/java/com/gitplex/server/manager/ConfigManager.java
similarity index 83%
rename from core/src/main/java/com/gitplex/server/core/manager/ConfigManager.java
rename to core/src/main/java/com/gitplex/server/manager/ConfigManager.java
index e87b13736f..a925bab480 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/ConfigManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/ConfigManager.java
@@ -1,13 +1,13 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import javax.annotation.Nullable;
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.Config;
-import com.gitplex.server.core.setting.BackupSetting;
-import com.gitplex.server.core.setting.MailSetting;
-import com.gitplex.server.core.setting.SecuritySetting;
-import com.gitplex.server.core.setting.SystemSetting;
+import com.gitplex.server.entity.Config;
+import com.gitplex.server.entity.support.setting.BackupSetting;
+import com.gitplex.server.entity.support.setting.MailSetting;
+import com.gitplex.server.entity.support.setting.SecuritySetting;
+import com.gitplex.server.entity.support.setting.SystemSetting;
+import com.gitplex.server.persistence.dao.EntityManager;
public interface ConfigManager extends EntityManager<Config> {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/DataManager.java b/core/src/main/java/com/gitplex/server/manager/DataManager.java
similarity index 55%
rename from core/src/main/java/com/gitplex/server/core/manager/DataManager.java
rename to core/src/main/java/com/gitplex/server/manager/DataManager.java
index 502e4fb9f0..c7d617c74c 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/DataManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/DataManager.java
@@ -1,11 +1,11 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.util.List;
import javax.annotation.Nullable;
-import com.gitplex.commons.util.init.ManualConfig;
-import com.gitplex.server.core.setting.BackupSetting;
+import com.gitplex.server.entity.support.setting.BackupSetting;
+import com.gitplex.server.util.init.ManualConfig;
public interface DataManager {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/DepotManager.java b/core/src/main/java/com/gitplex/server/manager/DepotManager.java
similarity index 87%
rename from core/src/main/java/com/gitplex/server/core/manager/DepotManager.java
rename to core/src/main/java/com/gitplex/server/manager/DepotManager.java
index 85ec189ca9..0583f80fa1 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/DepotManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/DepotManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.util.Collection;
@@ -6,9 +6,9 @@ import javax.annotation.Nullable;
import org.eclipse.jgit.lib.Repository;
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.persistence.dao.EntityManager;
public interface DepotManager extends EntityManager<Depot> {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/MailManager.java b/core/src/main/java/com/gitplex/server/manager/MailManager.java
similarity index 76%
rename from core/src/main/java/com/gitplex/server/core/manager/MailManager.java
rename to core/src/main/java/com/gitplex/server/manager/MailManager.java
index 87e0dd5f55..08474627ca 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/MailManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/MailManager.java
@@ -1,8 +1,8 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.util.Collection;
-import com.gitplex.server.core.setting.MailSetting;
+import com.gitplex.server.entity.support.setting.MailSetting;
public interface MailManager {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/OrganizationMembershipManager.java b/core/src/main/java/com/gitplex/server/manager/OrganizationMembershipManager.java
similarity index 70%
rename from core/src/main/java/com/gitplex/server/core/manager/OrganizationMembershipManager.java
rename to core/src/main/java/com/gitplex/server/manager/OrganizationMembershipManager.java
index f10ebe1da0..61ae0f3ade 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/OrganizationMembershipManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/OrganizationMembershipManager.java
@@ -1,13 +1,13 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.util.Collection;
import javax.annotation.Nullable;
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.OrganizationMembership;
-import com.gitplex.server.core.entity.TeamMembership;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.OrganizationMembership;
+import com.gitplex.server.entity.TeamMembership;
+import com.gitplex.server.persistence.dao.EntityManager;
public interface OrganizationMembershipManager extends EntityManager<OrganizationMembership> {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/PullRequestCommentManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestCommentManager.java
similarity index 50%
rename from core/src/main/java/com/gitplex/server/core/manager/PullRequestCommentManager.java
rename to core/src/main/java/com/gitplex/server/manager/PullRequestCommentManager.java
index ad091a5df8..f778abfa14 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/PullRequestCommentManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestCommentManager.java
@@ -1,7 +1,7 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.PullRequestComment;
+import com.gitplex.server.entity.PullRequestComment;
+import com.gitplex.server.persistence.dao.EntityManager;
public interface PullRequestCommentManager extends EntityManager<PullRequestComment> {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/PullRequestInfoManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestInfoManager.java
similarity index 77%
rename from core/src/main/java/com/gitplex/server/core/manager/PullRequestInfoManager.java
rename to core/src/main/java/com/gitplex/server/manager/PullRequestInfoManager.java
index 2be201ed8a..f84c5bf6dc 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/PullRequestInfoManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestInfoManager.java
@@ -1,10 +1,10 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.util.Collection;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
public interface PullRequestInfoManager {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/PullRequestManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestManager.java
similarity index 82%
rename from core/src/main/java/com/gitplex/server/core/manager/PullRequestManager.java
rename to core/src/main/java/com/gitplex/server/manager/PullRequestManager.java
index 5783d7dc67..3d5bad23bb 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/PullRequestManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestManager.java
@@ -1,17 +1,17 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.util.Collection;
import java.util.List;
import javax.annotation.Nullable;
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequest.IntegrationStrategy;
-import com.gitplex.server.core.entity.support.DepotAndBranch;
-import com.gitplex.server.core.entity.support.IntegrationPreview;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequest.IntegrationStrategy;
+import com.gitplex.server.entity.support.DepotAndBranch;
+import com.gitplex.server.entity.support.IntegrationPreview;
+import com.gitplex.server.persistence.dao.EntityManager;
public interface PullRequestManager extends EntityManager<PullRequest> {
diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestReferenceManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestReferenceManager.java
new file mode 100644
index 0000000000..159336d7e8
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestReferenceManager.java
@@ -0,0 +1,8 @@
+package com.gitplex.server.manager;
+
+import com.gitplex.server.entity.PullRequestReference;
+import com.gitplex.server.persistence.dao.EntityManager;
+
+public interface PullRequestReferenceManager extends EntityManager<PullRequestReference> {
+
+}
diff --git a/core/src/main/java/com/gitplex/server/core/manager/PullRequestReviewInvitationManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestReviewInvitationManager.java
similarity index 55%
rename from core/src/main/java/com/gitplex/server/core/manager/PullRequestReviewInvitationManager.java
rename to core/src/main/java/com/gitplex/server/manager/PullRequestReviewInvitationManager.java
index d16461a4b1..63d9fce295 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/PullRequestReviewInvitationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestReviewInvitationManager.java
@@ -1,12 +1,12 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.util.Collection;
import java.util.Date;
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestReviewInvitation;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestReviewInvitation;
+import com.gitplex.server.persistence.dao.EntityManager;
public interface PullRequestReviewInvitationManager extends EntityManager<PullRequestReviewInvitation> {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/PullRequestReviewManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestReviewManager.java
similarity index 66%
rename from core/src/main/java/com/gitplex/server/core/manager/PullRequestReviewManager.java
rename to core/src/main/java/com/gitplex/server/manager/PullRequestReviewManager.java
index d72df6b785..6aaf93d83d 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/PullRequestReviewManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestReviewManager.java
@@ -1,14 +1,14 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.util.List;
import javax.annotation.Nullable;
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestReview;
-import com.gitplex.server.core.entity.PullRequestUpdate;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestReview;
+import com.gitplex.server.entity.PullRequestUpdate;
+import com.gitplex.server.persistence.dao.EntityManager;
public interface PullRequestReviewManager extends EntityManager<PullRequestReview> {
diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestStatusChangeManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestStatusChangeManager.java
new file mode 100644
index 0000000000..dc453eb00f
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestStatusChangeManager.java
@@ -0,0 +1,8 @@
+package com.gitplex.server.manager;
+
+import com.gitplex.server.entity.PullRequestStatusChange;
+import com.gitplex.server.persistence.dao.EntityManager;
+
+public interface PullRequestStatusChangeManager extends EntityManager<PullRequestStatusChange> {
+
+}
diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestTaskManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestTaskManager.java
new file mode 100644
index 0000000000..f7f02204ab
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestTaskManager.java
@@ -0,0 +1,8 @@
+package com.gitplex.server.manager;
+
+import com.gitplex.server.entity.PullRequestTask;
+import com.gitplex.server.persistence.dao.EntityManager;
+
+public interface PullRequestTaskManager extends EntityManager<PullRequestTask> {
+
+}
diff --git a/core/src/main/java/com/gitplex/server/core/manager/PullRequestUpdateManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestUpdateManager.java
similarity index 74%
rename from core/src/main/java/com/gitplex/server/core/manager/PullRequestUpdateManager.java
rename to core/src/main/java/com/gitplex/server/manager/PullRequestUpdateManager.java
index 7d03a7bb5a..96f7bbdcec 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/PullRequestUpdateManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestUpdateManager.java
@@ -1,12 +1,12 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.util.List;
import javax.annotation.Nullable;
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequestUpdate;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequestUpdate;
+import com.gitplex.server.persistence.dao.EntityManager;
public interface PullRequestUpdateManager extends EntityManager<PullRequestUpdate> {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/PullRequestVerificationManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestVerificationManager.java
similarity index 65%
rename from core/src/main/java/com/gitplex/server/core/manager/PullRequestVerificationManager.java
rename to core/src/main/java/com/gitplex/server/manager/PullRequestVerificationManager.java
index 9cba1f7730..870f6e80d4 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/PullRequestVerificationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestVerificationManager.java
@@ -1,10 +1,10 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.util.Collection;
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestVerification;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestVerification;
+import com.gitplex.server.persistence.dao.EntityManager;
public interface PullRequestVerificationManager extends EntityManager<PullRequestVerification> {
diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestWatchManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestWatchManager.java
new file mode 100644
index 0000000000..f7e1d57bae
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestWatchManager.java
@@ -0,0 +1,8 @@
+package com.gitplex.server.manager;
+
+import com.gitplex.server.entity.PullRequestWatch;
+import com.gitplex.server.persistence.dao.EntityManager;
+
+public interface PullRequestWatchManager extends EntityManager<PullRequestWatch> {
+
+}
diff --git a/core/src/main/java/com/gitplex/server/core/manager/StorageManager.java b/core/src/main/java/com/gitplex/server/manager/StorageManager.java
similarity index 92%
rename from core/src/main/java/com/gitplex/server/core/manager/StorageManager.java
rename to core/src/main/java/com/gitplex/server/manager/StorageManager.java
index 15042872c9..cd65f2964e 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/StorageManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/StorageManager.java
@@ -1,8 +1,8 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.io.File;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
public interface StorageManager {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/TeamAuthorizationManager.java b/core/src/main/java/com/gitplex/server/manager/TeamAuthorizationManager.java
similarity index 54%
rename from core/src/main/java/com/gitplex/server/core/manager/TeamAuthorizationManager.java
rename to core/src/main/java/com/gitplex/server/manager/TeamAuthorizationManager.java
index 1c5e9b3b23..6f8aee6c89 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/TeamAuthorizationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/TeamAuthorizationManager.java
@@ -1,10 +1,10 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.util.Collection;
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.TeamAuthorization;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.TeamAuthorization;
+import com.gitplex.server.persistence.dao.EntityManager;
public interface TeamAuthorizationManager extends EntityManager<TeamAuthorization> {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/TeamManager.java b/core/src/main/java/com/gitplex/server/manager/TeamManager.java
similarity index 75%
rename from core/src/main/java/com/gitplex/server/core/manager/TeamManager.java
rename to core/src/main/java/com/gitplex/server/manager/TeamManager.java
index c5b59baddb..89c654447d 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/TeamManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/TeamManager.java
@@ -1,10 +1,10 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import javax.annotation.Nullable;
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Team;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Team;
+import com.gitplex.server.persistence.dao.EntityManager;
public interface TeamManager extends EntityManager<Team> {
/**
diff --git a/core/src/main/java/com/gitplex/server/core/manager/TeamMembershipManager.java b/core/src/main/java/com/gitplex/server/manager/TeamMembershipManager.java
similarity index 60%
rename from core/src/main/java/com/gitplex/server/core/manager/TeamMembershipManager.java
rename to core/src/main/java/com/gitplex/server/manager/TeamMembershipManager.java
index 44b4727d97..1281c7778b 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/TeamMembershipManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/TeamMembershipManager.java
@@ -1,10 +1,10 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.util.Collection;
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.TeamMembership;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.TeamMembership;
+import com.gitplex.server.persistence.dao.EntityManager;
public interface TeamMembershipManager extends EntityManager<TeamMembership> {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/UrlManager.java b/core/src/main/java/com/gitplex/server/manager/UrlManager.java
similarity index 50%
rename from core/src/main/java/com/gitplex/server/core/manager/UrlManager.java
rename to core/src/main/java/com/gitplex/server/manager/UrlManager.java
index 1faef4ab26..93fa7c45d9 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/UrlManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/UrlManager.java
@@ -1,14 +1,14 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import javax.annotation.Nullable;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestComment;
-import com.gitplex.server.core.entity.PullRequestStatusChange;
-import com.gitplex.server.core.entity.support.CodeCommentActivity;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestComment;
+import com.gitplex.server.entity.PullRequestStatusChange;
+import com.gitplex.server.entity.support.CodeCommentActivity;
public interface UrlManager {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/UserAuthorizationManager.java b/core/src/main/java/com/gitplex/server/manager/UserAuthorizationManager.java
similarity index 57%
rename from core/src/main/java/com/gitplex/server/core/manager/UserAuthorizationManager.java
rename to core/src/main/java/com/gitplex/server/manager/UserAuthorizationManager.java
index 79c32ed857..c3f2db636f 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/UserAuthorizationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/UserAuthorizationManager.java
@@ -1,13 +1,13 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.util.Collection;
import javax.annotation.Nullable;
-import com.gitplex.commons.hibernate.dao.EntityManager;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.UserAuthorization;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.UserAuthorization;
+import com.gitplex.server.persistence.dao.EntityManager;
public interface UserAuthorizationManager extends EntityManager<UserAuthorization> {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/VisitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/VisitInfoManager.java
similarity index 65%
rename from core/src/main/java/com/gitplex/server/core/manager/VisitInfoManager.java
rename to core/src/main/java/com/gitplex/server/manager/VisitInfoManager.java
index 7de13431a6..cf86dd62bd 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/VisitInfoManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/VisitInfoManager.java
@@ -1,13 +1,13 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.util.Date;
import javax.annotation.Nullable;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
public interface VisitInfoManager {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/WorkExecutor.java b/core/src/main/java/com/gitplex/server/manager/WorkExecutor.java
similarity index 87%
rename from core/src/main/java/com/gitplex/server/core/manager/WorkExecutor.java
rename to core/src/main/java/com/gitplex/server/manager/WorkExecutor.java
index db88fe3dc0..619bf913c5 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/WorkExecutor.java
+++ b/core/src/main/java/com/gitplex/server/manager/WorkExecutor.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager;
+package com.gitplex.server.manager;
import java.util.Collection;
import java.util.List;
@@ -7,8 +7,8 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import com.gitplex.commons.util.concurrent.PrioritizedCallable;
-import com.gitplex.commons.util.concurrent.PrioritizedRunnable;
+import com.gitplex.server.util.concurrent.PrioritizedCallable;
+import com.gitplex.server.util.concurrent.PrioritizedRunnable;
/**
* This executor is intended to run resource intensive long running tasks
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultAccountManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultAccountManager.java
similarity index 87%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultAccountManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultAccountManager.java
index a49584ec21..202a2dbef6 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultAccountManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultAccountManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.util.Iterator;
import java.util.List;
@@ -13,21 +13,21 @@ import org.hibernate.Query;
import org.hibernate.ReplicationMode;
import org.hibernate.criterion.Restrictions;
-import com.gitplex.commons.hibernate.Sessional;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestStatusChange;
-import com.gitplex.server.core.entity.support.IntegrationPolicy;
-import com.gitplex.server.core.event.lifecycle.SystemStarting;
-import com.gitplex.server.core.event.pullrequest.PullRequestStatusChangeEvent;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.PullRequestManager;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestStatusChange;
+import com.gitplex.server.entity.support.IntegrationPolicy;
+import com.gitplex.server.event.lifecycle.SystemStarting;
+import com.gitplex.server.event.pullrequest.PullRequestStatusChangeEvent;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.PullRequestManager;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultAttachmentManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.java
similarity index 83%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultAttachmentManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.java
index 37c83da24c..664266ff5c 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultAttachmentManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.io.File;
import java.io.IOException;
@@ -11,21 +11,21 @@ import org.quartz.ScheduleBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityPersisted;
-import com.gitplex.commons.hibernate.dao.EntityRemoved;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.commons.schedule.SchedulableTask;
-import com.gitplex.commons.schedule.TaskScheduler;
-import com.gitplex.commons.util.FileUtils;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.event.lifecycle.SystemStarted;
-import com.gitplex.server.core.event.lifecycle.SystemStopping;
-import com.gitplex.server.core.manager.AttachmentManager;
-import com.gitplex.server.core.manager.StorageManager;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.event.lifecycle.SystemStarted;
+import com.gitplex.server.event.lifecycle.SystemStopping;
+import com.gitplex.server.manager.AttachmentManager;
+import com.gitplex.server.manager.StorageManager;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityPersisted;
+import com.gitplex.server.persistence.dao.EntityRemoved;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.server.util.schedule.SchedulableTask;
+import com.gitplex.server.util.schedule.TaskScheduler;
@Singleton
public class DefaultAttachmentManager implements AttachmentManager, SchedulableTask {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultBatchWorkManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultBatchWorkManager.java
similarity index 84%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultBatchWorkManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultBatchWorkManager.java
index 09b5c38995..2005fb5927 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultBatchWorkManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultBatchWorkManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.util.ArrayList;
import java.util.Collection;
@@ -15,14 +15,14 @@ import javax.inject.Singleton;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.commons.util.concurrent.Prioritized;
-import com.gitplex.commons.util.concurrent.PrioritizedRunnable;
-import com.gitplex.server.core.event.lifecycle.SystemStarted;
-import com.gitplex.server.core.event.lifecycle.SystemStopping;
-import com.gitplex.server.core.manager.BatchWorkManager;
-import com.gitplex.server.core.manager.WorkExecutor;
-import com.gitplex.server.core.manager.support.BatchWorker;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.server.event.lifecycle.SystemStarted;
+import com.gitplex.server.event.lifecycle.SystemStopping;
+import com.gitplex.server.manager.BatchWorkManager;
+import com.gitplex.server.manager.WorkExecutor;
+import com.gitplex.server.manager.support.BatchWorker;
+import com.gitplex.server.util.concurrent.Prioritized;
+import com.gitplex.server.util.concurrent.PrioritizedRunnable;
@Singleton
public class DefaultBatchWorkManager implements BatchWorkManager, Runnable {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultBranchWatchManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultBranchWatchManager.java
similarity index 66%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultBranchWatchManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultBranchWatchManager.java
index 8233d14fbd..38c095fd82 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultBranchWatchManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultBranchWatchManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.util.Collection;
@@ -7,14 +7,14 @@ import javax.inject.Singleton;
import org.hibernate.criterion.Restrictions;
-import com.gitplex.commons.hibernate.Sessional;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.BranchWatch;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.BranchWatchManager;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.BranchWatch;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.BranchWatchManager;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
@Singleton
public class DefaultBranchWatchManager extends AbstractEntityManager<BranchWatch> implements BranchWatchManager {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentInfoManager.java
similarity index 90%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentInfoManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentInfoManager.java
index 0466c2f1ff..da16aef354 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentInfoManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentInfoManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.io.File;
import java.io.Serializable;
@@ -23,24 +23,24 @@ import org.eclipse.jgit.lib.ObjectId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.UnitOfWork;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.commons.util.FileUtils;
-import com.gitplex.commons.util.concurrent.Prioritized;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.support.CompareContext;
-import com.gitplex.server.core.event.codecomment.CodeCommentCreated;
-import com.gitplex.server.core.event.depot.DepotDeleted;
-import com.gitplex.server.core.event.lifecycle.SystemStopping;
-import com.gitplex.server.core.manager.BatchWorkManager;
-import com.gitplex.server.core.manager.CodeCommentInfoManager;
-import com.gitplex.server.core.manager.CodeCommentManager;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.manager.StorageManager;
-import com.gitplex.server.core.manager.support.BatchWorker;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.support.CompareContext;
+import com.gitplex.server.event.codecomment.CodeCommentCreated;
+import com.gitplex.server.event.depot.DepotDeleted;
+import com.gitplex.server.event.lifecycle.SystemStopping;
+import com.gitplex.server.manager.BatchWorkManager;
+import com.gitplex.server.manager.CodeCommentInfoManager;
+import com.gitplex.server.manager.CodeCommentManager;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.manager.StorageManager;
+import com.gitplex.server.manager.support.BatchWorker;
+import com.gitplex.server.persistence.UnitOfWork;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.server.util.concurrent.Prioritized;
import jetbrains.exodus.ArrayByteIterable;
import jetbrains.exodus.ByteIterable;
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.java
similarity index 80%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.java
index dd83bd4629..ada1e50d8a 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.util.ArrayList;
import java.util.Collection;
@@ -16,34 +16,34 @@ import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.hibernate.Sessional;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.calla.loader.ListenerRegistry;
-import com.gitplex.commons.markdown.MarkdownManager;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.CodeCommentRelation;
-import com.gitplex.server.core.entity.CodeCommentStatusChange;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.support.CodeCommentActivity;
-import com.gitplex.server.core.event.codecomment.CodeCommentActivityEvent;
-import com.gitplex.server.core.event.codecomment.CodeCommentCreated;
-import com.gitplex.server.core.event.codecomment.CodeCommentEvent;
-import com.gitplex.server.core.event.codecomment.CodeCommentResolved;
-import com.gitplex.server.core.event.codecomment.CodeCommentUnresolved;
-import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentActivityEvent;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.CodeCommentManager;
-import com.gitplex.server.core.manager.CodeCommentStatusChangeManager;
-import com.gitplex.server.core.manager.MailManager;
-import com.gitplex.server.core.manager.PullRequestManager;
-import com.gitplex.server.core.manager.UrlManager;
-import com.gitplex.server.core.util.markdown.MentionParser;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.launcher.loader.ListenerRegistry;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.CodeCommentRelation;
+import com.gitplex.server.entity.CodeCommentStatusChange;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.support.CodeCommentActivity;
+import com.gitplex.server.event.codecomment.CodeCommentActivityEvent;
+import com.gitplex.server.event.codecomment.CodeCommentCreated;
+import com.gitplex.server.event.codecomment.CodeCommentEvent;
+import com.gitplex.server.event.codecomment.CodeCommentResolved;
+import com.gitplex.server.event.codecomment.CodeCommentUnresolved;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.CodeCommentManager;
+import com.gitplex.server.manager.CodeCommentStatusChangeManager;
+import com.gitplex.server.manager.MailManager;
+import com.gitplex.server.manager.PullRequestManager;
+import com.gitplex.server.manager.UrlManager;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.util.markdown.MarkdownManager;
+import com.gitplex.server.util.markdown.MentionParser;
@Singleton
public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment> implements CodeCommentManager {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentRelationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationManager.java
similarity index 84%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentRelationManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationManager.java
index 350ec2220e..3ca7e49726 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentRelationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.util.Collection;
import java.util.Collections;
@@ -14,24 +14,24 @@ import javax.inject.Singleton;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.calla.loader.ListenerRegistry;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.CodeCommentRelation;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestUpdate;
-import com.gitplex.server.core.entity.support.CompareContext;
-import com.gitplex.server.core.event.codecomment.CodeCommentCreated;
-import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentCreated;
-import com.gitplex.server.core.manager.CodeCommentInfoManager;
-import com.gitplex.server.core.manager.CodeCommentManager;
-import com.gitplex.server.core.manager.CodeCommentRelationManager;
-import com.gitplex.server.core.manager.PullRequestInfoManager;
-import com.gitplex.server.core.manager.PullRequestManager;
-import com.gitplex.server.core.manager.VisitInfoManager;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.launcher.loader.ListenerRegistry;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.CodeCommentRelation;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestUpdate;
+import com.gitplex.server.entity.support.CompareContext;
+import com.gitplex.server.event.codecomment.CodeCommentCreated;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentCreated;
+import com.gitplex.server.manager.CodeCommentInfoManager;
+import com.gitplex.server.manager.CodeCommentManager;
+import com.gitplex.server.manager.CodeCommentRelationManager;
+import com.gitplex.server.manager.PullRequestInfoManager;
+import com.gitplex.server.manager.PullRequestManager;
+import com.gitplex.server.manager.VisitInfoManager;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
@Singleton
public class DefaultCodeCommentRelationManager extends AbstractEntityManager<CodeCommentRelation>
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentReplyManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentReplyManager.java
similarity index 67%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentReplyManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentReplyManager.java
index 4bd9665370..d508b270f2 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentReplyManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentReplyManager.java
@@ -1,16 +1,16 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.calla.loader.ListenerRegistry;
-import com.gitplex.server.core.entity.CodeCommentReply;
-import com.gitplex.server.core.event.codecomment.CodeCommentReplied;
-import com.gitplex.server.core.manager.CodeCommentManager;
-import com.gitplex.server.core.manager.CodeCommentReplyManager;
+import com.gitplex.launcher.loader.ListenerRegistry;
+import com.gitplex.server.entity.CodeCommentReply;
+import com.gitplex.server.event.codecomment.CodeCommentReplied;
+import com.gitplex.server.manager.CodeCommentManager;
+import com.gitplex.server.manager.CodeCommentReplyManager;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
@Singleton
public class DefaultCodeCommentReplyManager extends AbstractEntityManager<CodeCommentReply>
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentStatusChangeManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentStatusChangeManager.java
similarity index 51%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentStatusChangeManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentStatusChangeManager.java
index 40773de261..4b12298671 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCodeCommentStatusChangeManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentStatusChangeManager.java
@@ -1,12 +1,12 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.server.core.entity.CodeCommentStatusChange;
-import com.gitplex.server.core.manager.CodeCommentStatusChangeManager;
+import com.gitplex.server.entity.CodeCommentStatusChange;
+import com.gitplex.server.manager.CodeCommentStatusChangeManager;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
@Singleton
public class DefaultCodeCommentStatusChangeManager extends AbstractEntityManager<CodeCommentStatusChange>
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCommitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.java
similarity index 95%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCommitInfoManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.java
index 8c443ee439..0393ad8ecd 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultCommitInfoManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.io.File;
import java.io.IOException;
@@ -33,22 +33,22 @@ import org.eclipse.jgit.treewalk.TreeWalk;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.git.NameAndEmail;
-import com.gitplex.commons.hibernate.UnitOfWork;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.commons.util.FileUtils;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.commons.util.concurrent.Prioritized;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.event.RefUpdated;
-import com.gitplex.server.core.event.depot.DepotDeleted;
-import com.gitplex.server.core.event.lifecycle.SystemStopping;
-import com.gitplex.server.core.manager.BatchWorkManager;
-import com.gitplex.server.core.manager.CommitInfoManager;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.manager.StorageManager;
-import com.gitplex.server.core.manager.support.BatchWorker;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.event.RefUpdated;
+import com.gitplex.server.event.depot.DepotDeleted;
+import com.gitplex.server.event.lifecycle.SystemStopping;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.git.NameAndEmail;
+import com.gitplex.server.manager.BatchWorkManager;
+import com.gitplex.server.manager.CommitInfoManager;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.manager.StorageManager;
+import com.gitplex.server.manager.support.BatchWorker;
+import com.gitplex.server.persistence.UnitOfWork;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.util.concurrent.Prioritized;
import jetbrains.exodus.ArrayByteIterable;
import jetbrains.exodus.ByteIterable;
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultConfigManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultConfigManager.java
similarity index 82%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultConfigManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultConfigManager.java
index 04ef456aad..3baeee909b 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultConfigManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultConfigManager.java
@@ -1,24 +1,24 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.hibernate.criterion.Restrictions;
+import com.gitplex.server.entity.Config;
+import com.gitplex.server.entity.Config.Key;
+import com.gitplex.server.entity.support.setting.BackupSetting;
+import com.gitplex.server.entity.support.setting.MailSetting;
+import com.gitplex.server.entity.support.setting.SecuritySetting;
+import com.gitplex.server.entity.support.setting.SystemSetting;
+import com.gitplex.server.manager.ConfigManager;
+import com.gitplex.server.manager.DataManager;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.hibernate.Sessional;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.server.core.entity.Config;
-import com.gitplex.server.core.entity.Config.Key;
-import com.gitplex.server.core.manager.ConfigManager;
-import com.gitplex.server.core.manager.DataManager;
-import com.gitplex.server.core.setting.BackupSetting;
-import com.gitplex.server.core.setting.MailSetting;
-import com.gitplex.server.core.setting.SecuritySetting;
-import com.gitplex.server.core.setting.SystemSetting;
@Singleton
public class DefaultConfigManager extends AbstractEntityManager<Config> implements ConfigManager {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultDataManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultDataManager.java
similarity index 83%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultDataManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultDataManager.java
index a445a4f6dd..4af2f0e8af 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultDataManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultDataManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.io.File;
import java.io.ObjectStreamException;
@@ -16,32 +16,32 @@ import org.joda.time.format.DateTimeFormat;
import org.quartz.CronScheduleBuilder;
import org.quartz.ScheduleBuilder;
-import com.gitplex.calla.bootstrap.Bootstrap;
-import com.gitplex.calla.bootstrap.BootstrapUtils;
-import com.gitplex.commons.hibernate.IdManager;
-import com.gitplex.commons.hibernate.PersistManager;
-import com.gitplex.commons.hibernate.Sessional;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.calla.loader.ManagedSerializedForm;
-import com.gitplex.commons.schedule.SchedulableTask;
-import com.gitplex.commons.schedule.TaskScheduler;
-import com.gitplex.commons.util.FileUtils;
-import com.gitplex.commons.util.init.ManualConfig;
-import com.gitplex.commons.util.init.Skippable;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Config;
-import com.gitplex.server.core.entity.Config.Key;
-import com.gitplex.server.core.event.lifecycle.SystemStarting;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.ConfigManager;
-import com.gitplex.server.core.manager.DataManager;
-import com.gitplex.server.core.manager.MailManager;
-import com.gitplex.server.core.setting.BackupSetting;
-import com.gitplex.server.core.setting.MailSetting;
-import com.gitplex.server.core.setting.SecuritySetting;
-import com.gitplex.server.core.setting.SystemSetting;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.launcher.loader.ManagedSerializedForm;
+import com.gitplex.launcher.bootstrap.Bootstrap;
+import com.gitplex.launcher.bootstrap.BootstrapUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Config;
+import com.gitplex.server.entity.Config.Key;
+import com.gitplex.server.entity.support.setting.BackupSetting;
+import com.gitplex.server.entity.support.setting.MailSetting;
+import com.gitplex.server.entity.support.setting.SecuritySetting;
+import com.gitplex.server.entity.support.setting.SystemSetting;
+import com.gitplex.server.event.lifecycle.SystemStarting;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.ConfigManager;
+import com.gitplex.server.manager.DataManager;
+import com.gitplex.server.manager.MailManager;
+import com.gitplex.server.persistence.IdManager;
+import com.gitplex.server.persistence.PersistManager;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.server.util.init.ManualConfig;
+import com.gitplex.server.util.init.Skippable;
+import com.gitplex.server.util.schedule.SchedulableTask;
+import com.gitplex.server.util.schedule.TaskScheduler;
import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultDepotManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.java
similarity index 87%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultDepotManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.java
index d11f49485b..e703121880 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultDepotManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.io.File;
import java.io.IOException;
@@ -29,38 +29,38 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.git.command.CloneCommand;
-import com.gitplex.commons.hibernate.Sessional;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.calla.loader.ListenerRegistry;
-import com.gitplex.commons.util.FileUtils;
-import com.gitplex.commons.util.Pair;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.Team;
-import com.gitplex.server.core.entity.TeamAuthorization;
-import com.gitplex.server.core.entity.support.IntegrationPolicy;
-import com.gitplex.server.core.event.RefUpdated;
-import com.gitplex.server.core.event.depot.DepotDeleted;
-import com.gitplex.server.core.event.depot.DepotRenamed;
-import com.gitplex.server.core.event.depot.DepotTransferred;
-import com.gitplex.server.core.event.lifecycle.SystemStarted;
-import com.gitplex.server.core.event.lifecycle.SystemStarting;
-import com.gitplex.server.core.event.lifecycle.SystemStopping;
-import com.gitplex.server.core.gatekeeper.GateKeeper;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.CodeCommentInfoManager;
-import com.gitplex.server.core.manager.CommitInfoManager;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.manager.PullRequestInfoManager;
-import com.gitplex.server.core.manager.TeamAuthorizationManager;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.launcher.loader.ListenerRegistry;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.Team;
+import com.gitplex.server.entity.TeamAuthorization;
+import com.gitplex.server.entity.support.IntegrationPolicy;
+import com.gitplex.server.event.RefUpdated;
+import com.gitplex.server.event.depot.DepotDeleted;
+import com.gitplex.server.event.depot.DepotRenamed;
+import com.gitplex.server.event.depot.DepotTransferred;
+import com.gitplex.server.event.lifecycle.SystemStarted;
+import com.gitplex.server.event.lifecycle.SystemStarting;
+import com.gitplex.server.event.lifecycle.SystemStopping;
+import com.gitplex.server.gatekeeper.GateKeeper;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.git.command.CloneCommand;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.CodeCommentInfoManager;
+import com.gitplex.server.manager.CommitInfoManager;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.manager.PullRequestInfoManager;
+import com.gitplex.server.manager.TeamAuthorizationManager;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.security.privilege.DepotPrivilege;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.server.util.Pair;
+import com.gitplex.server.util.StringUtils;
@Singleton
public class DefaultDepotManager extends AbstractEntityManager<Depot> implements DepotManager {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultMailManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultMailManager.java
similarity index 90%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultMailManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultMailManager.java
index 4eb0c05e01..fd680f2144 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultMailManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultMailManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -15,12 +15,12 @@ import org.hibernate.resource.transaction.spi.TransactionStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.calla.bootstrap.Bootstrap;
-import com.gitplex.commons.hibernate.Sessional;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.server.core.manager.ConfigManager;
-import com.gitplex.server.core.manager.MailManager;
-import com.gitplex.server.core.setting.MailSetting;
+import com.gitplex.launcher.bootstrap.Bootstrap;
+import com.gitplex.server.entity.support.setting.MailSetting;
+import com.gitplex.server.manager.ConfigManager;
+import com.gitplex.server.manager.MailManager;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.dao.Dao;
@Singleton
public class DefaultMailManager implements MailManager {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultOrganizationMembershipManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultOrganizationMembershipManager.java
similarity index 81%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultOrganizationMembershipManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultOrganizationMembershipManager.java
index 2e95abc5d1..7802b32e0c 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultOrganizationMembershipManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultOrganizationMembershipManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.util.Collection;
@@ -7,17 +7,17 @@ import javax.inject.Singleton;
import org.hibernate.criterion.Restrictions;
-import com.gitplex.commons.hibernate.Sessional;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.OrganizationMembership;
-import com.gitplex.server.core.entity.TeamMembership;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.OrganizationMembershipManager;
-import com.gitplex.server.core.manager.TeamMembershipManager;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.OrganizationMembership;
+import com.gitplex.server.entity.TeamMembership;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.OrganizationMembershipManager;
+import com.gitplex.server.manager.TeamMembershipManager;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
@Singleton
public class DefaultOrganizationMembershipManager extends AbstractEntityManager<OrganizationMembership>
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestCommentManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestCommentManager.java
similarity index 66%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestCommentManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestCommentManager.java
index ff93b01398..fed96b5393 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestCommentManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestCommentManager.java
@@ -1,18 +1,18 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.calla.loader.ListenerRegistry;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.server.core.entity.PullRequestComment;
-import com.gitplex.server.core.entity.support.LastEvent;
-import com.gitplex.server.core.event.pullrequest.PullRequestCommentCreated;
-import com.gitplex.server.core.manager.PullRequestCommentManager;
-import com.gitplex.server.core.manager.PullRequestManager;
+import com.gitplex.launcher.loader.ListenerRegistry;
+import com.gitplex.server.entity.PullRequestComment;
+import com.gitplex.server.entity.support.LastEvent;
+import com.gitplex.server.event.pullrequest.PullRequestCommentCreated;
+import com.gitplex.server.manager.PullRequestCommentManager;
+import com.gitplex.server.manager.PullRequestManager;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.util.editable.EditableUtils;
@Singleton
public class DefaultPullRequestCommentManager extends AbstractEntityManager<PullRequestComment>
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestInfoManager.java
similarity index 89%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestInfoManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestInfoManager.java
index 9349a1b780..0326edd76d 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestInfoManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestInfoManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.io.File;
import java.io.IOException;
@@ -23,24 +23,24 @@ import org.eclipse.jgit.revwalk.RevWalk;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.UnitOfWork;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityPersisted;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.commons.util.FileUtils;
-import com.gitplex.commons.util.concurrent.Prioritized;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequestUpdate;
-import com.gitplex.server.core.event.depot.DepotDeleted;
-import com.gitplex.server.core.event.lifecycle.SystemStopping;
-import com.gitplex.server.core.manager.BatchWorkManager;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.manager.PullRequestInfoManager;
-import com.gitplex.server.core.manager.PullRequestUpdateManager;
-import com.gitplex.server.core.manager.StorageManager;
-import com.gitplex.server.core.manager.support.BatchWorker;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequestUpdate;
+import com.gitplex.server.event.depot.DepotDeleted;
+import com.gitplex.server.event.lifecycle.SystemStopping;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.manager.BatchWorkManager;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.manager.PullRequestInfoManager;
+import com.gitplex.server.manager.PullRequestUpdateManager;
+import com.gitplex.server.manager.StorageManager;
+import com.gitplex.server.manager.support.BatchWorker;
+import com.gitplex.server.persistence.UnitOfWork;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityPersisted;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.server.util.concurrent.Prioritized;
import jetbrains.exodus.ArrayByteIterable;
import jetbrains.exodus.ByteIterable;
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
similarity index 86%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
index 3e7baf5853..0fb0152fb6 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
@@ -1,16 +1,16 @@
-package com.gitplex.server.core.manager.impl;
-
-import static com.gitplex.server.core.entity.PullRequest.CriterionHelper.ofOpen;
-import static com.gitplex.server.core.entity.PullRequest.CriterionHelper.ofSource;
-import static com.gitplex.server.core.entity.PullRequest.CriterionHelper.ofSourceDepot;
-import static com.gitplex.server.core.entity.PullRequest.CriterionHelper.ofSubmitter;
-import static com.gitplex.server.core.entity.PullRequest.CriterionHelper.ofTarget;
-import static com.gitplex.server.core.entity.PullRequest.CriterionHelper.ofTargetDepot;
-import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.MERGE_ALWAYS;
-import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.MERGE_IF_NECESSARY;
-import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;
-import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;
-import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;
+package com.gitplex.server.manager.impl;
+
+import static com.gitplex.server.entity.PullRequest.CriterionHelper.ofOpen;
+import static com.gitplex.server.entity.PullRequest.CriterionHelper.ofSource;
+import static com.gitplex.server.entity.PullRequest.CriterionHelper.ofSourceDepot;
+import static com.gitplex.server.entity.PullRequest.CriterionHelper.ofSubmitter;
+import static com.gitplex.server.entity.PullRequest.CriterionHelper.ofTarget;
+import static com.gitplex.server.entity.PullRequest.CriterionHelper.ofTargetDepot;
+import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.MERGE_ALWAYS;
+import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.MERGE_IF_NECESSARY;
+import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;
+import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;
+import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;
import java.util.Collection;
import java.util.Date;
@@ -47,52 +47,52 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.hibernate.Sessional;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.UnitOfWork;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.calla.loader.ListenerRegistry;
-import com.gitplex.commons.markdown.MarkdownManager;
-import com.gitplex.commons.util.concurrent.Prioritized;
-import com.gitplex.commons.util.match.PatternMatcher;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestReviewInvitation;
-import com.gitplex.server.core.entity.PullRequestStatusChange;
-import com.gitplex.server.core.entity.PullRequestUpdate;
-import com.gitplex.server.core.entity.PullRequest.IntegrationStrategy;
-import com.gitplex.server.core.entity.PullRequestStatusChange.Type;
-import com.gitplex.server.core.entity.support.CloseInfo;
-import com.gitplex.server.core.entity.support.DepotAndBranch;
-import com.gitplex.server.core.entity.support.IntegrationPolicy;
-import com.gitplex.server.core.entity.support.IntegrationPreview;
-import com.gitplex.server.core.event.RefUpdated;
-import com.gitplex.server.core.event.depot.DepotDeleted;
-import com.gitplex.server.core.event.pullrequest.IntegrationPreviewCalculated;
-import com.gitplex.server.core.event.pullrequest.PullRequestOpened;
-import com.gitplex.server.core.event.pullrequest.PullRequestPendingApproval;
-import com.gitplex.server.core.event.pullrequest.PullRequestPendingIntegration;
-import com.gitplex.server.core.event.pullrequest.PullRequestPendingUpdate;
-import com.gitplex.server.core.event.pullrequest.PullRequestStatusChangeEvent;
-import com.gitplex.server.core.gatekeeper.checkresult.Failed;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
-import com.gitplex.server.core.gatekeeper.checkresult.Pending;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.BatchWorkManager;
-import com.gitplex.server.core.manager.PullRequestManager;
-import com.gitplex.server.core.manager.PullRequestReviewInvitationManager;
-import com.gitplex.server.core.manager.PullRequestStatusChangeManager;
-import com.gitplex.server.core.manager.PullRequestUpdateManager;
-import com.gitplex.server.core.manager.support.BatchWorker;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.core.util.ChildAwareMatcher;
-import com.gitplex.server.core.util.fullbranchmatch.FullBranchMatchUtils;
-import com.gitplex.server.core.util.includeexclude.IncludeExcludeUtils;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.launcher.loader.ListenerRegistry;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestReviewInvitation;
+import com.gitplex.server.entity.PullRequestStatusChange;
+import com.gitplex.server.entity.PullRequestUpdate;
+import com.gitplex.server.entity.PullRequest.IntegrationStrategy;
+import com.gitplex.server.entity.PullRequestStatusChange.Type;
+import com.gitplex.server.entity.support.CloseInfo;
+import com.gitplex.server.entity.support.DepotAndBranch;
+import com.gitplex.server.entity.support.IntegrationPolicy;
+import com.gitplex.server.entity.support.IntegrationPreview;
+import com.gitplex.server.event.RefUpdated;
+import com.gitplex.server.event.depot.DepotDeleted;
+import com.gitplex.server.event.pullrequest.IntegrationPreviewCalculated;
+import com.gitplex.server.event.pullrequest.PullRequestOpened;
+import com.gitplex.server.event.pullrequest.PullRequestPendingApproval;
+import com.gitplex.server.event.pullrequest.PullRequestPendingIntegration;
+import com.gitplex.server.event.pullrequest.PullRequestPendingUpdate;
+import com.gitplex.server.event.pullrequest.PullRequestStatusChangeEvent;
+import com.gitplex.server.gatekeeper.checkresult.Failed;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.gatekeeper.checkresult.Pending;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.BatchWorkManager;
+import com.gitplex.server.manager.PullRequestManager;
+import com.gitplex.server.manager.PullRequestReviewInvitationManager;
+import com.gitplex.server.manager.PullRequestStatusChangeManager;
+import com.gitplex.server.manager.PullRequestUpdateManager;
+import com.gitplex.server.manager.support.BatchWorker;
+import com.gitplex.server.persistence.UnitOfWork;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.concurrent.Prioritized;
+import com.gitplex.server.util.fullbranchmatch.FullBranchMatchUtils;
+import com.gitplex.server.util.includeexclude.IncludeExcludeUtils;
+import com.gitplex.server.util.markdown.MarkdownManager;
+import com.gitplex.server.util.match.ChildAwareMatcher;
+import com.gitplex.server.util.match.PatternMatcher;
@Singleton
public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest> implements PullRequestManager {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestReferenceManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReferenceManager.java
similarity index 67%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestReferenceManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReferenceManager.java
index 53b594add5..68b016cd0a 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestReferenceManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReferenceManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.util.Date;
@@ -7,19 +7,19 @@ import javax.inject.Singleton;
import org.hibernate.criterion.Restrictions;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.commons.markdown.MarkdownManager;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestReference;
-import com.gitplex.server.core.event.MarkdownAware;
-import com.gitplex.server.core.event.pullrequest.PullRequestChangeEvent;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.PullRequestReferenceManager;
-import com.gitplex.server.core.util.markdown.PullRequestParser;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestReference;
+import com.gitplex.server.event.MarkdownAware;
+import com.gitplex.server.event.pullrequest.PullRequestChangeEvent;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.PullRequestReferenceManager;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.util.markdown.MarkdownManager;
+import com.gitplex.server.util.markdown.PullRequestParser;
@Singleton
public class DefaultPullRequestReferenceManager extends AbstractEntityManager<PullRequestReference>
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestReviewInvitationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewInvitationManager.java
similarity index 67%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestReviewInvitationManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewInvitationManager.java
index 54b1b67567..3de4e77970 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestReviewInvitationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewInvitationManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.util.Collection;
import java.util.Date;
@@ -8,18 +8,18 @@ import javax.inject.Singleton;
import org.hibernate.criterion.Restrictions;
-import com.gitplex.commons.hibernate.Sessional;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.calla.loader.ListenerRegistry;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestReviewInvitation;
-import com.gitplex.server.core.event.pullrequest.PullRequestReviewInvitationChanged;
-import com.gitplex.server.core.manager.PullRequestReviewInvitationManager;
-import com.gitplex.server.core.manager.PullRequestReviewManager;
+import com.gitplex.launcher.loader.ListenerRegistry;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestReviewInvitation;
+import com.gitplex.server.event.pullrequest.PullRequestReviewInvitationChanged;
+import com.gitplex.server.manager.PullRequestReviewInvitationManager;
+import com.gitplex.server.manager.PullRequestReviewManager;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
@Singleton
public class DefaultPullRequestReviewInvitationManager extends AbstractEntityManager<PullRequestReviewInvitation>
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestReviewManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewManager.java
similarity index 78%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestReviewManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewManager.java
index b8d58d52c1..2befce6aae 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestReviewManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.util.Date;
import java.util.Iterator;
@@ -10,21 +10,21 @@ import javax.inject.Singleton;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
-import com.gitplex.commons.hibernate.Sessional;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestReview;
-import com.gitplex.server.core.entity.PullRequestStatusChange;
-import com.gitplex.server.core.entity.PullRequestUpdate;
-import com.gitplex.server.core.entity.PullRequestStatusChange.Type;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.PullRequestManager;
-import com.gitplex.server.core.manager.PullRequestReviewManager;
-import com.gitplex.server.core.manager.PullRequestStatusChangeManager;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestReview;
+import com.gitplex.server.entity.PullRequestStatusChange;
+import com.gitplex.server.entity.PullRequestUpdate;
+import com.gitplex.server.entity.PullRequestStatusChange.Type;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.PullRequestManager;
+import com.gitplex.server.manager.PullRequestReviewManager;
+import com.gitplex.server.manager.PullRequestStatusChangeManager;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
@Singleton
public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullRequestReview> implements PullRequestReviewManager {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestStatusChangeManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestStatusChangeManager.java
similarity index 59%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestStatusChangeManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestStatusChangeManager.java
index f0e69e35b9..77a92e47f9 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestStatusChangeManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestStatusChangeManager.java
@@ -1,14 +1,14 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.calla.loader.ListenerRegistry;
-import com.gitplex.server.core.entity.PullRequestStatusChange;
-import com.gitplex.server.core.event.pullrequest.PullRequestStatusChangeEvent;
-import com.gitplex.server.core.manager.PullRequestStatusChangeManager;
+import com.gitplex.launcher.loader.ListenerRegistry;
+import com.gitplex.server.entity.PullRequestStatusChange;
+import com.gitplex.server.event.pullrequest.PullRequestStatusChangeEvent;
+import com.gitplex.server.manager.PullRequestStatusChangeManager;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
@Singleton
public class DefaultPullRequestStatusChangeManager extends AbstractEntityManager<PullRequestStatusChange>
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestTaskManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestTaskManager.java
similarity index 83%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestTaskManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestTaskManager.java
index 38e04e152a..acf8d8d159 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestTaskManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestTaskManager.java
@@ -1,9 +1,9 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
-import static com.gitplex.server.core.entity.PullRequest.Status.PENDING_INTEGRATE;
-import static com.gitplex.server.core.entity.PullRequestTask.Type.INTEGRATE;
-import static com.gitplex.server.core.entity.PullRequestTask.Type.REVIEW;
-import static com.gitplex.server.core.entity.PullRequestTask.Type.UPDATE;
+import static com.gitplex.server.entity.PullRequest.Status.PENDING_INTEGRATE;
+import static com.gitplex.server.entity.PullRequestTask.Type.INTEGRATE;
+import static com.gitplex.server.entity.PullRequestTask.Type.REVIEW;
+import static com.gitplex.server.entity.PullRequestTask.Type.UPDATE;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -13,27 +13,27 @@ import org.hibernate.criterion.Restrictions;
import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.calla.loader.ListenerRegistry;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestReviewInvitation;
-import com.gitplex.server.core.entity.PullRequestStatusChange;
-import com.gitplex.server.core.entity.PullRequestTask;
-import com.gitplex.server.core.event.TaskChangeEvent;
-import com.gitplex.server.core.event.pullrequest.PullRequestPendingApproval;
-import com.gitplex.server.core.event.pullrequest.PullRequestPendingIntegration;
-import com.gitplex.server.core.event.pullrequest.PullRequestPendingUpdate;
-import com.gitplex.server.core.event.pullrequest.PullRequestReviewInvitationChanged;
-import com.gitplex.server.core.event.pullrequest.PullRequestStatusChangeEvent;
-import com.gitplex.server.core.event.pullrequest.PullRequestUpdated;
-import com.gitplex.server.core.manager.MailManager;
-import com.gitplex.server.core.manager.PullRequestTaskManager;
-import com.gitplex.server.core.manager.UrlManager;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.launcher.loader.ListenerRegistry;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestReviewInvitation;
+import com.gitplex.server.entity.PullRequestStatusChange;
+import com.gitplex.server.entity.PullRequestTask;
+import com.gitplex.server.event.TaskChangeEvent;
+import com.gitplex.server.event.pullrequest.PullRequestPendingApproval;
+import com.gitplex.server.event.pullrequest.PullRequestPendingIntegration;
+import com.gitplex.server.event.pullrequest.PullRequestPendingUpdate;
+import com.gitplex.server.event.pullrequest.PullRequestReviewInvitationChanged;
+import com.gitplex.server.event.pullrequest.PullRequestStatusChangeEvent;
+import com.gitplex.server.event.pullrequest.PullRequestUpdated;
+import com.gitplex.server.manager.MailManager;
+import com.gitplex.server.manager.PullRequestTaskManager;
+import com.gitplex.server.manager.UrlManager;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
/**
* This class manages pull request tasks and send task notifications if necessary.
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestUpdateManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestUpdateManager.java
similarity index 76%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestUpdateManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestUpdateManager.java
index f25c67fd8f..f51ad829ac 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestUpdateManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestUpdateManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.util.List;
@@ -12,22 +12,22 @@ import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import com.google.common.base.Throwables;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.hibernate.Sessional;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.calla.loader.ListenerRegistry;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestUpdate;
-import com.gitplex.server.core.entity.support.LastEvent;
-import com.gitplex.server.core.event.pullrequest.PullRequestUpdated;
-import com.gitplex.server.core.manager.PullRequestCommentManager;
-import com.gitplex.server.core.manager.PullRequestManager;
-import com.gitplex.server.core.manager.PullRequestUpdateManager;
+import com.gitplex.launcher.loader.ListenerRegistry;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestUpdate;
+import com.gitplex.server.entity.support.LastEvent;
+import com.gitplex.server.event.pullrequest.PullRequestUpdated;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.manager.PullRequestCommentManager;
+import com.gitplex.server.manager.PullRequestManager;
+import com.gitplex.server.manager.PullRequestUpdateManager;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.util.editable.EditableUtils;
@Singleton
public class DefaultPullRequestUpdateManager extends AbstractEntityManager<PullRequestUpdate>
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestVerificationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestVerificationManager.java
similarity index 79%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestVerificationManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestVerificationManager.java
index fb11ebbc88..639cd3a7b3 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestVerificationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestVerificationManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.util.Collection;
import java.util.Date;
@@ -8,22 +8,22 @@ import javax.inject.Singleton;
import org.hibernate.criterion.Restrictions;
-import com.gitplex.commons.hibernate.Sessional;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.calla.loader.ListenerRegistry;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestStatusChange;
-import com.gitplex.server.core.entity.PullRequestVerification;
-import com.gitplex.server.core.entity.PullRequestStatusChange.Type;
-import com.gitplex.server.core.entity.PullRequestVerification.Status;
-import com.gitplex.server.core.event.pullrequest.PullRequestVerificationRunning;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.PullRequestManager;
-import com.gitplex.server.core.manager.PullRequestStatusChangeManager;
-import com.gitplex.server.core.manager.PullRequestVerificationManager;
+import com.gitplex.launcher.loader.ListenerRegistry;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestStatusChange;
+import com.gitplex.server.entity.PullRequestVerification;
+import com.gitplex.server.entity.PullRequestStatusChange.Type;
+import com.gitplex.server.entity.PullRequestVerification.Status;
+import com.gitplex.server.event.pullrequest.PullRequestVerificationRunning;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.PullRequestManager;
+import com.gitplex.server.manager.PullRequestStatusChangeManager;
+import com.gitplex.server.manager.PullRequestVerificationManager;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
@Singleton
public class DefaultPullRequestVerificationManager extends AbstractEntityManager<PullRequestVerification>
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestWatchManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestWatchManager.java
similarity index 82%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestWatchManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestWatchManager.java
index 0d0df08f30..612d8619b3 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultPullRequestWatchManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestWatchManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.util.Collection;
import java.util.Date;
@@ -13,38 +13,38 @@ import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.revwalk.RevCommit;
import com.google.common.collect.Sets;
-import com.gitplex.commons.git.NameAndEmail;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.commons.markdown.MarkdownManager;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.BranchWatch;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestReviewInvitation;
-import com.gitplex.server.core.entity.PullRequestUpdate;
-import com.gitplex.server.core.entity.PullRequestWatch;
-import com.gitplex.server.core.entity.PullRequestStatusChange.Type;
-import com.gitplex.server.core.event.MarkdownAware;
-import com.gitplex.server.core.event.pullrequest.IntegrationPreviewCalculated;
-import com.gitplex.server.core.event.pullrequest.PullRequestChangeEvent;
-import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentActivityEvent;
-import com.gitplex.server.core.event.pullrequest.PullRequestCodeCommentCreated;
-import com.gitplex.server.core.event.pullrequest.PullRequestCommentCreated;
-import com.gitplex.server.core.event.pullrequest.PullRequestOpened;
-import com.gitplex.server.core.event.pullrequest.PullRequestReviewInvitationChanged;
-import com.gitplex.server.core.event.pullrequest.PullRequestStatusChangeEvent;
-import com.gitplex.server.core.event.pullrequest.PullRequestUpdated;
-import com.gitplex.server.core.event.pullrequest.PullRequestVerificationRunning;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.BranchWatchManager;
-import com.gitplex.server.core.manager.MailManager;
-import com.gitplex.server.core.manager.PullRequestWatchManager;
-import com.gitplex.server.core.manager.UrlManager;
-import com.gitplex.server.core.manager.VisitInfoManager;
-import com.gitplex.server.core.util.markdown.MentionParser;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.BranchWatch;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestReviewInvitation;
+import com.gitplex.server.entity.PullRequestUpdate;
+import com.gitplex.server.entity.PullRequestWatch;
+import com.gitplex.server.entity.PullRequestStatusChange.Type;
+import com.gitplex.server.event.MarkdownAware;
+import com.gitplex.server.event.pullrequest.IntegrationPreviewCalculated;
+import com.gitplex.server.event.pullrequest.PullRequestChangeEvent;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentCreated;
+import com.gitplex.server.event.pullrequest.PullRequestCommentCreated;
+import com.gitplex.server.event.pullrequest.PullRequestOpened;
+import com.gitplex.server.event.pullrequest.PullRequestReviewInvitationChanged;
+import com.gitplex.server.event.pullrequest.PullRequestStatusChangeEvent;
+import com.gitplex.server.event.pullrequest.PullRequestUpdated;
+import com.gitplex.server.event.pullrequest.PullRequestVerificationRunning;
+import com.gitplex.server.git.NameAndEmail;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.BranchWatchManager;
+import com.gitplex.server.manager.MailManager;
+import com.gitplex.server.manager.PullRequestWatchManager;
+import com.gitplex.server.manager.UrlManager;
+import com.gitplex.server.manager.VisitInfoManager;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.util.markdown.MarkdownManager;
+import com.gitplex.server.util.markdown.MentionParser;
@Singleton
public class DefaultPullRequestWatchManager extends AbstractEntityManager<PullRequestWatch>
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultStorageManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultStorageManager.java
similarity index 83%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultStorageManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultStorageManager.java
index 5cc384d8fd..935551e9ad 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultStorageManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultStorageManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.io.File;
import java.io.IOException;
@@ -9,15 +9,15 @@ import javax.inject.Singleton;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.commons.util.FileUtils;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.event.depot.DepotDeleted;
-import com.gitplex.server.core.event.lifecycle.SystemStarting;
-import com.gitplex.server.core.manager.ConfigManager;
-import com.gitplex.server.core.manager.StorageManager;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.event.depot.DepotDeleted;
+import com.gitplex.server.event.lifecycle.SystemStarting;
+import com.gitplex.server.manager.ConfigManager;
+import com.gitplex.server.manager.StorageManager;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.util.FileUtils;
@Singleton
public class DefaultStorageManager implements StorageManager {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultTeamAuthorizationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamAuthorizationManager.java
similarity index 72%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultTeamAuthorizationManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamAuthorizationManager.java
index 19722e59c0..9dbc5b93ff 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultTeamAuthorizationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamAuthorizationManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.util.Collection;
@@ -9,17 +9,17 @@ import org.hibernate.Query;
import org.hibernate.criterion.Restrictions;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.hibernate.Sessional;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.TeamAuthorization;
-import com.gitplex.server.core.event.depot.DepotTransferred;
-import com.gitplex.server.core.manager.TeamAuthorizationManager;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.TeamAuthorization;
+import com.gitplex.server.event.depot.DepotTransferred;
+import com.gitplex.server.manager.TeamAuthorizationManager;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.security.privilege.DepotPrivilege;
@Singleton
public class DefaultTeamAuthorizationManager extends AbstractEntityManager<TeamAuthorization>
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultTeamManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamManager.java
similarity index 68%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultTeamManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamManager.java
index 5b0348fcf1..5e0df89946 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultTeamManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.util.Iterator;
@@ -7,16 +7,16 @@ import javax.inject.Singleton;
import org.hibernate.criterion.Restrictions;
-import com.gitplex.commons.hibernate.Sessional;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.Team;
-import com.gitplex.server.core.gatekeeper.GateKeeper;
-import com.gitplex.server.core.manager.TeamManager;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.Team;
+import com.gitplex.server.gatekeeper.GateKeeper;
+import com.gitplex.server.manager.TeamManager;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
@Singleton
public class DefaultTeamManager extends AbstractEntityManager<Team> implements TeamManager {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultTeamMembershipManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamMembershipManager.java
similarity index 69%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultTeamMembershipManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamMembershipManager.java
index 8d2f6cd66b..68691bca3e 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultTeamMembershipManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultTeamMembershipManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.util.Collection;
@@ -7,14 +7,14 @@ import javax.inject.Singleton;
import org.hibernate.criterion.Restrictions;
-import com.gitplex.commons.hibernate.Sessional;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.TeamMembership;
-import com.gitplex.server.core.manager.TeamMembershipManager;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.TeamMembership;
+import com.gitplex.server.manager.TeamMembershipManager;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
@Singleton
public class DefaultTeamMembershipManager extends AbstractEntityManager<TeamMembership>
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultUserAuthorizationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserAuthorizationManager.java
similarity index 73%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultUserAuthorizationManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultUserAuthorizationManager.java
index e72b0b655a..d2469a27d2 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultUserAuthorizationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserAuthorizationManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.util.Collection;
@@ -7,17 +7,17 @@ import javax.inject.Singleton;
import org.hibernate.criterion.Restrictions;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.UserAuthorization;
+import com.gitplex.server.manager.UserAuthorizationManager;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.AbstractEntityManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.security.privilege.DepotPrivilege;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.hibernate.Sessional;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.AbstractEntityManager;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.UserAuthorization;
-import com.gitplex.server.core.manager.UserAuthorizationManager;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
@Singleton
public class DefaultUserAuthorizationManager extends AbstractEntityManager<UserAuthorization>
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultVisitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.java
similarity index 86%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultVisitInfoManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.java
index f7f7d66545..d803ecbb27 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultVisitInfoManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.io.File;
import java.nio.ByteBuffer;
@@ -11,25 +11,25 @@ import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.commons.util.FileUtils;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.CodeCommentRelation;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.support.CodeCommentActivity;
-import com.gitplex.server.core.event.codecomment.CodeCommentActivityEvent;
-import com.gitplex.server.core.event.codecomment.CodeCommentCreated;
-import com.gitplex.server.core.event.depot.DepotDeleted;
-import com.gitplex.server.core.event.lifecycle.SystemStopping;
-import com.gitplex.server.core.event.pullrequest.PullRequestCommentCreated;
-import com.gitplex.server.core.event.pullrequest.PullRequestOpened;
-import com.gitplex.server.core.event.pullrequest.PullRequestStatusChangeEvent;
-import com.gitplex.server.core.manager.StorageManager;
-import com.gitplex.server.core.manager.VisitInfoManager;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.CodeCommentRelation;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.support.CodeCommentActivity;
+import com.gitplex.server.event.codecomment.CodeCommentActivityEvent;
+import com.gitplex.server.event.codecomment.CodeCommentCreated;
+import com.gitplex.server.event.depot.DepotDeleted;
+import com.gitplex.server.event.lifecycle.SystemStopping;
+import com.gitplex.server.event.pullrequest.PullRequestCommentCreated;
+import com.gitplex.server.event.pullrequest.PullRequestOpened;
+import com.gitplex.server.event.pullrequest.PullRequestStatusChangeEvent;
+import com.gitplex.server.manager.StorageManager;
+import com.gitplex.server.manager.VisitInfoManager;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.util.FileUtils;
import jetbrains.exodus.ArrayByteIterable;
import jetbrains.exodus.ByteIterable;
diff --git a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultWorkExecutor.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultWorkExecutor.java
similarity index 82%
rename from core/src/main/java/com/gitplex/server/core/manager/impl/DefaultWorkExecutor.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultWorkExecutor.java
index ba253ac528..88deef6444 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/impl/DefaultWorkExecutor.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultWorkExecutor.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.impl;
+package com.gitplex.server.manager.impl;
import java.util.Collection;
import java.util.List;
@@ -9,12 +9,12 @@ import java.util.concurrent.TimeoutException;
import javax.inject.Singleton;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.commons.util.concurrent.PrioritizedCallable;
-import com.gitplex.commons.util.concurrent.PrioritizedExecutor;
-import com.gitplex.commons.util.concurrent.PrioritizedRunnable;
-import com.gitplex.server.core.event.lifecycle.SystemStopping;
-import com.gitplex.server.core.manager.WorkExecutor;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.server.event.lifecycle.SystemStopping;
+import com.gitplex.server.manager.WorkExecutor;
+import com.gitplex.server.util.concurrent.PrioritizedCallable;
+import com.gitplex.server.util.concurrent.PrioritizedExecutor;
+import com.gitplex.server.util.concurrent.PrioritizedRunnable;
@Singleton
public class DefaultWorkExecutor implements WorkExecutor {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/support/BatchWorker.java b/core/src/main/java/com/gitplex/server/manager/support/BatchWorker.java
similarity index 91%
rename from core/src/main/java/com/gitplex/server/core/manager/support/BatchWorker.java
rename to core/src/main/java/com/gitplex/server/manager/support/BatchWorker.java
index a982b8d6be..4e501ab013 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/support/BatchWorker.java
+++ b/core/src/main/java/com/gitplex/server/manager/support/BatchWorker.java
@@ -1,12 +1,12 @@
-package com.gitplex.server.core.manager.support;
+package com.gitplex.server.manager.support;
import java.util.Collection;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
+import com.gitplex.server.util.concurrent.Prioritized;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.util.concurrent.Prioritized;
public abstract class BatchWorker {
diff --git a/core/src/main/java/com/gitplex/server/core/manager/support/IndexResult.java b/core/src/main/java/com/gitplex/server/manager/support/IndexResult.java
similarity index 89%
rename from core/src/main/java/com/gitplex/server/core/manager/support/IndexResult.java
rename to core/src/main/java/com/gitplex/server/manager/support/IndexResult.java
index 2bb8a5ca64..cfd50c7aab 100644
--- a/core/src/main/java/com/gitplex/server/core/manager/support/IndexResult.java
+++ b/core/src/main/java/com/gitplex/server/manager/support/IndexResult.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.manager.support;
+package com.gitplex.server.manager.support;
public class IndexResult {
diff --git a/core/src/main/java/com/gitplex/server/core/migration/DatabaseMigrator.java b/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java
similarity index 94%
rename from core/src/main/java/com/gitplex/server/core/migration/DatabaseMigrator.java
rename to core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java
index 9b31b24ec7..1fe6ac6027 100644
--- a/core/src/main/java/com/gitplex/server/core/migration/DatabaseMigrator.java
+++ b/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.migration;
+package com.gitplex.server.migration;
import java.io.File;
import java.util.Stack;
@@ -7,9 +7,7 @@ import javax.inject.Singleton;
import org.dom4j.Element;
-import com.gitplex.commons.hibernate.migration.Migrator;
-import com.gitplex.commons.hibernate.migration.VersionedDocument;
-import com.gitplex.commons.util.StringUtils;
+import com.gitplex.server.util.StringUtils;
@Singleton
@SuppressWarnings("unused")
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/migration/JpaConverter.java b/core/src/main/java/com/gitplex/server/migration/JpaConverter.java
similarity index 96%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/migration/JpaConverter.java
rename to core/src/main/java/com/gitplex/server/migration/JpaConverter.java
index 0fbd88dbff..85ab233b23 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/migration/JpaConverter.java
+++ b/core/src/main/java/com/gitplex/server/migration/JpaConverter.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.migration;
+package com.gitplex.server.migration;
import java.lang.reflect.Field;
import java.util.Collection;
@@ -14,13 +14,13 @@ import org.dom4j.Element;
import org.hibernate.collection.internal.PersistentBag;
import org.hibernate.proxy.HibernateProxy;
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.commons.hibernate.dao.Dao;
import com.google.common.base.Throwables;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.commons.util.ClassUtils;
-import com.gitplex.commons.util.ReflectionUtils;
-import com.gitplex.commons.util.StringUtils;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.persistence.AbstractEntity;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.util.ClassUtils;
+import com.gitplex.server.util.ReflectionUtils;
+import com.gitplex.server.util.StringUtils;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import com.thoughtworks.xstream.converters.reflection.ReflectionConverter;
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/migration/MigrationHelper.java b/core/src/main/java/com/gitplex/server/migration/MigrationHelper.java
similarity index 98%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/migration/MigrationHelper.java
rename to core/src/main/java/com/gitplex/server/migration/MigrationHelper.java
index d6200901a5..8d678fc33f 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/migration/MigrationHelper.java
+++ b/core/src/main/java/com/gitplex/server/migration/MigrationHelper.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.migration;
+package com.gitplex.server.migration;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -15,8 +15,8 @@ import java.util.regex.Pattern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.gitplex.server.util.StringUtils;
import com.google.common.base.Throwables;
-import com.gitplex.commons.util.StringUtils;
public class MigrationHelper {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/migration/MigrationListener.java b/core/src/main/java/com/gitplex/server/migration/MigrationListener.java
similarity index 61%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/migration/MigrationListener.java
rename to core/src/main/java/com/gitplex/server/migration/MigrationListener.java
index ad205299a0..98a7e49709 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/migration/MigrationListener.java
+++ b/core/src/main/java/com/gitplex/server/migration/MigrationListener.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.migration;
+package com.gitplex.server.migration;
public interface MigrationListener {
diff --git a/core/src/main/java/com/gitplex/server/migration/Migrator.java b/core/src/main/java/com/gitplex/server/migration/Migrator.java
new file mode 100644
index 0000000000..ee7094d419
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/migration/Migrator.java
@@ -0,0 +1,5 @@
+package com.gitplex.server.migration;
+
+public interface Migrator {
+
+}
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/migration/MigratorAnalyzeResult.java b/core/src/main/java/com/gitplex/server/migration/MigratorAnalyzeResult.java
similarity index 93%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/migration/MigratorAnalyzeResult.java
rename to core/src/main/java/com/gitplex/server/migration/MigratorAnalyzeResult.java
index 11cf8d81f0..1bcf2744ef 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/migration/MigratorAnalyzeResult.java
+++ b/core/src/main/java/com/gitplex/server/migration/MigratorAnalyzeResult.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.migration;
+package com.gitplex.server.migration;
import java.lang.reflect.Method;
import java.util.ArrayList;
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/migration/PersistentBagConverter.java b/core/src/main/java/com/gitplex/server/migration/PersistentBagConverter.java
similarity index 94%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/migration/PersistentBagConverter.java
rename to core/src/main/java/com/gitplex/server/migration/PersistentBagConverter.java
index 916de79865..4939e3220f 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/migration/PersistentBagConverter.java
+++ b/core/src/main/java/com/gitplex/server/migration/PersistentBagConverter.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.migration;
+package com.gitplex.server.migration;
import java.util.ArrayList;
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/migration/VersionTable.java b/core/src/main/java/com/gitplex/server/migration/VersionTable.java
similarity index 68%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/migration/VersionTable.java
rename to core/src/main/java/com/gitplex/server/migration/VersionTable.java
index 64acd09a34..49bf3d534c 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/migration/VersionTable.java
+++ b/core/src/main/java/com/gitplex/server/migration/VersionTable.java
@@ -1,9 +1,9 @@
-package com.gitplex.commons.hibernate.migration;
+package com.gitplex.server.migration;
import javax.persistence.Entity;
import javax.persistence.Table;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
@Entity
@Table
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/migration/VersionedDocument.java b/core/src/main/java/com/gitplex/server/migration/VersionedDocument.java
similarity index 98%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/migration/VersionedDocument.java
rename to core/src/main/java/com/gitplex/server/migration/VersionedDocument.java
index 70da958ac2..7797f8288a 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/migration/VersionedDocument.java
+++ b/core/src/main/java/com/gitplex/server/migration/VersionedDocument.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.migration;
+package com.gitplex.server.migration;
import java.io.ByteArrayOutputStream;
import java.io.Externalizable;
@@ -38,9 +38,9 @@ import org.xml.sax.EntityResolver;
import com.google.common.base.Charsets;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.commons.util.ClassUtils;
-import com.gitplex.commons.util.FileUtils;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.util.ClassUtils;
+import com.gitplex.server.util.FileUtils;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.core.util.HierarchicalStreams;
import com.thoughtworks.xstream.io.xml.Dom4JReader;
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/AbstractEntity.java b/core/src/main/java/com/gitplex/server/persistence/AbstractEntity.java
similarity index 94%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/AbstractEntity.java
rename to core/src/main/java/com/gitplex/server/persistence/AbstractEntity.java
index 7b72987a3c..7c27997501 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/AbstractEntity.java
+++ b/core/src/main/java/com/gitplex/server/persistence/AbstractEntity.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate;
+package com.gitplex.server.persistence;
import java.io.Serializable;
@@ -21,7 +21,7 @@ public abstract class AbstractEntity implements Serializable, Comparable<Abstrac
private static final long serialVersionUID = 1L;
@Id
- @GenericGenerator(name="entity_id", strategy="com.gitplex.commons.hibernate.IdGenerator")
+ @GenericGenerator(name="entity_id", strategy="com.gitplex.server.persistence.IdGenerator")
@GeneratedValue(generator="entity_id")
private Long id;
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/DefaultIdManager.java b/core/src/main/java/com/gitplex/server/persistence/DefaultIdManager.java
similarity index 90%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/DefaultIdManager.java
rename to core/src/main/java/com/gitplex/server/persistence/DefaultIdManager.java
index ad033ca0fa..2a9a44ce32 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/DefaultIdManager.java
+++ b/core/src/main/java/com/gitplex/server/persistence/DefaultIdManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate;
+package com.gitplex.server.persistence;
import java.util.HashMap;
import java.util.Map;
@@ -11,7 +11,8 @@ import org.hibernate.Criteria;
import org.hibernate.criterion.Projections;
import org.hibernate.metadata.ClassMetadata;
-import com.gitplex.commons.hibernate.dao.Dao;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.dao.Dao;
@Singleton
public class DefaultIdManager implements IdManager {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/DefaultPersistManager.java b/core/src/main/java/com/gitplex/server/persistence/DefaultPersistManager.java
similarity index 97%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/DefaultPersistManager.java
rename to core/src/main/java/com/gitplex/server/persistence/DefaultPersistManager.java
index b61a366954..b51c7302ca 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/DefaultPersistManager.java
+++ b/core/src/main/java/com/gitplex/server/persistence/DefaultPersistManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate;
+package com.gitplex.server.persistence;
import java.io.File;
import java.io.FilenameFilter;
@@ -41,14 +41,16 @@ import org.hibernate.tool.schema.TargetType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.calla.loader.LoaderUtils;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.migration.MigrationHelper;
-import com.gitplex.commons.hibernate.migration.Migrator;
-import com.gitplex.commons.hibernate.migration.VersionTable;
-import com.gitplex.commons.hibernate.migration.VersionedDocument;
-import com.gitplex.commons.util.BeanUtils;
-import com.gitplex.commons.util.FileUtils;
+import com.gitplex.launcher.loader.LoaderUtils;
+import com.gitplex.server.migration.MigrationHelper;
+import com.gitplex.server.migration.Migrator;
+import com.gitplex.server.migration.VersionTable;
+import com.gitplex.server.migration.VersionedDocument;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.util.BeanUtils;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.server.util.validation.EntityValidator;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
import com.google.inject.Inject;
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/DefaultUnitOfWork.java b/core/src/main/java/com/gitplex/server/persistence/DefaultUnitOfWork.java
similarity index 96%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/DefaultUnitOfWork.java
rename to core/src/main/java/com/gitplex/server/persistence/DefaultUnitOfWork.java
index e16c380c8e..28a88d81d2 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/DefaultUnitOfWork.java
+++ b/core/src/main/java/com/gitplex/server/persistence/DefaultUnitOfWork.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate;
+package com.gitplex.server.persistence;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
@@ -8,9 +8,9 @@ import org.hibernate.Session;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.gitplex.server.util.ObjectReference;
import com.google.inject.Inject;
import com.google.inject.Singleton;
-import com.gitplex.commons.util.ObjectReference;
@Singleton
public class DefaultUnitOfWork implements UnitOfWork {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/HibernateFilter.java b/core/src/main/java/com/gitplex/server/persistence/HibernateFilter.java
similarity index 96%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/HibernateFilter.java
rename to core/src/main/java/com/gitplex/server/persistence/HibernateFilter.java
index 0de96d7f58..9b725f0a91 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/HibernateFilter.java
+++ b/core/src/main/java/com/gitplex/server/persistence/HibernateFilter.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate;
+package com.gitplex.server.persistence;
import java.io.IOException;
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/HibernateInterceptor.java b/core/src/main/java/com/gitplex/server/persistence/HibernateInterceptor.java
similarity index 97%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/HibernateInterceptor.java
rename to core/src/main/java/com/gitplex/server/persistence/HibernateInterceptor.java
index 0d1437ef16..97b8998175 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/HibernateInterceptor.java
+++ b/core/src/main/java/com/gitplex/server/persistence/HibernateInterceptor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate;
+package com.gitplex.server.persistence;
import java.io.Serializable;
import java.util.Set;
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/HibernateProperties.java b/core/src/main/java/com/gitplex/server/persistence/HibernateProperties.java
similarity index 94%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/HibernateProperties.java
rename to core/src/main/java/com/gitplex/server/persistence/HibernateProperties.java
index 8f401e711f..7bfddb73b7 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/HibernateProperties.java
+++ b/core/src/main/java/com/gitplex/server/persistence/HibernateProperties.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate;
+package com.gitplex.server.persistence;
import java.util.Map;
import java.util.Properties;
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/IdGenerator.java b/core/src/main/java/com/gitplex/server/persistence/IdGenerator.java
similarity index 89%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/IdGenerator.java
rename to core/src/main/java/com/gitplex/server/persistence/IdGenerator.java
index dad09d575e..679d645740 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/IdGenerator.java
+++ b/core/src/main/java/com/gitplex/server/persistence/IdGenerator.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate;
+package com.gitplex.server.persistence;
import java.io.Serializable;
import java.util.Properties;
@@ -11,7 +11,7 @@ import org.hibernate.id.IdentifierGenerator;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.type.Type;
-import com.gitplex.calla.loader.AppLoader;
+import com.gitplex.launcher.loader.AppLoader;
public class IdGenerator implements IdentifierGenerator, Configurable {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/IdManager.java b/core/src/main/java/com/gitplex/server/persistence/IdManager.java
similarity index 75%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/IdManager.java
rename to core/src/main/java/com/gitplex/server/persistence/IdManager.java
index 0f295a5782..b3005ab315 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/IdManager.java
+++ b/core/src/main/java/com/gitplex/server/persistence/IdManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate;
+package com.gitplex.server.persistence;
public interface IdManager {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/ModelProvider.java b/core/src/main/java/com/gitplex/server/persistence/ModelProvider.java
similarity index 76%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/ModelProvider.java
rename to core/src/main/java/com/gitplex/server/persistence/ModelProvider.java
index fe78265b6b..c3ce4ce5a4 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/ModelProvider.java
+++ b/core/src/main/java/com/gitplex/server/persistence/ModelProvider.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate;
+package com.gitplex.server.persistence;
import java.util.Collection;
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/PersistListener.java b/core/src/main/java/com/gitplex/server/persistence/PersistListener.java
similarity index 94%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/PersistListener.java
rename to core/src/main/java/com/gitplex/server/persistence/PersistListener.java
index d2b0b5d016..1c61822fd2 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/PersistListener.java
+++ b/core/src/main/java/com/gitplex/server/persistence/PersistListener.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate;
+package com.gitplex.server.persistence;
import java.io.Serializable;
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/PersistManager.java b/core/src/main/java/com/gitplex/server/persistence/PersistManager.java
similarity index 92%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/PersistManager.java
rename to core/src/main/java/com/gitplex/server/persistence/PersistManager.java
index 035ef0f59b..f46738681e 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/PersistManager.java
+++ b/core/src/main/java/com/gitplex/server/persistence/PersistManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate;
+package com.gitplex.server.persistence;
import java.io.File;
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/PrefixedNamingStrategy.java b/core/src/main/java/com/gitplex/server/persistence/PrefixedNamingStrategy.java
similarity index 95%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/PrefixedNamingStrategy.java
rename to core/src/main/java/com/gitplex/server/persistence/PrefixedNamingStrategy.java
index 6f566b7ef3..8df73411f4 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/PrefixedNamingStrategy.java
+++ b/core/src/main/java/com/gitplex/server/persistence/PrefixedNamingStrategy.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate;
+package com.gitplex.server.persistence;
import org.hibernate.boot.model.naming.Identifier;
import org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl;
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/SessionInterceptor.java b/core/src/main/java/com/gitplex/server/persistence/SessionInterceptor.java
similarity index 76%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/SessionInterceptor.java
rename to core/src/main/java/com/gitplex/server/persistence/SessionInterceptor.java
index 78aff83297..3a12d61039 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/SessionInterceptor.java
+++ b/core/src/main/java/com/gitplex/server/persistence/SessionInterceptor.java
@@ -1,11 +1,11 @@
-package com.gitplex.commons.hibernate;
+package com.gitplex.server.persistence;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
import com.google.inject.Inject;
-class SessionInterceptor implements MethodInterceptor {
+public class SessionInterceptor implements MethodInterceptor {
@Inject
private UnitOfWork unitOfWork;
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/TransactionInterceptor.java b/core/src/main/java/com/gitplex/server/persistence/TransactionInterceptor.java
similarity index 90%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/TransactionInterceptor.java
rename to core/src/main/java/com/gitplex/server/persistence/TransactionInterceptor.java
index c0554820a1..f8fe2b0a0c 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/TransactionInterceptor.java
+++ b/core/src/main/java/com/gitplex/server/persistence/TransactionInterceptor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate;
+package com.gitplex.server.persistence;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
@@ -9,7 +9,7 @@ import org.hibernate.resource.transaction.spi.TransactionStatus;
import com.google.inject.Inject;
-class TransactionInterceptor implements MethodInterceptor {
+public class TransactionInterceptor implements MethodInterceptor {
@Inject
private UnitOfWork unitOfWork;
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/UnitOfWork.java b/core/src/main/java/com/gitplex/server/persistence/UnitOfWork.java
similarity index 95%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/UnitOfWork.java
rename to core/src/main/java/com/gitplex/server/persistence/UnitOfWork.java
index ff33a7c6b5..60791bb644 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/UnitOfWork.java
+++ b/core/src/main/java/com/gitplex/server/persistence/UnitOfWork.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.gitplex.commons.hibernate;
+package com.gitplex.server.persistence;
import java.util.concurrent.Callable;
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/Sessional.java b/core/src/main/java/com/gitplex/server/persistence/annotation/Sessional.java
similarity index 83%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/Sessional.java
rename to core/src/main/java/com/gitplex/server/persistence/annotation/Sessional.java
index 0761bf1ac9..76a3e4bcad 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/Sessional.java
+++ b/core/src/main/java/com/gitplex/server/persistence/annotation/Sessional.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate;
+package com.gitplex.server.persistence.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/Transactional.java b/core/src/main/java/com/gitplex/server/persistence/annotation/Transactional.java
similarity index 94%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/Transactional.java
rename to core/src/main/java/com/gitplex/server/persistence/annotation/Transactional.java
index eeaffaac09..72733e1870 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/Transactional.java
+++ b/core/src/main/java/com/gitplex/server/persistence/annotation/Transactional.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.gitplex.commons.hibernate;
+package com.gitplex.server.persistence.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/dao/AbstractEntityManager.java b/core/src/main/java/com/gitplex/server/persistence/dao/AbstractEntityManager.java
similarity index 93%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/dao/AbstractEntityManager.java
rename to core/src/main/java/com/gitplex/server/persistence/dao/AbstractEntityManager.java
index be28f0d309..0b0952cec4 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/dao/AbstractEntityManager.java
+++ b/core/src/main/java/com/gitplex/server/persistence/dao/AbstractEntityManager.java
@@ -1,11 +1,11 @@
-package com.gitplex.commons.hibernate.dao;
+package com.gitplex.server.persistence.dao;
import java.util.List;
import org.hibernate.Session;
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.commons.util.ReflectionUtils;
+import com.gitplex.server.persistence.AbstractEntity;
+import com.gitplex.server.util.ReflectionUtils;
public abstract class AbstractEntityManager<T extends AbstractEntity> implements EntityManager<T> {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/dao/Dao.java b/core/src/main/java/com/gitplex/server/persistence/dao/Dao.java
similarity index 97%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/dao/Dao.java
rename to core/src/main/java/com/gitplex/server/persistence/dao/Dao.java
index a086cf4936..79ce3ead23 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/dao/Dao.java
+++ b/core/src/main/java/com/gitplex/server/persistence/dao/Dao.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.dao;
+package com.gitplex.server.persistence.dao;
import java.util.List;
@@ -6,7 +6,7 @@ import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.criterion.DetachedCriteria;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
public interface Dao {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/dao/DefaultDao.java b/core/src/main/java/com/gitplex/server/persistence/dao/DefaultDao.java
similarity index 91%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/dao/DefaultDao.java
rename to core/src/main/java/com/gitplex/server/persistence/dao/DefaultDao.java
index bbdd5491b9..98e0508b3c 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/dao/DefaultDao.java
+++ b/core/src/main/java/com/gitplex/server/persistence/dao/DefaultDao.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.dao;
+package com.gitplex.server.persistence.dao;
import java.io.ObjectStreamException;
import java.io.Serializable;
@@ -14,12 +14,12 @@ import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.criterion.Projections;
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.commons.hibernate.Sessional;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.UnitOfWork;
-import com.gitplex.calla.loader.ListenerRegistry;
-import com.gitplex.calla.loader.ManagedSerializedForm;
+import com.gitplex.launcher.loader.ListenerRegistry;
+import com.gitplex.launcher.loader.ManagedSerializedForm;
+import com.gitplex.server.persistence.AbstractEntity;
+import com.gitplex.server.persistence.UnitOfWork;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.annotation.Transactional;
@Singleton
@SuppressWarnings("unchecked")
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/dao/EntityCriteria.java b/core/src/main/java/com/gitplex/server/persistence/dao/EntityCriteria.java
similarity index 97%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/dao/EntityCriteria.java
rename to core/src/main/java/com/gitplex/server/persistence/dao/EntityCriteria.java
index a38a8f2fd8..e2337e2ec0 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/dao/EntityCriteria.java
+++ b/core/src/main/java/com/gitplex/server/persistence/dao/EntityCriteria.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.dao;
+package com.gitplex.server.persistence.dao;
import java.io.Serializable;
@@ -16,7 +16,7 @@ import org.hibernate.internal.CriteriaImpl;
import org.hibernate.sql.JoinType;
import org.hibernate.transform.ResultTransformer;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
@SuppressWarnings("serial")
public class EntityCriteria<T extends AbstractEntity> implements CriteriaSpecification, Serializable {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/dao/EntityManager.java b/core/src/main/java/com/gitplex/server/persistence/dao/EntityManager.java
similarity index 96%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/dao/EntityManager.java
rename to core/src/main/java/com/gitplex/server/persistence/dao/EntityManager.java
index 099baac760..2dd80260f6 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/dao/EntityManager.java
+++ b/core/src/main/java/com/gitplex/server/persistence/dao/EntityManager.java
@@ -1,11 +1,11 @@
-package com.gitplex.commons.hibernate.dao;
+package com.gitplex.server.persistence.dao;
import java.util.List;
import org.hibernate.HibernateException;
import org.hibernate.criterion.DetachedCriteria;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
public interface EntityManager<T extends AbstractEntity> {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/dao/EntityPersisted.java b/core/src/main/java/com/gitplex/server/persistence/dao/EntityPersisted.java
similarity index 76%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/dao/EntityPersisted.java
rename to core/src/main/java/com/gitplex/server/persistence/dao/EntityPersisted.java
index 6c216dfbf8..ee97f2ce3c 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/dao/EntityPersisted.java
+++ b/core/src/main/java/com/gitplex/server/persistence/dao/EntityPersisted.java
@@ -1,6 +1,6 @@
-package com.gitplex.commons.hibernate.dao;
+package com.gitplex.server.persistence.dao;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
public class EntityPersisted {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/dao/EntityRemoved.java b/core/src/main/java/com/gitplex/server/persistence/dao/EntityRemoved.java
similarity index 68%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/dao/EntityRemoved.java
rename to core/src/main/java/com/gitplex/server/persistence/dao/EntityRemoved.java
index 8bc542bcab..0712b9485e 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/dao/EntityRemoved.java
+++ b/core/src/main/java/com/gitplex/server/persistence/dao/EntityRemoved.java
@@ -1,6 +1,6 @@
-package com.gitplex.commons.hibernate.dao;
+package com.gitplex.server.persistence.dao;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
public class EntityRemoved {
diff --git a/shiro/src/main/java/com/gitplex/commons/shiro/BasicAuthenticationFilter.java b/core/src/main/java/com/gitplex/server/security/BasicAuthenticationFilter.java
similarity index 95%
rename from shiro/src/main/java/com/gitplex/commons/shiro/BasicAuthenticationFilter.java
rename to core/src/main/java/com/gitplex/server/security/BasicAuthenticationFilter.java
index a516e9f322..c108b3740f 100644
--- a/shiro/src/main/java/com/gitplex/commons/shiro/BasicAuthenticationFilter.java
+++ b/core/src/main/java/com/gitplex/server/security/BasicAuthenticationFilter.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.shiro;
+package com.gitplex.server.security;
import java.io.IOException;
import java.util.Locale;
@@ -22,9 +22,9 @@ import org.apache.shiro.subject.Subject;
import org.apache.shiro.web.filter.PathMatchingFilter;
import org.apache.shiro.web.util.WebUtils;
-import com.gitplex.calla.loader.PluginManager;
-import com.gitplex.commons.util.ExceptionUtils;
-import com.gitplex.commons.util.StringUtils;
+import com.gitplex.launcher.loader.PluginManager;
+import com.gitplex.server.util.ExceptionUtils;
+import com.gitplex.server.util.StringUtils;
@Singleton
public class BasicAuthenticationFilter extends PathMatchingFilter {
diff --git a/shiro/src/main/java/com/gitplex/commons/shiro/DefaultFilterChainResolver.java b/core/src/main/java/com/gitplex/server/security/DefaultFilterChainResolver.java
similarity index 95%
rename from shiro/src/main/java/com/gitplex/commons/shiro/DefaultFilterChainResolver.java
rename to core/src/main/java/com/gitplex/server/security/DefaultFilterChainResolver.java
index a6da84ef76..83b88d31f2 100644
--- a/shiro/src/main/java/com/gitplex/commons/shiro/DefaultFilterChainResolver.java
+++ b/core/src/main/java/com/gitplex/server/security/DefaultFilterChainResolver.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.shiro;
+package com.gitplex.server.security;
import java.util.Set;
diff --git a/shiro/src/main/java/com/gitplex/commons/shiro/DefaultWebEnvironment.java b/core/src/main/java/com/gitplex/server/security/DefaultWebEnvironment.java
similarity index 87%
rename from shiro/src/main/java/com/gitplex/commons/shiro/DefaultWebEnvironment.java
rename to core/src/main/java/com/gitplex/server/security/DefaultWebEnvironment.java
index cbc9f2fb4d..9fc04dc741 100644
--- a/shiro/src/main/java/com/gitplex/commons/shiro/DefaultWebEnvironment.java
+++ b/core/src/main/java/com/gitplex/server/security/DefaultWebEnvironment.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.shiro;
+package com.gitplex.server.security;
import org.apache.shiro.ShiroException;
import org.apache.shiro.util.Destroyable;
@@ -6,7 +6,7 @@ import org.apache.shiro.util.Initializable;
import org.apache.shiro.web.filter.mgt.FilterChainResolver;
import org.apache.shiro.web.mgt.WebSecurityManager;
-import com.gitplex.calla.loader.AppLoader;
+import com.gitplex.launcher.loader.AppLoader;
public class DefaultWebEnvironment extends org.apache.shiro.web.env.DefaultWebEnvironment
implements Initializable, Destroyable {
diff --git a/shiro/src/main/java/com/gitplex/commons/shiro/DefaultWebSecurityManager.java b/core/src/main/java/com/gitplex/server/security/DefaultWebSecurityManager.java
similarity index 93%
rename from shiro/src/main/java/com/gitplex/commons/shiro/DefaultWebSecurityManager.java
rename to core/src/main/java/com/gitplex/server/security/DefaultWebSecurityManager.java
index 748d52ef74..2f0480e03f 100644
--- a/shiro/src/main/java/com/gitplex/commons/shiro/DefaultWebSecurityManager.java
+++ b/core/src/main/java/com/gitplex/server/security/DefaultWebSecurityManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.shiro;
+package com.gitplex.server.security;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -6,6 +6,7 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import org.apache.shiro.mgt.SecurityManager;
+import org.apache.shiro.realm.AuthorizingRealm;
import org.apache.shiro.session.Session;
import org.apache.shiro.subject.PrincipalCollection;
import org.apache.shiro.subject.SimplePrincipalCollection;
@@ -15,13 +16,13 @@ import org.apache.shiro.web.mgt.DefaultWebSubjectFactory;
import org.apache.shiro.web.subject.WebSubjectContext;
import org.apache.shiro.web.subject.support.WebDelegatingSubject;
-import com.gitplex.calla.loader.PluginManager;
+import com.gitplex.launcher.loader.PluginManager;
@Singleton
public class DefaultWebSecurityManager extends org.apache.shiro.web.mgt.DefaultWebSecurityManager {
@Inject
- public DefaultWebSecurityManager(PluginManager pluginManager, AbstractRealm userRealm) {
+ public DefaultWebSecurityManager(PluginManager pluginManager, AuthorizingRealm authorizingRealm) {
setSubjectFactory(new DefaultWebSubjectFactory() {
@@ -67,7 +68,7 @@ public class DefaultWebSecurityManager extends org.apache.shiro.web.mgt.DefaultW
});
- setRealm(userRealm);
+ setRealm(authorizingRealm);
}
/**
diff --git a/shiro/src/main/java/com/gitplex/commons/shiro/FilterChainConfigurator.java b/core/src/main/java/com/gitplex/server/security/FilterChainConfigurator.java
similarity index 67%
rename from shiro/src/main/java/com/gitplex/commons/shiro/FilterChainConfigurator.java
rename to core/src/main/java/com/gitplex/server/security/FilterChainConfigurator.java
index 8d44ab574e..8034219bb3 100644
--- a/shiro/src/main/java/com/gitplex/commons/shiro/FilterChainConfigurator.java
+++ b/core/src/main/java/com/gitplex/server/security/FilterChainConfigurator.java
@@ -1,8 +1,8 @@
-package com.gitplex.commons.shiro;
+package com.gitplex.server.security;
import org.apache.shiro.web.filter.mgt.FilterChainManager;
-import com.gitplex.calla.loader.ExtensionPoint;
+import com.gitplex.launcher.loader.ExtensionPoint;
@ExtensionPoint
public interface FilterChainConfigurator {
diff --git a/core/src/main/java/com/gitplex/server/core/security/ObjectPermission.java b/core/src/main/java/com/gitplex/server/security/ObjectPermission.java
similarity index 76%
rename from core/src/main/java/com/gitplex/server/core/security/ObjectPermission.java
rename to core/src/main/java/com/gitplex/server/security/ObjectPermission.java
index 6f01b54fce..4263c72e0b 100644
--- a/core/src/main/java/com/gitplex/server/core/security/ObjectPermission.java
+++ b/core/src/main/java/com/gitplex/server/security/ObjectPermission.java
@@ -1,15 +1,15 @@
-package com.gitplex.server.core.security;
+package com.gitplex.server.security;
import org.apache.shiro.authz.Permission;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.security.privilege.AccountPrivilege;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
-import com.gitplex.server.core.security.privilege.Privilege;
-import com.gitplex.server.core.security.privilege.SystemAdmin;
-import com.gitplex.server.core.security.protectedobject.ProtectedObject;
-import com.gitplex.server.core.security.protectedobject.SystemObject;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.security.privilege.AccountPrivilege;
+import com.gitplex.server.security.privilege.DepotPrivilege;
+import com.gitplex.server.security.privilege.Privilege;
+import com.gitplex.server.security.privilege.SystemAdmin;
+import com.gitplex.server.security.protectedobject.ProtectedObject;
+import com.gitplex.server.security.protectedobject.SystemObject;
/**
* This class represents permissions to operate an account and its belongings.
diff --git a/core/src/main/java/com/gitplex/server/core/security/SecurityRealm.java b/core/src/main/java/com/gitplex/server/security/SecurityRealm.java
similarity index 67%
rename from core/src/main/java/com/gitplex/server/core/security/SecurityRealm.java
rename to core/src/main/java/com/gitplex/server/security/SecurityRealm.java
index d62597d360..b064411600 100644
--- a/core/src/main/java/com/gitplex/server/core/security/SecurityRealm.java
+++ b/core/src/main/java/com/gitplex/server/security/SecurityRealm.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.security;
+package com.gitplex.server.security;
import java.util.ArrayList;
import java.util.Collection;
@@ -8,27 +8,35 @@ import java.util.Set;
import javax.inject.Inject;
import javax.inject.Singleton;
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.AuthenticationInfo;
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.authc.UsernamePasswordToken;
+import org.apache.shiro.authc.credential.PasswordMatcher;
+import org.apache.shiro.authc.credential.PasswordService;
+import org.apache.shiro.authz.AuthorizationInfo;
import org.apache.shiro.authz.Permission;
+import org.apache.shiro.realm.AuthorizingRealm;
+import org.apache.shiro.subject.PrincipalCollection;
-import com.gitplex.commons.shiro.AbstractRealm;
-import com.gitplex.commons.shiro.AbstractUser;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.OrganizationMembership;
-import com.gitplex.server.core.entity.Team;
-import com.gitplex.server.core.entity.TeamAuthorization;
-import com.gitplex.server.core.entity.TeamMembership;
-import com.gitplex.server.core.entity.UserAuthorization;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.OrganizationMembershipManager;
-import com.gitplex.server.core.manager.TeamMembershipManager;
-import com.gitplex.server.core.manager.UserAuthorizationManager;
-import com.gitplex.server.core.security.privilege.AccountPrivilege;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.OrganizationMembership;
+import com.gitplex.server.entity.Team;
+import com.gitplex.server.entity.TeamAuthorization;
+import com.gitplex.server.entity.TeamMembership;
+import com.gitplex.server.entity.UserAuthorization;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.OrganizationMembershipManager;
+import com.gitplex.server.manager.TeamMembershipManager;
+import com.gitplex.server.manager.UserAuthorizationManager;
+import com.gitplex.server.security.privilege.AccountPrivilege;
+import com.gitplex.server.security.privilege.DepotPrivilege;
@Singleton
-public class SecurityRealm extends AbstractRealm {
+public class SecurityRealm extends AuthorizingRealm {
private final AccountManager accountManager;
@@ -36,21 +44,57 @@ public class SecurityRealm extends AbstractRealm {
private final TeamMembershipManager teamMembershipManager;
- @Inject
+ @Inject
public SecurityRealm(AccountManager userManager,
OrganizationMembershipManager organizationMembershipManager,
TeamMembershipManager teamMembershipManager) {
+ PasswordMatcher passwordMatcher = new PasswordMatcher();
+ passwordMatcher.setPasswordService(AppLoader.getInstance(PasswordService.class));
+ setCredentialsMatcher(passwordMatcher);
+
this.accountManager = userManager;
this.organizationMembershipManager = organizationMembershipManager;
this.teamMembershipManager = teamMembershipManager;
}
- @Override
- protected AbstractUser getUserByName(String userName) {
- return accountManager.findByName(userName);
- }
-
- @Override
+ @SuppressWarnings("serial")
+ @Override
+ protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
+ final Long userId = (Long) principals.getPrimaryPrincipal();
+
+ return new AuthorizationInfo() {
+
+ @Override
+ public Collection<String> getStringPermissions() {
+ return new HashSet<>();
+ }
+
+ @Override
+ public Collection<String> getRoles() {
+ return new HashSet<>();
+ }
+
+ @Override
+ public Collection<Permission> getObjectPermissions() {
+ return permissionsOf(userId);
+ }
+ };
+ }
+
+ @Override
+ protected final AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException {
+ return accountManager.findByName(((UsernamePasswordToken) token).getUsername());
+ }
+
+ /**
+ * Get collection of permissions for specified user identifier.
+ *
+ * @param userId
+ * identifier of user to get permissions for. Specifically, value <tt>0</tt> stands for
+ * anonymous user
+ * @return
+ * collection of permissions associated with specified user identifier
+ */
protected Collection<Permission> permissionsOf(Long userId) {
Collection<Permission> permissions = new ArrayList<>();
diff --git a/core/src/main/java/com/gitplex/server/core/security/SecurityUtils.java b/core/src/main/java/com/gitplex/server/security/SecurityUtils.java
similarity index 84%
rename from core/src/main/java/com/gitplex/server/core/security/SecurityUtils.java
rename to core/src/main/java/com/gitplex/server/security/SecurityUtils.java
index 262dfd379b..18a1fe02f1 100644
--- a/core/src/main/java/com/gitplex/server/core/security/SecurityUtils.java
+++ b/core/src/main/java/com/gitplex/server/security/SecurityUtils.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.security;
+package com.gitplex.server.security;
import java.util.Collection;
import java.util.HashSet;
@@ -8,18 +8,18 @@ import javax.annotation.Nullable;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestComment;
-import com.gitplex.server.core.entity.PullRequestReview;
-import com.gitplex.server.core.entity.PullRequestStatusChange;
-import com.gitplex.server.core.entity.support.CodeCommentActivity;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
-import com.gitplex.server.core.security.privilege.Privilege;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestComment;
+import com.gitplex.server.entity.PullRequestReview;
+import com.gitplex.server.entity.PullRequestStatusChange;
+import com.gitplex.server.entity.support.CodeCommentActivity;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.security.privilege.DepotPrivilege;
+import com.gitplex.server.security.privilege.Privilege;
public class SecurityUtils extends org.apache.shiro.SecurityUtils {
diff --git a/core/src/main/java/com/gitplex/server/core/security/privilege/AccountPrivilege.java b/core/src/main/java/com/gitplex/server/security/privilege/AccountPrivilege.java
similarity index 93%
rename from core/src/main/java/com/gitplex/server/core/security/privilege/AccountPrivilege.java
rename to core/src/main/java/com/gitplex/server/security/privilege/AccountPrivilege.java
index 06cf2b56e6..7e7b9c0840 100644
--- a/core/src/main/java/com/gitplex/server/core/security/privilege/AccountPrivilege.java
+++ b/core/src/main/java/com/gitplex/server/security/privilege/AccountPrivilege.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.security.privilege;
+package com.gitplex.server.security.privilege;
public enum AccountPrivilege implements Privilege {
diff --git a/core/src/main/java/com/gitplex/server/core/security/privilege/DepotPrivilege.java b/core/src/main/java/com/gitplex/server/security/privilege/DepotPrivilege.java
similarity index 93%
rename from core/src/main/java/com/gitplex/server/core/security/privilege/DepotPrivilege.java
rename to core/src/main/java/com/gitplex/server/security/privilege/DepotPrivilege.java
index a0ee65c132..6c487ac6e1 100644
--- a/core/src/main/java/com/gitplex/server/core/security/privilege/DepotPrivilege.java
+++ b/core/src/main/java/com/gitplex/server/security/privilege/DepotPrivilege.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.security.privilege;
+package com.gitplex.server.security.privilege;
public enum DepotPrivilege implements Privilege {
diff --git a/core/src/main/java/com/gitplex/server/core/security/privilege/Privilege.java b/core/src/main/java/com/gitplex/server/security/privilege/Privilege.java
similarity index 69%
rename from core/src/main/java/com/gitplex/server/core/security/privilege/Privilege.java
rename to core/src/main/java/com/gitplex/server/security/privilege/Privilege.java
index 55a3235128..18565564cc 100644
--- a/core/src/main/java/com/gitplex/server/core/security/privilege/Privilege.java
+++ b/core/src/main/java/com/gitplex/server/security/privilege/Privilege.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.security.privilege;
+package com.gitplex.server.security.privilege;
import java.io.Serializable;
diff --git a/core/src/main/java/com/gitplex/server/core/security/privilege/SystemAdmin.java b/core/src/main/java/com/gitplex/server/security/privilege/SystemAdmin.java
similarity index 77%
rename from core/src/main/java/com/gitplex/server/core/security/privilege/SystemAdmin.java
rename to core/src/main/java/com/gitplex/server/security/privilege/SystemAdmin.java
index d5f69377ee..4fad5fbb90 100644
--- a/core/src/main/java/com/gitplex/server/core/security/privilege/SystemAdmin.java
+++ b/core/src/main/java/com/gitplex/server/security/privilege/SystemAdmin.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.security.privilege;
+package com.gitplex.server.security.privilege;
public class SystemAdmin implements Privilege {
diff --git a/core/src/main/java/com/gitplex/server/security/protectedobject/AccountBelonging.java b/core/src/main/java/com/gitplex/server/security/protectedobject/AccountBelonging.java
new file mode 100644
index 0000000000..a2afbd0fae
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/security/protectedobject/AccountBelonging.java
@@ -0,0 +1,7 @@
+package com.gitplex.server.security.protectedobject;
+
+import com.gitplex.server.entity.Account;
+
+public interface AccountBelonging extends ProtectedObject {
+ Account getAccount();
+}
diff --git a/core/src/main/java/com/gitplex/server/core/security/protectedobject/ProtectedObject.java b/core/src/main/java/com/gitplex/server/security/protectedobject/ProtectedObject.java
similarity index 56%
rename from core/src/main/java/com/gitplex/server/core/security/protectedobject/ProtectedObject.java
rename to core/src/main/java/com/gitplex/server/security/protectedobject/ProtectedObject.java
index e8457e569c..f0009831fa 100644
--- a/core/src/main/java/com/gitplex/server/core/security/protectedobject/ProtectedObject.java
+++ b/core/src/main/java/com/gitplex/server/security/protectedobject/ProtectedObject.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.security.protectedobject;
+package com.gitplex.server.security.protectedobject;
public interface ProtectedObject {
boolean has(ProtectedObject object);
diff --git a/core/src/main/java/com/gitplex/server/core/security/protectedobject/SystemObject.java b/core/src/main/java/com/gitplex/server/security/protectedobject/SystemObject.java
similarity index 69%
rename from core/src/main/java/com/gitplex/server/core/security/protectedobject/SystemObject.java
rename to core/src/main/java/com/gitplex/server/security/protectedobject/SystemObject.java
index 45468de87b..9b1ba00721 100644
--- a/core/src/main/java/com/gitplex/server/core/security/protectedobject/SystemObject.java
+++ b/core/src/main/java/com/gitplex/server/security/protectedobject/SystemObject.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.security.protectedobject;
+package com.gitplex.server.security.protectedobject;
public class SystemObject implements ProtectedObject {
diff --git a/util/src/main/java/com/gitplex/commons/util/BeanUtils.java b/core/src/main/java/com/gitplex/server/util/BeanUtils.java
similarity index 99%
rename from util/src/main/java/com/gitplex/commons/util/BeanUtils.java
rename to core/src/main/java/com/gitplex/server/util/BeanUtils.java
index f69c086285..3166b58ba9 100644
--- a/util/src/main/java/com/gitplex/commons/util/BeanUtils.java
+++ b/core/src/main/java/com/gitplex/server/util/BeanUtils.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
diff --git a/util/src/main/java/com/gitplex/commons/util/ClassUtils.java b/core/src/main/java/com/gitplex/server/util/ClassUtils.java
similarity index 96%
rename from util/src/main/java/com/gitplex/commons/util/ClassUtils.java
rename to core/src/main/java/com/gitplex/server/util/ClassUtils.java
index 760fe1afec..8812960cee 100644
--- a/util/src/main/java/com/gitplex/commons/util/ClassUtils.java
+++ b/core/src/main/java/com/gitplex/server/util/ClassUtils.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.io.InputStream;
diff --git a/util/src/main/java/com/gitplex/commons/util/ContentDetector.java b/core/src/main/java/com/gitplex/server/util/ContentDetector.java
similarity index 98%
rename from util/src/main/java/com/gitplex/commons/util/ContentDetector.java
rename to core/src/main/java/com/gitplex/server/util/ContentDetector.java
index cab28eeca2..d3af7fb36f 100644
--- a/util/src/main/java/com/gitplex/commons/util/ContentDetector.java
+++ b/core/src/main/java/com/gitplex/server/util/ContentDetector.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.io.IOException;
import java.io.InputStream;
diff --git a/util/src/main/java/com/gitplex/commons/util/DependencyAware.java b/core/src/main/java/com/gitplex/server/util/DependencyAware.java
similarity index 92%
rename from util/src/main/java/com/gitplex/commons/util/DependencyAware.java
rename to core/src/main/java/com/gitplex/server/util/DependencyAware.java
index 8105aa0de0..f47b548634 100644
--- a/util/src/main/java/com/gitplex/commons/util/DependencyAware.java
+++ b/core/src/main/java/com/gitplex/server/util/DependencyAware.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.util.Set;
diff --git a/util/src/main/java/com/gitplex/commons/util/DependencyUtils.java b/core/src/main/java/com/gitplex/server/util/DependencyUtils.java
similarity index 98%
rename from util/src/main/java/com/gitplex/commons/util/DependencyUtils.java
rename to core/src/main/java/com/gitplex/server/util/DependencyUtils.java
index 5d63c8c4ea..fa216794f4 100644
--- a/util/src/main/java/com/gitplex/commons/util/DependencyUtils.java
+++ b/core/src/main/java/com/gitplex/server/util/DependencyUtils.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/util/src/main/java/com/gitplex/commons/util/EasyMap.java b/core/src/main/java/com/gitplex/server/util/EasyMap.java
similarity index 97%
rename from util/src/main/java/com/gitplex/commons/util/EasyMap.java
rename to core/src/main/java/com/gitplex/server/util/EasyMap.java
index 073f95ce80..6857e7fc75 100644
--- a/util/src/main/java/com/gitplex/commons/util/EasyMap.java
+++ b/core/src/main/java/com/gitplex/server/util/EasyMap.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.util.HashMap;
import java.util.LinkedHashMap;
diff --git a/util/src/main/java/com/gitplex/commons/util/ExceptionUtils.java b/core/src/main/java/com/gitplex/server/util/ExceptionUtils.java
similarity index 96%
rename from util/src/main/java/com/gitplex/commons/util/ExceptionUtils.java
rename to core/src/main/java/com/gitplex/server/util/ExceptionUtils.java
index d97c63bcd8..87ec445a22 100644
--- a/util/src/main/java/com/gitplex/commons/util/ExceptionUtils.java
+++ b/core/src/main/java/com/gitplex/server/util/ExceptionUtils.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.io.File;
import java.util.HashSet;
@@ -7,7 +7,7 @@ import java.util.Set;
import javax.annotation.Nullable;
import javax.net.ssl.SSLHandshakeException;
-import com.gitplex.calla.bootstrap.BootstrapUtils;
+import com.gitplex.launcher.bootstrap.BootstrapUtils;
public class ExceptionUtils extends org.apache.commons.lang3.exception.ExceptionUtils {
diff --git a/util/src/main/java/com/gitplex/commons/util/FileUtils.java b/core/src/main/java/com/gitplex/server/util/FileUtils.java
similarity index 98%
rename from util/src/main/java/com/gitplex/commons/util/FileUtils.java
rename to core/src/main/java/com/gitplex/server/util/FileUtils.java
index bd8511f2d9..11127e0951 100644
--- a/util/src/main/java/com/gitplex/commons/util/FileUtils.java
+++ b/core/src/main/java/com/gitplex/server/util/FileUtils.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -25,8 +25,8 @@ import org.apache.tools.ant.DirectoryScanner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.calla.bootstrap.Bootstrap;
-import com.gitplex.calla.bootstrap.BootstrapUtils;
+import com.gitplex.launcher.bootstrap.Bootstrap;
+import com.gitplex.launcher.bootstrap.BootstrapUtils;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
diff --git a/util/src/main/java/com/gitplex/commons/util/GeneralException.java b/core/src/main/java/com/gitplex/server/util/GeneralException.java
similarity index 87%
rename from util/src/main/java/com/gitplex/commons/util/GeneralException.java
rename to core/src/main/java/com/gitplex/server/util/GeneralException.java
index b832265243..7533df1734 100644
--- a/util/src/main/java/com/gitplex/commons/util/GeneralException.java
+++ b/core/src/main/java/com/gitplex/server/util/GeneralException.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
@SuppressWarnings("serial")
public class GeneralException extends RuntimeException {
diff --git a/util/src/main/java/com/gitplex/commons/util/Highlighter.java b/core/src/main/java/com/gitplex/server/util/Highlighter.java
similarity index 98%
rename from util/src/main/java/com/gitplex/commons/util/Highlighter.java
rename to core/src/main/java/com/gitplex/server/util/Highlighter.java
index c6df6e6d9d..84aae2db8b 100644
--- a/util/src/main/java/com/gitplex/commons/util/Highlighter.java
+++ b/core/src/main/java/com/gitplex/server/util/Highlighter.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.util.ArrayList;
import java.util.List;
diff --git a/util/src/main/java/com/gitplex/commons/util/JsoupUtils.java b/core/src/main/java/com/gitplex/server/util/JsoupUtils.java
similarity index 99%
rename from util/src/main/java/com/gitplex/commons/util/JsoupUtils.java
rename to core/src/main/java/com/gitplex/server/util/JsoupUtils.java
index fe4e1b486f..f8dba01ace 100644
--- a/util/src/main/java/com/gitplex/commons/util/JsoupUtils.java
+++ b/core/src/main/java/com/gitplex/server/util/JsoupUtils.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.util.Collection;
import java.util.regex.Matcher;
diff --git a/util/src/main/java/com/gitplex/commons/util/LockUtils.java b/core/src/main/java/com/gitplex/server/util/LockUtils.java
similarity index 98%
rename from util/src/main/java/com/gitplex/commons/util/LockUtils.java
rename to core/src/main/java/com/gitplex/server/util/LockUtils.java
index 666206c1e4..a1dcd8d6dc 100644
--- a/util/src/main/java/com/gitplex/commons/util/LockUtils.java
+++ b/core/src/main/java/com/gitplex/server/util/LockUtils.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.util.Map;
import java.util.concurrent.Callable;
diff --git a/util/src/main/java/com/gitplex/commons/util/ObjectReference.java b/core/src/main/java/com/gitplex/server/util/ObjectReference.java
similarity index 94%
rename from util/src/main/java/com/gitplex/commons/util/ObjectReference.java
rename to core/src/main/java/com/gitplex/server/util/ObjectReference.java
index 2c5de93f91..f8ca8ee7db 100644
--- a/util/src/main/java/com/gitplex/commons/util/ObjectReference.java
+++ b/core/src/main/java/com/gitplex/server/util/ObjectReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.io.Closeable;
diff --git a/util/src/main/java/com/gitplex/commons/util/Pair.java b/core/src/main/java/com/gitplex/server/util/Pair.java
similarity index 97%
rename from util/src/main/java/com/gitplex/commons/util/Pair.java
rename to core/src/main/java/com/gitplex/server/util/Pair.java
index 6330bd39a7..cf51af6e71 100644
--- a/util/src/main/java/com/gitplex/commons/util/Pair.java
+++ b/core/src/main/java/com/gitplex/server/util/Pair.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.util.ArrayList;
import java.util.List;
diff --git a/util/src/main/java/com/gitplex/commons/util/PathUtils.java b/core/src/main/java/com/gitplex/server/util/PathUtils.java
similarity index 95%
rename from util/src/main/java/com/gitplex/commons/util/PathUtils.java
rename to core/src/main/java/com/gitplex/server/util/PathUtils.java
index 92629ce4c4..3306f6a507 100644
--- a/util/src/main/java/com/gitplex/commons/util/PathUtils.java
+++ b/core/src/main/java/com/gitplex/server/util/PathUtils.java
@@ -1,10 +1,10 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.util.Collection;
import javax.annotation.Nullable;
-import com.gitplex.calla.loader.LoaderUtils;
+import com.gitplex.launcher.loader.LoaderUtils;
import com.gitplex.jsymbol.Range;
public class PathUtils {
diff --git a/util/src/main/java/com/gitplex/commons/util/RangeUtils.java b/core/src/main/java/com/gitplex/server/util/RangeUtils.java
similarity index 95%
rename from util/src/main/java/com/gitplex/commons/util/RangeUtils.java
rename to core/src/main/java/com/gitplex/server/util/RangeUtils.java
index 19f02d21fd..540b91eb91 100644
--- a/util/src/main/java/com/gitplex/commons/util/RangeUtils.java
+++ b/core/src/main/java/com/gitplex/server/util/RangeUtils.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/util/src/main/java/com/gitplex/commons/util/ReflectionUtils.java b/core/src/main/java/com/gitplex/server/util/ReflectionUtils.java
similarity index 99%
rename from util/src/main/java/com/gitplex/commons/util/ReflectionUtils.java
rename to core/src/main/java/com/gitplex/server/util/ReflectionUtils.java
index 4329b14c69..8d2bbec613 100644
--- a/util/src/main/java/com/gitplex/commons/util/ReflectionUtils.java
+++ b/core/src/main/java/com/gitplex/server/util/ReflectionUtils.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
diff --git a/util/src/main/java/com/gitplex/commons/util/StringUtils.java b/core/src/main/java/com/gitplex/server/util/StringUtils.java
similarity index 99%
rename from util/src/main/java/com/gitplex/commons/util/StringUtils.java
rename to core/src/main/java/com/gitplex/server/util/StringUtils.java
index b0107ca117..6dea10d6f8 100644
--- a/util/src/main/java/com/gitplex/commons/util/StringUtils.java
+++ b/core/src/main/java/com/gitplex/server/util/StringUtils.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/util/src/main/java/com/gitplex/commons/util/TextNodeVisitor.java b/core/src/main/java/com/gitplex/server/util/TextNodeVisitor.java
similarity index 95%
rename from util/src/main/java/com/gitplex/commons/util/TextNodeVisitor.java
rename to core/src/main/java/com/gitplex/server/util/TextNodeVisitor.java
index 3f645955e5..92abe66a5e 100644
--- a/util/src/main/java/com/gitplex/commons/util/TextNodeVisitor.java
+++ b/core/src/main/java/com/gitplex/server/util/TextNodeVisitor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.util.List;
diff --git a/util/src/main/java/com/gitplex/commons/util/Transformer.java b/core/src/main/java/com/gitplex/server/util/Transformer.java
similarity index 76%
rename from util/src/main/java/com/gitplex/commons/util/Transformer.java
rename to core/src/main/java/com/gitplex/server/util/Transformer.java
index 511776a5cd..6df81dc850 100644
--- a/util/src/main/java/com/gitplex/commons/util/Transformer.java
+++ b/core/src/main/java/com/gitplex/server/util/Transformer.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.io.Serializable;
diff --git a/util/src/main/java/com/gitplex/commons/util/UniversalEncodingDetector.java b/core/src/main/java/com/gitplex/server/util/UniversalEncodingDetector.java
similarity index 98%
rename from util/src/main/java/com/gitplex/commons/util/UniversalEncodingDetector.java
rename to core/src/main/java/com/gitplex/server/util/UniversalEncodingDetector.java
index 2070b33c3d..72343ea9c4 100644
--- a/util/src/main/java/com/gitplex/commons/util/UniversalEncodingDetector.java
+++ b/core/src/main/java/com/gitplex/server/util/UniversalEncodingDetector.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/util/src/main/java/com/gitplex/commons/util/UniversalEncodingListener.java b/core/src/main/java/com/gitplex/server/util/UniversalEncodingListener.java
similarity index 98%
rename from util/src/main/java/com/gitplex/commons/util/UniversalEncodingListener.java
rename to core/src/main/java/com/gitplex/server/util/UniversalEncodingListener.java
index 591fefda21..15d2ba5827 100644
--- a/util/src/main/java/com/gitplex/commons/util/UniversalEncodingListener.java
+++ b/core/src/main/java/com/gitplex/server/util/UniversalEncodingListener.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import java.nio.charset.Charset;
diff --git a/util/src/main/java/com/gitplex/commons/util/Version.java b/core/src/main/java/com/gitplex/server/util/Version.java
similarity index 99%
rename from util/src/main/java/com/gitplex/commons/util/Version.java
rename to core/src/main/java/com/gitplex/server/util/Version.java
index 02b7248bc9..29b1c046ac 100644
--- a/util/src/main/java/com/gitplex/commons/util/Version.java
+++ b/core/src/main/java/com/gitplex/server/util/Version.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import com.google.common.base.Preconditions;
diff --git a/util/src/main/java/com/gitplex/commons/util/WordUtils.java b/core/src/main/java/com/gitplex/server/util/WordUtils.java
similarity index 97%
rename from util/src/main/java/com/gitplex/commons/util/WordUtils.java
rename to core/src/main/java/com/gitplex/server/util/WordUtils.java
index c72c7b921f..0c4bb772b1 100644
--- a/util/src/main/java/com/gitplex/commons/util/WordUtils.java
+++ b/core/src/main/java/com/gitplex/server/util/WordUtils.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
public class WordUtils extends org.apache.commons.lang3.text.WordUtils {
diff --git a/util/src/main/java/com/gitplex/commons/util/concurrent/Prioritized.java b/core/src/main/java/com/gitplex/server/util/concurrent/Prioritized.java
similarity index 87%
rename from util/src/main/java/com/gitplex/commons/util/concurrent/Prioritized.java
rename to core/src/main/java/com/gitplex/server/util/concurrent/Prioritized.java
index 1126fa57e1..a1011b7e86 100644
--- a/util/src/main/java/com/gitplex/commons/util/concurrent/Prioritized.java
+++ b/core/src/main/java/com/gitplex/server/util/concurrent/Prioritized.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.concurrent;
+package com.gitplex.server.util.concurrent;
public class Prioritized implements PriorityAware {
diff --git a/util/src/main/java/com/gitplex/commons/util/concurrent/PrioritizedCallable.java b/core/src/main/java/com/gitplex/server/util/concurrent/PrioritizedCallable.java
similarity index 81%
rename from util/src/main/java/com/gitplex/commons/util/concurrent/PrioritizedCallable.java
rename to core/src/main/java/com/gitplex/server/util/concurrent/PrioritizedCallable.java
index cf771ec0a8..7f5063fda2 100644
--- a/util/src/main/java/com/gitplex/commons/util/concurrent/PrioritizedCallable.java
+++ b/core/src/main/java/com/gitplex/server/util/concurrent/PrioritizedCallable.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.concurrent;
+package com.gitplex.server.util.concurrent;
import java.util.concurrent.Callable;
diff --git a/util/src/main/java/com/gitplex/commons/util/concurrent/PrioritizedExecutor.java b/core/src/main/java/com/gitplex/server/util/concurrent/PrioritizedExecutor.java
similarity index 98%
rename from util/src/main/java/com/gitplex/commons/util/concurrent/PrioritizedExecutor.java
rename to core/src/main/java/com/gitplex/server/util/concurrent/PrioritizedExecutor.java
index 73a71d4fa9..abf56e24e8 100644
--- a/util/src/main/java/com/gitplex/commons/util/concurrent/PrioritizedExecutor.java
+++ b/core/src/main/java/com/gitplex/server/util/concurrent/PrioritizedExecutor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.concurrent;
+package com.gitplex.server.util.concurrent;
import java.util.Collection;
import java.util.List;
diff --git a/util/src/main/java/com/gitplex/commons/util/concurrent/PrioritizedFutureTask.java b/core/src/main/java/com/gitplex/server/util/concurrent/PrioritizedFutureTask.java
similarity index 93%
rename from util/src/main/java/com/gitplex/commons/util/concurrent/PrioritizedFutureTask.java
rename to core/src/main/java/com/gitplex/server/util/concurrent/PrioritizedFutureTask.java
index 8c4b212173..3bfcdfe29a 100644
--- a/util/src/main/java/com/gitplex/commons/util/concurrent/PrioritizedFutureTask.java
+++ b/core/src/main/java/com/gitplex/server/util/concurrent/PrioritizedFutureTask.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.concurrent;
+package com.gitplex.server.util.concurrent;
import java.util.concurrent.FutureTask;
diff --git a/util/src/main/java/com/gitplex/commons/util/concurrent/PrioritizedRunnable.java b/core/src/main/java/com/gitplex/server/util/concurrent/PrioritizedRunnable.java
similarity index 77%
rename from util/src/main/java/com/gitplex/commons/util/concurrent/PrioritizedRunnable.java
rename to core/src/main/java/com/gitplex/server/util/concurrent/PrioritizedRunnable.java
index 9f95ffb732..cf223c7932 100644
--- a/util/src/main/java/com/gitplex/commons/util/concurrent/PrioritizedRunnable.java
+++ b/core/src/main/java/com/gitplex/server/util/concurrent/PrioritizedRunnable.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.concurrent;
+package com.gitplex.server.util.concurrent;
public abstract class PrioritizedRunnable extends Prioritized implements Runnable {
diff --git a/util/src/main/java/com/gitplex/commons/util/concurrent/PriorityAware.java b/core/src/main/java/com/gitplex/server/util/concurrent/PriorityAware.java
similarity index 66%
rename from util/src/main/java/com/gitplex/commons/util/concurrent/PriorityAware.java
rename to core/src/main/java/com/gitplex/server/util/concurrent/PriorityAware.java
index a2ed6f72a0..3b8bd36d76 100644
--- a/util/src/main/java/com/gitplex/commons/util/concurrent/PriorityAware.java
+++ b/core/src/main/java/com/gitplex/server/util/concurrent/PriorityAware.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.concurrent;
+package com.gitplex.server.util.concurrent;
public interface PriorityAware extends Comparable<PriorityAware> {
int getPriority();
diff --git a/util/src/main/java/com/gitplex/commons/util/diff/DiffBlock.java b/core/src/main/java/com/gitplex/server/util/diff/DiffBlock.java
similarity index 90%
rename from util/src/main/java/com/gitplex/commons/util/diff/DiffBlock.java
rename to core/src/main/java/com/gitplex/server/util/diff/DiffBlock.java
index 7e6d671f46..4f4503ca86 100644
--- a/util/src/main/java/com/gitplex/commons/util/diff/DiffBlock.java
+++ b/core/src/main/java/com/gitplex/server/util/diff/DiffBlock.java
@@ -1,9 +1,9 @@
-package com.gitplex.commons.util.diff;
+package com.gitplex.server.util.diff;
import java.io.Serializable;
import java.util.List;
-import com.gitplex.commons.util.diff.DiffMatchPatch.Operation;
+import com.gitplex.server.util.diff.DiffMatchPatch.Operation;
public class DiffBlock<T> implements Serializable {
diff --git a/util/src/main/java/com/gitplex/commons/util/diff/DiffMatchPatch.java b/core/src/main/java/com/gitplex/server/util/diff/DiffMatchPatch.java
similarity index 99%
rename from util/src/main/java/com/gitplex/commons/util/diff/DiffMatchPatch.java
rename to core/src/main/java/com/gitplex/server/util/diff/DiffMatchPatch.java
index 34afcb5cd3..8b206baea2 100644
--- a/util/src/main/java/com/gitplex/commons/util/diff/DiffMatchPatch.java
+++ b/core/src/main/java/com/gitplex/server/util/diff/DiffMatchPatch.java
@@ -16,7 +16,7 @@
* the License.
*/
-package com.gitplex.commons.util.diff;
+package com.gitplex.server.util.diff;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
diff --git a/util/src/main/java/com/gitplex/commons/util/diff/DiffUtils.java b/core/src/main/java/com/gitplex/server/util/diff/DiffUtils.java
similarity index 98%
rename from util/src/main/java/com/gitplex/commons/util/diff/DiffUtils.java
rename to core/src/main/java/com/gitplex/server/util/diff/DiffUtils.java
index 8a05ff4741..b6dba7749b 100644
--- a/util/src/main/java/com/gitplex/commons/util/diff/DiffUtils.java
+++ b/core/src/main/java/com/gitplex/server/util/diff/DiffUtils.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.diff;
+package com.gitplex.server.util.diff;
import java.util.ArrayList;
import java.util.HashMap;
@@ -10,12 +10,12 @@ import java.util.regex.Pattern;
import javax.annotation.Nullable;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.commons.util.diff.DiffMatchPatch.Diff;
-import com.gitplex.commons.util.diff.DiffMatchPatch.Operation;
import com.gitplex.jsyntax.Token;
import com.gitplex.jsyntax.Tokenizer;
import com.gitplex.jsyntax.TokenizerRegistry;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.util.diff.DiffMatchPatch.Diff;
+import com.gitplex.server.util.diff.DiffMatchPatch.Operation;
import com.google.common.base.Preconditions;
public class DiffUtils {
diff --git a/util/src/main/java/com/gitplex/commons/util/diff/LineDiff.java b/core/src/main/java/com/gitplex/server/util/diff/LineDiff.java
similarity index 93%
rename from util/src/main/java/com/gitplex/commons/util/diff/LineDiff.java
rename to core/src/main/java/com/gitplex/server/util/diff/LineDiff.java
index a57bfa5467..a63238e69c 100644
--- a/util/src/main/java/com/gitplex/commons/util/diff/LineDiff.java
+++ b/core/src/main/java/com/gitplex/server/util/diff/LineDiff.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.diff;
+package com.gitplex.server.util.diff;
import java.io.Serializable;
import java.util.List;
diff --git a/util/src/main/java/com/gitplex/commons/util/diff/WhitespaceOption.java b/core/src/main/java/com/gitplex/server/util/diff/WhitespaceOption.java
similarity index 97%
rename from util/src/main/java/com/gitplex/commons/util/diff/WhitespaceOption.java
rename to core/src/main/java/com/gitplex/server/util/diff/WhitespaceOption.java
index 0c9a6b0931..a7680a10d6 100644
--- a/util/src/main/java/com/gitplex/commons/util/diff/WhitespaceOption.java
+++ b/core/src/main/java/com/gitplex/server/util/diff/WhitespaceOption.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.diff;
+package com.gitplex.server.util.diff;
import java.util.regex.Pattern;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/EditableUtils.java b/core/src/main/java/com/gitplex/server/util/editable/EditableUtils.java
similarity index 93%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/EditableUtils.java
rename to core/src/main/java/com/gitplex/server/util/editable/EditableUtils.java
index 943f902bd2..e25334140c 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/EditableUtils.java
+++ b/core/src/main/java/com/gitplex/server/util/editable/EditableUtils.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable;
+package com.gitplex.server.util.editable;
import java.io.Serializable;
import java.lang.reflect.AnnotatedElement;
@@ -11,14 +11,14 @@ import java.util.List;
import javax.annotation.Nullable;
import javax.validation.Validator;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.commons.util.BeanUtils;
-import com.gitplex.commons.util.ClassUtils;
-import com.gitplex.commons.util.GeneralException;
-import com.gitplex.commons.util.ReflectionUtils;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.commons.util.WordUtils;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.util.BeanUtils;
+import com.gitplex.server.util.ClassUtils;
+import com.gitplex.server.util.GeneralException;
+import com.gitplex.server.util.ReflectionUtils;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.util.WordUtils;
+import com.gitplex.server.util.editable.annotation.Editable;
public class EditableUtils {
diff --git a/core/src/main/java/com/gitplex/server/core/annotation/AccountChoice.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/AccountChoice.java
similarity index 85%
rename from core/src/main/java/com/gitplex/server/core/annotation/AccountChoice.java
rename to core/src/main/java/com/gitplex/server/util/editable/annotation/AccountChoice.java
index b96fb463d2..36dc19f159 100644
--- a/core/src/main/java/com/gitplex/server/core/annotation/AccountChoice.java
+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/AccountChoice.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.annotation;
+package com.gitplex.server.util.editable.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/gitplex/server/core/annotation/BranchChoice.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/BranchChoice.java
similarity index 83%
rename from core/src/main/java/com/gitplex/server/core/annotation/BranchChoice.java
rename to core/src/main/java/com/gitplex/server/util/editable/annotation/BranchChoice.java
index 9cb3a6bae5..a592460ac7 100644
--- a/core/src/main/java/com/gitplex/server/core/annotation/BranchChoice.java
+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/BranchChoice.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.annotation;
+package com.gitplex.server.util.editable.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/gitplex/server/core/annotation/BranchMatch.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/BranchMatch.java
similarity index 83%
rename from core/src/main/java/com/gitplex/server/core/annotation/BranchMatch.java
rename to core/src/main/java/com/gitplex/server/util/editable/annotation/BranchMatch.java
index fa7f0fe21a..f5cbd46782 100644
--- a/core/src/main/java/com/gitplex/server/core/annotation/BranchMatch.java
+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/BranchMatch.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.annotation;
+package com.gitplex.server.util.editable.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/ChoiceProvider.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/ChoiceProvider.java
similarity index 84%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/ChoiceProvider.java
rename to core/src/main/java/com/gitplex/server/util/editable/annotation/ChoiceProvider.java
index 02a8647aea..900f5d060a 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/ChoiceProvider.java
+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/ChoiceProvider.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.annotation;
+package com.gitplex.server.util.editable.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Editable.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/Editable.java
similarity index 90%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Editable.java
rename to core/src/main/java/com/gitplex/server/util/editable/annotation/Editable.java
index b8b1ab4014..c751a3a7bf 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Editable.java
+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/Editable.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.annotation;
+package com.gitplex.server.util.editable.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/ExcludeValues.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/ExcludeValues.java
similarity index 84%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/ExcludeValues.java
rename to core/src/main/java/com/gitplex/server/util/editable/annotation/ExcludeValues.java
index 72b5b0acb6..9c7625f54d 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/ExcludeValues.java
+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/ExcludeValues.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.annotation;
+package com.gitplex.server.util.editable.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/gitplex/server/core/annotation/FileChoice.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/FileChoice.java
similarity index 83%
rename from core/src/main/java/com/gitplex/server/core/annotation/FileChoice.java
rename to core/src/main/java/com/gitplex/server/util/editable/annotation/FileChoice.java
index a3627aebb0..6e72568685 100644
--- a/core/src/main/java/com/gitplex/server/core/annotation/FileChoice.java
+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/FileChoice.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.annotation;
+package com.gitplex.server.util.editable.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/gitplex/server/core/annotation/FullBranchMatch.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/FullBranchMatch.java
similarity index 83%
rename from core/src/main/java/com/gitplex/server/core/annotation/FullBranchMatch.java
rename to core/src/main/java/com/gitplex/server/util/editable/annotation/FullBranchMatch.java
index 18cf2e7c98..27fca2e5b0 100644
--- a/core/src/main/java/com/gitplex/server/core/annotation/FullBranchMatch.java
+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/FullBranchMatch.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.annotation;
+package com.gitplex.server.util.editable.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Horizontal.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/Horizontal.java
similarity index 83%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Horizontal.java
rename to core/src/main/java/com/gitplex/server/util/editable/annotation/Horizontal.java
index 29a86d4191..21119ea338 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Horizontal.java
+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/Horizontal.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.annotation;
+package com.gitplex.server.util.editable.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Markdown.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/Markdown.java
similarity index 88%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Markdown.java
rename to core/src/main/java/com/gitplex/server/util/editable/annotation/Markdown.java
index deb67005f7..466fde4a9e 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Markdown.java
+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/Markdown.java
@@ -6,7 +6,7 @@
*
* Revision: $Id: Multiline.java 1209 2008-07-28 00:16:18Z robin $
*/
-package com.gitplex.commons.wicket.editable.annotation;
+package com.gitplex.server.util.editable.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Multiline.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/Multiline.java
similarity index 88%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Multiline.java
rename to core/src/main/java/com/gitplex/server/util/editable/annotation/Multiline.java
index a4576ef09e..4e9e8932b8 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Multiline.java
+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/Multiline.java
@@ -6,7 +6,7 @@
*
* Revision: $Id: Multiline.java 1209 2008-07-28 00:16:18Z robin $
*/
-package com.gitplex.commons.wicket.editable.annotation;
+package com.gitplex.server.util.editable.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Numeric.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/Numeric.java
similarity index 83%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Numeric.java
rename to core/src/main/java/com/gitplex/server/util/editable/annotation/Numeric.java
index 8dfd24751d..88abe2d5de 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Numeric.java
+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/Numeric.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.annotation;
+package com.gitplex.server.util.editable.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/OmitName.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/OmitName.java
similarity index 85%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/OmitName.java
rename to core/src/main/java/com/gitplex/server/util/editable/annotation/OmitName.java
index 6f7240044d..b683c45f48 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/OmitName.java
+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/OmitName.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.annotation;
+package com.gitplex.server.util.editable.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Password.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/Password.java
similarity index 84%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Password.java
rename to core/src/main/java/com/gitplex/server/util/editable/annotation/Password.java
index b715dfbf96..a550a67c36 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Password.java
+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/Password.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.annotation;
+package com.gitplex.server.util.editable.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/gitplex/server/core/annotation/PathMatch.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/PathMatch.java
similarity index 83%
rename from core/src/main/java/com/gitplex/server/core/annotation/PathMatch.java
rename to core/src/main/java/com/gitplex/server/util/editable/annotation/PathMatch.java
index c61ded8b3b..d019c8a615 100644
--- a/core/src/main/java/com/gitplex/server/core/annotation/PathMatch.java
+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/PathMatch.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.annotation;
+package com.gitplex.server.util.editable.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/gitplex/server/core/annotation/RefMatch.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/RefMatch.java
similarity index 82%
rename from core/src/main/java/com/gitplex/server/core/annotation/RefMatch.java
rename to core/src/main/java/com/gitplex/server/util/editable/annotation/RefMatch.java
index 1f79153a9e..9fd9d2830d 100644
--- a/core/src/main/java/com/gitplex/server/core/annotation/RefMatch.java
+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/RefMatch.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.annotation;
+package com.gitplex.server.util.editable.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/gitplex/server/core/annotation/TeamChoice.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/TeamChoice.java
similarity index 84%
rename from core/src/main/java/com/gitplex/server/core/annotation/TeamChoice.java
rename to core/src/main/java/com/gitplex/server/util/editable/annotation/TeamChoice.java
index 90a84184c6..93577ed828 100644
--- a/core/src/main/java/com/gitplex/server/core/annotation/TeamChoice.java
+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/TeamChoice.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.annotation;
+package com.gitplex.server.util.editable.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Vertical.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/Vertical.java
similarity index 83%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Vertical.java
rename to core/src/main/java/com/gitplex/server/util/editable/annotation/Vertical.java
index fc8514ec8b..1917a347c5 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/annotation/Vertical.java
+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/Vertical.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.annotation;
+package com.gitplex.server.util.editable.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/util/src/main/java/com/gitplex/commons/util/execution/Argument.java b/core/src/main/java/com/gitplex/server/util/execution/Argument.java
similarity index 77%
rename from util/src/main/java/com/gitplex/commons/util/execution/Argument.java
rename to core/src/main/java/com/gitplex/server/util/execution/Argument.java
index 03b943b6a8..83636dee63 100644
--- a/util/src/main/java/com/gitplex/commons/util/execution/Argument.java
+++ b/core/src/main/java/com/gitplex/server/util/execution/Argument.java
@@ -1,6 +1,6 @@
-package com.gitplex.commons.util.execution;
+package com.gitplex.server.util.execution;
-import com.gitplex.commons.util.StringUtils;
+import com.gitplex.server.util.StringUtils;
public class Argument {
diff --git a/util/src/main/java/com/gitplex/commons/util/execution/Commandline.java b/core/src/main/java/com/gitplex/server/util/execution/Commandline.java
similarity index 98%
rename from util/src/main/java/com/gitplex/commons/util/execution/Commandline.java
rename to core/src/main/java/com/gitplex/server/util/execution/Commandline.java
index b56ac41e0f..3a682596c8 100644
--- a/util/src/main/java/com/gitplex/commons/util/execution/Commandline.java
+++ b/core/src/main/java/com/gitplex/server/util/execution/Commandline.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.execution;
+package com.gitplex.server.util.execution;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -17,7 +17,7 @@ import javax.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.util.StringUtils;
+import com.gitplex.server.util.StringUtils;
import com.google.common.base.Preconditions;
public class Commandline {
diff --git a/util/src/main/java/com/gitplex/commons/util/execution/ExecuteResult.java b/core/src/main/java/com/gitplex/server/util/execution/ExecuteResult.java
similarity index 92%
rename from util/src/main/java/com/gitplex/commons/util/execution/ExecuteResult.java
rename to core/src/main/java/com/gitplex/server/util/execution/ExecuteResult.java
index 7fd7735b98..f78b506699 100644
--- a/util/src/main/java/com/gitplex/commons/util/execution/ExecuteResult.java
+++ b/core/src/main/java/com/gitplex/server/util/execution/ExecuteResult.java
@@ -1,6 +1,6 @@
-package com.gitplex.commons.util.execution;
+package com.gitplex.server.util.execution;
-import com.gitplex.commons.util.GeneralException;
+import com.gitplex.server.util.GeneralException;
public class ExecuteResult {
diff --git a/util/src/main/java/com/gitplex/commons/util/execution/LineConsumer.java b/core/src/main/java/com/gitplex/server/util/execution/LineConsumer.java
similarity index 98%
rename from util/src/main/java/com/gitplex/commons/util/execution/LineConsumer.java
rename to core/src/main/java/com/gitplex/server/util/execution/LineConsumer.java
index c128341b2f..d95022cb28 100644
--- a/util/src/main/java/com/gitplex/commons/util/execution/LineConsumer.java
+++ b/core/src/main/java/com/gitplex/server/util/execution/LineConsumer.java
@@ -15,7 +15,7 @@
*
*/
-package com.gitplex.commons.util.execution;
+package com.gitplex.server.util.execution;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/util/src/main/java/com/gitplex/commons/util/execution/ProcessStreamPumper.java b/core/src/main/java/com/gitplex/server/util/execution/ProcessStreamPumper.java
similarity index 98%
rename from util/src/main/java/com/gitplex/commons/util/execution/ProcessStreamPumper.java
rename to core/src/main/java/com/gitplex/server/util/execution/ProcessStreamPumper.java
index b4ce4ab568..501bb7dfe3 100644
--- a/util/src/main/java/com/gitplex/commons/util/execution/ProcessStreamPumper.java
+++ b/core/src/main/java/com/gitplex/server/util/execution/ProcessStreamPumper.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.execution;
+package com.gitplex.server.util.execution;
import java.io.IOException;
import java.io.InputStream;
diff --git a/util/src/main/java/com/gitplex/commons/util/execution/StreamConsumer.java b/core/src/main/java/com/gitplex/server/util/execution/StreamConsumer.java
similarity index 96%
rename from util/src/main/java/com/gitplex/commons/util/execution/StreamConsumer.java
rename to core/src/main/java/com/gitplex/server/util/execution/StreamConsumer.java
index 176e344c6d..aa62d07d8b 100644
--- a/util/src/main/java/com/gitplex/commons/util/execution/StreamConsumer.java
+++ b/core/src/main/java/com/gitplex/server/util/execution/StreamConsumer.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.execution;
+package com.gitplex.server.util.execution;
import java.io.IOException;
import java.io.InputStream;
diff --git a/core/src/main/java/com/gitplex/server/core/util/fullbranchmatch/FullBranchMatch.g4 b/core/src/main/java/com/gitplex/server/util/fullbranchmatch/FullBranchMatch.g4
similarity index 100%
rename from core/src/main/java/com/gitplex/server/core/util/fullbranchmatch/FullBranchMatch.g4
rename to core/src/main/java/com/gitplex/server/util/fullbranchmatch/FullBranchMatch.g4
diff --git a/core/src/main/java/com/gitplex/server/core/util/fullbranchmatch/FullBranchMatchUtils.java b/core/src/main/java/com/gitplex/server/util/fullbranchmatch/FullBranchMatchUtils.java
similarity index 82%
rename from core/src/main/java/com/gitplex/server/core/util/fullbranchmatch/FullBranchMatchUtils.java
rename to core/src/main/java/com/gitplex/server/util/fullbranchmatch/FullBranchMatchUtils.java
index 978ca63d0e..fb03b91cb3 100644
--- a/core/src/main/java/com/gitplex/server/core/util/fullbranchmatch/FullBranchMatchUtils.java
+++ b/core/src/main/java/com/gitplex/server/util/fullbranchmatch/FullBranchMatchUtils.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.util.fullbranchmatch;
+package com.gitplex.server.util.fullbranchmatch;
import java.util.ArrayList;
import java.util.List;
@@ -10,16 +10,16 @@ import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.CommonTokenStream;
import org.apache.commons.lang3.StringUtils;
-import com.gitplex.commons.util.match.IncludeExclude;
-import com.gitplex.commons.util.match.Matcher;
-import com.gitplex.commons.util.match.WildcardUtils;
-import com.gitplex.server.core.util.fullbranchmatch.FullBranchMatchLexer;
-import com.gitplex.server.core.util.fullbranchmatch.FullBranchMatchParser;
-import com.gitplex.server.core.util.fullbranchmatch.FullBranchMatchParser.CriteriaContext;
-import com.gitplex.server.core.util.fullbranchmatch.FullBranchMatchParser.FullBranchMatchContext;
-import com.gitplex.server.core.util.fullbranchmatch.FullBranchMatchParser.MatchContext;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.support.DepotAndBranch;
+import com.gitplex.server.util.fullbranchmatch.FullBranchMatchLexer;
+import com.gitplex.server.util.fullbranchmatch.FullBranchMatchParser;
+import com.gitplex.server.util.fullbranchmatch.FullBranchMatchParser.CriteriaContext;
+import com.gitplex.server.util.fullbranchmatch.FullBranchMatchParser.FullBranchMatchContext;
+import com.gitplex.server.util.fullbranchmatch.FullBranchMatchParser.MatchContext;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.support.DepotAndBranch;
+import com.gitplex.server.util.match.IncludeExclude;
+import com.gitplex.server.util.match.Matcher;
+import com.gitplex.server.util.match.WildcardUtils;
public class FullBranchMatchUtils {
diff --git a/core/src/main/java/com/gitplex/server/core/util/includeexclude/IncludeExclude.g4 b/core/src/main/java/com/gitplex/server/util/includeexclude/IncludeExclude.g4
similarity index 100%
rename from core/src/main/java/com/gitplex/server/core/util/includeexclude/IncludeExclude.g4
rename to core/src/main/java/com/gitplex/server/util/includeexclude/IncludeExclude.g4
diff --git a/core/src/main/java/com/gitplex/server/core/util/includeexclude/IncludeExcludeUtils.java b/core/src/main/java/com/gitplex/server/util/includeexclude/IncludeExcludeUtils.java
similarity index 77%
rename from core/src/main/java/com/gitplex/server/core/util/includeexclude/IncludeExcludeUtils.java
rename to core/src/main/java/com/gitplex/server/util/includeexclude/IncludeExcludeUtils.java
index 321a034135..0ecc391799 100644
--- a/core/src/main/java/com/gitplex/server/core/util/includeexclude/IncludeExcludeUtils.java
+++ b/core/src/main/java/com/gitplex/server/util/includeexclude/IncludeExcludeUtils.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.util.includeexclude;
+package com.gitplex.server.util.includeexclude;
import java.util.ArrayList;
import java.util.List;
@@ -8,11 +8,11 @@ import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.tree.TerminalNode;
-import com.gitplex.commons.util.match.IncludeExclude;
-import com.gitplex.server.core.util.includeexclude.IncludeExcludeLexer;
-import com.gitplex.server.core.util.includeexclude.IncludeExcludeParser;
-import com.gitplex.server.core.util.includeexclude.IncludeExcludeParser.CriteriaContext;
-import com.gitplex.server.core.util.includeexclude.IncludeExcludeParser.MatchContext;
+import com.gitplex.server.util.includeexclude.IncludeExcludeLexer;
+import com.gitplex.server.util.includeexclude.IncludeExcludeParser;
+import com.gitplex.server.util.includeexclude.IncludeExcludeParser.CriteriaContext;
+import com.gitplex.server.util.includeexclude.IncludeExcludeParser.MatchContext;
+import com.gitplex.server.util.match.IncludeExclude;
public class IncludeExcludeUtils {
diff --git a/util/src/main/java/com/gitplex/commons/util/init/InitStage.java b/core/src/main/java/com/gitplex/server/util/init/InitStage.java
similarity index 98%
rename from util/src/main/java/com/gitplex/commons/util/init/InitStage.java
rename to core/src/main/java/com/gitplex/server/util/init/InitStage.java
index 9c596b1f07..97dd26448c 100644
--- a/util/src/main/java/com/gitplex/commons/util/init/InitStage.java
+++ b/core/src/main/java/com/gitplex/server/util/init/InitStage.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.init;
+package com.gitplex.server.util.init;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/util/src/main/java/com/gitplex/commons/util/init/ManualConfig.java b/core/src/main/java/com/gitplex/server/util/init/ManualConfig.java
similarity index 95%
rename from util/src/main/java/com/gitplex/commons/util/init/ManualConfig.java
rename to core/src/main/java/com/gitplex/server/util/init/ManualConfig.java
index caae3a1342..f3c01a80e3 100644
--- a/util/src/main/java/com/gitplex/commons/util/init/ManualConfig.java
+++ b/core/src/main/java/com/gitplex/server/util/init/ManualConfig.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.init;
+package com.gitplex.server.util.init;
import java.io.Serializable;
import java.util.HashSet;
diff --git a/util/src/main/java/com/gitplex/commons/util/init/Skippable.java b/core/src/main/java/com/gitplex/server/util/init/Skippable.java
similarity index 54%
rename from util/src/main/java/com/gitplex/commons/util/init/Skippable.java
rename to core/src/main/java/com/gitplex/server/util/init/Skippable.java
index 854a65204c..4b5eecaeed 100644
--- a/util/src/main/java/com/gitplex/commons/util/init/Skippable.java
+++ b/core/src/main/java/com/gitplex/server/util/init/Skippable.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.init;
+package com.gitplex.server.util.init;
public interface Skippable {
void skip();
diff --git a/core/src/main/java/com/gitplex/server/util/jackson/DefaultView.java b/core/src/main/java/com/gitplex/server/util/jackson/DefaultView.java
new file mode 100644
index 0000000000..c19316a2d2
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/util/jackson/DefaultView.java
@@ -0,0 +1,5 @@
+package com.gitplex.server.util.jackson;
+
+public class DefaultView {
+
+}
diff --git a/core/src/main/java/com/gitplex/server/util/jackson/ExternalView.java b/core/src/main/java/com/gitplex/server/util/jackson/ExternalView.java
new file mode 100644
index 0000000000..48db090cc4
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/util/jackson/ExternalView.java
@@ -0,0 +1,5 @@
+package com.gitplex.server.util.jackson;
+
+public class ExternalView {
+
+}
diff --git a/jackson/src/main/java/com/gitplex/commons/jackson/JsonOptions.java b/core/src/main/java/com/gitplex/server/util/jackson/JsonOptions.java
similarity index 85%
rename from jackson/src/main/java/com/gitplex/commons/jackson/JsonOptions.java
rename to core/src/main/java/com/gitplex/server/util/jackson/JsonOptions.java
index a30d3f5bd0..6efcb1f386 100644
--- a/jackson/src/main/java/com/gitplex/commons/jackson/JsonOptions.java
+++ b/core/src/main/java/com/gitplex/server/util/jackson/JsonOptions.java
@@ -1,10 +1,10 @@
-package com.gitplex.commons.jackson;
+package com.gitplex.server.util.jackson;
import java.util.LinkedHashMap;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gitplex.calla.loader.AppLoader;
+import com.gitplex.launcher.loader.AppLoader;
@SuppressWarnings("serial")
public class JsonOptions extends LinkedHashMap<String, String> {
diff --git a/jackson/src/main/java/com/gitplex/commons/jackson/ObjectMapperConfigurator.java b/core/src/main/java/com/gitplex/server/util/jackson/ObjectMapperConfigurator.java
similarity index 77%
rename from jackson/src/main/java/com/gitplex/commons/jackson/ObjectMapperConfigurator.java
rename to core/src/main/java/com/gitplex/server/util/jackson/ObjectMapperConfigurator.java
index ffb8245da9..537cb1c172 100644
--- a/jackson/src/main/java/com/gitplex/commons/jackson/ObjectMapperConfigurator.java
+++ b/core/src/main/java/com/gitplex/server/util/jackson/ObjectMapperConfigurator.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.jackson;
+package com.gitplex.server.util.jackson;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/jackson/src/main/java/com/gitplex/commons/jackson/ObjectMapperProvider.java b/core/src/main/java/com/gitplex/server/util/jackson/ObjectMapperProvider.java
similarity index 98%
rename from jackson/src/main/java/com/gitplex/commons/jackson/ObjectMapperProvider.java
rename to core/src/main/java/com/gitplex/server/util/jackson/ObjectMapperProvider.java
index 6ed1e7dee7..52caa10d3c 100644
--- a/jackson/src/main/java/com/gitplex/commons/jackson/ObjectMapperProvider.java
+++ b/core/src/main/java/com/gitplex/server/util/jackson/ObjectMapperProvider.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.jackson;
+package com.gitplex.server.util.jackson;
import java.util.Collection;
import java.util.Map;
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/EntityDeserializer.java b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/EntityDeserializer.java
similarity index 96%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/EntityDeserializer.java
rename to core/src/main/java/com/gitplex/server/util/jackson/hibernate/EntityDeserializer.java
index 89b9b09030..35e0a1cf59 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/EntityDeserializer.java
+++ b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/EntityDeserializer.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.jackson;
+package com.gitplex.server.util.jackson.hibernate;
import java.io.IOException;
@@ -12,8 +12,8 @@ import com.fasterxml.jackson.databind.deser.BeanDeserializer;
import com.fasterxml.jackson.databind.deser.SettableAnyProperty;
import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
import com.fasterxml.jackson.databind.deser.impl.PropertyValue;
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.commons.hibernate.dao.Dao;
+import com.gitplex.server.persistence.AbstractEntity;
+import com.gitplex.server.persistence.dao.Dao;
import com.google.common.base.Preconditions;
@SuppressWarnings("serial")
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/HibernateAnnotationIntrospector.java b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java
similarity index 91%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/HibernateAnnotationIntrospector.java
rename to core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java
index 72ca931cce..722ff42352 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/HibernateAnnotationIntrospector.java
+++ b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.jackson;
+package com.gitplex.server.util.jackson.hibernate;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
@@ -8,7 +8,7 @@ import com.fasterxml.jackson.core.Version;
import com.fasterxml.jackson.databind.AnnotationIntrospector;
import com.fasterxml.jackson.databind.introspect.Annotated;
import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
@SuppressWarnings("serial")
public class HibernateAnnotationIntrospector extends AnnotationIntrospector {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/HibernateObjectMapperConfigurator.java b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateObjectMapperConfigurator.java
similarity index 80%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/HibernateObjectMapperConfigurator.java
rename to core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateObjectMapperConfigurator.java
index 52870fe5ba..d91a0b4f94 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/HibernateObjectMapperConfigurator.java
+++ b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateObjectMapperConfigurator.java
@@ -1,10 +1,10 @@
-package com.gitplex.commons.hibernate.jackson;
+package com.gitplex.server.util.jackson.hibernate;
import javax.inject.Inject;
import javax.inject.Singleton;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gitplex.commons.jackson.ObjectMapperConfigurator;
+import com.gitplex.server.util.jackson.ObjectMapperConfigurator;
@Singleton
public class HibernateObjectMapperConfigurator implements ObjectMapperConfigurator {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/HibernateObjectMapperModule.java b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateObjectMapperModule.java
similarity index 96%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/HibernateObjectMapperModule.java
rename to core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateObjectMapperModule.java
index 33c24ef61a..5d4cd46af1 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/HibernateObjectMapperModule.java
+++ b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateObjectMapperModule.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.jackson;
+package com.gitplex.server.util.jackson.hibernate;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -22,8 +22,8 @@ import com.fasterxml.jackson.databind.ser.std.CollectionSerializer;
import com.fasterxml.jackson.databind.ser.std.MapSerializer;
import com.fasterxml.jackson.databind.type.CollectionType;
import com.fasterxml.jackson.databind.type.MapType;
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.commons.hibernate.dao.Dao;
+import com.gitplex.server.persistence.AbstractEntity;
+import com.gitplex.server.persistence.dao.Dao;
@Singleton
public class HibernateObjectMapperModule extends Module {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/HibernateProxySerializer.java b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateProxySerializer.java
similarity index 98%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/HibernateProxySerializer.java
rename to core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateProxySerializer.java
index 7d7f75a926..9e4ee92d2b 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/HibernateProxySerializer.java
+++ b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/HibernateProxySerializer.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.jackson;
+package com.gitplex.server.util.jackson.hibernate;
import java.io.IOException;
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/ManyToOneDeserializer.java b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/ManyToOneDeserializer.java
similarity index 82%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/ManyToOneDeserializer.java
rename to core/src/main/java/com/gitplex/server/util/jackson/hibernate/ManyToOneDeserializer.java
index 7cc4ac6836..b8d6a8a952 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/ManyToOneDeserializer.java
+++ b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/ManyToOneDeserializer.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.jackson;
+package com.gitplex.server.util.jackson.hibernate;
import java.io.IOException;
@@ -6,9 +6,9 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.calla.loader.AppLoader;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.persistence.AbstractEntity;
+import com.gitplex.server.persistence.dao.Dao;
@SuppressWarnings("serial")
public final class ManyToOneDeserializer extends StdDeserializer<AbstractEntity> {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/ManyToOneSerializer.java b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/ManyToOneSerializer.java
similarity index 86%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/ManyToOneSerializer.java
rename to core/src/main/java/com/gitplex/server/util/jackson/hibernate/ManyToOneSerializer.java
index 66730b2365..dec2949800 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/jackson/ManyToOneSerializer.java
+++ b/core/src/main/java/com/gitplex/server/util/jackson/hibernate/ManyToOneSerializer.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.hibernate.jackson;
+package com.gitplex.server.util.jackson.hibernate;
import java.io.IOException;
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.core.JsonGenerationException;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.server.persistence.AbstractEntity;
public final class ManyToOneSerializer extends StdSerializer<AbstractEntity> {
diff --git a/jetty/src/main/java/com/gitplex/commons/jetty/AssetServlet.java b/core/src/main/java/com/gitplex/server/util/jetty/AssetServlet.java
similarity index 98%
rename from jetty/src/main/java/com/gitplex/commons/jetty/AssetServlet.java
rename to core/src/main/java/com/gitplex/server/util/jetty/AssetServlet.java
index 33007b3267..bfa99fa2a3 100644
--- a/jetty/src/main/java/com/gitplex/commons/jetty/AssetServlet.java
+++ b/core/src/main/java/com/gitplex/server/util/jetty/AssetServlet.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.jetty;
+package com.gitplex.server.util.jetty;
import java.io.IOException;
import java.net.URL;
@@ -18,7 +18,7 @@ import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletMapping;
import org.eclipse.jetty.util.resource.Resource;
-import com.gitplex.calla.bootstrap.Bootstrap;
+import com.gitplex.launcher.bootstrap.Bootstrap;
/**
* Asset servlet to serve static web assets with some default parameters.
diff --git a/jetty/src/main/java/com/gitplex/commons/jetty/ClasspathAssetServlet.java b/core/src/main/java/com/gitplex/server/util/jetty/ClasspathAssetServlet.java
similarity index 96%
rename from jetty/src/main/java/com/gitplex/commons/jetty/ClasspathAssetServlet.java
rename to core/src/main/java/com/gitplex/server/util/jetty/ClasspathAssetServlet.java
index 255fddba34..908180affd 100644
--- a/jetty/src/main/java/com/gitplex/commons/jetty/ClasspathAssetServlet.java
+++ b/core/src/main/java/com/gitplex/server/util/jetty/ClasspathAssetServlet.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.jetty;
+package com.gitplex.server.util.jetty;
import java.net.URL;
diff --git a/jetty/src/main/java/com/gitplex/commons/jetty/JettyPlugin.java b/core/src/main/java/com/gitplex/server/util/jetty/DefaultJettyRunner.java
similarity index 60%
rename from jetty/src/main/java/com/gitplex/commons/jetty/JettyPlugin.java
rename to core/src/main/java/com/gitplex/server/util/jetty/DefaultJettyRunner.java
index 84c9f28ac5..6252094753 100644
--- a/jetty/src/main/java/com/gitplex/commons/jetty/JettyPlugin.java
+++ b/core/src/main/java/com/gitplex/server/util/jetty/DefaultJettyRunner.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.jetty;
+package com.gitplex.server.util.jetty;
import java.util.ArrayList;
import java.util.Collections;
@@ -6,7 +6,9 @@ import java.util.EnumSet;
import java.util.List;
import java.util.Set;
+import javax.inject.Inject;
import javax.inject.Provider;
+import javax.inject.Singleton;
import javax.servlet.DispatcherType;
import org.eclipse.jetty.server.Server;
@@ -14,72 +16,51 @@ import org.eclipse.jetty.server.handler.gzip.GzipHandler;
import org.eclipse.jetty.servlet.ErrorPageErrorHandler;
import org.eclipse.jetty.servlet.ServletContextHandler;
-import com.gitplex.calla.loader.AbstractPlugin;
-import com.google.inject.Inject;
+import com.gitplex.launcher.bootstrap.Bootstrap;
+import com.gitplex.launcher.bootstrap.BootstrapUtils;
+import com.gitplex.server.util.schedule.TaskScheduler;
import com.google.inject.servlet.GuiceFilter;
-import com.gitplex.calla.bootstrap.Bootstrap;
-import com.gitplex.calla.bootstrap.BootstrapUtils;
-public class JettyPlugin extends AbstractPlugin {
-
+@Singleton
+public class DefaultJettyRunner implements JettyRunner, Provider<ServletContextHandler> {
+
private static final int MAX_CONTENT_SIZE = 5000000;
- private Server server;
+ private Server jettyServer;
- private ServletContextHandler contextHandler;
+ private ServletContextHandler servletContextHandler;
private final Provider<Set<ServerConfigurator>> serverConfiguratorsProvider;
private final Provider<Set<ServletConfigurator>> servletConfiguratorsProvider;
+ @Override
+ public ServletContextHandler get() {
+ return servletContextHandler;
+ }
+
/*
* Inject providers here to avoid circurlar dependencies when dependency graph gets complicated
*/
@Inject
- public JettyPlugin(
+ public DefaultJettyRunner(
Provider<Set<ServerConfigurator>> serverConfiguratorsProvider,
- Provider<Set<ServletConfigurator>> servletConfiguratorsProvider) {
+ Provider<Set<ServletConfigurator>> servletConfiguratorsProvider, TaskScheduler taskScheduler) {
this.serverConfiguratorsProvider = serverConfiguratorsProvider;
this.servletConfiguratorsProvider = servletConfiguratorsProvider;
}
@Override
public void start() {
- server = createServer();
- if (Bootstrap.command == null) {
- try {
- server.start();
- } catch (Exception e) {
- throw BootstrapUtils.unchecked(e);
- }
- }
- }
+ jettyServer = new Server();
- @Override
- public void stop() {
- if (server != null && server.isStarted()) {
- try {
- server.stop();
- } catch (Exception e) {
- throw BootstrapUtils.unchecked(e);
- }
- }
- }
-
- public ServletContextHandler getContextHandler() {
- return contextHandler;
- }
-
- private Server createServer() {
- server = new Server();
-
- contextHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
- contextHandler.setMaxFormContentSize(MAX_CONTENT_SIZE);
+ servletContextHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
+ servletContextHandler.setMaxFormContentSize(MAX_CONTENT_SIZE);
- contextHandler.setClassLoader(JettyPlugin.class.getClassLoader());
+ servletContextHandler.setClassLoader(DefaultJettyRunner.class.getClassLoader());
- contextHandler.setErrorHandler(new ErrorPageErrorHandler());
- contextHandler.addFilter(DisableTraceFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));
+ servletContextHandler.setErrorHandler(new ErrorPageErrorHandler());
+ servletContextHandler.addFilter(DisableTraceFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));
/*
* By default contributions is in reverse dependency order. We reverse the order so that
@@ -88,7 +69,7 @@ public class JettyPlugin extends AbstractPlugin {
List<ServletConfigurator> servletConfigurators = new ArrayList<>(servletConfiguratorsProvider.get());
Collections.reverse(servletConfigurators);
for (ServletConfigurator configurator: servletConfigurators) {
- configurator.configure(contextHandler);
+ configurator.configure(servletContextHandler);
}
/*
@@ -96,17 +77,35 @@ public class JettyPlugin extends AbstractPlugin {
* configured in Guice web module can be filtered correctly by filters added to
* Jetty context directly.
*/
- contextHandler.addFilter(GuiceFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));
+ servletContextHandler.addFilter(GuiceFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));
GzipHandler gzipHandler = new GzipHandler();
gzipHandler.setIncludedMimeTypes("text/css", "application/javascript", "text/javascript");
- gzipHandler.setHandler(contextHandler);
+ gzipHandler.setHandler(servletContextHandler);
- server.setHandler(gzipHandler);
+ jettyServer.setHandler(gzipHandler);
for (ServerConfigurator configurator: serverConfiguratorsProvider.get())
- configurator.configure(server);
-
- return server;
+ configurator.configure(jettyServer);
+
+ if (Bootstrap.command == null) {
+ try {
+ jettyServer.start();
+ } catch (Exception e) {
+ throw BootstrapUtils.unchecked(e);
+ }
+ }
}
+
+ @Override
+ public void stop() {
+ if (jettyServer != null && jettyServer.isStarted()) {
+ try {
+ jettyServer.stop();
+ } catch (Exception e) {
+ throw BootstrapUtils.unchecked(e);
+ }
+ }
+ }
+
}
diff --git a/jetty/src/main/java/com/gitplex/commons/jetty/DisableTraceFilter.java b/core/src/main/java/com/gitplex/server/util/jetty/DisableTraceFilter.java
similarity index 96%
rename from jetty/src/main/java/com/gitplex/commons/jetty/DisableTraceFilter.java
rename to core/src/main/java/com/gitplex/server/util/jetty/DisableTraceFilter.java
index 938a3932f6..b0b6748104 100644
--- a/jetty/src/main/java/com/gitplex/commons/jetty/DisableTraceFilter.java
+++ b/core/src/main/java/com/gitplex/server/util/jetty/DisableTraceFilter.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.jetty;
+package com.gitplex.server.util.jetty;
import java.io.IOException;
diff --git a/jetty/src/main/java/com/gitplex/commons/jetty/FileAssetServlet.java b/core/src/main/java/com/gitplex/server/util/jetty/FileAssetServlet.java
similarity index 96%
rename from jetty/src/main/java/com/gitplex/commons/jetty/FileAssetServlet.java
rename to core/src/main/java/com/gitplex/server/util/jetty/FileAssetServlet.java
index 73a7cff5fb..46ea43ecc6 100644
--- a/jetty/src/main/java/com/gitplex/commons/jetty/FileAssetServlet.java
+++ b/core/src/main/java/com/gitplex/server/util/jetty/FileAssetServlet.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.jetty;
+package com.gitplex.server.util.jetty;
import java.io.File;
import java.net.MalformedURLException;
diff --git a/core/src/main/java/com/gitplex/server/util/jetty/JettyRunner.java b/core/src/main/java/com/gitplex/server/util/jetty/JettyRunner.java
new file mode 100644
index 0000000000..4f22d7ee29
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/util/jetty/JettyRunner.java
@@ -0,0 +1,9 @@
+package com.gitplex.server.util.jetty;
+
+public interface JettyRunner {
+
+ void start();
+
+ void stop();
+
+}
diff --git a/jetty/src/main/java/com/gitplex/commons/jetty/ServerConfigurator.java b/core/src/main/java/com/gitplex/server/util/jetty/ServerConfigurator.java
similarity index 59%
rename from jetty/src/main/java/com/gitplex/commons/jetty/ServerConfigurator.java
rename to core/src/main/java/com/gitplex/server/util/jetty/ServerConfigurator.java
index 8fcdee8286..57bad3c164 100644
--- a/jetty/src/main/java/com/gitplex/commons/jetty/ServerConfigurator.java
+++ b/core/src/main/java/com/gitplex/server/util/jetty/ServerConfigurator.java
@@ -1,8 +1,8 @@
-package com.gitplex.commons.jetty;
+package com.gitplex.server.util.jetty;
import org.eclipse.jetty.server.Server;
-import com.gitplex.calla.loader.ExtensionPoint;
+import com.gitplex.launcher.loader.ExtensionPoint;
@ExtensionPoint
public interface ServerConfigurator {
diff --git a/jetty/src/main/java/com/gitplex/commons/jetty/ServletConfigurator.java b/core/src/main/java/com/gitplex/server/util/jetty/ServletConfigurator.java
similarity index 64%
rename from jetty/src/main/java/com/gitplex/commons/jetty/ServletConfigurator.java
rename to core/src/main/java/com/gitplex/server/util/jetty/ServletConfigurator.java
index f6a98a695b..84962feea8 100644
--- a/jetty/src/main/java/com/gitplex/commons/jetty/ServletConfigurator.java
+++ b/core/src/main/java/com/gitplex/server/util/jetty/ServletConfigurator.java
@@ -1,8 +1,8 @@
-package com.gitplex.commons.jetty;
+package com.gitplex.server.util.jetty;
import org.eclipse.jetty.servlet.ServletContextHandler;
-import com.gitplex.calla.loader.ExtensionPoint;
+import com.gitplex.launcher.loader.ExtensionPoint;
@ExtensionPoint
public interface ServletConfigurator {
diff --git a/markdown/src/main/java/com/gitplex/commons/markdown/DefaultMarkdownManager.java b/core/src/main/java/com/gitplex/server/util/markdown/DefaultMarkdownManager.java
similarity index 96%
rename from markdown/src/main/java/com/gitplex/commons/markdown/DefaultMarkdownManager.java
rename to core/src/main/java/com/gitplex/server/util/markdown/DefaultMarkdownManager.java
index d34de52e24..a16cea9cd9 100644
--- a/markdown/src/main/java/com/gitplex/commons/markdown/DefaultMarkdownManager.java
+++ b/core/src/main/java/com/gitplex/server/util/markdown/DefaultMarkdownManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.markdown;
+package com.gitplex.server.util.markdown;
import static org.pegdown.Extensions.ALL_WITH_OPTIONALS;
@@ -26,9 +26,7 @@ import org.pegdown.ast.TaskListNode;
import org.pegdown.plugins.PegDownPlugins;
import org.pegdown.plugins.ToHtmlSerializerPlugin;
-import com.gitplex.commons.markdown.extensionpoint.HtmlTransformer;
-import com.gitplex.commons.markdown.extensionpoint.MarkdownExtension;
-import com.gitplex.commons.util.JsoupUtils;
+import com.gitplex.server.util.JsoupUtils;
@Singleton
public class DefaultMarkdownManager implements MarkdownManager {
diff --git a/core/src/main/java/com/gitplex/server/util/markdown/HtmlTransformer.java b/core/src/main/java/com/gitplex/server/util/markdown/HtmlTransformer.java
new file mode 100644
index 0000000000..0af5beaf92
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/util/markdown/HtmlTransformer.java
@@ -0,0 +1,10 @@
+package com.gitplex.server.util.markdown;
+
+import org.jsoup.nodes.Element;
+
+import com.gitplex.launcher.loader.ExtensionPoint;
+
+@ExtensionPoint
+public interface HtmlTransformer {
+ Element transform(Element body);
+}
diff --git a/markdown/src/main/java/com/gitplex/commons/markdown/extensionpoint/MarkdownExtension.java b/core/src/main/java/com/gitplex/server/util/markdown/MarkdownExtension.java
similarity index 82%
rename from markdown/src/main/java/com/gitplex/commons/markdown/extensionpoint/MarkdownExtension.java
rename to core/src/main/java/com/gitplex/server/util/markdown/MarkdownExtension.java
index 2a354070de..0c963e3b92 100644
--- a/markdown/src/main/java/com/gitplex/commons/markdown/extensionpoint/MarkdownExtension.java
+++ b/core/src/main/java/com/gitplex/server/util/markdown/MarkdownExtension.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.markdown.extensionpoint;
+package com.gitplex.server.util.markdown;
import java.util.Collection;
@@ -7,7 +7,7 @@ import javax.annotation.Nullable;
import org.pegdown.Parser;
import org.pegdown.plugins.ToHtmlSerializerPlugin;
-import com.gitplex.calla.loader.ExtensionPoint;
+import com.gitplex.launcher.loader.ExtensionPoint;
@ExtensionPoint
public interface MarkdownExtension {
diff --git a/markdown/src/main/java/com/gitplex/commons/markdown/MarkdownManager.java b/core/src/main/java/com/gitplex/server/util/markdown/MarkdownManager.java
similarity index 96%
rename from markdown/src/main/java/com/gitplex/commons/markdown/MarkdownManager.java
rename to core/src/main/java/com/gitplex/server/util/markdown/MarkdownManager.java
index fa929ee9b5..3f9360833c 100644
--- a/markdown/src/main/java/com/gitplex/commons/markdown/MarkdownManager.java
+++ b/core/src/main/java/com/gitplex/server/util/markdown/MarkdownManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.markdown;
+package com.gitplex.server.util.markdown;
public interface MarkdownManager {
diff --git a/core/src/main/java/com/gitplex/server/core/util/markdown/MentionParser.java b/core/src/main/java/com/gitplex/server/util/markdown/MentionParser.java
similarity index 86%
rename from core/src/main/java/com/gitplex/server/core/util/markdown/MentionParser.java
rename to core/src/main/java/com/gitplex/server/util/markdown/MentionParser.java
index 0af90f9322..a768017a84 100644
--- a/core/src/main/java/com/gitplex/server/core/util/markdown/MentionParser.java
+++ b/core/src/main/java/com/gitplex/server/util/markdown/MentionParser.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.util.markdown;
+package com.gitplex.server.util.markdown;
import java.util.Collection;
import java.util.HashSet;
@@ -11,11 +11,11 @@ import org.jsoup.nodes.TextNode;
import org.jsoup.select.NodeTraversor;
import com.google.common.collect.ImmutableSet;
-import com.gitplex.commons.util.JsoupUtils;
-import com.gitplex.commons.util.TextNodeVisitor;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.util.JsoupUtils;
+import com.gitplex.server.util.TextNodeVisitor;
public class MentionParser {
diff --git a/markdown/src/main/java/com/gitplex/commons/markdown/NormalizeTransformer.java b/core/src/main/java/com/gitplex/server/util/markdown/NormalizeTransformer.java
similarity index 90%
rename from markdown/src/main/java/com/gitplex/commons/markdown/NormalizeTransformer.java
rename to core/src/main/java/com/gitplex/server/util/markdown/NormalizeTransformer.java
index c5e43dc193..01b3a470c1 100644
--- a/markdown/src/main/java/com/gitplex/commons/markdown/NormalizeTransformer.java
+++ b/core/src/main/java/com/gitplex/server/util/markdown/NormalizeTransformer.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.markdown;
+package com.gitplex.server.util.markdown;
import java.util.Collection;
import java.util.List;
@@ -8,10 +8,9 @@ import org.jsoup.nodes.Node;
import org.jsoup.parser.Tag;
import org.jsoup.select.NodeVisitor;
-import com.gitplex.commons.markdown.extensionpoint.HtmlTransformer;
+import com.gitplex.server.util.JsoupUtils;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
-import com.gitplex.commons.util.JsoupUtils;
public class NormalizeTransformer implements HtmlTransformer {
diff --git a/core/src/main/java/com/gitplex/server/core/util/markdown/PullRequestParser.java b/core/src/main/java/com/gitplex/server/util/markdown/PullRequestParser.java
similarity index 87%
rename from core/src/main/java/com/gitplex/server/core/util/markdown/PullRequestParser.java
rename to core/src/main/java/com/gitplex/server/util/markdown/PullRequestParser.java
index 230dfc5354..57640f0401 100644
--- a/core/src/main/java/com/gitplex/server/core/util/markdown/PullRequestParser.java
+++ b/core/src/main/java/com/gitplex/server/util/markdown/PullRequestParser.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.util.markdown;
+package com.gitplex.server.util.markdown;
import java.util.Collection;
import java.util.HashSet;
@@ -11,11 +11,11 @@ import org.jsoup.nodes.TextNode;
import org.jsoup.select.NodeTraversor;
import com.google.common.collect.ImmutableSet;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.util.JsoupUtils;
-import com.gitplex.commons.util.TextNodeVisitor;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.PullRequest;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.util.JsoupUtils;
+import com.gitplex.server.util.TextNodeVisitor;
public class PullRequestParser {
diff --git a/core/src/main/java/com/gitplex/server/core/util/ChildAwareMatcher.java b/core/src/main/java/com/gitplex/server/util/match/ChildAwareMatcher.java
similarity index 84%
rename from core/src/main/java/com/gitplex/server/core/util/ChildAwareMatcher.java
rename to core/src/main/java/com/gitplex/server/util/match/ChildAwareMatcher.java
index 785707c1ba..053a837a64 100644
--- a/core/src/main/java/com/gitplex/server/core/util/ChildAwareMatcher.java
+++ b/core/src/main/java/com/gitplex/server/util/match/ChildAwareMatcher.java
@@ -1,6 +1,4 @@
-package com.gitplex.server.core.util;
-
-import com.gitplex.commons.util.match.WildcardStringMatcher;
+package com.gitplex.server.util.match;
/**
* Besides the normal wildcard string match, this matcher also matches
diff --git a/util/src/main/java/com/gitplex/commons/util/match/IncludeExclude.java b/core/src/main/java/com/gitplex/server/util/match/IncludeExclude.java
similarity index 94%
rename from util/src/main/java/com/gitplex/commons/util/match/IncludeExclude.java
rename to core/src/main/java/com/gitplex/server/util/match/IncludeExclude.java
index ffce3fcecd..4f02b382f3 100644
--- a/util/src/main/java/com/gitplex/commons/util/match/IncludeExclude.java
+++ b/core/src/main/java/com/gitplex/server/util/match/IncludeExclude.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.match;
+package com.gitplex.server.util.match;
import java.util.List;
diff --git a/util/src/main/java/com/gitplex/commons/util/match/Matcher.java b/core/src/main/java/com/gitplex/server/util/match/Matcher.java
similarity index 63%
rename from util/src/main/java/com/gitplex/commons/util/match/Matcher.java
rename to core/src/main/java/com/gitplex/server/util/match/Matcher.java
index 5d38c28567..0f435f694e 100644
--- a/util/src/main/java/com/gitplex/commons/util/match/Matcher.java
+++ b/core/src/main/java/com/gitplex/server/util/match/Matcher.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.match;
+package com.gitplex.server.util.match;
public interface Matcher<R, V> {
boolean matches(R rule, V value);
diff --git a/core/src/main/java/com/gitplex/server/core/util/ParentAwareMatcher.java b/core/src/main/java/com/gitplex/server/util/match/ParentAwareMatcher.java
similarity index 96%
rename from core/src/main/java/com/gitplex/server/core/util/ParentAwareMatcher.java
rename to core/src/main/java/com/gitplex/server/util/match/ParentAwareMatcher.java
index 52857274cb..37e3dfc25b 100644
--- a/core/src/main/java/com/gitplex/server/core/util/ParentAwareMatcher.java
+++ b/core/src/main/java/com/gitplex/server/util/match/ParentAwareMatcher.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.util;
+package com.gitplex.server.util.match;
/**
* Besides the normal child aware match, this matcher also matches
diff --git a/util/src/main/java/com/gitplex/commons/util/match/PatternApplied.java b/core/src/main/java/com/gitplex/server/util/match/PatternApplied.java
similarity index 92%
rename from util/src/main/java/com/gitplex/commons/util/match/PatternApplied.java
rename to core/src/main/java/com/gitplex/server/util/match/PatternApplied.java
index 883dc1edb5..4e1a6aa602 100644
--- a/util/src/main/java/com/gitplex/commons/util/match/PatternApplied.java
+++ b/core/src/main/java/com/gitplex/server/util/match/PatternApplied.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.match;
+package com.gitplex.server.util.match;
import java.io.Serializable;
diff --git a/util/src/main/java/com/gitplex/commons/util/match/PatternMatcher.java b/core/src/main/java/com/gitplex/server/util/match/PatternMatcher.java
similarity index 63%
rename from util/src/main/java/com/gitplex/commons/util/match/PatternMatcher.java
rename to core/src/main/java/com/gitplex/server/util/match/PatternMatcher.java
index d6032d95b3..9ddb8b946d 100644
--- a/util/src/main/java/com/gitplex/commons/util/match/PatternMatcher.java
+++ b/core/src/main/java/com/gitplex/server/util/match/PatternMatcher.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.match;
+package com.gitplex.server.util.match;
public interface PatternMatcher extends Matcher<String, String> {
}
diff --git a/util/src/main/java/com/gitplex/commons/util/match/WildcardPathMatcher.java b/core/src/main/java/com/gitplex/server/util/match/WildcardPathMatcher.java
similarity index 99%
rename from util/src/main/java/com/gitplex/commons/util/match/WildcardPathMatcher.java
rename to core/src/main/java/com/gitplex/server/util/match/WildcardPathMatcher.java
index 6d62b22173..374ff56df2 100644
--- a/util/src/main/java/com/gitplex/commons/util/match/WildcardPathMatcher.java
+++ b/core/src/main/java/com/gitplex/server/util/match/WildcardPathMatcher.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package com.gitplex.commons.util.match;
+package com.gitplex.server.util.match;
-import com.gitplex.commons.util.StringUtils;
+import com.gitplex.server.util.StringUtils;
/**
* <p>PathMatcher implementation for Ant-style path patterns.
diff --git a/util/src/main/java/com/gitplex/commons/util/match/WildcardStringMatcher.java b/core/src/main/java/com/gitplex/server/util/match/WildcardStringMatcher.java
similarity index 98%
rename from util/src/main/java/com/gitplex/commons/util/match/WildcardStringMatcher.java
rename to core/src/main/java/com/gitplex/server/util/match/WildcardStringMatcher.java
index 89276480ed..d018c0ad9e 100644
--- a/util/src/main/java/com/gitplex/commons/util/match/WildcardStringMatcher.java
+++ b/core/src/main/java/com/gitplex/server/util/match/WildcardStringMatcher.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.match;
+package com.gitplex.server.util.match;
public class WildcardStringMatcher implements PatternMatcher {
diff --git a/util/src/main/java/com/gitplex/commons/util/match/WildcardUtils.java b/core/src/main/java/com/gitplex/server/util/match/WildcardUtils.java
similarity index 99%
rename from util/src/main/java/com/gitplex/commons/util/match/WildcardUtils.java
rename to core/src/main/java/com/gitplex/server/util/match/WildcardUtils.java
index ec2a660b16..67ce041c96 100644
--- a/util/src/main/java/com/gitplex/commons/util/match/WildcardUtils.java
+++ b/core/src/main/java/com/gitplex/server/util/match/WildcardUtils.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.match;
+package com.gitplex.server.util.match;
import java.util.ArrayList;
import java.util.List;
diff --git a/schedule/src/main/java/com/gitplex/commons/schedule/DefaultTaskScheduler.java b/core/src/main/java/com/gitplex/server/util/schedule/DefaultTaskScheduler.java
similarity index 92%
rename from schedule/src/main/java/com/gitplex/commons/schedule/DefaultTaskScheduler.java
rename to core/src/main/java/com/gitplex/server/util/schedule/DefaultTaskScheduler.java
index c997cf2d03..514c44025b 100644
--- a/schedule/src/main/java/com/gitplex/commons/schedule/DefaultTaskScheduler.java
+++ b/core/src/main/java/com/gitplex/server/util/schedule/DefaultTaskScheduler.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.schedule;
+package com.gitplex.server.util.schedule;
import java.util.Properties;
import java.util.UUID;
@@ -45,15 +45,6 @@ public class DefaultTaskScheduler implements TaskScheduler {
}
}
- @Override
- public boolean isStarted() {
- try {
- return quartz.isStarted();
- } catch (SchedulerException e) {
- throw new RuntimeException(e);
- }
- }
-
@Override
public void start() {
try {
@@ -92,9 +83,10 @@ public class DefaultTaskScheduler implements TaskScheduler {
}
@Override
- public void shutdown() {
+ public void stop() {
try {
- quartz.shutdown();
+ if (quartz.isStarted())
+ quartz.shutdown();
} catch (SchedulerException e) {
throw new RuntimeException(e);
}
diff --git a/schedule/src/main/java/com/gitplex/commons/schedule/SchedulableTask.java b/core/src/main/java/com/gitplex/server/util/schedule/SchedulableTask.java
similarity index 76%
rename from schedule/src/main/java/com/gitplex/commons/schedule/SchedulableTask.java
rename to core/src/main/java/com/gitplex/server/util/schedule/SchedulableTask.java
index b977488923..705c0677cd 100644
--- a/schedule/src/main/java/com/gitplex/commons/schedule/SchedulableTask.java
+++ b/core/src/main/java/com/gitplex/server/util/schedule/SchedulableTask.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.schedule;
+package com.gitplex.server.util.schedule;
import org.quartz.ScheduleBuilder;
diff --git a/schedule/src/main/java/com/gitplex/commons/schedule/TaskScheduler.java b/core/src/main/java/com/gitplex/server/util/schedule/TaskScheduler.java
similarity index 62%
rename from schedule/src/main/java/com/gitplex/commons/schedule/TaskScheduler.java
rename to core/src/main/java/com/gitplex/server/util/schedule/TaskScheduler.java
index 53404f16c7..b37be405fa 100644
--- a/schedule/src/main/java/com/gitplex/commons/schedule/TaskScheduler.java
+++ b/core/src/main/java/com/gitplex/server/util/schedule/TaskScheduler.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.schedule;
+package com.gitplex.server.util.schedule;
public interface TaskScheduler {
@@ -8,7 +8,5 @@ public interface TaskScheduler {
void start();
- void shutdown();
-
- boolean isStarted();
+ void stop();
}
diff --git a/core/src/main/java/com/gitplex/server/core/setting/ServerConfig.java b/core/src/main/java/com/gitplex/server/util/serverconfig/ServerConfig.java
similarity index 93%
rename from core/src/main/java/com/gitplex/server/core/setting/ServerConfig.java
rename to core/src/main/java/com/gitplex/server/util/serverconfig/ServerConfig.java
index e18e654d44..21e13e0475 100644
--- a/core/src/main/java/com/gitplex/server/core/setting/ServerConfig.java
+++ b/core/src/main/java/com/gitplex/server/util/serverconfig/ServerConfig.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.setting;
+package com.gitplex.server.util.serverconfig;
public interface ServerConfig {
diff --git a/core/src/main/java/com/gitplex/server/core/setting/SslConfig.java b/core/src/main/java/com/gitplex/server/util/serverconfig/SslConfig.java
similarity index 76%
rename from core/src/main/java/com/gitplex/server/core/setting/SslConfig.java
rename to core/src/main/java/com/gitplex/server/util/serverconfig/SslConfig.java
index 74c105afef..e4d9f61560 100644
--- a/core/src/main/java/com/gitplex/server/core/setting/SslConfig.java
+++ b/core/src/main/java/com/gitplex/server/util/serverconfig/SslConfig.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.setting;
+package com.gitplex.server.util.serverconfig;
public interface SslConfig {
int getPort();
diff --git a/core/src/main/java/com/gitplex/server/core/util/validation/AccountNameReservation.java b/core/src/main/java/com/gitplex/server/util/validation/AccountNameReservation.java
similarity index 53%
rename from core/src/main/java/com/gitplex/server/core/util/validation/AccountNameReservation.java
rename to core/src/main/java/com/gitplex/server/util/validation/AccountNameReservation.java
index bdf08df2a4..f278e833bf 100644
--- a/core/src/main/java/com/gitplex/server/core/util/validation/AccountNameReservation.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/AccountNameReservation.java
@@ -1,8 +1,8 @@
-package com.gitplex.server.core.util.validation;
+package com.gitplex.server.util.validation;
import java.util.Set;
-import com.gitplex.calla.loader.ExtensionPoint;
+import com.gitplex.launcher.loader.ExtensionPoint;
@ExtensionPoint
public interface AccountNameReservation {
diff --git a/core/src/main/java/com/gitplex/server/core/util/validation/AccountNameValidator.java b/core/src/main/java/com/gitplex/server/util/validation/AccountNameValidator.java
similarity index 84%
rename from core/src/main/java/com/gitplex/server/core/util/validation/AccountNameValidator.java
rename to core/src/main/java/com/gitplex/server/util/validation/AccountNameValidator.java
index 5a00f931c8..4caf11d720 100644
--- a/core/src/main/java/com/gitplex/server/core/util/validation/AccountNameValidator.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/AccountNameValidator.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.util.validation;
+package com.gitplex.server.util.validation;
import java.util.HashSet;
import java.util.Set;
@@ -7,7 +7,8 @@ import java.util.regex.Pattern;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
-import com.gitplex.server.core.GitPlex;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.util.validation.annotation.AccountName;
public class AccountNameValidator implements ConstraintValidator<AccountName, String> {
@@ -38,7 +39,7 @@ public class AccountNameValidator implements ConstraintValidator<AccountName, St
public static synchronized Set<String> getReservedNames() {
if (reservedNames == null) {
reservedNames = new HashSet<>();
- for (AccountNameReservation each : GitPlex.getExtensions(AccountNameReservation.class)) {
+ for (AccountNameReservation each : AppLoader.getExtensions(AccountNameReservation.class)) {
reservedNames.addAll(each.getReserved());
}
}
diff --git a/validation/src/main/java/com/gitplex/commons/validation/ClassValidatingValidator.java b/core/src/main/java/com/gitplex/server/util/validation/ClassValidatingValidator.java
similarity index 78%
rename from validation/src/main/java/com/gitplex/commons/validation/ClassValidatingValidator.java
rename to core/src/main/java/com/gitplex/server/util/validation/ClassValidatingValidator.java
index c0489b1562..8e414dd63c 100644
--- a/validation/src/main/java/com/gitplex/commons/validation/ClassValidatingValidator.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/ClassValidatingValidator.java
@@ -1,8 +1,10 @@
-package com.gitplex.commons.validation;
+package com.gitplex.server.util.validation;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
+import com.gitplex.server.util.validation.annotation.ClassValidating;
+
public class ClassValidatingValidator implements ConstraintValidator<ClassValidating, Validatable> {
public void initialize(ClassValidating constraintAnnotation) {
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/DefaultEntityValidator.java b/core/src/main/java/com/gitplex/server/util/validation/DefaultEntityValidator.java
similarity index 50%
rename from hibernate/src/main/java/com/gitplex/commons/hibernate/DefaultEntityValidator.java
rename to core/src/main/java/com/gitplex/server/util/validation/DefaultEntityValidator.java
index 6a817bf38e..2912ecdf98 100644
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/DefaultEntityValidator.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/DefaultEntityValidator.java
@@ -1,10 +1,15 @@
-package com.gitplex.commons.hibernate;
+package com.gitplex.server.util.validation;
+
+import java.util.Set;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.persistence.AbstractEntity;
+
@Singleton
public class DefaultEntityValidator implements EntityValidator {
@@ -15,17 +20,32 @@ public class DefaultEntityValidator implements EntityValidator {
this.validator = validator;
}
- @Override
- public void validate(AbstractEntity entity) {
- for (ConstraintViolation<?> violation: validator.validate(entity)) {
- reportError(entity, violation);
- }
- }
-
protected void reportError(AbstractEntity entity, ConstraintViolation<?> violation) {
String errorInfo = String.format("Error validating entity {entity class: %s, entity id: %d, entity property: %s, error message: %s}",
entity.getClass(), entity.getId(), violation.getPropertyPath().toString(), violation.getMessage());
throw new RuntimeException(errorInfo);
}
+ @Override
+ public void validate(AbstractEntity entity) {
+ if (entity instanceof Account) {
+ Account account = (Account) entity;
+ Set<String> excludeProperties;
+ if (account.isOrganization()) {
+ excludeProperties = Account.getOrganizationExcludeProperties();
+ } else {
+ excludeProperties = Account.getUserExcludeProperties();
+ }
+ for (ConstraintViolation<?> violation: validator.validate(account)) {
+ if (!excludeProperties.contains(violation.getPropertyPath().toString())) {
+ reportError(account, violation);
+ }
+ }
+ } else {
+ for (ConstraintViolation<?> violation: validator.validate(entity)) {
+ reportError(entity, violation);
+ }
+ }
+ }
+
}
diff --git a/core/src/main/java/com/gitplex/server/core/util/validation/DepotNameReservation.java b/core/src/main/java/com/gitplex/server/util/validation/DepotNameReservation.java
similarity index 53%
rename from core/src/main/java/com/gitplex/server/core/util/validation/DepotNameReservation.java
rename to core/src/main/java/com/gitplex/server/util/validation/DepotNameReservation.java
index 8a17c6d7b5..5f9996adee 100644
--- a/core/src/main/java/com/gitplex/server/core/util/validation/DepotNameReservation.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/DepotNameReservation.java
@@ -1,8 +1,8 @@
-package com.gitplex.server.core.util.validation;
+package com.gitplex.server.util.validation;
import java.util.Set;
-import com.gitplex.calla.loader.ExtensionPoint;
+import com.gitplex.launcher.loader.ExtensionPoint;
@ExtensionPoint
public interface DepotNameReservation {
diff --git a/core/src/main/java/com/gitplex/server/core/util/validation/DepotNameValidator.java b/core/src/main/java/com/gitplex/server/util/validation/DepotNameValidator.java
similarity index 84%
rename from core/src/main/java/com/gitplex/server/core/util/validation/DepotNameValidator.java
rename to core/src/main/java/com/gitplex/server/util/validation/DepotNameValidator.java
index c53ca969f8..a57397346b 100644
--- a/core/src/main/java/com/gitplex/server/core/util/validation/DepotNameValidator.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/DepotNameValidator.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.util.validation;
+package com.gitplex.server.util.validation;
import java.util.HashSet;
import java.util.Set;
@@ -7,7 +7,8 @@ import java.util.regex.Pattern;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
-import com.gitplex.server.core.GitPlex;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.util.validation.annotation.DepotName;
public class DepotNameValidator implements ConstraintValidator<DepotName, String> {
@@ -38,7 +39,7 @@ public class DepotNameValidator implements ConstraintValidator<DepotName, String
public static synchronized Set<String> getReservedNames() {
if (reservedNames == null) {
reservedNames = new HashSet<>();
- for (DepotNameReservation each : GitPlex.getExtensions(DepotNameReservation.class)) {
+ for (DepotNameReservation each : AppLoader.getExtensions(DepotNameReservation.class)) {
reservedNames.addAll(each.getReserved());
}
}
diff --git a/validation/src/main/java/com/gitplex/commons/validation/DirectoryValidator.java b/core/src/main/java/com/gitplex/server/util/validation/DirectoryValidator.java
similarity index 91%
rename from validation/src/main/java/com/gitplex/commons/validation/DirectoryValidator.java
rename to core/src/main/java/com/gitplex/server/util/validation/DirectoryValidator.java
index 07b4517b72..1f7d1907ad 100644
--- a/validation/src/main/java/com/gitplex/commons/validation/DirectoryValidator.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/DirectoryValidator.java
@@ -1,11 +1,12 @@
-package com.gitplex.commons.validation;
+package com.gitplex.server.util.validation;
import java.io.File;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
-import com.gitplex.commons.util.FileUtils;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.server.util.validation.annotation.Directory;
public class DirectoryValidator implements ConstraintValidator<Directory, String> {
diff --git a/core/src/main/java/com/gitplex/server/util/validation/EntityValidator.java b/core/src/main/java/com/gitplex/server/util/validation/EntityValidator.java
new file mode 100644
index 0000000000..c132db9253
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/util/validation/EntityValidator.java
@@ -0,0 +1,7 @@
+package com.gitplex.server.util.validation;
+
+import com.gitplex.server.persistence.AbstractEntity;
+
+public interface EntityValidator {
+ void validate(AbstractEntity entity);
+}
diff --git a/validation/src/main/java/com/gitplex/commons/validation/NameValidator.java b/core/src/main/java/com/gitplex/server/util/validation/NameValidator.java
similarity index 82%
rename from validation/src/main/java/com/gitplex/commons/validation/NameValidator.java
rename to core/src/main/java/com/gitplex/server/util/validation/NameValidator.java
index 5d78c2eea4..035219828b 100644
--- a/validation/src/main/java/com/gitplex/commons/validation/NameValidator.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/NameValidator.java
@@ -1,9 +1,10 @@
-package com.gitplex.commons.validation;
+package com.gitplex.server.util.validation;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
-import com.gitplex.commons.util.StringUtils;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.util.validation.annotation.Name;
public class NameValidator implements ConstraintValidator<Name, String> {
diff --git a/core/src/main/java/com/gitplex/server/core/util/validation/TeamNameReservation.java b/core/src/main/java/com/gitplex/server/util/validation/TeamNameReservation.java
similarity index 53%
rename from core/src/main/java/com/gitplex/server/core/util/validation/TeamNameReservation.java
rename to core/src/main/java/com/gitplex/server/util/validation/TeamNameReservation.java
index db3d0a23b7..cc2659b9d7 100644
--- a/core/src/main/java/com/gitplex/server/core/util/validation/TeamNameReservation.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/TeamNameReservation.java
@@ -1,8 +1,8 @@
-package com.gitplex.server.core.util.validation;
+package com.gitplex.server.util.validation;
import java.util.Set;
-import com.gitplex.calla.loader.ExtensionPoint;
+import com.gitplex.launcher.loader.ExtensionPoint;
@ExtensionPoint
public interface TeamNameReservation {
diff --git a/core/src/main/java/com/gitplex/server/core/util/validation/TeamNameValidator.java b/core/src/main/java/com/gitplex/server/util/validation/TeamNameValidator.java
similarity index 84%
rename from core/src/main/java/com/gitplex/server/core/util/validation/TeamNameValidator.java
rename to core/src/main/java/com/gitplex/server/util/validation/TeamNameValidator.java
index fbcc554f6e..9a9ee55b90 100644
--- a/core/src/main/java/com/gitplex/server/core/util/validation/TeamNameValidator.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/TeamNameValidator.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.util.validation;
+package com.gitplex.server.util.validation;
import java.util.HashSet;
import java.util.Set;
@@ -7,7 +7,8 @@ import java.util.regex.Pattern;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
-import com.gitplex.server.core.GitPlex;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.util.validation.annotation.TeamName;
public class TeamNameValidator implements ConstraintValidator<TeamName, String> {
@@ -38,7 +39,7 @@ public class TeamNameValidator implements ConstraintValidator<TeamName, String>
public static synchronized Set<String> getReservedNames() {
if (reservedNames == null) {
reservedNames = new HashSet<>();
- for (TeamNameReservation each : GitPlex.getExtensions(TeamNameReservation.class)) {
+ for (TeamNameReservation each : AppLoader.getExtensions(TeamNameReservation.class)) {
reservedNames.addAll(each.getReserved());
}
}
diff --git a/validation/src/main/java/com/gitplex/commons/validation/Validatable.java b/core/src/main/java/com/gitplex/server/util/validation/Validatable.java
similarity index 76%
rename from validation/src/main/java/com/gitplex/commons/validation/Validatable.java
rename to core/src/main/java/com/gitplex/server/util/validation/Validatable.java
index 316b4733b1..24c99e70ae 100644
--- a/validation/src/main/java/com/gitplex/commons/validation/Validatable.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/Validatable.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.validation;
+package com.gitplex.server.util.validation;
import javax.validation.ConstraintValidatorContext;
diff --git a/validation/src/main/java/com/gitplex/commons/validation/ValidatorProvider.java b/core/src/main/java/com/gitplex/server/util/validation/ValidatorProvider.java
similarity index 91%
rename from validation/src/main/java/com/gitplex/commons/validation/ValidatorProvider.java
rename to core/src/main/java/com/gitplex/server/util/validation/ValidatorProvider.java
index 1e420d7885..af18a802c7 100644
--- a/validation/src/main/java/com/gitplex/commons/validation/ValidatorProvider.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/ValidatorProvider.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.validation;
+package com.gitplex.server.util.validation;
import javax.inject.Inject;
import javax.inject.Provider;
diff --git a/core/src/main/java/com/gitplex/server/core/util/validation/AccountName.java b/core/src/main/java/com/gitplex/server/util/validation/annotation/AccountName.java
similarity index 81%
rename from core/src/main/java/com/gitplex/server/core/util/validation/AccountName.java
rename to core/src/main/java/com/gitplex/server/util/validation/annotation/AccountName.java
index b54d5bb44f..31fcbe826b 100644
--- a/core/src/main/java/com/gitplex/server/core/util/validation/AccountName.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/annotation/AccountName.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.util.validation;
+package com.gitplex.server.util.validation.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -8,6 +8,8 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
+import com.gitplex.server.util.validation.AccountNameValidator;
+
@Target({ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy=AccountNameValidator.class)
diff --git a/validation/src/main/java/com/gitplex/commons/validation/ClassValidating.java b/core/src/main/java/com/gitplex/server/util/validation/annotation/ClassValidating.java
similarity index 83%
rename from validation/src/main/java/com/gitplex/commons/validation/ClassValidating.java
rename to core/src/main/java/com/gitplex/server/util/validation/annotation/ClassValidating.java
index c8d3d7eb4e..c9124a83dd 100644
--- a/validation/src/main/java/com/gitplex/commons/validation/ClassValidating.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/annotation/ClassValidating.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.validation;
+package com.gitplex.server.util.validation.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -9,6 +9,8 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
+import com.gitplex.server.util.validation.ClassValidatingValidator;
+
@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = ClassValidatingValidator.class)
diff --git a/core/src/main/java/com/gitplex/server/core/util/validation/DepotName.java b/core/src/main/java/com/gitplex/server/util/validation/annotation/DepotName.java
similarity index 81%
rename from core/src/main/java/com/gitplex/server/core/util/validation/DepotName.java
rename to core/src/main/java/com/gitplex/server/util/validation/annotation/DepotName.java
index 7330e8284c..65c8bed47d 100644
--- a/core/src/main/java/com/gitplex/server/core/util/validation/DepotName.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/annotation/DepotName.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.util.validation;
+package com.gitplex.server.util.validation.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -8,6 +8,8 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
+import com.gitplex.server.util.validation.DepotNameValidator;
+
@Target({ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy=DepotNameValidator.class)
diff --git a/validation/src/main/java/com/gitplex/commons/validation/Directory.java b/core/src/main/java/com/gitplex/server/util/validation/annotation/Directory.java
similarity index 85%
rename from validation/src/main/java/com/gitplex/commons/validation/Directory.java
rename to core/src/main/java/com/gitplex/server/util/validation/annotation/Directory.java
index 93fbb9271f..47b148fde9 100644
--- a/validation/src/main/java/com/gitplex/commons/validation/Directory.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/annotation/Directory.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.validation;
+package com.gitplex.server.util.validation.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -8,6 +8,8 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
+import com.gitplex.server.util.validation.DirectoryValidator;
+
/**
* @author robin
*/
diff --git a/validation/src/main/java/com/gitplex/commons/validation/Name.java b/core/src/main/java/com/gitplex/server/util/validation/annotation/Name.java
similarity index 85%
rename from validation/src/main/java/com/gitplex/commons/validation/Name.java
rename to core/src/main/java/com/gitplex/server/util/validation/annotation/Name.java
index da051022ea..8c0dfb485e 100644
--- a/validation/src/main/java/com/gitplex/commons/validation/Name.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/annotation/Name.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.validation;
+package com.gitplex.server.util.validation.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -8,6 +8,8 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
+import com.gitplex.server.util.validation.NameValidator;
+
/**
* @author robin
*/
diff --git a/core/src/main/java/com/gitplex/server/core/util/validation/TeamName.java b/core/src/main/java/com/gitplex/server/util/validation/annotation/TeamName.java
similarity index 82%
rename from core/src/main/java/com/gitplex/server/core/util/validation/TeamName.java
rename to core/src/main/java/com/gitplex/server/util/validation/annotation/TeamName.java
index 449c9d3cca..2f4324ed3c 100644
--- a/core/src/main/java/com/gitplex/server/core/util/validation/TeamName.java
+++ b/core/src/main/java/com/gitplex/server/util/validation/annotation/TeamName.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.util.validation;
+package com.gitplex.server.util.validation.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-import com.gitplex.commons.validation.Name;
+import com.gitplex.server.util.validation.TeamNameValidator;
@Target({ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/AbstractRevQueue.java b/core/src/main/java/org/eclipse/jgit/revwalk/AbstractRevQueue.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/AbstractRevQueue.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/AbstractRevQueue.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/AsyncRevObjectQueue.java b/core/src/main/java/org/eclipse/jgit/revwalk/AsyncRevObjectQueue.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/AsyncRevObjectQueue.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/AsyncRevObjectQueue.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/BlockObjQueue.java b/core/src/main/java/org/eclipse/jgit/revwalk/BlockObjQueue.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/BlockObjQueue.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/BlockObjQueue.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/BlockRevQueue.java b/core/src/main/java/org/eclipse/jgit/revwalk/BlockRevQueue.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/BlockRevQueue.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/BlockRevQueue.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/BoundaryGenerator.java b/core/src/main/java/org/eclipse/jgit/revwalk/BoundaryGenerator.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/BoundaryGenerator.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/BoundaryGenerator.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/DateRevQueue.java b/core/src/main/java/org/eclipse/jgit/revwalk/DateRevQueue.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/DateRevQueue.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/DateRevQueue.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/DelayRevQueue.java b/core/src/main/java/org/eclipse/jgit/revwalk/DelayRevQueue.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/DelayRevQueue.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/DelayRevQueue.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/DepthGenerator.java b/core/src/main/java/org/eclipse/jgit/revwalk/DepthGenerator.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/DepthGenerator.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/DepthGenerator.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/DepthWalk.java b/core/src/main/java/org/eclipse/jgit/revwalk/DepthWalk.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/DepthWalk.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/DepthWalk.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/EndGenerator.java b/core/src/main/java/org/eclipse/jgit/revwalk/EndGenerator.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/EndGenerator.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/EndGenerator.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/FIFORevQueue.java b/core/src/main/java/org/eclipse/jgit/revwalk/FIFORevQueue.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/FIFORevQueue.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/FIFORevQueue.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/FixUninterestingGenerator.java b/core/src/main/java/org/eclipse/jgit/revwalk/FixUninterestingGenerator.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/FixUninterestingGenerator.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/FixUninterestingGenerator.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/FollowFilter.java b/core/src/main/java/org/eclipse/jgit/revwalk/FollowFilter.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/FollowFilter.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/FollowFilter.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/FooterKey.java b/core/src/main/java/org/eclipse/jgit/revwalk/FooterKey.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/FooterKey.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/FooterKey.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/FooterLine.java b/core/src/main/java/org/eclipse/jgit/revwalk/FooterLine.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/FooterLine.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/FooterLine.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/Generator.java b/core/src/main/java/org/eclipse/jgit/revwalk/Generator.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/Generator.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/Generator.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/LIFORevQueue.java b/core/src/main/java/org/eclipse/jgit/revwalk/LIFORevQueue.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/LIFORevQueue.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/LIFORevQueue.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.java b/core/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.java
similarity index 99%
rename from git/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.java
index 484d0ef999..4dc0f219e5 100644
--- a/git/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.java
+++ b/core/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.java
@@ -26,8 +26,8 @@ import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
import org.eclipse.jgit.util.RawParseUtils;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.util.StringUtils;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.util.StringUtils;
import com.google.common.base.Throwables;
/**
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/MergeBaseGenerator.java b/core/src/main/java/org/eclipse/jgit/revwalk/MergeBaseGenerator.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/MergeBaseGenerator.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/MergeBaseGenerator.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/ObjectWalk.java b/core/src/main/java/org/eclipse/jgit/revwalk/ObjectWalk.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/ObjectWalk.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/ObjectWalk.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/PendingGenerator.java b/core/src/main/java/org/eclipse/jgit/revwalk/PendingGenerator.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/PendingGenerator.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/PendingGenerator.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/RenameCallback.java b/core/src/main/java/org/eclipse/jgit/revwalk/RenameCallback.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/RenameCallback.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/RenameCallback.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/RevBlob.java b/core/src/main/java/org/eclipse/jgit/revwalk/RevBlob.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/RevBlob.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/RevBlob.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/RevCommit.java b/core/src/main/java/org/eclipse/jgit/revwalk/RevCommit.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/RevCommit.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/RevCommit.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/RevCommitList.java b/core/src/main/java/org/eclipse/jgit/revwalk/RevCommitList.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/RevCommitList.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/RevCommitList.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/RevFlag.java b/core/src/main/java/org/eclipse/jgit/revwalk/RevFlag.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/RevFlag.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/RevFlag.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/RevFlagSet.java b/core/src/main/java/org/eclipse/jgit/revwalk/RevFlagSet.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/RevFlagSet.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/RevFlagSet.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/RevObject.java b/core/src/main/java/org/eclipse/jgit/revwalk/RevObject.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/RevObject.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/RevObject.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/RevObjectList.java b/core/src/main/java/org/eclipse/jgit/revwalk/RevObjectList.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/RevObjectList.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/RevObjectList.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/RevSort.java b/core/src/main/java/org/eclipse/jgit/revwalk/RevSort.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/RevSort.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/RevSort.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/RevTag.java b/core/src/main/java/org/eclipse/jgit/revwalk/RevTag.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/RevTag.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/RevTag.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/RevTree.java b/core/src/main/java/org/eclipse/jgit/revwalk/RevTree.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/RevTree.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/RevTree.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/RevWalk.java b/core/src/main/java/org/eclipse/jgit/revwalk/RevWalk.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/RevWalk.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/RevWalk.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/RevWalkUtils.java b/core/src/main/java/org/eclipse/jgit/revwalk/RevWalkUtils.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/RevWalkUtils.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/RevWalkUtils.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/RewriteGenerator.java b/core/src/main/java/org/eclipse/jgit/revwalk/RewriteGenerator.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/RewriteGenerator.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/RewriteGenerator.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/StartGenerator.java b/core/src/main/java/org/eclipse/jgit/revwalk/StartGenerator.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/StartGenerator.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/StartGenerator.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/TopoSortGenerator.java b/core/src/main/java/org/eclipse/jgit/revwalk/TopoSortGenerator.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/TopoSortGenerator.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/TopoSortGenerator.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/TreeRevFilter.java b/core/src/main/java/org/eclipse/jgit/revwalk/TreeRevFilter.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/TreeRevFilter.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/TreeRevFilter.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/filter/AndRevFilter.java b/core/src/main/java/org/eclipse/jgit/revwalk/filter/AndRevFilter.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/filter/AndRevFilter.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/filter/AndRevFilter.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/filter/AuthorRevFilter.java b/core/src/main/java/org/eclipse/jgit/revwalk/filter/AuthorRevFilter.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/filter/AuthorRevFilter.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/filter/AuthorRevFilter.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/filter/CommitTimeRevFilter.java b/core/src/main/java/org/eclipse/jgit/revwalk/filter/CommitTimeRevFilter.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/filter/CommitTimeRevFilter.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/filter/CommitTimeRevFilter.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/filter/CommitterRevFilter.java b/core/src/main/java/org/eclipse/jgit/revwalk/filter/CommitterRevFilter.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/filter/CommitterRevFilter.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/filter/CommitterRevFilter.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/filter/MaxCountRevFilter.java b/core/src/main/java/org/eclipse/jgit/revwalk/filter/MaxCountRevFilter.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/filter/MaxCountRevFilter.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/filter/MaxCountRevFilter.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/filter/MessageRevFilter.java b/core/src/main/java/org/eclipse/jgit/revwalk/filter/MessageRevFilter.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/filter/MessageRevFilter.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/filter/MessageRevFilter.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/filter/NotRevFilter.java b/core/src/main/java/org/eclipse/jgit/revwalk/filter/NotRevFilter.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/filter/NotRevFilter.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/filter/NotRevFilter.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/filter/ObjectFilter.java b/core/src/main/java/org/eclipse/jgit/revwalk/filter/ObjectFilter.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/filter/ObjectFilter.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/filter/ObjectFilter.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/filter/OrRevFilter.java b/core/src/main/java/org/eclipse/jgit/revwalk/filter/OrRevFilter.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/filter/OrRevFilter.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/filter/OrRevFilter.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/filter/PatternMatchRevFilter.java b/core/src/main/java/org/eclipse/jgit/revwalk/filter/PatternMatchRevFilter.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/filter/PatternMatchRevFilter.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/filter/PatternMatchRevFilter.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/filter/RevFilter.java b/core/src/main/java/org/eclipse/jgit/revwalk/filter/RevFilter.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/filter/RevFilter.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/filter/RevFilter.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/filter/RevFlagFilter.java b/core/src/main/java/org/eclipse/jgit/revwalk/filter/RevFlagFilter.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/filter/RevFlagFilter.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/filter/RevFlagFilter.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/filter/SkipRevFilter.java b/core/src/main/java/org/eclipse/jgit/revwalk/filter/SkipRevFilter.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/filter/SkipRevFilter.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/filter/SkipRevFilter.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/filter/SubStringRevFilter.java b/core/src/main/java/org/eclipse/jgit/revwalk/filter/SubStringRevFilter.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/filter/SubStringRevFilter.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/filter/SubStringRevFilter.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/filter/package-info.java b/core/src/main/java/org/eclipse/jgit/revwalk/filter/package-info.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/filter/package-info.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/filter/package-info.java
diff --git a/git/src/main/java/org/eclipse/jgit/revwalk/package-info.java b/core/src/main/java/org/eclipse/jgit/revwalk/package-info.java
similarity index 100%
rename from git/src/main/java/org/eclipse/jgit/revwalk/package-info.java
rename to core/src/main/java/org/eclipse/jgit/revwalk/package-info.java
diff --git a/core/src/main/resources/archetype-resource/src/main/java/Plugin.java b/core/src/main/resources/archetype-resource/src/main/java/Plugin.java
index 5ca2f34b53..3f2c04e7d2 100644
--- a/core/src/main/resources/archetype-resource/src/main/java/Plugin.java
+++ b/core/src/main/resources/archetype-resource/src/main/java/Plugin.java
@@ -1,7 +1,7 @@
package ${package};
import java.util.Collection;
-import com.gitplex.calla.loader.AbstractPlugin;
+import com.gitplex.launcher.loader.AbstractPlugin;
public class Plugin extends AbstractPlugin {
diff --git a/core/src/main/resources/archetype-resource/src/main/java/PluginModule.java b/core/src/main/resources/archetype-resource/src/main/java/PluginModule.java
index 0dbd7c4086..18c02202a7 100644
--- a/core/src/main/resources/archetype-resource/src/main/java/PluginModule.java
+++ b/core/src/main/resources/archetype-resource/src/main/java/PluginModule.java
@@ -1,7 +1,7 @@
package ${package};
-import com.gitplex.calla.loader.AbstractPlugin;
-import com.gitplex.calla.loader.AbstractPluginModule;
+import com.gitplex.launcher.loader.AbstractPlugin;
+import com.gitplex.launcher.loader.AbstractPluginModule;
/**
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
diff --git a/core/src/test/java/com/gitplex/server/core/entity/PullRequestTest.java b/core/src/test/java/com/gitplex/server/entity/PullRequestTest.java
similarity index 92%
rename from core/src/test/java/com/gitplex/server/core/entity/PullRequestTest.java
rename to core/src/test/java/com/gitplex/server/entity/PullRequestTest.java
index 275931415d..2ca11c8f90 100644
--- a/core/src/test/java/com/gitplex/server/core/entity/PullRequestTest.java
+++ b/core/src/test/java/com/gitplex/server/entity/PullRequestTest.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import java.io.File;
@@ -8,12 +8,9 @@ import org.junit.Test;
import org.mockito.Matchers;
import org.mockito.Mockito;
-import com.gitplex.commons.git.AbstractGitTest;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestUpdate;
-import com.gitplex.server.core.manager.DepotManager;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.git.AbstractGitTest;
+import com.gitplex.server.manager.DepotManager;
public class PullRequestTest extends AbstractGitTest {
diff --git a/core/src/test/java/com/gitplex/server/core/entity/PullRequestUpdateTest.java b/core/src/test/java/com/gitplex/server/entity/PullRequestUpdateTest.java
similarity index 96%
rename from core/src/test/java/com/gitplex/server/core/entity/PullRequestUpdateTest.java
rename to core/src/test/java/com/gitplex/server/entity/PullRequestUpdateTest.java
index ba14e27a0f..344f0924f4 100644
--- a/core/src/test/java/com/gitplex/server/core/entity/PullRequestUpdateTest.java
+++ b/core/src/test/java/com/gitplex/server/entity/PullRequestUpdateTest.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.core.entity;
+package com.gitplex.server.entity;
import java.io.File;
@@ -6,12 +6,9 @@ import org.eclipse.jgit.lib.Repository;
import org.junit.Assert;
import org.junit.Test;
+import com.gitplex.server.git.AbstractGitTest;
+import com.gitplex.server.git.GitUtils;
import com.google.common.collect.Sets;
-import com.gitplex.commons.git.AbstractGitTest;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestUpdate;
public class PullRequestUpdateTest extends AbstractGitTest {
diff --git a/git/src/test/java/com/gitplex/commons/git/AbstractGitTest.java b/core/src/test/java/com/gitplex/server/git/AbstractGitTest.java
similarity index 90%
rename from git/src/test/java/com/gitplex/commons/git/AbstractGitTest.java
rename to core/src/test/java/com/gitplex/server/git/AbstractGitTest.java
index 5bcc624426..2a5fdb8217 100644
--- a/git/src/test/java/com/gitplex/commons/git/AbstractGitTest.java
+++ b/core/src/test/java/com/gitplex/server/git/AbstractGitTest.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git;
+package com.gitplex.server.git;
import java.io.File;
import java.io.IOException;
@@ -16,13 +16,13 @@ import org.eclipse.jgit.lib.RefUpdate;
import org.junit.Assert;
import org.mockito.Mockito;
-import com.gitplex.calla.bootstrap.BootstrapUtils;
-import com.gitplex.commons.git.GitConfig;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.git.command.GitCommand;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.commons.util.FileUtils;
-import com.gitplex.calla.loader.AppLoaderMocker;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.git.command.GitCommand;
+import com.gitplex.server.git.config.GitConfig;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.launcher.loader.AppLoaderMocker;
+import com.gitplex.launcher.bootstrap.BootstrapUtils;
public abstract class AbstractGitTest extends AppLoaderMocker {
diff --git a/git/src/test/java/com/gitplex/commons/git/FileEditTest.java b/core/src/test/java/com/gitplex/server/git/FileEditTest.java
similarity index 95%
rename from git/src/test/java/com/gitplex/commons/git/FileEditTest.java
rename to core/src/test/java/com/gitplex/server/git/FileEditTest.java
index 3165d76566..edb55c8b4e 100644
--- a/git/src/test/java/com/gitplex/commons/git/FileEditTest.java
+++ b/core/src/test/java/com/gitplex/server/git/FileEditTest.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git;
+package com.gitplex.server.git;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -12,13 +12,13 @@ import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.treewalk.TreeWalk;
import org.junit.Test;
-import com.gitplex.commons.git.FileEdit;
-import com.gitplex.commons.git.PathAndContent;
-import com.gitplex.commons.git.exception.GitObjectAlreadyExistsException;
-import com.gitplex.commons.git.exception.GitObjectNotFoundException;
-import com.gitplex.commons.git.exception.NotGitFileException;
-import com.gitplex.commons.git.exception.NotGitTreeException;
-import com.gitplex.commons.git.exception.ObsoleteCommitException;
+import com.gitplex.server.git.FileEdit;
+import com.gitplex.server.git.PathAndContent;
+import com.gitplex.server.git.exception.GitObjectAlreadyExistsException;
+import com.gitplex.server.git.exception.GitObjectNotFoundException;
+import com.gitplex.server.git.exception.NotGitFileException;
+import com.gitplex.server.git.exception.NotGitTreeException;
+import com.gitplex.server.git.exception.ObsoleteCommitException;
public class FileEditTest extends AbstractGitTest {
diff --git a/git/src/test/java/com/gitplex/commons/git/GitUtilsTest.java b/core/src/test/java/com/gitplex/server/git/GitUtilsTest.java
similarity index 98%
rename from git/src/test/java/com/gitplex/commons/git/GitUtilsTest.java
rename to core/src/test/java/com/gitplex/server/git/GitUtilsTest.java
index a66e61dabd..2d5d3b316d 100644
--- a/git/src/test/java/com/gitplex/commons/git/GitUtilsTest.java
+++ b/core/src/test/java/com/gitplex/server/git/GitUtilsTest.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git;
+package com.gitplex.server.git;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -12,7 +12,7 @@ import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.treewalk.TreeWalk;
import org.junit.Test;
-import com.gitplex.commons.git.GitUtils;
+import com.gitplex.server.git.GitUtils;
import com.google.common.collect.Sets;
public class GitUtilsTest extends AbstractGitTest {
diff --git a/git/src/test/java/com/gitplex/commons/git/GitVersionTest.java b/core/src/test/java/com/gitplex/server/git/GitVersionTest.java
similarity index 93%
rename from git/src/test/java/com/gitplex/commons/git/GitVersionTest.java
rename to core/src/test/java/com/gitplex/server/git/GitVersionTest.java
index 04bec062de..7ccc6b06a2 100644
--- a/git/src/test/java/com/gitplex/commons/git/GitVersionTest.java
+++ b/core/src/test/java/com/gitplex/server/git/GitVersionTest.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git;
+package com.gitplex.server.git;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -6,7 +6,7 @@ import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import com.gitplex.commons.git.GitVersion;
+import com.gitplex.server.git.GitVersion;
public class GitVersionTest {
diff --git a/git/src/test/java/com/gitplex/commons/git/command/BlameCommandTest.java b/core/src/test/java/com/gitplex/server/git/command/BlameCommandTest.java
similarity index 91%
rename from git/src/test/java/com/gitplex/commons/git/command/BlameCommandTest.java
rename to core/src/test/java/com/gitplex/server/git/command/BlameCommandTest.java
index 7bf2ccf762..5c7f261a6d 100644
--- a/git/src/test/java/com/gitplex/commons/git/command/BlameCommandTest.java
+++ b/core/src/test/java/com/gitplex/server/git/command/BlameCommandTest.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.git.command;
+package com.gitplex.server.git.command;
import static org.junit.Assert.assertEquals;
@@ -6,9 +6,9 @@ import java.util.Map;
import org.junit.Test;
-import com.gitplex.commons.git.Blame;
-import com.gitplex.commons.git.command.BlameCommand;
-import com.gitplex.commons.git.AbstractGitTest;
+import com.gitplex.server.git.AbstractGitTest;
+import com.gitplex.server.git.Blame;
+import com.gitplex.server.git.command.BlameCommand;
public class BlameCommandTest extends AbstractGitTest {
diff --git a/util/src/test/java/com/gitplex/commons/util/BeanUtilsTest.java b/core/src/test/java/com/gitplex/server/util/BeanUtilsTest.java
similarity index 93%
rename from util/src/test/java/com/gitplex/commons/util/BeanUtilsTest.java
rename to core/src/test/java/com/gitplex/server/util/BeanUtilsTest.java
index 8ebe7bd54f..892a2b1475 100644
--- a/util/src/test/java/com/gitplex/commons/util/BeanUtilsTest.java
+++ b/core/src/test/java/com/gitplex/server/util/BeanUtilsTest.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -8,7 +8,7 @@ import java.util.List;
import org.junit.Test;
-import com.gitplex.commons.util.BeanUtils;
+import com.gitplex.server.util.BeanUtils;
public class BeanUtilsTest {
diff --git a/util/src/test/java/com/gitplex/commons/util/ClassUtilsTest.java b/core/src/test/java/com/gitplex/server/util/ClassUtilsTest.java
similarity index 84%
rename from util/src/test/java/com/gitplex/commons/util/ClassUtilsTest.java
rename to core/src/test/java/com/gitplex/server/util/ClassUtilsTest.java
index 9b53362c4a..6f3e0d0632 100644
--- a/util/src/test/java/com/gitplex/commons/util/ClassUtilsTest.java
+++ b/core/src/test/java/com/gitplex/server/util/ClassUtilsTest.java
@@ -1,9 +1,9 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import org.junit.Assert;
import org.junit.Test;
-import com.gitplex.commons.util.ClassUtils;
+import com.gitplex.server.util.ClassUtils;
public class ClassUtilsTest {
diff --git a/util/src/test/java/com/gitplex/commons/util/DependenceUtilsTest.java b/core/src/test/java/com/gitplex/server/util/DependenceUtilsTest.java
similarity index 97%
rename from util/src/test/java/com/gitplex/commons/util/DependenceUtilsTest.java
rename to core/src/test/java/com/gitplex/server/util/DependenceUtilsTest.java
index 41900a2d54..759ef2e8ee 100644
--- a/util/src/test/java/com/gitplex/commons/util/DependenceUtilsTest.java
+++ b/core/src/test/java/com/gitplex/server/util/DependenceUtilsTest.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -9,8 +9,8 @@ import java.util.Set;
import org.junit.Test;
-import com.gitplex.commons.util.DependencyAware;
-import com.gitplex.commons.util.DependencyUtils;
+import com.gitplex.server.util.DependencyAware;
+import com.gitplex.server.util.DependencyUtils;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
diff --git a/util/src/test/java/com/gitplex/commons/util/LoadPropsTest.java b/core/src/test/java/com/gitplex/server/util/LoadPropsTest.java
similarity index 95%
rename from util/src/test/java/com/gitplex/commons/util/LoadPropsTest.java
rename to core/src/test/java/com/gitplex/server/util/LoadPropsTest.java
index 6ee4bce230..b576d26462 100644
--- a/util/src/test/java/com/gitplex/commons/util/LoadPropsTest.java
+++ b/core/src/test/java/com/gitplex/server/util/LoadPropsTest.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -11,7 +11,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.gitplex.commons.util.FileUtils;
+import com.gitplex.server.util.FileUtils;
public class LoadPropsTest {
diff --git a/util/src/test/java/com/gitplex/commons/util/PathUtilsTest.java b/core/src/test/java/com/gitplex/server/util/PathUtilsTest.java
similarity index 88%
rename from util/src/test/java/com/gitplex/commons/util/PathUtilsTest.java
rename to core/src/test/java/com/gitplex/server/util/PathUtilsTest.java
index 5cb297c5e5..eba38cf817 100644
--- a/util/src/test/java/com/gitplex/commons/util/PathUtilsTest.java
+++ b/core/src/test/java/com/gitplex/server/util/PathUtilsTest.java
@@ -1,8 +1,7 @@
-package com.gitplex.commons.util;
-
-import static com.gitplex.commons.util.PathUtils.matchLongest;
-import static com.gitplex.commons.util.PathUtils.matchSegments;
+package com.gitplex.server.util;
+import static com.gitplex.server.util.PathUtils.matchLongest;
+import static com.gitplex.server.util.PathUtils.matchSegments;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
diff --git a/util/src/test/java/com/gitplex/commons/util/ReflectionUtilsTest.java b/core/src/test/java/com/gitplex/server/util/ReflectionUtilsTest.java
similarity index 96%
rename from util/src/test/java/com/gitplex/commons/util/ReflectionUtilsTest.java
rename to core/src/test/java/com/gitplex/server/util/ReflectionUtilsTest.java
index a076dc1278..f541b45dcf 100644
--- a/util/src/test/java/com/gitplex/commons/util/ReflectionUtilsTest.java
+++ b/core/src/test/java/com/gitplex/server/util/ReflectionUtilsTest.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import static org.junit.Assert.assertSame;
@@ -7,7 +7,7 @@ import java.util.List;
import org.junit.Test;
-import com.gitplex.commons.util.ReflectionUtils;
+import com.gitplex.server.util.ReflectionUtils;
import com.google.common.base.Optional;
public class ReflectionUtilsTest {
diff --git a/util/src/test/java/com/gitplex/commons/util/StringUtilsTest.java b/core/src/test/java/com/gitplex/server/util/StringUtilsTest.java
similarity index 92%
rename from util/src/test/java/com/gitplex/commons/util/StringUtilsTest.java
rename to core/src/test/java/com/gitplex/server/util/StringUtilsTest.java
index f93fa9da30..3ab064cca8 100644
--- a/util/src/test/java/com/gitplex/commons/util/StringUtilsTest.java
+++ b/core/src/test/java/com/gitplex/server/util/StringUtilsTest.java
@@ -1,10 +1,10 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import com.gitplex.commons.util.StringUtils;
+import com.gitplex.server.util.StringUtils;
public class StringUtilsTest {
diff --git a/util/src/test/java/com/gitplex/commons/util/VersionTest.java b/core/src/test/java/com/gitplex/server/util/VersionTest.java
similarity index 97%
rename from util/src/test/java/com/gitplex/commons/util/VersionTest.java
rename to core/src/test/java/com/gitplex/server/util/VersionTest.java
index c767af6264..560bd8960a 100644
--- a/util/src/test/java/com/gitplex/commons/util/VersionTest.java
+++ b/core/src/test/java/com/gitplex/server/util/VersionTest.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util;
+package com.gitplex.server.util;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -7,7 +7,7 @@ import static org.junit.Assert.fail;
import org.junit.Test;
-import com.gitplex.commons.util.Version;
+import com.gitplex.server.util.Version;
public class VersionTest {
diff --git a/util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/DummyAbstractClass.java b/core/src/test/java/com/gitplex/server/util/findsubclassesexploded/DummyAbstractClass.java
similarity index 56%
rename from util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/DummyAbstractClass.java
rename to core/src/test/java/com/gitplex/server/util/findsubclassesexploded/DummyAbstractClass.java
index b91722d7e9..e518d461f9 100644
--- a/util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/DummyAbstractClass.java
+++ b/core/src/test/java/com/gitplex/server/util/findsubclassesexploded/DummyAbstractClass.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.util.findsubclassesexploded;
+package com.gitplex.server.util.findsubclassesexploded;
public abstract class DummyAbstractClass implements DummyInterface {
diff --git a/core/src/test/java/com/gitplex/server/util/findsubclassesexploded/DummyInterface.java b/core/src/test/java/com/gitplex/server/util/findsubclassesexploded/DummyInterface.java
new file mode 100644
index 0000000000..8b9e8ee7cf
--- /dev/null
+++ b/core/src/test/java/com/gitplex/server/util/findsubclassesexploded/DummyInterface.java
@@ -0,0 +1,5 @@
+package com.gitplex.server.util.findsubclassesexploded;
+
+public interface DummyInterface {
+ void test();
+}
diff --git a/core/src/test/java/com/gitplex/server/util/findsubclassesexploded/dummy/DummyClass1.java b/core/src/test/java/com/gitplex/server/util/findsubclassesexploded/dummy/DummyClass1.java
new file mode 100644
index 0000000000..58712d3321
--- /dev/null
+++ b/core/src/test/java/com/gitplex/server/util/findsubclassesexploded/dummy/DummyClass1.java
@@ -0,0 +1,10 @@
+package com.gitplex.server.util.findsubclassesexploded.dummy;
+
+import com.gitplex.server.util.findsubclassesexploded.DummyAbstractClass;
+
+public class DummyClass1 extends DummyAbstractClass {
+
+ public void test() {
+ }
+
+}
diff --git a/core/src/test/java/com/gitplex/server/util/findsubclassesexploded/dummy/DummyClass2.java b/core/src/test/java/com/gitplex/server/util/findsubclassesexploded/dummy/DummyClass2.java
new file mode 100644
index 0000000000..4484db9ebd
--- /dev/null
+++ b/core/src/test/java/com/gitplex/server/util/findsubclassesexploded/dummy/DummyClass2.java
@@ -0,0 +1,10 @@
+package com.gitplex.server.util.findsubclassesexploded.dummy;
+
+import com.gitplex.server.util.findsubclassesexploded.DummyAbstractClass;
+
+public class DummyClass2 extends DummyAbstractClass {
+
+ public void test() {
+ }
+
+}
diff --git a/core/src/test/java/com/gitplex/server/util/findsubclassesexploded/dummy/DummyClass3.java b/core/src/test/java/com/gitplex/server/util/findsubclassesexploded/dummy/DummyClass3.java
new file mode 100644
index 0000000000..4e96c682b4
--- /dev/null
+++ b/core/src/test/java/com/gitplex/server/util/findsubclassesexploded/dummy/DummyClass3.java
@@ -0,0 +1,11 @@
+package com.gitplex.server.util.findsubclassesexploded.dummy;
+
+import com.gitplex.server.util.findsubclassesexploded.DummyInterface;
+
+public class DummyClass3 implements DummyInterface {
+
+ public void test() {
+
+ }
+
+}
diff --git a/core/src/test/java/com/gitplex/server/util/findsubclassesexploded/dummy/DummyClass4.java b/core/src/test/java/com/gitplex/server/util/findsubclassesexploded/dummy/DummyClass4.java
new file mode 100644
index 0000000000..e50a6a2bbf
--- /dev/null
+++ b/core/src/test/java/com/gitplex/server/util/findsubclassesexploded/dummy/DummyClass4.java
@@ -0,0 +1,9 @@
+package com.gitplex.server.util.findsubclassesexploded.dummy;
+
+public class DummyClass4 {
+
+ public void test() {
+
+ }
+
+}
diff --git a/core/src/test/java/com/gitplex/server/util/findsubclassesexploded/dummy2/DummyClass5.java b/core/src/test/java/com/gitplex/server/util/findsubclassesexploded/dummy2/DummyClass5.java
new file mode 100644
index 0000000000..b8edcbff1d
--- /dev/null
+++ b/core/src/test/java/com/gitplex/server/util/findsubclassesexploded/dummy2/DummyClass5.java
@@ -0,0 +1,10 @@
+package com.gitplex.server.util.findsubclassesexploded.dummy2;
+
+import com.gitplex.server.util.findsubclassesexploded.DummyAbstractClass;
+
+public class DummyClass5 extends DummyAbstractClass {
+
+ public void test() {
+ }
+
+}
diff --git a/util/src/test/java/com/gitplex/commons/util/pattern/WildcardUtilsTest.java b/core/src/test/java/com/gitplex/server/util/pattern/WildcardUtilsTest.java
similarity index 95%
rename from util/src/test/java/com/gitplex/commons/util/pattern/WildcardUtilsTest.java
rename to core/src/test/java/com/gitplex/server/util/pattern/WildcardUtilsTest.java
index 2867750bff..cd9ed462c6 100644
--- a/util/src/test/java/com/gitplex/commons/util/pattern/WildcardUtilsTest.java
+++ b/core/src/test/java/com/gitplex/server/util/pattern/WildcardUtilsTest.java
@@ -1,6 +1,6 @@
-package com.gitplex.commons.util.pattern;
+package com.gitplex.server.util.pattern;
-import static com.gitplex.commons.util.match.WildcardUtils.*;
+import static com.gitplex.server.util.match.WildcardUtils.*;
import static org.junit.Assert.*;
import org.junit.Test;
diff --git a/git/src/test/java/org/eclipse/jgit/revwalk/LastCommitsOfChildrenTest.java b/core/src/test/java/org/eclipse/jgit/revwalk/LastCommitsOfChildrenTest.java
similarity index 98%
rename from git/src/test/java/org/eclipse/jgit/revwalk/LastCommitsOfChildrenTest.java
rename to core/src/test/java/org/eclipse/jgit/revwalk/LastCommitsOfChildrenTest.java
index 481ecec941..a7c1c32acf 100644
--- a/git/src/test/java/org/eclipse/jgit/revwalk/LastCommitsOfChildrenTest.java
+++ b/core/src/test/java/org/eclipse/jgit/revwalk/LastCommitsOfChildrenTest.java
@@ -9,7 +9,7 @@ import org.eclipse.jgit.revwalk.LastCommitsOfChildren.Cache;
import org.eclipse.jgit.revwalk.LastCommitsOfChildren.Value;
import org.junit.Test;
-import com.gitplex.commons.git.AbstractGitTest;
+import com.gitplex.server.git.AbstractGitTest;
public class LastCommitsOfChildrenTest extends AbstractGitTest {
diff --git a/git/pom.xml b/git/pom.xml
deleted file mode 100644
index 7983fd0b2c..0000000000
--- a/git/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>server-git</artifactId>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>server-parent</artifactId>
- <version>1.0-EAP-build26</version>
- <relativePath>../parent</relativePath>
- </parent>
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <!-- Uncomment below if you'd like to publish an archetype based on your
- plugin -->
- <!--plugin> <artifactId>maven-archetype-plugin</artifactId> </plugin -->
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jgit</groupId>
- <artifactId>org.eclipse.jgit.http.server</artifactId>
- <version>${jgitVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jgit</groupId>
- <artifactId>org.eclipse.jgit.archive</artifactId>
- <version>${jgitVersion}</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-util</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-wicket</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- </dependencies>
- <properties>
- <jgitVersion>4.4.1.201607150455-r</jgitVersion>
- <moduleClass>com.gitplex.commons.git.GitModule</moduleClass>
- </properties>
-</project>
\ No newline at end of file
diff --git a/git/src/main/java/com/gitplex/commons/git/GitModule.java b/git/src/main/java/com/gitplex/commons/git/GitModule.java
deleted file mode 100644
index 09c3d134e7..0000000000
--- a/git/src/main/java/com/gitplex/commons/git/GitModule.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.gitplex.commons.git;
-
-import com.gitplex.commons.git.jackson.GitObjectMapperConfigurator;
-import com.gitplex.commons.jackson.ObjectMapperConfigurator;
-import com.gitplex.calla.loader.AbstractPluginModule;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class GitModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- // put your guice bindings here
- contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class);
- }
-
-}
diff --git a/git/src/main/resources/META-INF/maven/archetype-metadata.xml b/git/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 904fb7a4bb..0000000000
--- a/git/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archetype-descriptor name="archetype.plugin">
- <fileSets>
- <fileSet filtered="true" packaged="true">
- <directory>src/main/java</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/main/resources</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/test/java</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/test/resources</directory>
- </fileSet>
- </fileSets>
-</archetype-descriptor>
\ No newline at end of file
diff --git a/git/src/main/resources/archetype-resource/pom.xml b/git/src/main/resources/archetype-resource/pom.xml
deleted file mode 100644
index 61659b0c40..0000000000
--- a/git/src/main/resources/archetype-resource/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-#if (\${groupId} != "com.gitplex")
- <groupId>\${groupId}</groupId>
-#end
- <artifactId>\${artifactId}</artifactId>
- <version>\${version}</version>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>parent.general</artifactId>
- <version>1.0.0</version>
- </parent>
-
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <repositories>
- <repository>
- <id>pmeaseRepo</id>
- <name>PMEase Repository</name>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- <url>http://artifact.pmease.com/</url>
- </repository>
- </repositories>
-
- <properties>
- <moduleClass>\${package}.PluginModule</moduleClass>
- </properties>
-
-</project>
diff --git a/git/src/main/resources/archetype-resource/src/main/java/Plugin.java b/git/src/main/resources/archetype-resource/src/main/java/Plugin.java
deleted file mode 100644
index 5ca2f34b53..0000000000
--- a/git/src/main/resources/archetype-resource/src/main/java/Plugin.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package ${package};
-
-import java.util.Collection;
-import com.gitplex.calla.loader.AbstractPlugin;
-
-public class Plugin extends AbstractPlugin {
-
- @Override
- public Collection<?> getExtensions() {
- return null;
- }
-
-}
diff --git a/git/src/main/resources/archetype-resource/src/main/java/PluginModule.java b/git/src/main/resources/archetype-resource/src/main/java/PluginModule.java
deleted file mode 100644
index 0dbd7c4086..0000000000
--- a/git/src/main/resources/archetype-resource/src/main/java/PluginModule.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package ${package};
-
-import com.gitplex.calla.loader.AbstractPlugin;
-import com.gitplex.calla.loader.AbstractPluginModule;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class PluginModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- // put your guice bindings here
- }
-
- @Override
- protected Class<? extends AbstractPlugin> getPluginClass() {
- return Plugin.class;
- }
-
-}
diff --git a/hibernate/pom.xml b/hibernate/pom.xml
deleted file mode 100644
index 9f7a0b46fb..0000000000
--- a/hibernate/pom.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>server-parent</artifactId>
- <version>1.0-EAP-build26</version>
- <relativePath>../parent</relativePath>
- </parent>
- <artifactId>server-hibernate</artifactId>
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernateVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-ehcache</artifactId>
- <version>${hibernateVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>${hibernateVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-hikaricp</artifactId>
- <version>${hibernateVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>com.zaxxer</groupId>
- <artifactId>HikariCP-java6</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- </dependency>
- <dependency>
- <groupId>com.zaxxer</groupId>
- <artifactId>HikariCP</artifactId>
- <version>2.4.5</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- <version>3.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>2.3.3</version>
- </dependency>
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>9.4.1208</version>
- </dependency>
- <dependency>
- <groupId>org.mariadb.jdbc</groupId>
- <artifactId>mariadb-java-client</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-jackson</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-jetty</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- <dependency>
- <groupId>org.dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.4.9</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-util</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- </dependencies>
- <properties>
- <moduleClass>com.gitplex.commons.hibernate.HibernateModule</moduleClass>
- <hibernateVersion>5.1.0.Final</hibernateVersion>
- </properties>
-</project>
\ No newline at end of file
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/EntityValidator.java b/hibernate/src/main/java/com/gitplex/commons/hibernate/EntityValidator.java
deleted file mode 100644
index f759931ab9..0000000000
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/EntityValidator.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.gitplex.commons.hibernate;
-
-public interface EntityValidator {
- void validate(AbstractEntity entity);
-}
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/HibernateModule.java b/hibernate/src/main/java/com/gitplex/commons/hibernate/HibernateModule.java
deleted file mode 100644
index 521ff8eb4b..0000000000
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/HibernateModule.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package com.gitplex.commons.hibernate;
-
-import java.io.Serializable;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javax.inject.Provider;
-import javax.inject.Singleton;
-import javax.persistence.OneToMany;
-import javax.persistence.Transient;
-import javax.persistence.Version;
-
-import org.hibernate.CallbackException;
-import org.hibernate.Interceptor;
-import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
-import org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl;
-import org.hibernate.collection.internal.PersistentBag;
-import org.hibernate.type.Type;
-
-import com.gitplex.commons.hibernate.command.DefaultApplyDBConstraintsCommand;
-import com.gitplex.commons.hibernate.command.DefaultBackupCommand;
-import com.gitplex.commons.hibernate.command.DefaultCheckDataVersionCommand;
-import com.gitplex.commons.hibernate.command.DefaultCleanCommand;
-import com.gitplex.commons.hibernate.command.DefaultDBDialectCommand;
-import com.gitplex.commons.hibernate.command.DefaultRestoreCommand;
-import com.gitplex.commons.hibernate.command.DefaultUpgradeCommand;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.DefaultDao;
-import com.gitplex.commons.hibernate.jackson.HibernateObjectMapperConfigurator;
-import com.gitplex.commons.hibernate.migration.JpaConverter;
-import com.gitplex.commons.hibernate.migration.PersistentBagConverter;
-import com.gitplex.commons.hibernate.migration.VersionTable;
-import com.google.common.collect.Lists;
-import com.google.inject.matcher.AbstractMatcher;
-import com.google.inject.matcher.Matchers;
-import com.gitplex.calla.bootstrap.Bootstrap;
-import com.gitplex.calla.bootstrap.Command;
-import com.gitplex.commons.jackson.ObjectMapperConfigurator;
-import com.gitplex.commons.jetty.ServletConfigurator;
-import com.gitplex.calla.loader.AbstractPlugin;
-import com.gitplex.calla.loader.AbstractPluginModule;
-import com.gitplex.commons.util.ClassUtils;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.annotations.XStreamOmitField;
-import com.thoughtworks.xstream.converters.basic.NullConverter;
-import com.thoughtworks.xstream.converters.extended.ISO8601DateConverter;
-import com.thoughtworks.xstream.converters.extended.ISO8601SqlTimestampConverter;
-import com.thoughtworks.xstream.converters.reflection.ReflectionProvider;
-import com.thoughtworks.xstream.core.JVM;
-import com.thoughtworks.xstream.mapper.MapperWrapper;
-
-public class HibernateModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- // Use an optional binding here in case our client does not like to
- // start persist service provided by this plugin
- bind(Interceptor.class).to(HibernateInterceptor.class);
- bind(PhysicalNamingStrategy.class).to(PhysicalNamingStrategyStandardImpl.class);
-
- bind(UnitOfWork.class).to(DefaultUnitOfWork.class);
- bind(IdManager.class).to(DefaultIdManager.class);
- bind(Dao.class).to(DefaultDao.class);
- bind(EntityValidator.class).to(DefaultEntityValidator.class);
-
- TransactionInterceptor transactionInterceptor = new TransactionInterceptor();
- requestInjection(transactionInterceptor);
-
- bindInterceptor(Matchers.any(), new AbstractMatcher<AnnotatedElement>() {
-
- @Override
- public boolean matches(AnnotatedElement element) {
- return element.isAnnotationPresent(Transactional.class) && !((Method) element).isSynthetic();
- }
-
- }, transactionInterceptor);
-
- SessionInterceptor sessionInterceptor = new SessionInterceptor();
- requestInjection(sessionInterceptor);
-
- bindInterceptor(Matchers.any(), new AbstractMatcher<AnnotatedElement>() {
-
- @Override
- public boolean matches(AnnotatedElement element) {
- return element.isAnnotationPresent(Sessional.class) && !((Method) element).isSynthetic();
- }
-
- }, sessionInterceptor);
-
- contribute(ObjectMapperConfigurator.class, HibernateObjectMapperConfigurator.class);
- contribute(ServletConfigurator.class, HibernateServletConfigurator.class);
-
- contribute(PersistListener.class, new PersistListener() {
-
- @Override
- public boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types)
- throws CallbackException {
- return false;
- }
-
- @Override
- public boolean onLoad(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types)
- throws CallbackException {
- return false;
- }
-
- @Override
- public boolean onFlushDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState,
- String[] propertyNames, Type[] types) throws CallbackException {
- return false;
- }
-
- @Override
- public void onDelete(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types)
- throws CallbackException {
- }
- });
-
- contribute(ModelProvider.class, new ModelProvider() {
-
- @SuppressWarnings("unchecked")
- @Override
- public Collection<Class<? extends AbstractEntity>> getModelClasses() {
- return Lists.newArrayList(VersionTable.class);
- }
-
- });
-
- // put your guice bindings here
- bind(XStream.class).toProvider(new Provider<XStream>() {
-
- @SuppressWarnings("rawtypes")
- @Override
- public XStream get() {
- ReflectionProvider reflectionProvider = JVM.newReflectionProvider();
- XStream xstream = new XStream(reflectionProvider) {
-
- @Override
- protected MapperWrapper wrapMapper(MapperWrapper next) {
- return new MapperWrapper(next) {
-
- @Override
- public boolean shouldSerializeMember(Class definedIn, String fieldName) {
- Field field = reflectionProvider.getField(definedIn, fieldName);
-
- return field.getAnnotation(XStreamOmitField.class) == null &&
- field.getAnnotation(Transient.class) == null &&
- field.getAnnotation(OneToMany.class) == null &&
- field.getAnnotation(Version.class) == null;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public String serializedClass(Class type) {
- if (type == PersistentBag.class)
- return super.serializedClass(ArrayList.class);
- else if (type != null)
- return super.serializedClass(ClassUtils.unproxy(type));
- else
- return super.serializedClass(type);
- }
-
- };
- }
-
- };
-
- // register NullConverter as highest; otherwise NPE when unmarshal a map
- // containing an entry with value set to null.
- xstream.registerConverter(new NullConverter(), XStream.PRIORITY_VERY_HIGH);
- xstream.registerConverter(new PersistentBagConverter(xstream.getMapper()), 200);
- xstream.registerConverter(new JpaConverter(xstream.getMapper(), xstream.getReflectionProvider()));
- xstream.registerConverter(new ISO8601DateConverter(), 100);
- xstream.registerConverter(new ISO8601SqlTimestampConverter(), 100);
- xstream.autodetectAnnotations(true);
-
- return xstream;
- }
-
- }).in(Singleton.class);
-
- if (Bootstrap.command != null) {
- if (Command.RESTORE.equals(Bootstrap.command.getName()))
- bind(PersistManager.class).to(DefaultRestoreCommand.class);
- else if (Command.APPLY_DB_CONSTRAINTS.equals(Bootstrap.command.getName()))
- bind(PersistManager.class).to(DefaultApplyDBConstraintsCommand.class);
- else if (Command.BACKUP.equals(Bootstrap.command.getName()))
- bind(PersistManager.class).to(DefaultBackupCommand.class);
- else if (Command.CHECK_DATA_VERSION.equals(Bootstrap.command.getName()))
- bind(PersistManager.class).to(DefaultCheckDataVersionCommand.class);
- else if (Command.UPGRADE.equals(Bootstrap.command.getName()))
- bind(PersistManager.class).to(DefaultUpgradeCommand.class);
- else if (Command.CLEAN.equals(Bootstrap.command.getName()))
- bind(PersistManager.class).to(DefaultCleanCommand.class);
- else if (Command.DB_DIALECT.equals(Bootstrap.command.getName()))
- bind(PersistManager.class).to(DefaultDBDialectCommand.class);
- else
- bind(PersistManager.class).to(DefaultPersistManager.class);
- } else {
- bind(PersistManager.class).to(DefaultPersistManager.class);
- }
- }
-
- @Override
- protected Class<? extends AbstractPlugin> getPluginClass() {
- return HibernatePlugin.class;
- }
-
-}
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/HibernatePlugin.java b/hibernate/src/main/java/com/gitplex/commons/hibernate/HibernatePlugin.java
deleted file mode 100644
index 5aa239061e..0000000000
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/HibernatePlugin.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.gitplex.commons.hibernate;
-
-import com.google.inject.Inject;
-import com.gitplex.calla.loader.AbstractPlugin;
-
-public class HibernatePlugin extends AbstractPlugin {
-
- private final PersistManager persistManager;
-
- @Inject
- public HibernatePlugin(PersistManager persistManager) {
- this.persistManager = persistManager;
- }
-
- @Override
- public void start() {
- persistManager.start();
- }
-
- @Override
- public void stop() {
- persistManager.stop();
- }
-
-}
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/HibernateServletConfigurator.java b/hibernate/src/main/java/com/gitplex/commons/hibernate/HibernateServletConfigurator.java
deleted file mode 100644
index d48990fd2b..0000000000
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/HibernateServletConfigurator.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.gitplex.commons.hibernate;
-
-import java.util.EnumSet;
-
-import javax.inject.Inject;
-import javax.servlet.DispatcherType;
-
-import org.eclipse.jetty.servlet.FilterHolder;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-
-import com.gitplex.commons.jetty.ServletConfigurator;
-
-public class HibernateServletConfigurator implements ServletConfigurator {
-
- private final HibernateFilter hibernateFilter;
-
- @Inject
- public HibernateServletConfigurator(HibernateFilter hibernateFilter) {
- this.hibernateFilter = hibernateFilter;
- }
-
- @Override
- public void configure(ServletContextHandler context) {
- FilterHolder filterHolder = new FilterHolder(hibernateFilter);
- context.addFilter(filterHolder, "/*", EnumSet.of(DispatcherType.REQUEST));
- }
-
-}
diff --git a/hibernate/src/main/java/com/gitplex/commons/hibernate/migration/Migrator.java b/hibernate/src/main/java/com/gitplex/commons/hibernate/migration/Migrator.java
deleted file mode 100644
index e996574c85..0000000000
--- a/hibernate/src/main/java/com/gitplex/commons/hibernate/migration/Migrator.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.gitplex.commons.hibernate.migration;
-
-public interface Migrator {
-
-}
diff --git a/http/pom.xml b/http/pom.xml
deleted file mode 100644
index 783023d55f..0000000000
--- a/http/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>server-http</artifactId>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>server-parent</artifactId>
- <version>1.0-EAP-build26</version>
- <relativePath>../parent</relativePath>
- </parent>
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <!-- Uncomment below if you'd like to publish an archetype based on your plugin -->
- <!--plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- </plugin-->
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-core</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- </dependencies>
- <properties>
- <moduleClass>com.gitplex.server.http.HttpModule</moduleClass>
- </properties>
-</project>
\ No newline at end of file
diff --git a/http/src/main/java/com/gitplex/server/http/HttpModule.java b/http/src/main/java/com/gitplex/server/http/HttpModule.java
deleted file mode 100644
index 96dd178ebd..0000000000
--- a/http/src/main/java/com/gitplex/server/http/HttpModule.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.gitplex.server.http;
-
-import org.apache.shiro.web.filter.mgt.FilterChainManager;
-
-import com.gitplex.commons.jetty.ServletConfigurator;
-import com.gitplex.calla.loader.AbstractPluginModule;
-import com.gitplex.commons.shiro.FilterChainConfigurator;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class HttpModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- contribute(ServletConfigurator.class, HttpServletConfigurator.class);
-
- contribute(FilterChainConfigurator.class, new FilterChainConfigurator() {
-
- @Override
- public void configure(FilterChainManager filterChainManager) {
- filterChainManager.createChain("/**/info/refs", "noSessionCreation, authcBasic");
- filterChainManager.createChain("/**/git-upload-pack", "noSessionCreation, authcBasic");
- filterChainManager.createChain("/**/git-receive-pack", "noSessionCreation, authcBasic");
- }
-
- });
- }
-
-}
diff --git a/http/src/main/java/com/gitplex/server/http/HttpServletConfigurator.java b/http/src/main/java/com/gitplex/server/http/HttpServletConfigurator.java
deleted file mode 100644
index 4ac27f00f8..0000000000
--- a/http/src/main/java/com/gitplex/server/http/HttpServletConfigurator.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gitplex.server.http;
-
-import java.util.EnumSet;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.DispatcherType;
-
-import org.eclipse.jetty.servlet.FilterHolder;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-
-import com.gitplex.commons.jetty.ServletConfigurator;
-
-@Singleton
-public class HttpServletConfigurator implements ServletConfigurator {
-
- private final GitFilter gitFilter;
-
- @Inject
- public HttpServletConfigurator(GitFilter gitFilter) {
- this.gitFilter = gitFilter;
- }
-
- @Override
- public void configure(ServletContextHandler context) {
- FilterHolder filterHolder = new FilterHolder(gitFilter);
- context.addFilter(filterHolder, "/*", EnumSet.allOf(DispatcherType.class));
-
- /*
- ServletHolder servletHolder = new ServletHolder(new GitServlet());
- servletHolder.setInitParameter("export-all", "1");
- servletHolder.setInitParameter("base-path", "w:\\temp\\storage\\1");
- context.addServlet(servletHolder, "/git/*");
- */
- }
-
-}
diff --git a/http/src/main/resources/META-INF/maven/archetype-metadata.xml b/http/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 904fb7a4bb..0000000000
--- a/http/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archetype-descriptor name="archetype.plugin">
- <fileSets>
- <fileSet filtered="true" packaged="true">
- <directory>src/main/java</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/main/resources</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/test/java</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/test/resources</directory>
- </fileSet>
- </fileSets>
-</archetype-descriptor>
\ No newline at end of file
diff --git a/http/src/main/resources/archetype-resource/pom.xml b/http/src/main/resources/archetype-resource/pom.xml
deleted file mode 100644
index 61659b0c40..0000000000
--- a/http/src/main/resources/archetype-resource/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-#if (\${groupId} != "com.gitplex")
- <groupId>\${groupId}</groupId>
-#end
- <artifactId>\${artifactId}</artifactId>
- <version>\${version}</version>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>parent.general</artifactId>
- <version>1.0.0</version>
- </parent>
-
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <repositories>
- <repository>
- <id>pmeaseRepo</id>
- <name>PMEase Repository</name>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- <url>http://artifact.pmease.com/</url>
- </repository>
- </repositories>
-
- <properties>
- <moduleClass>\${package}.PluginModule</moduleClass>
- </properties>
-
-</project>
diff --git a/http/src/main/resources/archetype-resource/src/main/java/Plugin.java b/http/src/main/resources/archetype-resource/src/main/java/Plugin.java
deleted file mode 100644
index 5ca2f34b53..0000000000
--- a/http/src/main/resources/archetype-resource/src/main/java/Plugin.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package ${package};
-
-import java.util.Collection;
-import com.gitplex.calla.loader.AbstractPlugin;
-
-public class Plugin extends AbstractPlugin {
-
- @Override
- public Collection<?> getExtensions() {
- return null;
- }
-
-}
diff --git a/http/src/main/resources/archetype-resource/src/main/java/PluginModule.java b/http/src/main/resources/archetype-resource/src/main/java/PluginModule.java
deleted file mode 100644
index 0dbd7c4086..0000000000
--- a/http/src/main/resources/archetype-resource/src/main/java/PluginModule.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package ${package};
-
-import com.gitplex.calla.loader.AbstractPlugin;
-import com.gitplex.calla.loader.AbstractPluginModule;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class PluginModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- // put your guice bindings here
- }
-
- @Override
- protected Class<? extends AbstractPlugin> getPluginClass() {
- return Plugin.class;
- }
-
-}
diff --git a/jackson/pom.xml b/jackson/pom.xml
deleted file mode 100644
index 9b0e6c965a..0000000000
--- a/jackson/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>server-jackson</artifactId>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>server-parent</artifactId>
- <version>1.0-EAP-build26</version>
- <relativePath>../parent</relativePath>
- </parent>
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <!-- Uncomment below if you'd like to publish an archetype based on your
- plugin -->
- <!--plugin> <artifactId>maven-archetype-plugin</artifactId> </plugin -->
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-guava</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-joda</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- </dependency>
- </dependencies>
- <properties>
- <moduleClass>com.gitplex.commons.jackson.JacksonModule</moduleClass>
- </properties>
-</project>
\ No newline at end of file
diff --git a/jackson/src/main/java/com/gitplex/commons/jackson/DefaultView.java b/jackson/src/main/java/com/gitplex/commons/jackson/DefaultView.java
deleted file mode 100644
index 7b3ab90055..0000000000
--- a/jackson/src/main/java/com/gitplex/commons/jackson/DefaultView.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.gitplex.commons.jackson;
-
-public class DefaultView {
-
-}
diff --git a/jackson/src/main/java/com/gitplex/commons/jackson/ExternalView.java b/jackson/src/main/java/com/gitplex/commons/jackson/ExternalView.java
deleted file mode 100644
index 4bd3424e57..0000000000
--- a/jackson/src/main/java/com/gitplex/commons/jackson/ExternalView.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.gitplex.commons.jackson;
-
-public class ExternalView {
-
-}
diff --git a/jackson/src/main/java/com/gitplex/commons/jackson/JacksonModule.java b/jackson/src/main/java/com/gitplex/commons/jackson/JacksonModule.java
deleted file mode 100644
index c34484e5a0..0000000000
--- a/jackson/src/main/java/com/gitplex/commons/jackson/JacksonModule.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.gitplex.commons.jackson;
-
-import javax.inject.Singleton;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gitplex.calla.loader.AbstractPluginModule;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class JacksonModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- bind(ObjectMapper.class).toProvider(ObjectMapperProvider.class).in(Singleton.class);
-
- // Add a dummy contribution to avoid error if no other contributions
- contribute(ObjectMapperConfigurator.class, new ObjectMapperConfigurator() {
-
- @Override
- public void configure(ObjectMapper objectMapper) {
- }
-
- });
- }
-
-}
diff --git a/jackson/src/main/resources/META-INF/maven/archetype-metadata.xml b/jackson/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 904fb7a4bb..0000000000
--- a/jackson/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archetype-descriptor name="archetype.plugin">
- <fileSets>
- <fileSet filtered="true" packaged="true">
- <directory>src/main/java</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/main/resources</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/test/java</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/test/resources</directory>
- </fileSet>
- </fileSets>
-</archetype-descriptor>
\ No newline at end of file
diff --git a/jackson/src/main/resources/archetype-resource/pom.xml b/jackson/src/main/resources/archetype-resource/pom.xml
deleted file mode 100644
index 61659b0c40..0000000000
--- a/jackson/src/main/resources/archetype-resource/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-#if (\${groupId} != "com.gitplex")
- <groupId>\${groupId}</groupId>
-#end
- <artifactId>\${artifactId}</artifactId>
- <version>\${version}</version>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>parent.general</artifactId>
- <version>1.0.0</version>
- </parent>
-
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <repositories>
- <repository>
- <id>pmeaseRepo</id>
- <name>PMEase Repository</name>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- <url>http://artifact.pmease.com/</url>
- </repository>
- </repositories>
-
- <properties>
- <moduleClass>\${package}.PluginModule</moduleClass>
- </properties>
-
-</project>
diff --git a/jackson/src/main/resources/archetype-resource/src/main/java/Plugin.java b/jackson/src/main/resources/archetype-resource/src/main/java/Plugin.java
deleted file mode 100644
index 5ca2f34b53..0000000000
--- a/jackson/src/main/resources/archetype-resource/src/main/java/Plugin.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package ${package};
-
-import java.util.Collection;
-import com.gitplex.calla.loader.AbstractPlugin;
-
-public class Plugin extends AbstractPlugin {
-
- @Override
- public Collection<?> getExtensions() {
- return null;
- }
-
-}
diff --git a/jackson/src/main/resources/archetype-resource/src/main/java/PluginModule.java b/jackson/src/main/resources/archetype-resource/src/main/java/PluginModule.java
deleted file mode 100644
index 0dbd7c4086..0000000000
--- a/jackson/src/main/resources/archetype-resource/src/main/java/PluginModule.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package ${package};
-
-import com.gitplex.calla.loader.AbstractPlugin;
-import com.gitplex.calla.loader.AbstractPluginModule;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class PluginModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- // put your guice bindings here
- }
-
- @Override
- protected Class<? extends AbstractPlugin> getPluginClass() {
- return Plugin.class;
- }
-
-}
diff --git a/jersey/pom.xml b/jersey/pom.xml
deleted file mode 100644
index bcd56885b5..0000000000
--- a/jersey/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>server-jersey</artifactId>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>server-parent</artifactId>
- <version>1.0-EAP-build26</version>
- <relativePath>../parent</relativePath>
- </parent>
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <!-- Uncomment below if you'd like to publish an archetype based on your
- plugin -->
- <!--plugin> <artifactId>maven-archetype-plugin</artifactId> </plugin -->
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-validation</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-jackson</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-servlet</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-bean-validation</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.hk2</groupId>
- <artifactId>guice-bridge</artifactId>
- <version>2.4.0-b06</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-shiro</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- </dependencies>
- <properties>
- <moduleClass>com.gitplex.commons.jersey.JerseyModule</moduleClass>
- </properties>
-</project>
\ No newline at end of file
diff --git a/jersey/src/main/java/com/gitplex/commons/jersey/JerseyModule.java b/jersey/src/main/java/com/gitplex/commons/jersey/JerseyModule.java
deleted file mode 100644
index 0eae26a4b8..0000000000
--- a/jersey/src/main/java/com/gitplex/commons/jersey/JerseyModule.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.gitplex.commons.jersey;
-
-import javax.inject.Singleton;
-
-import org.apache.shiro.web.filter.mgt.FilterChainManager;
-import org.glassfish.jersey.server.ResourceConfig;
-
-import com.gitplex.calla.loader.AbstractPluginModule;
-import com.gitplex.commons.shiro.FilterChainConfigurator;
-import com.gitplex.commons.jetty.ServletConfigurator;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class JerseyModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- bind(ResourceConfig.class).toProvider(ResourceConfigProvider.class).in(Singleton.class);
-
- contribute(ServletConfigurator.class, JerseyServletConfigurator.class);
-
- contribute(FilterChainConfigurator.class, new FilterChainConfigurator() {
-
- @Override
- public void configure(FilterChainManager filterChainManager) {
- filterChainManager.createChain("/rest/**", "noSessionCreation, authcBasic");
- }
-
- });
-
- contribute(JerseyConfigurator.class, new JerseyConfigurator() {
-
- @Override
- public void configure(ResourceConfig resourceConfig) {
-
- }
-
- });
-
- }
-
-}
diff --git a/jersey/src/main/resources/META-INF/maven/archetype-metadata.xml b/jersey/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 904fb7a4bb..0000000000
--- a/jersey/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archetype-descriptor name="archetype.plugin">
- <fileSets>
- <fileSet filtered="true" packaged="true">
- <directory>src/main/java</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/main/resources</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/test/java</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/test/resources</directory>
- </fileSet>
- </fileSets>
-</archetype-descriptor>
\ No newline at end of file
diff --git a/jersey/src/main/resources/archetype-resource/pom.xml b/jersey/src/main/resources/archetype-resource/pom.xml
deleted file mode 100644
index 61659b0c40..0000000000
--- a/jersey/src/main/resources/archetype-resource/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-#if (\${groupId} != "com.gitplex")
- <groupId>\${groupId}</groupId>
-#end
- <artifactId>\${artifactId}</artifactId>
- <version>\${version}</version>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>parent.general</artifactId>
- <version>1.0.0</version>
- </parent>
-
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <repositories>
- <repository>
- <id>pmeaseRepo</id>
- <name>PMEase Repository</name>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- <url>http://artifact.pmease.com/</url>
- </repository>
- </repositories>
-
- <properties>
- <moduleClass>\${package}.PluginModule</moduleClass>
- </properties>
-
-</project>
diff --git a/jersey/src/main/resources/archetype-resource/src/main/java/Plugin.java b/jersey/src/main/resources/archetype-resource/src/main/java/Plugin.java
deleted file mode 100644
index 5ca2f34b53..0000000000
--- a/jersey/src/main/resources/archetype-resource/src/main/java/Plugin.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package ${package};
-
-import java.util.Collection;
-import com.gitplex.calla.loader.AbstractPlugin;
-
-public class Plugin extends AbstractPlugin {
-
- @Override
- public Collection<?> getExtensions() {
- return null;
- }
-
-}
diff --git a/jersey/src/main/resources/archetype-resource/src/main/java/PluginModule.java b/jersey/src/main/resources/archetype-resource/src/main/java/PluginModule.java
deleted file mode 100644
index 0dbd7c4086..0000000000
--- a/jersey/src/main/resources/archetype-resource/src/main/java/PluginModule.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package ${package};
-
-import com.gitplex.calla.loader.AbstractPlugin;
-import com.gitplex.calla.loader.AbstractPluginModule;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class PluginModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- // put your guice bindings here
- }
-
- @Override
- protected Class<? extends AbstractPlugin> getPluginClass() {
- return Plugin.class;
- }
-
-}
diff --git a/jetty/pom.xml b/jetty/pom.xml
deleted file mode 100644
index 410f7ab038..0000000000
--- a/jetty/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>server-parent</artifactId>
- <version>1.0-EAP-build26</version>
- <relativePath>../parent</relativePath>
- </parent>
- <artifactId>server-jetty</artifactId>
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlets</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- </dependency>
- </dependencies>
- <properties>
- <moduleClass>com.gitplex.commons.jetty.JettyModule</moduleClass>
- </properties>
-</project>
\ No newline at end of file
diff --git a/jetty/src/main/java/com/gitplex/commons/jetty/JettyModule.java b/jetty/src/main/java/com/gitplex/commons/jetty/JettyModule.java
deleted file mode 100644
index ea0888c80d..0000000000
--- a/jetty/src/main/java/com/gitplex/commons/jetty/JettyModule.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.gitplex.commons.jetty;
-
-import org.eclipse.jetty.server.SessionManager;
-
-import com.gitplex.calla.loader.AbstractPlugin;
-import com.gitplex.calla.loader.AbstractPluginModule;
-
-public class JettyModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- bind(SessionManager.class).toProvider(SessionManagerProvider.class);
- }
-
- @Override
- protected Class<? extends AbstractPlugin> getPluginClass() {
- return JettyPlugin.class;
- }
-
-}
diff --git a/jetty/src/main/java/com/gitplex/commons/jetty/SessionManagerProvider.java b/jetty/src/main/java/com/gitplex/commons/jetty/SessionManagerProvider.java
deleted file mode 100644
index 64c46bbea0..0000000000
--- a/jetty/src/main/java/com/gitplex/commons/jetty/SessionManagerProvider.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.gitplex.commons.jetty;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
-
-import org.eclipse.jetty.server.SessionManager;
-
-@Singleton
-public class SessionManagerProvider implements Provider<SessionManager> {
-
- private final JettyPlugin jettyPlugin;
-
- @Inject
- public SessionManagerProvider(JettyPlugin jettyPlugin) {
- this.jettyPlugin = jettyPlugin;
- }
-
- @Override
- public SessionManager get() {
- return jettyPlugin.getContextHandler().getSessionHandler().getSessionManager();
- }
-
-}
diff --git a/jsw/pom.xml b/jsw/pom.xml
deleted file mode 100644
index e9e275071a..0000000000
--- a/jsw/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>server-parent</artifactId>
- <version>1.0-EAP-build26</version>
- <relativePath>../parent</relativePath>
- </parent>
- <artifactId>server-jsw</artifactId>
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>prepare-package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <unzip src="wrapper/wrapper-delta-pack-st.zip" dest="${project.build.outputDirectory}" overwrite="true">
- <regexpmapper from="^.*?/(.*)" to="\1"/>
- </unzip>
- <copy todir="${project.build.outputDirectory}/customization">
- <fileset dir="wrapper/customization"/>
- </copy>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/markdown/pom.xml b/markdown/pom.xml
deleted file mode 100644
index 98b050920c..0000000000
--- a/markdown/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>server-markdown</artifactId>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>server-parent</artifactId>
- <version>1.0-EAP-build26</version>
- <relativePath>../parent</relativePath>
- </parent>
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <!-- Uncomment below if you'd like to publish an archetype based on your plugin -->
- <!--plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- </plugin-->
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-util</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- <dependency>
- <groupId>org.pegdown</groupId>
- <artifactId>pegdown</artifactId>
- <version>1.6.0</version>
- </dependency>
- </dependencies>
- <properties>
- <moduleClass>com.gitplex.commons.markdown.MarkdownModule</moduleClass>
- </properties>
-</project>
\ No newline at end of file
diff --git a/markdown/src/main/java/com/gitplex/commons/markdown/MarkdownModule.java b/markdown/src/main/java/com/gitplex/commons/markdown/MarkdownModule.java
deleted file mode 100644
index eb0932fa51..0000000000
--- a/markdown/src/main/java/com/gitplex/commons/markdown/MarkdownModule.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.gitplex.commons.markdown;
-
-import java.util.Collection;
-
-import org.pegdown.Parser;
-import org.pegdown.plugins.ToHtmlSerializerPlugin;
-
-import com.gitplex.commons.markdown.extensionpoint.HtmlTransformer;
-import com.gitplex.commons.markdown.extensionpoint.MarkdownExtension;
-import com.google.common.collect.Lists;
-import com.gitplex.calla.loader.AbstractPluginModule;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class MarkdownModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- contribute(MarkdownExtension.class, new MarkdownExtension() {
-
- @Override
- public Collection<Class<? extends Parser>> getInlineParsers() {
- return null;
- }
-
- @Override
- public Collection<ToHtmlSerializerPlugin> getHtmlSerializers() {
- return null;
- }
-
- @Override
- public Collection<Class<? extends Parser>> getBlockParsers() {
- return null;
- }
-
- @Override
- public Collection<HtmlTransformer> getHtmlTransformers() {
- return Lists.newArrayList((HtmlTransformer)new NormalizeTransformer());
- }
-
- });
- bind(MarkdownManager.class).to(DefaultMarkdownManager.class);
- }
-
-}
diff --git a/markdown/src/main/java/com/gitplex/commons/markdown/extensionpoint/HtmlTransformer.java b/markdown/src/main/java/com/gitplex/commons/markdown/extensionpoint/HtmlTransformer.java
deleted file mode 100644
index d584366b01..0000000000
--- a/markdown/src/main/java/com/gitplex/commons/markdown/extensionpoint/HtmlTransformer.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.gitplex.commons.markdown.extensionpoint;
-
-import org.jsoup.nodes.Element;
-
-public interface HtmlTransformer {
- Element transform(Element body);
-}
diff --git a/markdown/src/main/resources/META-INF/maven/archetype-metadata.xml b/markdown/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 904fb7a4bb..0000000000
--- a/markdown/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archetype-descriptor name="archetype.plugin">
- <fileSets>
- <fileSet filtered="true" packaged="true">
- <directory>src/main/java</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/main/resources</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/test/java</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/test/resources</directory>
- </fileSet>
- </fileSets>
-</archetype-descriptor>
\ No newline at end of file
diff --git a/markdown/src/main/resources/archetype-resource/pom.xml b/markdown/src/main/resources/archetype-resource/pom.xml
deleted file mode 100644
index 61659b0c40..0000000000
--- a/markdown/src/main/resources/archetype-resource/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-#if (\${groupId} != "com.gitplex")
- <groupId>\${groupId}</groupId>
-#end
- <artifactId>\${artifactId}</artifactId>
- <version>\${version}</version>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>parent.general</artifactId>
- <version>1.0.0</version>
- </parent>
-
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <repositories>
- <repository>
- <id>pmeaseRepo</id>
- <name>PMEase Repository</name>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- <url>http://artifact.pmease.com/</url>
- </repository>
- </repositories>
-
- <properties>
- <moduleClass>\${package}.PluginModule</moduleClass>
- </properties>
-
-</project>
diff --git a/markdown/src/main/resources/archetype-resource/src/main/java/PluginModule.java b/markdown/src/main/resources/archetype-resource/src/main/java/PluginModule.java
deleted file mode 100644
index 1f5b6ae3e2..0000000000
--- a/markdown/src/main/resources/archetype-resource/src/main/java/PluginModule.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package ${package};
-
-import com.gitplex.calla.loader.AbstractPlugin;
-import com.gitplex.calla.loader.AbstractPluginModule;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class PluginModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- // put your guice bindings here
- }
-
-}
diff --git a/parent/pom.xml b/pom.xml
similarity index 82%
rename from parent/pom.xml
rename to pom.xml
index 675c67f925..f7c3ea28b3 100644
--- a/parent/pom.xml
+++ b/pom.xml
@@ -3,9 +3,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.gitplex</groupId>
- <artifactId>calla-parent</artifactId>
+ <artifactId>launcher</artifactId>
<version>1.0.0</version>
- <relativePath>../../calla/parent</relativePath>
+ <relativePath>../launcher</relativePath>
</parent>
<artifactId>server-parent</artifactId>
<version>1.0-EAP-build26</version>
@@ -13,26 +13,33 @@
<prerequisites>
<maven>3.0</maven>
</prerequisites>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr4-maven-plugin</artifactId>
+ <version>${antlrVersion}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>antlr4</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<modules>
- <module>../jsw</module>
- <module>../util</module>
- <module>../jetty</module>
- <module>../git</module>
- <module>../hibernate</module>
- <module>../jersey</module>
- <module>../shiro</module>
- <module>../wicket</module>
- <module>../jackson</module>
- <module>../validation</module>
- <module>../schedule</module>
- <module>../markdown</module>
- <module>../antlr</module>
- <module>../core</module>
- <module>../http</module>
- <module>../rest</module>
- <module>../search</module>
- <module>../web</module>
- <module>../product</module>
+ <module>core</module>
+ <module>rest</module>
+ <module>search</module>
+ <module>web</module>
+ <module>product</module>
</modules>
<dependencyManagement>
<dependencies>
@@ -201,22 +208,39 @@
<dependencies>
<dependency>
<groupId>com.gitplex</groupId>
- <artifactId>calla-loader</artifactId>
- <version>${callaVersion}</version>
+ <artifactId>launcher-loader</artifactId>
+ <version>${launcherVersion}</version>
</dependency>
<dependency>
<groupId>com.gitplex</groupId>
- <artifactId>calla-loader</artifactId>
- <version>${callaVersion}</version>
+ <artifactId>launcher-loader</artifactId>
+ <version>${launcherVersion}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
+ <repositories>
+ <repository>
+ <id>pmeaseRepo</id>
+ <url>http://artifact.pmease.com/artifactory/pmeaseRepo</url>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </snapshots>
+ </repository>
+ </repositories>
<properties>
- <callaVersion>1.0.0</callaVersion>
+ <launcherVersion>1.0.0</launcherVersion>
<jerseyVersion>2.13</jerseyVersion>
<jettyVersion>9.3.8.v20160314</jettyVersion>
<jacksonVersion>2.4.3</jacksonVersion>
<servletVersion>3.1.0</servletVersion>
+ <antlrVersion>4.5.1-1</antlrVersion>
</properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/jsw/wrapper/customization/AppCommand.bat.in b/product/build/jsw/AppCommand.bat.in
similarity index 100%
rename from jsw/wrapper/customization/AppCommand.bat.in
rename to product/build/jsw/AppCommand.bat.in
diff --git a/jsw/wrapper/customization/sh.script.in b/product/build/jsw/sh.script.in
similarity index 100%
rename from jsw/wrapper/customization/sh.script.in
rename to product/build/jsw/sh.script.in
diff --git a/jsw/wrapper/wrapper-delta-pack-st.zip b/product/build/jsw/wrapper-delta-pack-st.zip
similarity index 100%
rename from jsw/wrapper/wrapper-delta-pack-st.zip
rename to product/build/jsw/wrapper-delta-pack-st.zip
diff --git a/jsw/wrapper/customization/wrapper.conf b/product/build/jsw/wrapper.conf
similarity index 100%
rename from jsw/wrapper/customization/wrapper.conf
rename to product/build/jsw/wrapper.conf
diff --git a/product/build/prepare_package.gant b/product/build/prepare_package.gant
index 3c2ec4bc58..86ce48cee9 100644
--- a/product/build/prepare_package.gant
+++ b/product/build/prepare_package.gant
@@ -2,11 +2,9 @@ target(default:"prepare to package the product") {
File buildDir = new File("${buildDirectory}")
File sandboxDir = new File(buildDir, "sandbox")
- File jswLoc = new File("${jswPath}")
- if (jswLoc.isFile()) {
- File extractTo = new File(buildDir, "jsw")
- unzip(src: jswLoc, dest: extractTo)
- jswLoc = extractTo
+ File jswLoc = new File(buildDir, "jsw")
+ unzip(src: new File("${jswPath}/wrapper-delta-pack-st.zip"), dest: jswLoc, overwrite: true) {
+ regexpmapper(from: "^.*?/(.*)", to:"\\1")
}
File binDir = new File(sandboxDir, "bin")
@@ -30,44 +28,44 @@ target(default:"prepare to package the product") {
filter(token: "set_pass_through", value: "PASS_THROUGH=true")
}
- copy(tofile: binDir.absolutePath + "/server.bat", file: jswLoc.absolutePath + "/customization/AppCommand.bat.in") {
+ copy(tofile: binDir.absolutePath + "/server.bat", file: "${jswPath}/AppCommand.bat.in") {
filterset() {
filter(token: "set_fixed_command", value: "")
filter(token: "properties_and_parameters", value: "wrapper.pidfile=../status/${lowerCaseProductName}.pid")
}
}
- copy(tofile: binDir.absolutePath + "/restore.bat", file: jswLoc.absolutePath + "/customization/AppCommand.bat.in") {
+ copy(tofile: binDir.absolutePath + "/restore.bat", file: "${jswPath}/AppCommand.bat.in") {
filterset(refid: "batchCommandCommonFilterSet")
filterset() {
filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"${productName} Restore\" wrapper.pidfile=${lowerCaseProductName}_restore.pid wrapper.name=${lowerCaseProductName}_restore wrapper.displayname=\"${productName} Restore\" wrapper.description=\"${productName} Restore\" -- restore")
}
}
- copy(tofile: binDir.absolutePath + "/backup.bat", file: jswLoc.absolutePath + "/customization/AppCommand.bat.in") {
+ copy(tofile: binDir.absolutePath + "/backup.bat", file: "${jswPath}/AppCommand.bat.in") {
filterset(refid: "batchCommandCommonFilterSet")
filterset() {
filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"${productName} Backup\" wrapper.pidfile=${lowerCaseProductName}_backup.pid wrapper.name=${lowerCaseProductName}_backup wrapper.displayname=\"${productName} Backup\" wrapper.description=\"${productName} Backup\" -- backup")
}
}
- copy(tofile: binDir.absolutePath + "/upgrade.bat", file: jswLoc.absolutePath + "/customization/AppCommand.bat.in") {
+ copy(tofile: binDir.absolutePath + "/upgrade.bat", file: "${jswPath}/AppCommand.bat.in") {
filterset(refid: "batchCommandCommonFilterSet")
filterset() {
filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"${productName} Upgrade\" wrapper.pidfile=${lowerCaseProductName}_upgrade.pid wrapper.name=${lowerCaseProductName}_upgrade wrapper.displayname=\"${productName} Upgrade\" wrapper.description=\"${productName} Upgrade\" -- upgrade")
}
}
- copy(tofile: binDir.absolutePath + "/apply_db_constraints.bat", file: jswLoc.absolutePath + "/customization/AppCommand.bat.in") {
+ copy(tofile: binDir.absolutePath + "/apply_db_constraints.bat", file: "${jswPath}/AppCommand.bat.in") {
filterset(refid: "batchCommandCommonFilterSet")
filterset() {
filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"${productName} Apply DB Constraints\" wrapper.pidfile=${lowerCaseProductName}_apply_db_constraints.pid wrapper.name=${lowerCaseProductName}_apply_db_constraints wrapper.displayname=\"${productName} Apply DB Constraints\" wrapper.description=\"${productName} Apply DB Constraints\" -- apply_db_constraints")
}
}
- copy(tofile: binDir.absolutePath + "/reset_admin_password.bat", file: jswLoc.absolutePath + "/customization/AppCommand.bat.in") {
+ copy(tofile: binDir.absolutePath + "/reset_admin_password.bat", file: "${jswPath}/AppCommand.bat.in") {
filterset(refid: "batchCommandCommonFilterSet")
filterset() {
filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"${productName} Reset Admin Password\" wrapper.pidfile=${lowerCaseProductName}_reset_admin_password.pid wrapper.name=${lowerCaseProductName}_reset_admin_password wrapper.displayname=\"${productName} Reset Admin Password\" wrapper.description=\"${productName} Reset Admin Password\" -- reset_admin_password")
}
}
- copy(tofile: binDir.absolutePath + "/server.sh", file: jswLoc.absolutePath + "/customization/sh.script.in") {
+ copy(tofile: binDir.absolutePath + "/server.sh", file: "${jswPath}/sh.script.in") {
filterset(refid: "appFilterSet")
filterset() {
filter(token: "set_fixed_command", value: "")
@@ -75,7 +73,7 @@ target(default:"prepare to package the product") {
filter(token: "properties_and_parameters", value: "--")
}
}
- copy(tofile: binDir.absolutePath + "/restore.sh", file: jswLoc.absolutePath + "/customization/sh.script.in") {
+ copy(tofile: binDir.absolutePath + "/restore.sh", file: "${jswPath}/sh.script.in") {
filterset() {
filter(token: "app.name", value: "${lowerCaseProductName}_restore")
filter(token: "app.long.name", value: "${productName} Restore")
@@ -87,7 +85,7 @@ target(default:"prepare to package the product") {
filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='${productName} Restore' wrapper.name=${lowerCaseProductName}_restore wrapper.displayname='${productName} Restore' wrapper.description='${productName} Restore' -- restore")
}
}
- copy(tofile: binDir.absolutePath + "/backup.sh", file: jswLoc.absolutePath + "/customization/sh.script.in") {
+ copy(tofile: binDir.absolutePath + "/backup.sh", file: "${jswPath}/sh.script.in") {
filterset() {
filter(token: "app.name", value: "${lowerCaseProductName}_backup")
filter(token: "app.long.name", value: "${productName} Backup")
@@ -99,7 +97,7 @@ target(default:"prepare to package the product") {
filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='${productName} Backup' wrapper.name=${lowerCaseProductName}_backup wrapper.displayname='${productName} Backup' wrapper.description='${productName} Backup' -- backup")
}
}
- copy(tofile: binDir.absolutePath + "/upgrade.sh", file: jswLoc.absolutePath + "/customization/sh.script.in") {
+ copy(tofile: binDir.absolutePath + "/upgrade.sh", file: "${jswPath}/sh.script.in") {
filterset() {
filter(token: "app.name", value: "${lowerCaseProductName}_upgrade")
filter(token: "app.long.name", value: "${productName} Upgrade")
@@ -111,7 +109,7 @@ target(default:"prepare to package the product") {
filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='${productName} Upgrade' wrapper.name=${lowerCaseProductName}_upgrade wrapper.displayname='${productName} Upgrade' wrapper.description='${productName} Upgrade' -- upgrade")
}
}
- copy(tofile: binDir.absolutePath + "/apply_db_constraints.sh", file: jswLoc.absolutePath + "/customization/sh.script.in") {
+ copy(tofile: binDir.absolutePath + "/apply_db_constraints.sh", file: "${jswPath}/sh.script.in") {
filterset() {
filter(token: "app.name", value: "${lowerCaseProductName}_apply_db_constraints")
filter(token: "app.long.name", value: "${productName} Apply DB Constraints")
@@ -123,7 +121,7 @@ target(default:"prepare to package the product") {
filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='${productName} Apply DB Constraints' wrapper.name=${lowerCaseProductName}_apply_db_constraints wrapper.displayname='${productName} Apply DB Constraints' wrapper.description='${productName} Apply DB Constraints' -- apply_db_constraints")
}
}
- copy(tofile: binDir.absolutePath + "/reset_admin_password.sh", file: jswLoc.absolutePath + "/customization/sh.script.in") {
+ copy(tofile: binDir.absolutePath + "/reset_admin_password.sh", file: "${jswPath}/sh.script.in") {
filterset() {
filter(token: "app.name", value: "${lowerCaseProductName}_reset_admin_password")
filter(token: "app.long.name", value: "${productName} Reset Admin Password")
@@ -136,7 +134,7 @@ target(default:"prepare to package the product") {
}
}
- copy(tofile: sandboxDir.absolutePath + "/conf/wrapper.conf", file: jswLoc.absolutePath + "/customization/wrapper.conf") {
+ copy(tofile: sandboxDir.absolutePath + "/conf/wrapper.conf", file: "${jswPath}/wrapper.conf") {
filterset(refid: "appFilterSet")
}
}
\ No newline at end of file
diff --git a/product/pom.xml b/product/pom.xml
index e2937b93d0..f44cbada81 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -7,7 +7,6 @@
<groupId>com.gitplex</groupId>
<artifactId>server-parent</artifactId>
<version>1.0-EAP-build26</version>
- <relativePath>../parent</relativePath>
</parent>
<build>
<plugins>
@@ -83,7 +82,7 @@
<gant file="build/prepare_package.gant">
<definition name="buildDirectory" value="${project.build.directory}"/>
<definition name="outputDirectory" value="${project.build.outputDirectory}"/>
- <definition name="jswPath" value="${com.gitplex:commons.jsw:jar}"/>
+ <definition name="jswPath" value="${basedir}/build/jsw"/>
<definition name="productName" value="${project.name}"/>
<definition name="lowerCaseProductName" value="${lowerCaseProductName}"/>
<definition name="bootstrapClass" value="${bootstrapClass}"/>
@@ -113,12 +112,6 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-jsw</artifactId>
- <version>1.0-EAP-build26</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>com.gitplex</groupId>
<artifactId>server-core</artifactId>
@@ -129,67 +122,20 @@
<artifactId>server-web</artifactId>
<version>1.0-EAP-build26</version>
</dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-git</artifactId>
- <version>1.0-EAP-build26</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>com.gitplex</groupId>
<artifactId>server-rest</artifactId>
<version>1.0-EAP-build26</version>
</dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-http</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
<dependency>
<groupId>com.gitplex</groupId>
<artifactId>server-search</artifactId>
<version>1.0-EAP-build26</version>
</dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-validation</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-schedule</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-shiro</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-jersey</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-markdown</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-hibernate</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-jetty</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
</dependencies>
<properties>
<executables>bin/*.sh, boot/wrapper-*</executables>
- <bootstrapClass>com.gitplex.calla.bootstrap.Bootstrap</bootstrapClass>
+ <bootstrapClass>com.gitplex.launcher.bootstrap.Bootstrap</bootstrapClass>
<moduleClass>com.gitplex.server.product.ProductModule</moduleClass>
<aggregation>true</aggregation>
</properties>
diff --git a/product/src/main/java/com/gitplex/server/product/DefaultServerConfig.java b/product/src/main/java/com/gitplex/server/product/DefaultServerConfig.java
index b8c5d662b5..12b67a6545 100644
--- a/product/src/main/java/com/gitplex/server/product/DefaultServerConfig.java
+++ b/product/src/main/java/com/gitplex/server/product/DefaultServerConfig.java
@@ -5,10 +5,10 @@ import java.io.File;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.gitplex.calla.bootstrap.Bootstrap;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.server.core.setting.ServerConfig;
-import com.gitplex.server.core.setting.SslConfig;
+import com.gitplex.launcher.bootstrap.Bootstrap;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.util.serverconfig.ServerConfig;
+import com.gitplex.server.util.serverconfig.SslConfig;
@Singleton
public class DefaultServerConfig implements ServerConfig {
diff --git a/product/src/main/java/com/gitplex/server/product/ProductConfigurator.java b/product/src/main/java/com/gitplex/server/product/ProductConfigurator.java
index 83bc365d92..40394c1c92 100644
--- a/product/src/main/java/com/gitplex/server/product/ProductConfigurator.java
+++ b/product/src/main/java/com/gitplex/server/product/ProductConfigurator.java
@@ -9,9 +9,9 @@ import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.util.ssl.SslContextFactory;
-import com.gitplex.commons.jetty.ServerConfigurator;
-import com.gitplex.server.core.setting.ServerConfig;
-import com.gitplex.server.core.setting.SslConfig;
+import com.gitplex.server.util.jetty.ServerConfigurator;
+import com.gitplex.server.util.serverconfig.ServerConfig;
+import com.gitplex.server.util.serverconfig.SslConfig;
public class ProductConfigurator implements ServerConfigurator {
diff --git a/product/src/main/java/com/gitplex/server/product/ProductModule.java b/product/src/main/java/com/gitplex/server/product/ProductModule.java
index f9b834932a..119b73416f 100644
--- a/product/src/main/java/com/gitplex/server/product/ProductModule.java
+++ b/product/src/main/java/com/gitplex/server/product/ProductModule.java
@@ -4,14 +4,14 @@ import java.io.File;
import org.hibernate.cfg.Environment;
-import com.gitplex.calla.bootstrap.Bootstrap;
-import com.gitplex.commons.hibernate.HibernateProperties;
-import com.gitplex.commons.jetty.ServerConfigurator;
-import com.gitplex.commons.jetty.ServletConfigurator;
-import com.gitplex.calla.loader.AbstractPluginModule;
-import com.gitplex.commons.util.FileUtils;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.server.core.setting.ServerConfig;
+import com.gitplex.launcher.loader.AbstractPluginModule;
+import com.gitplex.launcher.bootstrap.Bootstrap;
+import com.gitplex.server.persistence.HibernateProperties;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.util.jetty.ServerConfigurator;
+import com.gitplex.server.util.jetty.ServletConfigurator;
+import com.gitplex.server.util.serverconfig.ServerConfig;
public class ProductModule extends AbstractPluginModule {
diff --git a/product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.java b/product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.java
index 05e0ed979f..e732a402cc 100644
--- a/product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.java
+++ b/product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.java
@@ -1,22 +1,65 @@
package com.gitplex.server.product;
+import java.util.EnumSet;
+
import javax.inject.Inject;
+import javax.servlet.DispatcherType;
+import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpSessionListener;
+import org.apache.shiro.web.env.EnvironmentLoader;
+import org.apache.shiro.web.env.EnvironmentLoaderListener;
+import org.apache.shiro.web.servlet.ShiroFilter;
+import org.apache.wicket.protocol.http.WicketServlet;
+import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
-import com.gitplex.calla.bootstrap.Bootstrap;
-import com.gitplex.commons.jetty.FileAssetServlet;
-import com.gitplex.commons.jetty.ServletConfigurator;
-import com.gitplex.server.core.setting.ServerConfig;
+import com.gitplex.launcher.bootstrap.Bootstrap;
+import com.gitplex.server.git.GitFilter;
+import com.gitplex.server.git.GitPostReceiveCallback;
+import com.gitplex.server.git.GitPreReceiveCallback;
+import com.gitplex.server.persistence.HibernateFilter;
+import com.gitplex.server.security.DefaultWebEnvironment;
+import com.gitplex.server.util.jetty.ClasspathAssetServlet;
+import com.gitplex.server.util.jetty.FileAssetServlet;
+import com.gitplex.server.util.jetty.ServletConfigurator;
+import com.gitplex.server.util.serverconfig.ServerConfig;
+import com.gitplex.server.web.assets.Assets;
+import com.gitplex.server.web.behavior.markdown.AttachmentUploadServlet;
+import com.gitplex.server.web.websocket.WebSocketManager;
public class ProductServletConfigurator implements ServletConfigurator {
private final ServerConfig serverConfig;
+ private final HibernateFilter hibernateFilter;
+
+ private final ShiroFilter shiroFilter;
+
+ private final GitFilter gitFilter;
+
+ private final GitPreReceiveCallback preReceiveServlet;
+
+ private final GitPostReceiveCallback postReceiveServlet;
+
+ private final WicketServlet wicketServlet;
+
+ private final WebSocketManager webSocketManager;
+
@Inject
- public ProductServletConfigurator(ServerConfig serverConfig) {
+ public ProductServletConfigurator(ServerConfig serverConfig, HibernateFilter hibernateFilter,
+ ShiroFilter shiroFilter, GitFilter gitFilter, GitPreReceiveCallback preReceiveServlet,
+ GitPostReceiveCallback postReceiveServlet, WicketServlet wicketServlet,
+ WebSocketManager webSocketManager) {
this.serverConfig = serverConfig;
+ this.hibernateFilter = hibernateFilter;
+ this.shiroFilter = shiroFilter;
+ this.gitFilter = gitFilter;
+ this.preReceiveServlet = preReceiveServlet;
+ this.postReceiveServlet = postReceiveServlet;
+ this.wicketServlet = wicketServlet;
+ this.webSocketManager = webSocketManager;
}
@Override
@@ -25,11 +68,55 @@ public class ProductServletConfigurator implements ServletConfigurator {
context.getSessionHandler().getSessionManager().setMaxInactiveInterval(serverConfig.getSessionTimeout());
+ FilterHolder filterHolder = new FilterHolder(hibernateFilter);
+ context.addFilter(filterHolder, "/*", EnumSet.of(DispatcherType.REQUEST));
+
+ context.setInitParameter(EnvironmentLoader.ENVIRONMENT_CLASS_PARAM, DefaultWebEnvironment.class.getName());
+
+ context.addEventListener(new EnvironmentLoaderListener());
+
+ filterHolder = new FilterHolder(shiroFilter);
+ context.addFilter(filterHolder, "/*", EnumSet.allOf(DispatcherType.class));
+
+ filterHolder = new FilterHolder(gitFilter);
+ context.addFilter(filterHolder, "/*", EnumSet.allOf(DispatcherType.class));
+
+ ServletHolder servletHolder = new ServletHolder(preReceiveServlet);
+ context.addServlet(servletHolder, GitPreReceiveCallback.PATH + "/*");
+
+ servletHolder = new ServletHolder(postReceiveServlet);
+ context.addServlet(servletHolder, GitPostReceiveCallback.PATH + "/*");
+
+ servletHolder = new ServletHolder(wicketServlet);
+
+ /*
+ * Add wicket servlet as the default servlet which will serve all requests failed to
+ * match a path pattern
+ */
+ context.addServlet(servletHolder, "/");
+ context.addServlet(AttachmentUploadServlet.class, "/attachment_upload");
+
+ servletHolder = new ServletHolder(new ClasspathAssetServlet(Assets.class));
+ context.addServlet(servletHolder, "/assets/*");
+ context.addServlet(servletHolder, "/favicon.ico");
+ context.getSessionHandler().addEventListener(new HttpSessionListener() {
+
+ @Override
+ public void sessionCreated(HttpSessionEvent se) {
+ }
+
+ @Override
+ public void sessionDestroyed(HttpSessionEvent se) {
+ webSocketManager.onDestroySession(se.getSession().getId());
+ }
+
+ });
+
/*
* Configure a servlet to serve contents under site folder. Site folder can be used
* to hold site specific web assets.
*/
- ServletHolder servletHolder = new ServletHolder(new FileAssetServlet(Bootstrap.getSiteDir()));
+ servletHolder = new ServletHolder(new FileAssetServlet(Bootstrap.getSiteDir()));
context.addServlet(servletHolder, "/site/*");
context.addServlet(servletHolder, "/robots.txt");
}
diff --git a/product/src/main/java/com/gitplex/server/product/SslConfigBean.java b/product/src/main/java/com/gitplex/server/product/SslConfigBean.java
index 662f08cdd8..f51973e648 100644
--- a/product/src/main/java/com/gitplex/server/product/SslConfigBean.java
+++ b/product/src/main/java/com/gitplex/server/product/SslConfigBean.java
@@ -1,6 +1,6 @@
package com.gitplex.server.product;
-import com.gitplex.server.core.setting.SslConfig;
+import com.gitplex.server.util.serverconfig.SslConfig;
class SslConfigBean implements SslConfig {
diff --git a/product/src/main/resources/archetype-resource/src/main/java/Plugin.java b/product/src/main/resources/archetype-resource/src/main/java/Plugin.java
index 5ca2f34b53..3f2c04e7d2 100644
--- a/product/src/main/resources/archetype-resource/src/main/java/Plugin.java
+++ b/product/src/main/resources/archetype-resource/src/main/java/Plugin.java
@@ -1,7 +1,7 @@
package ${package};
import java.util.Collection;
-import com.gitplex.calla.loader.AbstractPlugin;
+import com.gitplex.launcher.loader.AbstractPlugin;
public class Plugin extends AbstractPlugin {
diff --git a/product/src/main/resources/archetype-resource/src/main/java/PluginModule.java b/product/src/main/resources/archetype-resource/src/main/java/PluginModule.java
index 0dbd7c4086..18c02202a7 100644
--- a/product/src/main/resources/archetype-resource/src/main/java/PluginModule.java
+++ b/product/src/main/resources/archetype-resource/src/main/java/PluginModule.java
@@ -1,7 +1,7 @@
package ${package};
-import com.gitplex.calla.loader.AbstractPlugin;
-import com.gitplex.calla.loader.AbstractPluginModule;
+import com.gitplex.launcher.loader.AbstractPlugin;
+import com.gitplex.launcher.loader.AbstractPluginModule;
/**
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
diff --git a/rest/pom.xml b/rest/pom.xml
index a584d5e302..4ebbd16361 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -6,7 +6,6 @@
<groupId>com.gitplex</groupId>
<artifactId>server-parent</artifactId>
<version>1.0-EAP-build26</version>
- <relativePath>../parent</relativePath>
</parent>
<build>
<plugins>
@@ -28,6 +27,19 @@
<artifactId>server-core</artifactId>
<version>1.0-EAP-build26</version>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.containers</groupId>
+ <artifactId>jersey-container-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.ext</groupId>
+ <artifactId>jersey-bean-validation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>guice-bridge</artifactId>
+ <version>2.4.0-b06</version>
+ </dependency>
</dependencies>
<properties>
<moduleClass>com.gitplex.server.rest.RestModule</moduleClass>
diff --git a/rest/src/main/java/com/gitplex/server/rest/PullRequestResource.java b/rest/src/main/java/com/gitplex/server/rest/PullRequestResource.java
index 14f2e23933..5636baaef5 100644
--- a/rest/src/main/java/com/gitplex/server/rest/PullRequestResource.java
+++ b/rest/src/main/java/com/gitplex/server/rest/PullRequestResource.java
@@ -17,11 +17,11 @@ import javax.ws.rs.core.MediaType;
import org.apache.shiro.authz.UnauthorizedException;
import org.hibernate.criterion.Restrictions;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.commons.jersey.ValidQueryParams;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.rest.jersey.ValidQueryParams;
+import com.gitplex.server.security.SecurityUtils;
@Path("/pull_requests")
@Consumes(MediaType.WILDCARD)
diff --git a/rest/src/main/java/com/gitplex/server/rest/PullRequestVerificationResource.java b/rest/src/main/java/com/gitplex/server/rest/PullRequestVerificationResource.java
index 53f6f17fef..a5963112fa 100644
--- a/rest/src/main/java/com/gitplex/server/rest/PullRequestVerificationResource.java
+++ b/rest/src/main/java/com/gitplex/server/rest/PullRequestVerificationResource.java
@@ -21,13 +21,13 @@ import javax.ws.rs.core.MediaType;
import org.apache.shiro.authz.UnauthorizedException;
import org.hibernate.criterion.Restrictions;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.commons.jersey.ValidQueryParams;
-import com.gitplex.server.core.entity.PullRequestVerification;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.PullRequestVerificationManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.entity.PullRequestVerification;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.PullRequestVerificationManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.rest.jersey.ValidQueryParams;
+import com.gitplex.server.security.SecurityUtils;
@Path("/pull_request_verifications")
@Consumes(MediaType.WILDCARD)
diff --git a/rest/src/main/java/com/gitplex/server/rest/RepositoryResource.java b/rest/src/main/java/com/gitplex/server/rest/RepositoryResource.java
index 763e79c727..4716b19afd 100644
--- a/rest/src/main/java/com/gitplex/server/rest/RepositoryResource.java
+++ b/rest/src/main/java/com/gitplex/server/rest/RepositoryResource.java
@@ -19,12 +19,12 @@ import org.apache.shiro.authz.UnauthenticatedException;
import org.apache.shiro.authz.UnauthorizedException;
import org.hibernate.criterion.Restrictions;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.commons.jersey.ValidQueryParams;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.security.ObjectPermission;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.rest.jersey.ValidQueryParams;
+import com.gitplex.server.security.ObjectPermission;
@Path("/repositories")
@Consumes(MediaType.WILDCARD)
diff --git a/rest/src/main/java/com/gitplex/server/rest/RestModule.java b/rest/src/main/java/com/gitplex/server/rest/RestModule.java
index 2c7be9d768..b9d96224a2 100644
--- a/rest/src/main/java/com/gitplex/server/rest/RestModule.java
+++ b/rest/src/main/java/com/gitplex/server/rest/RestModule.java
@@ -1,9 +1,16 @@
package com.gitplex.server.rest;
+import javax.inject.Singleton;
+
+import org.apache.shiro.web.filter.mgt.FilterChainManager;
import org.glassfish.jersey.server.ResourceConfig;
-import com.gitplex.commons.jersey.JerseyConfigurator;
-import com.gitplex.calla.loader.AbstractPluginModule;
+import com.gitplex.launcher.loader.AbstractPluginModule;
+import com.gitplex.server.rest.jersey.JerseyConfigurator;
+import com.gitplex.server.rest.jersey.JerseyServletConfigurator;
+import com.gitplex.server.rest.jersey.ResourceConfigProvider;
+import com.gitplex.server.security.FilterChainConfigurator;
+import com.gitplex.server.util.jetty.ServletConfigurator;
/**
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
@@ -15,6 +22,19 @@ public class RestModule extends AbstractPluginModule {
protected void configure() {
super.configure();
+ bind(ResourceConfig.class).toProvider(ResourceConfigProvider.class).in(Singleton.class);
+
+ contribute(ServletConfigurator.class, JerseyServletConfigurator.class);
+
+ contribute(FilterChainConfigurator.class, new FilterChainConfigurator() {
+
+ @Override
+ public void configure(FilterChainManager filterChainManager) {
+ filterChainManager.createChain("/rest/**", "noSessionCreation, authcBasic");
+ }
+
+ });
+
contribute(JerseyConfigurator.class, new JerseyConfigurator() {
@Override
diff --git a/rest/src/main/java/com/gitplex/server/rest/UserResource.java b/rest/src/main/java/com/gitplex/server/rest/UserResource.java
index caca07462b..c41b684d3e 100644
--- a/rest/src/main/java/com/gitplex/server/rest/UserResource.java
+++ b/rest/src/main/java/com/gitplex/server/rest/UserResource.java
@@ -15,10 +15,10 @@ import javax.ws.rs.core.MediaType;
import org.hibernate.criterion.Restrictions;
import org.hibernate.validator.constraints.Email;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.commons.jersey.ValidQueryParams;
-import com.gitplex.server.core.entity.Account;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.rest.jersey.ValidQueryParams;
@Path("/users")
@Consumes(MediaType.WILDCARD)
diff --git a/jersey/src/main/java/com/gitplex/commons/jersey/CatchAllExceptionMapper.java b/rest/src/main/java/com/gitplex/server/rest/jersey/CatchAllExceptionMapper.java
similarity index 95%
rename from jersey/src/main/java/com/gitplex/commons/jersey/CatchAllExceptionMapper.java
rename to rest/src/main/java/com/gitplex/server/rest/jersey/CatchAllExceptionMapper.java
index 98d832f778..d273600a8a 100644
--- a/jersey/src/main/java/com/gitplex/commons/jersey/CatchAllExceptionMapper.java
+++ b/rest/src/main/java/com/gitplex/server/rest/jersey/CatchAllExceptionMapper.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.jersey;
+package com.gitplex.server.rest.jersey;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
diff --git a/jersey/src/main/java/com/gitplex/commons/jersey/IllegalArgumentExceptionMapper.java b/rest/src/main/java/com/gitplex/server/rest/jersey/IllegalArgumentExceptionMapper.java
similarity index 94%
rename from jersey/src/main/java/com/gitplex/commons/jersey/IllegalArgumentExceptionMapper.java
rename to rest/src/main/java/com/gitplex/server/rest/jersey/IllegalArgumentExceptionMapper.java
index 2f74485bcf..7355401707 100644
--- a/jersey/src/main/java/com/gitplex/commons/jersey/IllegalArgumentExceptionMapper.java
+++ b/rest/src/main/java/com/gitplex/server/rest/jersey/IllegalArgumentExceptionMapper.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.jersey;
+package com.gitplex.server.rest.jersey;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
diff --git a/jersey/src/main/java/com/gitplex/commons/jersey/IncorrectCredentialsExceptionMapper.java b/rest/src/main/java/com/gitplex/server/rest/jersey/IncorrectCredentialsExceptionMapper.java
similarity index 92%
rename from jersey/src/main/java/com/gitplex/commons/jersey/IncorrectCredentialsExceptionMapper.java
rename to rest/src/main/java/com/gitplex/server/rest/jersey/IncorrectCredentialsExceptionMapper.java
index 158d8e00dc..97162065c0 100644
--- a/jersey/src/main/java/com/gitplex/commons/jersey/IncorrectCredentialsExceptionMapper.java
+++ b/rest/src/main/java/com/gitplex/server/rest/jersey/IncorrectCredentialsExceptionMapper.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.jersey;
+package com.gitplex.server.rest.jersey;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
diff --git a/jersey/src/main/java/com/gitplex/commons/jersey/JacksonContextResolver.java b/rest/src/main/java/com/gitplex/server/rest/jersey/JacksonContextResolver.java
similarity index 86%
rename from jersey/src/main/java/com/gitplex/commons/jersey/JacksonContextResolver.java
rename to rest/src/main/java/com/gitplex/server/rest/jersey/JacksonContextResolver.java
index 7d476a4fef..5415bb014f 100644
--- a/jersey/src/main/java/com/gitplex/commons/jersey/JacksonContextResolver.java
+++ b/rest/src/main/java/com/gitplex/server/rest/jersey/JacksonContextResolver.java
@@ -1,11 +1,11 @@
-package com.gitplex.commons.jersey;
+package com.gitplex.server.rest.jersey;
import javax.inject.Inject;
import javax.ws.rs.ext.ContextResolver;
import javax.ws.rs.ext.Provider;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gitplex.commons.jackson.ExternalView;
+import com.gitplex.server.util.jackson.ExternalView;
@Provider
public class JacksonContextResolver implements ContextResolver<ObjectMapper> {
diff --git a/jersey/src/main/java/com/gitplex/commons/jersey/JerseyApplication.java b/rest/src/main/java/com/gitplex/server/rest/jersey/JerseyApplication.java
similarity index 95%
rename from jersey/src/main/java/com/gitplex/commons/jersey/JerseyApplication.java
rename to rest/src/main/java/com/gitplex/server/rest/jersey/JerseyApplication.java
index 78c3ce73b6..b741413a50 100644
--- a/jersey/src/main/java/com/gitplex/commons/jersey/JerseyApplication.java
+++ b/rest/src/main/java/com/gitplex/server/rest/jersey/JerseyApplication.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.jersey;
+package com.gitplex.server.rest.jersey;
import javax.inject.Inject;
import javax.ws.rs.ext.MessageBodyReader;
@@ -15,7 +15,7 @@ import org.jvnet.hk2.guice.bridge.api.GuiceIntoHK2Bridge;
import com.fasterxml.jackson.jaxrs.base.JsonMappingExceptionMapper;
import com.fasterxml.jackson.jaxrs.base.JsonParseExceptionMapper;
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
-import com.gitplex.calla.loader.AppLoader;
+import com.gitplex.launcher.loader.AppLoader;
public class JerseyApplication extends ResourceConfig {
diff --git a/jersey/src/main/java/com/gitplex/commons/jersey/JerseyConfigurator.java b/rest/src/main/java/com/gitplex/server/rest/jersey/JerseyConfigurator.java
similarity index 77%
rename from jersey/src/main/java/com/gitplex/commons/jersey/JerseyConfigurator.java
rename to rest/src/main/java/com/gitplex/server/rest/jersey/JerseyConfigurator.java
index 78cf0bcac5..2821594b22 100644
--- a/jersey/src/main/java/com/gitplex/commons/jersey/JerseyConfigurator.java
+++ b/rest/src/main/java/com/gitplex/server/rest/jersey/JerseyConfigurator.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.jersey;
+package com.gitplex.server.rest.jersey;
import org.glassfish.jersey.server.ResourceConfig;
diff --git a/jersey/src/main/java/com/gitplex/commons/jersey/JerseyServletConfigurator.java b/rest/src/main/java/com/gitplex/server/rest/jersey/JerseyServletConfigurator.java
similarity index 87%
rename from jersey/src/main/java/com/gitplex/commons/jersey/JerseyServletConfigurator.java
rename to rest/src/main/java/com/gitplex/server/rest/jersey/JerseyServletConfigurator.java
index a43f18632e..60bb5dcfeb 100644
--- a/jersey/src/main/java/com/gitplex/commons/jersey/JerseyServletConfigurator.java
+++ b/rest/src/main/java/com/gitplex/server/rest/jersey/JerseyServletConfigurator.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.jersey;
+package com.gitplex.server.rest.jersey;
import javax.inject.Inject;
@@ -7,7 +7,7 @@ import org.eclipse.jetty.servlet.ServletHolder;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.servlet.ServletContainer;
-import com.gitplex.commons.jetty.ServletConfigurator;
+import com.gitplex.server.util.jetty.ServletConfigurator;
public class JerseyServletConfigurator implements ServletConfigurator {
diff --git a/jersey/src/main/java/com/gitplex/commons/jersey/ResourceConfigProvider.java b/rest/src/main/java/com/gitplex/server/rest/jersey/ResourceConfigProvider.java
similarity index 87%
rename from jersey/src/main/java/com/gitplex/commons/jersey/ResourceConfigProvider.java
rename to rest/src/main/java/com/gitplex/server/rest/jersey/ResourceConfigProvider.java
index 8cfc140f31..7c908363a9 100644
--- a/jersey/src/main/java/com/gitplex/commons/jersey/ResourceConfigProvider.java
+++ b/rest/src/main/java/com/gitplex/server/rest/jersey/ResourceConfigProvider.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.jersey;
+package com.gitplex.server.rest.jersey;
import javax.inject.Provider;
diff --git a/jersey/src/main/java/com/gitplex/commons/jersey/UnauthenticatedExceptionMapper.java b/rest/src/main/java/com/gitplex/server/rest/jersey/UnauthenticatedExceptionMapper.java
similarity index 90%
rename from jersey/src/main/java/com/gitplex/commons/jersey/UnauthenticatedExceptionMapper.java
rename to rest/src/main/java/com/gitplex/server/rest/jersey/UnauthenticatedExceptionMapper.java
index 12d2d85e27..8ba0d10ef2 100644
--- a/jersey/src/main/java/com/gitplex/commons/jersey/UnauthenticatedExceptionMapper.java
+++ b/rest/src/main/java/com/gitplex/server/rest/jersey/UnauthenticatedExceptionMapper.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.jersey;
+package com.gitplex.server.rest.jersey;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.Response;
@@ -8,7 +8,7 @@ import javax.ws.rs.ext.Provider;
import org.apache.shiro.authz.UnauthenticatedException;
-import com.gitplex.calla.loader.AppLoader;
+import com.gitplex.launcher.loader.AppLoader;
@Provider
public class UnauthenticatedExceptionMapper implements ExceptionMapper<UnauthenticatedException> {
diff --git a/jersey/src/main/java/com/gitplex/commons/jersey/UnauthorizedExceptionMapper.java b/rest/src/main/java/com/gitplex/server/rest/jersey/UnauthorizedExceptionMapper.java
similarity index 92%
rename from jersey/src/main/java/com/gitplex/commons/jersey/UnauthorizedExceptionMapper.java
rename to rest/src/main/java/com/gitplex/server/rest/jersey/UnauthorizedExceptionMapper.java
index 5ccb8f2a20..ce6d24e3ea 100644
--- a/jersey/src/main/java/com/gitplex/commons/jersey/UnauthorizedExceptionMapper.java
+++ b/rest/src/main/java/com/gitplex/server/rest/jersey/UnauthorizedExceptionMapper.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.jersey;
+package com.gitplex.server.rest.jersey;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.Response;
@@ -9,7 +9,7 @@ import javax.ws.rs.ext.Provider;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.UnauthorizedException;
-import com.gitplex.calla.loader.AppLoader;
+import com.gitplex.launcher.loader.AppLoader;
@Provider
public class UnauthorizedExceptionMapper implements ExceptionMapper<UnauthorizedException> {
diff --git a/jersey/src/main/java/com/gitplex/commons/jersey/UnknownAccountExceptionMapper.java b/rest/src/main/java/com/gitplex/server/rest/jersey/UnknownAccountExceptionMapper.java
similarity index 92%
rename from jersey/src/main/java/com/gitplex/commons/jersey/UnknownAccountExceptionMapper.java
rename to rest/src/main/java/com/gitplex/server/rest/jersey/UnknownAccountExceptionMapper.java
index a25fe19916..0aae212899 100644
--- a/jersey/src/main/java/com/gitplex/commons/jersey/UnknownAccountExceptionMapper.java
+++ b/rest/src/main/java/com/gitplex/server/rest/jersey/UnknownAccountExceptionMapper.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.jersey;
+package com.gitplex.server.rest.jersey;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
diff --git a/jersey/src/main/java/com/gitplex/commons/jersey/ValidQueryParams.java b/rest/src/main/java/com/gitplex/server/rest/jersey/ValidQueryParams.java
similarity index 94%
rename from jersey/src/main/java/com/gitplex/commons/jersey/ValidQueryParams.java
rename to rest/src/main/java/com/gitplex/server/rest/jersey/ValidQueryParams.java
index 32cd4261d7..8f695188bb 100644
--- a/jersey/src/main/java/com/gitplex/commons/jersey/ValidQueryParams.java
+++ b/rest/src/main/java/com/gitplex/server/rest/jersey/ValidQueryParams.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.jersey;
+package com.gitplex.server.rest.jersey;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/jersey/src/main/java/com/gitplex/commons/jersey/ValidQueryParamsValidator.java b/rest/src/main/java/com/gitplex/server/rest/jersey/ValidQueryParamsValidator.java
similarity index 97%
rename from jersey/src/main/java/com/gitplex/commons/jersey/ValidQueryParamsValidator.java
rename to rest/src/main/java/com/gitplex/server/rest/jersey/ValidQueryParamsValidator.java
index 91922855f9..5a18ca87e1 100644
--- a/jersey/src/main/java/com/gitplex/commons/jersey/ValidQueryParamsValidator.java
+++ b/rest/src/main/java/com/gitplex/server/rest/jersey/ValidQueryParamsValidator.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.jersey;
+package com.gitplex.server.rest.jersey;
import java.lang.annotation.Annotation;
import java.util.HashSet;
diff --git a/jersey/src/main/java/com/gitplex/commons/jersey/ValidationConfigurationContextResolver.java b/rest/src/main/java/com/gitplex/server/rest/jersey/ValidationConfigurationContextResolver.java
similarity index 90%
rename from jersey/src/main/java/com/gitplex/commons/jersey/ValidationConfigurationContextResolver.java
rename to rest/src/main/java/com/gitplex/server/rest/jersey/ValidationConfigurationContextResolver.java
index 073852ef7c..231ddfc83d 100644
--- a/jersey/src/main/java/com/gitplex/commons/jersey/ValidationConfigurationContextResolver.java
+++ b/rest/src/main/java/com/gitplex/server/rest/jersey/ValidationConfigurationContextResolver.java
@@ -1,11 +1,11 @@
-package com.gitplex.commons.jersey;
+package com.gitplex.server.rest.jersey;
import javax.validation.ValidatorFactory;
import javax.ws.rs.ext.ContextResolver;
import org.glassfish.jersey.server.validation.ValidationConfig;
-import com.gitplex.calla.loader.AppLoader;
+import com.gitplex.launcher.loader.AppLoader;
public class ValidationConfigurationContextResolver implements ContextResolver<ValidationConfig> {
diff --git a/schedule/pom.xml b/schedule/pom.xml
deleted file mode 100644
index e5da613cc6..0000000000
--- a/schedule/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>server-schedule</artifactId>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>server-parent</artifactId>
- <version>1.0-EAP-build26</version>
- <relativePath>../parent</relativePath>
- </parent>
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <!-- Uncomment below if you'd like to publish an archetype based on your plugin -->
- <!--plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- </plugin-->
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <exclusions>
- <exclusion>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <properties>
- <moduleClass>com.gitplex.commons.schedule.ScheduleModule</moduleClass>
- </properties>
-</project>
\ No newline at end of file
diff --git a/schedule/src/main/java/com/gitplex/commons/schedule/ScheduleModule.java b/schedule/src/main/java/com/gitplex/commons/schedule/ScheduleModule.java
deleted file mode 100644
index 82882f7b1f..0000000000
--- a/schedule/src/main/java/com/gitplex/commons/schedule/ScheduleModule.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.gitplex.commons.schedule;
-
-import com.gitplex.calla.loader.AbstractPlugin;
-import com.gitplex.calla.loader.AbstractPluginModule;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class ScheduleModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- // put your guice bindings here
- bind(TaskScheduler.class).to(DefaultTaskScheduler.class);
- }
-
- @Override
- protected Class<? extends AbstractPlugin> getPluginClass() {
- return SchedulePlugin.class;
- }
-
-}
diff --git a/schedule/src/main/java/com/gitplex/commons/schedule/SchedulePlugin.java b/schedule/src/main/java/com/gitplex/commons/schedule/SchedulePlugin.java
deleted file mode 100644
index 308cc368c8..0000000000
--- a/schedule/src/main/java/com/gitplex/commons/schedule/SchedulePlugin.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.gitplex.commons.schedule;
-
-import javax.inject.Inject;
-
-import com.gitplex.calla.bootstrap.Bootstrap;
-import com.gitplex.calla.loader.AbstractPlugin;
-
-public class SchedulePlugin extends AbstractPlugin {
-
- private final TaskScheduler taskScheduler;
-
- @Inject
- public SchedulePlugin(TaskScheduler taskScheduler) {
- this.taskScheduler = taskScheduler;
- }
-
- @Override
- public void start() {
- if (Bootstrap.command == null)
- taskScheduler.start();
- }
-
- @Override
- public void stop() {
- if (taskScheduler.isStarted())
- taskScheduler.shutdown();
- }
-
-}
diff --git a/schedule/src/main/resources/META-INF/maven/archetype-metadata.xml b/schedule/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 904fb7a4bb..0000000000
--- a/schedule/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archetype-descriptor name="archetype.plugin">
- <fileSets>
- <fileSet filtered="true" packaged="true">
- <directory>src/main/java</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/main/resources</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/test/java</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/test/resources</directory>
- </fileSet>
- </fileSets>
-</archetype-descriptor>
\ No newline at end of file
diff --git a/schedule/src/main/resources/archetype-resource/pom.xml b/schedule/src/main/resources/archetype-resource/pom.xml
deleted file mode 100644
index 61659b0c40..0000000000
--- a/schedule/src/main/resources/archetype-resource/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-#if (\${groupId} != "com.gitplex")
- <groupId>\${groupId}</groupId>
-#end
- <artifactId>\${artifactId}</artifactId>
- <version>\${version}</version>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>parent.general</artifactId>
- <version>1.0.0</version>
- </parent>
-
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <repositories>
- <repository>
- <id>pmeaseRepo</id>
- <name>PMEase Repository</name>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- <url>http://artifact.pmease.com/</url>
- </repository>
- </repositories>
-
- <properties>
- <moduleClass>\${package}.PluginModule</moduleClass>
- </properties>
-
-</project>
diff --git a/schedule/src/main/resources/archetype-resource/src/main/java/PluginModule.java b/schedule/src/main/resources/archetype-resource/src/main/java/PluginModule.java
deleted file mode 100644
index 1f5b6ae3e2..0000000000
--- a/schedule/src/main/resources/archetype-resource/src/main/java/PluginModule.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package ${package};
-
-import com.gitplex.calla.loader.AbstractPlugin;
-import com.gitplex.calla.loader.AbstractPluginModule;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class PluginModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- // put your guice bindings here
- }
-
-}
diff --git a/search/pom.xml b/search/pom.xml
index 59503160d6..7a08e98aa9 100644
--- a/search/pom.xml
+++ b/search/pom.xml
@@ -6,7 +6,6 @@
<groupId>com.gitplex</groupId>
<artifactId>server-parent</artifactId>
<version>1.0-EAP-build26</version>
- <relativePath>../parent</relativePath>
</parent>
<build>
<plugins>
@@ -65,13 +64,6 @@
<type>jar</type>
<version>${luceneVersion}</version>
</dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-git</artifactId>
- <version>1.0-EAP-build26</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
<properties>
<moduleClass>com.gitplex.server.search.SearchModule</moduleClass>
diff --git a/search/src/main/java/com/gitplex/server/search/CommitIndexed.java b/search/src/main/java/com/gitplex/server/search/CommitIndexed.java
index a71430d071..9ccf6081c4 100644
--- a/search/src/main/java/com/gitplex/server/search/CommitIndexed.java
+++ b/search/src/main/java/com/gitplex/server/search/CommitIndexed.java
@@ -2,7 +2,7 @@ package com.gitplex.server.search;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
public class CommitIndexed {
diff --git a/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java b/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java
index b9daa5db7d..8cfaf97741 100644
--- a/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java
+++ b/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java
@@ -63,22 +63,22 @@ import org.eclipse.jgit.treewalk.filter.TreeFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.hibernate.UnitOfWork;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.calla.loader.ListenerRegistry;
-import com.gitplex.commons.util.ContentDetector;
-import com.gitplex.commons.util.concurrent.Prioritized;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.launcher.loader.ListenerRegistry;
import com.gitplex.jsymbol.ExtractException;
import com.gitplex.jsymbol.Symbol;
import com.gitplex.jsymbol.SymbolExtractor;
import com.gitplex.jsymbol.SymbolExtractorRegistry;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.event.RefUpdated;
-import com.gitplex.server.core.manager.BatchWorkManager;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.manager.StorageManager;
-import com.gitplex.server.core.manager.support.BatchWorker;
-import com.gitplex.server.core.manager.support.IndexResult;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.event.RefUpdated;
+import com.gitplex.server.manager.BatchWorkManager;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.manager.StorageManager;
+import com.gitplex.server.manager.support.BatchWorker;
+import com.gitplex.server.manager.support.IndexResult;
+import com.gitplex.server.persistence.UnitOfWork;
+import com.gitplex.server.util.ContentDetector;
+import com.gitplex.server.util.concurrent.Prioritized;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
diff --git a/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java b/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java
index 82dbf7891f..dbe97e7942 100644
--- a/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java
+++ b/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java
@@ -39,14 +39,14 @@ import org.eclipse.jgit.treewalk.TreeWalk;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.calla.loader.Listen;
+import com.gitplex.launcher.loader.Listen;
import com.gitplex.jsymbol.Symbol;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.event.depot.DepotDeleted;
-import com.gitplex.server.core.event.lifecycle.SystemStopping;
-import com.gitplex.server.core.manager.StorageManager;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.event.depot.DepotDeleted;
+import com.gitplex.server.event.lifecycle.SystemStopping;
+import com.gitplex.server.manager.StorageManager;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.search.hit.QueryHit;
import com.gitplex.server.search.query.BlobQuery;
import com.google.common.base.Throwables;
diff --git a/search/src/main/java/com/gitplex/server/search/IndexManager.java b/search/src/main/java/com/gitplex/server/search/IndexManager.java
index 0820a00626..ea998c186e 100644
--- a/search/src/main/java/com/gitplex/server/search/IndexManager.java
+++ b/search/src/main/java/com/gitplex/server/search/IndexManager.java
@@ -2,8 +2,8 @@ package com.gitplex.server.search;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.support.IndexResult;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.support.IndexResult;
public interface IndexManager {
diff --git a/search/src/main/java/com/gitplex/server/search/SearchManager.java b/search/src/main/java/com/gitplex/server/search/SearchManager.java
index 6094f5ac6c..2f1aaff3b9 100644
--- a/search/src/main/java/com/gitplex/server/search/SearchManager.java
+++ b/search/src/main/java/com/gitplex/server/search/SearchManager.java
@@ -8,7 +8,7 @@ import org.apache.lucene.search.IndexSearcher;
import org.eclipse.jgit.lib.ObjectId;
import com.gitplex.jsymbol.Symbol;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
import com.gitplex.server.search.hit.QueryHit;
import com.gitplex.server.search.query.BlobQuery;
import com.gitplex.server.search.query.TooGeneralQueryException;
diff --git a/search/src/main/java/com/gitplex/server/search/SearchModule.java b/search/src/main/java/com/gitplex/server/search/SearchModule.java
index 977030ed4b..213b1ab5b0 100644
--- a/search/src/main/java/com/gitplex/server/search/SearchModule.java
+++ b/search/src/main/java/com/gitplex/server/search/SearchModule.java
@@ -1,6 +1,6 @@
package com.gitplex.server.search;
-import com.gitplex.calla.loader.AbstractPluginModule;
+import com.gitplex.launcher.loader.AbstractPluginModule;
/**
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
diff --git a/search/src/main/java/com/gitplex/server/search/query/FileQuery.java b/search/src/main/java/com/gitplex/server/search/query/FileQuery.java
index b3a5df4285..bed482c91a 100644
--- a/search/src/main/java/com/gitplex/server/search/query/FileQuery.java
+++ b/search/src/main/java/com/gitplex/server/search/query/FileQuery.java
@@ -13,10 +13,10 @@ import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.WildcardQuery;
import org.eclipse.jgit.treewalk.TreeWalk;
-import com.gitplex.commons.util.match.WildcardUtils;
import com.gitplex.jsymbol.Range;
import com.gitplex.server.search.hit.FileHit;
import com.gitplex.server.search.hit.QueryHit;
+import com.gitplex.server.util.match.WildcardUtils;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
diff --git a/search/src/main/java/com/gitplex/server/search/query/PathQuery.java b/search/src/main/java/com/gitplex/server/search/query/PathQuery.java
index 4efc8c8db0..4e946a48ee 100644
--- a/search/src/main/java/com/gitplex/server/search/query/PathQuery.java
+++ b/search/src/main/java/com/gitplex/server/search/query/PathQuery.java
@@ -13,9 +13,9 @@ import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.WildcardQuery;
import org.eclipse.jgit.treewalk.TreeWalk;
-import com.gitplex.commons.util.PathUtils;
import com.gitplex.server.search.hit.PathHit;
import com.gitplex.server.search.hit.QueryHit;
+import com.gitplex.server.util.PathUtils;
import com.gitplex.jsymbol.Range;
public class PathQuery extends BlobQuery {
diff --git a/search/src/main/java/com/gitplex/server/search/query/SymbolQuery.java b/search/src/main/java/com/gitplex/server/search/query/SymbolQuery.java
index 1215aaf1cc..f754a511d5 100644
--- a/search/src/main/java/com/gitplex/server/search/query/SymbolQuery.java
+++ b/search/src/main/java/com/gitplex/server/search/query/SymbolQuery.java
@@ -16,13 +16,13 @@ import org.apache.lucene.search.WildcardQuery;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.treewalk.TreeWalk;
-import com.gitplex.commons.util.match.WildcardUtils;
import com.gitplex.jsymbol.Range;
import com.gitplex.jsymbol.Symbol;
-import com.gitplex.server.core.GitPlex;
+import com.gitplex.server.GitPlex;
import com.gitplex.server.search.SearchManager;
import com.gitplex.server.search.hit.QueryHit;
import com.gitplex.server.search.hit.SymbolHit;
+import com.gitplex.server.util.match.WildcardUtils;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
diff --git a/search/src/main/java/com/gitplex/server/search/query/TextQuery.java b/search/src/main/java/com/gitplex/server/search/query/TextQuery.java
index 3b724f6e57..1f96012ed7 100644
--- a/search/src/main/java/com/gitplex/server/search/query/TextQuery.java
+++ b/search/src/main/java/com/gitplex/server/search/query/TextQuery.java
@@ -20,13 +20,13 @@ import org.apache.lucene.search.WildcardQuery;
import org.eclipse.jgit.lib.ObjectLoader;
import org.eclipse.jgit.treewalk.TreeWalk;
-import com.gitplex.commons.util.ContentDetector;
import com.gitplex.jsymbol.Range;
import com.gitplex.jsymbol.TokenPosition;
import com.gitplex.server.search.IndexConstants;
import com.gitplex.server.search.hit.QueryHit;
import com.gitplex.server.search.hit.TextHit;
import com.gitplex.server.search.query.regex.RegexLiterals;
+import com.gitplex.server.util.ContentDetector;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
diff --git a/shiro/pom.xml b/shiro/pom.xml
deleted file mode 100644
index 6ebabc3d3e..0000000000
--- a/shiro/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>server-shiro</artifactId>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>server-parent</artifactId>
- <version>1.0-EAP-build26</version>
- <relativePath>../parent</relativePath>
- </parent>
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- <version>${shiroVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-web</artifactId>
- <version>${shiroVersion}</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-hibernate</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- <dependency>
- <groupId>com.pmease.security.shiro</groupId>
- <artifactId>shiro-bcrypt</artifactId>
- <version>1.0.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-guice</artifactId>
- <version>${shiroVersion}</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-jackson</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- </dependencies>
- <properties>
- <moduleClass>com.gitplex.commons.shiro.ShiroModule</moduleClass>
- <shiroVersion>1.2.2</shiroVersion>
- </properties>
-</project>
\ No newline at end of file
diff --git a/shiro/src/main/java/com/gitplex/commons/shiro/AbstractRealm.java b/shiro/src/main/java/com/gitplex/commons/shiro/AbstractRealm.java
deleted file mode 100644
index 25992513c3..0000000000
--- a/shiro/src/main/java/com/gitplex/commons/shiro/AbstractRealm.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.gitplex.commons.shiro;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import javax.annotation.Nullable;
-
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.AuthenticationInfo;
-import org.apache.shiro.authc.AuthenticationToken;
-import org.apache.shiro.authc.UsernamePasswordToken;
-import org.apache.shiro.authc.credential.PasswordMatcher;
-import org.apache.shiro.authc.credential.PasswordService;
-import org.apache.shiro.authz.AuthorizationInfo;
-import org.apache.shiro.authz.Permission;
-import org.apache.shiro.realm.AuthorizingRealm;
-import org.apache.shiro.subject.PrincipalCollection;
-
-import com.gitplex.calla.loader.AppLoader;
-import com.google.inject.Inject;
-
-public abstract class AbstractRealm extends AuthorizingRealm {
-
- @Inject
- public AbstractRealm() {
- PasswordMatcher passwordMatcher = new PasswordMatcher();
- passwordMatcher.setPasswordService(AppLoader.getInstance(PasswordService.class));
- setCredentialsMatcher(passwordMatcher);
- }
-
- @SuppressWarnings("serial")
- @Override
- protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
- final Long userId = (Long) principals.getPrimaryPrincipal();
-
- return new AuthorizationInfo() {
-
- @Override
- public Collection<String> getStringPermissions() {
- return new HashSet<>();
- }
-
- @Override
- public Collection<String> getRoles() {
- return new HashSet<>();
- }
-
- @Override
- public Collection<Permission> getObjectPermissions() {
- return permissionsOf(userId);
- }
- };
- }
-
- /**
- * Retrieve {@link AuthenticationInfo} of specified token.
- *
- * @param token
- * The token used to retrieve associated {@link AuthenticationInfo}
- * @return
- * {@link AuthenticationInfo} of specified token. Specifically if {@link AuthenticationInfo#getCredentials()}
- * returns <tt>null</tt>, the credential will not be used to match against the password saved in token and
- * the authentication is considered successful. This is typically the case when the user is already
- * authenticated against other systems (such as LDAP) in this method.
- * @throws
- * AuthenticationException
- */
- protected AuthenticationInfo authenticationInfoOf(UsernamePasswordToken token) throws AuthenticationException {
- return getUserByName(token.getUsername());
- }
-
- @Override
- protected final AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException {
- return authenticationInfoOf((UsernamePasswordToken) token);
- }
-
- /**
- * Get collection of permissions for specified user identifier.
- *
- * @param userId
- * identifier of user to get permissions for. Specifically, value <tt>0</tt> stands for
- * anonymous user
- * @return
- * collection of permissions associated with specified user identifier
- */
- protected abstract Collection<Permission> permissionsOf(Long userId);
-
- /**
- * Get user by name.
- *
- * @param userName
- * name of the user
- * @return
- * user with specified name, or <tt>null</tt> if not found
- */
- protected abstract @Nullable AbstractUser getUserByName(String userName);
-
-}
diff --git a/shiro/src/main/java/com/gitplex/commons/shiro/AbstractUser.java b/shiro/src/main/java/com/gitplex/commons/shiro/AbstractUser.java
deleted file mode 100644
index bab4613b1f..0000000000
--- a/shiro/src/main/java/com/gitplex/commons/shiro/AbstractUser.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.gitplex.commons.shiro;
-
-import javax.persistence.Column;
-import javax.persistence.MappedSuperclass;
-
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.AuthenticationInfo;
-import org.apache.shiro.subject.PrincipalCollection;
-import org.apache.shiro.subject.SimplePrincipalCollection;
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.web.mgt.WebSecurityManager;
-
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.calla.loader.AppLoader;
-import com.google.common.base.Preconditions;
-
-@SuppressWarnings("serial")
-@MappedSuperclass
-public abstract class AbstractUser extends AbstractEntity implements AuthenticationInfo {
-
- @Column(unique=true, nullable=false)
- private String name;
-
- @Column(length=1024)
- private String password;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * Get hashed password of this user.
- *
- * @return
- * hashed password of this user
- */
- public String getPassword() {
- return password;
- }
-
- /**
- * Set password of this user.
- *
- * @param password
- * password to set
- */
- public void setPassword(String password) {
- if (password != null) {
- this.password = password;
- } else {
- this.password = null;
- }
- }
-
- @Override
- public PrincipalCollection getPrincipals() {
- return new SimplePrincipalCollection(getId(), "");
- }
-
- @Override
- public Object getCredentials() {
- return password;
- }
-
- public Subject asSubject() {
- return asSubject(getId());
- }
-
- public static Long getCurrentId() {
- Object principal = SecurityUtils.getSubject().getPrincipal();
- Preconditions.checkNotNull(principal);
- return (Long) principal;
- }
-
- public static PrincipalCollection asPrincipal(Long userId) {
- return new SimplePrincipalCollection(userId, "");
- }
-
- public static Subject asSubject(Long userId) {
- WebSecurityManager securityManager = AppLoader.getInstance(WebSecurityManager.class);
- return new Subject.Builder(securityManager).principals(asPrincipal(userId)).buildSubject();
- }
-
-}
diff --git a/shiro/src/main/java/com/gitplex/commons/shiro/ShiroModule.java b/shiro/src/main/java/com/gitplex/commons/shiro/ShiroModule.java
deleted file mode 100644
index acdcdc3bb1..0000000000
--- a/shiro/src/main/java/com/gitplex/commons/shiro/ShiroModule.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gitplex.commons.shiro;
-
-import javax.inject.Singleton;
-
-import org.apache.shiro.authc.credential.PasswordService;
-import org.apache.shiro.guice.aop.ShiroAopModule;
-import org.apache.shiro.web.filter.mgt.FilterChainManager;
-import org.apache.shiro.web.filter.mgt.FilterChainResolver;
-import org.apache.shiro.web.mgt.WebSecurityManager;
-import org.apache.shiro.web.servlet.ShiroFilter;
-
-import com.gitplex.commons.jetty.ServletConfigurator;
-import com.gitplex.calla.loader.AbstractPluginModule;
-import com.pmease.security.shiro.bcrypt.BCryptPasswordService;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class ShiroModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- // put your guice bindings here
- bind(WebSecurityManager.class).to(DefaultWebSecurityManager.class);
- bind(FilterChainResolver.class).to(DefaultFilterChainResolver.class);
- bind(BasicAuthenticationFilter.class);
- bind(PasswordService.class).to(BCryptPasswordService.class).in(Singleton.class);
- bind(ShiroFilter.class);
-
- install(new ShiroAopModule());
-
- contribute(ServletConfigurator.class, ShiroServletConfigurator.class);
-
- contribute(FilterChainConfigurator.class, new FilterChainConfigurator() {
-
- @Override
- public void configure(FilterChainManager filterChainManager) {
- }
-
- });
-
- }
-
-}
diff --git a/shiro/src/main/java/com/gitplex/commons/shiro/ShiroServletConfigurator.java b/shiro/src/main/java/com/gitplex/commons/shiro/ShiroServletConfigurator.java
deleted file mode 100644
index daf020add0..0000000000
--- a/shiro/src/main/java/com/gitplex/commons/shiro/ShiroServletConfigurator.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.gitplex.commons.shiro;
-
-import java.util.EnumSet;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.DispatcherType;
-
-import org.apache.shiro.web.env.EnvironmentLoader;
-import org.apache.shiro.web.env.EnvironmentLoaderListener;
-import org.apache.shiro.web.servlet.ShiroFilter;
-import org.eclipse.jetty.servlet.FilterHolder;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-
-import com.gitplex.commons.jetty.ServletConfigurator;
-
-@Singleton
-public class ShiroServletConfigurator implements ServletConfigurator {
-
- private final ShiroFilter shiroFilter;
-
- @Inject
- public ShiroServletConfigurator(ShiroFilter shiroFilter) {
- this.shiroFilter = shiroFilter;
- }
-
- @Override
- public void configure(ServletContextHandler context) {
- context.setInitParameter(
- EnvironmentLoader.ENVIRONMENT_CLASS_PARAM,
- DefaultWebEnvironment.class.getName());
-
- context.addEventListener(new EnvironmentLoaderListener());
-
- FilterHolder filterHolder = new FilterHolder(shiroFilter);
- context.addFilter(filterHolder, "/*", EnumSet.allOf(DispatcherType.class));
- }
-
-}
diff --git a/shiro/src/main/resources/META-INF/maven/archetype-metadata.xml b/shiro/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 904fb7a4bb..0000000000
--- a/shiro/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archetype-descriptor name="archetype.plugin">
- <fileSets>
- <fileSet filtered="true" packaged="true">
- <directory>src/main/java</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/main/resources</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/test/java</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/test/resources</directory>
- </fileSet>
- </fileSets>
-</archetype-descriptor>
\ No newline at end of file
diff --git a/shiro/src/main/resources/archetype-resource/pom.xml b/shiro/src/main/resources/archetype-resource/pom.xml
deleted file mode 100644
index 61659b0c40..0000000000
--- a/shiro/src/main/resources/archetype-resource/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-#if (\${groupId} != "com.gitplex")
- <groupId>\${groupId}</groupId>
-#end
- <artifactId>\${artifactId}</artifactId>
- <version>\${version}</version>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>parent.general</artifactId>
- <version>1.0.0</version>
- </parent>
-
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <repositories>
- <repository>
- <id>pmeaseRepo</id>
- <name>PMEase Repository</name>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- <url>http://artifact.pmease.com/</url>
- </repository>
- </repositories>
-
- <properties>
- <moduleClass>\${package}.PluginModule</moduleClass>
- </properties>
-
-</project>
diff --git a/shiro/src/main/resources/archetype-resource/src/main/java/Plugin.java b/shiro/src/main/resources/archetype-resource/src/main/java/Plugin.java
deleted file mode 100644
index 5ca2f34b53..0000000000
--- a/shiro/src/main/resources/archetype-resource/src/main/java/Plugin.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package ${package};
-
-import java.util.Collection;
-import com.gitplex.calla.loader.AbstractPlugin;
-
-public class Plugin extends AbstractPlugin {
-
- @Override
- public Collection<?> getExtensions() {
- return null;
- }
-
-}
diff --git a/shiro/src/main/resources/archetype-resource/src/main/java/PluginModule.java b/shiro/src/main/resources/archetype-resource/src/main/java/PluginModule.java
deleted file mode 100644
index 0dbd7c4086..0000000000
--- a/shiro/src/main/resources/archetype-resource/src/main/java/PluginModule.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package ${package};
-
-import com.gitplex.calla.loader.AbstractPlugin;
-import com.gitplex.calla.loader.AbstractPluginModule;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class PluginModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- // put your guice bindings here
- }
-
- @Override
- protected Class<? extends AbstractPlugin> getPluginClass() {
- return Plugin.class;
- }
-
-}
diff --git a/util/pom.xml b/util/pom.xml
deleted file mode 100644
index f00109d676..0000000000
--- a/util/pom.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>server-parent</artifactId>
- <version>1.0-EAP-build26</version>
- <relativePath>../parent</relativePath>
- </parent>
- <artifactId>server-util</artifactId>
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.unbescape</groupId>
- <artifactId>unbescape</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>calla-bootstrap</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jsoup</groupId>
- <artifactId>jsoup</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-email</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- </dependency>
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
- <dependency>
- <groupId>com.googlecode.juniversalchardet</groupId>
- <artifactId>juniversalchardet</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>jsymbol</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>jsyntax</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
diff --git a/util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/DummyInterface.java b/util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/DummyInterface.java
deleted file mode 100644
index 63cd35c1c2..0000000000
--- a/util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/DummyInterface.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.gitplex.commons.util.findsubclassesexploded;
-
-public interface DummyInterface {
- void test();
-}
diff --git a/util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/dummy/DummyClass1.java b/util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/dummy/DummyClass1.java
deleted file mode 100644
index a691c74a4c..0000000000
--- a/util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/dummy/DummyClass1.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gitplex.commons.util.findsubclassesexploded.dummy;
-
-import com.gitplex.commons.util.findsubclassesexploded.DummyAbstractClass;
-
-public class DummyClass1 extends DummyAbstractClass {
-
- public void test() {
- }
-
-}
diff --git a/util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/dummy/DummyClass2.java b/util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/dummy/DummyClass2.java
deleted file mode 100644
index e6fe8464ce..0000000000
--- a/util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/dummy/DummyClass2.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gitplex.commons.util.findsubclassesexploded.dummy;
-
-import com.gitplex.commons.util.findsubclassesexploded.DummyAbstractClass;
-
-public class DummyClass2 extends DummyAbstractClass {
-
- public void test() {
- }
-
-}
diff --git a/util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/dummy/DummyClass3.java b/util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/dummy/DummyClass3.java
deleted file mode 100644
index 1604c0980c..0000000000
--- a/util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/dummy/DummyClass3.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.gitplex.commons.util.findsubclassesexploded.dummy;
-
-import com.gitplex.commons.util.findsubclassesexploded.DummyInterface;
-
-public class DummyClass3 implements DummyInterface {
-
- public void test() {
-
- }
-
-}
diff --git a/util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/dummy/DummyClass4.java b/util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/dummy/DummyClass4.java
deleted file mode 100644
index 01498f5f20..0000000000
--- a/util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/dummy/DummyClass4.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.gitplex.commons.util.findsubclassesexploded.dummy;
-
-public class DummyClass4 {
-
- public void test() {
-
- }
-
-}
diff --git a/util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/dummy2/DummyClass5.java b/util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/dummy2/DummyClass5.java
deleted file mode 100644
index 63ec979e87..0000000000
--- a/util/src/test/java/com/gitplex/commons/util/findsubclassesexploded/dummy2/DummyClass5.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gitplex.commons.util.findsubclassesexploded.dummy2;
-
-import com.gitplex.commons.util.findsubclassesexploded.DummyAbstractClass;
-
-public class DummyClass5 extends DummyAbstractClass {
-
- public void test() {
- }
-
-}
diff --git a/validation/pom.xml b/validation/pom.xml
deleted file mode 100644
index a6a3ac45e6..0000000000
--- a/validation/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>server-validation</artifactId>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>server-parent</artifactId>
- <version>1.0-EAP-build26</version>
- <relativePath>../parent</relativePath>
- </parent>
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <!-- Uncomment below if you'd like to publish an archetype based on your plugin -->
- <!--plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- </plugin-->
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-hibernate</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- </dependencies>
- <properties>
- <moduleClass>com.gitplex.commons.validation.ValidationModule</moduleClass>
- </properties>
-</project>
\ No newline at end of file
diff --git a/validation/src/main/java/com/gitplex/commons/validation/DummyValidationConfigurator.java b/validation/src/main/java/com/gitplex/commons/validation/DummyValidationConfigurator.java
deleted file mode 100644
index 930d0fdac1..0000000000
--- a/validation/src/main/java/com/gitplex/commons/validation/DummyValidationConfigurator.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.gitplex.commons.validation;
-
-import javax.validation.Configuration;
-
-public class DummyValidationConfigurator implements ValidationConfigurator {
-
- @Override
- public void configure(Configuration<?> configuration) {
-
- }
-
-}
diff --git a/validation/src/main/java/com/gitplex/commons/validation/ValidationConfigurator.java b/validation/src/main/java/com/gitplex/commons/validation/ValidationConfigurator.java
deleted file mode 100644
index 8f0862043c..0000000000
--- a/validation/src/main/java/com/gitplex/commons/validation/ValidationConfigurator.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.gitplex.commons.validation;
-
-import javax.validation.Configuration;
-
-public interface ValidationConfigurator {
- void configure(Configuration<?> configuration);
-}
diff --git a/validation/src/main/java/com/gitplex/commons/validation/ValidationModule.java b/validation/src/main/java/com/gitplex/commons/validation/ValidationModule.java
deleted file mode 100644
index d63e83c06f..0000000000
--- a/validation/src/main/java/com/gitplex/commons/validation/ValidationModule.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.gitplex.commons.validation;
-
-import javax.inject.Singleton;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-
-import com.gitplex.calla.loader.AbstractPluginModule;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class ValidationModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- bind(ValidatorFactory.class).toProvider(ValidatorFactoryProvider.class).in(Singleton.class);
- bind(Validator.class).toProvider(ValidatorProvider.class).in(Singleton.class);
-
- contribute(ValidationConfigurator.class, DummyValidationConfigurator.class);
- }
-
-}
diff --git a/validation/src/main/java/com/gitplex/commons/validation/ValidatorFactoryProvider.java b/validation/src/main/java/com/gitplex/commons/validation/ValidatorFactoryProvider.java
deleted file mode 100644
index 42e4714239..0000000000
--- a/validation/src/main/java/com/gitplex/commons/validation/ValidatorFactoryProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.gitplex.commons.validation;
-
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.validation.Configuration;
-import javax.validation.Validation;
-import javax.validation.ValidatorFactory;
-
-public class ValidatorFactoryProvider implements Provider<ValidatorFactory> {
-
- private final Set<ValidationConfigurator> configurators;
-
- @Inject
- public ValidatorFactoryProvider(Set<ValidationConfigurator> configurators) {
- this.configurators = configurators;
- }
-
- @Override
- public ValidatorFactory get() {
- Configuration<?> configuration = Validation.byDefaultProvider().configure();
- for (ValidationConfigurator configurator: configurators)
- configurator.configure(configuration);
- return configuration.buildValidatorFactory();
- }
-
-}
diff --git a/validation/src/main/resources/META-INF/maven/archetype-metadata.xml b/validation/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 904fb7a4bb..0000000000
--- a/validation/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archetype-descriptor name="archetype.plugin">
- <fileSets>
- <fileSet filtered="true" packaged="true">
- <directory>src/main/java</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/main/resources</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/test/java</directory>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory>src/test/resources</directory>
- </fileSet>
- </fileSets>
-</archetype-descriptor>
\ No newline at end of file
diff --git a/validation/src/main/resources/archetype-resource/pom.xml b/validation/src/main/resources/archetype-resource/pom.xml
deleted file mode 100644
index 61659b0c40..0000000000
--- a/validation/src/main/resources/archetype-resource/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-#if (\${groupId} != "com.gitplex")
- <groupId>\${groupId}</groupId>
-#end
- <artifactId>\${artifactId}</artifactId>
- <version>\${version}</version>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>parent.general</artifactId>
- <version>1.0.0</version>
- </parent>
-
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <repositories>
- <repository>
- <id>pmeaseRepo</id>
- <name>PMEase Repository</name>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- <url>http://artifact.pmease.com/</url>
- </repository>
- </repositories>
-
- <properties>
- <moduleClass>\${package}.PluginModule</moduleClass>
- </properties>
-
-</project>
diff --git a/validation/src/main/resources/archetype-resource/src/main/java/Plugin.java b/validation/src/main/resources/archetype-resource/src/main/java/Plugin.java
deleted file mode 100644
index 5ca2f34b53..0000000000
--- a/validation/src/main/resources/archetype-resource/src/main/java/Plugin.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package ${package};
-
-import java.util.Collection;
-import com.gitplex.calla.loader.AbstractPlugin;
-
-public class Plugin extends AbstractPlugin {
-
- @Override
- public Collection<?> getExtensions() {
- return null;
- }
-
-}
diff --git a/validation/src/main/resources/archetype-resource/src/main/java/PluginModule.java b/validation/src/main/resources/archetype-resource/src/main/java/PluginModule.java
deleted file mode 100644
index 0dbd7c4086..0000000000
--- a/validation/src/main/resources/archetype-resource/src/main/java/PluginModule.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package ${package};
-
-import com.gitplex.calla.loader.AbstractPlugin;
-import com.gitplex.calla.loader.AbstractPluginModule;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class PluginModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- // put your guice bindings here
- }
-
- @Override
- protected Class<? extends AbstractPlugin> getPluginClass() {
- return Plugin.class;
- }
-
-}
diff --git a/web/pom.xml b/web/pom.xml
index f5ad759bbc..d0b8ee26ac 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -6,7 +6,6 @@
<groupId>com.gitplex</groupId>
<artifactId>server-parent</artifactId>
<version>1.0-EAP-build26</version>
- <relativePath>../parent</relativePath>
</parent>
<build>
<plugins>
@@ -28,6 +27,62 @@
</build>
<dependencies>
<dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ <version>${wicketVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ <version>${wicketVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-request</artifactId>
+ <version>${wicketVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <version>${wicketVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-devutils</artifactId>
+ <version>${wicketVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-native-websocket-core</artifactId>
+ <version>${wicketVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>font-awesome</artifactId>
+ <version>4.5.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.webjars</groupId>
+ <artifactId>bootstrap</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>de.agilecoders.wicket</groupId>
+ <artifactId>wicket-bootstrap-core</artifactId>
+ <version>${wicketBootstrapVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>de.agilecoders.wicket</groupId>
+ <artifactId>wicket-bootstrap-extensions</artifactId>
+ <version>${wicketBootstrapVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars.npm</groupId>
+ <artifactId>codemirror</artifactId>
+ <version>5.21.0</version>
+ </dependency>
+ <dependency>
<groupId>com.gitplex</groupId>
<artifactId>server-core</artifactId>
<version>1.0-EAP-build26</version>
@@ -63,10 +118,15 @@
<artifactId>server-search</artifactId>
<version>1.0-EAP-build26</version>
</dependency>
+ <dependency>
+ <groupId>com.gitplex</groupId>
+ <artifactId>codeassist</artifactId>
+ <version>1.0.0</version>
+ </dependency>
</dependencies>
<properties>
<moduleClass>com.gitplex.server.web.WebModule</moduleClass>
- <tika.version>1.4</tika.version>
- <wikitext.version>2.0.0</wikitext.version>
+ <wicketVersion>7.3.0</wicketVersion>
+ <wicketBootstrapVersion>0.10.6</wicketBootstrapVersion>
</properties>
</project>
\ No newline at end of file
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/DefaultWicketFilter.java b/web/src/main/java/com/gitplex/server/web/DefaultWicketFilter.java
similarity index 69%
rename from wicket/src/main/java/com/gitplex/commons/wicket/DefaultWicketFilter.java
rename to web/src/main/java/com/gitplex/server/web/DefaultWicketFilter.java
index d31a1bfd00..70871356ff 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/DefaultWicketFilter.java
+++ b/web/src/main/java/com/gitplex/server/web/DefaultWicketFilter.java
@@ -1,24 +1,24 @@
-package com.gitplex.commons.wicket;
+package com.gitplex.server.web;
import org.apache.wicket.protocol.http.IWebApplicationFactory;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.WicketFilter;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
-import com.gitplex.commons.wicket.websocket.WebSocketFilter;
+import com.gitplex.server.web.websocket.WebSocketFilter;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@Singleton
public class DefaultWicketFilter extends WebSocketFilter {
- private final AbstractWicketConfig wicketConfig;
+ private final WebApplication application;
@Inject
- public DefaultWicketFilter(AbstractWicketConfig wicketConfig, WebSocketPolicy webSocketPolicy) {
+ public DefaultWicketFilter(WebApplication application, WebSocketPolicy webSocketPolicy) {
super(webSocketPolicy);
- this.wicketConfig = wicketConfig;
+ this.application = application;
setFilterPath("");
}
@@ -27,7 +27,7 @@ public class DefaultWicketFilter extends WebSocketFilter {
return new IWebApplicationFactory() {
public WebApplication createApplication(WicketFilter filter) {
- return wicketConfig;
+ return application;
}
public void destroy(WicketFilter filter) {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/DefaultWicketServlet.java b/web/src/main/java/com/gitplex/server/web/DefaultWicketServlet.java
similarity index 94%
rename from wicket/src/main/java/com/gitplex/commons/wicket/DefaultWicketServlet.java
rename to web/src/main/java/com/gitplex/server/web/DefaultWicketServlet.java
index 962f38d7d1..a0a6360325 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/DefaultWicketServlet.java
+++ b/web/src/main/java/com/gitplex/server/web/DefaultWicketServlet.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket;
+package com.gitplex.server.web;
import javax.inject.Inject;
diff --git a/web/src/main/java/com/gitplex/server/web/ExpectedExceptionContribution.java b/web/src/main/java/com/gitplex/server/web/ExpectedExceptionContribution.java
index 1ad7e413d5..0311d5cc41 100644
--- a/web/src/main/java/com/gitplex/server/web/ExpectedExceptionContribution.java
+++ b/web/src/main/java/com/gitplex/server/web/ExpectedExceptionContribution.java
@@ -2,7 +2,7 @@ package com.gitplex.server.web;
import java.util.Collection;
-import com.gitplex.calla.loader.ExtensionPoint;
+import com.gitplex.launcher.loader.ExtensionPoint;
@ExtensionPoint
public interface ExpectedExceptionContribution {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/ResourcePackScopeContribution.java b/web/src/main/java/com/gitplex/server/web/ResourcePackScopeContribution.java
similarity index 63%
rename from wicket/src/main/java/com/gitplex/commons/wicket/ResourcePackScopeContribution.java
rename to web/src/main/java/com/gitplex/server/web/ResourcePackScopeContribution.java
index cc54c2d845..54bf4f72ac 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/ResourcePackScopeContribution.java
+++ b/web/src/main/java/com/gitplex/server/web/ResourcePackScopeContribution.java
@@ -1,8 +1,8 @@
-package com.gitplex.commons.wicket;
+package com.gitplex.server.web;
import java.util.Collection;
-import com.gitplex.calla.loader.ExtensionPoint;
+import com.gitplex.launcher.loader.ExtensionPoint;
@ExtensionPoint
public interface ResourcePackScopeContribution {
diff --git a/web/src/main/java/com/gitplex/server/web/WebAccountNameReservation.java b/web/src/main/java/com/gitplex/server/web/WebAccountNameReservation.java
index 13e63bf605..07974204a0 100644
--- a/web/src/main/java/com/gitplex/server/web/WebAccountNameReservation.java
+++ b/web/src/main/java/com/gitplex/server/web/WebAccountNameReservation.java
@@ -6,36 +6,37 @@ import java.util.HashSet;
import java.util.Set;
import javax.inject.Inject;
+import javax.inject.Provider;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.core.request.mapper.MountedMapper;
import org.apache.wicket.core.request.mapper.ResourceMapper;
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.mapper.ICompoundRequestMapper;
+import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletMapping;
+import com.gitplex.server.util.ReflectionUtils;
+import com.gitplex.server.util.validation.AccountNameReservation;
import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
-import com.gitplex.commons.jetty.JettyPlugin;
-import com.gitplex.commons.util.ReflectionUtils;
-import com.gitplex.server.core.util.validation.AccountNameReservation;
public class WebAccountNameReservation implements AccountNameReservation {
- private final JettyPlugin jettyPlugin;
+ private final Provider<ServletContextHandler> servletContextHandlerProvider;
private final WicketConfig webApp;
@Inject
- public WebAccountNameReservation(JettyPlugin jettyPlugin, WicketConfig webApp) {
- this.jettyPlugin = jettyPlugin;
+ public WebAccountNameReservation(Provider<ServletContextHandler> servletContextHandlerProvider, WicketConfig webApp) {
+ this.servletContextHandlerProvider = servletContextHandlerProvider;
this.webApp = webApp;
}
@Override
public Set<String> getReserved() {
Set<String> reserved = new HashSet<String>();
- for (ServletMapping mapping: jettyPlugin.getContextHandler().getServletHandler().getServletMappings()) {
+ for (ServletMapping mapping: servletContextHandlerProvider.get().getServletHandler().getServletMappings()) {
for (String pathSpec: mapping.getPathSpecs()) {
pathSpec = StringUtils.stripStart(pathSpec, "/");
pathSpec = StringUtils.substringBefore(pathSpec, "/");
diff --git a/web/src/main/java/com/gitplex/server/web/Constants.java b/web/src/main/java/com/gitplex/server/web/WebConstants.java
similarity index 96%
rename from web/src/main/java/com/gitplex/server/web/Constants.java
rename to web/src/main/java/com/gitplex/server/web/WebConstants.java
index 1caf71ac71..c03dfb725c 100644
--- a/web/src/main/java/com/gitplex/server/web/Constants.java
+++ b/web/src/main/java/com/gitplex/server/web/WebConstants.java
@@ -3,7 +3,7 @@ package com.gitplex.server.web;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
-public class Constants {
+public class WebConstants {
public static final String DATETIME_FORMAT = "yyyy-MM-dd HH:mm";
public static final DateTimeFormatter DATETIME_FORMATTER = DateTimeFormat.forPattern(DATETIME_FORMAT);
diff --git a/web/src/main/java/com/gitplex/server/web/WebDepotNameReservation.java b/web/src/main/java/com/gitplex/server/web/WebDepotNameReservation.java
index 7b30baeab0..cc0877c04f 100644
--- a/web/src/main/java/com/gitplex/server/web/WebDepotNameReservation.java
+++ b/web/src/main/java/com/gitplex/server/web/WebDepotNameReservation.java
@@ -2,7 +2,7 @@ package com.gitplex.server.web;
import java.util.Set;
-import com.gitplex.server.core.util.validation.DepotNameReservation;
+import com.gitplex.server.util.validation.DepotNameReservation;
import com.google.common.collect.Sets;
public class WebDepotNameReservation implements DepotNameReservation {
diff --git a/web/src/main/java/com/gitplex/server/web/WebModule.java b/web/src/main/java/com/gitplex/server/web/WebModule.java
index 9a7e58d7f8..2d5393ea9c 100644
--- a/web/src/main/java/com/gitplex/server/web/WebModule.java
+++ b/web/src/main/java/com/gitplex/server/web/WebModule.java
@@ -9,38 +9,44 @@ import org.apache.wicket.Application;
import org.apache.wicket.core.request.mapper.StalePageException;
import org.apache.wicket.protocol.http.PageExpiredException;
import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.protocol.http.WicketFilter;
+import org.apache.wicket.protocol.http.WicketServlet;
+import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.hibernate.ObjectNotFoundException;
import org.hibernate.StaleStateException;
import org.hibernate.exception.ConstraintViolationException;
import org.pegdown.Parser;
import org.pegdown.plugins.ToHtmlSerializerPlugin;
-import com.google.common.collect.Lists;
-import com.gitplex.commons.git.exception.GitException;
-import com.gitplex.commons.jetty.ServletConfigurator;
-import com.gitplex.calla.loader.AbstractPluginModule;
-import com.gitplex.commons.markdown.extensionpoint.HtmlTransformer;
-import com.gitplex.commons.markdown.extensionpoint.MarkdownExtension;
-import com.gitplex.commons.wicket.AbstractWicketConfig;
-import com.gitplex.commons.wicket.ResourcePackScopeContribution;
-import com.gitplex.commons.wicket.editable.EditSupport;
-import com.gitplex.commons.wicket.websocket.DefaultWebSocketManager;
-import com.gitplex.commons.wicket.websocket.WebSocketManager;
-import com.gitplex.server.core.manager.UrlManager;
-import com.gitplex.server.core.util.validation.AccountNameReservation;
-import com.gitplex.server.core.util.validation.DepotNameReservation;
-import com.gitplex.server.core.util.validation.TeamNameReservation;
-import com.gitplex.server.web.avatar.AvatarManager;
-import com.gitplex.server.web.avatar.DefaultAvatarManager;
+import com.gitplex.launcher.loader.AbstractPlugin;
+import com.gitplex.launcher.loader.AbstractPluginModule;
+import com.gitplex.server.git.exception.GitException;
+import com.gitplex.server.manager.UrlManager;
+import com.gitplex.server.util.markdown.HtmlTransformer;
+import com.gitplex.server.util.markdown.MarkdownExtension;
+import com.gitplex.server.util.validation.AccountNameReservation;
+import com.gitplex.server.util.validation.DepotNameReservation;
+import com.gitplex.server.util.validation.TeamNameReservation;
+import com.gitplex.server.web.behavior.markdown.EmojiTransformer;
import com.gitplex.server.web.component.comment.MentionTransformer;
import com.gitplex.server.web.component.comment.PullRequestTransformer;
import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;
import com.gitplex.server.web.component.diff.DiffRenderer;
+import com.gitplex.server.web.editable.DefaultEditSupportRegistry;
+import com.gitplex.server.web.editable.EditSupport;
import com.gitplex.server.web.editable.EditSupportLocator;
+import com.gitplex.server.web.editable.EditSupportRegistry;
+import com.gitplex.server.web.util.avatar.AvatarManager;
+import com.gitplex.server.web.util.avatar.DefaultAvatarManager;
+import com.gitplex.server.web.util.commitmessagetransform.CommitMessageTransformer;
+import com.gitplex.server.web.util.commitmessagetransform.PatternCommitMessageTransformer;
import com.gitplex.server.web.websocket.CodeCommentChangeBroadcaster;
import com.gitplex.server.web.websocket.CommitIndexedBroadcaster;
+import com.gitplex.server.web.websocket.DefaultWebSocketManager;
import com.gitplex.server.web.websocket.PullRequestChangeBroadcaster;
import com.gitplex.server.web.websocket.TaskChangeBroadcaster;
+import com.gitplex.server.web.websocket.WebSocketManager;
+import com.google.common.collect.Lists;
import jersey.repackaged.com.google.common.collect.Sets;
@@ -54,14 +60,44 @@ public class WebModule extends AbstractPluginModule {
protected void configure() {
super.configure();
- // put your guice bindings here
- bind(AbstractWicketConfig.class).to(WicketConfig.class);
+ bind(WicketServlet.class).to(DefaultWicketServlet.class);
+ bind(WicketFilter.class).to(DefaultWicketFilter.class);
+ bind(WebSocketPolicy.class).toInstance(WebSocketPolicy.newServerPolicy());
+ bind(EditSupportRegistry.class).to(DefaultEditSupportRegistry.class);
+ bind(WebSocketManager.class).to(DefaultWebSocketManager.class);
+
+ contribute(CommitMessageTransformer.class, PatternCommitMessageTransformer.class);
+
+ contributeFromPackage(EditSupport.class, EditSupport.class);
+
+ contribute(MarkdownExtension.class, new MarkdownExtension() {
+
+ @Override
+ public Collection<Class<? extends Parser>> getInlineParsers() {
+ return null;
+ }
+
+ @Override
+ public Collection<HtmlTransformer> getHtmlTransformers() {
+ return Lists.newArrayList((HtmlTransformer)new EmojiTransformer());
+ }
+
+ @Override
+ public Collection<ToHtmlSerializerPlugin> getHtmlSerializers() {
+ return null;
+ }
+
+ @Override
+ public Collection<Class<? extends Parser>> getBlockParsers() {
+ return null;
+ }
+ });
+
bind(WebApplication.class).to(WicketConfig.class);
bind(Application.class).to(WicketConfig.class);
bind(AvatarManager.class).to(DefaultAvatarManager.class);
bind(WebSocketManager.class).to(DefaultWebSocketManager.class);
- contribute(ServletConfigurator.class, WebServletConfigurator.class);
contribute(AccountNameReservation.class, WebAccountNameReservation.class);
contribute(DepotNameReservation.class, WebDepotNameReservation.class);
contribute(TeamNameReservation.class, WebTeamNameReservation.class);
@@ -121,5 +157,10 @@ public class WebModule extends AbstractPluginModule {
bind(PullRequestChangeBroadcaster.class);
bind(TaskChangeBroadcaster.class);
}
+
+ @Override
+ protected Class<? extends AbstractPlugin> getPluginClass() {
+ return WebPlugin.class;
+ }
}
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/WicketPlugin.java b/web/src/main/java/com/gitplex/server/web/WebPlugin.java
similarity index 51%
rename from wicket/src/main/java/com/gitplex/commons/wicket/WicketPlugin.java
rename to web/src/main/java/com/gitplex/server/web/WebPlugin.java
index b31deb5ffe..428bbdf539 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/WicketPlugin.java
+++ b/web/src/main/java/com/gitplex/server/web/WebPlugin.java
@@ -1,16 +1,16 @@
-package com.gitplex.commons.wicket;
+package com.gitplex.server.web;
import javax.inject.Inject;
-import com.gitplex.calla.loader.AbstractPlugin;
-import com.gitplex.commons.wicket.websocket.WebSocketManager;
+import com.gitplex.launcher.loader.AbstractPlugin;
+import com.gitplex.server.web.websocket.WebSocketManager;
-public class WicketPlugin extends AbstractPlugin {
+public class WebPlugin extends AbstractPlugin {
private final WebSocketManager webSocketManager;
@Inject
- public WicketPlugin(WebSocketManager webSocketManager) {
+ public WebPlugin(WebSocketManager webSocketManager) {
this.webSocketManager = webSocketManager;
}
diff --git a/web/src/main/java/com/gitplex/server/web/WebServletConfigurator.java b/web/src/main/java/com/gitplex/server/web/WebServletConfigurator.java
deleted file mode 100644
index aa741aa755..0000000000
--- a/web/src/main/java/com/gitplex/server/web/WebServletConfigurator.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.gitplex.server.web;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
-
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-
-import com.gitplex.commons.jetty.ClasspathAssetServlet;
-import com.gitplex.commons.jetty.ServletConfigurator;
-import com.gitplex.commons.wicket.websocket.WebSocketManager;
-import com.gitplex.server.web.assets.Assets;
-
-@Singleton
-public class WebServletConfigurator implements ServletConfigurator {
-
- private final WebSocketManager webSocketManager;
-
- @Inject
- public WebServletConfigurator(WebSocketManager webSocketManager) {
- this.webSocketManager = webSocketManager;
- }
-
- @Override
- public void configure(ServletContextHandler context) {
- ServletHolder servletHolder = new ServletHolder(new ClasspathAssetServlet(Assets.class));
- context.addServlet(servletHolder, "/assets/*");
- context.addServlet(servletHolder, "/favicon.ico");
- context.getSessionHandler().addEventListener(new HttpSessionListener() {
-
- @Override
- public void sessionCreated(HttpSessionEvent se) {
- }
-
- @Override
- public void sessionDestroyed(HttpSessionEvent se) {
- webSocketManager.onDestroySession(se.getSession().getId());
- }
-
- });
- }
-
-}
diff --git a/web/src/main/java/com/gitplex/server/web/WebSession.java b/web/src/main/java/com/gitplex/server/web/WebSession.java
index a8cf2e7f1d..656784407d 100644
--- a/web/src/main/java/com/gitplex/server/web/WebSession.java
+++ b/web/src/main/java/com/gitplex/server/web/WebSession.java
@@ -8,7 +8,7 @@ import org.apache.shiro.subject.Subject;
import org.apache.wicket.protocol.http.WicketServlet;
import org.apache.wicket.request.Request;
-import com.gitplex.server.core.GitPlex;
+import com.gitplex.server.GitPlex;
public class WebSession extends org.apache.wicket.protocol.http.WebSession {
diff --git a/web/src/main/java/com/gitplex/server/web/WebTeamNameReservation.java b/web/src/main/java/com/gitplex/server/web/WebTeamNameReservation.java
index 7a33dcc165..156a6d3caa 100644
--- a/web/src/main/java/com/gitplex/server/web/WebTeamNameReservation.java
+++ b/web/src/main/java/com/gitplex/server/web/WebTeamNameReservation.java
@@ -2,7 +2,7 @@ package com.gitplex.server.web;
import java.util.Set;
-import com.gitplex.server.core.util.validation.TeamNameReservation;
+import com.gitplex.server.util.validation.TeamNameReservation;
import com.google.common.collect.Sets;
public class WebTeamNameReservation implements TeamNameReservation {
diff --git a/web/src/main/java/com/gitplex/server/web/WicketConfig.java b/web/src/main/java/com/gitplex/server/web/WicketConfig.java
index 1b10bc66d3..03294a06a5 100644
--- a/web/src/main/java/com/gitplex/server/web/WicketConfig.java
+++ b/web/src/main/java/com/gitplex/server/web/WicketConfig.java
@@ -1,5 +1,9 @@
package com.gitplex.server.web;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.inject.Inject;
@@ -7,31 +11,181 @@ import javax.inject.Singleton;
import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.Application;
+import org.apache.wicket.Component;
+import org.apache.wicket.DefaultExceptionMapper;
import org.apache.wicket.Page;
+import org.apache.wicket.RuntimeConfigurationType;
import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.AjaxRequestTarget.IJavaScriptResponse;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.application.IComponentInstantiationListener;
+import org.apache.wicket.core.request.handler.PageProvider;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
+import org.apache.wicket.core.request.mapper.HomePageMapper;
+import org.apache.wicket.markup.html.pages.AbstractErrorPage;
+import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
+import org.apache.wicket.protocol.ws.WebSocketSettings;
+import org.apache.wicket.protocol.ws.api.IWebSocketConnection;
+import org.apache.wicket.protocol.ws.api.WebSocketResponse;
+import org.apache.wicket.request.IExceptionMapper;
+import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Response;
+import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebRequest;
+import org.apache.wicket.request.http.WebResponse;
+import org.apache.wicket.request.mapper.info.PageComponentInfo;
import org.apache.wicket.request.resource.caching.FilenameWithVersionResourceCachingStrategy;
import org.apache.wicket.request.resource.caching.version.LastModifiedResourceVersion;
+import org.apache.wicket.util.IProvider;
-import com.gitplex.commons.util.ExceptionUtils;
-import com.gitplex.commons.wicket.AbstractWicketConfig;
-import com.gitplex.server.web.mapper.UrlMapper;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.launcher.bootstrap.Bootstrap;
+import com.gitplex.server.util.ExceptionUtils;
+import com.gitplex.server.web.page.CommonPage;
import com.gitplex.server.web.page.error.BaseErrorPage;
import com.gitplex.server.web.page.error.ExpectedExceptionPage;
import com.gitplex.server.web.page.error.UnexpectedExceptionPage;
import com.gitplex.server.web.page.home.DashboardPage;
+import com.gitplex.server.web.util.mapper.UrlMapper;
+import com.gitplex.server.web.util.resourcebundle.PackageResourceBundler;
+import com.gitplex.server.web.websocket.WebSocketManager;
+
+import de.agilecoders.wicket.core.settings.BootstrapSettings;
@Singleton
-public class WicketConfig extends AbstractWicketConfig {
+public class WicketConfig extends WebApplication {
private final Set<ExpectedExceptionContribution> expectedExceptionContributions;
+ @Override
+ public RuntimeConfigurationType getConfigurationType() {
+ if (Bootstrap.sandboxMode && !Bootstrap.prodMode)
+ return RuntimeConfigurationType.DEVELOPMENT;
+ else
+ return RuntimeConfigurationType.DEPLOYMENT;
+ }
+
+ @Override
+ protected void init() {
+ super.init();
+
+ getMarkupSettings().setDefaultMarkupEncoding("UTF-8");
+ getMarkupSettings().setStripComments(true);
+ getMarkupSettings().setStripWicketTags(true);
+
+ getStoreSettings().setFileStoreFolder(Bootstrap.getTempDir());
+
+ BootstrapSettings bootstrapSettings = new BootstrapSettings();
+ bootstrapSettings.setAutoAppendResources(false);
+ de.agilecoders.wicket.core.Bootstrap.install(this, bootstrapSettings);
+
+ getComponentInstantiationListeners().add(new IComponentInstantiationListener() {
+
+ @Override
+ public void onInstantiation(Component component) {
+ if ((component instanceof Page)
+ && !(component instanceof AbstractErrorPage)
+ && !(component instanceof CommonPage)) {
+ throw new RuntimeException("All page classes should extend from CommonPage.");
+ }
+ }
+ });
+
+ getAjaxRequestTargetListeners().add(new AjaxRequestTarget.IListener() {
+
+ @Override
+ public void onBeforeRespond(Map<String, Component> map, AjaxRequestTarget target) {
+ CommonPage page = (CommonPage) target.getPage();
+ if (page.getSessionFeedback().anyMessage())
+ target.add(page.getSessionFeedback());
+
+ for (Component component: map.values()) {
+ target.appendJavaScript((String.format("$(document).trigger('elementReplaced', '%s');", component.getMarkupId())));
+ }
+ }
+
+ @Override
+ public void onAfterRespond(Map<String, Component> map, IJavaScriptResponse response) {
+ }
+
+ @Override
+ public void updateAjaxAttributes(AbstractDefaultAjaxBehavior behavior, AjaxRequestAttributes attributes) {
+ }
+
+ });
+
+ WebSocketSettings.Holder.set(this, new WebSocketSettings() {
+
+ @Override
+ public WebResponse newWebSocketResponse(IWebSocketConnection connection) {
+ return new WebSocketResponse(connection) {
+
+ @Override
+ public void sendError(int sc, String msg) {
+ try {
+ connection.sendMessage(WebSocketManager.ERROR_MESSAGE);
+ } catch (IOException e) {
+ }
+ }
+
+ };
+ }
+
+ });
+
+ mount(new HomePageMapper(getHomePage()) {
+
+ @Override
+ protected void encodePageComponentInfo(Url url, PageComponentInfo info) {
+ if (info.getComponentInfo() != null)
+ super.encodePageComponentInfo(url, info);
+ }
+
+ });
+
+ if (getConfigurationType() == RuntimeConfigurationType.DEPLOYMENT) {
+ List<Class<?>> resourcePackScopes = new ArrayList<>();
+ for (ResourcePackScopeContribution contribution: AppLoader.getExtensions(ResourcePackScopeContribution.class)) {
+ resourcePackScopes.addAll(contribution.getResourcePackScopes());
+ }
+ new PackageResourceBundler(WebModule.class, resourcePackScopes.toArray(new Class<?>[resourcePackScopes.size()])).install(this);
+ }
+
+ getResourceSettings().setCachingStrategy(new FilenameWithVersionResourceCachingStrategy(new LastModifiedResourceVersion()));
+
+ mount(new UrlMapper(this));
+ }
+
+ @Override
+ public final IProvider<IExceptionMapper> getExceptionMapperProvider() {
+ return new IProvider<IExceptionMapper>() {
+
+ @Override
+ public IExceptionMapper get() {
+ return new DefaultExceptionMapper() {
+
+ @Override
+ protected IRequestHandler mapExpectedExceptions(Exception e, Application application) {
+ Page errorPage = mapExceptions(e);
+ if (errorPage != null) {
+ return createPageRequestHandler(new PageProvider(errorPage));
+ } else {
+ return super.mapExpectedExceptions(e, application);
+ }
+ }
+
+ };
+ }
+
+ };
+ }
+
@Inject
public WicketConfig(Set<ExpectedExceptionContribution> expectedExceptionContributions) {
this.expectedExceptionContributions = expectedExceptionContributions;
@@ -75,20 +229,10 @@ public class WicketConfig extends AbstractWicketConfig {
};
}
- @Override
- protected void init() {
- super.init();
-
- getResourceSettings().setCachingStrategy(new FilenameWithVersionResourceCachingStrategy(new LastModifiedResourceVersion()));
-
- mount(new UrlMapper(this));
- }
-
public Iterable<IRequestMapper> getRequestMappers() {
return getRootRequestMapperAsCompound();
}
- @Override
protected Page mapExceptions(Exception e) {
for (ExpectedExceptionContribution contribution: expectedExceptionContributions) {
for (Class<? extends Exception> expectedExceptionClass: contribution.getExpectedExceptionClasses()) {
diff --git a/web/src/main/java/com/gitplex/server/web/WicketUrlManager.java b/web/src/main/java/com/gitplex/server/web/WicketUrlManager.java
index f74cf5851c..2e5085750c 100644
--- a/web/src/main/java/com/gitplex/server/web/WicketUrlManager.java
+++ b/web/src/main/java/com/gitplex/server/web/WicketUrlManager.java
@@ -3,15 +3,15 @@ package com.gitplex.server.web;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestComment;
-import com.gitplex.server.core.entity.PullRequestStatusChange;
-import com.gitplex.server.core.entity.support.CodeCommentActivity;
-import com.gitplex.server.core.manager.ConfigManager;
-import com.gitplex.server.core.manager.UrlManager;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestComment;
+import com.gitplex.server.entity.PullRequestStatusChange;
+import com.gitplex.server.entity.support.CodeCommentActivity;
+import com.gitplex.server.manager.ConfigManager;
+import com.gitplex.server.manager.UrlManager;
@Singleton
public class WicketUrlManager implements UrlManager {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/align/AlignResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/align/AlignResourceReference.java
similarity index 84%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/align/AlignResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/align/AlignResourceReference.java
index 4ae9ee5df5..56fb8f1287 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/align/AlignResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/align/AlignResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.align;
+package com.gitplex.server.web.assets.align;
import java.util.ArrayList;
import java.util.List;
@@ -8,7 +8,7 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
-import com.gitplex.commons.wicket.assets.textareacaretposition.TextareaCaretPositionResourceReference;
+import com.gitplex.server.web.assets.textareacaretposition.TextareaCaretPositionResourceReference;
public class AlignResourceReference extends JavaScriptResourceReference {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/align/jquery.align.js b/web/src/main/java/com/gitplex/server/web/assets/align/jquery.align.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/align/jquery.align.js
rename to web/src/main/java/com/gitplex/server/web/assets/align/jquery.align.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/areyousure/AreYouSureResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/areyousure/AreYouSureResourceReference.java
similarity index 93%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/areyousure/AreYouSureResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/areyousure/AreYouSureResourceReference.java
index 66d9b8a547..5a4797af99 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/areyousure/AreYouSureResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/areyousure/AreYouSureResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.areyousure;
+package com.gitplex.server.web.assets.areyousure;
import java.util.ArrayList;
import java.util.List;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/areyousure/jquery.are-you-sure.patched.js b/web/src/main/java/com/gitplex/server/web/assets/areyousure/jquery.are-you-sure.patched.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/areyousure/jquery.are-you-sure.patched.js
rename to web/src/main/java/com/gitplex/server/web/assets/areyousure/jquery.are-you-sure.patched.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/atwho/AtWhoResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/atwho/AtWhoResourceReference.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/atwho/AtWhoResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/atwho/AtWhoResourceReference.java
index 32cf7bd708..d83e3e3c2a 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/atwho/AtWhoResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/atwho/AtWhoResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.atwho;
+package com.gitplex.server.web.assets.atwho;
import java.util.ArrayList;
import java.util.List;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/atwho/jquery.atwho-caret.js b/web/src/main/java/com/gitplex/server/web/assets/atwho/jquery.atwho-caret.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/atwho/jquery.atwho-caret.js
rename to web/src/main/java/com/gitplex/server/web/assets/atwho/jquery.atwho-caret.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/atwho/jquery.atwho.css b/web/src/main/java/com/gitplex/server/web/assets/atwho/jquery.atwho.css
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/atwho/jquery.atwho.css
rename to web/src/main/java/com/gitplex/server/web/assets/atwho/jquery.atwho.css
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/atwho/jquery.atwho.js b/web/src/main/java/com/gitplex/server/web/assets/atwho/jquery.atwho.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/atwho/jquery.atwho.js
rename to web/src/main/java/com/gitplex/server/web/assets/atwho/jquery.atwho.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/autosize/AutoSizeResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/autosize/AutoSizeResourceReference.java
similarity index 93%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/autosize/AutoSizeResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/autosize/AutoSizeResourceReference.java
index 7e10d0373d..93ae8c52c1 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/autosize/AutoSizeResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/autosize/AutoSizeResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.autosize;
+package com.gitplex.server.web.assets.autosize;
import java.util.ArrayList;
import java.util.List;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/autosize/autosize-patched.js b/web/src/main/java/com/gitplex/server/web/assets/autosize/autosize-patched.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/autosize/autosize-patched.js
rename to web/src/main/java/com/gitplex/server/web/assets/autosize/autosize-patched.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/caret/CaretResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/caret/CaretResourceReference.java
similarity index 93%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/caret/CaretResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/caret/CaretResourceReference.java
index a1f5a8ab08..deff74fdb6 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/caret/CaretResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/caret/CaretResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.caret;
+package com.gitplex.server.web.assets.caret;
import java.util.ArrayList;
import java.util.List;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/caret/jquery.caret-1.5.2.js b/web/src/main/java/com/gitplex/server/web/assets/caret/jquery.caret-1.5.2.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/caret/jquery.caret-1.5.2.js
rename to web/src/main/java/com/gitplex/server/web/assets/caret/jquery.caret-1.5.2.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/clipboard/ClipboardResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/clipboard/ClipboardResourceReference.java
similarity index 85%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/clipboard/ClipboardResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/clipboard/ClipboardResourceReference.java
index 1c1ea9be0d..745b0e6156 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/clipboard/ClipboardResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/clipboard/ClipboardResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.clipboard;
+package com.gitplex.server.web.assets.clipboard;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/clipboard/clipboard.min.js b/web/src/main/java/com/gitplex/server/web/assets/clipboard/clipboard.min.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/clipboard/clipboard.min.js
rename to web/src/main/java/com/gitplex/server/web/assets/clipboard/clipboard.min.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/CodeMirrorResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/codemirror/CodeMirrorResourceReference.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/CodeMirrorResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/codemirror/CodeMirrorResourceReference.java
index c9a4bb2df7..0b36af5299 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/CodeMirrorResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/codemirror/CodeMirrorResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.codemirror;
+package com.gitplex.server.web.assets.codemirror;
import java.util.List;
@@ -6,9 +6,9 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import com.gitplex.commons.wicket.page.CommonDependentCssResourceReference;
-import com.gitplex.commons.wicket.page.CommonDependentResourceReference;
-import com.gitplex.commons.wicket.resourcebundle.ResourceBundle;
+import com.gitplex.server.web.page.CommonDependentCssResourceReference;
+import com.gitplex.server.web.page.CommonDependentResourceReference;
+import com.gitplex.server.web.util.resourcebundle.ResourceBundle;
import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;
import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/ModeUrlResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/codemirror/ModeUrlResourceReference.java
similarity index 93%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/ModeUrlResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/codemirror/ModeUrlResourceReference.java
index 29b466dde2..81e1b4ea3c 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/ModeUrlResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/codemirror/ModeUrlResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.codemirror;
+package com.gitplex.server.web.assets.codemirror;
import java.util.List;
@@ -8,7 +8,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
-import com.gitplex.commons.util.StringUtils;
+import com.gitplex.server.util.StringUtils;
import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/annotatescrollbar2.js b/web/src/main/java/com/gitplex/server/web/assets/codemirror/annotatescrollbar2.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/annotatescrollbar2.js
rename to web/src/main/java/com/gitplex/server/web/assets/codemirror/annotatescrollbar2.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/blank.js b/web/src/main/java/com/gitplex/server/web/assets/codemirror/blank.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/blank.js
rename to web/src/main/java/com/gitplex/server/web/assets/codemirror/blank.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/codemirror.css b/web/src/main/java/com/gitplex/server/web/assets/codemirror/codemirror.css
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/codemirror.css
rename to web/src/main/java/com/gitplex/server/web/assets/codemirror/codemirror.css
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/codemirror.js b/web/src/main/java/com/gitplex/server/web/assets/codemirror/codemirror.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/codemirror.js
rename to web/src/main/java/com/gitplex/server/web/assets/codemirror/codemirror.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/gotoline.js b/web/src/main/java/com/gitplex/server/web/assets/codemirror/gotoline.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/gotoline.js
rename to web/src/main/java/com/gitplex/server/web/assets/codemirror/gotoline.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/highlight.css b/web/src/main/java/com/gitplex/server/web/assets/codemirror/highlight.css
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/highlight.css
rename to web/src/main/java/com/gitplex/server/web/assets/codemirror/highlight.css
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/highlight.js b/web/src/main/java/com/gitplex/server/web/assets/codemirror/highlight.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/highlight.js
rename to web/src/main/java/com/gitplex/server/web/assets/codemirror/highlight.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/identifier-highlighter.js b/web/src/main/java/com/gitplex/server/web/assets/codemirror/identifier-highlighter.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/identifier-highlighter.js
rename to web/src/main/java/com/gitplex/server/web/assets/codemirror/identifier-highlighter.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/matchesonscrollbar2.js b/web/src/main/java/com/gitplex/server/web/assets/codemirror/matchesonscrollbar2.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/matchesonscrollbar2.js
rename to web/src/main/java/com/gitplex/server/web/assets/codemirror/matchesonscrollbar2.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/simplescrollbars.js b/web/src/main/java/com/gitplex/server/web/assets/codemirror/simplescrollbars.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/codemirror/simplescrollbars.js
rename to web/src/main/java/com/gitplex/server/web/assets/codemirror/simplescrollbars.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/cookies/CookiesResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/cookies/CookiesResourceReference.java
similarity index 85%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/cookies/CookiesResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/cookies/CookiesResourceReference.java
index 4ad0af96ba..2ed0170aa6 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/cookies/CookiesResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/cookies/CookiesResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.cookies;
+package com.gitplex.server.web.assets.cookies;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/cookies/cookies.min.js b/web/src/main/java/com/gitplex/server/web/assets/cookies/cookies.min.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/cookies/cookies.min.js
rename to web/src/main/java/com/gitplex/server/web/assets/cookies/cookies.min.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/diffmatchpatch/DiffMatchPatchResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/diffmatchpatch/DiffMatchPatchResourceReference.java
similarity index 85%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/diffmatchpatch/DiffMatchPatchResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/diffmatchpatch/DiffMatchPatchResourceReference.java
index 9b4b501016..5d1df7533f 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/diffmatchpatch/DiffMatchPatchResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/diffmatchpatch/DiffMatchPatchResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.diffmatchpatch;
+package com.gitplex.server.web.assets.diffmatchpatch;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/diffmatchpatch/diff_match_patch.js b/web/src/main/java/com/gitplex/server/web/assets/diffmatchpatch/diff_match_patch.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/diffmatchpatch/diff_match_patch.js
rename to web/src/main/java/com/gitplex/server/web/assets/diffmatchpatch/diff_match_patch.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/doneevents/DoneEventsResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/doneevents/DoneEventsResourceReference.java
similarity index 93%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/doneevents/DoneEventsResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/doneevents/DoneEventsResourceReference.java
index 4d1e6b5e77..33d52b7825 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/doneevents/DoneEventsResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/doneevents/DoneEventsResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.doneevents;
+package com.gitplex.server.web.assets.doneevents;
import java.util.ArrayList;
import java.util.List;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/doneevents/jquery.doneevents.js b/web/src/main/java/com/gitplex/server/web/assets/doneevents/jquery.doneevents.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/doneevents/jquery.doneevents.js
rename to web/src/main/java/com/gitplex/server/web/assets/doneevents/jquery.doneevents.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/hotkeys/HotkeysResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/hotkeys/HotkeysResourceReference.java
similarity index 93%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/hotkeys/HotkeysResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/hotkeys/HotkeysResourceReference.java
index 8ae569cb16..d52b6fe8ae 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/hotkeys/HotkeysResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/hotkeys/HotkeysResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.hotkeys;
+package com.gitplex.server.web.assets.hotkeys;
import java.util.ArrayList;
import java.util.List;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/hotkeys/jquery.hotkeys.js b/web/src/main/java/com/gitplex/server/web/assets/hotkeys/jquery.hotkeys.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/hotkeys/jquery.hotkeys.js
rename to web/src/main/java/com/gitplex/server/web/assets/hotkeys/jquery.hotkeys.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/hover/HoverResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/hover/HoverResourceReference.java
similarity index 93%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/hover/HoverResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/hover/HoverResourceReference.java
index 33fa59363b..288174bd6b 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/hover/HoverResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/hover/HoverResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.hover;
+package com.gitplex.server.web.assets.hover;
import java.util.ArrayList;
import java.util.List;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/hover/jquery.hover.js b/web/src/main/java/com/gitplex/server/web/assets/hover/jquery.hover.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/hover/jquery.hover.js
rename to web/src/main/java/com/gitplex/server/web/assets/hover/jquery.hover.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/jqueryui/JQueryUIResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/jqueryui/JQueryUIResourceReference.java
similarity index 94%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/jqueryui/JQueryUIResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/jqueryui/JQueryUIResourceReference.java
index 23640c1f0a..c1612d3e6e 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/jqueryui/JQueryUIResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/jqueryui/JQueryUIResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.jqueryui;
+package com.gitplex.server.web.assets.jqueryui;
import java.util.ArrayList;
import java.util.List;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/jqueryui/jquery-ui.min.js b/web/src/main/java/com/gitplex/server/web/assets/jqueryui/jquery-ui.min.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/jqueryui/jquery-ui.min.js
rename to web/src/main/java/com/gitplex/server/web/assets/jqueryui/jquery-ui.min.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/mousewheel/MouseWheelResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/mousewheel/MouseWheelResourceReference.java
similarity index 93%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/mousewheel/MouseWheelResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/mousewheel/MouseWheelResourceReference.java
index 323eead7f3..133a37ab70 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/mousewheel/MouseWheelResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/mousewheel/MouseWheelResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.mousewheel;
+package com.gitplex.server.web.assets.mousewheel;
import java.util.ArrayList;
import java.util.List;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/mousewheel/jquery.mousewheel.js b/web/src/main/java/com/gitplex/server/web/assets/mousewheel/jquery.mousewheel.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/mousewheel/jquery.mousewheel.js
rename to web/src/main/java/com/gitplex/server/web/assets/mousewheel/jquery.mousewheel.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/oneline/OnelineResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/oneline/OnelineResourceReference.java
similarity index 93%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/oneline/OnelineResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/oneline/OnelineResourceReference.java
index e1704ef253..3e4a159341 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/oneline/OnelineResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/oneline/OnelineResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.oneline;
+package com.gitplex.server.web.assets.oneline;
import java.util.ArrayList;
import java.util.List;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/oneline/jquery.oneline.js b/web/src/main/java/com/gitplex/server/web/assets/oneline/jquery.oneline.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/oneline/jquery.oneline.js
rename to web/src/main/java/com/gitplex/server/web/assets/oneline/jquery.oneline.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/scrollintoview/ScrollIntoViewResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/scrollintoview/ScrollIntoViewResourceReference.java
similarity index 93%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/scrollintoview/ScrollIntoViewResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/scrollintoview/ScrollIntoViewResourceReference.java
index 5769c08a3d..484415aacf 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/scrollintoview/ScrollIntoViewResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/scrollintoview/ScrollIntoViewResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.scrollintoview;
+package com.gitplex.server.web.assets.scrollintoview;
import java.util.ArrayList;
import java.util.List;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/scrollintoview/jquery.scrollintoview.js b/web/src/main/java/com/gitplex/server/web/assets/scrollintoview/jquery.scrollintoview.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/scrollintoview/jquery.scrollintoview.js
rename to web/src/main/java/com/gitplex/server/web/assets/scrollintoview/jquery.scrollintoview.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/selectionpopover/SelectionPopoverResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/selectionpopover/SelectionPopoverResourceReference.java
similarity index 94%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/selectionpopover/SelectionPopoverResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/selectionpopover/SelectionPopoverResourceReference.java
index 447f373edf..54548d5073 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/selectionpopover/SelectionPopoverResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/selectionpopover/SelectionPopoverResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.selectionpopover;
+package com.gitplex.server.web.assets.selectionpopover;
import java.util.ArrayList;
import java.util.List;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/selectionpopover/jquery.selectionpopover.css b/web/src/main/java/com/gitplex/server/web/assets/selectionpopover/jquery.selectionpopover.css
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/selectionpopover/jquery.selectionpopover.css
rename to web/src/main/java/com/gitplex/server/web/assets/selectionpopover/jquery.selectionpopover.css
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/selectionpopover/jquery.selectionpopover.js b/web/src/main/java/com/gitplex/server/web/assets/selectionpopover/jquery.selectionpopover.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/selectionpopover/jquery.selectionpopover.js
rename to web/src/main/java/com/gitplex/server/web/assets/selectionpopover/jquery.selectionpopover.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/snapsvg/SnapSvgResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/snapsvg/SnapSvgResourceReference.java
similarity index 85%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/snapsvg/SnapSvgResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/snapsvg/SnapSvgResourceReference.java
index efd2fac61c..1f45b9addf 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/snapsvg/SnapSvgResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/snapsvg/SnapSvgResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.snapsvg;
+package com.gitplex.server.web.assets.snapsvg;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/snapsvg/snap.svg-min.js b/web/src/main/java/com/gitplex/server/web/assets/snapsvg/snap.svg-min.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/snapsvg/snap.svg-min.js
rename to web/src/main/java/com/gitplex/server/web/assets/snapsvg/snap.svg-min.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/textareacaretposition/TextareaCaretPositionResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/textareacaretposition/TextareaCaretPositionResourceReference.java
similarity index 84%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/textareacaretposition/TextareaCaretPositionResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/textareacaretposition/TextareaCaretPositionResourceReference.java
index 06d9fad10f..2d9131531a 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/textareacaretposition/TextareaCaretPositionResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/textareacaretposition/TextareaCaretPositionResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.textareacaretposition;
+package com.gitplex.server.web.assets.textareacaretposition;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/textareacaretposition/textarea-caret-position.js b/web/src/main/java/com/gitplex/server/web/assets/textareacaretposition/textarea-caret-position.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/textareacaretposition/textarea-caret-position.js
rename to web/src/main/java/com/gitplex/server/web/assets/textareacaretposition/textarea-caret-position.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/uri/URI.js b/web/src/main/java/com/gitplex/server/web/assets/uri/URI.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/uri/URI.js
rename to web/src/main/java/com/gitplex/server/web/assets/uri/URI.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/assets/uri/URIResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/uri/URIResourceReference.java
similarity index 85%
rename from wicket/src/main/java/com/gitplex/commons/wicket/assets/uri/URIResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/uri/URIResourceReference.java
index 3cf9ff3d8c..93278d7d05 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/assets/uri/URIResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/uri/URIResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.assets.uri;
+package com.gitplex.server.web.assets.uri;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/AbstractPostAjaxBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/AbstractPostAjaxBehavior.java
similarity index 91%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/AbstractPostAjaxBehavior.java
rename to web/src/main/java/com/gitplex/server/web/behavior/AbstractPostAjaxBehavior.java
index 3eeeffc2f6..6961a8341b 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/AbstractPostAjaxBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/AbstractPostAjaxBehavior.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior;
+package com.gitplex.server.web.behavior;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/AutoHeightBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/AutoHeightBehavior.java
similarity index 94%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/AutoHeightBehavior.java
rename to web/src/main/java/com/gitplex/server/web/behavior/AutoHeightBehavior.java
index 2e68c0f24a..9705774c29 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/AutoHeightBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/AutoHeightBehavior.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior;
+package com.gitplex.server.web.behavior;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/CollapseBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/CollapseBehavior.java
similarity index 92%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/CollapseBehavior.java
rename to web/src/main/java/com/gitplex/server/web/behavior/CollapseBehavior.java
index ce261eb294..d06f06cde1 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/CollapseBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/CollapseBehavior.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior;
+package com.gitplex.server.web.behavior;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.AttributeAppender;
@@ -6,7 +6,7 @@ import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import com.gitplex.commons.wicket.component.AccordionPanel;
+import com.gitplex.server.web.component.AccordionPanel;
/**
* Add this behavior to a component to have it able to show/hide another component
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/DisableIfBlankBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/DisableIfBlankBehavior.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/DisableIfBlankBehavior.java
rename to web/src/main/java/com/gitplex/server/web/behavior/DisableIfBlankBehavior.java
index b74b922f5e..301ec750c8 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/DisableIfBlankBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/DisableIfBlankBehavior.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior;
+package com.gitplex.server.web.behavior;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/InputChangeBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/InputChangeBehavior.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/InputChangeBehavior.java
rename to web/src/main/java/com/gitplex/server/web/behavior/InputChangeBehavior.java
index 86f1a50763..c4ea54f91c 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/InputChangeBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/InputChangeBehavior.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior;
+package com.gitplex.server.web.behavior;
import java.util.Objects;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/OnTypingDoneBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/OnTypingDoneBehavior.java
similarity index 93%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/OnTypingDoneBehavior.java
rename to web/src/main/java/com/gitplex/server/web/behavior/OnTypingDoneBehavior.java
index 8ea21f87e4..f467b42ebd 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/OnTypingDoneBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/OnTypingDoneBehavior.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior;
+package com.gitplex.server.web.behavior;
import java.util.Objects;
@@ -10,7 +10,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.form.FormComponent;
-import com.gitplex.commons.wicket.assets.doneevents.DoneEventsResourceReference;
+import com.gitplex.server.web.assets.doneevents.DoneEventsResourceReference;
@SuppressWarnings("serial")
public abstract class OnTypingDoneBehavior extends AjaxFormComponentUpdatingBehavior{
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/RunTaskBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/RunTaskBehavior.java
similarity index 96%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/RunTaskBehavior.java
rename to web/src/main/java/com/gitplex/server/web/behavior/RunTaskBehavior.java
index 6624f57c30..9deb84f042 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/RunTaskBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/RunTaskBehavior.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior;
+package com.gitplex.server.web.behavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/TooltipBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/TooltipBehavior.java
similarity index 96%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/TooltipBehavior.java
rename to web/src/main/java/com/gitplex/server/web/behavior/TooltipBehavior.java
index 800bbe2a45..471617b239 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/TooltipBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/TooltipBehavior.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior;
+package com.gitplex.server.web.behavior;
import org.apache.wicket.Component;
import org.apache.wicket.markup.ComponentTag;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/ViewStateAwareBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/ViewStateAwareBehavior.java
similarity index 90%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/ViewStateAwareBehavior.java
rename to web/src/main/java/com/gitplex/server/web/behavior/ViewStateAwareBehavior.java
index beae76db3c..e4f9612b36 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/ViewStateAwareBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/ViewStateAwareBehavior.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior;
+package com.gitplex.server.web.behavior;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import com.gitplex.commons.wicket.assets.uri.URIResourceReference;
+import com.gitplex.server.web.assets.uri.URIResourceReference;
@SuppressWarnings("serial")
public class ViewStateAwareBehavior extends Behavior {
diff --git a/web/src/main/java/com/gitplex/server/web/behavior/blamemessage/BlameMessageBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/blamemessage/BlameMessageBehavior.java
index fd166a16c1..d4b02600ac 100644
--- a/web/src/main/java/com/gitplex/server/web/behavior/blamemessage/BlameMessageBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/blamemessage/BlameMessageBehavior.java
@@ -10,8 +10,8 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.eclipse.jgit.revwalk.RevCommit;
import org.unbescape.javascript.JavaScriptEscape;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
import com.gitplex.server.web.util.DateUtils;
public abstract class BlameMessageBehavior extends AbstractPostAjaxBehavior {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/clipboard/CopyClipboardBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/clipboard/CopyClipboardBehavior.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/clipboard/CopyClipboardBehavior.java
rename to web/src/main/java/com/gitplex/server/web/behavior/clipboard/CopyClipboardBehavior.java
index c179d8f0ce..999b78bc46 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/clipboard/CopyClipboardBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/clipboard/CopyClipboardBehavior.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior.clipboard;
+package com.gitplex.server.web.behavior.clipboard;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/clipboard/CopyClipboardResourceReference.java b/web/src/main/java/com/gitplex/server/web/behavior/clipboard/CopyClipboardResourceReference.java
similarity index 75%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/clipboard/CopyClipboardResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/behavior/clipboard/CopyClipboardResourceReference.java
index 49cc93ce18..2a84d77eda 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/clipboard/CopyClipboardResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/clipboard/CopyClipboardResourceReference.java
@@ -1,12 +1,12 @@
-package com.gitplex.commons.wicket.behavior.clipboard;
+package com.gitplex.server.web.behavior.clipboard;
import java.util.List;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import com.gitplex.commons.wicket.assets.clipboard.ClipboardResourceReference;
-import com.gitplex.commons.wicket.page.CommonDependentResourceReference;
+import com.gitplex.server.web.assets.clipboard.ClipboardResourceReference;
+import com.gitplex.server.web.page.CommonDependentResourceReference;
public class CopyClipboardResourceReference extends CommonDependentResourceReference {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/clipboard/copy-clipboard.js b/web/src/main/java/com/gitplex/server/web/behavior/clipboard/copy-clipboard.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/clipboard/copy-clipboard.js
rename to web/src/main/java/com/gitplex/server/web/behavior/clipboard/copy-clipboard.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/dragdrop/DragBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DragBehavior.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/dragdrop/DragBehavior.java
rename to web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DragBehavior.java
index 0ef39ab187..f803037092 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/dragdrop/DragBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DragBehavior.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior.dragdrop;
+package com.gitplex.server.web.behavior.dragdrop;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/dragdrop/DragDropCssResourceReference.java b/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DragDropCssResourceReference.java
similarity index 65%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/dragdrop/DragDropCssResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DragDropCssResourceReference.java
index f329cb7d0c..0665fedd1f 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/dragdrop/DragDropCssResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DragDropCssResourceReference.java
@@ -1,6 +1,6 @@
-package com.gitplex.commons.wicket.behavior.dragdrop;
+package com.gitplex.server.web.behavior.dragdrop;
-import com.gitplex.commons.wicket.page.CommonDependentCssResourceReference;
+import com.gitplex.server.web.page.CommonDependentCssResourceReference;
public class DragDropCssResourceReference extends CommonDependentCssResourceReference {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/dragdrop/DragDropResourceReference.java b/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DragDropResourceReference.java
similarity index 79%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/dragdrop/DragDropResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DragDropResourceReference.java
index 6469f7e7bc..367c3a08cd 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/dragdrop/DragDropResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DragDropResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior.dragdrop;
+package com.gitplex.server.web.behavior.dragdrop;
import java.util.List;
@@ -6,8 +6,8 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import com.gitplex.commons.wicket.assets.jqueryui.JQueryUIResourceReference;
-import com.gitplex.commons.wicket.page.CommonDependentResourceReference;
+import com.gitplex.server.web.assets.jqueryui.JQueryUIResourceReference;
+import com.gitplex.server.web.page.CommonDependentResourceReference;
public class DragDropResourceReference extends CommonDependentResourceReference {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/dragdrop/DropBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DropBehavior.java
similarity index 91%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/dragdrop/DropBehavior.java
rename to web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DropBehavior.java
index 6dfc269b4a..cfa8bbccd5 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/dragdrop/DropBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DropBehavior.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior.dragdrop;
+package com.gitplex.server.web.behavior.dragdrop;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
@@ -10,7 +10,7 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
@SuppressWarnings("serial")
public abstract class DropBehavior extends AbstractPostAjaxBehavior {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/dragdrop/dragdrop.css b/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/dragdrop.css
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/dragdrop/dragdrop.css
rename to web/src/main/java/com/gitplex/server/web/behavior/dragdrop/dragdrop.css
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/dragdrop/dragdrop.js b/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/dragdrop.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/dragdrop/dragdrop.js
rename to web/src/main/java/com/gitplex/server/web/behavior/dragdrop/dragdrop.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/dropdown/DropdownHover.java b/web/src/main/java/com/gitplex/server/web/behavior/dropdown/DropdownHover.java
similarity index 90%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/dropdown/DropdownHover.java
rename to web/src/main/java/com/gitplex/server/web/behavior/dropdown/DropdownHover.java
index f2ab1e0fe8..550caed429 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/dropdown/DropdownHover.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/dropdown/DropdownHover.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior.dropdown;
+package com.gitplex.server.web.behavior.dropdown;
import javax.annotation.Nullable;
@@ -9,10 +9,10 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.request.cycle.RequestCycle;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.gitplex.commons.wicket.component.floating.AlignPlacement;
-import com.gitplex.commons.wicket.component.floating.ComponentTarget;
-import com.gitplex.commons.wicket.component.floating.FloatingPanel;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.server.web.component.floating.AlignPlacement;
+import com.gitplex.server.web.component.floating.ComponentTarget;
+import com.gitplex.server.web.component.floating.FloatingPanel;
@SuppressWarnings("serial")
public abstract class DropdownHover extends AbstractPostAjaxBehavior {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/dropdown/DropdownHoverResourceReference.java b/web/src/main/java/com/gitplex/server/web/behavior/dropdown/DropdownHoverResourceReference.java
similarity index 67%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/dropdown/DropdownHoverResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/behavior/dropdown/DropdownHoverResourceReference.java
index 027b37fddb..6aabfd7db2 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/dropdown/DropdownHoverResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/dropdown/DropdownHoverResourceReference.java
@@ -1,6 +1,6 @@
-package com.gitplex.commons.wicket.behavior.dropdown;
+package com.gitplex.server.web.behavior.dropdown;
-import com.gitplex.commons.wicket.page.CommonDependentResourceReference;
+import com.gitplex.server.web.page.CommonDependentResourceReference;
public class DropdownHoverResourceReference extends CommonDependentResourceReference {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/dropdown/dropdown-hover.js b/web/src/main/java/com/gitplex/server/web/behavior/dropdown/dropdown-hover.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/dropdown/dropdown-hover.js
rename to web/src/main/java/com/gitplex/server/web/behavior/dropdown/dropdown-hover.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/infinitescroll/InfiniteScrollBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java
similarity index 93%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/infinitescroll/InfiniteScrollBehavior.java
rename to web/src/main/java/com/gitplex/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java
index 8de6801bf4..0811408613 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/infinitescroll/InfiniteScrollBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior.infinitescroll;
+package com.gitplex.server.web.behavior.infinitescroll;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
@@ -12,7 +12,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.PackageResourceReference;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
public abstract class InfiniteScrollBehavior extends AbstractPostAjaxBehavior {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/infinitescroll/InfiniteScrollResourceReference.java b/web/src/main/java/com/gitplex/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java
similarity index 73%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/infinitescroll/InfiniteScrollResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java
index 1d5fe929e2..68f50021b4 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/infinitescroll/InfiniteScrollResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java
@@ -1,12 +1,12 @@
-package com.gitplex.commons.wicket.behavior.infinitescroll;
+package com.gitplex.server.web.behavior.infinitescroll;
import java.util.List;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import com.gitplex.commons.wicket.assets.scrollintoview.ScrollIntoViewResourceReference;
-import com.gitplex.commons.wicket.page.CommonDependentResourceReference;
+import com.gitplex.server.web.assets.scrollintoview.ScrollIntoViewResourceReference;
+import com.gitplex.server.web.page.CommonDependentResourceReference;
public class InfiniteScrollResourceReference extends CommonDependentResourceReference {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/infinitescroll/ajax-indicator.gif b/web/src/main/java/com/gitplex/server/web/behavior/infinitescroll/ajax-indicator.gif
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/infinitescroll/ajax-indicator.gif
rename to web/src/main/java/com/gitplex/server/web/behavior/infinitescroll/ajax-indicator.gif
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/infinitescroll/infinite-scroll.js b/web/src/main/java/com/gitplex/server/web/behavior/infinitescroll/infinite-scroll.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/infinitescroll/infinite-scroll.js
rename to web/src/main/java/com/gitplex/server/web/behavior/infinitescroll/infinite-scroll.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/ANTLRAssistBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/inputassist/ANTLRAssistBehavior.java
similarity index 93%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/ANTLRAssistBehavior.java
rename to web/src/main/java/com/gitplex/server/web/behavior/inputassist/ANTLRAssistBehavior.java
index 65ca7f6519..67759eb423 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/ANTLRAssistBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/inputassist/ANTLRAssistBehavior.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior.inputassist;
+package com.gitplex.server.web.behavior.inputassist;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
@@ -20,15 +20,15 @@ import org.antlr.v4.runtime.Recognizer;
import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.TokenStream;
-import com.gitplex.commons.antlr.AntlrUtils;
-import com.gitplex.commons.antlr.codeassist.CodeAssist;
-import com.gitplex.commons.antlr.codeassist.InputCompletion;
-import com.gitplex.commons.antlr.codeassist.InputStatus;
-import com.gitplex.commons.antlr.codeassist.InputSuggestion;
-import com.gitplex.commons.antlr.codeassist.ParentedElement;
-import com.gitplex.commons.antlr.grammar.ElementSpec;
-import com.gitplex.commons.util.StringUtils;
+import com.gitplex.codeassist.AntlrUtils;
+import com.gitplex.codeassist.CodeAssist;
+import com.gitplex.codeassist.InputCompletion;
+import com.gitplex.codeassist.InputStatus;
+import com.gitplex.codeassist.InputSuggestion;
+import com.gitplex.codeassist.ParentedElement;
+import com.gitplex.codeassist.grammar.ElementSpec;
import com.gitplex.jsymbol.Range;
+import com.gitplex.server.util.StringUtils;
@SuppressWarnings("serial")
public abstract class ANTLRAssistBehavior extends InputAssistBehavior {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/AssistPanel.html b/web/src/main/java/com/gitplex/server/web/behavior/inputassist/AssistPanel.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/AssistPanel.html
rename to web/src/main/java/com/gitplex/server/web/behavior/inputassist/AssistPanel.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/AssistPanel.java b/web/src/main/java/com/gitplex/server/web/behavior/inputassist/AssistPanel.java
similarity index 94%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/AssistPanel.java
rename to web/src/main/java/com/gitplex/server/web/behavior/inputassist/AssistPanel.java
index 7bd288a8c9..2234457074 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/AssistPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/inputassist/AssistPanel.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior.inputassist;
+package com.gitplex.server.web.behavior.inputassist;
import java.util.List;
@@ -11,10 +11,10 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.RepeatingView;
-import com.gitplex.commons.antlr.codeassist.InputCompletion;
-import com.gitplex.commons.antlr.codeassist.InputStatus;
-import com.gitplex.commons.wicket.behavior.infinitescroll.InfiniteScrollBehavior;
+import com.gitplex.codeassist.InputCompletion;
+import com.gitplex.codeassist.InputStatus;
import com.gitplex.jsymbol.Range;
+import com.gitplex.server.web.behavior.infinitescroll.InfiniteScrollBehavior;
@SuppressWarnings("serial")
class AssistPanel extends Panel {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/InputAssistBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/inputassist/InputAssistBehavior.java
similarity index 92%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/InputAssistBehavior.java
rename to web/src/main/java/com/gitplex/server/web/behavior/inputassist/InputAssistBehavior.java
index 5119fb07b8..9abae84f85 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/InputAssistBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/inputassist/InputAssistBehavior.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior.inputassist;
+package com.gitplex.server.web.behavior.inputassist;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
@@ -18,16 +18,16 @@ import org.unbescape.javascript.JavaScriptEscape;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gitplex.commons.antlr.codeassist.InputCompletion;
-import com.gitplex.commons.antlr.codeassist.InputStatus;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.commons.util.RangeUtils;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.gitplex.commons.wicket.component.floating.AlignPlacement;
-import com.gitplex.commons.wicket.component.floating.AlignTarget;
-import com.gitplex.commons.wicket.component.floating.ComponentTarget;
-import com.gitplex.commons.wicket.component.floating.FloatingPanel;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.codeassist.InputCompletion;
+import com.gitplex.codeassist.InputStatus;
import com.gitplex.jsymbol.Range;
+import com.gitplex.server.util.RangeUtils;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.server.web.component.floating.AlignPlacement;
+import com.gitplex.server.web.component.floating.AlignTarget;
+import com.gitplex.server.web.component.floating.ComponentTarget;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/InputAssistResourceReference.java b/web/src/main/java/com/gitplex/server/web/behavior/inputassist/InputAssistResourceReference.java
similarity index 67%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/InputAssistResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/behavior/inputassist/InputAssistResourceReference.java
index c9d47bb747..437f19f7e8 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/InputAssistResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/inputassist/InputAssistResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior.inputassist;
+package com.gitplex.server.web.behavior.inputassist;
import java.util.List;
@@ -6,12 +6,12 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import com.gitplex.commons.wicket.assets.caret.CaretResourceReference;
-import com.gitplex.commons.wicket.assets.hotkeys.HotkeysResourceReference;
-import com.gitplex.commons.wicket.assets.scrollintoview.ScrollIntoViewResourceReference;
-import com.gitplex.commons.wicket.assets.textareacaretposition.TextareaCaretPositionResourceReference;
-import com.gitplex.commons.wicket.page.CommonDependentCssResourceReference;
-import com.gitplex.commons.wicket.page.CommonDependentResourceReference;
+import com.gitplex.server.web.assets.caret.CaretResourceReference;
+import com.gitplex.server.web.assets.hotkeys.HotkeysResourceReference;
+import com.gitplex.server.web.assets.scrollintoview.ScrollIntoViewResourceReference;
+import com.gitplex.server.web.assets.textareacaretposition.TextareaCaretPositionResourceReference;
+import com.gitplex.server.web.page.CommonDependentCssResourceReference;
+import com.gitplex.server.web.page.CommonDependentResourceReference;
public class InputAssistResourceReference extends CommonDependentResourceReference {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/bullet.gif b/web/src/main/java/com/gitplex/server/web/behavior/inputassist/bullet.gif
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/bullet.gif
rename to web/src/main/java/com/gitplex/server/web/behavior/inputassist/bullet.gif
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/hint.png b/web/src/main/java/com/gitplex/server/web/behavior/inputassist/hint.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/hint.png
rename to web/src/main/java/com/gitplex/server/web/behavior/inputassist/hint.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/input-assist.css b/web/src/main/java/com/gitplex/server/web/behavior/inputassist/input-assist.css
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/input-assist.css
rename to web/src/main/java/com/gitplex/server/web/behavior/inputassist/input-assist.css
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/input-assist.js b/web/src/main/java/com/gitplex/server/web/behavior/inputassist/input-assist.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/input-assist.js
rename to web/src/main/java/com/gitplex/server/web/behavior/inputassist/input-assist.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/wave.png b/web/src/main/java/com/gitplex/server/web/behavior/inputassist/wave.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/wave.png
rename to web/src/main/java/com/gitplex/server/web/behavior/inputassist/wave.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/AttachmentSupport.java b/web/src/main/java/com/gitplex/server/web/behavior/markdown/AttachmentSupport.java
similarity index 88%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/AttachmentSupport.java
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/AttachmentSupport.java
index 23a174cc3e..74879e5160 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/AttachmentSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/markdown/AttachmentSupport.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior.markdown;
+package com.gitplex.server.web.behavior.markdown;
import java.io.InputStream;
import java.io.Serializable;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/AttachmentUploadServlet.java b/web/src/main/java/com/gitplex/server/web/behavior/markdown/AttachmentUploadServlet.java
similarity index 96%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/AttachmentUploadServlet.java
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/AttachmentUploadServlet.java
index 6ece93f003..2c591d0fa4 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/AttachmentUploadServlet.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/markdown/AttachmentUploadServlet.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior.markdown;
+package com.gitplex.server.web.behavior.markdown;
import java.io.IOException;
import java.net.URLDecoder;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/EmojiOnes.java b/web/src/main/java/com/gitplex/server/web/behavior/markdown/EmojiOnes.java
similarity index 97%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/EmojiOnes.java
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/EmojiOnes.java
index 15ace591a5..609ef890d0 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/EmojiOnes.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/markdown/EmojiOnes.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior.markdown;
+package com.gitplex.server.web.behavior.markdown;
import java.io.IOException;
import java.io.InputStream;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/EmojiTransformer.java b/web/src/main/java/com/gitplex/server/web/behavior/markdown/EmojiTransformer.java
similarity index 90%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/EmojiTransformer.java
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/EmojiTransformer.java
index d114679f46..51bfa7c46a 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/EmojiTransformer.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/markdown/EmojiTransformer.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior.markdown;
+package com.gitplex.server.web.behavior.markdown;
import java.util.Collection;
import java.util.regex.Matcher;
@@ -11,9 +11,9 @@ import org.jsoup.nodes.Element;
import org.jsoup.nodes.TextNode;
import org.jsoup.select.NodeTraversor;
-import com.gitplex.commons.markdown.extensionpoint.HtmlTransformer;
-import com.gitplex.commons.util.JsoupUtils;
-import com.gitplex.commons.util.TextNodeVisitor;
+import com.gitplex.server.util.JsoupUtils;
+import com.gitplex.server.util.TextNodeVisitor;
+import com.gitplex.server.util.markdown.HtmlTransformer;
import com.google.common.collect.ImmutableSet;
public class EmojiTransformer implements HtmlTransformer {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/MarkdownBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownBehavior.java
similarity index 96%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/MarkdownBehavior.java
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownBehavior.java
index 1760b41d28..7a480f4593 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/MarkdownBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownBehavior.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior.markdown;
+package com.gitplex.server.web.behavior.markdown;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
@@ -30,10 +30,10 @@ import org.apache.wicket.util.crypt.Base64;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.commons.markdown.MarkdownManager;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.gitplex.commons.wicket.page.CommonPage;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.util.markdown.MarkdownManager;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.server.web.page.CommonPage;
import com.google.common.base.Charsets;
@SuppressWarnings("serial")
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/MarkdownResourceReference.java b/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownResourceReference.java
similarity index 77%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/MarkdownResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownResourceReference.java
index 3162738d89..2f9d68fd55 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/MarkdownResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior.markdown;
+package com.gitplex.server.web.behavior.markdown;
import java.util.List;
@@ -8,11 +8,11 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
-import com.gitplex.commons.wicket.assets.atwho.AtWhoResourceReference;
-import com.gitplex.commons.wicket.assets.caret.CaretResourceReference;
-import com.gitplex.commons.wicket.assets.codemirror.CodeMirrorResourceReference;
-import com.gitplex.commons.wicket.assets.hotkeys.HotkeysResourceReference;
-import com.gitplex.commons.wicket.page.CommonDependentResourceReference;
+import com.gitplex.server.web.assets.atwho.AtWhoResourceReference;
+import com.gitplex.server.web.assets.caret.CaretResourceReference;
+import com.gitplex.server.web.assets.codemirror.CodeMirrorResourceReference;
+import com.gitplex.server.web.assets.hotkeys.HotkeysResourceReference;
+import com.gitplex.server.web.page.CommonDependentResourceReference;
public class MarkdownResourceReference extends CommonDependentResourceReference {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/SelectUrlPanel.html b/web/src/main/java/com/gitplex/server/web/behavior/markdown/SelectUrlPanel.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/SelectUrlPanel.html
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/SelectUrlPanel.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/SelectUrlPanel.java b/web/src/main/java/com/gitplex/server/web/behavior/markdown/SelectUrlPanel.java
similarity index 98%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/SelectUrlPanel.java
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/SelectUrlPanel.java
index 79134af7da..4a6e578cfc 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/SelectUrlPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/markdown/SelectUrlPanel.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior.markdown;
+package com.gitplex.server.web.behavior.markdown;
import java.io.IOException;
import java.io.InputStream;
@@ -31,7 +31,7 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.lang.Bytes;
-import com.gitplex.commons.util.FileUtils;
+import com.gitplex.server.util.FileUtils;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/bootstrap-markdown.js b/web/src/main/java/com/gitplex/server/web/behavior/markdown/bootstrap-markdown.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/bootstrap-markdown.js
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/bootstrap-markdown.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/bootstrap-markdown.min.css b/web/src/main/java/com/gitplex/server/web/behavior/markdown/bootstrap-markdown.min.css
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/bootstrap-markdown.min.css
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/bootstrap-markdown.min.css
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji.json b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji.json
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji.json
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji.json
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0023-20E3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0023-20E3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0023-20E3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0023-20E3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0030-20E3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0030-20E3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0030-20E3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0030-20E3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0031-20E3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0031-20E3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0031-20E3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0031-20E3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0032-20E3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0032-20E3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0032-20E3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0032-20E3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0033-20E3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0033-20E3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0033-20E3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0033-20E3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0034-20E3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0034-20E3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0034-20E3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0034-20E3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0035-20E3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0035-20E3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0035-20E3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0035-20E3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0036-20E3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0036-20E3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0036-20E3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0036-20E3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0037-20E3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0037-20E3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0037-20E3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0037-20E3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0038-20E3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0038-20E3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0038-20E3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0038-20E3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0039-20E3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0039-20E3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/0039-20E3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/0039-20E3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/00A9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/00A9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/00A9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/00A9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/00AE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/00AE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/00AE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/00AE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F004.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F004.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F004.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F004.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F0CF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F0CF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F0CF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F0CF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F170.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F170.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F170.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F170.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F171.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F171.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F171.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F171.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F17E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F17E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F17E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F17E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F17F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F17F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F17F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F17F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F18E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F18E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F18E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F18E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F191.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F191.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F191.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F191.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F192.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F192.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F192.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F192.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F193.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F193.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F193.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F193.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F194.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F194.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F194.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F194.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F195.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F195.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F195.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F195.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F196.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F196.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F196.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F196.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F197.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F197.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F197.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F197.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F198.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F198.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F198.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F198.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F199.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F199.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F199.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F199.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F19A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F19A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F19A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F19A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1E8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1E8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1E8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1E8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1E9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1E9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1E9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1E9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1EA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1EA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1EA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1EA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1EB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1EB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1EB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1EB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1EC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1EC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1EC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1EC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1EE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1EE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1EE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1EE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1F1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1F1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1F1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1F1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1F2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1F2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1F2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1F2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1F4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1F4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1F4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1F4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1F7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1F7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1F7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1F7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1F9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1F9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1F9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1F9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1FA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1FA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1FA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1FA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1FC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1FC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1FC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1FC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1FF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1FF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E6-1F1FF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E6-1F1FF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1E6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1E6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1E6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1E6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1E7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1E7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1E7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1E7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1E9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1E9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1E9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1E9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1EA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1EA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1EA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1EA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1EB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1EB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1EB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1EB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1EC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1EC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1EC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1EC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1ED.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1ED.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1ED.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1ED.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1EE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1EE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1EE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1EE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1EF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1EF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1EF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1EF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1F2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1F2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1F2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1F2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1F3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1F3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1F3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1F3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1F4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1F4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1F4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1F4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1F7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1F7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1F7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1F7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1F8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1F8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1F8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1F8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1F9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1F9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1F9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1F9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1FC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1FC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1FC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1FC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1FE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1FE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1FE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1FE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1FF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1FF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E7-1F1FF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E7-1F1FF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1E6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1E6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1E6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1E6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1E9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1E9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1E9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1E9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1EB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1EB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1EB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1EB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1EC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1EC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1EC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1EC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1ED.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1ED.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1ED.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1ED.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1EE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1EE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1EE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1EE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1F1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1F1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1F1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1F1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1F2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1F2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1F2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1F2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1F3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1F3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1F3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1F3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1F4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1F4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1F4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1F4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1F7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1F7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1F7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1F7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1FA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1FA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1FA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1FA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1FB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1FB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1FB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1FB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1FE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1FE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1FE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1FE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1FF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1FF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E8-1F1FF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E8-1F1FF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E9-1F1EA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E9-1F1EA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E9-1F1EA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E9-1F1EA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E9-1F1EF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E9-1F1EF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E9-1F1EF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E9-1F1EF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E9-1F1F0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E9-1F1F0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E9-1F1F0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E9-1F1F0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E9-1F1F2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E9-1F1F2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E9-1F1F2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E9-1F1F2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E9-1F1F4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E9-1F1F4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E9-1F1F4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E9-1F1F4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E9-1F1FF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E9-1F1FF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1E9-1F1FF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1E9-1F1FF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EA-1F1E8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EA-1F1E8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EA-1F1E8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EA-1F1E8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EA-1F1EA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EA-1F1EA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EA-1F1EA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EA-1F1EA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EA-1F1EC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EA-1F1EC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EA-1F1EC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EA-1F1EC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EA-1F1ED.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EA-1F1ED.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EA-1F1ED.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EA-1F1ED.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EA-1F1F7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EA-1F1F7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EA-1F1F7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EA-1F1F7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EA-1F1F8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EA-1F1F8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EA-1F1F8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EA-1F1F8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EA-1F1F9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EA-1F1F9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EA-1F1F9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EA-1F1F9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EB-1F1EE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EB-1F1EE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EB-1F1EE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EB-1F1EE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EB-1F1EF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EB-1F1EF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EB-1F1EF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EB-1F1EF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EB-1F1F0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EB-1F1F0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EB-1F1F0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EB-1F1F0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EB-1F1F2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EB-1F1F2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EB-1F1F2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EB-1F1F2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EB-1F1F4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EB-1F1F4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EB-1F1F4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EB-1F1F4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EB-1F1F7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EB-1F1F7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EB-1F1F7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EB-1F1F7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1E6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1E6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1E6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1E6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1E7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1E7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1E7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1E7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1E9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1E9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1E9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1E9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1EA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1EA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1EA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1EA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1ED.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1ED.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1ED.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1ED.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1EE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1EE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1EE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1EE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1F1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1F1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1F1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1F1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1F2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1F2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1F2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1F2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1F3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1F3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1F3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1F3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1F6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1F6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1F6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1F6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1F7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1F7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1F7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1F7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1F9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1F9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1F9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1F9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1FA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1FA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1FA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1FA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1FC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1FC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1FC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1FC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1FE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1FE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EC-1F1FE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EC-1F1FE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1ED-1F1F0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1ED-1F1F0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1ED-1F1F0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1ED-1F1F0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1ED-1F1F3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1ED-1F1F3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1ED-1F1F3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1ED-1F1F3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1ED-1F1F7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1ED-1F1F7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1ED-1F1F7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1ED-1F1F7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1ED-1F1F9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1ED-1F1F9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1ED-1F1F9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1ED-1F1F9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1ED-1F1FA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1ED-1F1FA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1ED-1F1FA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1ED-1F1FA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EE-1F1E9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EE-1F1E9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EE-1F1E9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EE-1F1E9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EE-1F1EA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EE-1F1EA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EE-1F1EA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EE-1F1EA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EE-1F1F1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EE-1F1F1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EE-1F1F1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EE-1F1F1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EE-1F1F3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EE-1F1F3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EE-1F1F3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EE-1F1F3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EE-1F1F6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EE-1F1F6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EE-1F1F6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EE-1F1F6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EE-1F1F7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EE-1F1F7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EE-1F1F7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EE-1F1F7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EE-1F1F8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EE-1F1F8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EE-1F1F8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EE-1F1F8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EE-1F1F9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EE-1F1F9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EE-1F1F9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EE-1F1F9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EF-1F1EA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EF-1F1EA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EF-1F1EA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EF-1F1EA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EF-1F1F2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EF-1F1F2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EF-1F1F2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EF-1F1F2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EF-1F1F4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EF-1F1F4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EF-1F1F4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EF-1F1F4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EF-1F1F5.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EF-1F1F5.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1EF-1F1F5.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1EF-1F1F5.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1EA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1EA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1EA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1EA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1EC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1EC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1EC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1EC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1ED.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1ED.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1ED.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1ED.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1EE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1EE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1EE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1EE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1F2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1F2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1F2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1F2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1F3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1F3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1F3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1F3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1F5.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1F5.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1F5.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1F5.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1F7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1F7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1F7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1F7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1FC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1FC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1FC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1FC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1FE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1FE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1FE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1FE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1FF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1FF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F0-1F1FF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F0-1F1FF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1E6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1E6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1E6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1E6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1E7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1E7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1E7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1E7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1E8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1E8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1E8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1E8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1EE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1EE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1EE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1EE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1F0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1F0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1F0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1F0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1F7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1F7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1F7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1F7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1F8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1F8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1F8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1F8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1F9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1F9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1F9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1F9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1FA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1FA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1FA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1FA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1FB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1FB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1FB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1FB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1FE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1FE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F1-1F1FE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F1-1F1FE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1E6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1E6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1E6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1E6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1E8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1E8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1E8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1E8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1E9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1E9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1E9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1E9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1EA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1EA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1EA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1EA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1EC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1EC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1EC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1EC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1ED.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1ED.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1ED.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1ED.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1F0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1F0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1F0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1F0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1F1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1F1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1F1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1F1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1F2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1F2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1F2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1F2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1F3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1F3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1F3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1F3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1F4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1F4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1F4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1F4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1F7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1F7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1F7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1F7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1F8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1F8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1F8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1F8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1F9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1F9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1F9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1F9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1FA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1FA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1FA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1FA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1FB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1FB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1FB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1FB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1FC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1FC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1FC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1FC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1FD.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1FD.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1FD.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1FD.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1FE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1FE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1FE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1FE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1FF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1FF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F2-1F1FF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F2-1F1FF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1E6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1E6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1E6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1E6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1E8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1E8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1E8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1E8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1EA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1EA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1EA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1EA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1EC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1EC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1EC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1EC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1EE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1EE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1EE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1EE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1F1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1F1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1F1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1F1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1F4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1F4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1F4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1F4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1F5.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1F5.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1F5.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1F5.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1F7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1F7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1F7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1F7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1FA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1FA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1FA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1FA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1FF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1FF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F3-1F1FF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F3-1F1FF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F4-1F1F2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F4-1F1F2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F4-1F1F2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F4-1F1F2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1E6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1E6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1E6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1E6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1EA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1EA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1EA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1EA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1EB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1EB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1EB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1EB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1EC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1EC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1EC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1EC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1ED.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1ED.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1ED.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1ED.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1F0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1F0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1F0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1F0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1F1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1F1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1F1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1F1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1F7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1F7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1F7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1F7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1F8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1F8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1F8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1F8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1F9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1F9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1F9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1F9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1FC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1FC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1FC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1FC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1FE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1FE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F5-1F1FE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F5-1F1FE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F6-1F1E6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F6-1F1E6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F6-1F1E6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F6-1F1E6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F7-1F1F4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F7-1F1F4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F7-1F1F4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F7-1F1F4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F7-1F1F8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F7-1F1F8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F7-1F1F8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F7-1F1F8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F7-1F1FA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F7-1F1FA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F7-1F1FA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F7-1F1FA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F7-1F1FC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F7-1F1FC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F7-1F1FC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F7-1F1FC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1E6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1E6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1E6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1E6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1E7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1E7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1E7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1E7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1E8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1E8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1E8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1E8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1E9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1E9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1E9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1E9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1EA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1EA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1EA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1EA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1EC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1EC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1EC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1EC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1ED.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1ED.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1ED.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1ED.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1EE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1EE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1EE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1EE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1F0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1F0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1F0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1F0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1F1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1F1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1F1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1F1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1F2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1F2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1F2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1F2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1F3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1F3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1F3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1F3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1F4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1F4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1F4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1F4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1F7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1F7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1F7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1F7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1F9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1F9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1F9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1F9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1FB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1FB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1FB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1FB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1FE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1FE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1FE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1FE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1FF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1FF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F8-1F1FF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F8-1F1FF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1E9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1E9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1E9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1E9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1EC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1EC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1EC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1EC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1ED.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1ED.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1ED.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1ED.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1EF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1EF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1EF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1EF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1F1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1F1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1F1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1F1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1F2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1F2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1F2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1F2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1F3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1F3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1F3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1F3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1F4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1F4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1F4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1F4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1F7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1F7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1F7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1F7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1F9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1F9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1F9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1F9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1FB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1FB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1FB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1FB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1FC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1FC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1FC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1FC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1FF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1FF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1F9-1F1FF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1F9-1F1FF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FA-1F1E6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FA-1F1E6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FA-1F1E6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FA-1F1E6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FA-1F1EC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FA-1F1EC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FA-1F1EC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FA-1F1EC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FA-1F1F8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FA-1F1F8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FA-1F1F8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FA-1F1F8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FA-1F1FE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FA-1F1FE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FA-1F1FE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FA-1F1FE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FA-1F1FF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FA-1F1FF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FA-1F1FF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FA-1F1FF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FB-1F1E6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FB-1F1E6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FB-1F1E6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FB-1F1E6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FB-1F1E8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FB-1F1E8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FB-1F1E8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FB-1F1E8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FB-1F1EA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FB-1F1EA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FB-1F1EA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FB-1F1EA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FB-1F1EE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FB-1F1EE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FB-1F1EE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FB-1F1EE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FB-1F1F3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FB-1F1F3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FB-1F1F3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FB-1F1F3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FB-1F1FA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FB-1F1FA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FB-1F1FA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FB-1F1FA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FC-1F1EB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FC-1F1EB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FC-1F1EB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FC-1F1EB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FC-1F1F8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FC-1F1F8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FC-1F1F8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FC-1F1F8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FD-1F1F0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FD-1F1F0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FD-1F1F0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FD-1F1F0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FE-1F1EA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FE-1F1EA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FE-1F1EA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FE-1F1EA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FF-1F1E6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FF-1F1E6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FF-1F1E6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FF-1F1E6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FF-1F1F2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FF-1F1F2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FF-1F1F2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FF-1F1F2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FF-1F1FC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FF-1F1FC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F1FF-1F1FC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F1FF-1F1FC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F201.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F201.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F201.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F201.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F202.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F202.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F202.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F202.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F21A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F21A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F21A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F21A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F22F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F22F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F22F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F22F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F232.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F232.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F232.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F232.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F233.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F233.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F233.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F233.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F234.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F234.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F234.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F234.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F235.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F235.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F235.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F235.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F236.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F236.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F236.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F236.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F237.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F237.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F237.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F237.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F238.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F238.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F238.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F238.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F239.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F239.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F239.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F239.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F23A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F23A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F23A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F23A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F250.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F250.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F250.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F250.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F251.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F251.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F251.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F251.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F300.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F300.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F300.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F300.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F301.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F301.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F301.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F301.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F302.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F302.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F302.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F302.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F303.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F303.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F303.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F303.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F304.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F304.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F304.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F304.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F305.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F305.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F305.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F305.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F306.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F306.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F306.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F306.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F307.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F307.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F307.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F307.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F308.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F308.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F308.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F308.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F309.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F309.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F309.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F309.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F30A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F30A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F30A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F30A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F30B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F30B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F30B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F30B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F30C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F30C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F30C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F30C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F30D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F30D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F30D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F30D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F30E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F30E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F30E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F30E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F30F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F30F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F30F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F30F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F310.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F310.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F310.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F310.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F311.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F311.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F311.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F311.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F312.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F312.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F312.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F312.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F313.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F313.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F313.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F313.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F314.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F314.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F314.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F314.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F315.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F315.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F315.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F315.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F316.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F316.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F316.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F316.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F317.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F317.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F317.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F317.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F318.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F318.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F318.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F318.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F319.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F319.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F319.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F319.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F31A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F31A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F31A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F31A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F31B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F31B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F31B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F31B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F31C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F31C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F31C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F31C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F31D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F31D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F31D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F31D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F31E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F31E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F31E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F31E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F31F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F31F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F31F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F31F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F320.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F320.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F320.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F320.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F330.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F330.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F330.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F330.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F331.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F331.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F331.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F331.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F332.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F332.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F332.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F332.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F333.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F333.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F333.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F333.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F334.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F334.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F334.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F334.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F335.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F335.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F335.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F335.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F337.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F337.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F337.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F337.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F338.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F338.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F338.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F338.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F339.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F339.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F339.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F339.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F33A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F33A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F33A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F33A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F33B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F33B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F33B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F33B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F33C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F33C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F33C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F33C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F33D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F33D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F33D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F33D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F33E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F33E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F33E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F33E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F33F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F33F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F33F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F33F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F340.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F340.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F340.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F340.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F341.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F341.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F341.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F341.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F342.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F342.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F342.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F342.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F343.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F343.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F343.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F343.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F344.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F344.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F344.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F344.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F345.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F345.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F345.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F345.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F346.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F346.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F346.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F346.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F347.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F347.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F347.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F347.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F348.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F348.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F348.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F348.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F349.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F349.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F349.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F349.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F34A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F34A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F34A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F34A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F34B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F34B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F34B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F34B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F34C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F34C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F34C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F34C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F34D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F34D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F34D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F34D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F34E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F34E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F34E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F34E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F34F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F34F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F34F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F34F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F350.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F350.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F350.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F350.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F351.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F351.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F351.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F351.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F352.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F352.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F352.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F352.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F353.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F353.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F353.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F353.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F354.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F354.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F354.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F354.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F355.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F355.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F355.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F355.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F356.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F356.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F356.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F356.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F357.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F357.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F357.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F357.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F358.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F358.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F358.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F358.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F359.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F359.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F359.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F359.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F35A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F35A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F35A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F35A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F35B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F35B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F35B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F35B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F35C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F35C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F35C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F35C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F35D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F35D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F35D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F35D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F35E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F35E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F35E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F35E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F35F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F35F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F35F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F35F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F360.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F360.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F360.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F360.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F361.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F361.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F361.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F361.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F362.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F362.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F362.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F362.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F363.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F363.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F363.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F363.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F364.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F364.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F364.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F364.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F365.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F365.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F365.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F365.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F366.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F366.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F366.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F366.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F367.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F367.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F367.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F367.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F368.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F368.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F368.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F368.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F369.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F369.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F369.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F369.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F36A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F36A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F36A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F36A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F36B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F36B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F36B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F36B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F36C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F36C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F36C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F36C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F36D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F36D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F36D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F36D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F36E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F36E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F36E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F36E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F36F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F36F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F36F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F36F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F370.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F370.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F370.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F370.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F371.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F371.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F371.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F371.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F372.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F372.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F372.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F372.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F373.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F373.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F373.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F373.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F374.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F374.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F374.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F374.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F375.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F375.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F375.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F375.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F376.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F376.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F376.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F376.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F377.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F377.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F377.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F377.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F378.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F378.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F378.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F378.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F379.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F379.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F379.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F379.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F37A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F37A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F37A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F37A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F37B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F37B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F37B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F37B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F37C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F37C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F37C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F37C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F380.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F380.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F380.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F380.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F381.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F381.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F381.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F381.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F382.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F382.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F382.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F382.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F383.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F383.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F383.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F383.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F384.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F384.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F384.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F384.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F385.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F385.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F385.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F385.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F386.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F386.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F386.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F386.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F387.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F387.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F387.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F387.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F388.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F388.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F388.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F388.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F389.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F389.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F389.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F389.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F38A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F38A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F38A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F38A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F38B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F38B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F38B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F38B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F38C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F38C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F38C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F38C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F38D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F38D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F38D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F38D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F38E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F38E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F38E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F38E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F38F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F38F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F38F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F38F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F390.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F390.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F390.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F390.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F391.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F391.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F391.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F391.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F392.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F392.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F392.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F392.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F393.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F393.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F393.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F393.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3A0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3A0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3A0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3A0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3A1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3A1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3A1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3A1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3A2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3A2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3A2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3A2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3A3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3A3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3A3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3A3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3A4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3A4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3A4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3A4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3A5.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3A5.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3A5.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3A5.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3A6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3A6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3A6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3A6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3A7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3A7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3A7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3A7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3A8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3A8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3A8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3A8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3A9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3A9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3A9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3A9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3AA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3AA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3AA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3AA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3AB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3AB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3AB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3AB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3AC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3AC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3AC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3AC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3AD.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3AD.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3AD.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3AD.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3AE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3AE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3AE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3AE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3AF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3AF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3AF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3AF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3B0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3B0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3B0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3B0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3B1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3B1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3B1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3B1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3B2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3B2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3B2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3B2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3B3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3B3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3B3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3B3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3B4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3B4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3B4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3B4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3B5.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3B5.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3B5.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3B5.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3B6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3B6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3B6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3B6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3B7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3B7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3B7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3B7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3B8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3B8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3B8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3B8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3B9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3B9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3B9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3B9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3BA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3BA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3BA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3BA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3BB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3BB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3BB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3BB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3BC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3BC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3BC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3BC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3BD.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3BD.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3BD.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3BD.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3BE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3BE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3BE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3BE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3BF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3BF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3BF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3BF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3C0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3C0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3C0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3C0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3C1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3C1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3C1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3C1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3C2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3C2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3C2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3C2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3C3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3C3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3C3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3C3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3C4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3C4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3C4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3C4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3C6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3C6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3C6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3C6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3C7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3C7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3C7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3C7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3C8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3C8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3C8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3C8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3C9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3C9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3C9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3C9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3CA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3CA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3CA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3CA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3E0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3E0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3E0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3E0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3E1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3E1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3E1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3E1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3E2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3E2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3E2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3E2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3E3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3E3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3E3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3E3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3E4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3E4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3E4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3E4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3E5.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3E5.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3E5.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3E5.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3E6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3E6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3E6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3E6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3E7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3E7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3E7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3E7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3E8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3E8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3E8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3E8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3E9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3E9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3E9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3E9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3EA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3EA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3EA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3EA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3EB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3EB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3EB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3EB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3EC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3EC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3EC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3EC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3ED.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3ED.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3ED.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3ED.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3EE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3EE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3EE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3EE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3EF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3EF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3EF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3EF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3F0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3F0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F3F0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F3F0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F400.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F400.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F400.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F400.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F401.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F401.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F401.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F401.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F402.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F402.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F402.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F402.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F403.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F403.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F403.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F403.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F404.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F404.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F404.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F404.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F405.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F405.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F405.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F405.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F406.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F406.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F406.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F406.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F407.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F407.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F407.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F407.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F408.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F408.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F408.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F408.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F409.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F409.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F409.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F409.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F40A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F40A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F40A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F40A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F40B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F40B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F40B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F40B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F40C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F40C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F40C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F40C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F40D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F40D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F40D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F40D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F40E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F40E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F40E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F40E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F40F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F40F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F40F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F40F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F410.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F410.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F410.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F410.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F411.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F411.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F411.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F411.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F412.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F412.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F412.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F412.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F413.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F413.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F413.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F413.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F414.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F414.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F414.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F414.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F415.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F415.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F415.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F415.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F416.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F416.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F416.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F416.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F417.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F417.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F417.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F417.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F418.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F418.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F418.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F418.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F419.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F419.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F419.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F419.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F41A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F41A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F41A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F41A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F41B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F41B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F41B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F41B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F41C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F41C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F41C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F41C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F41D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F41D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F41D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F41D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F41E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F41E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F41E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F41E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F41F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F41F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F41F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F41F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F420.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F420.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F420.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F420.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F421.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F421.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F421.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F421.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F422.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F422.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F422.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F422.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F423.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F423.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F423.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F423.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F424.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F424.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F424.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F424.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F425.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F425.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F425.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F425.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F426.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F426.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F426.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F426.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F427.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F427.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F427.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F427.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F428.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F428.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F428.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F428.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F429.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F429.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F429.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F429.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F42A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F42A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F42A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F42A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F42B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F42B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F42B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F42B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F42C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F42C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F42C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F42C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F42D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F42D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F42D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F42D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F42E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F42E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F42E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F42E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F42F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F42F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F42F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F42F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F430.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F430.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F430.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F430.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F431.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F431.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F431.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F431.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F432.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F432.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F432.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F432.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F433.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F433.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F433.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F433.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F434.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F434.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F434.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F434.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F435.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F435.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F435.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F435.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F436.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F436.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F436.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F436.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F437.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F437.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F437.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F437.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F438.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F438.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F438.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F438.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F439.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F439.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F439.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F439.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F43A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F43A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F43A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F43A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F43B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F43B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F43B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F43B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F43C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F43C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F43C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F43C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F43D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F43D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F43D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F43D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F43E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F43E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F43E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F43E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F440.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F440.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F440.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F440.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F442.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F442.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F442.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F442.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F443.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F443.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F443.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F443.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F444.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F444.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F444.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F444.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F445.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F445.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F445.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F445.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F446.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F446.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F446.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F446.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F447.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F447.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F447.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F447.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F448.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F448.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F448.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F448.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F449.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F449.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F449.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F449.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F44A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F44A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F44A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F44A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F44B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F44B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F44B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F44B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F44C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F44C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F44C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F44C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F44D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F44D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F44D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F44D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F44E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F44E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F44E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F44E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F44F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F44F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F44F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F44F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F450.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F450.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F450.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F450.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F451.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F451.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F451.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F451.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F452.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F452.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F452.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F452.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F453.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F453.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F453.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F453.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F454.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F454.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F454.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F454.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F455.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F455.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F455.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F455.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F456.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F456.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F456.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F456.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F457.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F457.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F457.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F457.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F458.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F458.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F458.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F458.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F459.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F459.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F459.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F459.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F45A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F45A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F45A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F45A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F45B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F45B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F45B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F45B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F45C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F45C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F45C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F45C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F45D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F45D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F45D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F45D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F45E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F45E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F45E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F45E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F45F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F45F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F45F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F45F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F460.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F460.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F460.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F460.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F461.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F461.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F461.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F461.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F462.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F462.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F462.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F462.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F463.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F463.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F463.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F463.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F464.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F464.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F464.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F464.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F465.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F465.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F465.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F465.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F466.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F466.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F466.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F466.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F467.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F467.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F467.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F467.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F468.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F468.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F468.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F468.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F469.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F469.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F469.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F469.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F46A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F46A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F46A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F46A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F46B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F46B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F46B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F46B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F46C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F46C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F46C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F46C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F46D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F46D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F46D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F46D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F46E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F46E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F46E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F46E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F46F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F46F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F46F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F46F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F470.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F470.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F470.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F470.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F471.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F471.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F471.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F471.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F472.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F472.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F472.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F472.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F473.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F473.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F473.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F473.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F474.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F474.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F474.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F474.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F475.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F475.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F475.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F475.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F476.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F476.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F476.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F476.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F477.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F477.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F477.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F477.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F478.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F478.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F478.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F478.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F479.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F479.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F479.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F479.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F47A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F47A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F47A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F47A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F47B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F47B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F47B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F47B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F47C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F47C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F47C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F47C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F47D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F47D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F47D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F47D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F47E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F47E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F47E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F47E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F47F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F47F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F47F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F47F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F480.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F480.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F480.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F480.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F481.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F481.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F481.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F481.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F482.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F482.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F482.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F482.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F483.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F483.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F483.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F483.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F484.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F484.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F484.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F484.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F485.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F485.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F485.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F485.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F486.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F486.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F486.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F486.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F487.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F487.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F487.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F487.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F488.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F488.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F488.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F488.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F489.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F489.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F489.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F489.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F48A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F48A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F48A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F48A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F48B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F48B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F48B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F48B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F48C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F48C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F48C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F48C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F48D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F48D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F48D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F48D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F48E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F48E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F48E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F48E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F48F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F48F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F48F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F48F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F490.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F490.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F490.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F490.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F491.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F491.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F491.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F491.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F492.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F492.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F492.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F492.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F493.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F493.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F493.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F493.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F494.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F494.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F494.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F494.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F495.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F495.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F495.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F495.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F496.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F496.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F496.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F496.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F497.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F497.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F497.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F497.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F498.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F498.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F498.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F498.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F499.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F499.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F499.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F499.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F49A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F49A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F49A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F49A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F49B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F49B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F49B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F49B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F49C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F49C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F49C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F49C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F49D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F49D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F49D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F49D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F49E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F49E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F49E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F49E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F49F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F49F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F49F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F49F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4A0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4A0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4A0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4A0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4A1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4A1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4A1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4A1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4A2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4A2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4A2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4A2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4A3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4A3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4A3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4A3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4A4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4A4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4A4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4A4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4A5.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4A5.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4A5.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4A5.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4A6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4A6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4A6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4A6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4A7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4A7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4A7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4A7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4A8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4A8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4A8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4A8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4A9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4A9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4A9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4A9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4AA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4AA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4AA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4AA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4AB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4AB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4AB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4AB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4AC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4AC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4AC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4AC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4AD.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4AD.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4AD.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4AD.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4AE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4AE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4AE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4AE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4AF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4AF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4AF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4AF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4B0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4B0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4B0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4B0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4B1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4B1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4B1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4B1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4B2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4B2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4B2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4B2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4B3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4B3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4B3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4B3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4B4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4B4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4B4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4B4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4B5.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4B5.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4B5.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4B5.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4B6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4B6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4B6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4B6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4B7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4B7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4B7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4B7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4B8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4B8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4B8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4B8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4B9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4B9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4B9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4B9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4BA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4BA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4BA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4BA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4BB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4BB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4BB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4BB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4BC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4BC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4BC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4BC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4BD.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4BD.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4BD.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4BD.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4BE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4BE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4BE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4BE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4BF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4BF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4BF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4BF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4C0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4C0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4C0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4C0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4C1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4C1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4C1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4C1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4C2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4C2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4C2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4C2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4C3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4C3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4C3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4C3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4C4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4C4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4C4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4C4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4C5.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4C5.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4C5.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4C5.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4C6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4C6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4C6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4C6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4C7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4C7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4C7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4C7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4C8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4C8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4C8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4C8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4C9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4C9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4C9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4C9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4CA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4CA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4CA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4CA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4CB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4CB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4CB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4CB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4CC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4CC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4CC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4CC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4CD.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4CD.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4CD.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4CD.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4CE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4CE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4CE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4CE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4CF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4CF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4CF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4CF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4D0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4D0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4D0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4D0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4D1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4D1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4D1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4D1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4D2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4D2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4D2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4D2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4D3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4D3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4D3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4D3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4D4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4D4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4D4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4D4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4D5.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4D5.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4D5.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4D5.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4D6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4D6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4D6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4D6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4D7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4D7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4D7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4D7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4D8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4D8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4D8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4D8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4D9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4D9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4D9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4D9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4DA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4DA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4DA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4DA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4DB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4DB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4DB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4DB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4DC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4DC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4DC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4DC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4DD.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4DD.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4DD.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4DD.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4DE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4DE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4DE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4DE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4DF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4DF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4DF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4DF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4E0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4E0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4E0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4E0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4E1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4E1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4E1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4E1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4E2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4E2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4E2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4E2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4E3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4E3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4E3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4E3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4E4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4E4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4E4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4E4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4E5.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4E5.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4E5.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4E5.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4E6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4E6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4E6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4E6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4E7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4E7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4E7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4E7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4E8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4E8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4E8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4E8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4E9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4E9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4E9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4E9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4EA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4EA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4EA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4EA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4EB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4EB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4EB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4EB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4EC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4EC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4EC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4EC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4ED.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4ED.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4ED.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4ED.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4EE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4EE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4EE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4EE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4EF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4EF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4EF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4EF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4F0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4F0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4F0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4F0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4F1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4F1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4F1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4F1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4F2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4F2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4F2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4F2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4F3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4F3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4F3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4F3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4F4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4F4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4F4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4F4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4F5.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4F5.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4F5.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4F5.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4F6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4F6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4F6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4F6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4F7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4F7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4F7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4F7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4F9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4F9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4F9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4F9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4FA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4FA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4FA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4FA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4FB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4FB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4FB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4FB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4FC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4FC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F4FC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F4FC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F500.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F500.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F500.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F500.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F501.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F501.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F501.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F501.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F502.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F502.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F502.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F502.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F503.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F503.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F503.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F503.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F504.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F504.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F504.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F504.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F505.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F505.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F505.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F505.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F506.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F506.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F506.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F506.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F507.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F507.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F507.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F507.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F508.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F508.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F508.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F508.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F509.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F509.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F509.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F509.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F50A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F50A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F50A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F50A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F50B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F50B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F50B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F50B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F50C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F50C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F50C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F50C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F50D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F50D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F50D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F50D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F50E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F50E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F50E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F50E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F50F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F50F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F50F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F50F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F510.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F510.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F510.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F510.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F511.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F511.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F511.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F511.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F512.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F512.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F512.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F512.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F513.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F513.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F513.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F513.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F514.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F514.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F514.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F514.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F515.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F515.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F515.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F515.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F516.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F516.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F516.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F516.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F517.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F517.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F517.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F517.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F518.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F518.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F518.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F518.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F519.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F519.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F519.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F519.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F51A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F51A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F51A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F51A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F51B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F51B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F51B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F51B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F51C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F51C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F51C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F51C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F51D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F51D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F51D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F51D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F51E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F51E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F51E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F51E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F51F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F51F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F51F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F51F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F520.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F520.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F520.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F520.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F521.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F521.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F521.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F521.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F522.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F522.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F522.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F522.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F523.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F523.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F523.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F523.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F524.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F524.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F524.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F524.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F525.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F525.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F525.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F525.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F526.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F526.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F526.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F526.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F527.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F527.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F527.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F527.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F528.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F528.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F528.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F528.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F529.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F529.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F529.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F529.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F52A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F52A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F52A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F52A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F52B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F52B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F52B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F52B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F52C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F52C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F52C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F52C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F52D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F52D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F52D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F52D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F52E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F52E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F52E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F52E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F52F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F52F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F52F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F52F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F530.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F530.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F530.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F530.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F531.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F531.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F531.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F531.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F532.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F532.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F532.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F532.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F533.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F533.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F533.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F533.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F534.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F534.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F534.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F534.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F535.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F535.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F535.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F535.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F536.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F536.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F536.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F536.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F537.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F537.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F537.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F537.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F538.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F538.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F538.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F538.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F539.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F539.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F539.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F539.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F53A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F53A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F53A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F53A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F53B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F53B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F53B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F53B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F53C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F53C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F53C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F53C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F53D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F53D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F53D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F53D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F550.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F550.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F550.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F550.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F551.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F551.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F551.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F551.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F552.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F552.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F552.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F552.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F553.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F553.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F553.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F553.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F554.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F554.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F554.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F554.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F555.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F555.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F555.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F555.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F556.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F556.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F556.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F556.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F557.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F557.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F557.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F557.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F558.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F558.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F558.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F558.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F559.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F559.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F559.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F559.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F55A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F55A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F55A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F55A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F55B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F55B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F55B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F55B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F55C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F55C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F55C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F55C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F55D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F55D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F55D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F55D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F55E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F55E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F55E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F55E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F55F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F55F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F55F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F55F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F560.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F560.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F560.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F560.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F561.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F561.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F561.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F561.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F562.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F562.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F562.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F562.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F563.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F563.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F563.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F563.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F564.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F564.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F564.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F564.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F565.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F565.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F565.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F565.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F566.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F566.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F566.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F566.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F567.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F567.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F567.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F567.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F5FB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F5FB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F5FB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F5FB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F5FC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F5FC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F5FC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F5FC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F5FD.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F5FD.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F5FD.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F5FD.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F5FE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F5FE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F5FE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F5FE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F5FF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F5FF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F5FF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F5FF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F600.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F600.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F600.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F600.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F601.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F601.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F601.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F601.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F602.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F602.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F602.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F602.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F603.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F603.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F603.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F603.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F604.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F604.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F604.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F604.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F605.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F605.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F605.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F605.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F606.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F606.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F606.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F606.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F607.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F607.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F607.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F607.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F608.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F608.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F608.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F608.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F609.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F609.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F609.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F609.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F60A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F60A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F60A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F60A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F60B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F60B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F60B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F60B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F60C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F60C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F60C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F60C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F60D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F60D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F60D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F60D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F60E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F60E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F60E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F60E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F60F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F60F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F60F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F60F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F610.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F610.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F610.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F610.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F611.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F611.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F611.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F611.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F612.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F612.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F612.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F612.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F613.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F613.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F613.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F613.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F614.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F614.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F614.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F614.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F615.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F615.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F615.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F615.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F616.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F616.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F616.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F616.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F617.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F617.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F617.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F617.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F618.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F618.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F618.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F618.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F619.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F619.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F619.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F619.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F61A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F61A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F61A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F61A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F61B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F61B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F61B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F61B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F61C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F61C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F61C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F61C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F61D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F61D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F61D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F61D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F61E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F61E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F61E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F61E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F61F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F61F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F61F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F61F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F620.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F620.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F620.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F620.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F621.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F621.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F621.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F621.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F622.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F622.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F622.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F622.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F623.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F623.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F623.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F623.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F624.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F624.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F624.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F624.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F625.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F625.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F625.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F625.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F626.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F626.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F626.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F626.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F627.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F627.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F627.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F627.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F628.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F628.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F628.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F628.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F629.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F629.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F629.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F629.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F62A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F62A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F62A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F62A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F62B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F62B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F62B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F62B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F62C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F62C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F62C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F62C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F62D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F62D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F62D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F62D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F62E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F62E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F62E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F62E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F62F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F62F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F62F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F62F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F630.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F630.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F630.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F630.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F631.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F631.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F631.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F631.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F632.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F632.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F632.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F632.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F633.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F633.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F633.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F633.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F634.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F634.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F634.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F634.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F635.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F635.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F635.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F635.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F636.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F636.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F636.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F636.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F637.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F637.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F637.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F637.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F638.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F638.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F638.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F638.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F639.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F639.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F639.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F639.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F63A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F63A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F63A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F63A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F63B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F63B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F63B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F63B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F63C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F63C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F63C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F63C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F63D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F63D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F63D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F63D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F63E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F63E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F63E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F63E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F63F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F63F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F63F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F63F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F640.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F640.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F640.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F640.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F645.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F645.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F645.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F645.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F646.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F646.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F646.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F646.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F647.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F647.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F647.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F647.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F648.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F648.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F648.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F648.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F649.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F649.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F649.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F649.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F64A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F64A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F64A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F64A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F64B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F64B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F64B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F64B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F64C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F64C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F64C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F64C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F64D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F64D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F64D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F64D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F64E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F64E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F64E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F64E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F64F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F64F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F64F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F64F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F680.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F680.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F680.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F680.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F681.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F681.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F681.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F681.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F682.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F682.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F682.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F682.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F683.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F683.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F683.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F683.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F684.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F684.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F684.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F684.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F685.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F685.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F685.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F685.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F686.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F686.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F686.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F686.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F687.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F687.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F687.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F687.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F688.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F688.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F688.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F688.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F689.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F689.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F689.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F689.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F68A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F68A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F68A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F68A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F68B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F68B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F68B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F68B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F68C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F68C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F68C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F68C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F68D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F68D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F68D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F68D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F68E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F68E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F68E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F68E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F68F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F68F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F68F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F68F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F690.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F690.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F690.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F690.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F691.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F691.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F691.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F691.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F692.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F692.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F692.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F692.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F693.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F693.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F693.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F693.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F694.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F694.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F694.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F694.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F695.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F695.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F695.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F695.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F696.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F696.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F696.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F696.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F697.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F697.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F697.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F697.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F698.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F698.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F698.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F698.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F699.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F699.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F699.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F699.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F69A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F69A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F69A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F69A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F69B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F69B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F69B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F69B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F69C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F69C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F69C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F69C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F69D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F69D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F69D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F69D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F69E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F69E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F69E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F69E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F69F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F69F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F69F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F69F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6A0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6A0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6A0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6A0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6A1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6A1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6A1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6A1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6A2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6A2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6A2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6A2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6A3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6A3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6A3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6A3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6A4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6A4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6A4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6A4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6A5.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6A5.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6A5.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6A5.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6A6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6A6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6A6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6A6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6A7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6A7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6A7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6A7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6A8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6A8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6A8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6A8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6A9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6A9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6A9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6A9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6AA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6AA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6AA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6AA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6AB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6AB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6AB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6AB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6AC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6AC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6AC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6AC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6AD.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6AD.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6AD.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6AD.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6AE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6AE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6AE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6AE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6AF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6AF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6AF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6AF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6B0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6B0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6B0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6B0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6B1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6B1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6B1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6B1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6B2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6B2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6B2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6B2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6B3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6B3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6B3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6B3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6B4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6B4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6B4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6B4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6B5.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6B5.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6B5.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6B5.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6B6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6B6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6B6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6B6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6B7.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6B7.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6B7.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6B7.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6B8.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6B8.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6B8.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6B8.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6B9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6B9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6B9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6B9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6BA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6BA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6BA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6BA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6BB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6BB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6BB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6BB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6BC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6BC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6BC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6BC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6BD.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6BD.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6BD.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6BD.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6BE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6BE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6BE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6BE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6BF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6BF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6BF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6BF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6C0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6C0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6C0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6C0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6C1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6C1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6C1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6C1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6C2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6C2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6C2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6C2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6C3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6C3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6C3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6C3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6C4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6C4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6C4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6C4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6C5.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6C5.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/1F6C5.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/1F6C5.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/203C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/203C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/203C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/203C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2049.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2049.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2049.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2049.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2122.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2122.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2122.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2122.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2139.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2139.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2139.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2139.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2194.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2194.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2194.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2194.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2195.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2195.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2195.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2195.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2196.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2196.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2196.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2196.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2197.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2197.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2197.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2197.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2198.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2198.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2198.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2198.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2199.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2199.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2199.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2199.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/21A9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/21A9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/21A9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/21A9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/21AA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/21AA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/21AA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/21AA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/231A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/231A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/231A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/231A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/231B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/231B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/231B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/231B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/23E9.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/23E9.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/23E9.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/23E9.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/23EA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/23EA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/23EA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/23EA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/23EB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/23EB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/23EB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/23EB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/23EC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/23EC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/23EC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/23EC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/23F0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/23F0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/23F0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/23F0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/23F3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/23F3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/23F3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/23F3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/24C2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/24C2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/24C2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/24C2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/25AA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/25AA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/25AA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/25AA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/25AB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/25AB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/25AB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/25AB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/25B6.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/25B6.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/25B6.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/25B6.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/25C0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/25C0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/25C0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/25C0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/25FB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/25FB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/25FB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/25FB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/25FC.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/25FC.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/25FC.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/25FC.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/25FD.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/25FD.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/25FD.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/25FD.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/25FE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/25FE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/25FE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/25FE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2600.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2600.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2600.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2600.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2601.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2601.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2601.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2601.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/260E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/260E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/260E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/260E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2611.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2611.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2611.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2611.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2614.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2614.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2614.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2614.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2615.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2615.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2615.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2615.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/261D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/261D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/261D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/261D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/263A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/263A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/263A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/263A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2648.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2648.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2648.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2648.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2649.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2649.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2649.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2649.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/264A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/264A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/264A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/264A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/264B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/264B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/264B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/264B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/264C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/264C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/264C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/264C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/264D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/264D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/264D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/264D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/264E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/264E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/264E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/264E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/264F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/264F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/264F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/264F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2650.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2650.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2650.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2650.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2651.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2651.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2651.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2651.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2652.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2652.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2652.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2652.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2653.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2653.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2653.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2653.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2660.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2660.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2660.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2660.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2663.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2663.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2663.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2663.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2665.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2665.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2665.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2665.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2666.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2666.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2666.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2666.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2668.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2668.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2668.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2668.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/267B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/267B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/267B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/267B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/267F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/267F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/267F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/267F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2693.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2693.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2693.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2693.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26A0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26A0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26A0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26A0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26A1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26A1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26A1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26A1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26AA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26AA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26AA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26AA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26AB.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26AB.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26AB.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26AB.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26BD.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26BD.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26BD.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26BD.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26BE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26BE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26BE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26BE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26C4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26C4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26C4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26C4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26C5.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26C5.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26C5.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26C5.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26CE.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26CE.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26CE.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26CE.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26D4.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26D4.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26D4.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26D4.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26EA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26EA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26EA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26EA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26F2.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26F2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26F2.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26F2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26F3.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26F3.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26F3.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26F3.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26F5.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26F5.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26F5.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26F5.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26FA.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26FA.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26FA.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26FA.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26FD.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26FD.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/26FD.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/26FD.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2702.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2702.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2702.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2702.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2705.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2705.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2705.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2705.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2708.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2708.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2708.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2708.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2709.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2709.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2709.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2709.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/270A.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/270A.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/270A.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/270A.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/270B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/270B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/270B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/270B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/270C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/270C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/270C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/270C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/270F.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/270F.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/270F.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/270F.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2712.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2712.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2712.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2712.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2714.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2714.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2714.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2714.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2716.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2716.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2716.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2716.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2728.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2728.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2728.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2728.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2733.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2733.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2733.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2733.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2734.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2734.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2734.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2734.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2744.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2744.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2744.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2744.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2747.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2747.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2747.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2747.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/274C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/274C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/274C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/274C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/274E.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/274E.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/274E.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/274E.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2753.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2753.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2753.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2753.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2754.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2754.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2754.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2754.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2755.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2755.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2755.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2755.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2757.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2757.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2757.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2757.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2764.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2764.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2764.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2764.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2795.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2795.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2795.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2795.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2796.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2796.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2796.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2796.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2797.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2797.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2797.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2797.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/27A1.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/27A1.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/27A1.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/27A1.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/27B0.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/27B0.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/27B0.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/27B0.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/27BF.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/27BF.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/27BF.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/27BF.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2934.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2934.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2934.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2934.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2935.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2935.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2935.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2935.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2B05.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2B05.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2B05.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2B05.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2B06.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2B06.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2B06.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2B06.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2B07.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2B07.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2B07.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2B07.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2B1B.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2B1B.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2B1B.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2B1B.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2B1C.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2B1C.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2B1C.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2B1C.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2B50.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2B50.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2B50.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2B50.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2B55.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2B55.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/2B55.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/2B55.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/3030.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/3030.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/3030.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/3030.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/303D.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/303D.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/303D.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/303D.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/3297.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/3297.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/3297.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/3297.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/3299.png b/web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/3299.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/emoji/3299.png
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/emoji/3299.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/markdown.css b/web/src/main/java/com/gitplex/server/web/behavior/markdown/markdown.css
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/markdown.css
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/markdown.css
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/markdown.js b/web/src/main/java/com/gitplex/server/web/behavior/markdown/markdown.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/markdown/markdown.js
rename to web/src/main/java/com/gitplex/server/web/behavior/markdown/markdown.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/sortable/SortBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/sortable/SortBehavior.java
similarity index 96%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/sortable/SortBehavior.java
rename to web/src/main/java/com/gitplex/server/web/behavior/sortable/SortBehavior.java
index eb9e981589..79638df443 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/sortable/SortBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/sortable/SortBehavior.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior.sortable;
+package com.gitplex.server.web.behavior.sortable;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
@@ -9,8 +9,8 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnLoadHeaderItem;
import org.apache.wicket.request.cycle.RequestCycle;
-import com.gitplex.commons.wicket.assets.jqueryui.JQueryUIResourceReference;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.server.web.assets.jqueryui.JQueryUIResourceReference;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
public abstract class SortBehavior extends AbstractPostAjaxBehavior {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/sortable/SortPosition.java b/web/src/main/java/com/gitplex/server/web/behavior/sortable/SortPosition.java
similarity index 90%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/sortable/SortPosition.java
rename to web/src/main/java/com/gitplex/server/web/behavior/sortable/SortPosition.java
index 247a2e211d..94a7accabb 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/sortable/SortPosition.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/sortable/SortPosition.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior.sortable;
+package com.gitplex.server.web.behavior.sortable;
import com.google.common.base.Objects;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/testform/TestFormBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/testform/TestFormBehavior.java
similarity index 93%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/testform/TestFormBehavior.java
rename to web/src/main/java/com/gitplex/server/web/behavior/testform/TestFormBehavior.java
index 27325b008f..2891940581 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/testform/TestFormBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/testform/TestFormBehavior.java
@@ -1,9 +1,9 @@
-package com.gitplex.commons.wicket.behavior.testform;
+package com.gitplex.server.web.behavior.testform;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
@SuppressWarnings("serial")
public abstract class TestFormBehavior extends AbstractPostAjaxBehavior {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/testform/TestResult.java b/web/src/main/java/com/gitplex/server/web/behavior/testform/TestResult.java
similarity index 92%
rename from wicket/src/main/java/com/gitplex/commons/wicket/behavior/testform/TestResult.java
rename to web/src/main/java/com/gitplex/server/web/behavior/testform/TestResult.java
index a339e226d0..542265fe09 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/behavior/testform/TestResult.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/testform/TestResult.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.behavior.testform;
+package com.gitplex.server.web.behavior.testform;
public interface TestResult {
String getMessage();
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/AccordionPanel.java b/web/src/main/java/com/gitplex/server/web/component/AccordionPanel.java
similarity index 90%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/AccordionPanel.java
rename to web/src/main/java/com/gitplex/server/web/component/AccordionPanel.java
index c401caf0e1..7962215c9b 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/AccordionPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/AccordionPanel.java
@@ -1,11 +1,11 @@
-package com.gitplex.commons.wicket.component;
+package com.gitplex.server.web.component;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import com.gitplex.commons.wicket.behavior.CollapseBehavior;
+import com.gitplex.server.web.behavior.CollapseBehavior;
/**
* Put collapsible components inside this accordion panel to have them behaving like
diff --git a/web/src/main/java/com/gitplex/server/web/component/AccountLink.java b/web/src/main/java/com/gitplex/server/web/component/AccountLink.java
index 9c59a1f407..4dba43d9ef 100644
--- a/web/src/main/java/com/gitplex/server/web/component/AccountLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/AccountLink.java
@@ -7,9 +7,9 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.PersonIdent;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
import com.gitplex.server.web.page.account.AccountPage;
import com.gitplex.server.web.page.account.overview.AccountOverviewPage;
diff --git a/web/src/main/java/com/gitplex/server/web/component/BlobIcon.java b/web/src/main/java/com/gitplex/server/web/component/BlobIcon.java
index 90663ed3bc..73d5ad260f 100644
--- a/web/src/main/java/com/gitplex/server/web/component/BlobIcon.java
+++ b/web/src/main/java/com/gitplex/server/web/component/BlobIcon.java
@@ -5,7 +5,7 @@ import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
-import com.gitplex.commons.git.BlobIdent;
+import com.gitplex.server.git.BlobIdent;
@SuppressWarnings("serial")
public class BlobIcon extends WebComponent {
diff --git a/web/src/main/java/com/gitplex/server/web/component/BranchLink.java b/web/src/main/java/com/gitplex/server/web/component/BranchLink.java
index 06a371079b..39a0cc8ef0 100644
--- a/web/src/main/java/com/gitplex/server/web/component/BranchLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/BranchLink.java
@@ -6,7 +6,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.server.core.entity.support.DepotAndBranch;
+import com.gitplex.server.entity.support.DepotAndBranch;
import com.gitplex.server.web.page.depot.DepotPage;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
diff --git a/web/src/main/java/com/gitplex/server/web/component/DepotPicker.java b/web/src/main/java/com/gitplex/server/web/component/DepotPicker.java
index 00a0d327bc..f989d75b71 100644
--- a/web/src/main/java/com/gitplex/server/web/component/DepotPicker.java
+++ b/web/src/main/java/com/gitplex/server/web/component/DepotPicker.java
@@ -7,10 +7,10 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.web.component.DropdownLink;
import com.gitplex.server.web.component.depotselector.DepotSelector;
@SuppressWarnings("serial")
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/DropdownLink.java b/web/src/main/java/com/gitplex/server/web/component/DropdownLink.java
similarity index 91%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/DropdownLink.java
rename to web/src/main/java/com/gitplex/server/web/component/DropdownLink.java
index 345b5f8a78..6ff3e5c0b6 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/DropdownLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/DropdownLink.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component;
+package com.gitplex.server.web.component;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -10,11 +10,11 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.request.cycle.RequestCycle;
-import com.gitplex.commons.wicket.component.floating.AlignPlacement;
-import com.gitplex.commons.wicket.component.floating.AlignTarget;
-import com.gitplex.commons.wicket.component.floating.ComponentTarget;
-import com.gitplex.commons.wicket.component.floating.FloatingPanel;
-import com.gitplex.commons.wicket.component.floating.RectTarget;
+import com.gitplex.server.web.component.floating.AlignPlacement;
+import com.gitplex.server.web.component.floating.AlignTarget;
+import com.gitplex.server.web.component.floating.ComponentTarget;
+import com.gitplex.server.web.component.floating.FloatingPanel;
+import com.gitplex.server.web.component.floating.RectTarget;
@SuppressWarnings("serial")
public abstract class DropdownLink extends AjaxLink<Void> {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/LabelLink.java b/web/src/main/java/com/gitplex/server/web/component/LabelLink.java
similarity index 92%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/LabelLink.java
rename to web/src/main/java/com/gitplex/server/web/component/LabelLink.java
index a27d2d717d..02e122bcb8 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/LabelLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/LabelLink.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component;
+package com.gitplex.server.web.component;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/MultilineLabel.java b/web/src/main/java/com/gitplex/server/web/component/MultilineLabel.java
similarity index 96%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/MultilineLabel.java
rename to web/src/main/java/com/gitplex/server/web/component/MultilineLabel.java
index 998a137e56..157aab140b 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/MultilineLabel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/MultilineLabel.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component;
+package com.gitplex.server.web.component;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/PreventDefaultAjaxLink.java b/web/src/main/java/com/gitplex/server/web/component/PreventDefaultAjaxLink.java
similarity index 92%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/PreventDefaultAjaxLink.java
rename to web/src/main/java/com/gitplex/server/web/component/PreventDefaultAjaxLink.java
index 75812fcacc..6968d63561 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/PreventDefaultAjaxLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/PreventDefaultAjaxLink.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component;
+package com.gitplex.server.web.component;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/ViewStateAwareAjaxLink.java b/web/src/main/java/com/gitplex/server/web/component/ViewStateAwareAjaxLink.java
similarity index 96%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/ViewStateAwareAjaxLink.java
rename to web/src/main/java/com/gitplex/server/web/component/ViewStateAwareAjaxLink.java
index ad3ab2ec1b..221079b0a9 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/ViewStateAwareAjaxLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/ViewStateAwareAjaxLink.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component;
+package com.gitplex.server.web.component;
import javax.annotation.Nullable;
diff --git a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AbstractAccountChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/accountchoice/AbstractAccountChoiceProvider.java
index 52fecb85c9..b5a7c19c8c 100644
--- a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AbstractAccountChoiceProvider.java
+++ b/web/src/main/java/com/gitplex/server/web/component/accountchoice/AbstractAccountChoiceProvider.java
@@ -8,11 +8,11 @@ import org.json.JSONException;
import org.json.JSONWriter;
import com.google.common.collect.Lists;
-import com.gitplex.commons.wicket.component.select2.ChoiceProvider;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.web.avatar.AvatarManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.web.component.select2.ChoiceProvider;
+import com.gitplex.server.web.util.avatar.AvatarManager;
public abstract class AbstractAccountChoiceProvider extends ChoiceProvider<Account> {
diff --git a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountChoiceProvider.java
index 6b805901e9..acbf5a3d43 100644
--- a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountChoiceProvider.java
+++ b/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountChoiceProvider.java
@@ -7,12 +7,12 @@ import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.commons.wicket.component.select2.Response;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.component.select2.Response;
public class AccountChoiceProvider extends AbstractAccountChoiceProvider {
@@ -27,7 +27,7 @@ public class AccountChoiceProvider extends AbstractAccountChoiceProvider {
@Override
public void query(String term, int page, Response<Account> response) {
Dao dao = GitPlex.getInstance(Dao.class);
- int first = page * Constants.DEFAULT_PAGE_SIZE;
+ int first = page * WebConstants.DEFAULT_PAGE_SIZE;
Criterion criterion = Restrictions.and(Restrictions.or(
Restrictions.ilike("name", term, MatchMode.ANYWHERE),
Restrictions.ilike("fullName", term, MatchMode.ANYWHERE)));
@@ -35,12 +35,12 @@ public class AccountChoiceProvider extends AbstractAccountChoiceProvider {
criteria.add(criterion);
criteria.add(Restrictions.eq("organization", organization));
criteria.addOrder(Order.asc("name"));
- List<Account> accounts = dao.findRange(criteria, first, Constants.DEFAULT_PAGE_SIZE + 1);
+ List<Account> accounts = dao.findRange(criteria, first, WebConstants.DEFAULT_PAGE_SIZE + 1);
- if (accounts.size() <= Constants.DEFAULT_PAGE_SIZE) {
+ if (accounts.size() <= WebConstants.DEFAULT_PAGE_SIZE) {
response.addAll(accounts);
} else {
- response.addAll(accounts.subList(0, Constants.DEFAULT_PAGE_SIZE));
+ response.addAll(accounts.subList(0, WebConstants.DEFAULT_PAGE_SIZE));
response.setHasMore(true);
}
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountMultiChoice.java b/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountMultiChoice.java
index 4ec786ca0e..afbcf47882 100644
--- a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountMultiChoice.java
+++ b/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountMultiChoice.java
@@ -6,9 +6,9 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.component.select2.Select2MultiChoice;
-import com.gitplex.server.core.entity.Account;
+import com.gitplex.server.entity.Account;
import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;
+import com.gitplex.server.web.component.select2.Select2MultiChoice;
public class AccountMultiChoice extends Select2MultiChoice<Account> {
diff --git a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountSingleChoice.java b/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountSingleChoice.java
index b3b3d06392..4c2b8e28f2 100644
--- a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountSingleChoice.java
+++ b/web/src/main/java/com/gitplex/server/web/component/accountchoice/AccountSingleChoice.java
@@ -4,8 +4,8 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.component.select2.Select2Choice;
-import com.gitplex.server.core.entity.Account;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.web.component.select2.Select2Choice;
@SuppressWarnings("serial")
public class AccountSingleChoice extends Select2Choice<Account> {
diff --git a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AdministrativeAccountChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/accountchoice/AdministrativeAccountChoiceProvider.java
index e891f55749..04a99ec1ee 100644
--- a/web/src/main/java/com/gitplex/server/web/component/accountchoice/AdministrativeAccountChoiceProvider.java
+++ b/web/src/main/java/com/gitplex/server/web/component/accountchoice/AdministrativeAccountChoiceProvider.java
@@ -10,14 +10,14 @@ import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.wicket.component.select2.Response;
-import com.gitplex.commons.wicket.component.select2.ResponseFiller;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.OrganizationMembership;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.OrganizationMembership;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.component.select2.Response;
+import com.gitplex.server.web.component.select2.ResponseFiller;
public class AdministrativeAccountChoiceProvider extends AbstractAccountChoiceProvider {
@@ -26,7 +26,7 @@ public class AdministrativeAccountChoiceProvider extends AbstractAccountChoicePr
@Override
public void query(String term, int page, Response<Account> response) {
Account loginUser = Preconditions.checkNotNull(SecurityUtils.getAccount());
- int pageSize = Constants.DEFAULT_PAGE_SIZE;
+ int pageSize = WebConstants.DEFAULT_PAGE_SIZE;
if (loginUser.isAdministrator()) {
AccountManager accountManager = GitPlex.getInstance(AccountManager.class);
int first = page * pageSize;
diff --git a/web/src/main/java/com/gitplex/server/web/component/archivemenulink/ArchiveMenuLink.java b/web/src/main/java/com/gitplex/server/web/component/archivemenulink/ArchiveMenuLink.java
index 59bfe9b6eb..2e72e8d326 100644
--- a/web/src/main/java/com/gitplex/server/web/component/archivemenulink/ArchiveMenuLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/archivemenulink/ArchiveMenuLink.java
@@ -7,11 +7,11 @@ import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.markup.html.link.ResourceLink;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.component.menu.MenuItem;
-import com.gitplex.commons.wicket.component.menu.MenuLink;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.web.resource.ArchiveResource;
-import com.gitplex.server.web.resource.ArchiveResourceReference;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.web.component.menu.MenuItem;
+import com.gitplex.server.web.component.menu.MenuLink;
+import com.gitplex.server.web.util.resource.ArchiveResource;
+import com.gitplex.server.web.util.resource.ArchiveResourceReference;
@SuppressWarnings("serial")
public abstract class ArchiveMenuLink extends MenuLink {
diff --git a/web/src/main/java/com/gitplex/server/web/component/avatar/Avatar.java b/web/src/main/java/com/gitplex/server/web/component/avatar/Avatar.java
index d7c4268ef6..94da549c9b 100644
--- a/web/src/main/java/com/gitplex/server/web/component/avatar/Avatar.java
+++ b/web/src/main/java/com/gitplex/server/web/component/avatar/Avatar.java
@@ -10,11 +10,11 @@ import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.model.Model;
import org.eclipse.jgit.lib.PersonIdent;
-import com.gitplex.commons.wicket.behavior.TooltipBehavior;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.web.avatar.AvatarManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.web.behavior.TooltipBehavior;
+import com.gitplex.server.web.util.avatar.AvatarManager;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;
diff --git a/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarChanged.java b/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarChanged.java
index 6fa1e569b9..f6d18afc9a 100644
--- a/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarChanged.java
+++ b/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarChanged.java
@@ -2,8 +2,8 @@ package com.gitplex.server.web.component.avatar;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import com.gitplex.commons.wicket.AjaxEvent;
-import com.gitplex.server.core.entity.Account;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.web.util.AjaxEvent;
public class AvatarChanged extends AjaxEvent {
diff --git a/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.java b/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.java
index bb61912941..891687c7d7 100644
--- a/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.java
@@ -12,13 +12,13 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.PersonIdent;
-import com.gitplex.commons.wicket.behavior.TooltipBehavior;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.web.avatar.AvatarManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.web.behavior.TooltipBehavior;
import com.gitplex.server.web.page.account.AccountPage;
import com.gitplex.server.web.page.account.overview.AccountOverviewPage;
+import com.gitplex.server.web.util.avatar.AvatarManager;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;
diff --git a/web/src/main/java/com/gitplex/server/web/component/avatar/RemoveableAvatar.java b/web/src/main/java/com/gitplex/server/web/component/avatar/RemoveableAvatar.java
index 246c6461b8..e10adfab5c 100644
--- a/web/src/main/java/com/gitplex/server/web/component/avatar/RemoveableAvatar.java
+++ b/web/src/main/java/com/gitplex/server/web/component/avatar/RemoveableAvatar.java
@@ -9,10 +9,10 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import com.gitplex.commons.wicket.behavior.TooltipBehavior;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.web.avatar.AvatarManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.web.behavior.TooltipBehavior;
+import com.gitplex.server.web.util.avatar.AvatarManager;
@SuppressWarnings("serial")
public abstract class RemoveableAvatar extends AjaxLink<Account> {
diff --git a/web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchChoiceProvider.java
index 52fc26deda..1076e4a4b7 100644
--- a/web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchChoiceProvider.java
+++ b/web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchChoiceProvider.java
@@ -10,12 +10,12 @@ import org.apache.wicket.model.IModel;
import org.json.JSONException;
import org.json.JSONWriter;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.git.RefInfo;
-import com.gitplex.commons.wicket.component.select2.ChoiceProvider;
-import com.gitplex.commons.wicket.component.select2.Response;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.git.RefInfo;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.component.select2.ChoiceProvider;
+import com.gitplex.server.web.component.select2.Response;
@SuppressWarnings("serial")
public class BranchChoiceProvider extends ChoiceProvider<String> {
@@ -39,8 +39,8 @@ public class BranchChoiceProvider extends ChoiceProvider<String> {
Collections.sort(branches);
- int first = page * Constants.DEFAULT_PAGE_SIZE;
- int last = first + Constants.DEFAULT_PAGE_SIZE;
+ int first = page * WebConstants.DEFAULT_PAGE_SIZE;
+ int last = first + WebConstants.DEFAULT_PAGE_SIZE;
response.setHasMore(last<branches.size());
if (last > branches.size())
last = branches.size();
diff --git a/web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchMultiChoice.java b/web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchMultiChoice.java
index aad20fc282..c470119325 100644
--- a/web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchMultiChoice.java
+++ b/web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchMultiChoice.java
@@ -6,8 +6,8 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.component.select2.ChoiceProvider;
-import com.gitplex.commons.wicket.component.select2.Select2MultiChoice;
+import com.gitplex.server.web.component.select2.ChoiceProvider;
+import com.gitplex.server.web.component.select2.Select2MultiChoice;
@SuppressWarnings("serial")
public class BranchMultiChoice extends Select2MultiChoice<String> {
diff --git a/web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchSingleChoice.java b/web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchSingleChoice.java
index 5846ada58c..5f0dc0387f 100644
--- a/web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchSingleChoice.java
+++ b/web/src/main/java/com/gitplex/server/web/component/branchchoice/BranchSingleChoice.java
@@ -4,8 +4,8 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.component.select2.ChoiceProvider;
-import com.gitplex.commons.wicket.component.select2.Select2Choice;
+import com.gitplex.server.web.component.select2.ChoiceProvider;
+import com.gitplex.server.web.component.select2.Select2Choice;
@SuppressWarnings("serial")
public class BranchSingleChoice extends Select2Choice<String> {
diff --git a/web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchBehavior.java b/web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchBehavior.java
index b221aee40d..0fb86a7497 100644
--- a/web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchBehavior.java
@@ -6,14 +6,14 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.antlr.codeassist.FenceAware;
-import com.gitplex.commons.antlr.codeassist.InputSuggestion;
-import com.gitplex.commons.antlr.codeassist.ParentedElement;
-import com.gitplex.commons.antlr.grammar.ElementSpec;
-import com.gitplex.commons.antlr.grammar.LexerRuleRefElementSpec;
-import com.gitplex.commons.wicket.behavior.inputassist.ANTLRAssistBehavior;
-import com.gitplex.server.core.util.includeexclude.IncludeExcludeParser;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.codeassist.FenceAware;
+import com.gitplex.codeassist.InputSuggestion;
+import com.gitplex.codeassist.ParentedElement;
+import com.gitplex.codeassist.grammar.ElementSpec;
+import com.gitplex.codeassist.grammar.LexerRuleRefElementSpec;
+import com.gitplex.server.util.includeexclude.IncludeExcludeParser;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.web.behavior.inputassist.ANTLRAssistBehavior;
import com.gitplex.server.web.util.SuggestionUtils;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchInput.java b/web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchInput.java
index c651631541..b0e53f07b7 100644
--- a/web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchInput.java
+++ b/web/src/main/java/com/gitplex/server/web/component/branchmatch/BranchMatchInput.java
@@ -10,8 +10,8 @@ import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidationError;
import org.apache.wicket.validation.IValidator;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.util.includeexclude.IncludeExcludeUtils;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.util.includeexclude.IncludeExcludeUtils;
@SuppressWarnings("serial")
public class BranchMatchInput extends TextField<String> {
diff --git a/web/src/main/java/com/gitplex/server/web/component/branchpicker/AffinalBranchPicker.java b/web/src/main/java/com/gitplex/server/web/component/branchpicker/AffinalBranchPicker.java
index 9ca95cf71c..3e953e3ea7 100644
--- a/web/src/main/java/com/gitplex/server/web/component/branchpicker/AffinalBranchPicker.java
+++ b/web/src/main/java/com/gitplex/server/web/component/branchpicker/AffinalBranchPicker.java
@@ -8,11 +8,11 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.web.component.DepotPicker;
-import com.gitplex.server.web.model.AffinalDepotsModel;
+import com.gitplex.server.web.util.model.AffinalDepotsModel;
@SuppressWarnings("serial")
public abstract class AffinalBranchPicker extends Panel {
diff --git a/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.java b/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.java
index 28446c9a92..2d6b16d5a0 100644
--- a/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.java
+++ b/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.java
@@ -6,8 +6,8 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.unbescape.html.HtmlEscape;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.web.component.DropdownLink;
@SuppressWarnings("serial")
public abstract class BranchPicker extends DropdownLink {
diff --git a/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchSelector.java b/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchSelector.java
index cd14062d09..6b2150f40e 100644
--- a/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchSelector.java
+++ b/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchSelector.java
@@ -24,12 +24,12 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.git.RefInfo;
-import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.gitplex.commons.wicket.behavior.InputChangeBehavior;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.git.RefInfo;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.server.web.behavior.InputChangeBehavior;
+import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
@SuppressWarnings("serial")
public abstract class BranchSelector extends Panel {
diff --git a/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchSelectorResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchSelectorResourceReference.java
index c2239d968e..b3d8d440a9 100644
--- a/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchSelectorResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchSelectorResourceReference.java
@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
-import com.gitplex.commons.wicket.assets.hotkeys.HotkeysResourceReference;
+import com.gitplex.server.web.assets.hotkeys.HotkeysResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
public class BranchSelectorResourceReference extends BaseDependentResourceReference {
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentFilter.java b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentFilter.java
index 181cdb09c7..35a885ac0a 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentFilter.java
+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentFilter.java
@@ -11,12 +11,12 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.hibernate.criterion.Restrictions;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.commons.util.match.WildcardUtils;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.annotation.AccountChoice;
-import com.gitplex.server.core.annotation.FileChoice;
-import com.gitplex.server.core.entity.CodeComment;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.util.editable.annotation.AccountChoice;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.FileChoice;
+import com.gitplex.server.util.match.WildcardUtils;
@Editable
public class CodeCommentFilter implements Serializable {
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.java b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.java
index fb23cbe540..d631e0809f 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.java
@@ -31,19 +31,19 @@ import org.apache.wicket.model.Model;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.support.CompareContext;
-import com.gitplex.server.core.manager.CodeCommentManager;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.support.CompareContext;
+import com.gitplex.server.manager.CodeCommentManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.component.AccountLink;
+import com.gitplex.server.web.editable.BeanContext;
import com.gitplex.server.web.page.depot.DepotPage;
import com.gitplex.server.web.page.depot.compare.RevisionComparePage;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
@@ -263,7 +263,7 @@ public abstract class CodeCommentListPanel extends Panel {
};
DataTable<CodeComment, Void> dataTable = new DataTable<>("comments", columns,
- dataProvider, getPullRequest()!=null?Integer.MAX_VALUE:Constants.DEFAULT_PAGE_SIZE);
+ dataProvider, getPullRequest()!=null?Integer.MAX_VALUE:WebConstants.DEFAULT_PAGE_SIZE);
dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
dataTable.addBottomToolbar(new NavigationToolbar(dataTable) {
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java
index 951b455e34..e4f8f4005f 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java
@@ -31,34 +31,34 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.hibernate.StaleStateException;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.util.ClassUtils;
-import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.gitplex.commons.wicket.ajaxlistener.ConfirmListener;
-import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;
-import com.gitplex.commons.wicket.component.markdown.MarkdownEditSupport;
-import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;
-import com.gitplex.commons.wicket.websocket.WebSocketRenderBehavior;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.CodeCommentReply;
-import com.gitplex.server.core.entity.CodeCommentStatusChange;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.support.CodeCommentActivity;
-import com.gitplex.server.core.entity.support.CompareContext;
-import com.gitplex.server.core.entity.support.DepotAndRevision;
-import com.gitplex.server.core.manager.CodeCommentManager;
-import com.gitplex.server.core.manager.CodeCommentReplyManager;
-import com.gitplex.server.core.manager.CodeCommentStatusChangeManager;
-import com.gitplex.server.core.manager.VisitInfoManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.CodeCommentReply;
+import com.gitplex.server.entity.CodeCommentStatusChange;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.support.CodeCommentActivity;
+import com.gitplex.server.entity.support.CompareContext;
+import com.gitplex.server.entity.support.DepotAndRevision;
+import com.gitplex.server.manager.CodeCommentManager;
+import com.gitplex.server.manager.CodeCommentReplyManager;
+import com.gitplex.server.manager.CodeCommentStatusChangeManager;
+import com.gitplex.server.manager.VisitInfoManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.ClassUtils;
+import com.gitplex.server.web.behavior.markdown.AttachmentSupport;
import com.gitplex.server.web.component.AccountLink;
import com.gitplex.server.web.component.avatar.AvatarLink;
+import com.gitplex.server.web.component.markdown.MarkdownEditSupport;
+import com.gitplex.server.web.component.markdown.MarkdownPanel;
import com.gitplex.server.web.page.depot.compare.RevisionComparePage;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
import com.gitplex.server.web.util.DateUtils;
+import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
+import com.gitplex.server.web.util.ajaxlistener.ConfirmListener;
+import com.gitplex.server.web.websocket.WebSocketRenderBehavior;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java b/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java
index a3c31333b7..3853a03776 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java
+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java
@@ -21,16 +21,16 @@ import org.hibernate.criterion.Restrictions;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;
-import com.gitplex.commons.wicket.behavior.markdown.MarkdownBehavior;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.web.avatar.AvatarManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.web.behavior.markdown.AttachmentSupport;
+import com.gitplex.server.web.behavior.markdown.MarkdownBehavior;
+import com.gitplex.server.web.util.avatar.AvatarManager;
@SuppressWarnings("serial")
public abstract class CommentInput extends TextArea<String> {
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/DepotAttachmentSupport.java b/web/src/main/java/com/gitplex/server/web/component/comment/DepotAttachmentSupport.java
index 405bcc2c3c..7346d8abe6 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/DepotAttachmentSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/component/comment/DepotAttachmentSupport.java
@@ -12,16 +12,16 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.util.FileUtils;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.AttachmentManager;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.web.resource.AttachmentResource;
-import com.gitplex.server.web.resource.AttachmentResourceReference;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.AttachmentManager;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.web.behavior.markdown.AttachmentSupport;
+import com.gitplex.server.web.util.resource.AttachmentResource;
+import com.gitplex.server.web.util.resource.AttachmentResourceReference;
import jersey.repackaged.com.google.common.base.Throwables;
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/MentionTransformer.java b/web/src/main/java/com/gitplex/server/web/component/comment/MentionTransformer.java
index ba986341d5..8d9c121290 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/MentionTransformer.java
+++ b/web/src/main/java/com/gitplex/server/web/component/comment/MentionTransformer.java
@@ -3,9 +3,9 @@ package com.gitplex.server.web.component.comment;
import org.apache.wicket.request.cycle.RequestCycle;
import org.jsoup.nodes.Element;
-import com.gitplex.commons.markdown.extensionpoint.HtmlTransformer;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.util.markdown.MentionParser;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.util.markdown.HtmlTransformer;
+import com.gitplex.server.util.markdown.MentionParser;
import com.gitplex.server.web.page.account.overview.AccountOverviewPage;
public class MentionTransformer extends MentionParser implements HtmlTransformer {
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/PullRequestTransformer.java b/web/src/main/java/com/gitplex/server/web/component/comment/PullRequestTransformer.java
index 299e3b1047..d1d23436e4 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/PullRequestTransformer.java
+++ b/web/src/main/java/com/gitplex/server/web/component/comment/PullRequestTransformer.java
@@ -3,9 +3,9 @@ package com.gitplex.server.web.component.comment;
import org.apache.wicket.request.cycle.RequestCycle;
import org.jsoup.nodes.Element;
-import com.gitplex.commons.markdown.extensionpoint.HtmlTransformer;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.util.markdown.PullRequestParser;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.util.markdown.HtmlTransformer;
+import com.gitplex.server.util.markdown.PullRequestParser;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;
public class PullRequestTransformer extends PullRequestParser implements HtmlTransformer {
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextPanel.java b/web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextPanel.java
index 0cb6c162b3..53e95880d2 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextPanel.java
@@ -21,12 +21,12 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.revwalk.RevCommit;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.util.diff.WhitespaceOption;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.support.DepotAndRevision;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.support.DepotAndRevision;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.util.diff.WhitespaceOption;
import com.gitplex.server.web.component.revisionpicker.RevisionSelector;
import com.gitplex.server.web.page.depot.compare.RevisionComparePage;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
diff --git a/web/src/main/java/com/gitplex/server/web/component/commitgraph/CommitGraphResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/commitgraph/CommitGraphResourceReference.java
index 7fe2919c97..f4b20d7420 100644
--- a/web/src/main/java/com/gitplex/server/web/component/commitgraph/CommitGraphResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/component/commitgraph/CommitGraphResourceReference.java
@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
-import com.gitplex.commons.wicket.assets.snapsvg.SnapSvgResourceReference;
+import com.gitplex.server.web.assets.snapsvg.SnapSvgResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
public class CommitGraphResourceReference extends BaseDependentResourceReference {
diff --git a/web/src/main/java/com/gitplex/server/web/component/commitgraph/CommitGraphUtils.java b/web/src/main/java/com/gitplex/server/web/component/commitgraph/CommitGraphUtils.java
index d64dcf5e5b..a09e26f587 100644
--- a/web/src/main/java/com/gitplex/server/web/component/commitgraph/CommitGraphUtils.java
+++ b/web/src/main/java/com/gitplex/server/web/component/commitgraph/CommitGraphUtils.java
@@ -10,7 +10,7 @@ import org.eclipse.jgit.revwalk.RevCommit;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gitplex.server.core.GitPlex;
+import com.gitplex.server.GitPlex;
public class CommitGraphUtils {
diff --git a/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.java b/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.java
index e8d13b0fb6..08c3553949 100644
--- a/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.java
@@ -27,19 +27,19 @@ import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.revwalk.RevCommit;
import org.joda.time.DateTime;
-import com.gitplex.commons.git.BlobIdent;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.wicket.behavior.clipboard.CopyClipboardBehavior;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.git.BlobIdent;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;
import com.gitplex.server.web.component.avatar.ContributorAvatars;
import com.gitplex.server.web.component.commitgraph.CommitGraphResourceReference;
import com.gitplex.server.web.component.commitgraph.CommitGraphUtils;
import com.gitplex.server.web.component.commitmessage.ExpandableCommitMessagePanel;
import com.gitplex.server.web.component.contributorpanel.ContributorPanel;
-import com.gitplex.server.web.model.CommitRefsModel;
import com.gitplex.server.web.page.depot.commit.CommitDetailPage;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
+import com.gitplex.server.web.util.model.CommitRefsModel;
@SuppressWarnings("serial")
public class CommitListPanel extends Panel {
@@ -67,8 +67,8 @@ public class CommitListPanel extends Panel {
@Override
protected List<RevCommit> load() {
List<RevCommit> commits = commitsModel.getObject();
- if (commits.size() > Constants.MAX_DISPLAY_COMMITS)
- commits = commits.subList(commits.size()-Constants.MAX_DISPLAY_COMMITS, commits.size());
+ if (commits.size() > WebConstants.MAX_DISPLAY_COMMITS)
+ commits = commits.subList(commits.size()-WebConstants.MAX_DISPLAY_COMMITS, commits.size());
CommitGraphUtils.sort(commits, 0);
return separateByDate(commits);
}
@@ -86,13 +86,13 @@ public class CommitListPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- String tooManyMessage = "Too many commits, displaying recent " + Constants.MAX_DISPLAY_COMMITS;
+ String tooManyMessage = "Too many commits, displaying recent " + WebConstants.MAX_DISPLAY_COMMITS;
add(new Label("tooManyCommits", tooManyMessage) {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(commitsModel.getObject().size()>Constants.MAX_DISPLAY_COMMITS);
+ setVisible(commitsModel.getObject().size()>WebConstants.MAX_DISPLAY_COMMITS);
}
});
@@ -160,7 +160,7 @@ public class CommitListPanel extends Panel {
} else {
fragment = new Fragment("commit", "dateFrag", CommitListPanel.this);
DateTime dateTime = new DateTime(getModelObject().get(item.getIndex()+1).getCommitterIdent().getWhen());
- fragment.add(new Label("date", Constants.DATE_FORMATTER.print(dateTime)));
+ fragment.add(new Label("date", WebConstants.DATE_FORMATTER.print(dateTime)));
if (item.getIndex() == 0)
item.add(AttributeAppender.append("class", "date first"));
else
diff --git a/web/src/main/java/com/gitplex/server/web/component/commitmessage/CommitMessageLabel.java b/web/src/main/java/com/gitplex/server/web/component/commitmessage/CommitMessageLabel.java
index f6cee3e7c9..6149e058f6 100644
--- a/web/src/main/java/com/gitplex/server/web/component/commitmessage/CommitMessageLabel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/commitmessage/CommitMessageLabel.java
@@ -5,9 +5,9 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.unbescape.html.HtmlEscape;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.commitmessagetransform.CommitMessageTransformer;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.web.util.commitmessagetransform.CommitMessageTransformer;
@SuppressWarnings("serial")
public class CommitMessageLabel extends Label {
diff --git a/web/src/main/java/com/gitplex/server/web/component/commitmessage/ExpandableCommitMessagePanel.java b/web/src/main/java/com/gitplex/server/web/component/commitmessage/ExpandableCommitMessagePanel.java
index 56caf80d19..aff283fa00 100644
--- a/web/src/main/java/com/gitplex/server/web/component/commitmessage/ExpandableCommitMessagePanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/commitmessage/ExpandableCommitMessagePanel.java
@@ -17,10 +17,10 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.eclipse.jgit.revwalk.RevCommit;
import org.unbescape.html.HtmlEscape;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.util.Highlighter;
-import com.gitplex.commons.util.Transformer;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.util.Highlighter;
+import com.gitplex.server.util.Transformer;
import com.gitplex.server.web.page.depot.commit.CommitDetailPage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteAccountModal.java b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteAccountModal.java
index 30c96595b0..36a2917afa 100644
--- a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteAccountModal.java
+++ b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteAccountModal.java
@@ -2,9 +2,9 @@ package com.gitplex.server.web.component.confirmdelete;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
@SuppressWarnings("serial")
public abstract class ConfirmDeleteAccountModal extends ConfirmDeleteModal {
diff --git a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteDepotModal.java b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteDepotModal.java
index 2effc0294e..b0c431dcb3 100644
--- a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteDepotModal.java
+++ b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteDepotModal.java
@@ -2,9 +2,9 @@ package com.gitplex.server.web.component.confirmdelete;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.DepotManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.DepotManager;
@SuppressWarnings("serial")
public abstract class ConfirmDeleteDepotModal extends ConfirmDeleteModal {
diff --git a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteModal.java b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteModal.java
index 5c4f9ec745..5b2478de1c 100644
--- a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteModal.java
+++ b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteModal.java
@@ -3,7 +3,7 @@ package com.gitplex.server.web.component.confirmdelete;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import com.gitplex.commons.wicket.component.modal.ModalPanel;
+import com.gitplex.server.web.component.modal.ModalPanel;
@SuppressWarnings("serial")
public abstract class ConfirmDeleteModal extends ModalPanel {
diff --git a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.java b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.java
index 28ccf0cd9b..c738208781 100644
--- a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.java
@@ -9,7 +9,7 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
-import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;
+import com.gitplex.server.web.component.PreventDefaultAjaxLink;
@SuppressWarnings("serial")
abstract class ConfirmDeletePanel extends Panel {
diff --git a/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchLink.java b/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchLink.java
index dc96cf6784..d14dd64749 100644
--- a/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchLink.java
@@ -6,9 +6,9 @@ import org.apache.wicket.model.IModel;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.commons.wicket.component.modal.ModalLink;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.component.modal.ModalLink;
@SuppressWarnings("serial")
public abstract class CreateBranchLink extends ModalLink {
diff --git a/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.java b/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.java
index 3474efe319..b534643334 100644
--- a/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.java
@@ -11,13 +11,13 @@ import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.security.SecurityUtils;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
-import com.gitplex.server.core.security.SecurityUtils;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.java b/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.java
index 3ef9b14467..272288abe1 100644
--- a/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.java
@@ -6,9 +6,9 @@ import org.apache.wicket.model.IModel;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.commons.wicket.component.modal.ModalLink;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.component.modal.ModalLink;
@SuppressWarnings("serial")
public abstract class CreateTagLink extends ModalLink {
diff --git a/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.java b/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.java
index 29f473038f..9af3e00b66 100644
--- a/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.java
@@ -12,13 +12,13 @@ import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.security.SecurityUtils;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.gatekeeper.checkresult.GateCheckResult;
-import com.gitplex.server.core.security.SecurityUtils;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/datatable/AjaxHeadersToolbar.java b/web/src/main/java/com/gitplex/server/web/component/datatable/AjaxHeadersToolbar.java
similarity index 84%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/datatable/AjaxHeadersToolbar.java
rename to web/src/main/java/com/gitplex/server/web/component/datatable/AjaxHeadersToolbar.java
index eab3667012..745579f2e8 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/datatable/AjaxHeadersToolbar.java
+++ b/web/src/main/java/com/gitplex/server/web/component/datatable/AjaxHeadersToolbar.java
@@ -1,11 +1,11 @@
-package com.gitplex.commons.wicket.component.datatable;
+package com.gitplex.server.web.component.datatable;
import org.apache.wicket.ajax.attributes.IAjaxCallListener;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackHeadersToolbar;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortStateLocator;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import com.gitplex.commons.wicket.ajaxlistener.AjaxLoadingOverlay;
+import com.gitplex.server.web.util.ajaxlistener.AjaxLoadingOverlay;
@SuppressWarnings("serial")
public class AjaxHeadersToolbar<S> extends AjaxFallbackHeadersToolbar<S>{
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/datatable/AjaxNavigationToolbar.java b/web/src/main/java/com/gitplex/server/web/component/datatable/AjaxNavigationToolbar.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/datatable/AjaxNavigationToolbar.java
rename to web/src/main/java/com/gitplex/server/web/component/datatable/AjaxNavigationToolbar.java
index 77b6dfc01f..5691296252 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/datatable/AjaxNavigationToolbar.java
+++ b/web/src/main/java/com/gitplex/server/web/component/datatable/AjaxNavigationToolbar.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.datatable;
+package com.gitplex.server.web.component.datatable;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigation;
@@ -12,7 +12,7 @@ import org.apache.wicket.markup.html.navigation.paging.IPagingLabelProvider;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigation;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
-import com.gitplex.commons.wicket.ajaxlistener.AjaxLoadingOverlay;
+import com.gitplex.server.web.util.ajaxlistener.AjaxLoadingOverlay;
import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/datatable/DefaultDataTable.java b/web/src/main/java/com/gitplex/server/web/component/datatable/DefaultDataTable.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/datatable/DefaultDataTable.java
rename to web/src/main/java/com/gitplex/server/web/component/datatable/DefaultDataTable.java
index 6810eb0ee3..d7542ea1b4 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/datatable/DefaultDataTable.java
+++ b/web/src/main/java/com/gitplex/server/web/component/datatable/DefaultDataTable.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.datatable;
+package com.gitplex.server.web.component.datatable;
import java.util.List;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/datatable/EntityColumn.java b/web/src/main/java/com/gitplex/server/web/component/datatable/EntityColumn.java
similarity index 84%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/datatable/EntityColumn.java
rename to web/src/main/java/com/gitplex/server/web/component/datatable/EntityColumn.java
index e5c5d28168..40e8f128c3 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/datatable/EntityColumn.java
+++ b/web/src/main/java/com/gitplex/server/web/component/datatable/EntityColumn.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.datatable;
+package com.gitplex.server.web.component.datatable;
import org.apache.wicket.Component;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -7,10 +7,10 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
+import com.gitplex.server.persistence.AbstractEntity;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
public class EntityColumn<T extends AbstractEntity> implements IStyledColumn<T, String> {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/datatable/EntityDataProvider.java b/web/src/main/java/com/gitplex/server/web/component/datatable/EntityDataProvider.java
similarity index 86%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/datatable/EntityDataProvider.java
rename to web/src/main/java/com/gitplex/server/web/component/datatable/EntityDataProvider.java
index 7cc362a4be..67d5bac252 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/datatable/EntityDataProvider.java
+++ b/web/src/main/java/com/gitplex/server/web/component/datatable/EntityDataProvider.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.datatable;
+package com.gitplex.server.web.component.datatable;
import java.util.Iterator;
@@ -8,10 +8,10 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.hibernate.criterion.Order;
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.calla.loader.AppLoader;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.persistence.AbstractEntity;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
@SuppressWarnings("serial")
public class EntityDataProvider<T extends AbstractEntity> extends SortableDataProvider<T, String> {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/datatable/SelectionColumn.java b/web/src/main/java/com/gitplex/server/web/component/datatable/SelectionColumn.java
similarity index 98%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/datatable/SelectionColumn.java
rename to web/src/main/java/com/gitplex/server/web/component/datatable/SelectionColumn.java
index 11f87bd9fd..62cf6a7bf5 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/datatable/SelectionColumn.java
+++ b/web/src/main/java/com/gitplex/server/web/component/datatable/SelectionColumn.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.datatable;
+package com.gitplex.server.web.component.datatable;
import java.util.HashSet;
import java.util.Set;
@@ -26,7 +26,7 @@ import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
/**
* Add this column to the wicket DataTable component so that user can select row of the
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/datetime/DatetimePicker.java b/web/src/main/java/com/gitplex/server/web/component/datetime/DatetimePicker.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/datetime/DatetimePicker.java
rename to web/src/main/java/com/gitplex/server/web/component/datetime/DatetimePicker.java
index 36f81dc260..ff0021b303 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/datetime/DatetimePicker.java
+++ b/web/src/main/java/com/gitplex/server/web/component/datetime/DatetimePicker.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.datetime;
+package com.gitplex.server.web.component.datetime;
import java.util.Date;
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoice.java b/web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoice.java
index f0d7ab3a7f..34b0025145 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoice.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoice.java
@@ -4,8 +4,8 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.component.select2.Select2Choice;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.web.component.select2.Select2Choice;
@SuppressWarnings("serial")
public class AbstractDepotChoice extends Select2Choice<Depot> {
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoiceProvider.java
index 08d2e87347..fa1757cfc3 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoiceProvider.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotchoice/AbstractDepotChoiceProvider.java
@@ -8,10 +8,10 @@ import org.json.JSONException;
import org.json.JSONWriter;
import com.google.common.collect.Lists;
-import com.gitplex.commons.wicket.component.select2.ChoiceProvider;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.DepotManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.web.component.select2.ChoiceProvider;
@SuppressWarnings("serial")
public abstract class AbstractDepotChoiceProvider extends ChoiceProvider<Depot> {
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java
index 551f9382e3..7533bcbdf0 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java
@@ -37,14 +37,9 @@ import org.eclipse.jgit.lib.ObjectId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.git.BlobIdent;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.commons.wicket.behavior.RunTaskBehavior;
-import com.gitplex.commons.wicket.component.tabbable.AjaxActionTab;
-import com.gitplex.commons.wicket.component.tabbable.Tab;
-import com.gitplex.commons.wicket.component.tabbable.Tabbable;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.git.BlobIdent;
import com.gitplex.server.search.SearchManager;
import com.gitplex.server.search.hit.QueryHit;
import com.gitplex.server.search.query.BlobQuery;
@@ -52,7 +47,12 @@ import com.gitplex.server.search.query.FileQuery;
import com.gitplex.server.search.query.SymbolQuery;
import com.gitplex.server.search.query.TextQuery;
import com.gitplex.server.search.query.TooGeneralQueryException;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.web.behavior.RunTaskBehavior;
import com.gitplex.server.web.component.depotfile.blobsearch.result.SearchResultPanel;
+import com.gitplex.server.web.component.tabbable.AjaxActionTab;
+import com.gitplex.server.web.component.tabbable.Tab;
+import com.gitplex.server.web.component.tabbable.Tabbable;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java
index 87c7c026ea..5f91613368 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java
@@ -29,25 +29,25 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.gitplex.commons.wicket.behavior.RunTaskBehavior;
-import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;
-import com.gitplex.commons.wicket.component.floating.AlignPlacement;
-import com.gitplex.commons.wicket.component.floating.ComponentTarget;
-import com.gitplex.commons.wicket.component.floating.FloatingPanel;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.support.TextRange;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.support.TextRange;
import com.gitplex.server.search.SearchManager;
import com.gitplex.server.search.hit.QueryHit;
import com.gitplex.server.search.query.BlobQuery;
import com.gitplex.server.search.query.FileQuery;
import com.gitplex.server.search.query.SymbolQuery;
import com.gitplex.server.search.query.TooGeneralQueryException;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.server.web.behavior.RunTaskBehavior;
+import com.gitplex.server.web.component.PreventDefaultAjaxLink;
import com.gitplex.server.web.component.depotfile.blobsearch.result.SearchResultPanel;
+import com.gitplex.server.web.component.floating.AlignPlacement;
+import com.gitplex.server.web.component.floating.ComponentTarget;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
+import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
@SuppressWarnings("serial")
public abstract class InstantSearchPanel extends Panel {
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchResourceReference.java
index 4fe876f9d5..3b41e6503c 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchResourceReference.java
@@ -6,9 +6,9 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import com.gitplex.commons.wicket.assets.doneevents.DoneEventsResourceReference;
-import com.gitplex.commons.wicket.assets.hotkeys.HotkeysResourceReference;
-import com.gitplex.commons.wicket.assets.scrollintoview.ScrollIntoViewResourceReference;
+import com.gitplex.server.web.assets.doneevents.DoneEventsResourceReference;
+import com.gitplex.server.web.assets.hotkeys.HotkeysResourceReference;
+import com.gitplex.server.web.assets.scrollintoview.ScrollIntoViewResourceReference;
import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.java
index d0532dbb72..8a24393218 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.java
@@ -25,12 +25,12 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.FileMode;
-import com.gitplex.commons.git.BlobIdent;
-import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;
-import com.gitplex.server.core.entity.support.TextRange;
+import com.gitplex.server.entity.support.TextRange;
+import com.gitplex.server.git.BlobIdent;
import com.gitplex.server.search.hit.FileHit;
import com.gitplex.server.search.hit.QueryHit;
import com.gitplex.server.search.hit.TextHit;
+import com.gitplex.server.web.component.PreventDefaultAjaxLink;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
import com.gitplex.jsymbol.Range;
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultResourceReference.java
index 378e0f775d..2bfe6305fe 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultResourceReference.java
@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
-import com.gitplex.commons.wicket.assets.uri.URIResourceReference;
+import com.gitplex.server.web.assets.uri.URIResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
public class SearchResultResourceReference extends BaseDependentResourceReference {
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobRenderer.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobRenderer.java
index 36828a8d25..71347ff539 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobRenderer.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobRenderer.java
@@ -2,7 +2,7 @@ package com.gitplex.server.web.component.depotfile.blobview;
import javax.annotation.Nullable;
-import com.gitplex.calla.loader.ExtensionPoint;
+import com.gitplex.launcher.loader.ExtensionPoint;
@ExtensionPoint
public interface BlobRenderer {
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewContext.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewContext.java
index 5ee295cd87..973d4a1542 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewContext.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewContext.java
@@ -8,12 +8,12 @@ import javax.annotation.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.eclipse.jgit.revwalk.RevCommit;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.support.TextRange;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.support.TextRange;
+import com.gitplex.server.git.BlobIdent;
import com.gitplex.server.search.hit.QueryHit;
import com.gitplex.jsymbol.TokenPosition;
-import com.gitplex.commons.git.BlobIdent;
public interface BlobViewContext extends Serializable {
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewPanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewPanel.java
index 208f85064e..16b308ad6d 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewPanel.java
@@ -18,15 +18,15 @@ import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.request.cycle.RequestCycle;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.git.BlobIdent;
-import com.gitplex.commons.util.FileUtils;
-import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;
-import com.gitplex.commons.wicket.component.ViewStateAwareAjaxLink;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.git.BlobIdent;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.server.web.component.PreventDefaultAjaxLink;
+import com.gitplex.server.web.component.ViewStateAwareAjaxLink;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
-import com.gitplex.server.web.resource.BlobResource;
-import com.gitplex.server.web.resource.BlobResourceReference;
+import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
+import com.gitplex.server.web.util.resource.BlobResource;
+import com.gitplex.server.web.util.resource.BlobResourceReference;
@SuppressWarnings("serial")
public abstract class BlobViewPanel extends Panel {
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryRenderer.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryRenderer.java
index 48e29ab977..02bd013557 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryRenderer.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryRenderer.java
@@ -1,6 +1,6 @@
package com.gitplex.server.web.component.depotfile.blobview.binary;
-import com.gitplex.commons.git.Blob;
+import com.gitplex.server.git.Blob;
import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkPanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkPanel.java
index 9dd74ae15a..8455b313ac 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkPanel.java
@@ -7,10 +7,10 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.Link;
-import com.gitplex.commons.git.Blob;
-import com.gitplex.commons.git.Submodule;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.manager.ConfigManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.git.Blob;
+import com.gitplex.server.git.Submodule;
+import com.gitplex.server.manager.ConfigManager;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageRenderer.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageRenderer.java
index 6adb7836d0..d5d87e01cd 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageRenderer.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageRenderer.java
@@ -1,6 +1,6 @@
package com.gitplex.server.web.component.depotfile.blobview.image;
-import com.gitplex.commons.git.Blob;
+import com.gitplex.server.git.Blob;
import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageViewPanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageViewPanel.java
index 4b35103bc6..cea9986a40 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageViewPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageViewPanel.java
@@ -6,8 +6,8 @@ import org.apache.wicket.markup.html.image.Image;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;
-import com.gitplex.server.web.resource.BlobResource;
-import com.gitplex.server.web.resource.BlobResourceReference;
+import com.gitplex.server.web.util.resource.BlobResource;
+import com.gitplex.server.web.util.resource.BlobResourceReference;
@SuppressWarnings("serial")
public class ImageViewPanel extends BlobViewPanel {
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFilePanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFilePanel.java
index 2cf41d8965..b3e8a06656 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFilePanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFilePanel.java
@@ -7,11 +7,11 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.Model;
-import com.gitplex.commons.git.Blob;
-import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;
-import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;
+import com.gitplex.server.git.Blob;
+import com.gitplex.server.web.component.PreventDefaultAjaxLink;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;
+import com.gitplex.server.web.component.markdown.MarkdownPanel;
@SuppressWarnings("serial")
public class MarkdownFilePanel extends BlobViewPanel {
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownRenderer.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownRenderer.java
index 10c56fb918..4521f0c888 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownRenderer.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownRenderer.java
@@ -1,6 +1,6 @@
package com.gitplex.server.web.component.depotfile.blobview.markdown;
-import com.gitplex.commons.git.Blob;
+import com.gitplex.server.git.Blob;
import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceRenderer.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceRenderer.java
index 12111242a3..934077ce08 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceRenderer.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceRenderer.java
@@ -1,6 +1,6 @@
package com.gitplex.server.web.component.depotfile.blobview.source;
-import com.gitplex.commons.git.Blob;
+import com.gitplex.server.git.Blob;
import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.java
index cbddf60a9e..fd2fff3c11 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.java
@@ -48,27 +48,25 @@ import org.unbescape.javascript.JavaScriptEscape;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gitplex.commons.git.Blame;
-import com.gitplex.commons.git.Blob;
-import com.gitplex.commons.git.BlobIdent;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.git.command.BlameCommand;
-import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;
-import com.gitplex.commons.wicket.websocket.WebSocketRenderBehavior;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.support.CommentPos;
-import com.gitplex.server.core.entity.support.CompareContext;
-import com.gitplex.server.core.entity.support.TextRange;
-import com.gitplex.server.core.manager.CodeCommentManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.support.CommentPos;
+import com.gitplex.server.entity.support.CompareContext;
+import com.gitplex.server.entity.support.TextRange;
+import com.gitplex.server.git.Blame;
+import com.gitplex.server.git.Blob;
+import com.gitplex.server.git.BlobIdent;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.git.command.BlameCommand;
+import com.gitplex.server.manager.CodeCommentManager;
import com.gitplex.server.search.hit.QueryHit;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
import com.gitplex.server.web.behavior.blamemessage.BlameMessageBehavior;
+import com.gitplex.server.web.component.DropdownLink;
+import com.gitplex.server.web.component.PreventDefaultAjaxLink;
import com.gitplex.server.web.component.comment.CodeCommentPanel;
import com.gitplex.server.web.component.comment.CommentInput;
import com.gitplex.server.web.component.comment.DepotAttachmentSupport;
@@ -82,6 +80,8 @@ import com.gitplex.server.web.component.symboltooltip.SymbolTooltipPanel;
import com.gitplex.server.web.page.depot.commit.CommitDetailPage;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
import com.gitplex.server.web.util.DateUtils;
+import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
+import com.gitplex.server.web.websocket.WebSocketRenderBehavior;
import com.gitplex.jsymbol.ExtractException;
import com.gitplex.jsymbol.Range;
import com.gitplex.jsymbol.Symbol;
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewResourceReference.java
index fda8a276f5..3359b27f05 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewResourceReference.java
@@ -6,11 +6,11 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import com.gitplex.commons.wicket.assets.codemirror.CodeMirrorResourceReference;
-import com.gitplex.commons.wicket.assets.cookies.CookiesResourceReference;
-import com.gitplex.commons.wicket.assets.hover.HoverResourceReference;
-import com.gitplex.commons.wicket.assets.jqueryui.JQueryUIResourceReference;
-import com.gitplex.commons.wicket.assets.selectionpopover.SelectionPopoverResourceReference;
+import com.gitplex.server.web.assets.codemirror.CodeMirrorResourceReference;
+import com.gitplex.server.web.assets.cookies.CookiesResourceReference;
+import com.gitplex.server.web.assets.hover.HoverResourceReference;
+import com.gitplex.server.web.assets.jqueryui.JQueryUIResourceReference;
+import com.gitplex.server.web.assets.selectionpopover.SelectionPopoverResourceReference;
import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.java
index 9876c9ba7b..272e5a3e6f 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.java
@@ -17,7 +17,7 @@ import org.eclipse.jgit.revwalk.RevTree;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.treewalk.TreeWalk;
-import com.gitplex.commons.git.Blob;
+import com.gitplex.server.git.Blob;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSavePanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSavePanel.java
index 33975339f4..c0f26af9bd 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSavePanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSavePanel.java
@@ -32,20 +32,20 @@ import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.treewalk.TreeWalk;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.git.Blob;
-import com.gitplex.commons.git.BlobChange;
-import com.gitplex.commons.git.BlobIdent;
-import com.gitplex.commons.git.FileEdit;
-import com.gitplex.commons.git.PathAndContent;
-import com.gitplex.commons.git.exception.GitObjectAlreadyExistsException;
-import com.gitplex.commons.git.exception.NotGitTreeException;
-import com.gitplex.commons.git.exception.ObsoleteCommitException;
-import com.gitplex.commons.util.diff.WhitespaceOption;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.manager.AccountManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.git.Blob;
+import com.gitplex.server.git.BlobChange;
+import com.gitplex.server.git.BlobIdent;
+import com.gitplex.server.git.FileEdit;
+import com.gitplex.server.git.PathAndContent;
+import com.gitplex.server.git.exception.GitObjectAlreadyExistsException;
+import com.gitplex.server.git.exception.NotGitTreeException;
+import com.gitplex.server.git.exception.ObsoleteCommitException;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.util.diff.WhitespaceOption;
import com.gitplex.server.web.component.diff.blob.BlobDiffPanel;
import com.gitplex.server.web.component.diff.revision.DiffViewMode;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditPanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditPanel.java
index 6cd155ee53..3fc7ae9914 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditPanel.java
@@ -23,25 +23,25 @@ import org.eclipse.jgit.lib.ObjectId;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Charsets;
-import com.gitplex.commons.git.Blob;
-import com.gitplex.commons.git.BlobChange;
-import com.gitplex.commons.git.BlobIdent;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.git.PathAndContent;
-import com.gitplex.commons.util.diff.WhitespaceOption;
-import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.gitplex.commons.wicket.component.ViewStateAwareAjaxLink;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.support.TextRange;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.support.TextRange;
+import com.gitplex.server.git.Blob;
+import com.gitplex.server.git.BlobChange;
+import com.gitplex.server.git.BlobIdent;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.git.PathAndContent;
+import com.gitplex.server.util.diff.WhitespaceOption;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.server.web.component.ViewStateAwareAjaxLink;
import com.gitplex.server.web.component.depotfile.editsave.EditSavePanel;
import com.gitplex.server.web.component.diff.blob.BlobDiffPanel;
import com.gitplex.server.web.component.diff.revision.DiffViewMode;
import com.gitplex.server.web.component.sourceformat.OptionChangeCallback;
import com.gitplex.server.web.component.sourceformat.SourceFormatPanel;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
+import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
@SuppressWarnings("serial")
public abstract class FileEditPanel extends Panel {
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditResourceReference.java
index c1661e98f8..a3b68dbabc 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditResourceReference.java
@@ -7,8 +7,8 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
-import com.gitplex.commons.wicket.assets.codemirror.CodeMirrorResourceReference;
-import com.gitplex.commons.wicket.assets.diffmatchpatch.DiffMatchPatchResourceReference;
+import com.gitplex.server.web.assets.codemirror.CodeMirrorResourceReference;
+import com.gitplex.server.web.assets.diffmatchpatch.DiffMatchPatchResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
public class FileEditResourceReference extends BaseDependentResourceReference {
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.java
index f40ff84e6f..fae6d64524 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.java
@@ -30,13 +30,13 @@ import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.treewalk.TreeWalk;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.git.Blob;
-import com.gitplex.commons.git.BlobIdent;
-import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;
-import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.git.Blob;
+import com.gitplex.server.git.BlobIdent;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.component.PreventDefaultAjaxLink;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext.Mode;
+import com.gitplex.server.web.component.markdown.MarkdownPanel;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/LastCommitsResource.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/LastCommitsResource.java
index 6ef89d5c73..e5c5f56006 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/LastCommitsResource.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/LastCommitsResource.java
@@ -17,16 +17,16 @@ import org.unbescape.html.HtmlEscape;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.web.avatar.AvatarManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.page.account.overview.AccountOverviewPage;
import com.gitplex.server.web.page.depot.commit.CommitDetailPage;
import com.gitplex.server.web.util.DateUtils;
+import com.gitplex.server.web.util.avatar.AvatarManager;
/**
* Loading commits of children may take some time, and we do this via resource loading to avoid blocking
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigator.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigator.java
index 80420a53d4..c7c263130a 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigator.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigator.java
@@ -41,18 +41,18 @@ import org.eclipse.jgit.treewalk.TreeWalk;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
-import com.gitplex.commons.git.BlobIdent;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;
-import com.gitplex.commons.wicket.component.floating.AlignPlacement;
-import com.gitplex.commons.wicket.component.floating.FloatingPanel;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.git.BlobIdent;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.StringUtils;
import com.gitplex.server.web.component.BlobIcon;
+import com.gitplex.server.web.component.DropdownLink;
+import com.gitplex.server.web.component.PreventDefaultAjaxLink;
import com.gitplex.server.web.component.depotfile.blobview.BlobNameChangeCallback;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;
+import com.gitplex.server.web.component.floating.AlignPlacement;
+import com.gitplex.server.web.component.floating.FloatingPanel;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
+import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
@SuppressWarnings("serial")
public abstract class FileNavigator extends Panel {
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.java b/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.java
index c4af4f258a..e6933572e7 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.java
@@ -26,12 +26,12 @@ import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.gitplex.commons.wicket.behavior.InputChangeBehavior;
-import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.DepotManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.server.web.behavior.InputChangeBehavior;
+import com.gitplex.server.web.component.PreventDefaultAjaxLink;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelectorResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelectorResourceReference.java
index abfd215714..d77adc4266 100644
--- a/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelectorResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelectorResourceReference.java
@@ -7,8 +7,8 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
-import com.gitplex.commons.wicket.assets.hotkeys.HotkeysResourceReference;
-import com.gitplex.commons.wicket.assets.scrollintoview.ScrollIntoViewResourceReference;
+import com.gitplex.server.web.assets.hotkeys.HotkeysResourceReference;
+import com.gitplex.server.web.assets.scrollintoview.ScrollIntoViewResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
public class DepotSelectorResourceReference extends BaseDependentResourceReference {
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/DiffRenderer.java b/web/src/main/java/com/gitplex/server/web/component/diff/DiffRenderer.java
index 15f0309c94..1329b9fe69 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/DiffRenderer.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/DiffRenderer.java
@@ -5,8 +5,8 @@ import javax.annotation.Nullable;
import org.apache.tika.mime.MediaType;
import org.apache.wicket.markup.html.panel.Panel;
-import com.gitplex.commons.git.BlobChange;
-import com.gitplex.calla.loader.ExtensionPoint;
+import com.gitplex.launcher.loader.ExtensionPoint;
+import com.gitplex.server.git.BlobChange;
@ExtensionPoint
public interface DiffRenderer {
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.java
index d68c5cf740..9e9f818e80 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.java
@@ -14,15 +14,15 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
-import com.gitplex.commons.git.Blob;
-import com.gitplex.commons.git.BlobChange;
-import com.gitplex.commons.util.diff.DiffUtils;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.support.CommentPos;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.support.CommentPos;
+import com.gitplex.server.git.Blob;
+import com.gitplex.server.git.BlobChange;
+import com.gitplex.server.util.diff.DiffUtils;
+import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.component.diff.DiffRenderer;
import com.gitplex.server.web.component.diff.blob.text.TextDiffPanel;
import com.gitplex.server.web.component.diff.difftitle.BlobDiffTitle;
@@ -74,7 +74,7 @@ public class BlobDiffPanel extends Panel implements SourceAware {
if (blob.getText() != null) {
if (blob.getText().getLines().size() > DiffUtils.MAX_DIFF_SIZE) {
add(newFragment("Unable to diff as the file is too large.", true));
- } else if (change.getAdditions()+change.getDeletions() > Constants.MAX_SINGLE_FILE_DIFF_LINES) {
+ } else if (change.getAdditions()+change.getDeletions() > WebConstants.MAX_SINGLE_FILE_DIFF_LINES) {
add(newFragment("Diff is too large to be displayed.", true));
} else if (change.getDiffBlocks().isEmpty()) {
if (change.getNewBlobIdent().path != null)
@@ -112,7 +112,7 @@ public class BlobDiffPanel extends Panel implements SourceAware {
if (change.getOldText() != null && change.getNewText() != null) {
if (change.getOldText().getLines().size() + change.getNewText().getLines().size() > DiffUtils.MAX_DIFF_SIZE) {
add(newFragment("Unable to diff as the file is too large.", true));
- } else if (change.getAdditions() + change.getDeletions() > Constants.MAX_SINGLE_FILE_DIFF_LINES) {
+ } else if (change.getAdditions() + change.getDeletions() > WebConstants.MAX_SINGLE_FILE_DIFF_LINES) {
add(newFragment("Diff is too large to be displayed.", true));
} else if (change.getAdditions() + change.getDeletions() == 0
&& (markSupport == null || markSupport.getComments().isEmpty())) {
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/SourceAware.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/SourceAware.java
index 91c52eda36..d61cf028ff 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/SourceAware.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/SourceAware.java
@@ -4,8 +4,8 @@ import javax.annotation.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.support.CommentPos;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.support.CommentPos;
public interface SourceAware {
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffPanel.java
index 331a701b86..79bdfb8247 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffPanel.java
@@ -2,7 +2,7 @@ package com.gitplex.server.web.component.diff.blob.image;
import org.apache.wicket.markup.html.panel.Panel;
-import com.gitplex.commons.git.BlobChange;
+import com.gitplex.server.git.BlobChange;
@SuppressWarnings("serial")
public class ImageDiffPanel extends Panel {
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffRenderer.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffRenderer.java
index 3bda777a01..41376320e6 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffRenderer.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffRenderer.java
@@ -3,7 +3,7 @@ package com.gitplex.server.web.component.diff.blob.image;
import org.apache.tika.mime.MediaType;
import org.apache.wicket.markup.html.panel.Panel;
-import com.gitplex.commons.git.BlobChange;
+import com.gitplex.server.git.BlobChange;
import com.gitplex.server.web.component.diff.DiffRenderer;
public class ImageDiffRenderer implements DiffRenderer {
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java
index db2ad9140c..3f5d2eef1e 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java
@@ -36,29 +36,29 @@ import org.unbescape.html.HtmlEscape;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gitplex.commons.git.Blame;
-import com.gitplex.commons.git.BlobChange;
-import com.gitplex.commons.git.BriefCommit;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.git.command.BlameCommand;
-import com.gitplex.commons.util.RangeUtils;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.commons.util.diff.DiffBlock;
-import com.gitplex.commons.util.diff.DiffMatchPatch.Operation;
-import com.gitplex.commons.util.diff.DiffUtils;
-import com.gitplex.commons.util.diff.LineDiff;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
import com.gitplex.jsyntax.Token;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.support.CommentPos;
-import com.gitplex.server.core.entity.support.TextRange;
-import com.gitplex.server.core.manager.CodeCommentManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.support.CommentPos;
+import com.gitplex.server.entity.support.TextRange;
+import com.gitplex.server.git.Blame;
+import com.gitplex.server.git.BlobChange;
+import com.gitplex.server.git.BriefCommit;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.git.command.BlameCommand;
+import com.gitplex.server.manager.CodeCommentManager;
import com.gitplex.server.search.hit.QueryHit;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.RangeUtils;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.util.diff.DiffBlock;
+import com.gitplex.server.util.diff.DiffUtils;
+import com.gitplex.server.util.diff.LineDiff;
+import com.gitplex.server.util.diff.DiffMatchPatch.Operation;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
import com.gitplex.server.web.behavior.blamemessage.BlameMessageBehavior;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext.Mode;
import com.gitplex.server.web.component.diff.blob.SourceAware;
@@ -294,8 +294,8 @@ public class TextDiffPanel extends Panel implements SourceAware {
int index = params.getParameterValue("param1").toInt();
Integer lastContextSize = contextSizes.get(index);
if (lastContextSize == null)
- lastContextSize = Constants.DIFF_CONTEXT_SIZE;
- int contextSize = lastContextSize + Constants.DIFF_EXPAND_SIZE;
+ lastContextSize = WebConstants.DIFF_CONTEXT_SIZE;
+ int contextSize = lastContextSize + WebConstants.DIFF_EXPAND_SIZE;
contextSizes.put(index, contextSize);
StringBuilder builder = new StringBuilder();
@@ -579,7 +579,7 @@ public class TextDiffPanel extends Panel implements SourceAware {
if (block.getType() == Type.EQUAL) {
Integer lastContextSize = contextSizes.get(i);
if (lastContextSize == null)
- lastContextSize = Constants.DIFF_CONTEXT_SIZE;
+ lastContextSize = WebConstants.DIFF_CONTEXT_SIZE;
appendEquals(builder, i, 0, lastContextSize);
} else if (block.getType() == Type.MARKED_EQUAL) {
appendMarkedEquals(builder, i);
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffResourceReference.java
index 14af77ccfb..58c843bbeb 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffResourceReference.java
@@ -7,8 +7,8 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
-import com.gitplex.commons.wicket.assets.hover.HoverResourceReference;
-import com.gitplex.commons.wicket.assets.selectionpopover.SelectionPopoverResourceReference;
+import com.gitplex.server.web.assets.hover.HoverResourceReference;
+import com.gitplex.server.web.assets.selectionpopover.SelectionPopoverResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/diffstat/DiffStatBar.java b/web/src/main/java/com/gitplex/server/web/component/diff/diffstat/DiffStatBar.java
index f41e63e8a3..37a6e1f59d 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/diffstat/DiffStatBar.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/diffstat/DiffStatBar.java
@@ -7,7 +7,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.LoadableDetachableModel;
-import com.gitplex.commons.wicket.behavior.TooltipBehavior;
+import com.gitplex.server.web.behavior.TooltipBehavior;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig.Placement;
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/difftitle/BlobDiffTitle.java b/web/src/main/java/com/gitplex/server/web/component/diff/difftitle/BlobDiffTitle.java
index 2d114affae..408d642d4c 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/difftitle/BlobDiffTitle.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/difftitle/BlobDiffTitle.java
@@ -6,7 +6,7 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
-import com.gitplex.commons.git.BlobChange;
+import com.gitplex.server.git.BlobChange;
@SuppressWarnings("serial")
public class BlobDiffTitle extends Panel {
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.java
index dfd6263365..5334f1d43f 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.java
@@ -8,8 +8,8 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.support.CommentPos;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.support.CommentPos;
public interface BlobCommentSupport extends Serializable {
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/CommentSupport.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/CommentSupport.java
index ba83a02991..a1514ec0c7 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/CommentSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/CommentSupport.java
@@ -6,8 +6,8 @@ import javax.annotation.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.support.CommentPos;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.support.CommentPos;
public interface CommentSupport extends Serializable {
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
index 8c64ed9942..6d397b3bc6 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -53,32 +53,28 @@ import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.revwalk.RevCommit;
-import com.google.common.base.Objects;
-import com.google.common.collect.Lists;
-import com.gitplex.commons.antlr.codeassist.InputCompletion;
-import com.gitplex.commons.antlr.codeassist.InputStatus;
-import com.gitplex.commons.antlr.codeassist.InputSuggestion;
-import com.gitplex.commons.git.Blob;
-import com.gitplex.commons.git.BlobChange;
-import com.gitplex.commons.git.BlobIdent;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.commons.util.diff.DiffUtils;
-import com.gitplex.commons.util.diff.WhitespaceOption;
-import com.gitplex.commons.util.match.WildcardUtils;
-import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.gitplex.commons.wicket.behavior.inputassist.InputAssistBehavior;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.commons.wicket.component.menu.MenuItem;
-import com.gitplex.commons.wicket.component.menu.MenuLink;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.support.CommentPos;
-import com.gitplex.server.core.entity.support.CompareContext;
-import com.gitplex.server.core.manager.CodeCommentManager;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.web.Constants;
+import com.gitplex.codeassist.InputCompletion;
+import com.gitplex.codeassist.InputStatus;
+import com.gitplex.codeassist.InputSuggestion;
+import com.gitplex.jsymbol.Range;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.support.CommentPos;
+import com.gitplex.server.entity.support.CompareContext;
+import com.gitplex.server.git.Blob;
+import com.gitplex.server.git.BlobChange;
+import com.gitplex.server.git.BlobIdent;
+import com.gitplex.server.manager.CodeCommentManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.util.diff.DiffUtils;
+import com.gitplex.server.util.diff.WhitespaceOption;
+import com.gitplex.server.util.match.WildcardUtils;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.behavior.inputassist.InputAssistBehavior;
+import com.gitplex.server.web.component.DropdownLink;
import com.gitplex.server.web.component.comment.CodeCommentPanel;
import com.gitplex.server.web.component.comment.CommentInput;
import com.gitplex.server.web.component.comment.DepotAttachmentSupport;
@@ -86,8 +82,12 @@ import com.gitplex.server.web.component.comment.comparecontext.CompareContextPan
import com.gitplex.server.web.component.diff.blob.BlobDiffPanel;
import com.gitplex.server.web.component.diff.blob.SourceAware;
import com.gitplex.server.web.component.diff.diffstat.DiffStatBar;
+import com.gitplex.server.web.component.menu.MenuItem;
+import com.gitplex.server.web.component.menu.MenuLink;
import com.gitplex.server.web.util.SuggestionUtils;
-import com.gitplex.jsymbol.Range;
+import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
+import com.google.common.base.Objects;
+import com.google.common.collect.Lists;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
@@ -254,8 +254,8 @@ public class RevisionDiffPanel extends Panel {
->Paths.get(change1.getPath()).compareTo(Paths.get(change2.getPath())));
List<BlobChange> diffChanges = new ArrayList<>();
- if (normalizedChanges.size() > Constants.MAX_DIFF_FILES)
- diffChanges = normalizedChanges.subList(0, Constants.MAX_DIFF_FILES);
+ if (normalizedChanges.size() > WebConstants.MAX_DIFF_FILES)
+ diffChanges = normalizedChanges.subList(0, WebConstants.MAX_DIFF_FILES);
else
diffChanges = normalizedChanges;
@@ -312,9 +312,9 @@ public class RevisionDiffPanel extends Panel {
* display smaller diffs from different files as many as
* possible
*/
- if (changedLines <= Constants.MAX_SINGLE_FILE_DIFF_LINES) {
+ if (changedLines <= WebConstants.MAX_SINGLE_FILE_DIFF_LINES) {
totalChangedLines += changedLines;
- if (totalChangedLines <= Constants.MAX_DIFF_LINES)
+ if (totalChangedLines <= WebConstants.MAX_DIFF_LINES)
displayChanges.add(change);
else
break;
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffResourceReference.java
index fc8c874fab..3d28fbcf15 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffResourceReference.java
@@ -6,8 +6,8 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import com.gitplex.commons.wicket.assets.cookies.CookiesResourceReference;
-import com.gitplex.commons.wicket.assets.jqueryui.JQueryUIResourceReference;
+import com.gitplex.server.web.assets.cookies.CookiesResourceReference;
+import com.gitplex.server.web.assets.jqueryui.JQueryUIResourceReference;
import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/floating/AlignPlacement.java b/web/src/main/java/com/gitplex/server/web/component/floating/AlignPlacement.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/floating/AlignPlacement.java
rename to web/src/main/java/com/gitplex/server/web/component/floating/AlignPlacement.java
index 88d7ea79b5..6ced9486b6 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/floating/AlignPlacement.java
+++ b/web/src/main/java/com/gitplex/server/web/component/floating/AlignPlacement.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.floating;
+package com.gitplex.server.web.component.floating;
import java.io.Serializable;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/floating/AlignTarget.java b/web/src/main/java/com/gitplex/server/web/component/floating/AlignTarget.java
similarity index 60%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/floating/AlignTarget.java
rename to web/src/main/java/com/gitplex/server/web/component/floating/AlignTarget.java
index 36f52b0cc2..f94e64778d 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/floating/AlignTarget.java
+++ b/web/src/main/java/com/gitplex/server/web/component/floating/AlignTarget.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.floating;
+package com.gitplex.server.web.component.floating;
import java.io.Serializable;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/floating/ComponentTarget.java b/web/src/main/java/com/gitplex/server/web/component/floating/ComponentTarget.java
similarity index 91%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/floating/ComponentTarget.java
rename to web/src/main/java/com/gitplex/server/web/component/floating/ComponentTarget.java
index 11b1d41cc6..7fcc97df2a 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/floating/ComponentTarget.java
+++ b/web/src/main/java/com/gitplex/server/web/component/floating/ComponentTarget.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.floating;
+package com.gitplex.server.web.component.floating;
import org.apache.wicket.Component;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/floating/FloatingPanel.html b/web/src/main/java/com/gitplex/server/web/component/floating/FloatingPanel.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/floating/FloatingPanel.html
rename to web/src/main/java/com/gitplex/server/web/component/floating/FloatingPanel.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/floating/FloatingPanel.java b/web/src/main/java/com/gitplex/server/web/component/floating/FloatingPanel.java
similarity index 93%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/floating/FloatingPanel.java
rename to web/src/main/java/com/gitplex/server/web/component/floating/FloatingPanel.java
index 64c9f92336..6693ab6271 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/floating/FloatingPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/floating/FloatingPanel.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.floating;
+package com.gitplex.server.web.component.floating;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -9,8 +9,8 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.request.cycle.RequestCycle;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.gitplex.commons.wicket.page.CommonPage;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.server.web.page.CommonPage;
@SuppressWarnings("serial")
public abstract class FloatingPanel extends Panel {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/floating/FloatingResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/floating/FloatingResourceReference.java
similarity index 84%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/floating/FloatingResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/component/floating/FloatingResourceReference.java
index c9cc8a6578..4fed6b2816 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/floating/FloatingResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/component/floating/FloatingResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.floating;
+package com.gitplex.server.web.component.floating;
import java.util.List;
@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
-import com.gitplex.commons.wicket.page.CommonDependentResourceReference;
+import com.gitplex.server.web.page.CommonDependentResourceReference;
public class FloatingResourceReference extends CommonDependentResourceReference {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/floating/RectTarget.java b/web/src/main/java/com/gitplex/server/web/component/floating/RectTarget.java
similarity index 92%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/floating/RectTarget.java
rename to web/src/main/java/com/gitplex/server/web/component/floating/RectTarget.java
index 089e6c77fa..2a436b44bd 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/floating/RectTarget.java
+++ b/web/src/main/java/com/gitplex/server/web/component/floating/RectTarget.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.floating;
+package com.gitplex.server.web.component.floating;
public class RectTarget implements AlignTarget {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/floating/floating.css b/web/src/main/java/com/gitplex/server/web/component/floating/floating.css
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/floating/floating.css
rename to web/src/main/java/com/gitplex/server/web/component/floating/floating.css
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/floating/floating.js b/web/src/main/java/com/gitplex/server/web/component/floating/floating.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/floating/floating.js
rename to web/src/main/java/com/gitplex/server/web/component/floating/floating.js
diff --git a/web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchBehavior.java b/web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchBehavior.java
index a68d798a91..ee008d174c 100644
--- a/web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchBehavior.java
@@ -6,15 +6,15 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.antlr.codeassist.InputSuggestion;
-import com.gitplex.commons.antlr.codeassist.ParentedElement;
-import com.gitplex.commons.antlr.grammar.LexerRuleRefElementSpec;
-import com.gitplex.commons.antlr.parser.Element;
-import com.gitplex.commons.wicket.behavior.inputassist.ANTLRAssistBehavior;
-import com.gitplex.server.core.util.fullbranchmatch.FullBranchMatchParser;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.DepotManager;
+import com.gitplex.codeassist.InputSuggestion;
+import com.gitplex.codeassist.ParentedElement;
+import com.gitplex.codeassist.grammar.LexerRuleRefElementSpec;
+import com.gitplex.codeassist.parser.Element;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.util.fullbranchmatch.FullBranchMatchParser;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.web.behavior.inputassist.ANTLRAssistBehavior;
import com.gitplex.server.web.page.depot.DepotPage;
import com.gitplex.server.web.util.SuggestionUtils;
diff --git a/web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchInput.java b/web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchInput.java
index 19b23ab72e..6f0157bcc0 100644
--- a/web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchInput.java
+++ b/web/src/main/java/com/gitplex/server/web/component/fullbranchmatch/FullBranchMatchInput.java
@@ -10,8 +10,8 @@ import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidationError;
import org.apache.wicket.validation.IValidator;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.util.fullbranchmatch.FullBranchMatchUtils;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.util.fullbranchmatch.FullBranchMatchUtils;
@SuppressWarnings("serial")
public class FullBranchMatchInput extends TextField<String> {
diff --git a/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.java b/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.java
index 1bce4cf2eb..d7520918a1 100644
--- a/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.java
@@ -17,15 +17,15 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.OrganizationMembership;
-import com.gitplex.server.core.entity.TeamAuthorization;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.OrganizationMembership;
+import com.gitplex.server.entity.TeamAuthorization;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.security.privilege.DepotPrivilege;
import com.gitplex.server.web.component.avatar.Avatar;
-import com.gitplex.server.web.depotaccess.DepotAccess;
import com.gitplex.server.web.page.account.members.MemberEffectivePrivilegePage;
import com.gitplex.server.web.page.account.members.MemberPrivilegeSourcePage;
+import com.gitplex.server.web.util.depotaccess.DepotAccess;
import com.google.common.base.Preconditions;
@SuppressWarnings("serial")
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/loadingindicator/LoadingIndicator.html b/web/src/main/java/com/gitplex/server/web/component/loadingindicator/LoadingIndicator.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/loadingindicator/LoadingIndicator.html
rename to web/src/main/java/com/gitplex/server/web/component/loadingindicator/LoadingIndicator.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/loadingindicator/LoadingIndicator.java b/web/src/main/java/com/gitplex/server/web/component/loadingindicator/LoadingIndicator.java
similarity index 88%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/loadingindicator/LoadingIndicator.java
rename to web/src/main/java/com/gitplex/server/web/component/loadingindicator/LoadingIndicator.java
index 3cff7390ec..e2276858a7 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/loadingindicator/LoadingIndicator.java
+++ b/web/src/main/java/com/gitplex/server/web/component/loadingindicator/LoadingIndicator.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.loadingindicator;
+package com.gitplex.server.web.component.loadingindicator;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/loadingindicator/LoadingIndicatorResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/loadingindicator/LoadingIndicatorResourceReference.java
similarity index 83%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/loadingindicator/LoadingIndicatorResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/component/loadingindicator/LoadingIndicatorResourceReference.java
index 3858c460af..d007a3cce8 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/loadingindicator/LoadingIndicatorResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/component/loadingindicator/LoadingIndicatorResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.loadingindicator;
+package com.gitplex.server.web.component.loadingindicator;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/loadingindicator/ajax-indicator.gif b/web/src/main/java/com/gitplex/server/web/component/loadingindicator/ajax-indicator.gif
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/loadingindicator/ajax-indicator.gif
rename to web/src/main/java/com/gitplex/server/web/component/loadingindicator/ajax-indicator.gif
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/loadingindicator/loading-indicator.css b/web/src/main/java/com/gitplex/server/web/component/loadingindicator/loading-indicator.css
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/loadingindicator/loading-indicator.css
rename to web/src/main/java/com/gitplex/server/web/component/loadingindicator/loading-indicator.css
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/markdown/MarkdownEditSupport.java b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditSupport.java
similarity index 73%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/markdown/MarkdownEditSupport.java
rename to web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditSupport.java
index 566a048125..110d870936 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/markdown/MarkdownEditSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditSupport.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.markdown;
+package com.gitplex.server.web.component.markdown;
import java.io.Serializable;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/markdown/MarkdownPanel.html b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownPanel.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/markdown/MarkdownPanel.html
rename to web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownPanel.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/markdown/MarkdownPanel.java b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownPanel.java
similarity index 93%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/markdown/MarkdownPanel.java
rename to web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownPanel.java
index 91bdf55e11..e9852a533e 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/markdown/MarkdownPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownPanel.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.markdown;
+package com.gitplex.server.web.component.markdown;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
@@ -17,10 +17,10 @@ import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
import org.hibernate.StaleStateException;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.commons.markdown.MarkdownManager;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.util.markdown.MarkdownManager;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/markdown/MarkdownResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownResourceReference.java
similarity index 80%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/markdown/MarkdownResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownResourceReference.java
index d765ff873d..01102fd30c 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/markdown/MarkdownResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.markdown;
+package com.gitplex.server.web.component.markdown;
import java.util.List;
@@ -7,8 +7,8 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
-import com.gitplex.commons.wicket.assets.codemirror.CodeMirrorResourceReference;
-import com.gitplex.commons.wicket.page.CommonDependentResourceReference;
+import com.gitplex.server.web.assets.codemirror.CodeMirrorResourceReference;
+import com.gitplex.server.web.page.CommonDependentResourceReference;
public class MarkdownResourceReference extends CommonDependentResourceReference {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/markdown/markdown.css b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/markdown/markdown.css
rename to web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/markdown/markdown.js b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/markdown/markdown.js
rename to web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/menu/MenuItem.java b/web/src/main/java/com/gitplex/server/web/component/menu/MenuItem.java
similarity index 88%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/menu/MenuItem.java
rename to web/src/main/java/com/gitplex/server/web/component/menu/MenuItem.java
index 8afa4f7547..a6d840e929 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/menu/MenuItem.java
+++ b/web/src/main/java/com/gitplex/server/web/component/menu/MenuItem.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.menu;
+package com.gitplex.server.web.component.menu;
import java.io.Serializable;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/menu/MenuLink.java b/web/src/main/java/com/gitplex/server/web/component/menu/MenuLink.java
similarity index 83%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/menu/MenuLink.java
rename to web/src/main/java/com/gitplex/server/web/component/menu/MenuLink.java
index f11813d7b0..2219dfec28 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/menu/MenuLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/menu/MenuLink.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.menu;
+package com.gitplex.server.web.component.menu;
import java.util.List;
@@ -7,9 +7,9 @@ import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.commons.wicket.component.floating.AlignPlacement;
-import com.gitplex.commons.wicket.component.floating.FloatingPanel;
+import com.gitplex.server.web.component.DropdownLink;
+import com.gitplex.server.web.component.floating.AlignPlacement;
+import com.gitplex.server.web.component.floating.FloatingPanel;
@SuppressWarnings("serial")
public abstract class MenuLink extends DropdownLink {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/menu/MenuPanel.html b/web/src/main/java/com/gitplex/server/web/component/menu/MenuPanel.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/menu/MenuPanel.html
rename to web/src/main/java/com/gitplex/server/web/component/menu/MenuPanel.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/menu/MenuPanel.java b/web/src/main/java/com/gitplex/server/web/component/menu/MenuPanel.java
similarity index 97%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/menu/MenuPanel.java
rename to web/src/main/java/com/gitplex/server/web/component/menu/MenuPanel.java
index c3d5361e8a..f7891cfff8 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/menu/MenuPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/menu/MenuPanel.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.menu;
+package com.gitplex.server.web.component.menu;
import java.util.List;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/menu/MenuResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/menu/MenuResourceReference.java
similarity index 84%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/menu/MenuResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/component/menu/MenuResourceReference.java
index e57fa82c1f..a4a06ce391 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/menu/MenuResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/component/menu/MenuResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.menu;
+package com.gitplex.server.web.component.menu;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/menu/menu.css b/web/src/main/java/com/gitplex/server/web/component/menu/menu.css
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/menu/menu.css
rename to web/src/main/java/com/gitplex/server/web/component/menu/menu.css
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/modal/ModalLink.java b/web/src/main/java/com/gitplex/server/web/component/modal/ModalLink.java
similarity index 94%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/modal/ModalLink.java
rename to web/src/main/java/com/gitplex/server/web/component/modal/ModalLink.java
index 2568674591..bfde581984 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/modal/ModalLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/modal/ModalLink.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.modal;
+package com.gitplex.server.web.component.modal;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/modal/ModalPanel.html b/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/modal/ModalPanel.html
rename to web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/modal/ModalPanel.java b/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java
similarity index 93%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/modal/ModalPanel.java
rename to web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java
index 220c8198d9..d00fdb3ffa 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/modal/ModalPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.modal;
+package com.gitplex.server.web.component.modal;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -9,8 +9,8 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.gitplex.commons.wicket.page.CommonPage;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.server.web.page.CommonPage;
@SuppressWarnings("serial")
public abstract class ModalPanel extends Panel {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/modal/ModalResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/modal/ModalResourceReference.java
similarity index 64%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/modal/ModalResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/component/modal/ModalResourceReference.java
index 449527dc85..43ce5ace2a 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/modal/ModalResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/component/modal/ModalResourceReference.java
@@ -1,6 +1,6 @@
-package com.gitplex.commons.wicket.component.modal;
+package com.gitplex.server.web.component.modal;
-import com.gitplex.commons.wicket.page.CommonDependentResourceReference;
+import com.gitplex.server.web.page.CommonDependentResourceReference;
public class ModalResourceReference extends CommonDependentResourceReference {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/modal/modal.js b/web/src/main/java/com/gitplex/server/web/component/modal/modal.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/modal/modal.js
rename to web/src/main/java/com/gitplex/server/web/component/modal/modal.js
diff --git a/web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchBehavior.java b/web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchBehavior.java
index 0ad526bc9d..991e4327b9 100644
--- a/web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchBehavior.java
@@ -6,14 +6,14 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.antlr.codeassist.FenceAware;
-import com.gitplex.commons.antlr.codeassist.InputSuggestion;
-import com.gitplex.commons.antlr.codeassist.ParentedElement;
-import com.gitplex.commons.antlr.grammar.ElementSpec;
-import com.gitplex.commons.antlr.grammar.LexerRuleRefElementSpec;
-import com.gitplex.commons.wicket.behavior.inputassist.ANTLRAssistBehavior;
-import com.gitplex.server.core.util.includeexclude.IncludeExcludeParser;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.codeassist.FenceAware;
+import com.gitplex.codeassist.InputSuggestion;
+import com.gitplex.codeassist.ParentedElement;
+import com.gitplex.codeassist.grammar.ElementSpec;
+import com.gitplex.codeassist.grammar.LexerRuleRefElementSpec;
+import com.gitplex.server.util.includeexclude.IncludeExcludeParser;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.web.behavior.inputassist.ANTLRAssistBehavior;
import com.gitplex.server.web.util.SuggestionUtils;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchInput.java b/web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchInput.java
index cee21f7d19..1ec44a351f 100644
--- a/web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchInput.java
+++ b/web/src/main/java/com/gitplex/server/web/component/pathmatch/PathMatchInput.java
@@ -10,8 +10,8 @@ import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidationError;
import org.apache.wicket.validation.IValidator;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.util.includeexclude.IncludeExcludeUtils;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.util.includeexclude.IncludeExcludeUtils;
@SuppressWarnings("serial")
public class PathMatchInput extends TextField<String> {
diff --git a/web/src/main/java/com/gitplex/server/web/component/pathselector/PathSelector.java b/web/src/main/java/com/gitplex/server/web/component/pathselector/PathSelector.java
index ac678f38b5..f50ab41e6c 100644
--- a/web/src/main/java/com/gitplex/server/web/component/pathselector/PathSelector.java
+++ b/web/src/main/java/com/gitplex/server/web/component/pathselector/PathSelector.java
@@ -28,11 +28,11 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.treewalk.TreeWalk;
-import com.gitplex.commons.git.BlobIdent;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.git.BlobIdent;
+import com.gitplex.server.util.StringUtils;
import com.gitplex.server.web.component.BlobIcon;
+import com.gitplex.server.web.component.PreventDefaultAjaxLink;
@SuppressWarnings("serial")
public abstract class PathSelector extends Panel {
diff --git a/web/src/main/java/com/gitplex/server/web/component/privilegeselection/PrivilegeSelectionPanel.java b/web/src/main/java/com/gitplex/server/web/component/privilegeselection/PrivilegeSelectionPanel.java
index 8e739f96bc..cd8445ecf4 100644
--- a/web/src/main/java/com/gitplex/server/web/component/privilegeselection/PrivilegeSelectionPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/privilegeselection/PrivilegeSelectionPanel.java
@@ -7,7 +7,7 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.panel.Panel;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
+import com.gitplex.server.security.privilege.DepotPrivilege;
@SuppressWarnings("serial")
public abstract class PrivilegeSelectionPanel extends Panel {
diff --git a/web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.java b/web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.java
index 50f0a78258..efc10c332f 100644
--- a/web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.java
@@ -7,12 +7,12 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.IModel;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
import com.gitplex.server.web.component.AccountLink;
-import com.gitplex.server.web.depotaccess.DepotAccess;
-import com.gitplex.server.web.depotaccess.PrivilegeSource;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
+import com.gitplex.server.web.util.depotaccess.DepotAccess;
+import com.gitplex.server.web.util.depotaccess.PrivilegeSource;
@SuppressWarnings("serial")
public class PrivilegeSourcePanel extends Panel {
diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/Assignee.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/Assignee.java
index f8a06cc13d..7007d32328 100644
--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/Assignee.java
+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/Assignee.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import javax.annotation.Nullable;
-import com.gitplex.server.core.entity.Account;
+import com.gitplex.server.entity.Account;
@SuppressWarnings("serial")
public class Assignee implements Serializable {
diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeChoice.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeChoice.java
index 1ca0c807f6..d52362b14a 100644
--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeChoice.java
+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeChoice.java
@@ -4,10 +4,10 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.component.select2.Select2Choice;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;
+import com.gitplex.server.web.component.select2.Select2Choice;
@SuppressWarnings("serial")
public class AssigneeChoice extends Select2Choice<Assignee> {
diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeProvider.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeProvider.java
index 522727233e..224f359e55 100644
--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeProvider.java
+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestassignee/AssigneeProvider.java
@@ -11,18 +11,18 @@ import org.json.JSONException;
import org.json.JSONWriter;
import com.google.common.collect.Lists;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.wicket.component.select2.ChoiceProvider;
-import com.gitplex.commons.wicket.component.select2.Response;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.security.ObjectPermission;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
-import com.gitplex.server.web.Constants;
-import com.gitplex.server.web.avatar.AvatarManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.security.ObjectPermission;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.security.privilege.DepotPrivilege;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.component.select2.ChoiceProvider;
+import com.gitplex.server.web.component.select2.Response;
+import com.gitplex.server.web.util.avatar.AvatarManager;
public class AssigneeProvider extends ChoiceProvider<Assignee> {
@@ -54,8 +54,8 @@ public class AssigneeProvider extends ChoiceProvider<Assignee> {
assignees.add(0, new Assignee(currentUser, "Me"));
}
- int first = page * Constants.DEFAULT_PAGE_SIZE;
- int last = first + Constants.DEFAULT_PAGE_SIZE;
+ int first = page * WebConstants.DEFAULT_PAGE_SIZE;
+ int last = first + WebConstants.DEFAULT_PAGE_SIZE;
if (last > assignees.size()) {
response.addAll(assignees.subList(first, assignees.size()));
} else {
diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerAvatar.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerAvatar.java
index 5151e98f47..1dae189eed 100644
--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerAvatar.java
+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerAvatar.java
@@ -7,15 +7,15 @@ import java.util.Set;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.model.IModel;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestReviewInvitation;
-import com.gitplex.server.core.manager.PullRequestReviewInvitationManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestReviewInvitation;
+import com.gitplex.server.manager.PullRequestReviewInvitationManager;
+import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.avatar.RemoveableAvatar;
-import com.gitplex.server.web.model.EntityModel;
-import com.gitplex.server.web.model.UserModel;
+import com.gitplex.server.web.util.model.EntityModel;
+import com.gitplex.server.web.util.model.UserModel;
@SuppressWarnings("serial")
public class ReviewerAvatar extends RemoveableAvatar {
diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerChoice.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerChoice.java
index 3d3d9e8a30..d171e6d245 100644
--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerChoice.java
+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerChoice.java
@@ -7,14 +7,14 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestReviewInvitation;
-import com.gitplex.server.core.manager.PullRequestReviewInvitationManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestReviewInvitation;
+import com.gitplex.server.manager.PullRequestReviewInvitationManager;
+import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;
+import com.gitplex.server.web.component.select2.SelectToAddChoice;
@SuppressWarnings("serial")
public abstract class ReviewerChoice extends SelectToAddChoice<Account> {
diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerProvider.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerProvider.java
index 743ba96942..069a474d1d 100644
--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerProvider.java
+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requestreviewer/ReviewerProvider.java
@@ -5,11 +5,11 @@ import java.util.List;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.component.select2.Response;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.component.accountchoice.AbstractAccountChoiceProvider;
+import com.gitplex.server.web.component.select2.Response;
public class ReviewerProvider extends AbstractAccountChoiceProvider {
@@ -33,8 +33,8 @@ public class ReviewerProvider extends AbstractAccountChoiceProvider {
reviewers.sort((user1, user2) -> user1.getDisplayName().compareTo(user2.getDisplayName()));
- int first = page * Constants.DEFAULT_PAGE_SIZE;
- int last = first + Constants.DEFAULT_PAGE_SIZE;
+ int first = page * WebConstants.DEFAULT_PAGE_SIZE;
+ int last = first + WebConstants.DEFAULT_PAGE_SIZE;
if (last > reviewers.size()) {
response.addAll(reviewers.subList(first, reviewers.size()));
} else {
diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requeststatus/RequestStatusPanel.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requeststatus/RequestStatusPanel.java
index a3a2aee2fb..33b35457a6 100644
--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/requeststatus/RequestStatusPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/requeststatus/RequestStatusPanel.java
@@ -6,9 +6,9 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequest.Status;
-import com.gitplex.server.core.entity.support.CloseInfo;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequest.Status;
+import com.gitplex.server.entity.support.CloseInfo;
@SuppressWarnings("serial")
public class RequestStatusPanel extends Panel {
diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultIcon.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultIcon.java
index 529fe2c988..ed47ba52a9 100644
--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultIcon.java
+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultIcon.java
@@ -7,9 +7,9 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.behavior.dropdown.DropdownHover;
-import com.gitplex.commons.wicket.component.floating.AlignPlacement;
-import com.gitplex.server.core.entity.PullRequestReview;
+import com.gitplex.server.entity.PullRequestReview;
+import com.gitplex.server.web.behavior.dropdown.DropdownHover;
+import com.gitplex.server.web.component.floating.AlignPlacement;
@SuppressWarnings("serial")
public class ReviewResultIcon extends WebComponent {
diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultTooltip.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultTooltip.java
index 4745ce69af..bc03e02076 100644
--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultTooltip.java
+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/reviewresult/ReviewResultTooltip.java
@@ -5,11 +5,11 @@ import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestReview;
-import com.gitplex.server.core.manager.PullRequestReviewManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestReview;
+import com.gitplex.server.manager.PullRequestReviewManager;
+import com.gitplex.server.security.SecurityUtils;
@SuppressWarnings("serial")
class ReviewResultTooltip extends GenericPanel<PullRequestReview> {
diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java
index 8cabaf5bf0..c59d138757 100644
--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java
@@ -17,9 +17,9 @@ import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestVerification;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestVerification;
+import com.gitplex.server.web.component.DropdownLink;
@SuppressWarnings("serial")
public class VerificationStatusPanel extends Panel {
diff --git a/web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchBehavior.java b/web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchBehavior.java
index 82c58a8e53..7230920fe7 100644
--- a/web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchBehavior.java
@@ -9,15 +9,15 @@ import org.apache.wicket.model.IModel;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Ref;
-import com.gitplex.commons.antlr.codeassist.FenceAware;
-import com.gitplex.commons.antlr.codeassist.InputSuggestion;
-import com.gitplex.commons.antlr.codeassist.ParentedElement;
-import com.gitplex.commons.antlr.grammar.ElementSpec;
-import com.gitplex.commons.antlr.grammar.LexerRuleRefElementSpec;
-import com.gitplex.commons.wicket.behavior.inputassist.ANTLRAssistBehavior;
-import com.gitplex.server.core.util.includeexclude.IncludeExcludeParser;
+import com.gitplex.codeassist.FenceAware;
+import com.gitplex.codeassist.InputSuggestion;
+import com.gitplex.codeassist.ParentedElement;
+import com.gitplex.codeassist.grammar.ElementSpec;
+import com.gitplex.codeassist.grammar.LexerRuleRefElementSpec;
import com.gitplex.jsymbol.Range;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.util.includeexclude.IncludeExcludeParser;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.web.behavior.inputassist.ANTLRAssistBehavior;
@SuppressWarnings("serial")
public class RefMatchBehavior extends ANTLRAssistBehavior {
diff --git a/web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchInput.java b/web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchInput.java
index 693922f323..c7954fad50 100644
--- a/web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchInput.java
+++ b/web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchInput.java
@@ -10,8 +10,8 @@ import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidationError;
import org.apache.wicket.validation.IValidator;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.util.includeexclude.IncludeExcludeUtils;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.util.includeexclude.IncludeExcludeUtils;
@SuppressWarnings("serial")
public class RefMatchInput extends TextField<String> {
diff --git a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/AffinalRevisionPicker.java b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/AffinalRevisionPicker.java
index bcdce391ee..7bd06d919b 100644
--- a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/AffinalRevisionPicker.java
+++ b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/AffinalRevisionPicker.java
@@ -8,11 +8,11 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.web.component.DepotPicker;
-import com.gitplex.server.web.model.AffinalDepotsModel;
+import com.gitplex.server.web.util.model.AffinalDepotsModel;
@SuppressWarnings("serial")
public abstract class AffinalRevisionPicker extends Panel {
diff --git a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.java b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.java
index 5177ad1f76..89c3eb81ec 100644
--- a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.java
@@ -8,10 +8,10 @@ import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.AccountManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.AccountManager;
@SuppressWarnings("serial")
abstract class CreateTagPanel extends Panel {
diff --git a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.java b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.java
index a45af983f4..488d69a822 100644
--- a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.java
+++ b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.java
@@ -7,11 +7,11 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.commons.wicket.component.modal.ModalPanel;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.support.DepotAndRevision;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.support.DepotAndRevision;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.web.component.DropdownLink;
+import com.gitplex.server.web.component.modal.ModalPanel;
@SuppressWarnings("serial")
public abstract class RevisionPicker extends DropdownLink {
diff --git a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.java b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.java
index b7a3b4c0d2..990c7ad5b8 100644
--- a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.java
+++ b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.java
@@ -38,19 +38,19 @@ import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Ref;
import org.unbescape.html.HtmlEscape;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.git.RefInfo;
-import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.gitplex.commons.wicket.behavior.InputChangeBehavior;
-import com.gitplex.commons.wicket.behavior.infinitescroll.InfiniteScrollBehavior;
-import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;
-import com.gitplex.commons.wicket.component.modal.ModalPanel;
-import com.gitplex.commons.wicket.component.tabbable.AjaxActionTab;
-import com.gitplex.commons.wicket.component.tabbable.Tab;
-import com.gitplex.commons.wicket.component.tabbable.Tabbable;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.git.RefInfo;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.server.web.behavior.InputChangeBehavior;
+import com.gitplex.server.web.behavior.infinitescroll.InfiniteScrollBehavior;
+import com.gitplex.server.web.component.PreventDefaultAjaxLink;
+import com.gitplex.server.web.component.modal.ModalPanel;
+import com.gitplex.server.web.component.tabbable.AjaxActionTab;
+import com.gitplex.server.web.component.tabbable.Tab;
+import com.gitplex.server.web.component.tabbable.Tabbable;
+import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
diff --git a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelectorResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelectorResourceReference.java
index 26e7a67cf4..74a90c34ad 100644
--- a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelectorResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelectorResourceReference.java
@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
-import com.gitplex.commons.wicket.assets.hotkeys.HotkeysResourceReference;
+import com.gitplex.server.web.assets.hotkeys.HotkeysResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
public class RevisionSelectorResourceReference extends BaseDependentResourceReference {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/AbstractSelect2Choice.java b/web/src/main/java/com/gitplex/server/web/component/select2/AbstractSelect2Choice.java
similarity index 99%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/AbstractSelect2Choice.java
rename to web/src/main/java/com/gitplex/server/web/component/select2/AbstractSelect2Choice.java
index 4210c73d02..9b42331517 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/AbstractSelect2Choice.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/AbstractSelect2Choice.java
@@ -10,7 +10,7 @@
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package com.gitplex.commons.wicket.component.select2;
+package com.gitplex.server.web.component.select2;
import java.io.IOException;
import java.io.OutputStreamWriter;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/AbstractSelect2Choice.utf8.properties b/web/src/main/java/com/gitplex/server/web/component/select2/AbstractSelect2Choice.utf8.properties
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/AbstractSelect2Choice.utf8.properties
rename to web/src/main/java/com/gitplex/server/web/component/select2/AbstractSelect2Choice.utf8.properties
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/AbstractSelect2Choice_de.utf8.properties b/web/src/main/java/com/gitplex/server/web/component/select2/AbstractSelect2Choice_de.utf8.properties
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/AbstractSelect2Choice_de.utf8.properties
rename to web/src/main/java/com/gitplex/server/web/component/select2/AbstractSelect2Choice_de.utf8.properties
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/AbstractSelect2Choice_hu.utf8.properties b/web/src/main/java/com/gitplex/server/web/component/select2/AbstractSelect2Choice_hu.utf8.properties
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/AbstractSelect2Choice_hu.utf8.properties
rename to web/src/main/java/com/gitplex/server/web/component/select2/AbstractSelect2Choice_hu.utf8.properties
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/AjaxSettings.java b/web/src/main/java/com/gitplex/server/web/component/select2/AjaxSettings.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/AjaxSettings.java
rename to web/src/main/java/com/gitplex/server/web/component/select2/AjaxSettings.java
index d313324199..06b97e8abb 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/AjaxSettings.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/AjaxSettings.java
@@ -10,14 +10,14 @@
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package com.gitplex.commons.wicket.component.select2;
+package com.gitplex.server.web.component.select2;
import java.io.Serializable;
import org.json.JSONException;
import org.json.JSONWriter;
-import com.gitplex.commons.wicket.component.select2.json.Json;
+import com.gitplex.server.web.component.select2.json.Json;
/**
* Select2 Ajax settings. Refer to the Select2 documentation for what these
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/ChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/select2/ChoiceProvider.java
similarity index 98%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/ChoiceProvider.java
rename to web/src/main/java/com/gitplex/server/web/component/select2/ChoiceProvider.java
index b9d60c7482..da5dd23d15 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/ChoiceProvider.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/ChoiceProvider.java
@@ -10,7 +10,7 @@
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package com.gitplex.commons.wicket.component.select2;
+package com.gitplex.server.web.component.select2;
import java.util.Collection;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/DragAndDropBehavior.java b/web/src/main/java/com/gitplex/server/web/component/select2/DragAndDropBehavior.java
similarity index 89%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/DragAndDropBehavior.java
rename to web/src/main/java/com/gitplex/server/web/component/select2/DragAndDropBehavior.java
index 58f699fe71..9604c9efe9 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/DragAndDropBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/DragAndDropBehavior.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.select2;
+package com.gitplex.server.web.component.select2;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import com.gitplex.commons.wicket.assets.jqueryui.JQueryUIResourceReference;
+import com.gitplex.server.web.assets.jqueryui.JQueryUIResourceReference;
/**
* Adds drag & drop behavior to Select2MultiChoice components, i.e. the list of
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/JQuery.java b/web/src/main/java/com/gitplex/server/web/component/select2/JQuery.java
similarity index 78%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/JQuery.java
rename to web/src/main/java/com/gitplex/server/web/component/select2/JQuery.java
index 0c305669bb..d3fe9c24f4 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/JQuery.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/JQuery.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.select2;
+package com.gitplex.server.web.component.select2;
public class JQuery {
private JQuery() {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/Response.java b/web/src/main/java/com/gitplex/server/web/component/select2/Response.java
similarity index 97%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/Response.java
rename to web/src/main/java/com/gitplex/server/web/component/select2/Response.java
index 0d35fbdc28..ebc9883fe2 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/Response.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/Response.java
@@ -10,7 +10,7 @@
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package com.gitplex.commons.wicket.component.select2;
+package com.gitplex.server.web.component.select2;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/ResponseFiller.java b/web/src/main/java/com/gitplex/server/web/component/select2/ResponseFiller.java
similarity index 90%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/ResponseFiller.java
rename to web/src/main/java/com/gitplex/server/web/component/select2/ResponseFiller.java
index 401f18230c..7543df2737 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/ResponseFiller.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/ResponseFiller.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.select2;
+package com.gitplex.server.web.component.select2;
import java.util.List;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/Select2Choice.java b/web/src/main/java/com/gitplex/server/web/component/select2/Select2Choice.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/Select2Choice.java
rename to web/src/main/java/com/gitplex/server/web/component/select2/Select2Choice.java
index 123c77d8d9..b17692f50a 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/Select2Choice.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/Select2Choice.java
@@ -10,7 +10,7 @@
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package com.gitplex.commons.wicket.component.select2;
+package com.gitplex.server.web.component.select2;
import java.util.Collections;
@@ -20,7 +20,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.util.string.Strings;
import org.json.JSONException;
-import com.gitplex.commons.wicket.component.select2.json.JsonBuilder;
+import com.gitplex.server.web.component.select2.json.JsonBuilder;
/**
* Single-select Select2 component. Should be attached to a
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/Select2CssResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/select2/Select2CssResourceReference.java
similarity index 84%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/Select2CssResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/component/select2/Select2CssResourceReference.java
index 29a21bdd32..13a60ad8a7 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/Select2CssResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/Select2CssResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.select2;
+package com.gitplex.server.web.component.select2;
import java.util.List;
@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
-import com.gitplex.commons.wicket.page.CommonDependentCssResourceReference;
+import com.gitplex.server.web.page.CommonDependentCssResourceReference;
public class Select2CssResourceReference extends CommonDependentCssResourceReference {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/Select2MultiChoice.java b/web/src/main/java/com/gitplex/server/web/component/select2/Select2MultiChoice.java
similarity index 96%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/Select2MultiChoice.java
rename to web/src/main/java/com/gitplex/server/web/component/select2/Select2MultiChoice.java
index 2140d24adf..229e4fb73f 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/Select2MultiChoice.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/Select2MultiChoice.java
@@ -10,7 +10,7 @@
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package com.gitplex.commons.wicket.component.select2;
+package com.gitplex.server.web.component.select2;
import java.util.ArrayList;
import java.util.Arrays;
@@ -22,7 +22,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.util.string.Strings;
import org.json.JSONException;
-import com.gitplex.commons.wicket.component.select2.json.JsonBuilder;
+import com.gitplex.server.web.component.select2.json.JsonBuilder;
/**
* Multi-select Select2 component. Should be attached to a
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/Select2ResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/select2/Select2ResourceReference.java
similarity index 78%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/Select2ResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/component/select2/Select2ResourceReference.java
index cd64e91884..8a651e25b9 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/Select2ResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/Select2ResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.select2;
+package com.gitplex.server.web.component.select2;
import java.util.List;
@@ -6,8 +6,8 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import com.gitplex.commons.wicket.assets.mousewheel.MouseWheelResourceReference;
-import com.gitplex.commons.wicket.page.CommonDependentResourceReference;
+import com.gitplex.server.web.assets.mousewheel.MouseWheelResourceReference;
+import com.gitplex.server.web.page.CommonDependentResourceReference;
public class Select2ResourceReference extends CommonDependentResourceReference {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/SelectToAddChoice.java b/web/src/main/java/com/gitplex/server/web/component/select2/SelectToAddChoice.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/SelectToAddChoice.java
rename to web/src/main/java/com/gitplex/server/web/component/select2/SelectToAddChoice.java
index 2a89e8bc75..6fbe2b7988 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/SelectToAddChoice.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/SelectToAddChoice.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.select2;
+package com.gitplex.server.web.component.select2;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/Settings.java b/web/src/main/java/com/gitplex/server/web/component/select2/Settings.java
similarity index 98%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/Settings.java
rename to web/src/main/java/com/gitplex/server/web/component/select2/Settings.java
index 3995522f4a..45d8e947b3 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/Settings.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/Settings.java
@@ -10,14 +10,14 @@
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package com.gitplex.commons.wicket.component.select2;
+package com.gitplex.server.web.component.select2;
import java.io.Serializable;
import org.json.JSONException;
import org.json.JSONStringer;
-import com.gitplex.commons.wicket.component.select2.json.Json;
+import com.gitplex.server.web.component.select2.json.Json;
/**
* Select2 settings. Refer to the Select2 documentation for what these options
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/StringTextChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/select2/StringTextChoiceProvider.java
similarity index 91%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/StringTextChoiceProvider.java
rename to web/src/main/java/com/gitplex/server/web/component/select2/StringTextChoiceProvider.java
index e4d0e29c16..d0f28d66bb 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/StringTextChoiceProvider.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/StringTextChoiceProvider.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.select2;
+package com.gitplex.server.web.component.select2;
import java.util.Collection;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/TextChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/select2/TextChoiceProvider.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/TextChoiceProvider.java
rename to web/src/main/java/com/gitplex/server/web/component/select2/TextChoiceProvider.java
index c07d8e5999..1c196d9515 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/TextChoiceProvider.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/TextChoiceProvider.java
@@ -10,7 +10,7 @@
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package com.gitplex.commons.wicket.component.select2;
+package com.gitplex.server.web.component.select2;
import org.json.JSONException;
import org.json.JSONWriter;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/json/Json.java b/web/src/main/java/com/gitplex/server/web/component/select2/json/Json.java
similarity index 96%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/json/Json.java
rename to web/src/main/java/com/gitplex/server/web/component/select2/json/Json.java
index ba3d7874ba..0ffff89298 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/json/Json.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/json/Json.java
@@ -10,7 +10,7 @@
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package com.gitplex.commons.wicket.component.select2.json;
+package com.gitplex.server.web.component.select2.json;
import org.json.JSONException;
import org.json.JSONWriter;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/json/JsonBuilder.java b/web/src/main/java/com/gitplex/server/web/component/select2/json/JsonBuilder.java
similarity index 96%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/json/JsonBuilder.java
rename to web/src/main/java/com/gitplex/server/web/component/select2/json/JsonBuilder.java
index fb872ea01c..101b762f36 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/json/JsonBuilder.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/json/JsonBuilder.java
@@ -10,7 +10,7 @@
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package com.gitplex.commons.wicket.component.select2.json;
+package com.gitplex.server.web.component.select2.json;
import org.json.JSONWriter;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/json/JsonFunction.java b/web/src/main/java/com/gitplex/server/web/component/select2/json/JsonFunction.java
similarity index 94%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/json/JsonFunction.java
rename to web/src/main/java/com/gitplex/server/web/component/select2/json/JsonFunction.java
index 8b9c06d349..ae297a9d18 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/json/JsonFunction.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/json/JsonFunction.java
@@ -10,7 +10,7 @@
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package com.gitplex.commons.wicket.component.select2.json;
+package com.gitplex.server.web.component.select2.json;
import org.json.JSONString;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/json/StringBuilderWriter.java b/web/src/main/java/com/gitplex/server/web/component/select2/json/StringBuilderWriter.java
similarity index 96%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/json/StringBuilderWriter.java
rename to web/src/main/java/com/gitplex/server/web/component/select2/json/StringBuilderWriter.java
index 8621877171..7a51fb1965 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/json/StringBuilderWriter.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/json/StringBuilderWriter.java
@@ -10,7 +10,7 @@
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package com.gitplex.commons.wicket.component.select2.json;
+package com.gitplex.server.web.component.select2.json;
import java.io.IOException;
import java.io.Writer;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2-bootstrap.css b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2-bootstrap.css
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2-bootstrap.css
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2-bootstrap.css
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2-spinner.gif b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2-spinner.gif
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2-spinner.gif
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2-spinner.gif
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2.css b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2.css
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2.css
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2.css
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2.jquery.json b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2.jquery.json
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2.jquery.json
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2.jquery.json
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2.js b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2.js
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2.min.js b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2.min.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2.min.js
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2.min.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2.png b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2.png
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_de.js b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_de.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_de.js
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_de.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_es.js b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_es.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_es.js
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_es.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_eu.js b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_eu.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_eu.js
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_eu.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_fr.js b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_fr.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_fr.js
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_fr.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_hr.js b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_hr.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_hr.js
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_hr.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_hu.js b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_hu.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_hu.js
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_hu.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_it.js b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_it.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_it.js
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_it.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_nl.js b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_nl.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_nl.js
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_nl.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_pt-BR.js b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_pt-BR.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_pt-BR.js
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_pt-BR.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_pt-PT.js b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_pt-PT.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_pt-PT.js
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_pt-PT.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_ro.js b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_ro.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_ro.js
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_ro.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_ru.js b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_ru.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_ru.js
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_ru.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_sk.js b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_sk.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_sk.js
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_sk.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_sv.js b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_sv.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_sv.js
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_sv.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_tr.js b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_tr.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_tr.js
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_tr.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_ua.js b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_ua.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_ua.js
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_ua.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_zh-CN.js b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_zh-CN.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2_locale_zh-CN.js
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2_locale_zh-CN.js
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2x2.png b/web/src/main/java/com/gitplex/server/web/component/select2/res/select2x2.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/select2/res/select2x2.png
rename to web/src/main/java/com/gitplex/server/web/component/select2/res/select2x2.png
diff --git a/web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java b/web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java
index 8b13366cf8..d28dbae110 100644
--- a/web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java
@@ -29,15 +29,12 @@ import org.apache.wicket.request.resource.ResourceReference;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.commons.git.Blob;
-import com.gitplex.commons.git.BlobIdent;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.gitplex.commons.wicket.behavior.RunTaskBehavior;
-import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;
import com.gitplex.jsymbol.Symbol;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.support.TextRange;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.support.TextRange;
+import com.gitplex.server.git.Blob;
+import com.gitplex.server.git.BlobIdent;
import com.gitplex.server.search.IndexConstants;
import com.gitplex.server.search.SearchManager;
import com.gitplex.server.search.hit.QueryHit;
@@ -46,6 +43,9 @@ import com.gitplex.server.search.query.BlobQuery;
import com.gitplex.server.search.query.PathQuery;
import com.gitplex.server.search.query.SymbolQuery;
import com.gitplex.server.search.query.TextQuery;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.server.web.behavior.RunTaskBehavior;
+import com.gitplex.server.web.component.PreventDefaultAjaxLink;
import com.gitplex.server.web.component.depotfile.blobsearch.result.SearchResultPanel;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/ActionTab.java b/web/src/main/java/com/gitplex/server/web/component/tabbable/ActionTab.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/ActionTab.java
rename to web/src/main/java/com/gitplex/server/web/component/tabbable/ActionTab.java
index 244a6a20cd..342efb96b9 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/ActionTab.java
+++ b/web/src/main/java/com/gitplex/server/web/component/tabbable/ActionTab.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.tabbable;
+package com.gitplex.server.web.component.tabbable;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.list.ListView;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/ActionTabLink.html b/web/src/main/java/com/gitplex/server/web/component/tabbable/ActionTabLink.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/ActionTabLink.html
rename to web/src/main/java/com/gitplex/server/web/component/tabbable/ActionTabLink.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/ActionTabLink.java b/web/src/main/java/com/gitplex/server/web/component/tabbable/ActionTabLink.java
similarity index 92%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/ActionTabLink.java
rename to web/src/main/java/com/gitplex/server/web/component/tabbable/ActionTabLink.java
index 54e273e2d3..503da7cdb0 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/ActionTabLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/tabbable/ActionTabLink.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.tabbable;
+package com.gitplex.server.web.component.tabbable;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/AjaxActionTab.java b/web/src/main/java/com/gitplex/server/web/component/tabbable/AjaxActionTab.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/AjaxActionTab.java
rename to web/src/main/java/com/gitplex/server/web/component/tabbable/AjaxActionTab.java
index 0f5acfdd16..7e7963d29a 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/AjaxActionTab.java
+++ b/web/src/main/java/com/gitplex/server/web/component/tabbable/AjaxActionTab.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.tabbable;
+package com.gitplex.server.web.component.tabbable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/PageTab.java b/web/src/main/java/com/gitplex/server/web/component/tabbable/PageTab.java
similarity index 98%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/PageTab.java
rename to web/src/main/java/com/gitplex/server/web/component/tabbable/PageTab.java
index f4ffb18e29..6653c39236 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/PageTab.java
+++ b/web/src/main/java/com/gitplex/server/web/component/tabbable/PageTab.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.tabbable;
+package com.gitplex.server.web.component.tabbable;
import java.util.ArrayList;
import java.util.List;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/PageTabLink.html b/web/src/main/java/com/gitplex/server/web/component/tabbable/PageTabLink.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/PageTabLink.html
rename to web/src/main/java/com/gitplex/server/web/component/tabbable/PageTabLink.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/PageTabLink.java b/web/src/main/java/com/gitplex/server/web/component/tabbable/PageTabLink.java
similarity index 92%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/PageTabLink.java
rename to web/src/main/java/com/gitplex/server/web/component/tabbable/PageTabLink.java
index 9b213233c8..636b4d23d8 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/PageTabLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/tabbable/PageTabLink.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.tabbable;
+package com.gitplex.server.web.component.tabbable;
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.basic.Label;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/Tab.java b/web/src/main/java/com/gitplex/server/web/component/tabbable/Tab.java
similarity index 90%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/Tab.java
rename to web/src/main/java/com/gitplex/server/web/component/tabbable/Tab.java
index 8067a40cf8..5575dafaee 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/Tab.java
+++ b/web/src/main/java/com/gitplex/server/web/component/tabbable/Tab.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.tabbable;
+package com.gitplex.server.web.component.tabbable;
import java.io.Serializable;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/TabDivider.java b/web/src/main/java/com/gitplex/server/web/component/tabbable/TabDivider.java
similarity index 89%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/TabDivider.java
rename to web/src/main/java/com/gitplex/server/web/component/tabbable/TabDivider.java
index 3f969d35b7..00434d0fbe 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/TabDivider.java
+++ b/web/src/main/java/com/gitplex/server/web/component/tabbable/TabDivider.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.tabbable;
+package com.gitplex.server.web.component.tabbable;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/Tabbable.html b/web/src/main/java/com/gitplex/server/web/component/tabbable/Tabbable.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/Tabbable.html
rename to web/src/main/java/com/gitplex/server/web/component/tabbable/Tabbable.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/Tabbable.java b/web/src/main/java/com/gitplex/server/web/component/tabbable/Tabbable.java
similarity index 96%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/Tabbable.java
rename to web/src/main/java/com/gitplex/server/web/component/tabbable/Tabbable.java
index 8d78f9a4ba..f7ce123cbe 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/tabbable/Tabbable.java
+++ b/web/src/main/java/com/gitplex/server/web/component/tabbable/Tabbable.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.tabbable;
+package com.gitplex.server.web.component.tabbable;
import java.util.ArrayList;
import java.util.List;
diff --git a/web/src/main/java/com/gitplex/server/web/component/teamchoice/AbstractTeamChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/teamchoice/AbstractTeamChoiceProvider.java
index 21f3210002..2dd767017e 100644
--- a/web/src/main/java/com/gitplex/server/web/component/teamchoice/AbstractTeamChoiceProvider.java
+++ b/web/src/main/java/com/gitplex/server/web/component/teamchoice/AbstractTeamChoiceProvider.java
@@ -7,10 +7,10 @@ import org.json.JSONException;
import org.json.JSONWriter;
import com.google.common.collect.Lists;
-import com.gitplex.commons.wicket.component.select2.ChoiceProvider;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Team;
-import com.gitplex.server.core.manager.TeamManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Team;
+import com.gitplex.server.manager.TeamManager;
+import com.gitplex.server.web.component.select2.ChoiceProvider;
public abstract class AbstractTeamChoiceProvider extends ChoiceProvider<Team> {
diff --git a/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamChoiceProvider.java
index d7aa4aa59e..6dfd8cbdcf 100644
--- a/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamChoiceProvider.java
+++ b/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamChoiceProvider.java
@@ -6,13 +6,13 @@ import org.apache.wicket.model.IModel;
import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Restrictions;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.commons.wicket.component.select2.Response;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Team;
-import com.gitplex.server.core.manager.TeamManager;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Team;
+import com.gitplex.server.manager.TeamManager;
+import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.component.select2.Response;
public class TeamChoiceProvider extends AbstractTeamChoiceProvider {
@@ -27,16 +27,16 @@ public class TeamChoiceProvider extends AbstractTeamChoiceProvider {
@Override
public void query(String term, int page, Response<Team> response) {
TeamManager teamManager = GitPlex.getInstance(TeamManager.class);
- int first = page * Constants.DEFAULT_PAGE_SIZE;
+ int first = page * WebConstants.DEFAULT_PAGE_SIZE;
EntityCriteria<Team> criteria = teamManager.newCriteria();
criteria.add(Restrictions.ilike("name", term, MatchMode.ANYWHERE))
.add(Restrictions.eq("organization", organizationModel.getObject()));
- List<Team> teams = teamManager.findRange(criteria, first, Constants.DEFAULT_PAGE_SIZE + 1);
+ List<Team> teams = teamManager.findRange(criteria, first, WebConstants.DEFAULT_PAGE_SIZE + 1);
- if (teams.size() <= Constants.DEFAULT_PAGE_SIZE) {
+ if (teams.size() <= WebConstants.DEFAULT_PAGE_SIZE) {
response.addAll(teams);
} else {
- response.addAll(teams.subList(0, Constants.DEFAULT_PAGE_SIZE));
+ response.addAll(teams.subList(0, WebConstants.DEFAULT_PAGE_SIZE));
response.setHasMore(true);
}
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamMultiChoice.java b/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamMultiChoice.java
index 6993368eb5..9432c4038f 100644
--- a/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamMultiChoice.java
+++ b/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamMultiChoice.java
@@ -6,8 +6,8 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.component.select2.Select2MultiChoice;
-import com.gitplex.server.core.entity.Team;
+import com.gitplex.server.entity.Team;
+import com.gitplex.server.web.component.select2.Select2MultiChoice;
@SuppressWarnings("serial")
public class TeamMultiChoice extends Select2MultiChoice<Team> {
diff --git a/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamSingleChoice.java b/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamSingleChoice.java
index d67ca5acc6..84cfd4c9f5 100644
--- a/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamSingleChoice.java
+++ b/web/src/main/java/com/gitplex/server/web/component/teamchoice/TeamSingleChoice.java
@@ -4,8 +4,8 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.component.select2.Select2Choice;
-import com.gitplex.server.core.entity.Team;
+import com.gitplex.server.entity.Team;
+import com.gitplex.server.web.component.select2.Select2Choice;
@SuppressWarnings("serial")
public class TeamSingleChoice extends Select2Choice<Team> {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/wizard/ManualConfigStep.java b/web/src/main/java/com/gitplex/server/web/component/wizard/ManualConfigStep.java
similarity index 83%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/wizard/ManualConfigStep.java
rename to web/src/main/java/com/gitplex/server/web/component/wizard/ManualConfigStep.java
index d41e679294..f0bf8335f4 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/wizard/ManualConfigStep.java
+++ b/web/src/main/java/com/gitplex/server/web/component/wizard/ManualConfigStep.java
@@ -1,11 +1,11 @@
-package com.gitplex.commons.wicket.component.wizard;
+package com.gitplex.server.web.component.wizard;
import java.io.Serializable;
import org.apache.wicket.markup.html.form.FormComponent;
-import com.gitplex.commons.util.init.ManualConfig;
-import com.gitplex.commons.wicket.editable.BeanContext;
+import com.gitplex.server.util.init.ManualConfig;
+import com.gitplex.server.web.editable.BeanContext;
@SuppressWarnings("serial")
public class ManualConfigStep implements WizardStep {
diff --git a/web/src/main/java/com/gitplex/server/web/component/wizard/Skippable.java b/web/src/main/java/com/gitplex/server/web/component/wizard/Skippable.java
new file mode 100644
index 0000000000..be8f79c4cd
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/wizard/Skippable.java
@@ -0,0 +1,5 @@
+package com.gitplex.server.web.component.wizard;
+
+public interface Skippable {
+ void skip();
+}
\ No newline at end of file
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/wizard/Wizard.html b/web/src/main/java/com/gitplex/server/web/component/wizard/Wizard.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/wizard/Wizard.html
rename to web/src/main/java/com/gitplex/server/web/component/wizard/Wizard.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/wizard/Wizard.java b/web/src/main/java/com/gitplex/server/web/component/wizard/Wizard.java
similarity index 98%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/wizard/Wizard.java
rename to web/src/main/java/com/gitplex/server/web/component/wizard/Wizard.java
index 69c675f0db..cb00dcf9c9 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/wizard/Wizard.java
+++ b/web/src/main/java/com/gitplex/server/web/component/wizard/Wizard.java
@@ -6,7 +6,7 @@
*
* Revision: $Id$
*/
-package com.gitplex.commons.wicket.component.wizard;
+package com.gitplex.server.web.component.wizard;
import java.util.List;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/wizard/WizardResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/wizard/WizardResourceReference.java
similarity index 84%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/wizard/WizardResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/component/wizard/WizardResourceReference.java
index da051bb0c8..78d0520204 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/wizard/WizardResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/component/wizard/WizardResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.component.wizard;
+package com.gitplex.server.web.component.wizard;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/wizard/WizardStep.java b/web/src/main/java/com/gitplex/server/web/component/wizard/WizardStep.java
similarity index 86%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/wizard/WizardStep.java
rename to web/src/main/java/com/gitplex/server/web/component/wizard/WizardStep.java
index 3506070482..1b96f3be23 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/wizard/WizardStep.java
+++ b/web/src/main/java/com/gitplex/server/web/component/wizard/WizardStep.java
@@ -5,7 +5,7 @@
*
* Revision: $Id$
*/
-package com.gitplex.commons.wicket.component.wizard;
+package com.gitplex.server.web.component.wizard;
import java.io.Serializable;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/wizard/wizard.css b/web/src/main/java/com/gitplex/server/web/component/wizard/wizard.css
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/component/wizard/wizard.css
rename to web/src/main/java/com/gitplex/server/web/component/wizard/wizard.css
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/BeanContext.java b/web/src/main/java/com/gitplex/server/web/editable/BeanContext.java
similarity index 96%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/BeanContext.java
rename to web/src/main/java/com/gitplex/server/web/editable/BeanContext.java
index a7ab51bb37..cfc2c146be 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/BeanContext.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/BeanContext.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable;
+package com.gitplex.server.web.editable;
import java.io.Serializable;
import java.util.HashSet;
@@ -8,8 +8,8 @@ import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.commons.util.ClassUtils;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.util.ClassUtils;
@SuppressWarnings("serial")
public abstract class BeanContext<T> extends BeanDescriptor {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/BeanDescriptor.java b/web/src/main/java/com/gitplex/server/web/editable/BeanDescriptor.java
similarity index 90%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/BeanDescriptor.java
rename to web/src/main/java/com/gitplex/server/web/editable/BeanDescriptor.java
index e0811cf643..1913b98795 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/BeanDescriptor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/BeanDescriptor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable;
+package com.gitplex.server.web.editable;
import java.io.Serializable;
import java.lang.reflect.Method;
@@ -6,8 +6,9 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import com.gitplex.commons.util.BeanUtils;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
+import com.gitplex.server.util.BeanUtils;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.util.editable.annotation.Editable;
import com.google.common.collect.Sets;
@SuppressWarnings("serial")
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/BeanEditor.java b/web/src/main/java/com/gitplex/server/web/editable/BeanEditor.java
similarity index 91%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/BeanEditor.java
rename to web/src/main/java/com/gitplex/server/web/editable/BeanEditor.java
index 38bcc7cbe9..3a228f9839 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/BeanEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/BeanEditor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable;
+package com.gitplex.server.web.editable;
import java.util.HashSet;
import java.util.Set;
@@ -11,8 +11,8 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.commons.wicket.editable.PathSegment.Property;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.web.editable.PathSegment.Property;
@SuppressWarnings("serial")
public abstract class BeanEditor<T> extends ValueEditor<T> {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/BeanViewer.html b/web/src/main/java/com/gitplex/server/web/editable/BeanViewer.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/BeanViewer.html
rename to web/src/main/java/com/gitplex/server/web/editable/BeanViewer.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/BeanViewer.java b/web/src/main/java/com/gitplex/server/web/editable/BeanViewer.java
similarity index 93%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/BeanViewer.java
rename to web/src/main/java/com/gitplex/server/web/editable/BeanViewer.java
index adf4032c59..789638cf79 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/BeanViewer.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/BeanViewer.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable;
+package com.gitplex.server.web.editable;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.AttributeAppender;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/DefaultEditSupportRegistry.java b/web/src/main/java/com/gitplex/server/web/editable/DefaultEditSupportRegistry.java
similarity index 94%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/DefaultEditSupportRegistry.java
rename to web/src/main/java/com/gitplex/server/web/editable/DefaultEditSupportRegistry.java
index cf0e42d996..6e7d1b33ac 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/DefaultEditSupportRegistry.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/DefaultEditSupportRegistry.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable;
+package com.gitplex.server.web.editable;
import java.io.Serializable;
import java.util.ArrayList;
@@ -8,7 +8,7 @@ import java.util.Set;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.gitplex.commons.util.GeneralException;
+import com.gitplex.server.util.GeneralException;
@Singleton
public class DefaultEditSupportRegistry implements EditSupportRegistry {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/EditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/EditSupport.java
similarity index 76%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/EditSupport.java
rename to web/src/main/java/com/gitplex/server/web/editable/EditSupport.java
index fe9421d620..cdfd68b142 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/EditSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/EditSupport.java
@@ -1,9 +1,9 @@
-package com.gitplex.commons.wicket.editable;
+package com.gitplex.server.web.editable;
import java.io.Serializable;
import java.util.Set;
-import com.gitplex.calla.loader.ExtensionPoint;
+import com.gitplex.launcher.loader.ExtensionPoint;
@ExtensionPoint
public interface EditSupport extends Serializable {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/EditSupportRegistry.java b/web/src/main/java/com/gitplex/server/web/editable/EditSupportRegistry.java
similarity index 86%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/EditSupportRegistry.java
rename to web/src/main/java/com/gitplex/server/web/editable/EditSupportRegistry.java
index 2110bf8280..a564af2886 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/EditSupportRegistry.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/EditSupportRegistry.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable;
+package com.gitplex.server.web.editable;
import java.io.Serializable;
import java.util.Set;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/EditableModule.java b/web/src/main/java/com/gitplex/server/web/editable/EditableModule.java
similarity index 73%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/EditableModule.java
rename to web/src/main/java/com/gitplex/server/web/editable/EditableModule.java
index 088b253c59..82544e3e3c 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/EditableModule.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/EditableModule.java
@@ -1,6 +1,6 @@
-package com.gitplex.commons.wicket.editable;
+package com.gitplex.server.web.editable;
-import com.gitplex.calla.loader.AbstractPluginModule;
+import com.gitplex.launcher.loader.AbstractPluginModule;
/**
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/EditorChanged.java b/web/src/main/java/com/gitplex/server/web/editable/EditorChanged.java
similarity index 65%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/EditorChanged.java
rename to web/src/main/java/com/gitplex/server/web/editable/EditorChanged.java
index 53becf0061..39e658464e 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/EditorChanged.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/EditorChanged.java
@@ -1,8 +1,8 @@
-package com.gitplex.commons.wicket.editable;
+package com.gitplex.server.web.editable;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import com.gitplex.commons.wicket.AjaxEvent;
+import com.gitplex.server.web.util.AjaxEvent;
public class EditorChanged extends AjaxEvent {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/ErrorContext.java b/web/src/main/java/com/gitplex/server/web/editable/ErrorContext.java
similarity index 79%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/ErrorContext.java
rename to web/src/main/java/com/gitplex/server/web/editable/ErrorContext.java
index 525e52a1a6..0481acdd94 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/ErrorContext.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/ErrorContext.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable;
+package com.gitplex.server.web.editable;
public interface ErrorContext {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/NotDefinedLabel.java b/web/src/main/java/com/gitplex/server/web/editable/NotDefinedLabel.java
similarity index 83%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/NotDefinedLabel.java
rename to web/src/main/java/com/gitplex/server/web/editable/NotDefinedLabel.java
index d744c5a90f..915e5a1abf 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/NotDefinedLabel.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/NotDefinedLabel.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable;
+package com.gitplex.server.web.editable;
import org.apache.wicket.markup.html.basic.Label;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/PathSegment.java b/web/src/main/java/com/gitplex/server/web/editable/PathSegment.java
similarity index 94%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/PathSegment.java
rename to web/src/main/java/com/gitplex/server/web/editable/PathSegment.java
index 2bd69a1a69..32930541b2 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/PathSegment.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/PathSegment.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable;
+package com.gitplex.server.web.editable;
import java.io.Serializable;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/PropertyContext.java b/web/src/main/java/com/gitplex/server/web/editable/PropertyContext.java
similarity index 97%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/PropertyContext.java
rename to web/src/main/java/com/gitplex/server/web/editable/PropertyContext.java
index d9ed46a515..82695fbf87 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/PropertyContext.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/PropertyContext.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable;
+package com.gitplex.server.web.editable;
import java.io.Serializable;
@@ -7,7 +7,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
-import com.gitplex.calla.loader.AppLoader;
+import com.gitplex.launcher.loader.AppLoader;
@SuppressWarnings("serial")
public abstract class PropertyContext<T> extends PropertyDescriptor {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/PropertyDescriptor.java b/web/src/main/java/com/gitplex/server/web/editable/PropertyDescriptor.java
similarity index 97%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/PropertyDescriptor.java
rename to web/src/main/java/com/gitplex/server/web/editable/PropertyDescriptor.java
index caa1c8ab5b..46c0da6375 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/PropertyDescriptor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/PropertyDescriptor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable;
+package com.gitplex.server.web.editable;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
@@ -9,7 +9,7 @@ import javax.validation.constraints.Size;
import org.hibernate.validator.constraints.NotEmpty;
-import com.gitplex.commons.util.BeanUtils;
+import com.gitplex.server.util.BeanUtils;
public class PropertyDescriptor implements Serializable {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/PropertyEditor.java b/web/src/main/java/com/gitplex/server/web/editable/PropertyEditor.java
similarity index 94%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/PropertyEditor.java
rename to web/src/main/java/com/gitplex/server/web/editable/PropertyEditor.java
index 98f81c6812..002ea355b8 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/PropertyEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/PropertyEditor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable;
+package com.gitplex.server.web.editable;
import java.util.Set;
@@ -10,7 +10,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.validation.INullAcceptingValidator;
import org.apache.wicket.validation.IValidatable;
-import com.gitplex.calla.loader.AppLoader;
+import com.gitplex.launcher.loader.AppLoader;
@SuppressWarnings("serial")
public abstract class PropertyEditor<T> extends ValueEditor<T> {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/PropertyViewer.html b/web/src/main/java/com/gitplex/server/web/editable/PropertyViewer.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/PropertyViewer.html
rename to web/src/main/java/com/gitplex/server/web/editable/PropertyViewer.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/PropertyViewer.java b/web/src/main/java/com/gitplex/server/web/editable/PropertyViewer.java
similarity index 94%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/PropertyViewer.java
rename to web/src/main/java/com/gitplex/server/web/editable/PropertyViewer.java
index 8f2e707cbb..45c2da6e31 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/PropertyViewer.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/PropertyViewer.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable;
+package com.gitplex.server.web.editable;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.AttributeAppender;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/ValueEditor.java b/web/src/main/java/com/gitplex/server/web/editable/ValueEditor.java
similarity index 97%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/ValueEditor.java
rename to web/src/main/java/com/gitplex/server/web/editable/ValueEditor.java
index 90ce92b09b..44deea91c3 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/ValueEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/ValueEditor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable;
+package com.gitplex.server.web.editable;
import javax.annotation.Nullable;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/ValuePath.java b/web/src/main/java/com/gitplex/server/web/editable/ValuePath.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/ValuePath.java
rename to web/src/main/java/com/gitplex/server/web/editable/ValuePath.java
index da6447786e..1aabd37309 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/ValuePath.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/ValuePath.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable;
+package com.gitplex.server.web.editable;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountEditSupport.java
index b026f64b0a..60309d1901 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountEditSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountEditSupport.java
@@ -9,15 +9,15 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.eclipse.jgit.util.StringUtils;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.EditSupport;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.commons.wicket.editable.NotDefinedLabel;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.PropertyViewer;
-import com.gitplex.server.core.annotation.AccountChoice;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.util.editable.annotation.AccountChoice;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.EditSupport;
+import com.gitplex.server.web.editable.NotDefinedLabel;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.editable.PropertyViewer;
@SuppressWarnings("serial")
public class AccountEditSupport implements EditSupport {
diff --git a/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountMultiChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountMultiChoiceEditor.java
index b1ce66269d..c8acd412d4 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountMultiChoiceEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountMultiChoiceEditor.java
@@ -9,15 +9,15 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
import com.gitplex.server.web.component.accountchoice.AccountChoiceProvider;
import com.gitplex.server.web.component.accountchoice.AccountMultiChoice;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
@SuppressWarnings("serial")
public class AccountMultiChoiceEditor extends PropertyEditor<List<String>> {
diff --git a/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountSingleChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountSingleChoiceEditor.java
index 3b33dc34c7..dac88c1d8a 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountSingleChoiceEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/accountchoice/AccountSingleChoiceEditor.java
@@ -4,15 +4,15 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
import com.gitplex.server.web.component.accountchoice.AccountChoiceProvider;
import com.gitplex.server.web.component.accountchoice.AccountSingleChoice;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
@SuppressWarnings("serial")
public class AccountSingleChoiceEditor extends PropertyEditor<String> {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/bool/BooleanEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/bool/BooleanEditSupport.java
similarity index 78%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/bool/BooleanEditSupport.java
rename to web/src/main/java/com/gitplex/server/web/editable/bool/BooleanEditSupport.java
index da8bd4565b..a643df85c8 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/bool/BooleanEditSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/bool/BooleanEditSupport.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.bool;
+package com.gitplex.server.web.editable.bool;
import java.lang.reflect.Method;
import java.util.Set;
@@ -7,13 +7,13 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.EditSupport;
-import com.gitplex.commons.wicket.editable.NotDefinedLabel;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.PropertyViewer;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.EditSupport;
+import com.gitplex.server.web.editable.NotDefinedLabel;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.editable.PropertyViewer;
@SuppressWarnings("serial")
public class BooleanEditSupport implements EditSupport {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/bool/BooleanPropertyEditor.html b/web/src/main/java/com/gitplex/server/web/editable/bool/BooleanPropertyEditor.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/bool/BooleanPropertyEditor.html
rename to web/src/main/java/com/gitplex/server/web/editable/bool/BooleanPropertyEditor.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/bool/BooleanPropertyEditor.java b/web/src/main/java/com/gitplex/server/web/editable/bool/BooleanPropertyEditor.java
similarity index 80%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/bool/BooleanPropertyEditor.java
rename to web/src/main/java/com/gitplex/server/web/editable/bool/BooleanPropertyEditor.java
index eeb5bb6dc1..645df434ee 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/bool/BooleanPropertyEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/bool/BooleanPropertyEditor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.bool;
+package com.gitplex.server.web.editable.bool;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.form.CheckBox;
@@ -7,10 +7,10 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
@SuppressWarnings("serial")
public class BooleanPropertyEditor extends PropertyEditor<Boolean> {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/bool/NullableBooleanPropertyEditor.html b/web/src/main/java/com/gitplex/server/web/editable/bool/NullableBooleanPropertyEditor.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/bool/NullableBooleanPropertyEditor.html
rename to web/src/main/java/com/gitplex/server/web/editable/bool/NullableBooleanPropertyEditor.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/bool/NullableBooleanPropertyEditor.java b/web/src/main/java/com/gitplex/server/web/editable/bool/NullableBooleanPropertyEditor.java
similarity index 85%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/bool/NullableBooleanPropertyEditor.java
rename to web/src/main/java/com/gitplex/server/web/editable/bool/NullableBooleanPropertyEditor.java
index 0f98fe3cbc..c727dd26ad 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/bool/NullableBooleanPropertyEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/bool/NullableBooleanPropertyEditor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.bool;
+package com.gitplex.server.web.editable.bool;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -7,10 +7,10 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
import com.google.common.collect.Lists;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchEditSupport.java
index e3279da8fa..35e3b03de0 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchEditSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchEditSupport.java
@@ -10,15 +10,15 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.eclipse.jgit.util.StringUtils;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.EditSupport;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.commons.wicket.editable.NotDefinedLabel;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.PropertyViewer;
-import com.gitplex.server.core.annotation.BranchChoice;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.util.editable.annotation.BranchChoice;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.EditSupport;
+import com.gitplex.server.web.editable.NotDefinedLabel;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.editable.PropertyViewer;
@SuppressWarnings("serial")
public class BranchEditSupport implements EditSupport {
diff --git a/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchMultiChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchMultiChoiceEditor.java
index 41b4bb0eef..9e69aa4947 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchMultiChoiceEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchMultiChoiceEditor.java
@@ -9,13 +9,13 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
import com.gitplex.server.web.component.branchchoice.BranchChoiceProvider;
import com.gitplex.server.web.component.branchchoice.BranchMultiChoice;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
import com.gitplex.server.web.page.depot.DepotPage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchSingleChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchSingleChoiceEditor.java
index 4c48cd6d1d..7e9b0083c7 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchSingleChoiceEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/branchchoice/BranchSingleChoiceEditor.java
@@ -4,13 +4,13 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
import com.gitplex.server.web.component.branchchoice.BranchChoiceProvider;
import com.gitplex.server.web.component.branchchoice.BranchSingleChoice;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
import com.gitplex.server.web.page.depot.DepotPage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditSupport.java
index 7f2a2aa398..229f59fa5f 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditSupport.java
@@ -7,14 +7,14 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.EditSupport;
-import com.gitplex.commons.wicket.editable.NotDefinedLabel;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.PropertyViewer;
-import com.gitplex.server.core.annotation.BranchMatch;
+import com.gitplex.server.util.editable.annotation.BranchMatch;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.EditSupport;
+import com.gitplex.server.web.editable.NotDefinedLabel;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.editable.PropertyViewer;
@SuppressWarnings("serial")
public class BranchMatchEditSupport implements EditSupport {
diff --git a/web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditor.java b/web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditor.java
index 57f77429af..53bd0b2d5a 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/branchmatch/BranchMatchEditor.java
@@ -6,12 +6,12 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
import com.gitplex.server.web.component.branchmatch.BranchMatchInput;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
import com.gitplex.server.web.page.depot.DepotPage;
@SuppressWarnings("serial")
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/date/DateEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/date/DateEditSupport.java
similarity index 76%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/date/DateEditSupport.java
rename to web/src/main/java/com/gitplex/server/web/editable/date/DateEditSupport.java
index 7babebe5d7..5fce37f530 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/date/DateEditSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/date/DateEditSupport.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.date;
+package com.gitplex.server.web.editable.date;
import java.util.Date;
import java.util.Set;
@@ -7,13 +7,13 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.EditSupport;
-import com.gitplex.commons.wicket.editable.NotDefinedLabel;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.PropertyViewer;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.EditSupport;
+import com.gitplex.server.web.editable.NotDefinedLabel;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.editable.PropertyViewer;
@SuppressWarnings("serial")
public class DateEditSupport implements EditSupport {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/date/DatePropertyEditor.html b/web/src/main/java/com/gitplex/server/web/editable/date/DatePropertyEditor.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/date/DatePropertyEditor.html
rename to web/src/main/java/com/gitplex/server/web/editable/date/DatePropertyEditor.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/date/DatePropertyEditor.java b/web/src/main/java/com/gitplex/server/web/editable/date/DatePropertyEditor.java
similarity index 82%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/date/DatePropertyEditor.java
rename to web/src/main/java/com/gitplex/server/web/editable/date/DatePropertyEditor.java
index a76ba92a22..c3fc0cbc21 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/date/DatePropertyEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/date/DatePropertyEditor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.date;
+package com.gitplex.server.web.editable.date;
import java.lang.reflect.Method;
import java.util.Date;
@@ -11,12 +11,12 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.annotation.OmitName;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.util.editable.annotation.OmitName;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.DateTextField;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.DateTextFieldConfig;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/enumeration/EnumEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/enumeration/EnumEditSupport.java
similarity index 75%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/enumeration/EnumEditSupport.java
rename to web/src/main/java/com/gitplex/server/web/editable/enumeration/EnumEditSupport.java
index 7915dae9cf..5d3ff6423b 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/enumeration/EnumEditSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/enumeration/EnumEditSupport.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.enumeration;
+package com.gitplex.server.web.editable.enumeration;
import java.util.Set;
@@ -6,13 +6,13 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.EditSupport;
-import com.gitplex.commons.wicket.editable.NotDefinedLabel;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.PropertyViewer;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.EditSupport;
+import com.gitplex.server.web.editable.NotDefinedLabel;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.editable.PropertyViewer;
@SuppressWarnings("serial")
public class EnumEditSupport implements EditSupport {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/enumeration/EnumPropertyEditor.html b/web/src/main/java/com/gitplex/server/web/editable/enumeration/EnumPropertyEditor.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/enumeration/EnumPropertyEditor.html
rename to web/src/main/java/com/gitplex/server/web/editable/enumeration/EnumPropertyEditor.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/enumeration/EnumPropertyEditor.java b/web/src/main/java/com/gitplex/server/web/editable/enumeration/EnumPropertyEditor.java
similarity index 87%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/enumeration/EnumPropertyEditor.java
rename to web/src/main/java/com/gitplex/server/web/editable/enumeration/EnumPropertyEditor.java
index 811b2bcd59..5988cde85e 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/enumeration/EnumPropertyEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/enumeration/EnumPropertyEditor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.enumeration;
+package com.gitplex.server.web.editable.enumeration;
import java.util.ArrayList;
import java.util.Collection;
@@ -14,11 +14,11 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.annotation.ExcludeValues;
+import com.gitplex.server.util.editable.annotation.ExcludeValues;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
@SuppressWarnings("serial")
public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {
diff --git a/web/src/main/java/com/gitplex/server/web/editable/filechoice/FileChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/filechoice/FileChoiceEditor.java
index e9262eb972..05d75585e9 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/filechoice/FileChoiceEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/filechoice/FileChoiceEditor.java
@@ -8,20 +8,20 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
+import com.gitplex.codeassist.InputCompletion;
+import com.gitplex.codeassist.InputStatus;
+import com.gitplex.codeassist.InputSuggestion;
+import com.gitplex.jsymbol.Range;
+import com.gitplex.server.util.ReflectionUtils;
+import com.gitplex.server.util.editable.annotation.FileChoice;
+import com.gitplex.server.web.behavior.inputassist.InputAssistBehavior;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.util.SuggestionUtils;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
-import com.gitplex.commons.antlr.codeassist.InputCompletion;
-import com.gitplex.commons.antlr.codeassist.InputStatus;
-import com.gitplex.commons.antlr.codeassist.InputSuggestion;
-import com.gitplex.commons.util.ReflectionUtils;
-import com.gitplex.commons.wicket.behavior.inputassist.InputAssistBehavior;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.server.core.annotation.FileChoice;
-import com.gitplex.server.web.util.SuggestionUtils;
-import com.gitplex.jsymbol.Range;
@SuppressWarnings("serial")
public class FileChoiceEditor extends PropertyEditor<String> {
diff --git a/web/src/main/java/com/gitplex/server/web/editable/filechoice/FileEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/filechoice/FileEditSupport.java
index 13d0659090..05af16bec0 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/filechoice/FileEditSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/filechoice/FileEditSupport.java
@@ -7,14 +7,14 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.EditSupport;
-import com.gitplex.commons.wicket.editable.NotDefinedLabel;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.PropertyViewer;
-import com.gitplex.server.core.annotation.FileChoice;
+import com.gitplex.server.util.editable.annotation.FileChoice;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.EditSupport;
+import com.gitplex.server.web.editable.NotDefinedLabel;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.editable.PropertyViewer;
@SuppressWarnings("serial")
public class FileEditSupport implements EditSupport {
diff --git a/web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditSupport.java
index 92b1f60de6..ccbf933419 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditSupport.java
@@ -7,14 +7,14 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.EditSupport;
-import com.gitplex.commons.wicket.editable.NotDefinedLabel;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.PropertyViewer;
-import com.gitplex.server.core.annotation.FullBranchMatch;
+import com.gitplex.server.util.editable.annotation.FullBranchMatch;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.EditSupport;
+import com.gitplex.server.web.editable.NotDefinedLabel;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.editable.PropertyViewer;
@SuppressWarnings("serial")
public class FullBranchMatchEditSupport implements EditSupport {
diff --git a/web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditor.java b/web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditor.java
index e4e89a06cc..776bc2602d 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/fullbranchmatch/FullBranchMatchEditor.java
@@ -6,12 +6,12 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
import com.gitplex.server.web.component.fullbranchmatch.FullBranchMatchInput;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
import com.gitplex.server.web.page.depot.DepotPage;
@SuppressWarnings("serial")
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/list/EnumListPropertyEditor.html b/web/src/main/java/com/gitplex/server/web/editable/list/EnumListPropertyEditor.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/list/EnumListPropertyEditor.html
rename to web/src/main/java/com/gitplex/server/web/editable/list/EnumListPropertyEditor.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/list/EnumListPropertyEditor.java b/web/src/main/java/com/gitplex/server/web/editable/list/EnumListPropertyEditor.java
similarity index 85%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/list/EnumListPropertyEditor.java
rename to web/src/main/java/com/gitplex/server/web/editable/list/EnumListPropertyEditor.java
index b8ebc06d16..26b1a75fc1 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/list/EnumListPropertyEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/list/EnumListPropertyEditor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.list;
+package com.gitplex.server.web.editable.list;
import java.io.Serializable;
import java.util.ArrayList;
@@ -17,16 +17,16 @@ import org.apache.wicket.util.convert.ConversionException;
import org.json.JSONException;
import org.json.JSONWriter;
-import com.gitplex.commons.util.WordUtils;
-import com.gitplex.commons.wicket.component.select2.ChoiceProvider;
-import com.gitplex.commons.wicket.component.select2.Response;
-import com.gitplex.commons.wicket.component.select2.Select2MultiChoice;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.annotation.ExcludeValues;
+import com.gitplex.server.util.WordUtils;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.util.editable.annotation.ExcludeValues;
+import com.gitplex.server.web.component.select2.ChoiceProvider;
+import com.gitplex.server.web.component.select2.Response;
+import com.gitplex.server.web.component.select2.Select2MultiChoice;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
@SuppressWarnings({"serial", "unchecked", "rawtypes"})
public class EnumListPropertyEditor extends PropertyEditor<List<Enum<?>>> {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/list/ListEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/list/ListEditSupport.java
similarity index 83%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/list/ListEditSupport.java
rename to web/src/main/java/com/gitplex/server/web/editable/list/ListEditSupport.java
index 1bfb59a03d..dc3aa6b255 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/list/ListEditSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/list/ListEditSupport.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.list;
+package com.gitplex.server.web.editable.list;
import java.io.Serializable;
import java.util.List;
@@ -8,21 +8,21 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import com.gitplex.calla.loader.LoaderUtils;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.EditSupport;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.commons.wicket.editable.NotDefinedLabel;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.PropertyViewer;
-import com.gitplex.commons.wicket.editable.annotation.ChoiceProvider;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.commons.wicket.editable.list.concrete.ConcreteListPropertyEditor;
-import com.gitplex.commons.wicket.editable.list.concrete.ConcreteListPropertyViewer;
-import com.gitplex.commons.wicket.editable.list.polymorphic.PolymorphicListPropertyEditor;
-import com.gitplex.commons.wicket.editable.list.polymorphic.PolymorphicListPropertyViewer;
+import com.gitplex.launcher.loader.LoaderUtils;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.util.editable.annotation.ChoiceProvider;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.EditSupport;
+import com.gitplex.server.web.editable.NotDefinedLabel;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.editable.PropertyViewer;
+import com.gitplex.server.web.editable.list.concrete.ConcreteListPropertyEditor;
+import com.gitplex.server.web.editable.list.concrete.ConcreteListPropertyViewer;
+import com.gitplex.server.web.editable.list.polymorphic.PolymorphicListPropertyEditor;
+import com.gitplex.server.web.editable.list.polymorphic.PolymorphicListPropertyViewer;
@SuppressWarnings("serial")
public class ListEditSupport implements EditSupport {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/list/StringListPropertyEditor.html b/web/src/main/java/com/gitplex/server/web/editable/list/StringListPropertyEditor.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/list/StringListPropertyEditor.html
rename to web/src/main/java/com/gitplex/server/web/editable/list/StringListPropertyEditor.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/list/StringListPropertyEditor.java b/web/src/main/java/com/gitplex/server/web/editable/list/StringListPropertyEditor.java
similarity index 80%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/list/StringListPropertyEditor.java
rename to web/src/main/java/com/gitplex/server/web/editable/list/StringListPropertyEditor.java
index bd8551da39..b41088d9c7 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/list/StringListPropertyEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/list/StringListPropertyEditor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.list;
+package com.gitplex.server.web.editable.list;
import java.io.Serializable;
import java.util.ArrayList;
@@ -12,14 +12,14 @@ import org.apache.wicket.util.convert.ConversionException;
import org.json.JSONException;
import org.json.JSONWriter;
-import com.gitplex.commons.util.ReflectionUtils;
-import com.gitplex.commons.wicket.component.select2.ChoiceProvider;
-import com.gitplex.commons.wicket.component.select2.Response;
-import com.gitplex.commons.wicket.component.select2.Select2MultiChoice;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
+import com.gitplex.server.util.ReflectionUtils;
+import com.gitplex.server.web.component.select2.ChoiceProvider;
+import com.gitplex.server.web.component.select2.Response;
+import com.gitplex.server.web.component.select2.Select2MultiChoice;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
import com.google.common.base.Preconditions;
@SuppressWarnings("serial")
@@ -33,9 +33,9 @@ public class StringListPropertyEditor extends PropertyEditor<List<String>> {
public StringListPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<String>> propertyModel) {
super(id, propertyDescriptor, propertyModel);
- com.gitplex.commons.wicket.editable.annotation.ChoiceProvider choiceProvider =
+ com.gitplex.server.util.editable.annotation.ChoiceProvider choiceProvider =
propertyDescriptor.getPropertyGetter().getAnnotation(
- com.gitplex.commons.wicket.editable.annotation.ChoiceProvider.class);
+ com.gitplex.server.util.editable.annotation.ChoiceProvider.class);
Preconditions.checkNotNull(choiceProvider);
for (String each: (List<String>)ReflectionUtils
.invokeStaticMethod(propertyDescriptor.getBeanClass(), choiceProvider.value())) {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/list/concrete/ConcreteListPropertyEditor.html b/web/src/main/java/com/gitplex/server/web/editable/list/concrete/ConcreteListPropertyEditor.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/list/concrete/ConcreteListPropertyEditor.html
rename to web/src/main/java/com/gitplex/server/web/editable/list/concrete/ConcreteListPropertyEditor.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/list/concrete/ConcreteListPropertyEditor.java b/web/src/main/java/com/gitplex/server/web/editable/list/concrete/ConcreteListPropertyEditor.java
similarity index 93%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/list/concrete/ConcreteListPropertyEditor.java
rename to web/src/main/java/com/gitplex/server/web/editable/list/concrete/ConcreteListPropertyEditor.java
index c0f2fe5f16..03adcaee2d 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/list/concrete/ConcreteListPropertyEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/list/concrete/ConcreteListPropertyEditor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.list.concrete;
+package com.gitplex.server.web.editable.list.concrete;
import static de.agilecoders.wicket.jquery.JQuery.$;
@@ -27,18 +27,18 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.calla.loader.LoaderUtils;
-import com.gitplex.commons.wicket.behavior.sortable.SortBehavior;
-import com.gitplex.commons.wicket.behavior.sortable.SortPosition;
-import com.gitplex.commons.wicket.editable.BeanDescriptor;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.commons.wicket.editable.EditorChanged;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PathSegment.Property;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
+import com.gitplex.launcher.loader.LoaderUtils;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.web.behavior.sortable.SortBehavior;
+import com.gitplex.server.web.behavior.sortable.SortPosition;
+import com.gitplex.server.web.editable.BeanDescriptor;
+import com.gitplex.server.web.editable.EditorChanged;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.editable.PathSegment.Property;
@SuppressWarnings("serial")
public class ConcreteListPropertyEditor extends PropertyEditor<List<Serializable>> {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/list/concrete/ConcreteListPropertyViewer.html b/web/src/main/java/com/gitplex/server/web/editable/list/concrete/ConcreteListPropertyViewer.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/list/concrete/ConcreteListPropertyViewer.html
rename to web/src/main/java/com/gitplex/server/web/editable/list/concrete/ConcreteListPropertyViewer.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/list/concrete/ConcreteListPropertyViewer.java b/web/src/main/java/com/gitplex/server/web/editable/list/concrete/ConcreteListPropertyViewer.java
similarity index 88%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/list/concrete/ConcreteListPropertyViewer.java
rename to web/src/main/java/com/gitplex/server/web/editable/list/concrete/ConcreteListPropertyViewer.java
index ce4bc3577b..a7b3b53963 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/list/concrete/ConcreteListPropertyViewer.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/list/concrete/ConcreteListPropertyViewer.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.list.concrete;
+package com.gitplex.server.web.editable.list.concrete;
import java.io.Serializable;
import java.util.ArrayList;
@@ -12,10 +12,10 @@ import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
-import com.gitplex.commons.wicket.editable.BeanDescriptor;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.web.editable.BeanDescriptor;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
@SuppressWarnings("serial")
public class ConcreteListPropertyViewer extends Panel {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/list/polymorphic/PolymorphicListPropertyEditor.html b/web/src/main/java/com/gitplex/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/list/polymorphic/PolymorphicListPropertyEditor.html
rename to web/src/main/java/com/gitplex/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/list/polymorphic/PolymorphicListPropertyEditor.java b/web/src/main/java/com/gitplex/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.java
similarity index 91%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/list/polymorphic/PolymorphicListPropertyEditor.java
rename to web/src/main/java/com/gitplex/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.java
index 6b44f472da..18ae21fef4 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/list/polymorphic/PolymorphicListPropertyEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.list.polymorphic;
+package com.gitplex.server.web.editable.list.polymorphic;
import static de.agilecoders.wicket.jquery.JQuery.$;
@@ -24,21 +24,21 @@ import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.calla.loader.ImplementationRegistry;
-import com.gitplex.calla.loader.LoaderUtils;
-import com.gitplex.commons.wicket.behavior.sortable.SortBehavior;
-import com.gitplex.commons.wicket.behavior.sortable.SortPosition;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.BeanEditor;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.commons.wicket.editable.EditorChanged;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.annotation.Horizontal;
-import com.gitplex.commons.wicket.editable.annotation.Vertical;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.launcher.loader.ImplementationRegistry;
+import com.gitplex.launcher.loader.LoaderUtils;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.util.editable.annotation.Horizontal;
+import com.gitplex.server.util.editable.annotation.Vertical;
+import com.gitplex.server.web.behavior.sortable.SortBehavior;
+import com.gitplex.server.web.behavior.sortable.SortPosition;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.BeanEditor;
+import com.gitplex.server.web.editable.EditorChanged;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
import com.google.common.base.Preconditions;
@SuppressWarnings("serial")
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/list/polymorphic/PolymorphicListPropertyViewer.html b/web/src/main/java/com/gitplex/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/list/polymorphic/PolymorphicListPropertyViewer.html
rename to web/src/main/java/com/gitplex/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/list/polymorphic/PolymorphicListPropertyViewer.java b/web/src/main/java/com/gitplex/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.java
similarity index 84%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/list/polymorphic/PolymorphicListPropertyViewer.java
rename to web/src/main/java/com/gitplex/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.java
index 199ba17621..4a43bfae41 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/list/polymorphic/PolymorphicListPropertyViewer.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.list.polymorphic;
+package com.gitplex.server.web.editable.list.polymorphic;
import java.io.Serializable;
import java.lang.reflect.Method;
@@ -12,11 +12,11 @@ import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.annotation.Horizontal;
-import com.gitplex.commons.wicket.editable.annotation.Vertical;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.util.editable.annotation.Horizontal;
+import com.gitplex.server.util.editable.annotation.Vertical;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
@SuppressWarnings("serial")
public class PolymorphicListPropertyViewer extends Panel {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/numeric/NumericEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/numeric/NumericEditSupport.java
similarity index 76%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/numeric/NumericEditSupport.java
rename to web/src/main/java/com/gitplex/server/web/editable/numeric/NumericEditSupport.java
index e79f8abd0d..c93fb049c0 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/numeric/NumericEditSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/numeric/NumericEditSupport.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.numeric;
+package com.gitplex.server.web.editable.numeric;
import java.util.Set;
@@ -6,13 +6,13 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.EditSupport;
-import com.gitplex.commons.wicket.editable.NotDefinedLabel;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.PropertyViewer;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.EditSupport;
+import com.gitplex.server.web.editable.NotDefinedLabel;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.editable.PropertyViewer;
@SuppressWarnings("serial")
public class NumericEditSupport implements EditSupport {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/numeric/NumericPropertyEditor.html b/web/src/main/java/com/gitplex/server/web/editable/numeric/NumericPropertyEditor.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/numeric/NumericPropertyEditor.html
rename to web/src/main/java/com/gitplex/server/web/editable/numeric/NumericPropertyEditor.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/numeric/NumericPropertyEditor.java b/web/src/main/java/com/gitplex/server/web/editable/numeric/NumericPropertyEditor.java
similarity index 81%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/numeric/NumericPropertyEditor.java
rename to web/src/main/java/com/gitplex/server/web/editable/numeric/NumericPropertyEditor.java
index fbc07276a7..079a21f044 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/numeric/NumericPropertyEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/numeric/NumericPropertyEditor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.numeric;
+package com.gitplex.server.web.editable.numeric;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.form.TextField;
@@ -7,10 +7,10 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
@SuppressWarnings("serial")
public class NumericPropertyEditor extends PropertyEditor<Number> {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/password/ConfirmativePasswordPropertyEditor.html b/web/src/main/java/com/gitplex/server/web/editable/password/ConfirmativePasswordPropertyEditor.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/password/ConfirmativePasswordPropertyEditor.html
rename to web/src/main/java/com/gitplex/server/web/editable/password/ConfirmativePasswordPropertyEditor.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/password/ConfirmativePasswordPropertyEditor.java b/web/src/main/java/com/gitplex/server/web/editable/password/ConfirmativePasswordPropertyEditor.java
similarity index 86%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/password/ConfirmativePasswordPropertyEditor.java
rename to web/src/main/java/com/gitplex/server/web/editable/password/ConfirmativePasswordPropertyEditor.java
index fbacac78b5..752ce96886 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/password/ConfirmativePasswordPropertyEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/password/ConfirmativePasswordPropertyEditor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.password;
+package com.gitplex.server.web.editable.password;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.form.PasswordTextField;
@@ -7,11 +7,11 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
@SuppressWarnings("serial")
public class ConfirmativePasswordPropertyEditor extends PropertyEditor<String> {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/password/PasswordEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/password/PasswordEditSupport.java
similarity index 81%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/password/PasswordEditSupport.java
rename to web/src/main/java/com/gitplex/server/web/editable/password/PasswordEditSupport.java
index f15948b547..f3bfd082cb 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/password/PasswordEditSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/password/PasswordEditSupport.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.password;
+package com.gitplex.server.web.editable.password;
import java.util.Set;
@@ -6,14 +6,14 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.EditSupport;
-import com.gitplex.commons.wicket.editable.NotDefinedLabel;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.PropertyViewer;
-import com.gitplex.commons.wicket.editable.annotation.Password;
+import com.gitplex.server.util.editable.annotation.Password;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.EditSupport;
+import com.gitplex.server.web.editable.NotDefinedLabel;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.editable.PropertyViewer;
@SuppressWarnings("serial")
public class PasswordEditSupport implements EditSupport {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/password/PasswordPropertyEditor.html b/web/src/main/java/com/gitplex/server/web/editable/password/PasswordPropertyEditor.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/password/PasswordPropertyEditor.html
rename to web/src/main/java/com/gitplex/server/web/editable/password/PasswordPropertyEditor.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/password/PasswordPropertyEditor.java b/web/src/main/java/com/gitplex/server/web/editable/password/PasswordPropertyEditor.java
similarity index 80%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/password/PasswordPropertyEditor.java
rename to web/src/main/java/com/gitplex/server/web/editable/password/PasswordPropertyEditor.java
index 06f5ef7a4f..3f788788c0 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/password/PasswordPropertyEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/password/PasswordPropertyEditor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.password;
+package com.gitplex.server.web.editable.password;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.form.PasswordTextField;
@@ -7,11 +7,11 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
@SuppressWarnings("serial")
public class PasswordPropertyEditor extends PropertyEditor<String> {
diff --git a/web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditSupport.java
index 121bfcfa93..e1d3da8cd2 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditSupport.java
@@ -7,14 +7,14 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.EditSupport;
-import com.gitplex.commons.wicket.editable.NotDefinedLabel;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.PropertyViewer;
-import com.gitplex.server.core.annotation.PathMatch;
+import com.gitplex.server.util.editable.annotation.PathMatch;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.EditSupport;
+import com.gitplex.server.web.editable.NotDefinedLabel;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.editable.PropertyViewer;
@SuppressWarnings("serial")
public class PathMatchEditSupport implements EditSupport {
diff --git a/web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditor.java b/web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditor.java
index cad0e17b7a..0a6efc6264 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/pathmatch/PathMatchEditor.java
@@ -6,12 +6,12 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
import com.gitplex.server.web.component.pathmatch.PathMatchInput;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
import com.gitplex.server.web.page.depot.DepotPage;
@SuppressWarnings("serial")
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/polymorphic/PolymorphicEditSuport.java b/web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicEditSuport.java
similarity index 72%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/polymorphic/PolymorphicEditSuport.java
rename to web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicEditSuport.java
index a8452760f8..67e535201e 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/polymorphic/PolymorphicEditSuport.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicEditSuport.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.polymorphic;
+package com.gitplex.server.web.editable.polymorphic;
import java.io.Serializable;
import java.util.Set;
@@ -6,15 +6,15 @@ import java.util.Set;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
-import com.gitplex.calla.loader.LoaderUtils;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.EditSupport;
-import com.gitplex.commons.wicket.editable.NotDefinedLabel;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.PropertyViewer;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
+import com.gitplex.launcher.loader.LoaderUtils;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.EditSupport;
+import com.gitplex.server.web.editable.NotDefinedLabel;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.editable.PropertyViewer;
@SuppressWarnings("serial")
public class PolymorphicEditSuport implements EditSupport {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/polymorphic/PolymorphicPropertyEditor.html b/web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicPropertyEditor.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/polymorphic/PolymorphicPropertyEditor.html
rename to web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicPropertyEditor.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/polymorphic/PolymorphicPropertyEditor.java b/web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicPropertyEditor.java
similarity index 87%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/polymorphic/PolymorphicPropertyEditor.java
rename to web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicPropertyEditor.java
index ab9a4f7b64..db65d879cb 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/polymorphic/PolymorphicPropertyEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicPropertyEditor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.polymorphic;
+package com.gitplex.server.web.editable.polymorphic;
import java.io.Serializable;
import java.lang.reflect.Method;
@@ -17,18 +17,18 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.calla.loader.ImplementationRegistry;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.BeanEditor;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.commons.wicket.editable.EditorChanged;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.annotation.Horizontal;
-import com.gitplex.commons.wicket.editable.annotation.Vertical;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.launcher.loader.ImplementationRegistry;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.util.editable.annotation.Horizontal;
+import com.gitplex.server.util.editable.annotation.Vertical;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.BeanEditor;
+import com.gitplex.server.web.editable.EditorChanged;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
import com.google.common.base.Preconditions;
@SuppressWarnings("serial")
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/polymorphic/PolymorphicPropertyViewer.html b/web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicPropertyViewer.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/polymorphic/PolymorphicPropertyViewer.html
rename to web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicPropertyViewer.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/polymorphic/PolymorphicPropertyViewer.java b/web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicPropertyViewer.java
similarity index 79%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/polymorphic/PolymorphicPropertyViewer.java
rename to web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicPropertyViewer.java
index 4549d546ed..918558a5ab 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/polymorphic/PolymorphicPropertyViewer.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/polymorphic/PolymorphicPropertyViewer.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.polymorphic;
+package com.gitplex.server.web.editable.polymorphic;
import java.io.Serializable;
import java.lang.reflect.Method;
@@ -8,11 +8,11 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.annotation.Horizontal;
-import com.gitplex.commons.wicket.editable.annotation.Vertical;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.util.editable.annotation.Horizontal;
+import com.gitplex.server.util.editable.annotation.Vertical;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
@SuppressWarnings("serial")
public class PolymorphicPropertyViewer extends Panel {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/reflection/ReflectionBeanEditor.html b/web/src/main/java/com/gitplex/server/web/editable/reflection/ReflectionBeanEditor.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/reflection/ReflectionBeanEditor.html
rename to web/src/main/java/com/gitplex/server/web/editable/reflection/ReflectionBeanEditor.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/reflection/ReflectionBeanEditor.java b/web/src/main/java/com/gitplex/server/web/editable/reflection/ReflectionBeanEditor.java
similarity index 86%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/reflection/ReflectionBeanEditor.java
rename to web/src/main/java/com/gitplex/server/web/editable/reflection/ReflectionBeanEditor.java
index f8e8de35a6..579b4a7b4c 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/reflection/ReflectionBeanEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/reflection/ReflectionBeanEditor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.reflection;
+package com.gitplex.server.web.editable.reflection;
import java.io.Serializable;
import java.util.ArrayList;
@@ -18,18 +18,18 @@ import org.apache.wicket.util.convert.ConversionException;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
-import com.gitplex.commons.wicket.editable.BeanDescriptor;
-import com.gitplex.commons.wicket.editable.BeanEditor;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.PathSegment.Property;
-import com.gitplex.commons.wicket.editable.annotation.Horizontal;
-import com.gitplex.commons.wicket.editable.annotation.OmitName;
-import com.gitplex.commons.wicket.editable.annotation.Vertical;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.util.editable.annotation.Horizontal;
+import com.gitplex.server.util.editable.annotation.OmitName;
+import com.gitplex.server.util.editable.annotation.Vertical;
+import com.gitplex.server.web.editable.BeanDescriptor;
+import com.gitplex.server.web.editable.BeanEditor;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.editable.PathSegment.Property;
@SuppressWarnings("serial")
public class ReflectionBeanEditor extends BeanEditor<Serializable> {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/reflection/ReflectionBeanViewer.html b/web/src/main/java/com/gitplex/server/web/editable/reflection/ReflectionBeanViewer.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/reflection/ReflectionBeanViewer.html
rename to web/src/main/java/com/gitplex/server/web/editable/reflection/ReflectionBeanViewer.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/reflection/ReflectionBeanViewer.java b/web/src/main/java/com/gitplex/server/web/editable/reflection/ReflectionBeanViewer.java
similarity index 84%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/reflection/ReflectionBeanViewer.java
rename to web/src/main/java/com/gitplex/server/web/editable/reflection/ReflectionBeanViewer.java
index 719988db34..33aa2c3132 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/reflection/ReflectionBeanViewer.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/reflection/ReflectionBeanViewer.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.reflection;
+package com.gitplex.server.web.editable.reflection;
import java.io.Serializable;
import java.lang.reflect.Method;
@@ -13,11 +13,11 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import com.gitplex.commons.wicket.editable.BeanDescriptor;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.annotation.OmitName;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.util.editable.annotation.OmitName;
+import com.gitplex.server.web.editable.BeanDescriptor;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
@SuppressWarnings("serial")
public class ReflectionBeanViewer extends Panel {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/reflection/ReflectionEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/reflection/ReflectionEditSupport.java
similarity index 74%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/reflection/ReflectionEditSupport.java
rename to web/src/main/java/com/gitplex/server/web/editable/reflection/ReflectionEditSupport.java
index bcfb54ece4..1ba06e0154 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/reflection/ReflectionEditSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/reflection/ReflectionEditSupport.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.reflection;
+package com.gitplex.server.web.editable.reflection;
import java.io.Serializable;
import java.util.Set;
@@ -6,18 +6,18 @@ import java.util.Set;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
-import com.gitplex.calla.loader.LoaderUtils;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.BeanDescriptor;
-import com.gitplex.commons.wicket.editable.BeanEditor;
-import com.gitplex.commons.wicket.editable.BeanViewer;
-import com.gitplex.commons.wicket.editable.EditSupport;
-import com.gitplex.commons.wicket.editable.NotDefinedLabel;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.PropertyViewer;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
+import com.gitplex.launcher.loader.LoaderUtils;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.BeanDescriptor;
+import com.gitplex.server.web.editable.BeanEditor;
+import com.gitplex.server.web.editable.BeanViewer;
+import com.gitplex.server.web.editable.EditSupport;
+import com.gitplex.server.web.editable.NotDefinedLabel;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.editable.PropertyViewer;
@SuppressWarnings("serial")
public class ReflectionEditSupport implements EditSupport {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/reflection/ReflectionPropertyEditor.html b/web/src/main/java/com/gitplex/server/web/editable/reflection/ReflectionPropertyEditor.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/reflection/ReflectionPropertyEditor.html
rename to web/src/main/java/com/gitplex/server/web/editable/reflection/ReflectionPropertyEditor.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/reflection/ReflectionPropertyEditor.java b/web/src/main/java/com/gitplex/server/web/editable/reflection/ReflectionPropertyEditor.java
similarity index 87%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/reflection/ReflectionPropertyEditor.java
rename to web/src/main/java/com/gitplex/server/web/editable/reflection/ReflectionPropertyEditor.java
index 1d8d6bc43b..dd90b15238 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/reflection/ReflectionPropertyEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/reflection/ReflectionPropertyEditor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.reflection;
+package com.gitplex.server.web.editable.reflection;
import java.io.Serializable;
@@ -11,13 +11,13 @@ import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.BeanEditor;
-import com.gitplex.commons.wicket.editable.EditorChanged;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.BeanEditor;
+import com.gitplex.server.web.editable.EditorChanged;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
@SuppressWarnings("serial")
public class ReflectionPropertyEditor extends PropertyEditor<Serializable> {
diff --git a/web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditSupport.java
index 6cd6a1d024..1a72fa2c91 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditSupport.java
@@ -7,14 +7,14 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.EditSupport;
-import com.gitplex.commons.wicket.editable.NotDefinedLabel;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.PropertyViewer;
-import com.gitplex.server.core.annotation.RefMatch;
+import com.gitplex.server.util.editable.annotation.RefMatch;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.EditSupport;
+import com.gitplex.server.web.editable.NotDefinedLabel;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.editable.PropertyViewer;
@SuppressWarnings("serial")
public class RefMatchEditSupport implements EditSupport {
diff --git a/web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditor.java b/web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditor.java
index 6bbc9cac02..8ea957ae09 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/refmatch/RefMatchEditor.java
@@ -6,12 +6,12 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
import com.gitplex.server.web.component.refmatch.RefMatchInput;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
import com.gitplex.server.web.page.depot.DepotPage;
@SuppressWarnings("serial")
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/string/StringEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/string/StringEditSupport.java
similarity index 70%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/string/StringEditSupport.java
rename to web/src/main/java/com/gitplex/server/web/editable/string/StringEditSupport.java
index 0e1afcdd6c..72163ce8b6 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/string/StringEditSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/string/StringEditSupport.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.string;
+package com.gitplex.server.web.editable.string;
import java.util.Set;
@@ -7,18 +7,18 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import com.gitplex.commons.wicket.component.MultilineLabel;
-import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.EditSupport;
-import com.gitplex.commons.wicket.editable.NotDefinedLabel;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.PropertyViewer;
-import com.gitplex.commons.wicket.editable.annotation.Markdown;
-import com.gitplex.commons.wicket.editable.annotation.Multiline;
-import com.gitplex.commons.wicket.editable.annotation.Password;
+import com.gitplex.server.util.editable.annotation.Markdown;
+import com.gitplex.server.util.editable.annotation.Multiline;
+import com.gitplex.server.util.editable.annotation.Password;
+import com.gitplex.server.web.component.MultilineLabel;
+import com.gitplex.server.web.component.markdown.MarkdownPanel;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.EditSupport;
+import com.gitplex.server.web.editable.NotDefinedLabel;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.editable.PropertyViewer;
@SuppressWarnings("serial")
public class StringEditSupport implements EditSupport {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/string/StringPropertyEditor.html b/web/src/main/java/com/gitplex/server/web/editable/string/StringPropertyEditor.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/string/StringPropertyEditor.html
rename to web/src/main/java/com/gitplex/server/web/editable/string/StringPropertyEditor.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/editable/string/StringPropertyEditor.java b/web/src/main/java/com/gitplex/server/web/editable/string/StringPropertyEditor.java
similarity index 81%
rename from wicket/src/main/java/com/gitplex/commons/wicket/editable/string/StringPropertyEditor.java
rename to web/src/main/java/com/gitplex/server/web/editable/string/StringPropertyEditor.java
index 35b2faca11..de83f5fda5 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/editable/string/StringPropertyEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/string/StringPropertyEditor.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.editable.string;
+package com.gitplex.server.web.editable.string;
import java.lang.reflect.Method;
@@ -13,15 +13,15 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.commons.wicket.behavior.markdown.MarkdownBehavior;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.annotation.Markdown;
-import com.gitplex.commons.wicket.editable.annotation.Multiline;
-import com.gitplex.commons.wicket.editable.annotation.OmitName;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.util.editable.annotation.Markdown;
+import com.gitplex.server.util.editable.annotation.Multiline;
+import com.gitplex.server.util.editable.annotation.OmitName;
+import com.gitplex.server.web.behavior.markdown.MarkdownBehavior;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
@SuppressWarnings("serial")
public class StringPropertyEditor extends PropertyEditor<String> {
diff --git a/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamEditSupport.java
index 3f166023b8..0761f0f21a 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamEditSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamEditSupport.java
@@ -9,15 +9,15 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.eclipse.jgit.util.StringUtils;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.EditSupport;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.commons.wicket.editable.NotDefinedLabel;
-import com.gitplex.commons.wicket.editable.PropertyContext;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.commons.wicket.editable.PropertyViewer;
-import com.gitplex.server.core.annotation.TeamChoice;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.util.editable.annotation.TeamChoice;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.EditSupport;
+import com.gitplex.server.web.editable.NotDefinedLabel;
+import com.gitplex.server.web.editable.PropertyContext;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
+import com.gitplex.server.web.editable.PropertyViewer;
@SuppressWarnings("serial")
public class TeamEditSupport implements EditSupport {
diff --git a/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamMultiChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamMultiChoiceEditor.java
index f4b510524f..52d904841a 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamMultiChoiceEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamMultiChoiceEditor.java
@@ -10,16 +10,16 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Team;
-import com.gitplex.server.core.manager.TeamManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Team;
+import com.gitplex.server.manager.TeamManager;
import com.gitplex.server.web.component.teamchoice.TeamChoiceProvider;
import com.gitplex.server.web.component.teamchoice.TeamMultiChoice;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
import com.gitplex.server.web.page.account.AccountPage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamSingleChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamSingleChoiceEditor.java
index d7dd15b660..7f0a153771 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamSingleChoiceEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/teamchoice/TeamSingleChoiceEditor.java
@@ -5,16 +5,16 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
-import com.gitplex.commons.wicket.editable.ErrorContext;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.PropertyEditor;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Team;
-import com.gitplex.server.core.manager.TeamManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Team;
+import com.gitplex.server.manager.TeamManager;
import com.gitplex.server.web.component.teamchoice.TeamChoiceProvider;
import com.gitplex.server.web.component.teamchoice.TeamSingleChoice;
+import com.gitplex.server.web.editable.ErrorContext;
+import com.gitplex.server.web.editable.PathSegment;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.PropertyEditor;
import com.gitplex.server.web.page.account.AccountPage;
@SuppressWarnings("serial")
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/page/CommonCssResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/CommonCssResourceReference.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/page/CommonCssResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/page/CommonCssResourceReference.java
index f83b02ee83..88c2a5b4d4 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/page/CommonCssResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/page/CommonCssResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.page;
+package com.gitplex.server.web.page;
import java.util.ArrayList;
import java.util.List;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/page/CommonDependentCssResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/CommonDependentCssResourceReference.java
similarity index 94%
rename from wicket/src/main/java/com/gitplex/commons/wicket/page/CommonDependentCssResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/page/CommonDependentCssResourceReference.java
index 606db89e06..fb9ce9e065 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/page/CommonDependentCssResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/page/CommonDependentCssResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.page;
+package com.gitplex.server.web.page;
import java.util.ArrayList;
import java.util.List;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/page/CommonDependentResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/CommonDependentResourceReference.java
similarity index 94%
rename from wicket/src/main/java/com/gitplex/commons/wicket/page/CommonDependentResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/page/CommonDependentResourceReference.java
index 8352f38e89..637a584e2f 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/page/CommonDependentResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/page/CommonDependentResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.page;
+package com.gitplex.server.web.page;
import java.util.ArrayList;
import java.util.List;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/page/CommonErrorPage.html b/web/src/main/java/com/gitplex/server/web/page/CommonErrorPage.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/page/CommonErrorPage.html
rename to web/src/main/java/com/gitplex/server/web/page/CommonErrorPage.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/page/CommonPage.html b/web/src/main/java/com/gitplex/server/web/page/CommonPage.html
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/page/CommonPage.html
rename to web/src/main/java/com/gitplex/server/web/page/CommonPage.html
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/page/CommonPage.java b/web/src/main/java/com/gitplex/server/web/page/CommonPage.java
similarity index 89%
rename from wicket/src/main/java/com/gitplex/commons/wicket/page/CommonPage.java
rename to web/src/main/java/com/gitplex/server/web/page/CommonPage.java
index 0a3110a896..4265e600cd 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/page/CommonPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/CommonPage.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.page;
+package com.gitplex.server.web.page;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
@@ -26,12 +26,12 @@ import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.time.Duration;
-import org.eclipse.jetty.server.SessionManager;
+import org.eclipse.jetty.servlet.ServletContextHandler;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.gitplex.commons.wicket.websocket.WebSocketManager;
-import com.gitplex.commons.wicket.websocket.WebSocketRegion;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.server.web.websocket.WebSocketManager;
+import com.gitplex.server.web.websocket.WebSocketRegion;
@SuppressWarnings("serial")
public abstract class CommonPage extends WebPage {
@@ -88,7 +88,8 @@ public abstract class CommonPage extends WebPage {
add(sessionFeedback);
sessionFeedback.setOutputMarkupId(true);
- int sessionTimeout = AppLoader.getInstance(SessionManager.class).getMaxInactiveInterval();
+ int sessionTimeout = AppLoader.getInstance(ServletContextHandler.class)
+ .getSessionHandler().getSessionManager().getMaxInactiveInterval();
add(new WebMarkupContainer("keepSessionAlive")
.add(new AjaxSelfUpdatingTimerBehavior(Duration.milliseconds(sessionTimeout*500L))));
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/page/CommonResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/CommonResourceReference.java
similarity index 84%
rename from wicket/src/main/java/com/gitplex/commons/wicket/page/CommonResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/page/CommonResourceReference.java
index a800861b30..b563ce8216 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/page/CommonResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/page/CommonResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.page;
+package com.gitplex.server.web.page;
import java.util.ArrayList;
import java.util.List;
@@ -8,9 +8,9 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
-import com.gitplex.commons.wicket.assets.align.AlignResourceReference;
-import com.gitplex.commons.wicket.assets.areyousure.AreYouSureResourceReference;
-import com.gitplex.commons.wicket.assets.autosize.AutoSizeResourceReference;
+import com.gitplex.server.web.assets.align.AlignResourceReference;
+import com.gitplex.server.web.assets.areyousure.AreYouSureResourceReference;
+import com.gitplex.server.web.assets.autosize.AutoSizeResourceReference;
import de.agilecoders.wicket.core.Bootstrap;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/page/FontAwesomeResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/FontAwesomeResourceReference.java
similarity index 88%
rename from wicket/src/main/java/com/gitplex/commons/wicket/page/FontAwesomeResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/page/FontAwesomeResourceReference.java
index 56c6a24a36..2351abb09f 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/page/FontAwesomeResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/page/FontAwesomeResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.page;
+package com.gitplex.server.web.page;
import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/page/SessionFeedbackPanel.java b/web/src/main/java/com/gitplex/server/web/page/SessionFeedbackPanel.java
similarity index 97%
rename from wicket/src/main/java/com/gitplex/commons/wicket/page/SessionFeedbackPanel.java
rename to web/src/main/java/com/gitplex/server/web/page/SessionFeedbackPanel.java
index 631ead2ecc..d5ba9c611d 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/page/SessionFeedbackPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/SessionFeedbackPanel.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.page;
+package com.gitplex.server.web.page;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.feedback.FeedbackMessage;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/page/ViewState.java b/web/src/main/java/com/gitplex/server/web/page/ViewState.java
similarity index 94%
rename from wicket/src/main/java/com/gitplex/commons/wicket/page/ViewState.java
rename to web/src/main/java/com/gitplex/server/web/page/ViewState.java
index 08a02d3f1c..ed13e6c8f9 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/page/ViewState.java
+++ b/web/src/main/java/com/gitplex/server/web/page/ViewState.java
@@ -1,10 +1,10 @@
-package com.gitplex.commons.wicket.page;
+package com.gitplex.server.web.page;
import java.io.Serializable;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gitplex.calla.loader.AppLoader;
+import com.gitplex.launcher.loader.AppLoader;
public class ViewState implements Serializable {
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/AccountLayoutPage.java b/web/src/main/java/com/gitplex/server/web/page/account/AccountLayoutPage.java
index e1ce1ef180..7ec1e4ef94 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/AccountLayoutPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/AccountLayoutPage.java
@@ -9,10 +9,10 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.wicket.component.tabbable.PageTab;
-import com.gitplex.commons.wicket.component.tabbable.Tabbable;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.avatar.Avatar;
+import com.gitplex.server.web.component.tabbable.PageTab;
+import com.gitplex.server.web.component.tabbable.Tabbable;
import com.gitplex.server.web.page.account.collaborators.AccountCollaboratorListPage;
import com.gitplex.server.web.page.account.collaborators.CollaboratorPage;
import com.gitplex.server.web.page.account.members.MemberListPage;
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/AccountPage.java b/web/src/main/java/com/gitplex/server/web/page/account/AccountPage.java
index beb6692436..9f93a3ca7f 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/AccountPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/AccountPage.java
@@ -7,11 +7,11 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.web.model.UserModel;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
import com.gitplex.server.web.page.layout.LayoutPage;
+import com.gitplex.server.web.util.model.UserModel;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/AccountTab.java b/web/src/main/java/com/gitplex/server/web/page/account/AccountTab.java
index 2c698ece55..7061d0e831 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/AccountTab.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/AccountTab.java
@@ -3,7 +3,7 @@ package com.gitplex.server.web.page.account;
import org.apache.wicket.Component;
import org.apache.wicket.model.Model;
-import com.gitplex.commons.wicket.component.tabbable.PageTab;
+import com.gitplex.server.web.component.tabbable.PageTab;
@SuppressWarnings("serial")
public class AccountTab extends PageTab {
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.java
index 5b898dcced..b13a39c5f2 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.java
@@ -18,13 +18,13 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.UserAuthorization;
-import com.gitplex.server.core.manager.UserAuthorizationManager;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.UserAuthorization;
+import com.gitplex.server.manager.UserAuthorizationManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
import com.gitplex.server.web.component.avatar.Avatar;
import com.gitplex.server.web.page.account.AccountLayoutPage;
import com.gitplex.server.web.page.account.overview.AccountOverviewPage;
@@ -100,7 +100,7 @@ public class AccountCollaboratorListPage extends AccountLayoutPage {
return listOfCollaborators;
}
- }, Constants.DEFAULT_PAGE_SIZE) {
+ }, WebConstants.DEFAULT_PAGE_SIZE) {
@Override
protected void populateItem(ListItem<Account> item) {
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.java
index 9dee85faef..27977d686e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.java
@@ -25,23 +25,23 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.commons.wicket.component.select2.Response;
-import com.gitplex.commons.wicket.component.select2.ResponseFiller;
-import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.UserAuthorization;
-import com.gitplex.server.core.manager.UserAuthorizationManager;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.UserAuthorization;
+import com.gitplex.server.manager.UserAuthorizationManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.security.privilege.DepotPrivilege;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
+import com.gitplex.server.web.component.DropdownLink;
import com.gitplex.server.web.component.depotchoice.AbstractDepotChoiceProvider;
import com.gitplex.server.web.component.depotchoice.DepotChoiceResourceReference;
import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;
-import com.gitplex.server.web.depotaccess.DepotAccess;
+import com.gitplex.server.web.component.select2.Response;
+import com.gitplex.server.web.component.select2.ResponseFiller;
+import com.gitplex.server.web.component.select2.SelectToAddChoice;
import com.gitplex.server.web.page.depot.setting.authorization.DepotCollaboratorListPage;
+import com.gitplex.server.web.util.depotaccess.DepotAccess;
import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;
import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;
@@ -167,7 +167,7 @@ public class CollaboratorDepotListPage extends CollaboratorPage {
Collections.sort(depots);
- new ResponseFiller<Depot>(response).fill(depots, page, Constants.DEFAULT_PAGE_SIZE);
+ new ResponseFiller<Depot>(response).fill(depots, page, WebConstants.DEFAULT_PAGE_SIZE);
}
}) {
@@ -264,7 +264,7 @@ public class CollaboratorDepotListPage extends CollaboratorPage {
return authorizations;
}
- }, Constants.DEFAULT_PAGE_SIZE) {
+ }, WebConstants.DEFAULT_PAGE_SIZE) {
@Override
protected void populateItem(ListItem<UserAuthorization> item) {
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java
index 3e561230a1..6d096095ac 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java
@@ -18,16 +18,16 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.security.privilege.DepotPrivilege;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
+import com.gitplex.server.web.component.DropdownLink;
import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;
-import com.gitplex.server.web.depotaccess.DepotAccess;
import com.gitplex.server.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;
+import com.gitplex.server.web.util.depotaccess.DepotAccess;
import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;
import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;
@@ -164,7 +164,7 @@ public class CollaboratorEffectivePrivilegePage extends CollaboratorPage {
return permissions;
}
- }, Constants.DEFAULT_PAGE_SIZE) {
+ }, WebConstants.DEFAULT_PAGE_SIZE) {
@Override
protected void populateItem(ListItem<DepotPermission> item) {
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.java b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.java
index 4922bf307c..4d158127c4 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.java
@@ -14,15 +14,15 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.wicket.component.tabbable.PageTab;
-import com.gitplex.commons.wicket.component.tabbable.PageTabLink;
-import com.gitplex.commons.wicket.component.tabbable.Tabbable;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.AccountLink;
import com.gitplex.server.web.component.avatar.AvatarLink;
+import com.gitplex.server.web.component.tabbable.PageTab;
+import com.gitplex.server.web.component.tabbable.PageTabLink;
+import com.gitplex.server.web.component.tabbable.Tabbable;
import com.gitplex.server.web.page.account.AccountLayoutPage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.java b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.java
index 985c537d9c..f67e0751dc 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.java
@@ -4,10 +4,10 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.DepotManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.DepotManager;
import com.gitplex.server.web.component.privilegesource.PrivilegeSourcePanel;
import com.google.common.base.Preconditions;
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.java
index 9fe5d5ca01..470bf3e897 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.java
@@ -18,16 +18,16 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.security.privilege.DepotPrivilege;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
+import com.gitplex.server.web.component.DropdownLink;
import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;
-import com.gitplex.server.web.depotaccess.DepotAccess;
import com.gitplex.server.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;
+import com.gitplex.server.web.util.depotaccess.DepotAccess;
import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;
import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;
@@ -164,7 +164,7 @@ public class MemberEffectivePrivilegePage extends MemberPage {
return permissions;
}
- }, Constants.DEFAULT_PAGE_SIZE) {
+ }, WebConstants.DEFAULT_PAGE_SIZE) {
@Override
protected void populateItem(ListItem<DepotPermission> item) {
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.java
index f83e8ab2b2..c5e62d120f 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.java
@@ -26,15 +26,15 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.OrganizationMembership;
-import com.gitplex.server.core.manager.OrganizationMembershipManager;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.OrganizationMembership;
+import com.gitplex.server.manager.OrganizationMembershipManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.security.privilege.DepotPrivilege;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
+import com.gitplex.server.web.component.DropdownLink;
import com.gitplex.server.web.component.avatar.Avatar;
import com.gitplex.server.web.component.roleselection.RoleSelectionPanel;
import com.gitplex.server.web.page.account.AccountLayoutPage;
@@ -234,7 +234,7 @@ public class MemberListPage extends AccountLayoutPage {
return memberships;
}
- }, Constants.DEFAULT_PAGE_SIZE) {
+ }, WebConstants.DEFAULT_PAGE_SIZE) {
@Override
protected void populateItem(ListItem<OrganizationMembership> item) {
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.java
index 44ce72ce26..68e8f7fad1 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.java
@@ -21,22 +21,22 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.wicket.ConfirmOnClick;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.commons.wicket.component.tabbable.PageTab;
-import com.gitplex.commons.wicket.component.tabbable.PageTabLink;
-import com.gitplex.commons.wicket.component.tabbable.Tabbable;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.OrganizationMembership;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.OrganizationMembershipManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.OrganizationMembership;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.OrganizationMembershipManager;
+import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.AccountLink;
+import com.gitplex.server.web.component.DropdownLink;
import com.gitplex.server.web.component.avatar.AvatarLink;
import com.gitplex.server.web.component.roleselection.RoleSelectionPanel;
+import com.gitplex.server.web.component.tabbable.PageTab;
+import com.gitplex.server.web.component.tabbable.PageTabLink;
+import com.gitplex.server.web.component.tabbable.Tabbable;
import com.gitplex.server.web.page.account.AccountLayoutPage;
import com.gitplex.server.web.page.account.overview.AccountOverviewPage;
+import com.gitplex.server.web.util.ConfirmOnClick;
@SuppressWarnings("serial")
public abstract class MemberPage extends AccountLayoutPage {
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPrivilegeSourcePage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPrivilegeSourcePage.java
index 655027f96e..f8c91461ec 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPrivilegeSourcePage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPrivilegeSourcePage.java
@@ -5,12 +5,12 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.OrganizationMembership;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.OrganizationMembership;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.privilegesource.PrivilegeSourcePanel;
import com.google.common.base.Preconditions;
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.java
index a3cf121db4..4572f01a28 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.java
@@ -24,18 +24,18 @@ import org.json.JSONWriter;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
-import com.gitplex.commons.wicket.component.select2.ChoiceProvider;
-import com.gitplex.commons.wicket.component.select2.Response;
-import com.gitplex.commons.wicket.component.select2.ResponseFiller;
-import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Team;
-import com.gitplex.server.core.entity.TeamMembership;
-import com.gitplex.server.core.manager.TeamManager;
-import com.gitplex.server.core.manager.TeamMembershipManager;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Team;
+import com.gitplex.server.entity.TeamMembership;
+import com.gitplex.server.manager.TeamManager;
+import com.gitplex.server.manager.TeamMembershipManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.component.select2.ChoiceProvider;
+import com.gitplex.server.web.component.select2.Response;
+import com.gitplex.server.web.component.select2.ResponseFiller;
+import com.gitplex.server.web.component.select2.SelectToAddChoice;
import com.gitplex.server.web.component.teamchoice.TeamChoiceResourceReference;
import com.gitplex.server.web.page.account.teams.TeamMemberListPage;
@@ -104,7 +104,7 @@ public class MemberTeamListPage extends MemberPage {
Collections.sort(teams);
- new ResponseFiller<Team>(response).fill(teams, page, Constants.DEFAULT_PAGE_SIZE);
+ new ResponseFiller<Team>(response).fill(teams, page, WebConstants.DEFAULT_PAGE_SIZE);
}
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/NewMembersPage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/NewMembersPage.java
index f463a3d930..0b8d0b1c55 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/members/NewMembersPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/NewMembersPage.java
@@ -15,13 +15,13 @@ import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.OrganizationMembership;
-import com.gitplex.server.core.entity.Team;
-import com.gitplex.server.core.entity.TeamMembership;
-import com.gitplex.server.core.manager.OrganizationMembershipManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.OrganizationMembership;
+import com.gitplex.server.entity.Team;
+import com.gitplex.server.entity.TeamMembership;
+import com.gitplex.server.manager.OrganizationMembershipManager;
+import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.teamchoice.TeamChoiceProvider;
import com.gitplex.server.web.component.teamchoice.TeamMultiChoice;
import com.gitplex.server.web.page.account.AccountLayoutPage;
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoiceProvider.java
index 9e70cb44dd..5ea34ae748 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoiceProvider.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoiceProvider.java
@@ -11,15 +11,15 @@ import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.commons.wicket.component.select2.Response;
-import com.gitplex.commons.wicket.component.select2.ResponseFiller;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.OrganizationMembership;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.OrganizationMembership;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.component.accountchoice.AccountChoiceProvider;
+import com.gitplex.server.web.component.select2.Response;
+import com.gitplex.server.web.component.select2.ResponseFiller;
public class NonMemberChoiceProvider extends AccountChoiceProvider {
@@ -52,7 +52,7 @@ public class NonMemberChoiceProvider extends AccountChoiceProvider {
nonMembers.add(user);
}
- new ResponseFiller<Account>(response).fill(nonMembers, page, Constants.DEFAULT_PAGE_SIZE);
+ new ResponseFiller<Account>(response).fill(nonMembers, page, WebConstants.DEFAULT_PAGE_SIZE);
}
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoices.java b/web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoices.java
index ccaf75582d..0861d3e8a6 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoices.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/NonMemberChoices.java
@@ -6,9 +6,9 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.component.select2.Select2MultiChoice;
-import com.gitplex.server.core.entity.Account;
+import com.gitplex.server.entity.Account;
import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;
+import com.gitplex.server.web.component.select2.Select2MultiChoice;
public class NonMemberChoices extends Select2MultiChoice<Account> {
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/AccountOverviewPage.java b/web/src/main/java/com/gitplex/server/web/page/account/overview/AccountOverviewPage.java
index 092750c97e..22b957eca9 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/AccountOverviewPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/overview/AccountOverviewPage.java
@@ -3,7 +3,7 @@ package com.gitplex.server.web.page.account.overview;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.server.core.entity.Account;
+import com.gitplex.server.entity.Account;
import com.gitplex.server.web.page.account.AccountLayoutPage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.java b/web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.java
index e72386014c..0b06270697 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.java
@@ -17,13 +17,13 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;
@@ -124,7 +124,7 @@ public class DepotListPanel extends GenericPanel<Account> {
return depots;
}
- }, Constants.DEFAULT_PAGE_SIZE) {
+ }, WebConstants.DEFAULT_PAGE_SIZE) {
@Override
protected void populateItem(final ListItem<Depot> item) {
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.java b/web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.java
index 4fb969eba7..24ffe5c12e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.java
@@ -5,14 +5,14 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.BeanEditor;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.BeanEditor;
+import com.gitplex.server.web.editable.PathSegment;
import com.gitplex.server.web.page.account.AccountLayoutPage;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/NewOrganizationPage.java b/web/src/main/java/com/gitplex/server/web/page/account/overview/NewOrganizationPage.java
index d6f8504dc6..ea9743a171 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/NewOrganizationPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/overview/NewOrganizationPage.java
@@ -5,15 +5,15 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.BeanEditor;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.OrganizationMembership;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.OrganizationMembershipManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.OrganizationMembership;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.OrganizationMembershipManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.BeanEditor;
+import com.gitplex.server.web.editable.PathSegment;
import com.gitplex.server.web.page.account.AccountLayoutPage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/OrganizationOverviewPanel.java b/web/src/main/java/com/gitplex/server/web/page/account/overview/OrganizationOverviewPanel.java
index bf534fba0a..b5573ace28 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/OrganizationOverviewPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/overview/OrganizationOverviewPanel.java
@@ -4,7 +4,7 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
-import com.gitplex.server.core.entity.Account;
+import com.gitplex.server.entity.Account;
@SuppressWarnings("serial")
public class OrganizationOverviewPanel extends GenericPanel<Account> {
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.java b/web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.java
index 00ea36bd5f..b2e9ff65e0 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.java
@@ -13,9 +13,9 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.OrganizationMembership;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.OrganizationMembership;
+import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.AccountLink;
import com.gitplex.server.web.component.avatar.AvatarLink;
import com.gitplex.server.web.component.roleselection.RoleSelectionPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/AccountSettingPage.java b/web/src/main/java/com/gitplex/server/web/page/account/setting/AccountSettingPage.java
index c1d679404e..b9ac6eac7b 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/setting/AccountSettingPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/setting/AccountSettingPage.java
@@ -5,9 +5,9 @@ import java.util.List;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.wicket.component.tabbable.PageTab;
-import com.gitplex.commons.wicket.component.tabbable.Tabbable;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.component.tabbable.PageTab;
+import com.gitplex.server.web.component.tabbable.Tabbable;
import com.gitplex.server.web.page.account.AccountLayoutPage;
import com.gitplex.server.web.page.account.AccountTab;
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.java b/web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.java
index 779a9da572..b3113b20d2 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/setting/AvatarEditPage.java
@@ -12,11 +12,11 @@ import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.apache.wicket.markup.html.form.upload.FileUploadField;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.util.FileUtils;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.web.avatar.AvatarManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.util.FileUtils;
import com.gitplex.server.web.component.avatar.AvatarChanged;
+import com.gitplex.server.web.util.avatar.AvatarManager;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/OldPasswordValidator.java b/web/src/main/java/com/gitplex/server/web/page/account/setting/OldPasswordValidator.java
index 92a54497dd..79b73c2905 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/setting/OldPasswordValidator.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/setting/OldPasswordValidator.java
@@ -5,9 +5,9 @@ import javax.validation.ConstraintValidatorContext;
import org.apache.shiro.authc.credential.PasswordService;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.commons.wicket.WicketUtils;
+import com.gitplex.launcher.loader.AppLoader;
import com.gitplex.server.web.page.account.AccountPage;
+import com.gitplex.server.web.util.WicketUtils;
public class OldPasswordValidator implements ConstraintValidator<OldPassword, String> {
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditBean.java b/web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditBean.java
index de2860ae3f..f5e90e03fc 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditBean.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditBean.java
@@ -4,8 +4,8 @@ import java.io.Serializable;
import org.hibernate.validator.constraints.NotEmpty;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.commons.wicket.editable.annotation.Password;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.Password;
@Editable
public class PasswordEditBean implements Serializable {
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditPage.java b/web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditPage.java
index e633feb053..7da427f05e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/setting/PasswordEditPage.java
@@ -10,12 +10,12 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.base.Preconditions;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.editable.BeanContext;
import com.gitplex.server.web.page.account.overview.AccountOverviewPage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.java b/web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.java
index 2c871a6f20..284b690ee5 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/setting/ProfileEditPage.java
@@ -11,13 +11,13 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.BeanEditor;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
import com.gitplex.server.web.component.confirmdelete.ConfirmDeleteAccountModal;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.BeanEditor;
+import com.gitplex.server.web.editable.PathSegment;
import com.gitplex.server.web.page.account.AccountPage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.java
index 19a6d111d9..52e12f68d7 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.java
@@ -22,18 +22,18 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.hibernate.criterion.Restrictions;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.commons.wicket.component.datatable.DefaultDataTable;
-import com.gitplex.commons.wicket.component.datatable.EntityDataProvider;
-import com.gitplex.commons.wicket.component.datatable.SelectionColumn;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestTask;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestTask;
+import com.gitplex.server.persistence.AbstractEntity;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.component.BranchLink;
+import com.gitplex.server.web.component.datatable.DefaultDataTable;
+import com.gitplex.server.web.component.datatable.EntityDataProvider;
+import com.gitplex.server.web.component.datatable.SelectionColumn;
import com.gitplex.server.web.page.account.AccountLayoutPage;
import com.gitplex.server.web.page.account.overview.AccountOverviewPage;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;
@@ -155,7 +155,7 @@ public class TaskListPage extends AccountLayoutPage {
});
DataTable<PullRequestTask, String> dataTable =
- new DefaultDataTable<PullRequestTask, String>("tasks", columns, dataProvider, Constants.DEFAULT_PAGE_SIZE);
+ new DefaultDataTable<PullRequestTask, String>("tasks", columns, dataProvider, WebConstants.DEFAULT_PAGE_SIZE);
dataTable.setVisible(dataTable.getRowCount() != 0);
add(dataTable);
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoiceProvider.java
index 3755b1a5c5..13ba6ae1db 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoiceProvider.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoiceProvider.java
@@ -5,11 +5,11 @@ import java.util.List;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.component.select2.Response;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.OrganizationMembership;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.OrganizationMembership;
+import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.component.accountchoice.AccountChoiceProvider;
+import com.gitplex.server.web.component.select2.Response;
public class MemberChoiceProvider extends AccountChoiceProvider {
@@ -35,8 +35,8 @@ public class MemberChoiceProvider extends AccountChoiceProvider {
}
members.sort((user1, user2) -> user1.getName().compareTo(user2.getName()));
- int from = page * Constants.DEFAULT_PAGE_SIZE;
- int to = from + Constants.DEFAULT_PAGE_SIZE;
+ int from = page * WebConstants.DEFAULT_PAGE_SIZE;
+ int to = from + WebConstants.DEFAULT_PAGE_SIZE;
if (to > members.size()) {
to = members.size();
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoices.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoices.java
index 727df38d14..f826167dde 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoices.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/MemberChoices.java
@@ -6,9 +6,9 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.component.select2.Select2MultiChoice;
-import com.gitplex.server.core.entity.Account;
+import com.gitplex.server.entity.Account;
import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;
+import com.gitplex.server.web.component.select2.Select2MultiChoice;
public class MemberChoices extends Select2MultiChoice<Account> {
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/NewTeamPage.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/NewTeamPage.java
index 853d9f87b8..464368e9be 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/NewTeamPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/NewTeamPage.java
@@ -7,14 +7,14 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.BeanEditor;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Team;
-import com.gitplex.server.core.manager.TeamManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Team;
+import com.gitplex.server.manager.TeamManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.BeanEditor;
+import com.gitplex.server.web.editable.PathSegment;
import com.gitplex.server.web.page.account.AccountLayoutPage;
import com.gitplex.server.web.page.account.overview.AccountOverviewPage;
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.java
index 272205bb17..102d1071d8 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.java
@@ -26,27 +26,27 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.commons.wicket.component.modal.ModalLink;
-import com.gitplex.commons.wicket.component.select2.Response;
-import com.gitplex.commons.wicket.component.select2.ResponseFiller;
-import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.Team;
-import com.gitplex.server.core.entity.TeamAuthorization;
-import com.gitplex.server.core.manager.TeamAuthorizationManager;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.Team;
+import com.gitplex.server.entity.TeamAuthorization;
+import com.gitplex.server.manager.TeamAuthorizationManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.security.privilege.DepotPrivilege;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
+import com.gitplex.server.web.component.DropdownLink;
import com.gitplex.server.web.component.depotchoice.AbstractDepotChoiceProvider;
import com.gitplex.server.web.component.depotchoice.DepotChoiceResourceReference;
import com.gitplex.server.web.component.greaterprivilege.GreaterPrivilegesPanel;
+import com.gitplex.server.web.component.modal.ModalLink;
import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;
-import com.gitplex.server.web.depotaccess.DepotAccess;
+import com.gitplex.server.web.component.select2.Response;
+import com.gitplex.server.web.component.select2.ResponseFiller;
+import com.gitplex.server.web.component.select2.SelectToAddChoice;
import com.gitplex.server.web.page.depot.setting.authorization.DepotTeamListPage;
+import com.gitplex.server.web.util.depotaccess.DepotAccess;
import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;
import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;
@@ -198,7 +198,7 @@ public class TeamDepotListPage extends TeamPage {
Collections.sort(depots);
- new ResponseFiller<Depot>(response).fill(depots, page, Constants.DEFAULT_PAGE_SIZE);
+ new ResponseFiller<Depot>(response).fill(depots, page, WebConstants.DEFAULT_PAGE_SIZE);
}
}) {
@@ -264,7 +264,7 @@ public class TeamDepotListPage extends TeamPage {
return authorizations;
}
- }, Constants.DEFAULT_PAGE_SIZE) {
+ }, WebConstants.DEFAULT_PAGE_SIZE) {
@Override
protected void populateItem(ListItem<TeamAuthorization> item) {
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamEditPage.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamEditPage.java
index c76cef9e2d..c75f54419e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamEditPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamEditPage.java
@@ -9,14 +9,14 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.BeanEditor;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Team;
-import com.gitplex.server.core.manager.TeamManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Team;
+import com.gitplex.server.manager.TeamManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.BeanEditor;
+import com.gitplex.server.web.editable.PathSegment;
import com.gitplex.server.web.page.account.AccountLayoutPage;
import com.gitplex.server.web.page.account.overview.AccountOverviewPage;
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.java
index e9e9f0ba50..1d66082205 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.java
@@ -20,17 +20,17 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.wicket.ajaxlistener.ConfirmListener;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Team;
-import com.gitplex.server.core.entity.TeamMembership;
-import com.gitplex.server.core.manager.TeamManager;
-import com.gitplex.server.core.manager.TeamMembershipManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Team;
+import com.gitplex.server.entity.TeamMembership;
+import com.gitplex.server.manager.TeamManager;
+import com.gitplex.server.manager.TeamMembershipManager;
+import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.avatar.AvatarLink;
import com.gitplex.server.web.page.account.AccountLayoutPage;
import com.gitplex.server.web.page.account.overview.AccountOverviewPage;
+import com.gitplex.server.web.util.ajaxlistener.ConfirmListener;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.java
index 1b9bed9c18..cf84a1d7b3 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.java
@@ -26,24 +26,24 @@ import org.json.JSONWriter;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.gitplex.commons.wicket.component.select2.ChoiceProvider;
-import com.gitplex.commons.wicket.component.select2.Response;
-import com.gitplex.commons.wicket.component.select2.ResponseFiller;
-import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.OrganizationMembership;
-import com.gitplex.server.core.entity.TeamMembership;
-import com.gitplex.server.core.manager.OrganizationMembershipManager;
-import com.gitplex.server.core.manager.TeamMembershipManager;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.web.Constants;
-import com.gitplex.server.web.avatar.AvatarManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.OrganizationMembership;
+import com.gitplex.server.entity.TeamMembership;
+import com.gitplex.server.manager.OrganizationMembershipManager;
+import com.gitplex.server.manager.TeamMembershipManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;
import com.gitplex.server.web.component.avatar.Avatar;
+import com.gitplex.server.web.component.select2.ChoiceProvider;
+import com.gitplex.server.web.component.select2.Response;
+import com.gitplex.server.web.component.select2.ResponseFiller;
+import com.gitplex.server.web.component.select2.SelectToAddChoice;
import com.gitplex.server.web.page.account.members.MemberListPage;
import com.gitplex.server.web.page.account.members.MemberTeamListPage;
+import com.gitplex.server.web.util.avatar.AvatarManager;
import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;
import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;
@@ -131,7 +131,7 @@ public class TeamMemberListPage extends TeamPage {
memberships.sort((membership1, membership2)
-> membership1.getUser().compareTo(membership2.getUser()));
- new ResponseFiller<OrganizationMembership>(response).fill(memberships, page, Constants.DEFAULT_PAGE_SIZE);
+ new ResponseFiller<OrganizationMembership>(response).fill(memberships, page, WebConstants.DEFAULT_PAGE_SIZE);
}
@Override
@@ -222,7 +222,7 @@ public class TeamMemberListPage extends TeamPage {
return memberships;
}
- }, Constants.DEFAULT_PAGE_SIZE) {
+ }, WebConstants.DEFAULT_PAGE_SIZE) {
@Override
protected void populateItem(ListItem<TeamMembership> item) {
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.java
index 0b24a5be63..a2c367372f 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.java
@@ -15,18 +15,18 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.wicket.ConfirmOnClick;
-import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;
-import com.gitplex.commons.wicket.component.tabbable.PageTab;
-import com.gitplex.commons.wicket.component.tabbable.PageTabLink;
-import com.gitplex.commons.wicket.component.tabbable.Tabbable;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Team;
-import com.gitplex.server.core.manager.TeamManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Team;
+import com.gitplex.server.manager.TeamManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.component.markdown.MarkdownPanel;
+import com.gitplex.server.web.component.tabbable.PageTab;
+import com.gitplex.server.web.component.tabbable.PageTabLink;
+import com.gitplex.server.web.component.tabbable.Tabbable;
import com.gitplex.server.web.page.account.AccountLayoutPage;
import com.gitplex.server.web.page.account.overview.AccountOverviewPage;
+import com.gitplex.server.web.util.ConfirmOnClick;
@SuppressWarnings("serial")
public abstract class TeamPage extends AccountLayoutPage {
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.java
index 5f3b8876d8..0332ffb42c 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationPage.java
@@ -8,9 +8,9 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
-import com.gitplex.commons.wicket.component.tabbable.PageTab;
-import com.gitplex.commons.wicket.component.tabbable.Tabbable;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.component.tabbable.PageTab;
+import com.gitplex.server.web.component.tabbable.Tabbable;
import com.gitplex.server.web.page.admin.account.NewUserPage;
import com.gitplex.server.web.page.admin.account.UserListPage;
import com.gitplex.server.web.page.layout.LayoutPage;
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationTab.java b/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationTab.java
index 72a9c4f5c3..62b874944e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationTab.java
+++ b/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationTab.java
@@ -3,7 +3,7 @@ package com.gitplex.server.web.page.admin;
import org.apache.wicket.Component;
import org.apache.wicket.model.Model;
-import com.gitplex.commons.wicket.component.tabbable.PageTab;
+import com.gitplex.server.web.component.tabbable.PageTab;
@SuppressWarnings("serial")
public class AdministrationTab extends PageTab {
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/BackupSettingHolder.java b/web/src/main/java/com/gitplex/server/web/page/admin/BackupSettingHolder.java
index b6b68789da..9f58f02f60 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/BackupSettingHolder.java
+++ b/web/src/main/java/com/gitplex/server/web/page/admin/BackupSettingHolder.java
@@ -2,8 +2,8 @@ package com.gitplex.server.web.page.admin;
import java.io.Serializable;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.setting.BackupSetting;
+import com.gitplex.server.entity.support.setting.BackupSetting;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable
public class BackupSettingHolder implements Serializable {
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/DatabaseBackupPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/DatabaseBackupPage.java
index 9ccee55787..db20a30eff 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/DatabaseBackupPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/admin/DatabaseBackupPage.java
@@ -8,12 +8,12 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.link.ResourceLink;
import org.apache.wicket.request.resource.AbstractResource;
-import com.gitplex.calla.bootstrap.BootstrapUtils;
-import com.gitplex.commons.hibernate.PersistManager;
-import com.gitplex.commons.util.FileUtils;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.manager.ConfigManager;
+import com.gitplex.launcher.bootstrap.BootstrapUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.manager.ConfigManager;
+import com.gitplex.server.persistence.PersistManager;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.server.web.editable.BeanContext;
@SuppressWarnings("serial")
public class DatabaseBackupPage extends AdministrationPage {
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingHolder.java b/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingHolder.java
index 252ab78a44..4f1a2509fb 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingHolder.java
+++ b/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingHolder.java
@@ -2,8 +2,8 @@ package com.gitplex.server.web.page.admin;
import java.io.Serializable;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.setting.MailSetting;
+import com.gitplex.server.entity.support.setting.MailSetting;
+import com.gitplex.server.util.editable.annotation.Editable;
@Editable
public class MailSettingHolder implements Serializable {
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.java
index 6381dd1479..4af569f87f 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.java
@@ -13,17 +13,17 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Sets;
-import com.gitplex.commons.util.ExceptionUtils;
-import com.gitplex.commons.wicket.behavior.testform.TestFormBehavior;
-import com.gitplex.commons.wicket.behavior.testform.TestResult;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.BeanEditor;
-import com.gitplex.commons.wicket.editable.EditorChanged;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.ConfigManager;
-import com.gitplex.server.core.manager.MailManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.ConfigManager;
+import com.gitplex.server.manager.MailManager;
+import com.gitplex.server.util.ExceptionUtils;
+import com.gitplex.server.web.behavior.testform.TestFormBehavior;
+import com.gitplex.server.web.behavior.testform.TestResult;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.BeanEditor;
+import com.gitplex.server.web.editable.EditorChanged;
@SuppressWarnings("serial")
public class MailSettingPage extends AdministrationPage {
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/SecuritySettingPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/SecuritySettingPage.java
index 470a3feca6..f814b61572 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/SecuritySettingPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/admin/SecuritySettingPage.java
@@ -2,10 +2,10 @@ package com.gitplex.server.web.page.admin;
import org.apache.wicket.markup.html.form.Form;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.manager.ConfigManager;
-import com.gitplex.server.core.setting.SecuritySetting;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.support.setting.SecuritySetting;
+import com.gitplex.server.manager.ConfigManager;
+import com.gitplex.server.web.editable.BeanContext;
@SuppressWarnings("serial")
public class SecuritySettingPage extends AdministrationPage {
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/SystemSettingPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/SystemSettingPage.java
index e3a078ae72..8adbd694a7 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/SystemSettingPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/admin/SystemSettingPage.java
@@ -2,10 +2,10 @@ package com.gitplex.server.web.page.admin;
import org.apache.wicket.markup.html.form.Form;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.manager.ConfigManager;
-import com.gitplex.server.core.setting.SystemSetting;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.support.setting.SystemSetting;
+import com.gitplex.server.manager.ConfigManager;
+import com.gitplex.server.web.editable.BeanContext;
@SuppressWarnings("serial")
public class SystemSettingPage extends AdministrationPage {
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.java
index 02860dd88e..ce35e97518 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/admin/account/NewUserPage.java
@@ -4,13 +4,13 @@ import org.apache.shiro.authc.credential.PasswordService;
import org.apache.wicket.Session;
import org.apache.wicket.markup.html.form.Form;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.BeanEditor;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.BeanEditor;
+import com.gitplex.server.web.editable.PathSegment;
import com.gitplex.server.web.page.admin.AdministrationPage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.java
index 0b574138eb..c681946567 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.java
@@ -15,12 +15,12 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
import com.gitplex.server.web.component.AccountLink;
import com.gitplex.server.web.component.avatar.AvatarLink;
import com.gitplex.server.web.component.confirmdelete.ConfirmDeleteAccountModal;
@@ -103,7 +103,7 @@ public class UserListPage extends AdministrationPage {
return accounts;
}
- }, Constants.DEFAULT_PAGE_SIZE) {
+ }, WebConstants.DEFAULT_PAGE_SIZE) {
@Override
protected void populateItem(ListItem<Account> item) {
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/BaseCssResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/base/BaseCssResourceReference.java
index 9779e9d18a..ff44aaa925 100644
--- a/web/src/main/java/com/gitplex/server/web/page/base/BaseCssResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/page/base/BaseCssResourceReference.java
@@ -5,7 +5,7 @@ import java.util.List;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
-import com.gitplex.commons.wicket.page.CommonDependentCssResourceReference;
+import com.gitplex.server.web.page.CommonDependentCssResourceReference;
import com.gitplex.server.web.page.base.fontext.FontExtResourceReference;
public class BaseCssResourceReference extends CommonDependentCssResourceReference {
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/BaseDependentCssResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/base/BaseDependentCssResourceReference.java
index f7a4942a38..b46d90dba8 100644
--- a/web/src/main/java/com/gitplex/server/web/page/base/BaseDependentCssResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/page/base/BaseDependentCssResourceReference.java
@@ -5,7 +5,7 @@ import java.util.List;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
-import com.gitplex.commons.wicket.page.CommonDependentCssResourceReference;
+import com.gitplex.server.web.page.CommonDependentCssResourceReference;
public class BaseDependentCssResourceReference extends CommonDependentCssResourceReference {
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java b/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java
index 0cf83246ac..755d2dc650 100644
--- a/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java
@@ -12,10 +12,10 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.PackageResourceReference;
-import com.gitplex.commons.wicket.page.CommonPage;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.web.page.CommonPage;
import com.gitplex.server.web.page.init.ServerInitPage;
import com.gitplex.server.web.page.security.LoginPage;
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/BaseResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/base/BaseResourceReference.java
index 7e52c0bef9..3e5ef4f896 100644
--- a/web/src/main/java/com/gitplex/server/web/page/base/BaseResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/page/base/BaseResourceReference.java
@@ -5,7 +5,7 @@ import java.util.List;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
-import com.gitplex.commons.wicket.page.CommonDependentResourceReference;
+import com.gitplex.server.web.page.CommonDependentResourceReference;
public class BaseResourceReference extends CommonDependentResourceReference {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/page/common.css b/web/src/main/java/com/gitplex/server/web/page/common.css
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/page/common.css
rename to web/src/main/java/com/gitplex/server/web/page/common.css
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/page/common.js b/web/src/main/java/com/gitplex/server/web/page/common.js
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/page/common.js
rename to web/src/main/java/com/gitplex/server/web/page/common.js
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java
index 82e261390c..fee7d9ba7e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java
@@ -29,15 +29,15 @@ import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.commons.wicket.component.tabbable.PageTab;
-import com.gitplex.commons.wicket.component.tabbable.Tabbable;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.manager.VisitInfoManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.manager.VisitInfoManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.component.DropdownLink;
+import com.gitplex.server.web.component.tabbable.PageTab;
+import com.gitplex.server.web.component.tabbable.Tabbable;
import com.gitplex.server.web.page.account.AccountPage;
import com.gitplex.server.web.page.account.overview.AccountOverviewPage;
import com.gitplex.server.web.page.depot.branches.DepotBranchesPage;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/DepotResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/DepotResourceReference.java
index 1d23e45105..c606392e38 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/DepotResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/DepotResourceReference.java
@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
-import com.gitplex.commons.wicket.assets.cookies.CookiesResourceReference;
+import com.gitplex.server.web.assets.cookies.CookiesResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
public class DepotResourceReference extends BaseDependentResourceReference {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/DepotTab.java b/web/src/main/java/com/gitplex/server/web/page/depot/DepotTab.java
index cbc43c52de..cad99aa93f 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/DepotTab.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/DepotTab.java
@@ -3,7 +3,7 @@ package com.gitplex.server.web.page.depot;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.component.tabbable.PageTab;
+import com.gitplex.server.web.component.tabbable.PageTab;
@SuppressWarnings("serial")
public class DepotTab extends PageTab {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.java
index 0dff457999..e7923af77a 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.java
@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java
index f564a4391f..033f8b2cbf 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java
@@ -47,23 +47,23 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.git.RefInfo;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.gitplex.commons.wicket.behavior.clipboard.CopyClipboardBehavior;
-import com.gitplex.commons.wicket.component.modal.ModalLink;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.BranchWatch;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.support.DepotAndBranch;
-import com.gitplex.server.core.manager.BranchWatchManager;
-import com.gitplex.server.core.manager.PullRequestManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.BranchWatch;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.support.DepotAndBranch;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.git.RefInfo;
+import com.gitplex.server.manager.BranchWatchManager;
+import com.gitplex.server.manager.PullRequestManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
+import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;
import com.gitplex.server.web.component.branchchoice.BranchChoiceProvider;
import com.gitplex.server.web.component.branchchoice.BranchSingleChoice;
import com.gitplex.server.web.component.contributorpanel.ContributorPanel;
+import com.gitplex.server.web.component.modal.ModalLink;
import com.gitplex.server.web.component.revisionpicker.RevisionPicker;
import com.gitplex.server.web.page.depot.DepotPage;
import com.gitplex.server.web.page.depot.NoBranchesPage;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/comments/CodeCommentPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/comments/CodeCommentPage.java
index 4cfcb94705..dedc605dea 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/comments/CodeCommentPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/comments/CodeCommentPage.java
@@ -3,11 +3,11 @@ package com.gitplex.server.web.page.depot.comments;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.CodeCommentRelation;
-import com.gitplex.server.core.entity.support.CompareContext;
-import com.gitplex.server.core.manager.CodeCommentManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.CodeCommentRelation;
+import com.gitplex.server.entity.support.CompareContext;
+import com.gitplex.server.manager.CodeCommentManager;
import com.gitplex.server.web.page.depot.DepotPage;
import com.gitplex.server.web.page.depot.compare.RevisionComparePage;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsPage.java
index 66cbdbc8f9..3fc52f7746 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsPage.java
@@ -7,9 +7,9 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.manager.CodeCommentInfoManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.manager.CodeCommentInfoManager;
import com.gitplex.server.web.component.comment.CodeCommentAware;
import com.gitplex.server.web.component.comment.CodeCommentFilter;
import com.gitplex.server.web.component.comment.CodeCommentListPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java
index d28db6a6f1..df6755e45e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java
@@ -35,18 +35,18 @@ import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.git.BlobIdent;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.git.RefInfo;
-import com.gitplex.commons.util.diff.WhitespaceOption;
-import com.gitplex.commons.wicket.behavior.clipboard.CopyClipboardBehavior;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.support.CommentPos;
-import com.gitplex.server.core.manager.CodeCommentManager;
-import com.gitplex.server.core.manager.CommitInfoManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.support.CommentPos;
+import com.gitplex.server.git.BlobIdent;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.git.RefInfo;
+import com.gitplex.server.manager.CodeCommentManager;
+import com.gitplex.server.manager.CommitInfoManager;
+import com.gitplex.server.util.diff.WhitespaceOption;
+import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;
import com.gitplex.server.web.component.avatar.ContributorAvatars;
import com.gitplex.server.web.component.commitmessage.CommitMessageLabel;
import com.gitplex.server.web.component.contributorpanel.ContributorPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailResourceReference.java
index 396e119266..7153da72fa 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailResourceReference.java
@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
-import com.gitplex.commons.wicket.assets.oneline.OnelineResourceReference;
+import com.gitplex.server.web.assets.oneline.OnelineResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
public class CommitDetailResourceReference extends BaseDependentResourceReference {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.java
index c4a76a0121..e01daebc8d 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.java
@@ -46,27 +46,27 @@ import org.unbescape.java.JavaEscape;
import com.google.common.base.Optional;
import com.google.common.base.Throwables;
-import com.gitplex.commons.git.BlobIdent;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.git.command.RevListCommand;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.commons.util.concurrent.PrioritizedCallable;
-import com.gitplex.commons.wicket.ajaxlistener.IndicateLoadingListener;
-import com.gitplex.commons.wicket.behavior.clipboard.CopyClipboardBehavior;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.support.DepotAndRevision;
-import com.gitplex.server.core.manager.WorkExecutor;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.support.DepotAndRevision;
+import com.gitplex.server.git.BlobIdent;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.git.command.RevListCommand;
+import com.gitplex.server.manager.WorkExecutor;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.util.concurrent.PrioritizedCallable;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;
import com.gitplex.server.web.component.avatar.ContributorAvatars;
import com.gitplex.server.web.component.commitgraph.CommitGraphResourceReference;
import com.gitplex.server.web.component.commitgraph.CommitGraphUtils;
import com.gitplex.server.web.component.commitmessage.ExpandableCommitMessagePanel;
import com.gitplex.server.web.component.contributorpanel.ContributorPanel;
-import com.gitplex.server.web.model.CommitRefsModel;
import com.gitplex.server.web.page.depot.DepotPage;
import com.gitplex.server.web.page.depot.compare.RevisionComparePage;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
+import com.gitplex.server.web.util.ajaxlistener.IndicateLoadingListener;
+import com.gitplex.server.web.util.model.CommitRefsModel;
import com.gitplex.server.web.page.depot.commit.CommitQueryLexer;
import com.gitplex.server.web.page.depot.commit.CommitQueryParser;
import com.gitplex.server.web.page.depot.commit.CommitQueryParser.CriteriaContext;
@@ -473,7 +473,7 @@ public class DepotCommitsPage extends DepotPage {
} else {
item = new Fragment(itemId, "dateFrag", this);
DateTime dateTime = new DateTime(current.get(index+1).getCommitterIdent().getWhen());
- item.add(new Label("date", Constants.DATE_FORMATTER.print(dateTime)));
+ item.add(new Label("date", WebConstants.DATE_FORMATTER.print(dateTime)));
item.add(AttributeAppender.append("class", "date"));
}
item.setOutputMarkupId(true);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/QueryAssistBehavior.java b/web/src/main/java/com/gitplex/server/web/page/depot/commit/QueryAssistBehavior.java
index c01ee1f11e..5a2e38cb70 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/commit/QueryAssistBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/commit/QueryAssistBehavior.java
@@ -8,23 +8,22 @@ import java.util.Map;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.antlr.codeassist.FenceAware;
-import com.gitplex.commons.antlr.codeassist.InputSuggestion;
-import com.gitplex.commons.antlr.codeassist.ParentedElement;
-import com.gitplex.commons.antlr.grammar.ElementSpec;
-import com.gitplex.commons.antlr.grammar.LexerRuleRefElementSpec;
-import com.gitplex.commons.git.NameAndEmail;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.commons.util.match.PatternApplied;
-import com.gitplex.commons.util.match.WildcardUtils;
-import com.gitplex.commons.wicket.behavior.inputassist.ANTLRAssistBehavior;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.CommitInfoManager;
-import com.gitplex.server.web.Constants;
-import com.gitplex.server.web.util.SuggestionUtils;
+import com.gitplex.codeassist.FenceAware;
+import com.gitplex.codeassist.InputSuggestion;
+import com.gitplex.codeassist.ParentedElement;
+import com.gitplex.codeassist.grammar.ElementSpec;
+import com.gitplex.codeassist.grammar.LexerRuleRefElementSpec;
import com.gitplex.jsymbol.Range;
-import com.gitplex.server.web.page.depot.commit.CommitQueryParser;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.git.NameAndEmail;
+import com.gitplex.server.manager.CommitInfoManager;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.util.match.PatternApplied;
+import com.gitplex.server.util.match.WildcardUtils;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.behavior.inputassist.ANTLRAssistBehavior;
+import com.gitplex.server.web.util.SuggestionUtils;
@SuppressWarnings("serial")
public class QueryAssistBehavior extends ANTLRAssistBehavior {
@@ -104,9 +103,9 @@ public class QueryAssistBehavior extends ANTLRAssistBehavior {
suggestions.add(new InputSuggestion(fenced, -1, true, getFencingDescription(), matchRange));
}
if (suggestions.size() < count)
- suggestions.add(new InputSuggestion(Constants.DATETIME_FORMATTER.print(System.currentTimeMillis())));
+ suggestions.add(new InputSuggestion(WebConstants.DATETIME_FORMATTER.print(System.currentTimeMillis())));
if (suggestions.size() < count)
- suggestions.add(new InputSuggestion(Constants.DATE_FORMATTER.print(System.currentTimeMillis())));
+ suggestions.add(new InputSuggestion(WebConstants.DATE_FORMATTER.print(System.currentTimeMillis())));
for (String dateExample: DATE_EXAMPLES) {
if (suggestions.size() < count)
suggestions.add(new InputSuggestion(dateExample));
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/RevListCommandFiller.java b/web/src/main/java/com/gitplex/server/web/page/depot/commit/RevListCommandFiller.java
index 33073fa404..25b91a8991 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/commit/RevListCommandFiller.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/commit/RevListCommandFiller.java
@@ -5,7 +5,7 @@ import org.antlr.v4.runtime.tree.TerminalNode;
import org.apache.commons.lang3.StringUtils;
import org.unbescape.java.JavaEscape;
-import com.gitplex.commons.git.command.RevListCommand;
+import com.gitplex.server.git.command.RevListCommand;
import com.gitplex.server.web.page.depot.commit.CommitQueryBaseListener;
import com.gitplex.server.web.page.depot.commit.CommitQueryParser.AfterContext;
import com.gitplex.server.web.page.depot.commit.CommitQueryParser.AuthorContext;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java b/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java
index 74f751c4a9..081b723f89 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java
@@ -31,28 +31,26 @@ import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.util.diff.WhitespaceOption;
-import com.gitplex.commons.wicket.behavior.TooltipBehavior;
-import com.gitplex.commons.wicket.component.tabbable.AjaxActionTab;
-import com.gitplex.commons.wicket.component.tabbable.Tab;
-import com.gitplex.commons.wicket.component.tabbable.Tabbable;
-import com.gitplex.commons.wicket.websocket.WebSocketManager;
-import com.gitplex.commons.wicket.websocket.WebSocketRegion;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.support.CommentPos;
-import com.gitplex.server.core.entity.support.CompareContext;
-import com.gitplex.server.core.entity.support.DepotAndBranch;
-import com.gitplex.server.core.entity.support.DepotAndRevision;
-import com.gitplex.server.core.manager.CodeCommentManager;
-import com.gitplex.server.core.manager.PullRequestManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.support.CommentPos;
+import com.gitplex.server.entity.support.CompareContext;
+import com.gitplex.server.entity.support.DepotAndBranch;
+import com.gitplex.server.entity.support.DepotAndRevision;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.manager.CodeCommentManager;
+import com.gitplex.server.manager.PullRequestManager;
+import com.gitplex.server.util.diff.WhitespaceOption;
+import com.gitplex.server.web.behavior.TooltipBehavior;
import com.gitplex.server.web.component.commitlist.CommitListPanel;
import com.gitplex.server.web.component.diff.revision.CommentSupport;
import com.gitplex.server.web.component.diff.revision.RevisionDiffPanel;
import com.gitplex.server.web.component.revisionpicker.AffinalRevisionPicker;
+import com.gitplex.server.web.component.tabbable.AjaxActionTab;
+import com.gitplex.server.web.component.tabbable.Tab;
+import com.gitplex.server.web.component.tabbable.Tabbable;
import com.gitplex.server.web.page.depot.DepotPage;
import com.gitplex.server.web.page.depot.NoBranchesPage;
import com.gitplex.server.web.page.depot.commit.CommitDetailPage;
@@ -60,6 +58,8 @@ import com.gitplex.server.web.page.depot.pullrequest.newrequest.NewRequestPage;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailPage;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;
import com.gitplex.server.web.websocket.CodeCommentChangedRegion;
+import com.gitplex.server.web.websocket.WebSocketManager;
+import com.gitplex.server.web.websocket.WebSocketRegion;
@SuppressWarnings("serial")
public class RevisionComparePage extends DepotPage implements CommentSupport {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.java b/web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.java
index e809738a86..451aee0757 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.java
@@ -37,34 +37,30 @@ import org.eclipse.jgit.revwalk.RevTree;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.treewalk.TreeWalk;
-import com.gitplex.commons.git.Blob;
-import com.gitplex.commons.git.BlobIdent;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.git.exception.GitObjectNotFoundException;
-import com.gitplex.commons.hibernate.UnitOfWork;
-import com.gitplex.calla.loader.ListenerRegistry;
-import com.gitplex.commons.util.diff.DiffUtils;
-import com.gitplex.commons.wicket.component.modal.ModalLink;
-import com.gitplex.commons.wicket.websocket.WebSocketManager;
-import com.gitplex.commons.wicket.websocket.WebSocketRegion;
-import com.gitplex.commons.wicket.websocket.WebSocketRenderBehavior;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestUpdate;
-import com.gitplex.server.core.entity.support.CommentPos;
-import com.gitplex.server.core.entity.support.TextRange;
-import com.gitplex.server.core.event.RefUpdated;
-import com.gitplex.server.core.manager.CodeCommentManager;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.manager.PullRequestManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.launcher.loader.ListenerRegistry;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestUpdate;
+import com.gitplex.server.entity.support.CommentPos;
+import com.gitplex.server.entity.support.TextRange;
+import com.gitplex.server.event.RefUpdated;
+import com.gitplex.server.git.Blob;
+import com.gitplex.server.git.BlobIdent;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.git.exception.GitObjectNotFoundException;
+import com.gitplex.server.manager.CodeCommentManager;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.manager.PullRequestManager;
+import com.gitplex.server.persistence.UnitOfWork;
import com.gitplex.server.search.IndexManager;
import com.gitplex.server.search.SearchManager;
import com.gitplex.server.search.hit.QueryHit;
import com.gitplex.server.search.query.BlobQuery;
import com.gitplex.server.search.query.TextQuery;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.diff.DiffUtils;
import com.gitplex.server.web.WebSession;
import com.gitplex.server.web.component.archivemenulink.ArchiveMenuLink;
import com.gitplex.server.web.component.depotfile.blobsearch.advanced.AdvancedSearchPanel;
@@ -80,6 +76,7 @@ import com.gitplex.server.web.component.depotfile.editsave.EditSavePanel;
import com.gitplex.server.web.component.depotfile.fileedit.FileEditPanel;
import com.gitplex.server.web.component.depotfile.filelist.FileListPanel;
import com.gitplex.server.web.component.depotfile.filenavigator.FileNavigator;
+import com.gitplex.server.web.component.modal.ModalLink;
import com.gitplex.server.web.component.revisionpicker.RevisionPicker;
import com.gitplex.server.web.page.depot.DepotPage;
import com.gitplex.server.web.page.depot.NoBranchesPage;
@@ -89,6 +86,9 @@ import com.gitplex.server.web.page.depot.pullrequest.requestdetail.integrationpr
import com.gitplex.server.web.websocket.CodeCommentChangedRegion;
import com.gitplex.server.web.websocket.CommitIndexedRegion;
import com.gitplex.server.web.websocket.PullRequestChangedRegion;
+import com.gitplex.server.web.websocket.WebSocketManager;
+import com.gitplex.server.web.websocket.WebSocketRegion;
+import com.gitplex.server.web.websocket.WebSocketRenderBehavior;
import com.gitplex.jsymbol.TokenPosition;
import com.gitplex.jsymbol.util.NoAntiCacheImage;
import com.google.common.base.Objects;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFileResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFileResourceReference.java
index 7d117f0d02..a4d11f97bc 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFileResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFileResourceReference.java
@@ -6,8 +6,8 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import com.gitplex.commons.wicket.assets.cookies.CookiesResourceReference;
-import com.gitplex.commons.wicket.assets.jqueryui.JQueryUIResourceReference;
+import com.gitplex.server.web.assets.cookies.CookiesResourceReference;
+import com.gitplex.server.web.assets.jqueryui.JQueryUIResourceReference;
import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/file/RequestCompareInfo.java b/web/src/main/java/com/gitplex/server/web/page/depot/file/RequestCompareInfo.java
index 2fa4e12257..8bb7e4da16 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/file/RequestCompareInfo.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/file/RequestCompareInfo.java
@@ -9,8 +9,8 @@ import java.util.List;
import javax.annotation.Nullable;
-import com.gitplex.commons.util.diff.WhitespaceOption;
-import com.gitplex.server.core.entity.support.CommentPos;
+import com.gitplex.server.entity.support.CommentPos;
+import com.gitplex.server.util.diff.WhitespaceOption;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.integrationpreview.IntegrationPreviewPage;
import com.google.common.base.Charsets;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.java
index cc3e682b53..dfe73d5242 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.java
@@ -8,17 +8,17 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.BeanEditor;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.accountchoice.AccountSingleChoice;
import com.gitplex.server.web.component.accountchoice.AdministrativeAccountChoiceProvider;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.BeanEditor;
+import com.gitplex.server.web.editable.PathSegment;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java
index 488b8c31b2..5edbae97e2 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java
@@ -18,16 +18,16 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.eclipse.jgit.lib.Constants;
-import com.gitplex.commons.wicket.behavior.clipboard.CopyClipboardBehavior;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;
-import com.gitplex.commons.wicket.component.modal.ModalLink;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.CommitInfoManager;
-import com.gitplex.server.core.manager.UrlManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.CommitInfoManager;
+import com.gitplex.server.manager.UrlManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;
+import com.gitplex.server.web.component.DropdownLink;
import com.gitplex.server.web.component.depotselector.DepotSelector;
+import com.gitplex.server.web.component.markdown.MarkdownPanel;
+import com.gitplex.server.web.component.modal.ModalLink;
import com.gitplex.server.web.page.depot.branches.DepotBranchesPage;
import com.gitplex.server.web.page.depot.commit.DepotCommitsPage;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java
index 333b119bd5..b64912e2cf 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java
@@ -1,7 +1,7 @@
package com.gitplex.server.web.page.depot.pullrequest.newrequest;
-import static com.gitplex.server.core.entity.PullRequest.Status.INTEGRATED;
-import static com.gitplex.server.core.entity.PullRequest.Status.PENDING_UPDATE;
+import static com.gitplex.server.entity.PullRequest.Status.INTEGRATED;
+import static com.gitplex.server.entity.PullRequest.Status.PENDING_UPDATE;
import java.io.IOException;
import java.util.ArrayList;
@@ -35,28 +35,25 @@ import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.util.diff.WhitespaceOption;
-import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;
-import com.gitplex.commons.wicket.component.tabbable.AjaxActionTab;
-import com.gitplex.commons.wicket.component.tabbable.Tab;
-import com.gitplex.commons.wicket.component.tabbable.Tabbable;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequest.IntegrationStrategy;
-import com.gitplex.server.core.entity.PullRequest.Status;
-import com.gitplex.server.core.entity.PullRequestReviewInvitation;
-import com.gitplex.server.core.entity.PullRequestUpdate;
-import com.gitplex.server.core.entity.support.CloseInfo;
-import com.gitplex.server.core.entity.support.CommentPos;
-import com.gitplex.server.core.entity.support.DepotAndBranch;
-import com.gitplex.server.core.manager.CodeCommentManager;
-import com.gitplex.server.core.manager.PullRequestManager;
-import com.gitplex.server.core.security.ObjectPermission;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestReviewInvitation;
+import com.gitplex.server.entity.PullRequestUpdate;
+import com.gitplex.server.entity.PullRequest.IntegrationStrategy;
+import com.gitplex.server.entity.PullRequest.Status;
+import com.gitplex.server.entity.support.CloseInfo;
+import com.gitplex.server.entity.support.CommentPos;
+import com.gitplex.server.entity.support.DepotAndBranch;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.manager.CodeCommentManager;
+import com.gitplex.server.manager.PullRequestManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.security.ObjectPermission;
+import com.gitplex.server.util.diff.WhitespaceOption;
+import com.gitplex.server.web.behavior.markdown.AttachmentSupport;
import com.gitplex.server.web.component.BranchLink;
import com.gitplex.server.web.component.branchpicker.AffinalBranchPicker;
import com.gitplex.server.web.component.comment.CommentInput;
@@ -67,7 +64,9 @@ import com.gitplex.server.web.component.diff.revision.RevisionDiffPanel;
import com.gitplex.server.web.component.pullrequest.requestassignee.AssigneeChoice;
import com.gitplex.server.web.component.pullrequest.requestreviewer.ReviewerAvatar;
import com.gitplex.server.web.component.pullrequest.requestreviewer.ReviewerChoice;
-import com.gitplex.server.web.model.ReviewersModel;
+import com.gitplex.server.web.component.tabbable.AjaxActionTab;
+import com.gitplex.server.web.component.tabbable.Tab;
+import com.gitplex.server.web.component.tabbable.Tabbable;
import com.gitplex.server.web.page.depot.DepotPage;
import com.gitplex.server.web.page.depot.NoBranchesPage;
import com.gitplex.server.web.page.depot.commit.CommitDetailPage;
@@ -76,6 +75,7 @@ import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetail
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;
import com.gitplex.server.web.page.depot.pullrequest.requestlist.RequestListPage;
import com.gitplex.server.web.page.security.LoginPage;
+import com.gitplex.server.web.util.model.ReviewersModel;
import com.google.common.base.Preconditions;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java
index e235780f2c..2dd2f93274 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java
@@ -7,11 +7,11 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.manager.AccountManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.manager.AccountManager;
import com.gitplex.server.web.component.comment.CodeCommentFilter;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java
index 85d2615cf1..26cae12d63 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java
@@ -7,8 +7,8 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.PullRequest;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.PullRequest;
import com.gitplex.server.web.component.comment.CodeCommentFilter;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java
index 9dda8757a9..ea39b6a038 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java
@@ -1,6 +1,6 @@
package com.gitplex.server.web.page.depot.pullrequest.requestdetail;
-import static com.gitplex.server.core.entity.PullRequest.Status.PENDING_INTEGRATE;
+import static com.gitplex.server.entity.PullRequest.Status.PENDING_INTEGRATE;
import javax.annotation.Nullable;
@@ -9,18 +9,18 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.model.LoadableDetachableModel;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestReview;
-import com.gitplex.server.core.entity.PullRequestReviewInvitation;
-import com.gitplex.server.core.entity.PullRequest.Status;
-import com.gitplex.server.core.entity.support.IntegrationPreview;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.PullRequestManager;
-import com.gitplex.server.core.manager.PullRequestReviewManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestReview;
+import com.gitplex.server.entity.PullRequestReviewInvitation;
+import com.gitplex.server.entity.PullRequest.Status;
+import com.gitplex.server.entity.support.IntegrationPreview;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.PullRequestManager;
+import com.gitplex.server.manager.PullRequestReviewManager;
+import com.gitplex.server.security.SecurityUtils;
@SuppressWarnings("serial")
public enum PullRequestOperation {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java
index 487adcb4ef..7c1a9c1d19 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java
@@ -1,10 +1,10 @@
package com.gitplex.server.web.page.depot.pullrequest.requestdetail;
-import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.MERGE_ALWAYS;
-import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.MERGE_IF_NECESSARY;
-import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;
-import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;
-import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;
+import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.MERGE_ALWAYS;
+import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.MERGE_IF_NECESSARY;
+import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;
+import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;
+import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;
import static com.gitplex.server.web.page.depot.pullrequest.requestdetail.PullRequestOperation.APPROVE;
import static com.gitplex.server.web.page.depot.pullrequest.requestdetail.PullRequestOperation.DELETE_SOURCE_BRANCH;
import static com.gitplex.server.web.page.depot.pullrequest.requestdetail.PullRequestOperation.DISAPPROVE;
@@ -56,32 +56,28 @@ import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.wicket.WicketUtils;
-import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.commons.wicket.component.tabbable.PageTab;
-import com.gitplex.commons.wicket.component.tabbable.PageTabLink;
-import com.gitplex.commons.wicket.component.tabbable.Tab;
-import com.gitplex.commons.wicket.component.tabbable.Tabbable;
-import com.gitplex.commons.wicket.websocket.WebSocketRegion;
-import com.gitplex.commons.wicket.websocket.WebSocketRenderBehavior;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestUpdate;
-import com.gitplex.server.core.entity.PullRequest.Status;
-import com.gitplex.server.core.entity.support.DepotAndBranch;
-import com.gitplex.server.core.entity.support.IntegrationPreview;
-import com.gitplex.server.core.manager.PullRequestManager;
-import com.gitplex.server.core.manager.VisitInfoManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestUpdate;
+import com.gitplex.server.entity.PullRequest.Status;
+import com.gitplex.server.entity.support.DepotAndBranch;
+import com.gitplex.server.entity.support.IntegrationPreview;
+import com.gitplex.server.manager.PullRequestManager;
+import com.gitplex.server.manager.VisitInfoManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.behavior.markdown.AttachmentSupport;
import com.gitplex.server.web.component.AccountLink;
import com.gitplex.server.web.component.BranchLink;
+import com.gitplex.server.web.component.DropdownLink;
import com.gitplex.server.web.component.comment.CommentInput;
import com.gitplex.server.web.component.comment.DepotAttachmentSupport;
import com.gitplex.server.web.component.pullrequest.verificationstatus.VerificationStatusPanel;
-import com.gitplex.server.web.model.EntityModel;
+import com.gitplex.server.web.component.tabbable.PageTab;
+import com.gitplex.server.web.component.tabbable.PageTabLink;
+import com.gitplex.server.web.component.tabbable.Tab;
+import com.gitplex.server.web.component.tabbable.Tabbable;
import com.gitplex.server.web.page.depot.DepotPage;
import com.gitplex.server.web.page.depot.NoBranchesPage;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
@@ -89,8 +85,12 @@ import com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments.
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.integrationpreview.IntegrationPreviewPage;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;
import com.gitplex.server.web.util.DateUtils;
+import com.gitplex.server.web.util.WicketUtils;
+import com.gitplex.server.web.util.model.EntityModel;
import com.gitplex.server.web.websocket.PullRequestChanged;
import com.gitplex.server.web.websocket.PullRequestChangedRegion;
+import com.gitplex.server.web.websocket.WebSocketRegion;
+import com.gitplex.server.web.websocket.WebSocketRenderBehavior;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.java
index 7dc86d5784..27571d2d2d 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.java
@@ -1,9 +1,9 @@
package com.gitplex.server.web.page.depot.pullrequest.requestdetail;
-import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.MERGE_ALWAYS;
-import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;
-import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;
-import static com.gitplex.server.core.entity.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;
+import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.MERGE_ALWAYS;
+import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;
+import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;
+import static com.gitplex.server.entity.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
@@ -12,14 +12,14 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequest.IntegrationStrategy;
-import com.gitplex.server.core.entity.support.IntegrationPreview;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequest.IntegrationStrategy;
+import com.gitplex.server.entity.support.IntegrationPreview;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.security.SecurityUtils;
@SuppressWarnings("serial")
class ResolveConflictInstructionPanel extends Panel {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.java
index 242207fffd..9c2d2316e6 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.java
@@ -5,7 +5,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.server.core.entity.PullRequestUpdate;
+import com.gitplex.server.entity.PullRequestUpdate;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java
index b360110142..ab9545fd39 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java
@@ -33,26 +33,26 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.revwalk.RevCommit;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.util.diff.WhitespaceOption;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.commons.wicket.websocket.WebSocketManager;
-import com.gitplex.commons.wicket.websocket.WebSocketRegion;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestUpdate;
-import com.gitplex.server.core.entity.support.CodeCommentActivity;
-import com.gitplex.server.core.entity.support.CommentPos;
-import com.gitplex.server.core.manager.CodeCommentManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestUpdate;
+import com.gitplex.server.entity.support.CodeCommentActivity;
+import com.gitplex.server.entity.support.CommentPos;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.manager.CodeCommentManager;
+import com.gitplex.server.util.diff.WhitespaceOption;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.server.web.component.DropdownLink;
import com.gitplex.server.web.component.diff.revision.CommentSupport;
import com.gitplex.server.web.component.diff.revision.RevisionDiffPanel;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailPage;
import com.gitplex.server.web.page.depot.pullrequest.requestlist.RequestListPage;
import com.gitplex.server.web.websocket.CodeCommentChangedRegion;
import com.gitplex.server.web.websocket.PullRequestChanged;
+import com.gitplex.server.web.websocket.WebSocketManager;
+import com.gitplex.server.web.websocket.WebSocketRegion;
@SuppressWarnings("serial")
public class RequestChangesPage extends RequestDetailPage implements CommentSupport {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java
index bc6b106ba5..88a29bd891 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java
@@ -7,8 +7,8 @@ import java.util.List;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.server.core.entity.CodeComment;
-import com.gitplex.server.core.entity.PullRequest;
+import com.gitplex.server.entity.CodeComment;
+import com.gitplex.server.entity.PullRequest;
import com.gitplex.server.web.component.comment.CodeCommentAware;
import com.gitplex.server.web.component.comment.CodeCommentFilter;
import com.gitplex.server.web.component.comment.CodeCommentListPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.java
index a6222b7e56..3397c81e9f 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.java
@@ -16,10 +16,10 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.util.diff.WhitespaceOption;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.support.IntegrationPreview;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.support.IntegrationPreview;
+import com.gitplex.server.util.diff.WhitespaceOption;
import com.gitplex.server.web.component.diff.revision.RevisionDiffPanel;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailPage;
import com.gitplex.server.web.page.depot.pullrequest.requestlist.RequestListPage;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java
index 2e47c04ea3..fa852f2037 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java
@@ -35,26 +35,25 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.joda.time.DateTime;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.wicket.ConfirmOnClick;
-import com.gitplex.commons.wicket.behavior.TooltipBehavior;
-import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestComment;
-import com.gitplex.server.core.entity.PullRequestReference;
-import com.gitplex.server.core.entity.PullRequestReview;
-import com.gitplex.server.core.entity.PullRequestReviewInvitation;
-import com.gitplex.server.core.entity.PullRequestStatusChange;
-import com.gitplex.server.core.entity.PullRequestUpdate;
-import com.gitplex.server.core.entity.PullRequestWatch;
-import com.gitplex.server.core.entity.PullRequest.IntegrationStrategy;
-import com.gitplex.server.core.manager.PullRequestCommentManager;
-import com.gitplex.server.core.manager.PullRequestManager;
-import com.gitplex.server.core.security.ObjectPermission;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestComment;
+import com.gitplex.server.entity.PullRequestReference;
+import com.gitplex.server.entity.PullRequestReview;
+import com.gitplex.server.entity.PullRequestReviewInvitation;
+import com.gitplex.server.entity.PullRequestStatusChange;
+import com.gitplex.server.entity.PullRequestUpdate;
+import com.gitplex.server.entity.PullRequestWatch;
+import com.gitplex.server.entity.PullRequest.IntegrationStrategy;
+import com.gitplex.server.manager.PullRequestCommentManager;
+import com.gitplex.server.manager.PullRequestManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.security.ObjectPermission;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.behavior.TooltipBehavior;
+import com.gitplex.server.web.behavior.markdown.AttachmentSupport;
import com.gitplex.server.web.component.avatar.Avatar;
import com.gitplex.server.web.component.avatar.AvatarLink;
import com.gitplex.server.web.component.comment.CommentInput;
@@ -63,8 +62,6 @@ import com.gitplex.server.web.component.pullrequest.requestassignee.AssigneeChoi
import com.gitplex.server.web.component.pullrequest.requestreviewer.ReviewerAvatar;
import com.gitplex.server.web.component.pullrequest.requestreviewer.ReviewerChoice;
import com.gitplex.server.web.component.pullrequest.reviewresult.ReviewResultIcon;
-import com.gitplex.server.web.model.EntityModel;
-import com.gitplex.server.web.model.ReviewersModel;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailPage;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity.CommentedActivity;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity.OpenedActivity;
@@ -73,6 +70,9 @@ import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.acti
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity.StatusChangeActivity;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity.UpdatedActivity;
import com.gitplex.server.web.page.depot.pullrequest.requestlist.RequestListPage;
+import com.gitplex.server.web.util.ConfirmOnClick;
+import com.gitplex.server.web.util.model.EntityModel;
+import com.gitplex.server.web.util.model.ReviewersModel;
import com.gitplex.server.web.websocket.PullRequestChanged;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.java
index d51fa40a14..0c852c2b31 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.java
@@ -9,8 +9,8 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestUpdate;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestUpdate;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
import com.gitplex.server.web.websocket.PullRequestChanged;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.java
index 266af330c8..697c70632e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.java
@@ -5,9 +5,9 @@ import java.util.Date;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.PullRequestComment;
-import com.gitplex.server.core.manager.PullRequestCommentManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.PullRequestComment;
+import com.gitplex.server.manager.PullRequestCommentManager;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java
index 58b5d294fd..295f88362d 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java
@@ -16,22 +16,22 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.hibernate.StaleStateException;
-import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.gitplex.commons.wicket.ajaxlistener.ConfirmListener;
-import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;
-import com.gitplex.commons.wicket.component.markdown.MarkdownEditSupport;
-import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestComment;
-import com.gitplex.server.core.manager.PullRequestCommentManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestComment;
+import com.gitplex.server.manager.PullRequestCommentManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.behavior.markdown.AttachmentSupport;
import com.gitplex.server.web.component.AccountLink;
import com.gitplex.server.web.component.comment.CommentInput;
import com.gitplex.server.web.component.comment.DepotAttachmentSupport;
+import com.gitplex.server.web.component.markdown.MarkdownEditSupport;
+import com.gitplex.server.web.component.markdown.MarkdownPanel;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.SinceChangesLink;
import com.gitplex.server.web.util.DateUtils;
+import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
+import com.gitplex.server.web.util.ajaxlistener.ConfirmListener;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.java
index 228f6003e7..311d0b50cc 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.java
@@ -5,9 +5,9 @@ import java.util.Date;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.manager.PullRequestManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.manager.PullRequestManager;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java
index 3431f55729..5bec90e79e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java
@@ -16,20 +16,20 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.hibernate.StaleStateException;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;
-import com.gitplex.commons.wicket.component.markdown.MarkdownEditSupport;
-import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.manager.PullRequestManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.manager.PullRequestManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.behavior.markdown.AttachmentSupport;
import com.gitplex.server.web.component.AccountLink;
import com.gitplex.server.web.component.comment.CommentInput;
import com.gitplex.server.web.component.comment.DepotAttachmentSupport;
+import com.gitplex.server.web.component.markdown.MarkdownEditSupport;
+import com.gitplex.server.web.component.markdown.MarkdownPanel;
import com.gitplex.server.web.util.DateUtils;
+import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.java
index 3b9408b1cb..79113a68da 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.java
@@ -5,9 +5,9 @@ import java.util.Date;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.PullRequestReference;
-import com.gitplex.server.core.manager.PullRequestReferenceManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.PullRequestReference;
+import com.gitplex.server.manager.PullRequestReferenceManager;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.java
index 19da76a6e6..e262956666 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.java
@@ -6,8 +6,8 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestReference;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestReference;
import com.gitplex.server.web.component.AccountLink;
import com.gitplex.server.web.component.avatar.AvatarLink;
import com.gitplex.server.web.component.pullrequest.requeststatus.RequestStatusPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java
index 8b7ba38bb5..d1dfd48ba2 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java
@@ -2,7 +2,7 @@ package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.act
import org.apache.wicket.ajax.AjaxRequestTarget;
-import com.gitplex.commons.wicket.AjaxEvent;
+import com.gitplex.server.web.util.AjaxEvent;
public class RequestCommentDeleted extends AjaxEvent {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java
index d0f928e37e..d5d3224c52 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java
@@ -5,9 +5,9 @@ import java.util.Date;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.PullRequestStatusChange;
-import com.gitplex.server.core.manager.PullRequestStatusChangeManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.PullRequestStatusChange;
+import com.gitplex.server.manager.PullRequestStatusChangeManager;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java
index c83c1d7654..ee070232db 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java
@@ -18,22 +18,22 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.hibernate.StaleStateException;
-import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;
-import com.gitplex.commons.wicket.component.markdown.MarkdownEditSupport;
-import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestStatusChange;
-import com.gitplex.server.core.manager.PullRequestStatusChangeManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestStatusChange;
+import com.gitplex.server.manager.PullRequestStatusChangeManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.behavior.markdown.AttachmentSupport;
import com.gitplex.server.web.component.AccountLink;
import com.gitplex.server.web.component.avatar.AvatarLink;
import com.gitplex.server.web.component.comment.CommentInput;
import com.gitplex.server.web.component.comment.DepotAttachmentSupport;
+import com.gitplex.server.web.component.markdown.MarkdownEditSupport;
+import com.gitplex.server.web.component.markdown.MarkdownPanel;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.SinceChangesLink;
import com.gitplex.server.web.util.DateUtils;
+import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.java
index 1ac5430159..d2a27780b6 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.java
@@ -5,9 +5,9 @@ import java.util.Date;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.PullRequestUpdate;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.PullRequestUpdate;
+import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java
index ac3b3e0700..08171213d6 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java
@@ -21,13 +21,13 @@ import org.apache.wicket.util.visit.IVisitor;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.revwalk.RevCommit;
-import com.gitplex.commons.git.BlobIdent;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.wicket.behavior.clipboard.CopyClipboardBehavior;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestUpdate;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestUpdate;
+import com.gitplex.server.git.BlobIdent;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;
import com.gitplex.server.web.component.avatar.AvatarLink;
import com.gitplex.server.web.component.commitmessage.ExpandableCommitMessagePanel;
import com.gitplex.server.web.component.pullrequest.verificationstatus.VerificationStatusPanel;
@@ -65,13 +65,13 @@ class UpdatedPanel extends GenericPanel<PullRequestUpdate> {
protected void onInitialize() {
super.onInitialize();
- String tooManyMessage = "Too many commits, displaying recent " + Constants.MAX_DISPLAY_COMMITS;
+ String tooManyMessage = "Too many commits, displaying recent " + WebConstants.MAX_DISPLAY_COMMITS;
add(new Label("tooManyCommits", tooManyMessage) {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getUpdate().getCommits().size()>Constants.MAX_DISPLAY_COMMITS);
+ setVisible(getUpdate().getCommits().size()>WebConstants.MAX_DISPLAY_COMMITS);
}
});
@@ -80,8 +80,8 @@ class UpdatedPanel extends GenericPanel<PullRequestUpdate> {
@Override
protected List<RevCommit> load() {
List<RevCommit> commits = getUpdate().getCommits();
- if (commits.size() > Constants.MAX_DISPLAY_COMMITS)
- return commits.subList(commits.size()-Constants.MAX_DISPLAY_COMMITS, commits.size());
+ if (commits.size() > WebConstants.MAX_DISPLAY_COMMITS)
+ return commits.subList(commits.size()-WebConstants.MAX_DISPLAY_COMMITS, commits.size());
else
return commits;
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.java
index 855be8a1c9..d7f738a2fc 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.java
@@ -32,20 +32,20 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.commons.wicket.component.menu.MenuItem;
-import com.gitplex.commons.wicket.component.menu.MenuLink;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.component.AccountLink;
import com.gitplex.server.web.component.BranchLink;
+import com.gitplex.server.web.component.menu.MenuItem;
+import com.gitplex.server.web.component.menu.MenuLink;
import com.gitplex.server.web.component.pullrequest.requeststatus.RequestStatusPanel;
+import com.gitplex.server.web.editable.BeanContext;
import com.gitplex.server.web.page.depot.DepotPage;
import com.gitplex.server.web.page.depot.pullrequest.newrequest.NewRequestPage;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;
@@ -403,7 +403,7 @@ public class RequestListPage extends DepotPage {
};
DataTable<PullRequest, Void> dataTable = new DataTable<>("requests", columns,
- dataProvider, Constants.DEFAULT_PAGE_SIZE);
+ dataProvider, WebConstants.DEFAULT_PAGE_SIZE);
dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
dataTable.addBottomToolbar(new NavigationToolbar(dataTable) {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SearchOption.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SearchOption.java
index 5545e01af4..6f3868c47f 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SearchOption.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SearchOption.java
@@ -1,9 +1,9 @@
package com.gitplex.server.web.page.depot.pullrequest.requestlist;
-import static com.gitplex.server.core.entity.PullRequest.CriterionHelper.ofSource;
-import static com.gitplex.server.core.entity.PullRequest.CriterionHelper.ofSourceDepot;
-import static com.gitplex.server.core.entity.PullRequest.CriterionHelper.ofTarget;
-import static com.gitplex.server.core.entity.PullRequest.CriterionHelper.ofTargetDepot;
+import static com.gitplex.server.entity.PullRequest.CriterionHelper.ofSource;
+import static com.gitplex.server.entity.PullRequest.CriterionHelper.ofSourceDepot;
+import static com.gitplex.server.entity.PullRequest.CriterionHelper.ofTarget;
+import static com.gitplex.server.entity.PullRequest.CriterionHelper.ofTargetDepot;
import java.io.Serializable;
import java.util.Date;
@@ -13,13 +13,13 @@ import javax.validation.constraints.NotNull;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.hibernate.criterion.Restrictions;
-import com.gitplex.commons.hibernate.dao.EntityCriteria;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.annotation.AccountChoice;
-import com.gitplex.server.core.annotation.BranchChoice;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.support.DepotAndBranch;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.support.DepotAndBranch;
+import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.util.editable.annotation.AccountChoice;
+import com.gitplex.server.util.editable.annotation.BranchChoice;
+import com.gitplex.server.util.editable.annotation.Editable;
@SuppressWarnings("serial")
@Editable
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SortOption.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SortOption.java
index 5a0145c909..a7544fc761 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SortOption.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/SortOption.java
@@ -7,7 +7,7 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.hibernate.criterion.Order;
-import com.gitplex.commons.util.WordUtils;
+import com.gitplex.server.util.WordUtils;
public class SortOption implements Serializable {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingPage.java
index bcaf01509b..e1fca2a5d1 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingPage.java
@@ -8,9 +8,9 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.wicket.component.tabbable.PageTab;
-import com.gitplex.commons.wicket.component.tabbable.Tabbable;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.component.tabbable.PageTab;
+import com.gitplex.server.web.component.tabbable.Tabbable;
import com.gitplex.server.web.page.depot.DepotPage;
import com.gitplex.server.web.page.depot.setting.authorization.DepotCollaboratorListPage;
import com.gitplex.server.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTab.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTab.java
index a7944d7775..2e6624ffcc 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTab.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTab.java
@@ -3,7 +3,7 @@ package com.gitplex.server.web.page.depot.setting;
import org.apache.wicket.Component;
import org.apache.wicket.model.Model;
-import com.gitplex.commons.wicket.component.tabbable.PageTab;
+import com.gitplex.server.web.component.tabbable.PageTab;
@SuppressWarnings("serial")
public class DepotSettingTab extends PageTab {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.java
index deadf062e4..231608262d 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.java
@@ -23,27 +23,27 @@ import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.commons.wicket.component.select2.Response;
-import com.gitplex.commons.wicket.component.select2.ResponseFiller;
-import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.UserAuthorization;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.UserAuthorizationManager;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.UserAuthorization;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.UserAuthorizationManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.security.privilege.DepotPrivilege;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.component.DropdownLink;
import com.gitplex.server.web.component.accountchoice.AbstractAccountChoiceProvider;
import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;
import com.gitplex.server.web.component.avatar.Avatar;
import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;
-import com.gitplex.server.web.depotaccess.DepotAccess;
+import com.gitplex.server.web.component.select2.Response;
+import com.gitplex.server.web.component.select2.ResponseFiller;
+import com.gitplex.server.web.component.select2.SelectToAddChoice;
import com.gitplex.server.web.page.account.collaborators.CollaboratorDepotListPage;
import com.gitplex.server.web.page.account.collaborators.CollaboratorPrivilegeSourcePage;
import com.gitplex.server.web.page.depot.setting.DepotSettingPage;
+import com.gitplex.server.web.util.depotaccess.DepotAccess;
@SuppressWarnings("serial")
public class DepotCollaboratorListPage extends DepotSettingPage {
@@ -144,7 +144,7 @@ public class DepotCollaboratorListPage extends DepotSettingPage {
Collections.sort(collaborators);
- new ResponseFiller<Account>(response).fill(collaborators, page, Constants.DEFAULT_PAGE_SIZE);
+ new ResponseFiller<Account>(response).fill(collaborators, page, WebConstants.DEFAULT_PAGE_SIZE);
}
}) {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java
index 345077b0f0..b196098b3f 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java
@@ -20,22 +20,22 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.OrganizationMembership;
-import com.gitplex.server.core.entity.UserAuthorization;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.OrganizationMembership;
+import com.gitplex.server.entity.UserAuthorization;
+import com.gitplex.server.security.privilege.DepotPrivilege;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
+import com.gitplex.server.web.component.DropdownLink;
import com.gitplex.server.web.component.avatar.Avatar;
import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;
-import com.gitplex.server.web.depotaccess.DepotAccess;
import com.gitplex.server.web.page.account.collaborators.CollaboratorDepotListPage;
import com.gitplex.server.web.page.account.collaborators.CollaboratorPrivilegeSourcePage;
import com.gitplex.server.web.page.account.members.MemberEffectivePrivilegePage;
import com.gitplex.server.web.page.account.members.MemberPrivilegeSourcePage;
import com.gitplex.server.web.page.depot.setting.DepotSettingPage;
+import com.gitplex.server.web.util.depotaccess.DepotAccess;
import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;
import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;
@@ -178,7 +178,7 @@ public class DepotEffectivePrivilegePage extends DepotSettingPage {
return permissions;
}
- }, Constants.DEFAULT_PAGE_SIZE) {
+ }, WebConstants.DEFAULT_PAGE_SIZE) {
@Override
protected void populateItem(ListItem<UserPermission> item) {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.java
index 9f481b2dc3..711391c4b0 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.java
@@ -23,27 +23,27 @@ import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.commons.wicket.component.modal.ModalLink;
-import com.gitplex.commons.wicket.component.select2.Response;
-import com.gitplex.commons.wicket.component.select2.ResponseFiller;
-import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.Team;
-import com.gitplex.server.core.entity.TeamAuthorization;
-import com.gitplex.server.core.manager.TeamAuthorizationManager;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.Team;
+import com.gitplex.server.entity.TeamAuthorization;
+import com.gitplex.server.manager.TeamAuthorizationManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.security.privilege.DepotPrivilege;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.component.DropdownLink;
import com.gitplex.server.web.component.greaterprivilege.GreaterPrivilegesPanel;
+import com.gitplex.server.web.component.modal.ModalLink;
import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;
+import com.gitplex.server.web.component.select2.Response;
+import com.gitplex.server.web.component.select2.ResponseFiller;
+import com.gitplex.server.web.component.select2.SelectToAddChoice;
import com.gitplex.server.web.component.teamchoice.AbstractTeamChoiceProvider;
import com.gitplex.server.web.component.teamchoice.TeamChoiceResourceReference;
-import com.gitplex.server.web.depotaccess.DepotAccess;
import com.gitplex.server.web.page.account.teams.TeamDepotListPage;
import com.gitplex.server.web.page.depot.setting.DepotSettingPage;
+import com.gitplex.server.web.util.depotaccess.DepotAccess;
@SuppressWarnings("serial")
public class DepotTeamListPage extends DepotSettingPage {
@@ -143,7 +143,7 @@ public class DepotTeamListPage extends DepotSettingPage {
Collections.sort(teams);
- new ResponseFiller<Team>(response).fill(teams, page, Constants.DEFAULT_PAGE_SIZE);
+ new ResponseFiller<Team>(response).fill(teams, page, WebConstants.DEFAULT_PAGE_SIZE);
}
}) {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.java
index f533ad772d..46153673a5 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.java
@@ -7,12 +7,12 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.wicket.editable.PropertyDescriptor;
-import com.gitplex.commons.wicket.editable.reflection.ReflectionPropertyEditor;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.support.CommitMessageTransformSetting;
-import com.gitplex.server.core.manager.DepotManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.support.CommitMessageTransformSetting;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.web.editable.PropertyDescriptor;
+import com.gitplex.server.web.editable.reflection.ReflectionPropertyEditor;
import com.gitplex.server.web.page.depot.setting.DepotSettingPage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperDropBehavior.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperDropBehavior.java
index ad248ce00a..745644e309 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperDropBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperDropBehavior.java
@@ -8,17 +8,17 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
-import com.gitplex.commons.wicket.behavior.dragdrop.DropBehavior;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.gatekeeper.AndGateKeeper;
-import com.gitplex.server.core.gatekeeper.AndOrGateKeeper;
-import com.gitplex.server.core.gatekeeper.CompositeGateKeeper;
-import com.gitplex.server.core.gatekeeper.ConditionalGateKeeper;
-import com.gitplex.server.core.gatekeeper.DefaultGateKeeper;
-import com.gitplex.server.core.gatekeeper.GateKeeper;
-import com.gitplex.server.core.gatekeeper.NotGateKeeper;
-import com.gitplex.server.core.manager.DepotManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.gatekeeper.AndGateKeeper;
+import com.gitplex.server.gatekeeper.AndOrGateKeeper;
+import com.gitplex.server.gatekeeper.CompositeGateKeeper;
+import com.gitplex.server.gatekeeper.ConditionalGateKeeper;
+import com.gitplex.server.gatekeeper.DefaultGateKeeper;
+import com.gitplex.server.gatekeeper.GateKeeper;
+import com.gitplex.server.gatekeeper.NotGateKeeper;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.web.behavior.dragdrop.DropBehavior;
abstract class GateKeeperDropBehavior extends DropBehavior {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperEditor.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperEditor.java
index 4dbe18ec6c..6135ffac68 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperEditor.java
@@ -11,9 +11,9 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.server.core.gatekeeper.GateKeeper;
+import com.gitplex.server.gatekeeper.GateKeeper;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.web.editable.BeanContext;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperLink.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperLink.java
index 3b416f6cfd..6649342e0d 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperLink.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperLink.java
@@ -6,10 +6,10 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.commons.wicket.component.floating.AlignPlacement;
-import com.gitplex.commons.wicket.component.floating.FloatingPanel;
-import com.gitplex.server.core.gatekeeper.GateKeeper;
+import com.gitplex.server.gatekeeper.GateKeeper;
+import com.gitplex.server.web.component.DropdownLink;
+import com.gitplex.server.web.component.floating.AlignPlacement;
+import com.gitplex.server.web.component.floating.FloatingPanel;
@SuppressWarnings("serial")
abstract class GateKeeperLink extends DropdownLink {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPage.java
index 39c589c441..051da1cd86 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPage.java
@@ -10,13 +10,13 @@ import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.util.ReflectionUtils;
-import com.gitplex.commons.wicket.component.modal.ModalPanel;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.gatekeeper.GateKeeper;
-import com.gitplex.server.core.manager.DepotManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.gatekeeper.GateKeeper;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.util.ReflectionUtils;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.web.component.modal.ModalPanel;
import com.gitplex.server.web.page.depot.setting.DepotSettingPage;
import jersey.repackaged.com.google.common.collect.Lists;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPanel.java
index 9776965f10..a483339266 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperPanel.java
@@ -19,20 +19,20 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import com.google.common.base.Joiner;
-import com.gitplex.commons.util.ReflectionUtils;
-import com.gitplex.commons.wicket.ajaxlistener.ConfirmListener;
-import com.gitplex.commons.wicket.behavior.dragdrop.DragBehavior;
-import com.gitplex.commons.wicket.component.modal.ModalLink;
-import com.gitplex.commons.wicket.component.modal.ModalPanel;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.server.core.gatekeeper.AbstractGateKeeper;
-import com.gitplex.server.core.gatekeeper.AndGateKeeper;
-import com.gitplex.server.core.gatekeeper.AndOrGateKeeper;
-import com.gitplex.server.core.gatekeeper.ConditionalGateKeeper;
-import com.gitplex.server.core.gatekeeper.DefaultGateKeeper;
-import com.gitplex.server.core.gatekeeper.GateKeeper;
-import com.gitplex.server.core.gatekeeper.NotGateKeeper;
+import com.gitplex.server.gatekeeper.AbstractGateKeeper;
+import com.gitplex.server.gatekeeper.AndGateKeeper;
+import com.gitplex.server.gatekeeper.AndOrGateKeeper;
+import com.gitplex.server.gatekeeper.ConditionalGateKeeper;
+import com.gitplex.server.gatekeeper.DefaultGateKeeper;
+import com.gitplex.server.gatekeeper.GateKeeper;
+import com.gitplex.server.gatekeeper.NotGateKeeper;
+import com.gitplex.server.util.ReflectionUtils;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.web.behavior.dragdrop.DragBehavior;
+import com.gitplex.server.web.component.modal.ModalLink;
+import com.gitplex.server.web.component.modal.ModalPanel;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.util.ajaxlistener.ConfirmListener;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipBehavior;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperSelector.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperSelector.java
index ea668f4872..db590d10ad 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperSelector.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperSelector.java
@@ -16,15 +16,15 @@ import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
import com.google.common.base.Preconditions;
-import com.gitplex.calla.loader.ImplementationRegistry;
-import com.gitplex.commons.wicket.behavior.CollapseBehavior;
-import com.gitplex.commons.wicket.component.AccordionPanel;
-import com.gitplex.commons.wicket.editable.EditableUtils;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.gatekeeper.DefaultGateKeeper;
-import com.gitplex.server.core.gatekeeper.GateKeeper;
-import com.gitplex.server.core.gatekeeper.TeamAwareGateKeeper;
+import com.gitplex.launcher.loader.ImplementationRegistry;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.gatekeeper.DefaultGateKeeper;
+import com.gitplex.server.gatekeeper.GateKeeper;
+import com.gitplex.server.gatekeeper.TeamAwareGateKeeper;
+import com.gitplex.server.util.editable.EditableUtils;
+import com.gitplex.server.web.behavior.CollapseBehavior;
+import com.gitplex.server.web.component.AccordionPanel;
import com.gitplex.server.web.page.account.AccountPage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.java
index 196e647311..24b5bb5a3a 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/general/GeneralSettingPage.java
@@ -15,22 +15,22 @@ import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.wicket.component.modal.ModalPanel;
-import com.gitplex.commons.wicket.component.select2.Response;
-import com.gitplex.commons.wicket.component.select2.ResponseFiller;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.BeanEditor;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.security.SecurityUtils;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.component.accountchoice.AbstractAccountChoiceProvider;
import com.gitplex.server.web.component.accountchoice.AccountSingleChoice;
import com.gitplex.server.web.component.confirmdelete.ConfirmDeleteDepotModal;
+import com.gitplex.server.web.component.modal.ModalPanel;
+import com.gitplex.server.web.component.select2.Response;
+import com.gitplex.server.web.component.select2.ResponseFiller;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.BeanEditor;
+import com.gitplex.server.web.editable.PathSegment;
import com.gitplex.server.web.page.account.overview.AccountOverviewPage;
import com.gitplex.server.web.page.depot.setting.DepotSettingPage;
@@ -137,7 +137,7 @@ public class GeneralSettingPage extends DepotSettingPage {
accounts.add(account);
}
}
- new ResponseFiller<Account>(response).fill(accounts, page, Constants.DEFAULT_PAGE_SIZE);
+ new ResponseFiller<Account>(response).fill(accounts, page, WebConstants.DEFAULT_PAGE_SIZE);
}
}).setRequired(true));
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.java
index aa68a80a37..c16d199023 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.java
@@ -6,8 +6,8 @@ import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.server.core.entity.support.IntegrationPolicy;
+import com.gitplex.server.entity.support.IntegrationPolicy;
+import com.gitplex.server.web.editable.BeanContext;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.java
index 5f7a15a77c..8095ce2a92 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.java
@@ -12,12 +12,12 @@ import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.wicket.behavior.sortable.SortBehavior;
-import com.gitplex.commons.wicket.behavior.sortable.SortPosition;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.support.IntegrationPolicy;
-import com.gitplex.server.core.manager.DepotManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.support.IntegrationPolicy;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.web.behavior.sortable.SortBehavior;
+import com.gitplex.server.web.behavior.sortable.SortPosition;
import com.gitplex.server.web.page.depot.setting.DepotSettingPage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.java
index a03a8b264f..f050d224ee 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.java
@@ -6,9 +6,9 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.panel.Panel;
-import com.gitplex.commons.wicket.ajaxlistener.ConfirmListener;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.server.core.entity.support.IntegrationPolicy;
+import com.gitplex.server.entity.support.IntegrationPolicy;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.util.ajaxlistener.ConfirmListener;
@SuppressWarnings("serial")
abstract class IntegrationPolicyPanel extends Panel {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java
index 699663cdad..9f7f75e78b 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java
@@ -33,24 +33,24 @@ import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevTag;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.git.RefInfo;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.commons.wicket.ajaxlistener.ConfirmListener;
-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.gitplex.commons.wicket.behavior.clipboard.CopyClipboardBehavior;
-import com.gitplex.commons.wicket.component.modal.ModalLink;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.git.RefInfo;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
+import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;
import com.gitplex.server.web.component.AccountLink;
import com.gitplex.server.web.component.archivemenulink.ArchiveMenuLink;
import com.gitplex.server.web.component.contributorpanel.ContributorPanel;
+import com.gitplex.server.web.component.modal.ModalLink;
import com.gitplex.server.web.component.revisionpicker.RevisionPicker;
import com.gitplex.server.web.page.depot.DepotPage;
import com.gitplex.server.web.page.depot.NoBranchesPage;
import com.gitplex.server.web.page.depot.commit.CommitDetailPage;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
import com.gitplex.server.web.util.DateUtils;
+import com.gitplex.server.web.util.ajaxlistener.ConfirmListener;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;
@@ -241,7 +241,7 @@ public class DepotTagsPage extends DepotPage {
PageableListView<RefInfo> tagsView;
tagsContainer.add(tagsView = new PageableListView<RefInfo>("tags", tagsModel,
- com.gitplex.server.web.Constants.DEFAULT_PAGE_SIZE) {
+ com.gitplex.server.web.WebConstants.DEFAULT_PAGE_SIZE) {
@Override
protected void populateItem(ListItem<RefInfo> item) {
diff --git a/web/src/main/java/com/gitplex/server/web/page/error/ExpectedExceptionPage.java b/web/src/main/java/com/gitplex/server/web/page/error/ExpectedExceptionPage.java
index 7b2e3af1f2..fe27d1a31a 100644
--- a/web/src/main/java/com/gitplex/server/web/page/error/ExpectedExceptionPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/error/ExpectedExceptionPage.java
@@ -8,8 +8,8 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.util.string.Strings;
-import com.gitplex.commons.util.WordUtils;
-import com.gitplex.commons.wicket.component.MultilineLabel;
+import com.gitplex.server.util.WordUtils;
+import com.gitplex.server.web.component.MultilineLabel;
import com.gitplex.server.web.page.home.DashboardPage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.java b/web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.java
index b55e52e1a8..5992cd6195 100644
--- a/web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.java
@@ -33,11 +33,11 @@ import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.string.Strings;
-import com.gitplex.commons.util.FileUtils;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.ConfigManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.ConfigManager;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.server.util.StringUtils;
import com.gitplex.server.web.page.home.DashboardPage;
import com.gitplex.server.web.util.DateUtils;
diff --git a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java b/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java
index 14ccd511b4..9eb60c07ff 100644
--- a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java
@@ -17,11 +17,11 @@ import org.apache.wicket.markup.html.list.PageableListView;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
import com.gitplex.server.web.page.layout.LayoutPage;
@@ -87,7 +87,7 @@ public class DashboardPage extends LayoutPage {
return depots;
}
- }, Constants.DEFAULT_PAGE_SIZE) {
+ }, WebConstants.DEFAULT_PAGE_SIZE) {
@Override
protected void populateItem(ListItem<Depot> item) {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/page/images/add.png b/web/src/main/java/com/gitplex/server/web/page/images/add.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/page/images/add.png
rename to web/src/main/java/com/gitplex/server/web/page/images/add.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/page/images/back-to-top.png b/web/src/main/java/com/gitplex/server/web/page/images/back-to-top.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/page/images/back-to-top.png
rename to web/src/main/java/com/gitplex/server/web/page/images/back-to-top.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/page/images/delete.png b/web/src/main/java/com/gitplex/server/web/page/images/delete.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/page/images/delete.png
rename to web/src/main/java/com/gitplex/server/web/page/images/delete.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/page/images/error.png b/web/src/main/java/com/gitplex/server/web/page/images/error.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/page/images/error.png
rename to web/src/main/java/com/gitplex/server/web/page/images/error.png
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/page/images/move.png b/web/src/main/java/com/gitplex/server/web/page/images/move.png
similarity index 100%
rename from wicket/src/main/java/com/gitplex/commons/wicket/page/images/move.png
rename to web/src/main/java/com/gitplex/server/web/page/images/move.png
diff --git a/web/src/main/java/com/gitplex/server/web/page/init/ServerInitPage.java b/web/src/main/java/com/gitplex/server/web/page/init/ServerInitPage.java
index 7ca0a512d8..1164acabf6 100644
--- a/web/src/main/java/com/gitplex/server/web/page/init/ServerInitPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/init/ServerInitPage.java
@@ -10,15 +10,15 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import com.gitplex.commons.util.init.InitStage;
-import com.gitplex.commons.util.init.ManualConfig;
-import com.gitplex.commons.wicket.component.wizard.ManualConfigStep;
-import com.gitplex.commons.wicket.component.wizard.Wizard;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.init.InitStage;
+import com.gitplex.server.util.init.ManualConfig;
import com.gitplex.server.web.WebSession;
+import com.gitplex.server.web.component.wizard.ManualConfigStep;
+import com.gitplex.server.web.component.wizard.Wizard;
import com.gitplex.server.web.page.base.BasePage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.java b/web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.java
index d804f5488e..7e02e7e705 100644
--- a/web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.java
@@ -5,16 +5,16 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.BeanEditor;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.DepotManager;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.DepotManager;
import com.gitplex.server.web.component.accountchoice.AccountSingleChoice;
import com.gitplex.server.web.component.accountchoice.AdministrativeAccountChoiceProvider;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.BeanEditor;
+import com.gitplex.server.web.editable.PathSegment;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java b/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java
index 6a247a9a6f..0d4ee08090 100644
--- a/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java
@@ -23,19 +23,17 @@ import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.calla.loader.Plugin;
-import com.gitplex.commons.wicket.component.DropdownLink;
-import com.gitplex.commons.wicket.component.floating.AlignPlacement;
-import com.gitplex.commons.wicket.websocket.WebSocketRegion;
-import com.gitplex.commons.wicket.websocket.WebSocketRenderBehavior;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.ConfigManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.launcher.loader.Plugin;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.ConfigManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.component.DropdownLink;
import com.gitplex.server.web.component.avatar.Avatar;
import com.gitplex.server.web.component.avatar.AvatarLink;
+import com.gitplex.server.web.component.floating.AlignPlacement;
import com.gitplex.server.web.page.account.overview.AccountOverviewPage;
import com.gitplex.server.web.page.account.overview.NewOrganizationPage;
import com.gitplex.server.web.page.account.setting.ProfileEditPage;
@@ -47,6 +45,8 @@ import com.gitplex.server.web.page.security.LoginPage;
import com.gitplex.server.web.page.security.LogoutPage;
import com.gitplex.server.web.page.security.RegisterPage;
import com.gitplex.server.web.websocket.TaskChangedRegion;
+import com.gitplex.server.web.websocket.WebSocketRegion;
+import com.gitplex.server.web.websocket.WebSocketRenderBehavior;
@SuppressWarnings("serial")
public abstract class LayoutPage extends BasePage {
diff --git a/web/src/main/java/com/gitplex/server/web/page/security/ForgetPage.java b/web/src/main/java/com/gitplex/server/web/page/security/ForgetPage.java
index 67c1a74506..7cbd830033 100644
--- a/web/src/main/java/com/gitplex/server/web/page/security/ForgetPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/security/ForgetPage.java
@@ -14,16 +14,16 @@ import org.hibernate.validator.constraints.NotEmpty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.commons.wicket.behavior.testform.TestFormBehavior;
-import com.gitplex.commons.wicket.behavior.testform.TestResult;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.annotation.Editable;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.ConfigManager;
-import com.gitplex.server.core.manager.MailManager;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.ConfigManager;
+import com.gitplex.server.manager.MailManager;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.web.behavior.testform.TestFormBehavior;
+import com.gitplex.server.web.behavior.testform.TestResult;
+import com.gitplex.server.web.editable.BeanContext;
import com.gitplex.server.web.page.base.BasePage;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.java b/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.java
index 637690ad00..ec47548d5e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.java
@@ -18,12 +18,12 @@ import org.apache.wicket.model.IModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.ConfigManager;
-import com.gitplex.server.core.manager.MailManager;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.ConfigManager;
+import com.gitplex.server.manager.MailManager;
import com.gitplex.server.web.WebSession;
import com.gitplex.server.web.page.base.BasePage;
diff --git a/web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.java b/web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.java
index bfd57e9fc5..c690671052 100644
--- a/web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/security/RegisterPage.java
@@ -8,14 +8,14 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.SubmitLink;
import org.apache.wicket.markup.html.link.Link;
-import com.gitplex.commons.wicket.editable.BeanContext;
-import com.gitplex.commons.wicket.editable.BeanEditor;
-import com.gitplex.commons.wicket.editable.PathSegment;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.AccountManager;
-import com.gitplex.server.core.manager.ConfigManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.ConfigManager;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.editable.BeanContext;
+import com.gitplex.server.web.editable.BeanEditor;
+import com.gitplex.server.web.editable.PathSegment;
import com.gitplex.server.web.page.account.AccountPage;
import com.gitplex.server.web.page.account.setting.AvatarEditPage;
import com.gitplex.server.web.page.base.BasePage;
diff --git a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
index d9525a2717..34a5fb5f29 100644
--- a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
@@ -1,6 +1,6 @@
package com.gitplex.server.web.page.test;
-import com.gitplex.commons.wicket.page.CommonPage;
+import com.gitplex.server.web.page.CommonPage;
@SuppressWarnings("serial")
public class TestPage extends CommonPage {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/AjaxEvent.java b/web/src/main/java/com/gitplex/server/web/util/AjaxEvent.java
similarity index 91%
rename from wicket/src/main/java/com/gitplex/commons/wicket/AjaxEvent.java
rename to web/src/main/java/com/gitplex/server/web/util/AjaxEvent.java
index 236dba1b3f..44032f2722 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/AjaxEvent.java
+++ b/web/src/main/java/com/gitplex/server/web/util/AjaxEvent.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket;
+package com.gitplex.server.web.util;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/ConfirmOnClick.java b/web/src/main/java/com/gitplex/server/web/util/ConfirmOnClick.java
similarity index 90%
rename from wicket/src/main/java/com/gitplex/commons/wicket/ConfirmOnClick.java
rename to web/src/main/java/com/gitplex/server/web/util/ConfirmOnClick.java
index 51c90a798e..55d27dfb81 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/ConfirmOnClick.java
+++ b/web/src/main/java/com/gitplex/server/web/util/ConfirmOnClick.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket;
+package com.gitplex.server.web.util;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.wicket.AttributeModifier;
diff --git a/web/src/main/java/com/gitplex/server/web/util/DateUtils.java b/web/src/main/java/com/gitplex/server/web/util/DateUtils.java
index 1fd5a308bd..961305a7c4 100644
--- a/web/src/main/java/com/gitplex/server/web/util/DateUtils.java
+++ b/web/src/main/java/com/gitplex/server/web/util/DateUtils.java
@@ -5,7 +5,7 @@ import java.util.Date;
import org.joda.time.DateTime;
import org.ocpsoft.prettytime.PrettyTime;
-import com.gitplex.server.web.Constants;
+import com.gitplex.server.web.WebConstants;
public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
@@ -14,11 +14,11 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
}
public static String formatDate(Date date) {
- return Constants.DATE_FORMATTER.print(new DateTime(date));
+ return WebConstants.DATE_FORMATTER.print(new DateTime(date));
}
public static String formatDateTime(Date date) {
- return Constants.DATETIME_FORMATTER.print(new DateTime(date));
+ return WebConstants.DATETIME_FORMATTER.print(new DateTime(date));
}
}
\ No newline at end of file
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/NoVersionMountedMapper.java b/web/src/main/java/com/gitplex/server/web/util/NoVersionMountedMapper.java
similarity index 94%
rename from wicket/src/main/java/com/gitplex/commons/wicket/NoVersionMountedMapper.java
rename to web/src/main/java/com/gitplex/server/web/util/NoVersionMountedMapper.java
index 2109bb9d7a..c7a93ab2d3 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/NoVersionMountedMapper.java
+++ b/web/src/main/java/com/gitplex/server/web/util/NoVersionMountedMapper.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket;
+package com.gitplex.server.web.util;
import org.apache.wicket.core.request.mapper.MountedMapper;
import org.apache.wicket.request.Url;
diff --git a/web/src/main/java/com/gitplex/server/web/util/SuggestionUtils.java b/web/src/main/java/com/gitplex/server/web/util/SuggestionUtils.java
index f272caa2f9..4f9e77d47c 100644
--- a/web/src/main/java/com/gitplex/server/web/util/SuggestionUtils.java
+++ b/web/src/main/java/com/gitplex/server/web/util/SuggestionUtils.java
@@ -10,17 +10,17 @@ import java.util.Set;
import javax.annotation.Nullable;
-import com.google.common.base.Preconditions;
-import com.gitplex.commons.antlr.codeassist.InputSuggestion;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.commons.git.RefInfo;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.util.match.PatternApplied;
-import com.gitplex.commons.util.match.WildcardUtils;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.CommitInfoManager;
+import com.gitplex.codeassist.InputSuggestion;
import com.gitplex.jsymbol.Range;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.git.RefInfo;
+import com.gitplex.server.manager.CommitInfoManager;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.util.match.PatternApplied;
+import com.gitplex.server.util.match.WildcardUtils;
+import com.google.common.base.Preconditions;
public class SuggestionUtils {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/WicketUtils.java b/web/src/main/java/com/gitplex/server/web/util/WicketUtils.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/WicketUtils.java
rename to web/src/main/java/com/gitplex/server/web/util/WicketUtils.java
index 979428a707..dcd364d59d 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/WicketUtils.java
+++ b/web/src/main/java/com/gitplex/server/web/util/WicketUtils.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket;
+package com.gitplex.server.web.util;
import javax.annotation.Nullable;
@@ -12,7 +12,7 @@ import org.apache.wicket.protocol.ws.api.registry.PageIdKey;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.RequestCycle;
-import com.gitplex.commons.wicket.websocket.PageKey;
+import com.gitplex.server.web.websocket.PageKey;
public class WicketUtils {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/ajaxlistener/AjaxLoadingOverlay.java b/web/src/main/java/com/gitplex/server/web/util/ajaxlistener/AjaxLoadingOverlay.java
similarity index 97%
rename from wicket/src/main/java/com/gitplex/commons/wicket/ajaxlistener/AjaxLoadingOverlay.java
rename to web/src/main/java/com/gitplex/server/web/util/ajaxlistener/AjaxLoadingOverlay.java
index 3b86e2841a..8ec592356a 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/ajaxlistener/AjaxLoadingOverlay.java
+++ b/web/src/main/java/com/gitplex/server/web/util/ajaxlistener/AjaxLoadingOverlay.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.ajaxlistener;
+package com.gitplex.server.web.util.ajaxlistener;
import java.io.Serializable;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/ajaxlistener/CompositeAjaxCallListener.java b/web/src/main/java/com/gitplex/server/web/util/ajaxlistener/CompositeAjaxCallListener.java
similarity index 98%
rename from wicket/src/main/java/com/gitplex/commons/wicket/ajaxlistener/CompositeAjaxCallListener.java
rename to web/src/main/java/com/gitplex/server/web/util/ajaxlistener/CompositeAjaxCallListener.java
index b78c99df54..e833541fac 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/ajaxlistener/CompositeAjaxCallListener.java
+++ b/web/src/main/java/com/gitplex/server/web/util/ajaxlistener/CompositeAjaxCallListener.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.ajaxlistener;
+package com.gitplex.server.web.util.ajaxlistener;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.attributes.IAjaxCallListener;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/ajaxlistener/ConfirmLeaveListener.java b/web/src/main/java/com/gitplex/server/web/util/ajaxlistener/ConfirmLeaveListener.java
similarity index 96%
rename from wicket/src/main/java/com/gitplex/commons/wicket/ajaxlistener/ConfirmLeaveListener.java
rename to web/src/main/java/com/gitplex/server/web/util/ajaxlistener/ConfirmLeaveListener.java
index 4bfe896c98..c5b8eda8ac 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/ajaxlistener/ConfirmLeaveListener.java
+++ b/web/src/main/java/com/gitplex/server/web/util/ajaxlistener/ConfirmLeaveListener.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.ajaxlistener;
+package com.gitplex.server.web.util.ajaxlistener;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.attributes.IAjaxCallListener;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/ajaxlistener/ConfirmListener.java b/web/src/main/java/com/gitplex/server/web/util/ajaxlistener/ConfirmListener.java
similarity index 96%
rename from wicket/src/main/java/com/gitplex/commons/wicket/ajaxlistener/ConfirmListener.java
rename to web/src/main/java/com/gitplex/server/web/util/ajaxlistener/ConfirmListener.java
index e56dad518c..fe6b645bdf 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/ajaxlistener/ConfirmListener.java
+++ b/web/src/main/java/com/gitplex/server/web/util/ajaxlistener/ConfirmListener.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.ajaxlistener;
+package com.gitplex.server.web.util.ajaxlistener;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.wicket.Component;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/ajaxlistener/IndicateLoadingListener.java b/web/src/main/java/com/gitplex/server/web/util/ajaxlistener/IndicateLoadingListener.java
similarity index 96%
rename from wicket/src/main/java/com/gitplex/commons/wicket/ajaxlistener/IndicateLoadingListener.java
rename to web/src/main/java/com/gitplex/server/web/util/ajaxlistener/IndicateLoadingListener.java
index 17746b2b7e..f9baeec421 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/ajaxlistener/IndicateLoadingListener.java
+++ b/web/src/main/java/com/gitplex/server/web/util/ajaxlistener/IndicateLoadingListener.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.ajaxlistener;
+package com.gitplex.server.web.util.ajaxlistener;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.attributes.IAjaxCallListener;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/ajaxlistener/IndicateWorkingListener.java b/web/src/main/java/com/gitplex/server/web/util/ajaxlistener/IndicateWorkingListener.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/ajaxlistener/IndicateWorkingListener.java
rename to web/src/main/java/com/gitplex/server/web/util/ajaxlistener/IndicateWorkingListener.java
index 44210df037..c0880bc8a7 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/ajaxlistener/IndicateWorkingListener.java
+++ b/web/src/main/java/com/gitplex/server/web/util/ajaxlistener/IndicateWorkingListener.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.ajaxlistener;
+package com.gitplex.server.web.util.ajaxlistener;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.attributes.IAjaxCallListener;
@@ -6,7 +6,7 @@ import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
/**
* Show global ajax loading indicator right away instead of using a timer.
diff --git a/web/src/main/java/com/gitplex/server/web/avatar/AvatarGenerator.java b/web/src/main/java/com/gitplex/server/web/util/avatar/AvatarGenerator.java
similarity index 99%
rename from web/src/main/java/com/gitplex/server/web/avatar/AvatarGenerator.java
rename to web/src/main/java/com/gitplex/server/web/util/avatar/AvatarGenerator.java
index b0c6211b50..e4046405fc 100644
--- a/web/src/main/java/com/gitplex/server/web/avatar/AvatarGenerator.java
+++ b/web/src/main/java/com/gitplex/server/web/util/avatar/AvatarGenerator.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.avatar;
+package com.gitplex.server.web.util.avatar;
import java.awt.Color;
import java.awt.Font;
diff --git a/web/src/main/java/com/gitplex/server/web/avatar/AvatarManager.java b/web/src/main/java/com/gitplex/server/web/util/avatar/AvatarManager.java
similarity index 91%
rename from web/src/main/java/com/gitplex/server/web/avatar/AvatarManager.java
rename to web/src/main/java/com/gitplex/server/web/util/avatar/AvatarManager.java
index a6b70520a5..0821c0cef0 100644
--- a/web/src/main/java/com/gitplex/server/web/avatar/AvatarManager.java
+++ b/web/src/main/java/com/gitplex/server/web/util/avatar/AvatarManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.avatar;
+package com.gitplex.server.web.util.avatar;
import java.io.File;
@@ -7,7 +7,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.eclipse.jgit.lib.PersonIdent;
-import com.gitplex.server.core.entity.Account;
+import com.gitplex.server.entity.Account;
public interface AvatarManager {
diff --git a/web/src/main/java/com/gitplex/server/web/avatar/DefaultAvatarManager.java b/web/src/main/java/com/gitplex/server/web/util/avatar/DefaultAvatarManager.java
similarity index 91%
rename from web/src/main/java/com/gitplex/server/web/avatar/DefaultAvatarManager.java
rename to web/src/main/java/com/gitplex/server/web/util/avatar/DefaultAvatarManager.java
index f804337aea..b20fe6be96 100644
--- a/web/src/main/java/com/gitplex/server/web/avatar/DefaultAvatarManager.java
+++ b/web/src/main/java/com/gitplex/server/web/util/avatar/DefaultAvatarManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.avatar;
+package com.gitplex.server.web.util.avatar;
import java.awt.image.BufferedImage;
import java.io.File;
@@ -15,13 +15,13 @@ import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.apache.wicket.request.cycle.RequestCycle;
import org.eclipse.jgit.lib.PersonIdent;
-import com.gitplex.calla.bootstrap.Bootstrap;
-import com.gitplex.commons.hibernate.Transactional;
-import com.gitplex.commons.util.FileUtils;
-import com.gitplex.commons.util.LockUtils;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.manager.ConfigManager;
+import com.gitplex.launcher.bootstrap.Bootstrap;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.manager.ConfigManager;
+import com.gitplex.server.persistence.annotation.Transactional;
+import com.gitplex.server.util.FileUtils;
+import com.gitplex.server.util.LockUtils;
+import com.gitplex.server.util.StringUtils;
import com.google.common.base.Splitter;
import com.google.common.base.Throwables;
import com.google.common.collect.Iterables;
diff --git a/web/src/main/java/com/gitplex/server/web/avatar/Gravatar.java b/web/src/main/java/com/gitplex/server/web/util/avatar/Gravatar.java
similarity index 99%
rename from web/src/main/java/com/gitplex/server/web/avatar/Gravatar.java
rename to web/src/main/java/com/gitplex/server/web/util/avatar/Gravatar.java
index 8f829a55c4..cf63d64621 100644
--- a/web/src/main/java/com/gitplex/server/web/avatar/Gravatar.java
+++ b/web/src/main/java/com/gitplex/server/web/util/avatar/Gravatar.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.avatar;
+package com.gitplex.server.web.util.avatar;
import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
diff --git a/web/src/main/java/com/gitplex/server/web/util/commitmessagetransform/CommitMessageTransformer.java b/web/src/main/java/com/gitplex/server/web/util/commitmessagetransform/CommitMessageTransformer.java
new file mode 100644
index 0000000000..255317571c
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/util/commitmessagetransform/CommitMessageTransformer.java
@@ -0,0 +1,11 @@
+package com.gitplex.server.web.util.commitmessagetransform;
+
+import com.gitplex.launcher.loader.ExtensionPoint;
+import com.gitplex.server.entity.Depot;
+
+@ExtensionPoint
+public interface CommitMessageTransformer {
+
+ String transform(Depot depot, String commitMessage);
+
+}
diff --git a/core/src/main/java/com/gitplex/server/core/commitmessagetransform/PatternCommitMessageTransformer.java b/web/src/main/java/com/gitplex/server/web/util/commitmessagetransform/PatternCommitMessageTransformer.java
similarity index 71%
rename from core/src/main/java/com/gitplex/server/core/commitmessagetransform/PatternCommitMessageTransformer.java
rename to web/src/main/java/com/gitplex/server/web/util/commitmessagetransform/PatternCommitMessageTransformer.java
index 7322dfb21a..162950b928 100644
--- a/core/src/main/java/com/gitplex/server/core/commitmessagetransform/PatternCommitMessageTransformer.java
+++ b/web/src/main/java/com/gitplex/server/web/util/commitmessagetransform/PatternCommitMessageTransformer.java
@@ -1,9 +1,9 @@
-package com.gitplex.server.core.commitmessagetransform;
+package com.gitplex.server.web.util.commitmessagetransform;
import javax.inject.Singleton;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.support.CommitMessageTransformSetting;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.support.CommitMessageTransformSetting;
@Singleton
public class PatternCommitMessageTransformer implements CommitMessageTransformer {
diff --git a/web/src/main/java/com/gitplex/server/web/depotaccess/DepotAccess.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/DepotAccess.java
similarity index 86%
rename from web/src/main/java/com/gitplex/server/web/depotaccess/DepotAccess.java
rename to web/src/main/java/com/gitplex/server/web/util/depotaccess/DepotAccess.java
index aa0990071b..c352da8ba1 100644
--- a/web/src/main/java/com/gitplex/server/web/depotaccess/DepotAccess.java
+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/DepotAccess.java
@@ -1,15 +1,15 @@
-package com.gitplex.server.web.depotaccess;
+package com.gitplex.server.web.util.depotaccess;
import java.util.ArrayList;
import java.util.List;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.entity.OrganizationMembership;
-import com.gitplex.server.core.entity.TeamAuthorization;
-import com.gitplex.server.core.entity.TeamMembership;
-import com.gitplex.server.core.entity.UserAuthorization;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.entity.OrganizationMembership;
+import com.gitplex.server.entity.TeamAuthorization;
+import com.gitplex.server.entity.TeamMembership;
+import com.gitplex.server.entity.UserAuthorization;
+import com.gitplex.server.security.privilege.DepotPrivilege;
public class DepotAccess {
diff --git a/web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotCollaborator.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaborator.java
similarity index 76%
rename from web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotCollaborator.java
rename to web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaborator.java
index 878f56dccf..d903ebc7c9 100644
--- a/web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotCollaborator.java
+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaborator.java
@@ -1,12 +1,12 @@
-package com.gitplex.server.web.depotaccess;
+package com.gitplex.server.web.util.depotaccess;
import org.apache.wicket.Component;
import org.apache.wicket.model.LoadableDetachableModel;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.UserAuthorization;
-import com.gitplex.server.core.manager.UserAuthorizationManager;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.UserAuthorization;
+import com.gitplex.server.manager.UserAuthorizationManager;
+import com.gitplex.server.security.privilege.DepotPrivilege;
public class IsDepotCollaborator implements PrivilegeSource {
diff --git a/web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotCollaboratorPanel.html b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaboratorPanel.html
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotCollaboratorPanel.html
rename to web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaboratorPanel.html
diff --git a/web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotCollaboratorPanel.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaboratorPanel.java
similarity index 90%
rename from web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotCollaboratorPanel.java
rename to web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaboratorPanel.java
index e336a54574..0d9dfa091f 100644
--- a/web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotCollaboratorPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaboratorPanel.java
@@ -1,11 +1,11 @@
-package com.gitplex.server.web.depotaccess;
+package com.gitplex.server.web.util.depotaccess;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
-import com.gitplex.server.core.entity.UserAuthorization;
+import com.gitplex.server.entity.UserAuthorization;
import com.gitplex.server.web.page.depot.setting.authorization.DepotCollaboratorListPage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotOwner.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotOwner.java
similarity index 79%
rename from web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotOwner.java
rename to web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotOwner.java
index 13fa971dd0..e44d6eea5a 100644
--- a/web/src/main/java/com/gitplex/server/web/depotaccess/IsDepotOwner.java
+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotOwner.java
@@ -1,9 +1,9 @@
-package com.gitplex.server.web.depotaccess;
+package com.gitplex.server.web.util.depotaccess;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
+import com.gitplex.server.security.privilege.DepotPrivilege;
public class IsDepotOwner implements PrivilegeSource {
diff --git a/web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationAdmin.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdmin.java
similarity index 74%
rename from web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationAdmin.java
rename to web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdmin.java
index 8949fd18fb..f3bfef5f55 100644
--- a/web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationAdmin.java
+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdmin.java
@@ -1,12 +1,12 @@
-package com.gitplex.server.web.depotaccess;
+package com.gitplex.server.web.util.depotaccess;
import org.apache.wicket.Component;
import org.apache.wicket.model.LoadableDetachableModel;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.OrganizationMembership;
-import com.gitplex.server.core.manager.OrganizationMembershipManager;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.OrganizationMembership;
+import com.gitplex.server.manager.OrganizationMembershipManager;
+import com.gitplex.server.security.privilege.DepotPrivilege;
public class IsOrganizationAdmin implements PrivilegeSource {
diff --git a/web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationAdminPanel.html b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdminPanel.html
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationAdminPanel.html
rename to web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdminPanel.html
diff --git a/web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationAdminPanel.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdminPanel.java
similarity index 90%
rename from web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationAdminPanel.java
rename to web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdminPanel.java
index 9ba3eb946b..83266e2ee8 100644
--- a/web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationAdminPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdminPanel.java
@@ -1,11 +1,11 @@
-package com.gitplex.server.web.depotaccess;
+package com.gitplex.server.web.util.depotaccess;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
-import com.gitplex.server.core.entity.OrganizationMembership;
+import com.gitplex.server.entity.OrganizationMembership;
import com.gitplex.server.web.page.account.members.MemberTeamListPage;
@SuppressWarnings("serial")
diff --git a/web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationMember.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMember.java
similarity index 76%
rename from web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationMember.java
rename to web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMember.java
index a636eced39..30e243b011 100644
--- a/web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationMember.java
+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMember.java
@@ -1,12 +1,12 @@
-package com.gitplex.server.web.depotaccess;
+package com.gitplex.server.web.util.depotaccess;
import org.apache.wicket.Component;
import org.apache.wicket.model.LoadableDetachableModel;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.OrganizationMembership;
-import com.gitplex.server.core.manager.OrganizationMembershipManager;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.OrganizationMembership;
+import com.gitplex.server.manager.OrganizationMembershipManager;
+import com.gitplex.server.security.privilege.DepotPrivilege;
public class IsOrganizationMember implements PrivilegeSource {
diff --git a/web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationMemberPanel.html b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMemberPanel.html
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationMemberPanel.html
rename to web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMemberPanel.html
diff --git a/web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationMemberPanel.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMemberPanel.java
similarity index 85%
rename from web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationMemberPanel.java
rename to web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMemberPanel.java
index d9857edf16..3c6fa8fd74 100644
--- a/web/src/main/java/com/gitplex/server/web/depotaccess/IsOrganizationMemberPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMemberPanel.java
@@ -1,13 +1,13 @@
-package com.gitplex.server.web.depotaccess;
+package com.gitplex.server.web.util.depotaccess;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
-import com.gitplex.server.core.entity.Account;
-import com.gitplex.server.core.entity.OrganizationMembership;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.entity.Account;
+import com.gitplex.server.entity.OrganizationMembership;
+import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.page.account.setting.ProfileEditPage;
public class IsOrganizationMemberPanel extends Panel {
diff --git a/web/src/main/java/com/gitplex/server/web/depotaccess/IsPublicDepot.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsPublicDepot.java
similarity index 78%
rename from web/src/main/java/com/gitplex/server/web/depotaccess/IsPublicDepot.java
rename to web/src/main/java/com/gitplex/server/web/util/depotaccess/IsPublicDepot.java
index 909d3de736..7efbaaf3b0 100644
--- a/web/src/main/java/com/gitplex/server/web/depotaccess/IsPublicDepot.java
+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsPublicDepot.java
@@ -1,9 +1,9 @@
-package com.gitplex.server.web.depotaccess;
+package com.gitplex.server.web.util.depotaccess;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
+import com.gitplex.server.security.privilege.DepotPrivilege;
public class IsPublicDepot implements PrivilegeSource {
diff --git a/web/src/main/java/com/gitplex/server/web/depotaccess/IsSystemAdministrator.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsSystemAdministrator.java
similarity index 79%
rename from web/src/main/java/com/gitplex/server/web/depotaccess/IsSystemAdministrator.java
rename to web/src/main/java/com/gitplex/server/web/util/depotaccess/IsSystemAdministrator.java
index e575f9b62b..f1698c2e2e 100644
--- a/web/src/main/java/com/gitplex/server/web/depotaccess/IsSystemAdministrator.java
+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsSystemAdministrator.java
@@ -1,9 +1,9 @@
-package com.gitplex.server.web.depotaccess;
+package com.gitplex.server.web.util.depotaccess;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
+import com.gitplex.server.security.privilege.DepotPrivilege;
public class IsSystemAdministrator implements PrivilegeSource {
diff --git a/web/src/main/java/com/gitplex/server/web/depotaccess/IsTeamMember.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMember.java
similarity index 76%
rename from web/src/main/java/com/gitplex/server/web/depotaccess/IsTeamMember.java
rename to web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMember.java
index d9c7fb1a21..c7f5970fef 100644
--- a/web/src/main/java/com/gitplex/server/web/depotaccess/IsTeamMember.java
+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMember.java
@@ -1,12 +1,12 @@
-package com.gitplex.server.web.depotaccess;
+package com.gitplex.server.web.util.depotaccess;
import org.apache.wicket.Component;
import org.apache.wicket.model.LoadableDetachableModel;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.TeamMembership;
-import com.gitplex.server.core.manager.TeamMembershipManager;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.TeamMembership;
+import com.gitplex.server.manager.TeamMembershipManager;
+import com.gitplex.server.security.privilege.DepotPrivilege;
public class IsTeamMember implements PrivilegeSource {
diff --git a/web/src/main/java/com/gitplex/server/web/depotaccess/IsTeamMemberPanel.html b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMemberPanel.html
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/depotaccess/IsTeamMemberPanel.html
rename to web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMemberPanel.html
diff --git a/web/src/main/java/com/gitplex/server/web/depotaccess/IsTeamMemberPanel.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMemberPanel.java
similarity index 90%
rename from web/src/main/java/com/gitplex/server/web/depotaccess/IsTeamMemberPanel.java
rename to web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMemberPanel.java
index a60ff595f7..45b2b86ea7 100644
--- a/web/src/main/java/com/gitplex/server/web/depotaccess/IsTeamMemberPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMemberPanel.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.depotaccess;
+package com.gitplex.server.web.util.depotaccess;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -6,8 +6,8 @@ import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
-import com.gitplex.server.core.entity.TeamMembership;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
+import com.gitplex.server.entity.TeamMembership;
+import com.gitplex.server.security.privilege.DepotPrivilege;
import com.gitplex.server.web.page.account.teams.TeamDepotListPage;
import com.gitplex.server.web.page.account.teams.TeamMemberListPage;
diff --git a/web/src/main/java/com/gitplex/server/web/depotaccess/PrivilegeSource.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/PrivilegeSource.java
similarity index 64%
rename from web/src/main/java/com/gitplex/server/web/depotaccess/PrivilegeSource.java
rename to web/src/main/java/com/gitplex/server/web/util/depotaccess/PrivilegeSource.java
index 4fa8d0c90e..796ecd3981 100644
--- a/web/src/main/java/com/gitplex/server/web/depotaccess/PrivilegeSource.java
+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/PrivilegeSource.java
@@ -1,10 +1,10 @@
-package com.gitplex.server.web.depotaccess;
+package com.gitplex.server.web.util.depotaccess;
import java.io.Serializable;
import org.apache.wicket.Component;
-import com.gitplex.server.core.security.privilege.DepotPrivilege;
+import com.gitplex.server.security.privilege.DepotPrivilege;
public interface PrivilegeSource extends Serializable {
diff --git a/web/src/main/java/com/gitplex/server/web/mapper/AccountMapper.java b/web/src/main/java/com/gitplex/server/web/util/mapper/AccountMapper.java
similarity index 83%
rename from web/src/main/java/com/gitplex/server/web/mapper/AccountMapper.java
rename to web/src/main/java/com/gitplex/server/web/util/mapper/AccountMapper.java
index 80c029ad59..8b22e73cf2 100644
--- a/web/src/main/java/com/gitplex/server/web/mapper/AccountMapper.java
+++ b/web/src/main/java/com/gitplex/server/web/util/mapper/AccountMapper.java
@@ -1,10 +1,10 @@
-package com.gitplex.server.web.mapper;
+package com.gitplex.server.web.util.mapper;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.component.IRequestablePage;
-import com.gitplex.commons.wicket.NoVersionMountedMapper;
+import com.gitplex.server.web.util.NoVersionMountedMapper;
public class AccountMapper extends NoVersionMountedMapper {
diff --git a/web/src/main/java/com/gitplex/server/web/mapper/DepotMapper.java b/web/src/main/java/com/gitplex/server/web/util/mapper/DepotMapper.java
similarity index 83%
rename from web/src/main/java/com/gitplex/server/web/mapper/DepotMapper.java
rename to web/src/main/java/com/gitplex/server/web/util/mapper/DepotMapper.java
index e687ca4704..4193f30f78 100644
--- a/web/src/main/java/com/gitplex/server/web/mapper/DepotMapper.java
+++ b/web/src/main/java/com/gitplex/server/web/util/mapper/DepotMapper.java
@@ -1,10 +1,10 @@
-package com.gitplex.server.web.mapper;
+package com.gitplex.server.web.util.mapper;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.component.IRequestablePage;
-import com.gitplex.commons.wicket.NoVersionMountedMapper;
+import com.gitplex.server.web.util.NoVersionMountedMapper;
public class DepotMapper extends NoVersionMountedMapper {
diff --git a/web/src/main/java/com/gitplex/server/web/mapper/DepotResourceMapper.java b/web/src/main/java/com/gitplex/server/web/util/mapper/DepotResourceMapper.java
similarity index 92%
rename from web/src/main/java/com/gitplex/server/web/mapper/DepotResourceMapper.java
rename to web/src/main/java/com/gitplex/server/web/util/mapper/DepotResourceMapper.java
index a1e5cd97c1..aa09ec84ee 100644
--- a/web/src/main/java/com/gitplex/server/web/mapper/DepotResourceMapper.java
+++ b/web/src/main/java/com/gitplex/server/web/util/mapper/DepotResourceMapper.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.mapper;
+package com.gitplex.server.web.util.mapper;
import org.apache.wicket.core.request.mapper.ResourceMapper;
import org.apache.wicket.request.IRequestHandler;
diff --git a/web/src/main/java/com/gitplex/server/web/mapper/MapperUtils.java b/web/src/main/java/com/gitplex/server/web/util/mapper/MapperUtils.java
similarity index 84%
rename from web/src/main/java/com/gitplex/server/web/mapper/MapperUtils.java
rename to web/src/main/java/com/gitplex/server/web/util/mapper/MapperUtils.java
index 34c8f3a286..11e164312b 100644
--- a/web/src/main/java/com/gitplex/server/web/mapper/MapperUtils.java
+++ b/web/src/main/java/com/gitplex/server/web/util/mapper/MapperUtils.java
@@ -1,13 +1,13 @@
-package com.gitplex.server.web.mapper;
+package com.gitplex.server.web.util.mapper;
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.request.Url;
-import com.gitplex.commons.util.StringUtils;
-import com.gitplex.server.core.util.validation.AccountNameValidator;
-import com.gitplex.server.core.util.validation.DepotNameValidator;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.util.validation.AccountNameValidator;
+import com.gitplex.server.util.validation.DepotNameValidator;
public class MapperUtils {
diff --git a/web/src/main/java/com/gitplex/server/web/mapper/UrlMapper.java b/web/src/main/java/com/gitplex/server/web/util/mapper/UrlMapper.java
similarity index 97%
rename from web/src/main/java/com/gitplex/server/web/mapper/UrlMapper.java
rename to web/src/main/java/com/gitplex/server/web/util/mapper/UrlMapper.java
index e9ecfbc9e7..4b83687c27 100644
--- a/web/src/main/java/com/gitplex/server/web/mapper/UrlMapper.java
+++ b/web/src/main/java/com/gitplex/server/web/util/mapper/UrlMapper.java
@@ -1,11 +1,10 @@
-package com.gitplex.server.web.mapper;
+package com.gitplex.server.web.util.mapper;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.mapper.CompoundRequestMapper;
-import com.gitplex.commons.wicket.NoVersionMountedMapper;
import com.gitplex.server.web.page.account.collaborators.AccountCollaboratorListPage;
import com.gitplex.server.web.page.account.collaborators.CollaboratorDepotListPage;
import com.gitplex.server.web.page.account.collaborators.CollaboratorEffectivePrivilegePage;
@@ -63,9 +62,10 @@ import com.gitplex.server.web.page.security.LoginPage;
import com.gitplex.server.web.page.security.LogoutPage;
import com.gitplex.server.web.page.security.RegisterPage;
import com.gitplex.server.web.page.test.TestPage;
-import com.gitplex.server.web.resource.ArchiveResourceReference;
-import com.gitplex.server.web.resource.AttachmentResourceReference;
-import com.gitplex.server.web.resource.BlobResourceReference;
+import com.gitplex.server.web.util.NoVersionMountedMapper;
+import com.gitplex.server.web.util.resource.ArchiveResourceReference;
+import com.gitplex.server.web.util.resource.AttachmentResourceReference;
+import com.gitplex.server.web.util.resource.BlobResourceReference;
public class UrlMapper extends CompoundRequestMapper {
diff --git a/web/src/main/java/com/gitplex/server/web/model/AffinalDepotsModel.java b/web/src/main/java/com/gitplex/server/web/util/model/AffinalDepotsModel.java
similarity index 84%
rename from web/src/main/java/com/gitplex/server/web/model/AffinalDepotsModel.java
rename to web/src/main/java/com/gitplex/server/web/util/model/AffinalDepotsModel.java
index bd830390b4..462249385c 100644
--- a/web/src/main/java/com/gitplex/server/web/model/AffinalDepotsModel.java
+++ b/web/src/main/java/com/gitplex/server/web/util/model/AffinalDepotsModel.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.model;
+package com.gitplex.server.web.util.model;
import java.util.ArrayList;
import java.util.Collection;
@@ -7,10 +7,10 @@ import java.util.List;
import org.apache.wicket.model.LoadableDetachableModel;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.security.SecurityUtils;
@SuppressWarnings("serial")
public class AffinalDepotsModel extends LoadableDetachableModel<Collection<Depot>> {
diff --git a/web/src/main/java/com/gitplex/server/web/model/CommitRefsModel.java b/web/src/main/java/com/gitplex/server/web/util/model/CommitRefsModel.java
similarity index 91%
rename from web/src/main/java/com/gitplex/server/web/model/CommitRefsModel.java
rename to web/src/main/java/com/gitplex/server/web/util/model/CommitRefsModel.java
index 0d7fa97689..2fc5bc16ce 100644
--- a/web/src/main/java/com/gitplex/server/web/model/CommitRefsModel.java
+++ b/web/src/main/java/com/gitplex/server/web/util/model/CommitRefsModel.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.model;
+package com.gitplex.server.web.util.model;
import java.util.ArrayList;
import java.util.HashMap;
@@ -10,8 +10,8 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
-import com.gitplex.commons.git.RefInfo;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.git.RefInfo;
public class CommitRefsModel extends LoadableDetachableModel<Map<String, List<String>>> {
diff --git a/web/src/main/java/com/gitplex/server/web/model/DepotModel.java b/web/src/main/java/com/gitplex/server/web/util/model/DepotModel.java
similarity index 72%
rename from web/src/main/java/com/gitplex/server/web/model/DepotModel.java
rename to web/src/main/java/com/gitplex/server/web/util/model/DepotModel.java
index c779f53055..1760b17d2b 100644
--- a/web/src/main/java/com/gitplex/server/web/model/DepotModel.java
+++ b/web/src/main/java/com/gitplex/server/web/util/model/DepotModel.java
@@ -1,6 +1,6 @@
-package com.gitplex.server.web.model;
+package com.gitplex.server.web.util.model;
-import com.gitplex.server.core.entity.Depot;
+import com.gitplex.server.entity.Depot;
/** Shortcut for {@link EntityModel}<Repository> */
public class DepotModel extends EntityModel<Depot> {
diff --git a/web/src/main/java/com/gitplex/server/web/model/EntityModel.java b/web/src/main/java/com/gitplex/server/web/util/model/EntityModel.java
similarity index 80%
rename from web/src/main/java/com/gitplex/server/web/model/EntityModel.java
rename to web/src/main/java/com/gitplex/server/web/util/model/EntityModel.java
index f55bae5f38..90f71458eb 100644
--- a/web/src/main/java/com/gitplex/server/web/model/EntityModel.java
+++ b/web/src/main/java/com/gitplex/server/web/util/model/EntityModel.java
@@ -1,13 +1,13 @@
-package com.gitplex.server.web.model;
+package com.gitplex.server.web.util.model;
import javax.annotation.Nullable;
import org.apache.wicket.model.LoadableDetachableModel;
-import com.gitplex.commons.hibernate.AbstractEntity;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.commons.util.ClassUtils;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.persistence.AbstractEntity;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.util.ClassUtils;
public class EntityModel<T extends AbstractEntity> extends LoadableDetachableModel<T> {
diff --git a/web/src/main/java/com/gitplex/server/web/model/ReviewersModel.java b/web/src/main/java/com/gitplex/server/web/util/model/ReviewersModel.java
similarity index 88%
rename from web/src/main/java/com/gitplex/server/web/model/ReviewersModel.java
rename to web/src/main/java/com/gitplex/server/web/util/model/ReviewersModel.java
index abb6fd02f0..fb15cbdad7 100644
--- a/web/src/main/java/com/gitplex/server/web/model/ReviewersModel.java
+++ b/web/src/main/java/com/gitplex/server/web/util/model/ReviewersModel.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.model;
+package com.gitplex.server.web.util.model;
import java.util.ArrayList;
import java.util.List;
@@ -6,8 +6,8 @@ import java.util.List;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
-import com.gitplex.server.core.entity.PullRequest;
-import com.gitplex.server.core.entity.PullRequestReviewInvitation;
+import com.gitplex.server.entity.PullRequest;
+import com.gitplex.server.entity.PullRequestReviewInvitation;
@SuppressWarnings("serial")
public class ReviewersModel extends LoadableDetachableModel<List<PullRequestReviewInvitation>>{
diff --git a/web/src/main/java/com/gitplex/server/web/model/UserModel.java b/web/src/main/java/com/gitplex/server/web/util/model/UserModel.java
similarity index 66%
rename from web/src/main/java/com/gitplex/server/web/model/UserModel.java
rename to web/src/main/java/com/gitplex/server/web/util/model/UserModel.java
index 0f6bafb838..ff155c2953 100644
--- a/web/src/main/java/com/gitplex/server/web/model/UserModel.java
+++ b/web/src/main/java/com/gitplex/server/web/util/model/UserModel.java
@@ -1,6 +1,6 @@
-package com.gitplex.server.web.model;
+package com.gitplex.server.web.util.model;
-import com.gitplex.server.core.entity.Account;
+import com.gitplex.server.entity.Account;
public class UserModel extends EntityModel<Account> {
diff --git a/web/src/main/java/com/gitplex/server/web/resource/ArchiveResource.java b/web/src/main/java/com/gitplex/server/web/util/resource/ArchiveResource.java
similarity index 94%
rename from web/src/main/java/com/gitplex/server/web/resource/ArchiveResource.java
rename to web/src/main/java/com/gitplex/server/web/util/resource/ArchiveResource.java
index 6835ed1457..67e28b6b1c 100644
--- a/web/src/main/java/com/gitplex/server/web/resource/ArchiveResource.java
+++ b/web/src/main/java/com/gitplex/server/web/util/resource/ArchiveResource.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.resource;
+package com.gitplex.server.web.util.resource;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -18,10 +18,10 @@ import org.eclipse.jgit.archive.TgzFormat;
import org.eclipse.jgit.archive.ZipFormat;
import org.eclipse.jgit.lib.Constants;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.security.SecurityUtils;
import com.google.common.base.Charsets;
import com.google.common.base.Preconditions;
diff --git a/web/src/main/java/com/gitplex/server/web/resource/ArchiveResourceReference.java b/web/src/main/java/com/gitplex/server/web/util/resource/ArchiveResourceReference.java
similarity index 89%
rename from web/src/main/java/com/gitplex/server/web/resource/ArchiveResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/util/resource/ArchiveResourceReference.java
index b660605535..769afe272e 100644
--- a/web/src/main/java/com/gitplex/server/web/resource/ArchiveResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/util/resource/ArchiveResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.resource;
+package com.gitplex.server.web.util.resource;
import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.request.resource.ResourceReference;
diff --git a/web/src/main/java/com/gitplex/server/web/resource/AttachmentResource.java b/web/src/main/java/com/gitplex/server/web/util/resource/AttachmentResource.java
similarity index 92%
rename from web/src/main/java/com/gitplex/server/web/resource/AttachmentResource.java
rename to web/src/main/java/com/gitplex/server/web/util/resource/AttachmentResource.java
index 9e72587ff0..14317e6267 100644
--- a/web/src/main/java/com/gitplex/server/web/resource/AttachmentResource.java
+++ b/web/src/main/java/com/gitplex/server/web/util/resource/AttachmentResource.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.resource;
+package com.gitplex.server.web.util.resource;
import java.io.File;
import java.io.FileInputStream;
@@ -17,11 +17,11 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.AbstractResource;
import org.eclipse.jgit.lib.Constants;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.AttachmentManager;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.security.SecurityUtils;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.manager.AttachmentManager;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.security.SecurityUtils;
import com.google.common.base.Charsets;
import com.google.common.base.Preconditions;
diff --git a/web/src/main/java/com/gitplex/server/web/resource/AttachmentResourceReference.java b/web/src/main/java/com/gitplex/server/web/util/resource/AttachmentResourceReference.java
similarity index 89%
rename from web/src/main/java/com/gitplex/server/web/resource/AttachmentResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/util/resource/AttachmentResourceReference.java
index 73a967ea2d..013584c170 100644
--- a/web/src/main/java/com/gitplex/server/web/resource/AttachmentResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/util/resource/AttachmentResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.resource;
+package com.gitplex.server.web.util.resource;
import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.request.resource.ResourceReference;
diff --git a/web/src/main/java/com/gitplex/server/web/resource/BlobResource.java b/web/src/main/java/com/gitplex/server/web/util/resource/BlobResource.java
similarity index 90%
rename from web/src/main/java/com/gitplex/server/web/resource/BlobResource.java
rename to web/src/main/java/com/gitplex/server/web/util/resource/BlobResource.java
index dfb6eb6849..781489d0cf 100644
--- a/web/src/main/java/com/gitplex/server/web/resource/BlobResource.java
+++ b/web/src/main/java/com/gitplex/server/web/util/resource/BlobResource.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.resource;
+package com.gitplex.server.web.util.resource;
import java.io.IOException;
import java.io.InputStream;
@@ -14,15 +14,15 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.AbstractResource;
import org.eclipse.jgit.lib.Constants;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.entity.Depot;
+import com.gitplex.server.git.Blob;
+import com.gitplex.server.git.BlobIdent;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.manager.DepotManager;
+import com.gitplex.server.security.SecurityUtils;
import com.google.common.base.Charsets;
import com.google.common.base.Preconditions;
-import com.gitplex.commons.git.Blob;
-import com.gitplex.commons.git.BlobIdent;
-import com.gitplex.commons.git.GitUtils;
-import com.gitplex.server.core.GitPlex;
-import com.gitplex.server.core.entity.Depot;
-import com.gitplex.server.core.manager.DepotManager;
-import com.gitplex.server.core.security.SecurityUtils;
public class BlobResource extends AbstractResource {
diff --git a/web/src/main/java/com/gitplex/server/web/resource/BlobResourceReference.java b/web/src/main/java/com/gitplex/server/web/util/resource/BlobResourceReference.java
similarity index 88%
rename from web/src/main/java/com/gitplex/server/web/resource/BlobResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/util/resource/BlobResourceReference.java
index 2c04de373a..dbd0a236e8 100644
--- a/web/src/main/java/com/gitplex/server/web/resource/BlobResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/util/resource/BlobResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.resource;
+package com.gitplex.server.web.util.resource;
import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.request.resource.ResourceReference;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/resourcebundle/BundleAwareResourceReferenceFactory.java b/web/src/main/java/com/gitplex/server/web/util/resourcebundle/BundleAwareResourceReferenceFactory.java
similarity index 98%
rename from wicket/src/main/java/com/gitplex/commons/wicket/resourcebundle/BundleAwareResourceReferenceFactory.java
rename to web/src/main/java/com/gitplex/server/web/util/resourcebundle/BundleAwareResourceReferenceFactory.java
index a546e3a03e..b7a4004d1d 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/resourcebundle/BundleAwareResourceReferenceFactory.java
+++ b/web/src/main/java/com/gitplex/server/web/util/resourcebundle/BundleAwareResourceReferenceFactory.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.resourcebundle;
+package com.gitplex.server.web.util.resourcebundle;
import java.nio.file.Path;
import java.nio.file.Paths;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/resourcebundle/BundleInfo.java b/web/src/main/java/com/gitplex/server/web/util/resourcebundle/BundleInfo.java
similarity index 90%
rename from wicket/src/main/java/com/gitplex/commons/wicket/resourcebundle/BundleInfo.java
rename to web/src/main/java/com/gitplex/server/web/util/resourcebundle/BundleInfo.java
index 0f4ede2cc3..d03549242e 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/resourcebundle/BundleInfo.java
+++ b/web/src/main/java/com/gitplex/server/web/util/resourcebundle/BundleInfo.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.resourcebundle;
+package com.gitplex.server.web.util.resourcebundle;
import org.apache.wicket.request.resource.ResourceReference;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/resourcebundle/PackageResourceBundler.java b/web/src/main/java/com/gitplex/server/web/util/resourcebundle/PackageResourceBundler.java
similarity index 97%
rename from wicket/src/main/java/com/gitplex/commons/wicket/resourcebundle/PackageResourceBundler.java
rename to web/src/main/java/com/gitplex/server/web/util/resourcebundle/PackageResourceBundler.java
index 945ba70ede..be6dcc0102 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/resourcebundle/PackageResourceBundler.java
+++ b/web/src/main/java/com/gitplex/server/web/util/resourcebundle/PackageResourceBundler.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.resourcebundle;
+package com.gitplex.server.web.util.resourcebundle;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
@@ -20,9 +20,9 @@ import org.apache.wicket.request.resource.IResourceReferenceFactory;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
-import com.gitplex.calla.loader.LoaderUtils;
-import com.gitplex.commons.util.DependencyAware;
-import com.gitplex.commons.util.DependencyUtils;
+import com.gitplex.launcher.loader.LoaderUtils;
+import com.gitplex.server.util.DependencyAware;
+import com.gitplex.server.util.DependencyUtils;
public class PackageResourceBundler {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/resourcebundle/ResourceBundle.java b/web/src/main/java/com/gitplex/server/web/util/resourcebundle/ResourceBundle.java
similarity index 83%
rename from wicket/src/main/java/com/gitplex/commons/wicket/resourcebundle/ResourceBundle.java
rename to web/src/main/java/com/gitplex/server/web/util/resourcebundle/ResourceBundle.java
index 1e1d995905..29cdba598c 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/resourcebundle/ResourceBundle.java
+++ b/web/src/main/java/com/gitplex/server/web/util/resourcebundle/ResourceBundle.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.resourcebundle;
+package com.gitplex.server.web.util.resourcebundle;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/web/src/main/java/com/gitplex/server/web/websocket/CodeCommentChangeBroadcaster.java b/web/src/main/java/com/gitplex/server/web/websocket/CodeCommentChangeBroadcaster.java
index d8aa99152f..b3ac1d604a 100644
--- a/web/src/main/java/com/gitplex/server/web/websocket/CodeCommentChangeBroadcaster.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/CodeCommentChangeBroadcaster.java
@@ -3,11 +3,11 @@ package com.gitplex.server.web.websocket;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.commons.wicket.WicketUtils;
-import com.gitplex.commons.wicket.websocket.PageKey;
-import com.gitplex.commons.wicket.websocket.WebSocketManager;
-import com.gitplex.server.core.event.codecomment.CodeCommentEvent;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.server.event.codecomment.CodeCommentEvent;
+import com.gitplex.server.web.util.WicketUtils;
+import com.gitplex.server.web.websocket.PageKey;
+import com.gitplex.server.web.websocket.WebSocketManager;
@Singleton
public class CodeCommentChangeBroadcaster {
diff --git a/web/src/main/java/com/gitplex/server/web/websocket/CodeCommentChangedRegion.java b/web/src/main/java/com/gitplex/server/web/websocket/CodeCommentChangedRegion.java
index 3402566168..2de980ee51 100644
--- a/web/src/main/java/com/gitplex/server/web/websocket/CodeCommentChangedRegion.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/CodeCommentChangedRegion.java
@@ -1,6 +1,6 @@
package com.gitplex.server.web.websocket;
-import com.gitplex.commons.wicket.websocket.WebSocketRegion;
+import com.gitplex.server.web.websocket.WebSocketRegion;
public class CodeCommentChangedRegion implements WebSocketRegion {
diff --git a/web/src/main/java/com/gitplex/server/web/websocket/CommitIndexedBroadcaster.java b/web/src/main/java/com/gitplex/server/web/websocket/CommitIndexedBroadcaster.java
index e17d402ca7..33aa7507a4 100644
--- a/web/src/main/java/com/gitplex/server/web/websocket/CommitIndexedBroadcaster.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/CommitIndexedBroadcaster.java
@@ -3,9 +3,9 @@ package com.gitplex.server.web.websocket;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.commons.wicket.websocket.WebSocketManager;
+import com.gitplex.launcher.loader.Listen;
import com.gitplex.server.search.CommitIndexed;
+import com.gitplex.server.web.websocket.WebSocketManager;
@Singleton
public class CommitIndexedBroadcaster {
diff --git a/web/src/main/java/com/gitplex/server/web/websocket/CommitIndexedRegion.java b/web/src/main/java/com/gitplex/server/web/websocket/CommitIndexedRegion.java
index d682842228..fe2cad7fed 100644
--- a/web/src/main/java/com/gitplex/server/web/websocket/CommitIndexedRegion.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/CommitIndexedRegion.java
@@ -2,7 +2,7 @@ package com.gitplex.server.web.websocket;
import org.eclipse.jgit.lib.ObjectId;
-import com.gitplex.commons.wicket.websocket.WebSocketRegion;
+import com.gitplex.server.web.websocket.WebSocketRegion;
public class CommitIndexedRegion implements WebSocketRegion {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/websocket/CompositeRegion.java b/web/src/main/java/com/gitplex/server/web/websocket/CompositeRegion.java
similarity index 94%
rename from wicket/src/main/java/com/gitplex/commons/wicket/websocket/CompositeRegion.java
rename to web/src/main/java/com/gitplex/server/web/websocket/CompositeRegion.java
index 2a4d5f4d93..14e220abe6 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/websocket/CompositeRegion.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/CompositeRegion.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.websocket;
+package com.gitplex.server.web.websocket;
import java.util.Collection;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/websocket/DefaultWebSocketManager.java b/web/src/main/java/com/gitplex/server/web/websocket/DefaultWebSocketManager.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/websocket/DefaultWebSocketManager.java
rename to web/src/main/java/com/gitplex/server/web/websocket/DefaultWebSocketManager.java
index 8cf844e5f6..2600ed52c6 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/websocket/DefaultWebSocketManager.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/DefaultWebSocketManager.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.websocket;
+package com.gitplex.server.web.websocket;
import java.io.IOException;
import java.util.Collection;
@@ -21,9 +21,9 @@ import org.apache.wicket.protocol.ws.api.registry.SimpleWebSocketConnectionRegis
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.hibernate.resource.transaction.spi.TransactionStatus;
-import com.gitplex.commons.hibernate.Sessional;
-import com.gitplex.commons.hibernate.dao.Dao;
-import com.gitplex.commons.wicket.page.CommonPage;
+import com.gitplex.server.persistence.annotation.Sessional;
+import com.gitplex.server.persistence.dao.Dao;
+import com.gitplex.server.web.page.CommonPage;
@Singleton
public class DefaultWebSocketManager implements WebSocketManager {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/websocket/PageKey.java b/web/src/main/java/com/gitplex/server/web/websocket/PageKey.java
similarity index 95%
rename from wicket/src/main/java/com/gitplex/commons/wicket/websocket/PageKey.java
rename to web/src/main/java/com/gitplex/server/web/websocket/PageKey.java
index c6f3f4c068..8d08c4f46a 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/websocket/PageKey.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/PageKey.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.websocket;
+package com.gitplex.server.web.websocket;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/web/src/main/java/com/gitplex/server/web/websocket/PullRequestChangeBroadcaster.java b/web/src/main/java/com/gitplex/server/web/websocket/PullRequestChangeBroadcaster.java
index ae1d8cbdf3..a41f6845df 100644
--- a/web/src/main/java/com/gitplex/server/web/websocket/PullRequestChangeBroadcaster.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/PullRequestChangeBroadcaster.java
@@ -3,11 +3,11 @@ package com.gitplex.server.web.websocket;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.commons.wicket.WicketUtils;
-import com.gitplex.commons.wicket.websocket.PageKey;
-import com.gitplex.commons.wicket.websocket.WebSocketManager;
-import com.gitplex.server.core.event.pullrequest.PullRequestChangeEvent;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.server.event.pullrequest.PullRequestChangeEvent;
+import com.gitplex.server.web.util.WicketUtils;
+import com.gitplex.server.web.websocket.PageKey;
+import com.gitplex.server.web.websocket.WebSocketManager;
@Singleton
public class PullRequestChangeBroadcaster {
diff --git a/web/src/main/java/com/gitplex/server/web/websocket/PullRequestChanged.java b/web/src/main/java/com/gitplex/server/web/websocket/PullRequestChanged.java
index dba4c03110..0a97a1792e 100644
--- a/web/src/main/java/com/gitplex/server/web/websocket/PullRequestChanged.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/PullRequestChanged.java
@@ -2,7 +2,7 @@ package com.gitplex.server.web.websocket;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import com.gitplex.commons.wicket.AjaxEvent;
+import com.gitplex.server.web.util.AjaxEvent;
public class PullRequestChanged extends AjaxEvent {
diff --git a/web/src/main/java/com/gitplex/server/web/websocket/PullRequestChangedRegion.java b/web/src/main/java/com/gitplex/server/web/websocket/PullRequestChangedRegion.java
index 3ebdef890c..8253cf7f5a 100644
--- a/web/src/main/java/com/gitplex/server/web/websocket/PullRequestChangedRegion.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/PullRequestChangedRegion.java
@@ -1,6 +1,6 @@
package com.gitplex.server.web.websocket;
-import com.gitplex.commons.wicket.websocket.WebSocketRegion;
+import com.gitplex.server.web.websocket.WebSocketRegion;
public class PullRequestChangedRegion implements WebSocketRegion {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/websocket/RecentRenderRequest.java b/web/src/main/java/com/gitplex/server/web/websocket/RecentRenderRequest.java
similarity index 91%
rename from wicket/src/main/java/com/gitplex/commons/wicket/websocket/RecentRenderRequest.java
rename to web/src/main/java/com/gitplex/server/web/websocket/RecentRenderRequest.java
index b8bdb5b435..f58081cd6a 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/websocket/RecentRenderRequest.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/RecentRenderRequest.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.websocket;
+package com.gitplex.server.web.websocket;
import java.util.Date;
diff --git a/web/src/main/java/com/gitplex/server/web/websocket/TaskChangeBroadcaster.java b/web/src/main/java/com/gitplex/server/web/websocket/TaskChangeBroadcaster.java
index a1ea85e294..7b01f518f2 100644
--- a/web/src/main/java/com/gitplex/server/web/websocket/TaskChangeBroadcaster.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/TaskChangeBroadcaster.java
@@ -3,9 +3,9 @@ package com.gitplex.server.web.websocket;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.gitplex.calla.loader.Listen;
-import com.gitplex.commons.wicket.websocket.WebSocketManager;
-import com.gitplex.server.core.event.TaskChangeEvent;
+import com.gitplex.launcher.loader.Listen;
+import com.gitplex.server.event.TaskChangeEvent;
+import com.gitplex.server.web.websocket.WebSocketManager;
@Singleton
public class TaskChangeBroadcaster {
diff --git a/web/src/main/java/com/gitplex/server/web/websocket/TaskChangedRegion.java b/web/src/main/java/com/gitplex/server/web/websocket/TaskChangedRegion.java
index 6fe9430d37..a0aa344223 100644
--- a/web/src/main/java/com/gitplex/server/web/websocket/TaskChangedRegion.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/TaskChangedRegion.java
@@ -1,6 +1,6 @@
package com.gitplex.server.web.websocket;
-import com.gitplex.commons.wicket.websocket.WebSocketRegion;
+import com.gitplex.server.web.websocket.WebSocketRegion;
public class TaskChangedRegion implements WebSocketRegion {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/websocket/WebSocketConnection.java b/web/src/main/java/com/gitplex/server/web/websocket/WebSocketConnection.java
similarity index 98%
rename from wicket/src/main/java/com/gitplex/commons/wicket/websocket/WebSocketConnection.java
rename to web/src/main/java/com/gitplex/server/web/websocket/WebSocketConnection.java
index a866b941fa..363127798f 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/websocket/WebSocketConnection.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/WebSocketConnection.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.gitplex.commons.wicket.websocket;
+package com.gitplex.server.web.websocket;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/websocket/WebSocketFilter.java b/web/src/main/java/com/gitplex/server/web/websocket/WebSocketFilter.java
similarity index 98%
rename from wicket/src/main/java/com/gitplex/commons/wicket/websocket/WebSocketFilter.java
rename to web/src/main/java/com/gitplex/server/web/websocket/WebSocketFilter.java
index b9c1d99f1b..42a50bd374 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/websocket/WebSocketFilter.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/WebSocketFilter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.gitplex.commons.wicket.websocket;
+package com.gitplex.server.web.websocket;
import java.io.IOException;
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/websocket/WebSocketManager.java b/web/src/main/java/com/gitplex/server/web/websocket/WebSocketManager.java
similarity index 83%
rename from wicket/src/main/java/com/gitplex/commons/wicket/websocket/WebSocketManager.java
rename to web/src/main/java/com/gitplex/server/web/websocket/WebSocketManager.java
index 0dcb132a34..49e024a07d 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/websocket/WebSocketManager.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/WebSocketManager.java
@@ -1,8 +1,8 @@
-package com.gitplex.commons.wicket.websocket;
+package com.gitplex.server.web.websocket;
import javax.annotation.Nullable;
-import com.gitplex.commons.wicket.page.CommonPage;
+import com.gitplex.server.web.page.CommonPage;
public interface WebSocketManager {
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/websocket/WebSocketProcessor.java b/web/src/main/java/com/gitplex/server/web/websocket/WebSocketProcessor.java
similarity index 96%
rename from wicket/src/main/java/com/gitplex/commons/wicket/websocket/WebSocketProcessor.java
rename to web/src/main/java/com/gitplex/server/web/websocket/WebSocketProcessor.java
index e9c77c1359..90d1df77e7 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/websocket/WebSocketProcessor.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/WebSocketProcessor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.gitplex.commons.wicket.websocket;
+package com.gitplex.server.web.websocket;
import org.apache.shiro.subject.Subject;
import org.apache.shiro.util.ThreadContext;
@@ -27,8 +27,8 @@ import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.hibernate.UnitOfWork;
-import com.gitplex.calla.loader.AppLoader;
+import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.persistence.UnitOfWork;
/**
* An {@link org.apache.wicket.protocol.ws.api.IWebSocketProcessor processor} that integrates with
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/websocket/WebSocketRegion.java b/web/src/main/java/com/gitplex/server/web/websocket/WebSocketRegion.java
similarity index 63%
rename from wicket/src/main/java/com/gitplex/commons/wicket/websocket/WebSocketRegion.java
rename to web/src/main/java/com/gitplex/server/web/websocket/WebSocketRegion.java
index b5a510e0d3..4951b54c37 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/websocket/WebSocketRegion.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/WebSocketRegion.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.websocket;
+package com.gitplex.server.web.websocket;
public interface WebSocketRegion {
boolean contains(WebSocketRegion region);
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/websocket/WebSocketRenderBehavior.java b/web/src/main/java/com/gitplex/server/web/websocket/WebSocketRenderBehavior.java
similarity index 98%
rename from wicket/src/main/java/com/gitplex/commons/wicket/websocket/WebSocketRenderBehavior.java
rename to web/src/main/java/com/gitplex/server/web/websocket/WebSocketRenderBehavior.java
index 08b3bec13a..a81e2ccc42 100644
--- a/wicket/src/main/java/com/gitplex/commons/wicket/websocket/WebSocketRenderBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/WebSocketRenderBehavior.java
@@ -1,4 +1,4 @@
-package com.gitplex.commons.wicket.websocket;
+package com.gitplex.server.web.websocket;
import org.apache.wicket.Component;
import org.apache.wicket.protocol.ws.api.WebSocketBehavior;
diff --git a/wicket/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/references/DatetimePickerCssReference.java b/web/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/references/DatetimePickerCssReference.java
similarity index 100%
rename from wicket/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/references/DatetimePickerCssReference.java
rename to web/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/references/DatetimePickerCssReference.java
diff --git a/wicket/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/references/DatetimePickerJsReference.java b/web/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/references/DatetimePickerJsReference.java
similarity index 100%
rename from wicket/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/references/DatetimePickerJsReference.java
rename to web/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/references/DatetimePickerJsReference.java
diff --git a/wicket/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/references/bootstrap-datetimepicker.min.css b/web/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/references/bootstrap-datetimepicker.min.css
similarity index 100%
rename from wicket/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/references/bootstrap-datetimepicker.min.css
rename to web/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/references/bootstrap-datetimepicker.min.css
diff --git a/wicket/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/references/bootstrap-datetimepicker.min.js b/web/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/references/bootstrap-datetimepicker.min.js
similarity index 100%
rename from wicket/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/references/bootstrap-datetimepicker.min.js
rename to web/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/references/bootstrap-datetimepicker.min.js
diff --git a/wicket/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.html b/web/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.html
similarity index 100%
rename from wicket/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.html
rename to web/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.html
diff --git a/wicket/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java b/web/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
similarity index 99%
rename from wicket/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
rename to web/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
index 7f763e499e..68f2f34d32 100644
--- a/wicket/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
+++ b/web/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
@@ -65,7 +65,7 @@ import org.apache.wicket.util.string.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitplex.commons.wicket.websocket.WebSocketManager;
+import com.gitplex.server.web.websocket.WebSocketManager;
/**
* The base implementation of IWebSocketProcessor. Provides the common logic
diff --git a/wicket/src/main/java/org/apache/wicket/protocol/ws/api/ServletRequestCopy.java b/web/src/main/java/org/apache/wicket/protocol/ws/api/ServletRequestCopy.java
similarity index 100%
rename from wicket/src/main/java/org/apache/wicket/protocol/ws/api/ServletRequestCopy.java
rename to web/src/main/java/org/apache/wicket/protocol/ws/api/ServletRequestCopy.java
diff --git a/wicket/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java b/web/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java
similarity index 100%
rename from wicket/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java
rename to web/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java
diff --git a/wicket/src/test/java/com/gitplex/commons/wicket/util/PackageResourceBundlerTest.java b/web/src/test/java/com/gitplex/commons/wicket/util/PackageResourceBundlerTest.java
similarity index 97%
rename from wicket/src/test/java/com/gitplex/commons/wicket/util/PackageResourceBundlerTest.java
rename to web/src/test/java/com/gitplex/commons/wicket/util/PackageResourceBundlerTest.java
index 47cff2313e..d13bb5cb6b 100644
--- a/wicket/src/test/java/com/gitplex/commons/wicket/util/PackageResourceBundlerTest.java
+++ b/web/src/test/java/com/gitplex/commons/wicket/util/PackageResourceBundlerTest.java
@@ -5,7 +5,6 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.junit.Assert;
import org.junit.Test;
-import com.gitplex.commons.wicket.resourcebundle.PackageResourceBundler;
import com.gitplex.commons.wicket.util.testdata.a.Js1ResourceReferenceA;
import com.gitplex.commons.wicket.util.testdata.a.Js2ResourceReferenceA;
import com.gitplex.commons.wicket.util.testdata.a.Js3ResourceReferenceA;
@@ -16,6 +15,7 @@ import com.gitplex.commons.wicket.util.testdata.c.Js1ResourceReferenceC;
import com.gitplex.commons.wicket.util.testdata.c.Js2ResourceReferenceC;
import com.gitplex.commons.wicket.util.testdata.c.Js3ResourceReferenceC;
import com.gitplex.commons.wicket.util.testdata.c.Js4ResourceReferenceC;
+import com.gitplex.server.web.util.resourcebundle.PackageResourceBundler;
public class PackageResourceBundlerTest {
diff --git a/wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/a/Js1ResourceReferenceA.java b/web/src/test/java/com/gitplex/commons/wicket/util/testdata/a/Js1ResourceReferenceA.java
similarity index 100%
rename from wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/a/Js1ResourceReferenceA.java
rename to web/src/test/java/com/gitplex/commons/wicket/util/testdata/a/Js1ResourceReferenceA.java
diff --git a/wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/a/Js2ResourceReferenceA.java b/web/src/test/java/com/gitplex/commons/wicket/util/testdata/a/Js2ResourceReferenceA.java
similarity index 100%
rename from wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/a/Js2ResourceReferenceA.java
rename to web/src/test/java/com/gitplex/commons/wicket/util/testdata/a/Js2ResourceReferenceA.java
diff --git a/wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/a/Js3ResourceReferenceA.java b/web/src/test/java/com/gitplex/commons/wicket/util/testdata/a/Js3ResourceReferenceA.java
similarity index 100%
rename from wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/a/Js3ResourceReferenceA.java
rename to web/src/test/java/com/gitplex/commons/wicket/util/testdata/a/Js3ResourceReferenceA.java
diff --git a/wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/b/Js1ResourceReferenceB.java b/web/src/test/java/com/gitplex/commons/wicket/util/testdata/b/Js1ResourceReferenceB.java
similarity index 84%
rename from wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/b/Js1ResourceReferenceB.java
rename to web/src/test/java/com/gitplex/commons/wicket/util/testdata/b/Js1ResourceReferenceB.java
index 83f97d7e86..3083560c0b 100644
--- a/wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/b/Js1ResourceReferenceB.java
+++ b/web/src/test/java/com/gitplex/commons/wicket/util/testdata/b/Js1ResourceReferenceB.java
@@ -2,7 +2,7 @@ package com.gitplex.commons.wicket.util.testdata.b;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
-import com.gitplex.commons.wicket.resourcebundle.ResourceBundle;
+import com.gitplex.server.web.util.resourcebundle.ResourceBundle;
@ResourceBundle
public class Js1ResourceReferenceB extends JavaScriptResourceReference {
diff --git a/wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/b/Js2ResourceReferenceB.java b/web/src/test/java/com/gitplex/commons/wicket/util/testdata/b/Js2ResourceReferenceB.java
similarity index 100%
rename from wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/b/Js2ResourceReferenceB.java
rename to web/src/test/java/com/gitplex/commons/wicket/util/testdata/b/Js2ResourceReferenceB.java
diff --git a/wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/b/Js3ResourceReferenceB.java b/web/src/test/java/com/gitplex/commons/wicket/util/testdata/b/Js3ResourceReferenceB.java
similarity index 91%
rename from wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/b/Js3ResourceReferenceB.java
rename to web/src/test/java/com/gitplex/commons/wicket/util/testdata/b/Js3ResourceReferenceB.java
index 4a9e9a3a99..c47cef8d13 100644
--- a/wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/b/Js3ResourceReferenceB.java
+++ b/web/src/test/java/com/gitplex/commons/wicket/util/testdata/b/Js3ResourceReferenceB.java
@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
-import com.gitplex.commons.wicket.resourcebundle.ResourceBundle;
+import com.gitplex.server.web.util.resourcebundle.ResourceBundle;
@ResourceBundle
public class Js3ResourceReferenceB extends JavaScriptResourceReference {
diff --git a/wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/c/Js1ResourceReferenceC.java b/web/src/test/java/com/gitplex/commons/wicket/util/testdata/c/Js1ResourceReferenceC.java
similarity index 100%
rename from wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/c/Js1ResourceReferenceC.java
rename to web/src/test/java/com/gitplex/commons/wicket/util/testdata/c/Js1ResourceReferenceC.java
diff --git a/wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/c/Js2ResourceReferenceC.java b/web/src/test/java/com/gitplex/commons/wicket/util/testdata/c/Js2ResourceReferenceC.java
similarity index 93%
rename from wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/c/Js2ResourceReferenceC.java
rename to web/src/test/java/com/gitplex/commons/wicket/util/testdata/c/Js2ResourceReferenceC.java
index 0565764fba..a97872c6bd 100644
--- a/wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/c/Js2ResourceReferenceC.java
+++ b/web/src/test/java/com/gitplex/commons/wicket/util/testdata/c/Js2ResourceReferenceC.java
@@ -9,7 +9,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
-import com.gitplex.commons.wicket.resourcebundle.ResourceBundle;
+import com.gitplex.server.web.util.resourcebundle.ResourceBundle;
@ResourceBundle
public class Js2ResourceReferenceC extends JavaScriptResourceReference {
diff --git a/wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/c/Js3ResourceReferenceC.java b/web/src/test/java/com/gitplex/commons/wicket/util/testdata/c/Js3ResourceReferenceC.java
similarity index 100%
rename from wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/c/Js3ResourceReferenceC.java
rename to web/src/test/java/com/gitplex/commons/wicket/util/testdata/c/Js3ResourceReferenceC.java
diff --git a/wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/c/Js4ResourceReferenceC.java b/web/src/test/java/com/gitplex/commons/wicket/util/testdata/c/Js4ResourceReferenceC.java
similarity index 93%
rename from wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/c/Js4ResourceReferenceC.java
rename to web/src/test/java/com/gitplex/commons/wicket/util/testdata/c/Js4ResourceReferenceC.java
index fa6ba0bf15..0e435dc783 100644
--- a/wicket/src/test/java/com/gitplex/commons/wicket/util/testdata/c/Js4ResourceReferenceC.java
+++ b/web/src/test/java/com/gitplex/commons/wicket/util/testdata/c/Js4ResourceReferenceC.java
@@ -9,7 +9,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
-import com.gitplex.commons.wicket.resourcebundle.ResourceBundle;
+import com.gitplex.server.web.util.resourcebundle.ResourceBundle;
@ResourceBundle
public class Js4ResourceReferenceC extends JavaScriptResourceReference {
diff --git a/wicket/pom.xml b/wicket/pom.xml
deleted file mode 100644
index d869c84648..0000000000
--- a/wicket/pom.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.gitplex</groupId>
- <artifactId>server-parent</artifactId>
- <version>1.0-EAP-build26</version>
- <relativePath>../parent</relativePath>
- </parent>
- <artifactId>server-wicket</artifactId>
- <build>
- <plugins>
- <plugin>
- <groupId>com.gitplex</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- <version>${wicketVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-extensions</artifactId>
- <version>${wicketVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-request</artifactId>
- <version>${wicketVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- <version>${wicketVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-devutils</artifactId>
- <version>${wicketVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-native-websocket-core</artifactId>
- <version>${wicketVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>font-awesome</artifactId>
- <version>4.5.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.webjars</groupId>
- <artifactId>bootstrap</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>de.agilecoders.wicket</groupId>
- <artifactId>wicket-bootstrap-core</artifactId>
- <version>${wicketBootstrapVersion}</version>
- </dependency>
- <dependency>
- <groupId>de.agilecoders.wicket</groupId>
- <artifactId>wicket-bootstrap-extensions</artifactId>
- <version>${wicketBootstrapVersion}</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-validation</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-shiro</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-jetty</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-hibernate</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-markdown</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- <dependency>
- <groupId>com.gitplex</groupId>
- <artifactId>server-antlr</artifactId>
- <version>1.0-EAP-build26</version>
- </dependency>
- <dependency>
- <groupId>org.webjars.npm</groupId>
- <artifactId>codemirror</artifactId>
- <version>5.21.0</version>
- </dependency>
- </dependencies>
- <properties>
- <moduleClass>com.gitplex.commons.wicket.WicketModule</moduleClass>
- <wicketVersion>7.3.0</wicketVersion>
- <wicketBootstrapVersion>0.10.6</wicketBootstrapVersion>
- </properties>
-</project>
\ No newline at end of file
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/AbstractWicketConfig.java b/wicket/src/main/java/com/gitplex/commons/wicket/AbstractWicketConfig.java
deleted file mode 100644
index 33a9a2964c..0000000000
--- a/wicket/src/main/java/com/gitplex/commons/wicket/AbstractWicketConfig.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.gitplex.commons.wicket;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.wicket.Application;
-import org.apache.wicket.Component;
-import org.apache.wicket.DefaultExceptionMapper;
-import org.apache.wicket.Page;
-import org.apache.wicket.RuntimeConfigurationType;
-import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.AjaxRequestTarget.IJavaScriptResponse;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.application.IComponentInstantiationListener;
-import org.apache.wicket.core.request.handler.PageProvider;
-import org.apache.wicket.core.request.mapper.HomePageMapper;
-import org.apache.wicket.markup.html.pages.AbstractErrorPage;
-import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.ws.WebSocketSettings;
-import org.apache.wicket.protocol.ws.api.IWebSocketConnection;
-import org.apache.wicket.protocol.ws.api.WebSocketResponse;
-import org.apache.wicket.request.IExceptionMapper;
-import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.Url;
-import org.apache.wicket.request.http.WebResponse;
-import org.apache.wicket.request.mapper.info.PageComponentInfo;
-import org.apache.wicket.util.IProvider;
-
-import com.gitplex.calla.bootstrap.Bootstrap;
-import com.gitplex.calla.loader.AppLoader;
-import com.gitplex.commons.wicket.page.CommonPage;
-import com.gitplex.commons.wicket.resourcebundle.PackageResourceBundler;
-import com.gitplex.commons.wicket.websocket.WebSocketManager;
-
-import de.agilecoders.wicket.core.settings.BootstrapSettings;
-
-public abstract class AbstractWicketConfig extends WebApplication {
-
- @Override
- public RuntimeConfigurationType getConfigurationType() {
- if (Bootstrap.sandboxMode && !Bootstrap.prodMode)
- return RuntimeConfigurationType.DEVELOPMENT;
- else
- return RuntimeConfigurationType.DEPLOYMENT;
- }
-
- @Override
- protected void init() {
- super.init();
-
- getMarkupSettings().setDefaultMarkupEncoding("UTF-8");
- getMarkupSettings().setStripComments(true);
- getMarkupSettings().setStripWicketTags(true);
-
- getStoreSettings().setFileStoreFolder(Bootstrap.getTempDir());
-
- BootstrapSettings bootstrapSettings = new BootstrapSettings();
- bootstrapSettings.setAutoAppendResources(false);
- de.agilecoders.wicket.core.Bootstrap.install(this, bootstrapSettings);
-
- getComponentInstantiationListeners().add(new IComponentInstantiationListener() {
-
- @Override
- public void onInstantiation(Component component) {
- if ((component instanceof Page)
- && !(component instanceof AbstractErrorPage)
- && !(component instanceof CommonPage)) {
- throw new RuntimeException("All page classes should extend from CommonPage.");
- }
- }
- });
-
- getAjaxRequestTargetListeners().add(new AjaxRequestTarget.IListener() {
-
- @Override
- public void onBeforeRespond(Map<String, Component> map, AjaxRequestTarget target) {
- CommonPage page = (CommonPage) target.getPage();
- if (page.getSessionFeedback().anyMessage())
- target.add(page.getSessionFeedback());
-
- for (Component component: map.values()) {
- target.appendJavaScript((String.format("$(document).trigger('elementReplaced', '%s');", component.getMarkupId())));
- }
- }
-
- @Override
- public void onAfterRespond(Map<String, Component> map, IJavaScriptResponse response) {
- }
-
- @Override
- public void updateAjaxAttributes(AbstractDefaultAjaxBehavior behavior, AjaxRequestAttributes attributes) {
- }
-
- });
-
- WebSocketSettings.Holder.set(this, new WebSocketSettings() {
-
- @Override
- public WebResponse newWebSocketResponse(IWebSocketConnection connection) {
- return new WebSocketResponse(connection) {
-
- @Override
- public void sendError(int sc, String msg) {
- try {
- connection.sendMessage(WebSocketManager.ERROR_MESSAGE);
- } catch (IOException e) {
- }
- }
-
- };
- }
-
- });
-
- mount(new HomePageMapper(getHomePage()) {
-
- @Override
- protected void encodePageComponentInfo(Url url, PageComponentInfo info) {
- if (info.getComponentInfo() != null)
- super.encodePageComponentInfo(url, info);
- }
-
- });
-
- if (getConfigurationType() == RuntimeConfigurationType.DEPLOYMENT) {
- List<Class<?>> resourcePackScopes = new ArrayList<>();
- for (ResourcePackScopeContribution contribution: AppLoader.getExtensions(ResourcePackScopeContribution.class)) {
- resourcePackScopes.addAll(contribution.getResourcePackScopes());
- }
- new PackageResourceBundler(WicketModule.class, resourcePackScopes.toArray(new Class<?>[resourcePackScopes.size()])).install(this);
- }
- }
-
- @Override
- public final IProvider<IExceptionMapper> getExceptionMapperProvider() {
- return new IProvider<IExceptionMapper>() {
-
- @Override
- public IExceptionMapper get() {
- return new DefaultExceptionMapper() {
-
- @Override
- protected IRequestHandler mapExpectedExceptions(Exception e, Application application) {
- Page errorPage = mapExceptions(e);
- if (errorPage != null) {
- return createPageRequestHandler(new PageProvider(errorPage));
- } else {
- return super.mapExpectedExceptions(e, application);
- }
- }
-
- };
- }
-
- };
- }
-
- protected Page mapExceptions(Exception e) {
- return null;
- }
-
-}
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/WicketModule.java b/wicket/src/main/java/com/gitplex/commons/wicket/WicketModule.java
deleted file mode 100644
index c6b30554be..0000000000
--- a/wicket/src/main/java/com/gitplex/commons/wicket/WicketModule.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.gitplex.commons.wicket;
-
-import java.util.Collection;
-
-import org.apache.wicket.protocol.http.WicketFilter;
-import org.apache.wicket.protocol.http.WicketServlet;
-import org.eclipse.jetty.websocket.api.WebSocketPolicy;
-import org.pegdown.Parser;
-import org.pegdown.plugins.ToHtmlSerializerPlugin;
-
-import com.gitplex.calla.loader.AbstractPlugin;
-import com.gitplex.calla.loader.AbstractPluginModule;
-import com.gitplex.commons.markdown.extensionpoint.HtmlTransformer;
-import com.gitplex.commons.markdown.extensionpoint.MarkdownExtension;
-import com.gitplex.commons.wicket.behavior.markdown.EmojiTransformer;
-import com.gitplex.commons.wicket.editable.DefaultEditSupportRegistry;
-import com.gitplex.commons.wicket.editable.EditSupport;
-import com.gitplex.commons.wicket.editable.EditSupportRegistry;
-import com.gitplex.commons.wicket.websocket.DefaultWebSocketManager;
-import com.gitplex.commons.wicket.websocket.WebSocketManager;
-import com.google.common.collect.Lists;
-import com.gitplex.commons.jetty.ServletConfigurator;
-
-public class WicketModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- bind(WicketServlet.class).to(DefaultWicketServlet.class);
- bind(WicketFilter.class).to(DefaultWicketFilter.class);
- bind(WebSocketPolicy.class).toInstance(WebSocketPolicy.newServerPolicy());
- bind(EditSupportRegistry.class).to(DefaultEditSupportRegistry.class);
- bind(WebSocketManager.class).to(DefaultWebSocketManager.class);
-
- contribute(ServletConfigurator.class, WicketServletConfigurator.class);
-
- contributeFromPackage(EditSupport.class, EditSupport.class);
-
- contribute(MarkdownExtension.class, new MarkdownExtension() {
-
- @Override
- public Collection<Class<? extends Parser>> getInlineParsers() {
- return null;
- }
-
- @Override
- public Collection<HtmlTransformer> getHtmlTransformers() {
- return Lists.newArrayList((HtmlTransformer)new EmojiTransformer());
- }
-
- @Override
- public Collection<ToHtmlSerializerPlugin> getHtmlSerializers() {
- return null;
- }
-
- @Override
- public Collection<Class<? extends Parser>> getBlockParsers() {
- return null;
- }
- });
- }
-
- @Override
- protected Class<? extends AbstractPlugin> getPluginClass() {
- return WicketPlugin.class;
- }
-
-}
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/WicketServletConfigurator.java b/wicket/src/main/java/com/gitplex/commons/wicket/WicketServletConfigurator.java
deleted file mode 100644
index 69ab7d5268..0000000000
--- a/wicket/src/main/java/com/gitplex/commons/wicket/WicketServletConfigurator.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.gitplex.commons.wicket;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.apache.wicket.protocol.http.WicketServlet;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-
-import com.gitplex.commons.wicket.behavior.markdown.AttachmentUploadServlet;
-import com.gitplex.commons.jetty.ServletConfigurator;
-
-@Singleton
-public class WicketServletConfigurator implements ServletConfigurator {
-
- private final WicketServlet wicketServlet;
-
- @Inject
- public WicketServletConfigurator(WicketServlet wicketServlet) {
- this.wicketServlet = wicketServlet;
- }
-
- @Override
- public void configure(ServletContextHandler context) {
- ServletHolder servletHolder = new ServletHolder(wicketServlet);
-
- /*
- * Add wicket servlet as the default servlet which will serve all requests failed to
- * match a path pattern
- */
- context.addServlet(servletHolder, "/");
- context.addServlet(AttachmentUploadServlet.class, "/attachment_upload");
- }
-
-}
diff --git a/wicket/src/main/java/com/gitplex/commons/wicket/component/wizard/Skippable.java b/wicket/src/main/java/com/gitplex/commons/wicket/component/wizard/Skippable.java
deleted file mode 100644
index 436a6496b7..0000000000
--- a/wicket/src/main/java/com/gitplex/commons/wicket/component/wizard/Skippable.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.gitplex.commons.wicket.component.wizard;
-
-public interface Skippable {
- void skip();
-}
\ No newline at end of file