Skip to content

The Unified and Autonomous Development Platform

Modify jetty to prevent from using full rediction url

robin shine79993f0faef6
diff --git a/core/src/main/java/com/gitplex/server/util/diff/DiffUtils.java b/core/src/main/java/com/gitplex/server/util/diff/DiffUtils.java
index b6dba7749b..fcade021e1 100644
--- a/core/src/main/java/com/gitplex/server/util/diff/DiffUtils.java
+++ b/core/src/main/java/com/gitplex/server/util/diff/DiffUtils.java
@@ -45,6 +45,13 @@ public class DiffUtils {
private static List<List<Token>> tokenize(List<String> lines, @Nullable String fileName) {
Tokenizer tokenizer = TokenizerRegistry.getTokenizer(fileName);
if (tokenizer != null) {
+ //TODO: Some tokenizers are not thread safe, and we are using a temporary fix here
+ try {
+ tokenizer = TokenizerRegistry.getTokenizer(fileName).getClass().newInstance();
+ } catch (InstantiationException | IllegalAccessException e) {
+ throw new RuntimeException(e);
+ }
+
List<List<Token>> tokenizedLines = tokenizer.tokenize(lines);
List<List<Token>> refinedLines = new ArrayList<>();
for (List<Token> tokenizedLine: tokenizedLines) {
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 839f95c840..991a3630fa 100644
--- a/product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.java
+++ b/product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.java
@@ -97,6 +97,7 @@ public class ProductServletConfigurator implements ServletConfigurator {
ServletHolder assetServletHolder = new ServletHolder(new ClasspathAssetServlet(Assets.class));
context.addServlet(assetServletHolder, "/assets/*");
+ context.addServlet(assetServletHolder, "/favicon.ico");
context.getSessionHandler().addEventListener(new HttpSessionListener() {
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/image/favicon.ico b/web/src/main/java/com/gitplex/server/web/assets/favicon.ico
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/page/base/image/favicon.ico
rename to web/src/main/java/com/gitplex/server/web/assets/favicon.ico
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/image/add.png b/web/src/main/java/com/gitplex/server/web/assets/image/add.png
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/page/base/image/add.png
rename to web/src/main/java/com/gitplex/server/web/assets/image/add.png
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/image/apple-touch-icon.png b/web/src/main/java/com/gitplex/server/web/assets/image/apple-touch-icon.png
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/page/base/image/apple-touch-icon.png
rename to web/src/main/java/com/gitplex/server/web/assets/image/apple-touch-icon.png
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/image/delete.png b/web/src/main/java/com/gitplex/server/web/assets/image/delete.png
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/page/base/image/delete.png
rename to web/src/main/java/com/gitplex/server/web/assets/image/delete.png
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/image/error.png b/web/src/main/java/com/gitplex/server/web/assets/image/error.png
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/page/base/image/error.png
rename to web/src/main/java/com/gitplex/server/web/assets/image/error.png
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/image/move.png b/web/src/main/java/com/gitplex/server/web/assets/image/move.png
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/page/base/image/move.png
rename to web/src/main/java/com/gitplex/server/web/assets/image/move.png
diff --git a/web/src/main/java/com/gitplex/server/web/assets/align/AlignResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/align/AlignResourceReference.java
similarity index 85%
rename from web/src/main/java/com/gitplex/server/web/assets/align/AlignResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/align/AlignResourceReference.java
index 56fb8f1287..7b1271058e 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/align/AlignResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/align/AlignResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.align;
+package com.gitplex.server.web.assets.js.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.server.web.assets.textareacaretposition.TextareaCaretPositionResourceReference;
+import com.gitplex.server.web.assets.js.textareacaretposition.TextareaCaretPositionResourceReference;
public class AlignResourceReference extends JavaScriptResourceReference {
diff --git a/web/src/main/java/com/gitplex/server/web/assets/align/jquery.align.js b/web/src/main/java/com/gitplex/server/web/assets/js/align/jquery.align.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/align/jquery.align.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/align/jquery.align.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/areyousure/AreYouSureResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/areyousure/AreYouSureResourceReference.java
similarity index 93%
rename from web/src/main/java/com/gitplex/server/web/assets/areyousure/AreYouSureResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/areyousure/AreYouSureResourceReference.java
index 5a4797af99..195e73c8e3 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/areyousure/AreYouSureResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/areyousure/AreYouSureResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.areyousure;
+package com.gitplex.server.web.assets.js.areyousure;
import java.util.ArrayList;
import java.util.List;
diff --git a/web/src/main/java/com/gitplex/server/web/assets/areyousure/jquery.are-you-sure.patched.js b/web/src/main/java/com/gitplex/server/web/assets/js/areyousure/jquery.are-you-sure.patched.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/areyousure/jquery.are-you-sure.patched.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/areyousure/jquery.are-you-sure.patched.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/atwho/AtWhoResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/atwho/AtWhoResourceReference.java
similarity index 95%
rename from web/src/main/java/com/gitplex/server/web/assets/atwho/AtWhoResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/atwho/AtWhoResourceReference.java
index d83e3e3c2a..891617c3ae 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/atwho/AtWhoResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/atwho/AtWhoResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.atwho;
+package com.gitplex.server.web.assets.js.atwho;
import java.util.ArrayList;
import java.util.List;
diff --git a/web/src/main/java/com/gitplex/server/web/assets/atwho/jquery.atwho-caret.js b/web/src/main/java/com/gitplex/server/web/assets/js/atwho/jquery.atwho-caret.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/atwho/jquery.atwho-caret.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/atwho/jquery.atwho-caret.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/atwho/jquery.atwho.css b/web/src/main/java/com/gitplex/server/web/assets/js/atwho/jquery.atwho.css
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/atwho/jquery.atwho.css
rename to web/src/main/java/com/gitplex/server/web/assets/js/atwho/jquery.atwho.css
diff --git a/web/src/main/java/com/gitplex/server/web/assets/atwho/jquery.atwho.js b/web/src/main/java/com/gitplex/server/web/assets/js/atwho/jquery.atwho.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/atwho/jquery.atwho.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/atwho/jquery.atwho.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/autosize/AutoSizeResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/autosize/AutoSizeResourceReference.java
similarity index 93%
rename from web/src/main/java/com/gitplex/server/web/assets/autosize/AutoSizeResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/autosize/AutoSizeResourceReference.java
index 93ae8c52c1..72af3bb979 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/autosize/AutoSizeResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/autosize/AutoSizeResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.autosize;
+package com.gitplex.server.web.assets.js.autosize;
import java.util.ArrayList;
import java.util.List;
diff --git a/web/src/main/java/com/gitplex/server/web/assets/autosize/autosize-patched.js b/web/src/main/java/com/gitplex/server/web/assets/js/autosize/autosize-patched.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/autosize/autosize-patched.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/autosize/autosize-patched.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/caret/CaretResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/caret/CaretResourceReference.java
similarity index 94%
rename from web/src/main/java/com/gitplex/server/web/assets/caret/CaretResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/caret/CaretResourceReference.java
index deff74fdb6..4d86ffad37 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/caret/CaretResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/caret/CaretResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.caret;
+package com.gitplex.server.web.assets.js.caret;
import java.util.ArrayList;
import java.util.List;
diff --git a/web/src/main/java/com/gitplex/server/web/assets/caret/jquery.caret-1.5.2.js b/web/src/main/java/com/gitplex/server/web/assets/js/caret/jquery.caret-1.5.2.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/caret/jquery.caret-1.5.2.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/caret/jquery.caret-1.5.2.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/clipboard/ClipboardResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/clipboard/ClipboardResourceReference.java
similarity index 85%
rename from web/src/main/java/com/gitplex/server/web/assets/clipboard/ClipboardResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/clipboard/ClipboardResourceReference.java
index 745b0e6156..98cc30dae6 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/clipboard/ClipboardResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/clipboard/ClipboardResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.clipboard;
+package com.gitplex.server.web.assets.js.clipboard;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
diff --git a/web/src/main/java/com/gitplex/server/web/assets/clipboard/clipboard.min.js b/web/src/main/java/com/gitplex/server/web/assets/js/clipboard/clipboard.min.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/clipboard/clipboard.min.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/clipboard/clipboard.min.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/codemirror/CodeMirrorResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/CodeMirrorResourceReference.java
similarity index 99%
rename from web/src/main/java/com/gitplex/server/web/assets/codemirror/CodeMirrorResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/codemirror/CodeMirrorResourceReference.java
index d318b5f9fe..af2e70c391 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/codemirror/CodeMirrorResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/CodeMirrorResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.codemirror;
+package com.gitplex.server.web.assets.js.codemirror;
import java.util.List;
diff --git a/web/src/main/java/com/gitplex/server/web/assets/codemirror/ModeUrlResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/ModeUrlResourceReference.java
similarity index 96%
rename from web/src/main/java/com/gitplex/server/web/assets/codemirror/ModeUrlResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/codemirror/ModeUrlResourceReference.java
index 81e1b4ea3c..334a8d7d4e 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/codemirror/ModeUrlResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/ModeUrlResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.codemirror;
+package com.gitplex.server.web.assets.js.codemirror;
import java.util.List;
diff --git a/web/src/main/java/com/gitplex/server/web/assets/codemirror/annotatescrollbar2.js b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/annotatescrollbar2.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/codemirror/annotatescrollbar2.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/codemirror/annotatescrollbar2.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/codemirror/blank.js b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/blank.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/codemirror/blank.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/codemirror/blank.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/codemirror/codemirror.css b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/codemirror.css
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/codemirror/codemirror.css
rename to web/src/main/java/com/gitplex/server/web/assets/js/codemirror/codemirror.css
diff --git a/web/src/main/java/com/gitplex/server/web/assets/codemirror/codemirror.js b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/codemirror.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/codemirror/codemirror.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/codemirror/codemirror.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/codemirror/gotoline.js b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/gotoline.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/codemirror/gotoline.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/codemirror/gotoline.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/codemirror/highlight.css b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/highlight.css
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/codemirror/highlight.css
rename to web/src/main/java/com/gitplex/server/web/assets/js/codemirror/highlight.css
diff --git a/web/src/main/java/com/gitplex/server/web/assets/codemirror/highlight.js b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/highlight.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/codemirror/highlight.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/codemirror/highlight.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/codemirror/identifier-highlighter.js b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/identifier-highlighter.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/codemirror/identifier-highlighter.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/codemirror/identifier-highlighter.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/codemirror/matchesonscrollbar2.js b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/matchesonscrollbar2.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/codemirror/matchesonscrollbar2.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/codemirror/matchesonscrollbar2.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/codemirror/simplescrollbars.js b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/simplescrollbars.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/codemirror/simplescrollbars.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/codemirror/simplescrollbars.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/cookies/CookiesResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/cookies/CookiesResourceReference.java
similarity index 85%
rename from web/src/main/java/com/gitplex/server/web/assets/cookies/CookiesResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/cookies/CookiesResourceReference.java
index 2ed0170aa6..6209c88296 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/cookies/CookiesResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/cookies/CookiesResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.cookies;
+package com.gitplex.server.web.assets.js.cookies;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
diff --git a/web/src/main/java/com/gitplex/server/web/assets/cookies/cookies.min.js b/web/src/main/java/com/gitplex/server/web/assets/js/cookies/cookies.min.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/cookies/cookies.min.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/cookies/cookies.min.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/diffmatchpatch/DiffMatchPatchResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/diffmatchpatch/DiffMatchPatchResourceReference.java
similarity index 85%
rename from web/src/main/java/com/gitplex/server/web/assets/diffmatchpatch/DiffMatchPatchResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/diffmatchpatch/DiffMatchPatchResourceReference.java
index 5d1df7533f..31201a73f6 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/diffmatchpatch/DiffMatchPatchResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/diffmatchpatch/DiffMatchPatchResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.diffmatchpatch;
+package com.gitplex.server.web.assets.js.diffmatchpatch;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
diff --git a/web/src/main/java/com/gitplex/server/web/assets/diffmatchpatch/diff_match_patch.js b/web/src/main/java/com/gitplex/server/web/assets/js/diffmatchpatch/diff_match_patch.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/diffmatchpatch/diff_match_patch.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/diffmatchpatch/diff_match_patch.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/doneevents/DoneEventsResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/doneevents/DoneEventsResourceReference.java
similarity index 93%
rename from web/src/main/java/com/gitplex/server/web/assets/doneevents/DoneEventsResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/doneevents/DoneEventsResourceReference.java
index 33d52b7825..6b831ccd81 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/doneevents/DoneEventsResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/doneevents/DoneEventsResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.doneevents;
+package com.gitplex.server.web.assets.js.doneevents;
import java.util.ArrayList;
import java.util.List;
diff --git a/web/src/main/java/com/gitplex/server/web/assets/doneevents/jquery.doneevents.js b/web/src/main/java/com/gitplex/server/web/assets/js/doneevents/jquery.doneevents.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/doneevents/jquery.doneevents.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/doneevents/jquery.doneevents.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/hotkeys/HotkeysResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/hotkeys/HotkeysResourceReference.java
similarity index 93%
rename from web/src/main/java/com/gitplex/server/web/assets/hotkeys/HotkeysResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/hotkeys/HotkeysResourceReference.java
index d52b6fe8ae..9028eb51c7 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/hotkeys/HotkeysResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/hotkeys/HotkeysResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.hotkeys;
+package com.gitplex.server.web.assets.js.hotkeys;
import java.util.ArrayList;
import java.util.List;
diff --git a/web/src/main/java/com/gitplex/server/web/assets/hotkeys/jquery.hotkeys.js b/web/src/main/java/com/gitplex/server/web/assets/js/hotkeys/jquery.hotkeys.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/hotkeys/jquery.hotkeys.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/hotkeys/jquery.hotkeys.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/hover/HoverResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/hover/HoverResourceReference.java
similarity index 94%
rename from web/src/main/java/com/gitplex/server/web/assets/hover/HoverResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/hover/HoverResourceReference.java
index 288174bd6b..46839913ef 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/hover/HoverResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/hover/HoverResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.hover;
+package com.gitplex.server.web.assets.js.hover;
import java.util.ArrayList;
import java.util.List;
diff --git a/web/src/main/java/com/gitplex/server/web/assets/hover/jquery.hover.js b/web/src/main/java/com/gitplex/server/web/assets/js/hover/jquery.hover.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/hover/jquery.hover.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/hover/jquery.hover.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/jqueryui/JQueryUIResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/jqueryui/JQueryUIResourceReference.java
similarity index 94%
rename from web/src/main/java/com/gitplex/server/web/assets/jqueryui/JQueryUIResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/jqueryui/JQueryUIResourceReference.java
index c1612d3e6e..2f23cf8c47 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/jqueryui/JQueryUIResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/jqueryui/JQueryUIResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.jqueryui;
+package com.gitplex.server.web.assets.js.jqueryui;
import java.util.ArrayList;
import java.util.List;
diff --git a/web/src/main/java/com/gitplex/server/web/assets/jqueryui/jquery-ui.min.js b/web/src/main/java/com/gitplex/server/web/assets/js/jqueryui/jquery-ui.min.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/jqueryui/jquery-ui.min.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/jqueryui/jquery-ui.min.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/mousewheel/MouseWheelResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/mousewheel/MouseWheelResourceReference.java
similarity index 93%
rename from web/src/main/java/com/gitplex/server/web/assets/mousewheel/MouseWheelResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/mousewheel/MouseWheelResourceReference.java
index 133a37ab70..3d1d160e1a 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/mousewheel/MouseWheelResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/mousewheel/MouseWheelResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.mousewheel;
+package com.gitplex.server.web.assets.js.mousewheel;
import java.util.ArrayList;
import java.util.List;
diff --git a/web/src/main/java/com/gitplex/server/web/assets/mousewheel/jquery.mousewheel.js b/web/src/main/java/com/gitplex/server/web/assets/js/mousewheel/jquery.mousewheel.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/mousewheel/jquery.mousewheel.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/mousewheel/jquery.mousewheel.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/oneline/OnelineResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/oneline/OnelineResourceReference.java
similarity index 93%
rename from web/src/main/java/com/gitplex/server/web/assets/oneline/OnelineResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/oneline/OnelineResourceReference.java
index 3e4a159341..dc7bb2399e 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/oneline/OnelineResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/oneline/OnelineResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.oneline;
+package com.gitplex.server.web.assets.js.oneline;
import java.util.ArrayList;
import java.util.List;
diff --git a/web/src/main/java/com/gitplex/server/web/assets/oneline/jquery.oneline.js b/web/src/main/java/com/gitplex/server/web/assets/js/oneline/jquery.oneline.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/oneline/jquery.oneline.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/oneline/jquery.oneline.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/scrollintoview/ScrollIntoViewResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/scrollintoview/ScrollIntoViewResourceReference.java
similarity index 93%
rename from web/src/main/java/com/gitplex/server/web/assets/scrollintoview/ScrollIntoViewResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/scrollintoview/ScrollIntoViewResourceReference.java
index 484415aacf..fe1c9173df 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/scrollintoview/ScrollIntoViewResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/scrollintoview/ScrollIntoViewResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.scrollintoview;
+package com.gitplex.server.web.assets.js.scrollintoview;
import java.util.ArrayList;
import java.util.List;
diff --git a/web/src/main/java/com/gitplex/server/web/assets/scrollintoview/jquery.scrollintoview.js b/web/src/main/java/com/gitplex/server/web/assets/js/scrollintoview/jquery.scrollintoview.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/scrollintoview/jquery.scrollintoview.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/scrollintoview/jquery.scrollintoview.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/selectionpopover/SelectionPopoverResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/selectionpopover/SelectionPopoverResourceReference.java
similarity index 94%
rename from web/src/main/java/com/gitplex/server/web/assets/selectionpopover/SelectionPopoverResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/selectionpopover/SelectionPopoverResourceReference.java
index 54548d5073..efd5e9b3bb 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/selectionpopover/SelectionPopoverResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/selectionpopover/SelectionPopoverResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.selectionpopover;
+package com.gitplex.server.web.assets.js.selectionpopover;
import java.util.ArrayList;
import java.util.List;
diff --git a/web/src/main/java/com/gitplex/server/web/assets/selectionpopover/jquery.selectionpopover.css b/web/src/main/java/com/gitplex/server/web/assets/js/selectionpopover/jquery.selectionpopover.css
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/selectionpopover/jquery.selectionpopover.css
rename to web/src/main/java/com/gitplex/server/web/assets/js/selectionpopover/jquery.selectionpopover.css
diff --git a/web/src/main/java/com/gitplex/server/web/assets/selectionpopover/jquery.selectionpopover.js b/web/src/main/java/com/gitplex/server/web/assets/js/selectionpopover/jquery.selectionpopover.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/selectionpopover/jquery.selectionpopover.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/selectionpopover/jquery.selectionpopover.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/snapsvg/SnapSvgResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/snapsvg/SnapSvgResourceReference.java
similarity index 85%
rename from web/src/main/java/com/gitplex/server/web/assets/snapsvg/SnapSvgResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/snapsvg/SnapSvgResourceReference.java
index 1f45b9addf..94331d03db 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/snapsvg/SnapSvgResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/snapsvg/SnapSvgResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.snapsvg;
+package com.gitplex.server.web.assets.js.snapsvg;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
diff --git a/web/src/main/java/com/gitplex/server/web/assets/snapsvg/snap.svg-min.js b/web/src/main/java/com/gitplex/server/web/assets/js/snapsvg/snap.svg-min.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/snapsvg/snap.svg-min.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/snapsvg/snap.svg-min.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/textareacaretposition/TextareaCaretPositionResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/textareacaretposition/TextareaCaretPositionResourceReference.java
similarity index 84%
rename from web/src/main/java/com/gitplex/server/web/assets/textareacaretposition/TextareaCaretPositionResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/textareacaretposition/TextareaCaretPositionResourceReference.java
index 2d9131531a..f2f0bbd982 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/textareacaretposition/TextareaCaretPositionResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/textareacaretposition/TextareaCaretPositionResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.textareacaretposition;
+package com.gitplex.server.web.assets.js.textareacaretposition;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
diff --git a/web/src/main/java/com/gitplex/server/web/assets/textareacaretposition/textarea-caret-position.js b/web/src/main/java/com/gitplex/server/web/assets/js/textareacaretposition/textarea-caret-position.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/textareacaretposition/textarea-caret-position.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/textareacaretposition/textarea-caret-position.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/uri/URI.js b/web/src/main/java/com/gitplex/server/web/assets/js/uri/URI.js
similarity index 100%
rename from web/src/main/java/com/gitplex/server/web/assets/uri/URI.js
rename to web/src/main/java/com/gitplex/server/web/assets/js/uri/URI.js
diff --git a/web/src/main/java/com/gitplex/server/web/assets/uri/URIResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/uri/URIResourceReference.java
similarity index 86%
rename from web/src/main/java/com/gitplex/server/web/assets/uri/URIResourceReference.java
rename to web/src/main/java/com/gitplex/server/web/assets/js/uri/URIResourceReference.java
index 93278d7d05..e52f7c55a5 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/uri/URIResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/uri/URIResourceReference.java
@@ -1,4 +1,4 @@
-package com.gitplex.server.web.assets.uri;
+package com.gitplex.server.web.assets.js.uri;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
diff --git a/web/src/main/java/com/gitplex/server/web/behavior/OnTypingDoneBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/OnTypingDoneBehavior.java
index f467b42ebd..1696064eda 100644
--- a/web/src/main/java/com/gitplex/server/web/behavior/OnTypingDoneBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/OnTypingDoneBehavior.java
@@ -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.server.web.assets.doneevents.DoneEventsResourceReference;
+import com.gitplex.server.web.assets.js.doneevents.DoneEventsResourceReference;
@SuppressWarnings("serial")
public abstract class OnTypingDoneBehavior extends AjaxFormComponentUpdatingBehavior{
diff --git a/web/src/main/java/com/gitplex/server/web/behavior/ViewStateAwareBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/ViewStateAwareBehavior.java
index 84c043727f..73d0b42881 100644
--- a/web/src/main/java/com/gitplex/server/web/behavior/ViewStateAwareBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/ViewStateAwareBehavior.java
@@ -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.server.web.assets.uri.URIResourceReference;
+import com.gitplex.server.web.assets.js.uri.URIResourceReference;
@SuppressWarnings("serial")
public class ViewStateAwareBehavior extends Behavior {
diff --git a/web/src/main/java/com/gitplex/server/web/behavior/clipboard/CopyClipboardResourceReference.java b/web/src/main/java/com/gitplex/server/web/behavior/clipboard/CopyClipboardResourceReference.java
index 454da69a02..1b39311a03 100644
--- a/web/src/main/java/com/gitplex/server/web/behavior/clipboard/CopyClipboardResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/clipboard/CopyClipboardResourceReference.java
@@ -5,7 +5,7 @@ import java.util.List;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import com.gitplex.server.web.assets.clipboard.ClipboardResourceReference;
+import com.gitplex.server.web.assets.js.clipboard.ClipboardResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
public class CopyClipboardResourceReference extends BaseDependentResourceReference {
diff --git a/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DragDropResourceReference.java b/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DragDropResourceReference.java
index 13bcf2f776..214f7eaae0 100644
--- a/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DragDropResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/dragdrop/DragDropResourceReference.java
@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import com.gitplex.server.web.assets.jqueryui.JQueryUIResourceReference;
+import com.gitplex.server.web.assets.js.jqueryui.JQueryUIResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
public class DragDropResourceReference extends BaseDependentResourceReference {
diff --git a/web/src/main/java/com/gitplex/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java b/web/src/main/java/com/gitplex/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java
index 682c337788..ac1dcdb84d 100644
--- a/web/src/main/java/com/gitplex/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java
@@ -5,7 +5,7 @@ import java.util.List;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import com.gitplex.server.web.assets.scrollintoview.ScrollIntoViewResourceReference;
+import com.gitplex.server.web.assets.js.scrollintoview.ScrollIntoViewResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
public class InfiniteScrollResourceReference extends BaseDependentResourceReference {
diff --git a/web/src/main/java/com/gitplex/server/web/behavior/inputassist/InputAssistResourceReference.java b/web/src/main/java/com/gitplex/server/web/behavior/inputassist/InputAssistResourceReference.java
index 4499f53184..c9d2787d1d 100644
--- a/web/src/main/java/com/gitplex/server/web/behavior/inputassist/InputAssistResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/inputassist/InputAssistResourceReference.java
@@ -6,10 +6,10 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-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.assets.js.caret.CaretResourceReference;
+import com.gitplex.server.web.assets.js.hotkeys.HotkeysResourceReference;
+import com.gitplex.server.web.assets.js.scrollintoview.ScrollIntoViewResourceReference;
+import com.gitplex.server.web.assets.js.textareacaretposition.TextareaCaretPositionResourceReference;
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/behavior/markdown/MarkdownResourceReference.java b/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownResourceReference.java
index a8eb71505c..9620a0dc7f 100644
--- a/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownResourceReference.java
@@ -8,10 +8,10 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
-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.assets.js.atwho.AtWhoResourceReference;
+import com.gitplex.server.web.assets.js.caret.CaretResourceReference;
+import com.gitplex.server.web.assets.js.codemirror.CodeMirrorResourceReference;
+import com.gitplex.server.web.assets.js.hotkeys.HotkeysResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
public class MarkdownResourceReference extends BaseDependentResourceReference {
diff --git a/web/src/main/java/com/gitplex/server/web/behavior/sortable/SortBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/sortable/SortBehavior.java
index 84a95269da..f20bc71a27 100644
--- a/web/src/main/java/com/gitplex/server/web/behavior/sortable/SortBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/behavior/sortable/SortBehavior.java
@@ -9,7 +9,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnLoadHeaderItem;
import org.apache.wicket.request.cycle.RequestCycle;
-import com.gitplex.server.web.assets.jqueryui.JQueryUIResourceReference;
+import com.gitplex.server.web.assets.js.jqueryui.JQueryUIResourceReference;
import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
public abstract class SortBehavior extends AbstractPostAjaxBehavior {
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 b3d8d440a9..ff5d0e440c 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.server.web.assets.hotkeys.HotkeysResourceReference;
+import com.gitplex.server.web.assets.js.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/commitgraph/CommitGraphResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/commitgraph/CommitGraphResourceReference.java
index f4b20d7420..75ea98b19b 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.server.web.assets.snapsvg.SnapSvgResourceReference;
+import com.gitplex.server.web.assets.js.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/depotfile/blobsearch/instant/InstantSearchResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchResourceReference.java
index 3b41e6503c..dfcfb6b91f 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.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.assets.js.doneevents.DoneEventsResourceReference;
+import com.gitplex.server.web.assets.js.hotkeys.HotkeysResourceReference;
+import com.gitplex.server.web.assets.js.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/SearchResultResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultResourceReference.java
index 2bfe6305fe..7138aea767 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.server.web.assets.uri.URIResourceReference;
+import com.gitplex.server.web.assets.js.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/source/SourceViewResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewResourceReference.java
index 3359b27f05..d12e1fe29d 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.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.assets.js.codemirror.CodeMirrorResourceReference;
+import com.gitplex.server.web.assets.js.cookies.CookiesResourceReference;
+import com.gitplex.server.web.assets.js.hover.HoverResourceReference;
+import com.gitplex.server.web.assets.js.jqueryui.JQueryUIResourceReference;
+import com.gitplex.server.web.assets.js.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/fileedit/FileEditResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditResourceReference.java
index a3b68dbabc..abfc318bc7 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.server.web.assets.codemirror.CodeMirrorResourceReference;
-import com.gitplex.server.web.assets.diffmatchpatch.DiffMatchPatchResourceReference;
+import com.gitplex.server.web.assets.js.codemirror.CodeMirrorResourceReference;
+import com.gitplex.server.web.assets.js.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/depotselector/DepotSelectorResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelectorResourceReference.java
index d77adc4266..be15bbf180 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.server.web.assets.hotkeys.HotkeysResourceReference;
-import com.gitplex.server.web.assets.scrollintoview.ScrollIntoViewResourceReference;
+import com.gitplex.server.web.assets.js.hotkeys.HotkeysResourceReference;
+import com.gitplex.server.web.assets.js.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/blob/text/TextDiffResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffResourceReference.java
index 58c843bbeb..61e734320e 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.server.web.assets.hover.HoverResourceReference;
-import com.gitplex.server.web.assets.selectionpopover.SelectionPopoverResourceReference;
+import com.gitplex.server.web.assets.js.hover.HoverResourceReference;
+import com.gitplex.server.web.assets.js.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/revision/RevisionDiffResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffResourceReference.java
index 3d28fbcf15..b772e9a863 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.server.web.assets.cookies.CookiesResourceReference;
-import com.gitplex.server.web.assets.jqueryui.JQueryUIResourceReference;
+import com.gitplex.server.web.assets.js.cookies.CookiesResourceReference;
+import com.gitplex.server.web.assets.js.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/component/markdown/MarkdownResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownResourceReference.java
index 282d55fe5d..41b0c43924 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownResourceReference.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.server.web.assets.codemirror.CodeMirrorResourceReference;
+import com.gitplex.server.web.assets.js.codemirror.CodeMirrorResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
public class MarkdownResourceReference extends BaseDependentResourceReference {
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 74a90c34ad..dcfa658443 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.server.web.assets.hotkeys.HotkeysResourceReference;
+import com.gitplex.server.web.assets.js.hotkeys.HotkeysResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
public class RevisionSelectorResourceReference extends BaseDependentResourceReference {
diff --git a/web/src/main/java/com/gitplex/server/web/component/select2/DragAndDropBehavior.java b/web/src/main/java/com/gitplex/server/web/component/select2/DragAndDropBehavior.java
index 9604c9efe9..e62d391b56 100644
--- a/web/src/main/java/com/gitplex/server/web/component/select2/DragAndDropBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/DragAndDropBehavior.java
@@ -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.server.web.assets.jqueryui.JQueryUIResourceReference;
+import com.gitplex.server.web.assets.js.jqueryui.JQueryUIResourceReference;
/**
* Adds drag & drop behavior to Select2MultiChoice components, i.e. the list of
diff --git a/web/src/main/java/com/gitplex/server/web/component/select2/Select2ResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/select2/Select2ResourceReference.java
index 632ac8cc83..48b0f49404 100644
--- a/web/src/main/java/com/gitplex/server/web/component/select2/Select2ResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/component/select2/Select2ResourceReference.java
@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import com.gitplex.server.web.assets.mousewheel.MouseWheelResourceReference;
+import com.gitplex.server.web.assets.js.mousewheel.MouseWheelResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
public class Select2ResourceReference extends BaseDependentResourceReference {
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 fa698761ff..aab8d84702 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
@@ -38,6 +38,7 @@ import com.gitplex.launcher.loader.AppLoader;
import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.AccountManager;
import com.gitplex.server.model.Account;
+import com.gitplex.server.web.assets.Assets;
import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
import com.gitplex.server.web.page.init.ServerInitPage;
import com.gitplex.server.web.page.security.LoginPage;
@@ -91,7 +92,7 @@ public abstract class BasePage extends WebPage {
protected void onComponentTag(ComponentTag tag) {
super.onComponentTag(tag);
CharSequence url = urlFor(
- new PackageResourceReference(BasePage.class, "image/favicon.ico"),
+ new PackageResourceReference(Assets.class, "favicon.ico"),
new PageParameters());
tag.put("href", url);
}
@@ -103,7 +104,7 @@ public abstract class BasePage extends WebPage {
protected void onComponentTag(ComponentTag tag) {
super.onComponentTag(tag);
CharSequence url = urlFor(
- new PackageResourceReference(BasePage.class, "image/apple-touch-icon.png"),
+ new PackageResourceReference(Assets.class, "image/apple-touch-icon.png"),
new PageParameters());
tag.put("href", url);
}
@@ -115,7 +116,7 @@ public abstract class BasePage extends WebPage {
protected void onComponentTag(ComponentTag tag) {
super.onComponentTag(tag);
CharSequence url = urlFor(
- new PackageResourceReference(BasePage.class, "image/apple-touch-icon.png"),
+ new PackageResourceReference(Assets.class, "image/apple-touch-icon.png"),
new PageParameters());
tag.put("href", url);
}
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 16fcfce951..d0a555663c 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
@@ -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.server.web.assets.align.AlignResourceReference;
-import com.gitplex.server.web.assets.areyousure.AreYouSureResourceReference;
-import com.gitplex.server.web.assets.autosize.AutoSizeResourceReference;
+import com.gitplex.server.web.assets.js.align.AlignResourceReference;
+import com.gitplex.server.web.assets.js.areyousure.AreYouSureResourceReference;
+import com.gitplex.server.web.assets.js.autosize.AutoSizeResourceReference;
import de.agilecoders.wicket.core.Bootstrap;
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/base.css b/web/src/main/java/com/gitplex/server/web/page/base/base.css
index 860a738369..ad818a0dc9 100644
--- a/web/src/main/java/com/gitplex/server/web/page/base/base.css
+++ b/web/src/main/java/com/gitplex/server/web/page/base/base.css
@@ -314,15 +314,15 @@ form>.test-feedback {
/* ICONS */
span.add.icon {
padding: 12px;
- background: url("image/add.png") no-repeat 50% 50%;
+ background: url("/assets/image/add.png") no-repeat 50% 50%;
}
span.delete.icon {
padding: 12px;
- background: url("image/delete.png") no-repeat 50% 50%;
+ background: url("/assets/image/delete.png") no-repeat 50% 50%;
}
span.move.icon {
padding: 12px;
- background: url("image/move.png") no-repeat 50% 50%;
+ background: url("/assets/image/move.png") no-repeat 50% 50%;
}
/* WEB SOCKET ERROR */
@@ -340,7 +340,7 @@ span.move.icon {
#websocket-error span {
width: 16px;
height: 16px;
- background: url("image/error.png") 0 0 no-repeat;
+ background: url("/assets/image/error.png") 0 0 no-repeat;
}
/* FILE INPUT */
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 c606392e38..26c51e722f 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.server.web.assets.cookies.CookiesResourceReference;
+import com.gitplex.server.web.assets.js.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/commit/CommitDetailResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailResourceReference.java
index 7153da72fa..ba6866dab6 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.server.web.assets.oneline.OnelineResourceReference;
+import com.gitplex.server.web.assets.js.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/file/DepotFileResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFileResourceReference.java
index a4d11f97bc..d0acf43aed 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.server.web.assets.cookies.CookiesResourceReference;
-import com.gitplex.server.web.assets.jqueryui.JQueryUIResourceReference;
+import com.gitplex.server.web.assets.js.cookies.CookiesResourceReference;
+import com.gitplex.server.web.assets.js.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/error/error-page.css b/web/src/main/java/com/gitplex/server/web/page/error/error-page.css
index e45cb5c910..af2162ef07 100644
--- a/web/src/main/java/com/gitplex/server/web/page/error/error-page.css
+++ b/web/src/main/java/com/gitplex/server/web/page/error/error-page.css
@@ -1,6 +1,3 @@
-html.error, body.error {
- background: #FF557F;
-}
body.error .center-box {
width: 75%;
padding: 20px;
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 21a763980b..4fcb6ef7dd 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,13 +1,8 @@
package com.gitplex.server.web.page.test;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.markup.html.link.Link;
-import com.gitplex.server.GitPlex;
-import com.gitplex.server.manager.DepotManager;
-import com.gitplex.server.model.Depot;
import com.gitplex.server.web.page.base.BasePage;
-import com.gitplex.server.web.page.depot.file.DepotFilePage;
@SuppressWarnings("serial")
public class TestPage extends BasePage {
@@ -15,13 +10,15 @@ public class TestPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
-
- Depot depot = GitPlex.getInstance(DepotManager.class).load(1L);
- DepotFilePage.State state = new DepotFilePage.State();
- state.blobIdent.revision = "master";
- state.blobIdent.path = "hello/world";
- PageParameters params = DepotFilePage.paramsOf(depot, state);
- add(new BookmarkablePageLink<Void>("test", DepotFilePage.class, params));
+
+ add(new Link<Void>("test") {
+
+ @Override
+ public void onClick() {
+ setResponsePage(TestPage.class);
+ }
+
+ });
}
}
diff --git a/web/src/main/java/org/eclipse/jetty/server/Response.java b/web/src/main/java/org/eclipse/jetty/server/Response.java
new file mode 100644
index 0000000000..f52e6447d6
--- /dev/null
+++ b/web/src/main/java/org/eclipse/jetty/server/Response.java
@@ -0,0 +1,1389 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+// ------------------------------------------------------------------------
+// All rights reserved. This program and the accompanying materials
+// are made available under the terms of the Eclipse Public License v1.0
+// and Apache License v2.0 which accompanies this distribution.
+//
+// The Eclipse Public License is available at
+// http://www.eclipse.org/legal/epl-v10.html
+//
+// The Apache License v2.0 is available at
+// http://www.opensource.org/licenses/apache2.0.php
+//
+// You may elect to redistribute this code under either of these licenses.
+// ========================================================================
+//
+
+package org.eclipse.jetty.server;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.nio.channels.IllegalSelectorException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.eclipse.jetty.http.DateGenerator;
+import org.eclipse.jetty.http.HttpContent;
+import org.eclipse.jetty.http.HttpCookie;
+import org.eclipse.jetty.http.HttpField;
+import org.eclipse.jetty.http.HttpFields;
+import org.eclipse.jetty.http.HttpGenerator;
+import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.http.HttpHeaderValue;
+import org.eclipse.jetty.http.HttpScheme;
+import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.http.HttpURI;
+import org.eclipse.jetty.http.HttpVersion;
+import org.eclipse.jetty.http.MetaData;
+import org.eclipse.jetty.http.MimeTypes;
+import org.eclipse.jetty.http.PreEncodedHttpField;
+import org.eclipse.jetty.io.RuntimeIOException;
+import org.eclipse.jetty.server.handler.ErrorHandler;
+import org.eclipse.jetty.util.ByteArrayISO8859Writer;
+import org.eclipse.jetty.util.QuotedStringTokenizer;
+import org.eclipse.jetty.util.StringUtil;
+import org.eclipse.jetty.util.URIUtil;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.Logger;
+
+/**
+ * <p>{@link Response} provides the implementation for {@link HttpServletResponse}.</p>
+ */
+public class Response implements HttpServletResponse
+{
+ private static final Logger LOG = Log.getLogger(Response.class);
+ private static final String __COOKIE_DELIM="\",;\\ \t";
+ private final static String __01Jan1970_COOKIE = DateGenerator.formatCookieDate(0).trim();
+ private final static int __MIN_BUFFER_SIZE = 1;
+ private final static HttpField __EXPIRES_01JAN1970 = new PreEncodedHttpField(HttpHeader.EXPIRES,DateGenerator.__01Jan1970);
+
+
+ // Cookie building buffer. Reduce garbage for cookie using applications
+ private static final ThreadLocal<StringBuilder> __cookieBuilder = new ThreadLocal<StringBuilder>()
+ {
+ @Override
+ protected StringBuilder initialValue()
+ {
+ return new StringBuilder(128);
+ }
+ };
+
+ public enum OutputType
+ {
+ NONE, STREAM, WRITER
+ }
+
+ /**
+ * If a header name starts with this string, the header (stripped of the prefix)
+ * can be set during include using only {@link #setHeader(String, String)} or
+ * {@link #addHeader(String, String)}.
+ */
+ public final static String SET_INCLUDE_HEADER_PREFIX = "org.eclipse.jetty.server.include.";
+
+ /**
+ * If this string is found within the comment of a cookie added with {@link #addCookie(Cookie)}, then the cookie
+ * will be set as HTTP ONLY.
+ */
+ public final static String HTTP_ONLY_COMMENT = "__HTTP_ONLY__";
+
+ private final HttpChannel _channel;
+ private final HttpFields _fields = new HttpFields();
+ private final AtomicInteger _include = new AtomicInteger();
+ private final HttpOutput _out;
+ private int _status = HttpStatus.OK_200;
+ private String _reason;
+ private Locale _locale;
+ private MimeTypes.Type _mimeType;
+ private String _characterEncoding;
+ private boolean _explicitEncoding;
+ private String _contentType;
+ private OutputType _outputType = OutputType.NONE;
+ private ResponseWriter _writer;
+ private long _contentLength = -1;
+
+
+ public Response(HttpChannel channel, HttpOutput out)
+ {
+ _channel = channel;
+ _out = out;
+ }
+
+ public HttpChannel getHttpChannel()
+ {
+ return _channel;
+ }
+
+ protected void recycle()
+ {
+ _status = HttpStatus.OK_200;
+ _reason = null;
+ _locale = null;
+ _mimeType = null;
+ _characterEncoding = null;
+ _contentType = null;
+ _outputType = OutputType.NONE;
+ _contentLength = -1;
+ _out.recycle();
+ _fields.clear();
+ _explicitEncoding=false;
+ }
+
+ public HttpOutput getHttpOutput()
+ {
+ return _out;
+ }
+
+ public boolean isIncluding()
+ {
+ return _include.get() > 0;
+ }
+
+ public void include()
+ {
+ _include.incrementAndGet();
+ }
+
+ public void included()
+ {
+ _include.decrementAndGet();
+ if (_outputType == OutputType.WRITER)
+ {
+ _writer.reopen();
+ }
+ _out.reopen();
+ }
+
+ public void addCookie(HttpCookie cookie)
+ {
+ addSetCookie(
+ cookie.getName(),
+ cookie.getValue(),
+ cookie.getDomain(),
+ cookie.getPath(),
+ cookie.getMaxAge(),
+ cookie.getComment(),
+ cookie.isSecure(),
+ cookie.isHttpOnly(),
+ cookie.getVersion());;
+ }
+
+ @Override
+ public void addCookie(Cookie cookie)
+ {
+ String comment = cookie.getComment();
+ boolean httpOnly = false;
+
+ if (comment != null)
+ {
+ int i = comment.indexOf(HTTP_ONLY_COMMENT);
+ if (i >= 0)
+ {
+ httpOnly = true;
+ comment = comment.replace(HTTP_ONLY_COMMENT, "").trim();
+ if (comment.length() == 0)
+ comment = null;
+ }
+ }
+ addSetCookie(cookie.getName(),
+ cookie.getValue(),
+ cookie.getDomain(),
+ cookie.getPath(),
+ cookie.getMaxAge(),
+ comment,
+ cookie.getSecure(),
+ httpOnly || cookie.isHttpOnly(),
+ cookie.getVersion());
+ }
+
+
+ /**
+ * Format a set cookie value
+ *
+ * @param name the name
+ * @param value the value
+ * @param domain the domain
+ * @param path the path
+ * @param maxAge the maximum age
+ * @param comment the comment (only present on versions &gt; 0)
+ * @param isSecure true if secure cookie
+ * @param isHttpOnly true if for http only
+ * @param version version of cookie logic to use (0 == default behavior)
+ */
+ public void addSetCookie(
+ final String name,
+ final String value,
+ final String domain,
+ final String path,
+ final long maxAge,
+ final String comment,
+ final boolean isSecure,
+ final boolean isHttpOnly,
+ int version)
+ {
+ // Check arguments
+ if (name == null || name.length() == 0)
+ throw new IllegalArgumentException("Bad cookie name");
+
+ // Format value and params
+ StringBuilder buf = __cookieBuilder.get();
+ buf.setLength(0);
+
+ // Name is checked for legality by servlet spec, but can also be passed directly so check again for quoting
+ boolean quote_name=isQuoteNeededForCookie(name);
+ quoteOnlyOrAppend(buf,name,quote_name);
+
+ buf.append('=');
+
+ // Remember name= part to look for other matching set-cookie
+ String name_equals=buf.toString();
+
+ // Append the value
+ boolean quote_value=isQuoteNeededForCookie(value);
+ quoteOnlyOrAppend(buf,value,quote_value);
+
+ // Look for domain and path fields and check if they need to be quoted
+ boolean has_domain = domain!=null && domain.length()>0;
+ boolean quote_domain = has_domain && isQuoteNeededForCookie(domain);
+ boolean has_path = path!=null && path.length()>0;
+ boolean quote_path = has_path && isQuoteNeededForCookie(path);
+
+ // Upgrade the version if we have a comment or we need to quote value/path/domain or if they were already quoted
+ if (version==0 && ( comment!=null || quote_name || quote_value || quote_domain || quote_path ||
+ QuotedStringTokenizer.isQuoted(name) || QuotedStringTokenizer.isQuoted(value) ||
+ QuotedStringTokenizer.isQuoted(path) || QuotedStringTokenizer.isQuoted(domain)))
+ version=1;
+
+ // Append version
+ if (version==1)
+ buf.append (";Version=1");
+ else if (version>1)
+ buf.append (";Version=").append(version);
+
+ // Append path
+ if (has_path)
+ {
+ buf.append(";Path=");
+ quoteOnlyOrAppend(buf,path,quote_path);
+ }
+
+ // Append domain
+ if (has_domain)
+ {
+ buf.append(";Domain=");
+ quoteOnlyOrAppend(buf,domain,quote_domain);
+ }
+
+ // Handle max-age and/or expires
+ if (maxAge >= 0)
+ {
+ // Always use expires
+ // This is required as some browser (M$ this means you!) don't handle max-age even with v1 cookies
+ buf.append(";Expires=");
+ if (maxAge == 0)
+ buf.append(__01Jan1970_COOKIE);
+ else
+ DateGenerator.formatCookieDate(buf, System.currentTimeMillis() + 1000L * maxAge);
+
+ // for v1 cookies, also send max-age
+ if (version>=1)
+ {
+ buf.append(";Max-Age=");
+ buf.append(maxAge);
+ }
+ }
+
+ // add the other fields
+ if (isSecure)
+ buf.append(";Secure");
+ if (isHttpOnly)
+ buf.append(";HttpOnly");
+ if (comment != null)
+ {
+ buf.append(";Comment=");
+ quoteOnlyOrAppend(buf,comment,isQuoteNeededForCookie(comment));
+ }
+
+ // remove any existing set-cookie fields of same name
+ Iterator<HttpField> i=_fields.iterator();
+ while (i.hasNext())
+ {
+ HttpField field=i.next();
+ if (field.getHeader()==HttpHeader.SET_COOKIE)
+ {
+ String val = field.getValue();
+ if (val!=null && val.startsWith(name_equals))
+ {
+ //existing cookie has same name, does it also match domain and path?
+ if (((!has_domain && !val.contains("Domain")) || (has_domain && val.contains(domain))) &&
+ ((!has_path && !val.contains("Path")) || (has_path && val.contains(path))))
+ {
+ i.remove();
+ }
+ }
+ }
+ }
+
+ // add the set cookie
+ _fields.add(HttpHeader.SET_COOKIE.toString(), buf.toString());
+
+ // Expire responses with set-cookie headers so they do not get cached.
+ _fields.put(__EXPIRES_01JAN1970);
+ }
+
+
+ /* ------------------------------------------------------------ */
+ /** Does a cookie value need to be quoted?
+ * @param s value string
+ * @return true if quoted;
+ * @throws IllegalArgumentException If there a control characters in the string
+ */
+ private static boolean isQuoteNeededForCookie(String s)
+ {
+ if (s==null || s.length()==0)
+ return true;
+
+ if (QuotedStringTokenizer.isQuoted(s))
+ return false;
+
+ for (int i=0;i<s.length();i++)
+ {
+ char c = s.charAt(i);
+ if (__COOKIE_DELIM.indexOf(c)>=0)
+ return true;
+
+ if (c<0x20 || c>=0x7f)
+ throw new IllegalArgumentException("Illegal character in cookie value");
+ }
+
+ return false;
+ }
+
+
+ private static void quoteOnlyOrAppend(StringBuilder buf, String s, boolean quote)
+ {
+ if (quote)
+ QuotedStringTokenizer.quoteOnly(buf,s);
+ else
+ buf.append(s);
+ }
+
+ @Override
+ public boolean containsHeader(String name)
+ {
+ return _fields.containsKey(name);
+ }
+
+ @Override
+ public String encodeURL(String url)
+ {
+ final Request request = _channel.getRequest();
+ SessionManager sessionManager = request.getSessionManager();
+ if (sessionManager == null)
+ return url;
+
+ HttpURI uri = null;
+ if (sessionManager.isCheckingRemoteSessionIdEncoding() && URIUtil.hasScheme(url))
+ {
+ uri = new HttpURI(url);
+ String path = uri.getPath();
+ path = (path == null ? "" : path);
+ int port = uri.getPort();
+ if (port < 0)
+ port = HttpScheme.HTTPS.asString().equalsIgnoreCase(uri.getScheme()) ? 443 : 80;
+
+ // Is it the same server?
+ if (!request.getServerName().equalsIgnoreCase(uri.getHost()))
+ return url;
+ if (request.getServerPort() != port)
+ return url;
+ if (!path.startsWith(request.getContextPath())) //TODO the root context path is "", with which every non null string starts
+ return url;
+ }
+
+ String sessionURLPrefix = sessionManager.getSessionIdPathParameterNamePrefix();
+ if (sessionURLPrefix == null)
+ return url;
+
+ if (url == null)
+ return null;
+
+ // should not encode if cookies in evidence
+ if ((sessionManager.isUsingCookies() && request.isRequestedSessionIdFromCookie()) || !sessionManager.isUsingURLs())
+ {
+ int prefix = url.indexOf(sessionURLPrefix);
+ if (prefix != -1)
+ {
+ int suffix = url.indexOf("?", prefix);
+ if (suffix < 0)
+ suffix = url.indexOf("#", prefix);
+
+ if (suffix <= prefix)
+ return url.substring(0, prefix);
+ return url.substring(0, prefix) + url.substring(suffix);
+ }
+ return url;
+ }
+
+ // get session;
+ HttpSession session = request.getSession(false);
+
+ // no session
+ if (session == null)
+ return url;
+
+ // invalid session
+ if (!sessionManager.isValid(session))
+ return url;
+
+ String id = sessionManager.getNodeId(session);
+
+ if (uri == null)
+ uri = new HttpURI(url);
+
+
+ // Already encoded
+ int prefix = url.indexOf(sessionURLPrefix);
+ if (prefix != -1)
+ {
+ int suffix = url.indexOf("?", prefix);
+ if (suffix < 0)
+ suffix = url.indexOf("#", prefix);
+
+ if (suffix <= prefix)
+ return url.substring(0, prefix + sessionURLPrefix.length()) + id;
+ return url.substring(0, prefix + sessionURLPrefix.length()) + id +
+ url.substring(suffix);
+ }
+
+ // edit the session
+ int suffix = url.indexOf('?');
+ if (suffix < 0)
+ suffix = url.indexOf('#');
+ if (suffix < 0)
+ {
+ return url +
+ ((HttpScheme.HTTPS.is(uri.getScheme()) || HttpScheme.HTTP.is(uri.getScheme())) && uri.getPath() == null ? "/" : "") + //if no path, insert the root path
+ sessionURLPrefix + id;
+ }
+
+
+ return url.substring(0, suffix) +
+ ((HttpScheme.HTTPS.is(uri.getScheme()) || HttpScheme.HTTP.is(uri.getScheme())) && uri.getPath() == null ? "/" : "") + //if no path so insert the root path
+ sessionURLPrefix + id + url.substring(suffix);
+ }
+
+ @Override
+ public String encodeRedirectURL(String url)
+ {
+ return encodeURL(url);
+ }
+
+ @Override
+ @Deprecated
+ public String encodeUrl(String url)
+ {
+ return encodeURL(url);
+ }
+
+ @Override
+ @Deprecated
+ public String encodeRedirectUrl(String url)
+ {
+ return encodeRedirectURL(url);
+ }
+
+ @Override
+ public void sendError(int sc) throws IOException
+ {
+ sendError(sc, null);
+ }
+
+ @Override
+ public void sendError(int code, String message) throws IOException
+ {
+ if (isIncluding())
+ return;
+
+ if (isCommitted())
+ {
+ if (LOG.isDebugEnabled())
+ LOG.debug("Aborting on sendError on committed response {} {}",code,message);
+ code=-1;
+ }
+
+ switch(code)
+ {
+ case -1:
+ _channel.abort(new IOException());
+ return;
+ case 102:
+ sendProcessing();
+ return;
+ default:
+ }
+
+ if (isCommitted())
+ LOG.warn("cannot sendError("+code+", "+message+") response already committed");
+
+ resetBuffer();
+ _characterEncoding=null;
+ setHeader(HttpHeader.EXPIRES,null);
+ setHeader(HttpHeader.LAST_MODIFIED,null);
+ setHeader(HttpHeader.CACHE_CONTROL,null);
+ setHeader(HttpHeader.CONTENT_TYPE,null);
+ setHeader(HttpHeader.CONTENT_LENGTH,null);
+
+ _outputType = OutputType.NONE;
+ setStatus(code);
+ _reason=message;
+
+ Request request = _channel.getRequest();
+ Throwable cause = (Throwable)request.getAttribute(Dispatcher.ERROR_EXCEPTION);
+ if (message==null)
+ message=cause==null?HttpStatus.getMessage(code):cause.toString();
+
+ // If we are allowed to have a body
+ if (code!=SC_NO_CONTENT &&
+ code!=SC_NOT_MODIFIED &&
+ code!=SC_PARTIAL_CONTENT &&
+ code>=SC_OK)
+ {
+ ErrorHandler error_handler = ErrorHandler.getErrorHandler(_channel.getServer(),request.getContext()==null?null:request.getContext().getContextHandler());
+ if (error_handler!=null)
+ {
+ request.setAttribute(RequestDispatcher.ERROR_STATUS_CODE,new Integer(code));
+ request.setAttribute(RequestDispatcher.ERROR_MESSAGE, message);
+ request.setAttribute(RequestDispatcher.ERROR_REQUEST_URI, request.getRequestURI());
+ request.setAttribute(RequestDispatcher.ERROR_SERVLET_NAME,request.getServletName());
+ error_handler.handle(null,_channel.getRequest(),_channel.getRequest(),this );
+ }
+ else
+ {
+ setHeader(HttpHeader.CACHE_CONTROL, "must-revalidate,no-cache,no-store");
+ setContentType(MimeTypes.Type.TEXT_HTML_8859_1.toString());
+ try (ByteArrayISO8859Writer writer= new ByteArrayISO8859Writer(2048);)
+ {
+ message=StringUtil.sanitizeXmlString(message);
+ String uri= request.getRequestURI();
+ uri=StringUtil.sanitizeXmlString(uri);
+
+ writer.write("<html>\n<head>\n<meta http-equiv=\"Content-Type\" content=\"text/html;charset=ISO-8859-1\"/>\n");
+ writer.write("<title>Error ");
+ writer.write(Integer.toString(code));
+ writer.write(' ');
+ if (message==null)
+ writer.write(message);
+ writer.write("</title>\n</head>\n<body>\n<h2>HTTP ERROR: ");
+ writer.write(Integer.toString(code));
+ writer.write("</h2>\n<p>Problem accessing ");
+ writer.write(uri);
+ writer.write(". Reason:\n<pre> ");
+ writer.write(message);
+ writer.write("</pre>");
+ writer.write("</p>\n<hr />");
+
+ getHttpChannel().getHttpConfiguration().writePoweredBy(writer,null,"<hr/>");
+ writer.write("\n</body>\n</html>\n");
+
+ writer.flush();
+ setContentLength(writer.size());
+ try (ServletOutputStream outputStream = getOutputStream())
+ {
+ writer.writeTo(outputStream);
+ writer.destroy();
+ }
+ }
+ }
+ }
+ else if (code!=SC_PARTIAL_CONTENT)
+ {
+ // TODO work out why this is required?
+ _channel.getRequest().getHttpFields().remove(HttpHeader.CONTENT_TYPE);
+ _channel.getRequest().getHttpFields().remove(HttpHeader.CONTENT_LENGTH);
+ _characterEncoding=null;
+ _mimeType=null;
+ }
+
+ closeOutput();
+ }
+
+ /**
+ * Sends a 102-Processing response.
+ * If the connection is a HTTP connection, the version is 1.1 and the
+ * request has a Expect header starting with 102, then a 102 response is
+ * sent. This indicates that the request still be processed and real response
+ * can still be sent. This method is called by sendError if it is passed 102.
+ * @throws IOException if unable to send the 102 response
+ * @see javax.servlet.http.HttpServletResponse#sendError(int)
+ */
+ public void sendProcessing() throws IOException
+ {
+ if (_channel.isExpecting102Processing() && !isCommitted())
+ {
+ _channel.sendResponse(HttpGenerator.PROGRESS_102_INFO, null, true);
+ }
+ }
+
+ /**
+ * Sends a response with one of the 300 series redirection codes.
+ * @param code the redirect status code
+ * @param location the location to send in <code>Location</code> headers
+ * @throws IOException if unable to send the redirect
+ */
+ public void sendRedirect(int code, String location) throws IOException
+ {
+ if ((code < HttpServletResponse.SC_MULTIPLE_CHOICES) || (code >= HttpServletResponse.SC_BAD_REQUEST))
+ throw new IllegalArgumentException("Not a 3xx redirect code");
+
+ if (isIncluding())
+ return;
+
+ if (location == null)
+ throw new IllegalArgumentException();
+
+ /*
+ * The new http spec now allows to redirect to relative urls. So we comment
+ * out below section to avoid wrongly prepending http scheme to the url if
+ * GitPlex running with http protocol is exposed to outside as https prococol
+ * via reverse proxy
+ */
+
+ /*
+ if (!URIUtil.hasScheme(location))
+ {
+ StringBuilder buf = _channel.getRequest().getRootURL();
+ if (location.startsWith("/"))
+ {
+ // absolute in context
+ location=URIUtil.canonicalPath(location);
+ }
+ else
+ {
+ // relative to request
+ String path=_channel.getRequest().getRequestURI();
+ String parent=(path.endsWith("/"))?path:URIUtil.parentPath(path);
+ location=URIUtil.canonicalPath(URIUtil.addPaths(parent,location));
+ if (!location.startsWith("/"))
+ buf.append('/');
+ }
+
+ if(location==null)
+ throw new IllegalStateException("path cannot be above root");
+ buf.append(location);
+
+ location=buf.toString();
+ }
+ */
+
+ resetBuffer();
+ setHeader(HttpHeader.LOCATION, location);
+ setStatus(code);
+ closeOutput();
+ }
+
+ @Override
+ public void sendRedirect(String location) throws IOException
+ {
+ sendRedirect(HttpServletResponse.SC_MOVED_TEMPORARILY, location);
+ }
+
+ @Override
+ public void setDateHeader(String name, long date)
+ {
+ if (!isIncluding())
+ _fields.putDateField(name, date);
+ }
+
+ @Override
+ public void addDateHeader(String name, long date)
+ {
+ if (!isIncluding())
+ _fields.addDateField(name, date);
+ }
+
+ public void setHeader(HttpHeader name, String value)
+ {
+ if (HttpHeader.CONTENT_TYPE == name)
+ setContentType(value);
+ else
+ {
+ if (isIncluding())
+ return;
+
+ _fields.put(name, value);
+
+ if (HttpHeader.CONTENT_LENGTH == name)
+ {
+ if (value == null)
+ _contentLength = -1l;
+ else
+ _contentLength = Long.parseLong(value);
+ }
+ }
+ }
+
+ @Override
+ public void setHeader(String name, String value)
+ {
+ if (HttpHeader.CONTENT_TYPE.is(name))
+ setContentType(value);
+ else
+ {
+ if (isIncluding())
+ {
+ if (name.startsWith(SET_INCLUDE_HEADER_PREFIX))
+ name = name.substring(SET_INCLUDE_HEADER_PREFIX.length());
+ else
+ return;
+ }
+ _fields.put(name, value);
+ if (HttpHeader.CONTENT_LENGTH.is(name))
+ {
+ if (value == null)
+ _contentLength = -1l;
+ else
+ _contentLength = Long.parseLong(value);
+ }
+ }
+ }
+
+ @Override
+ public Collection<String> getHeaderNames()
+ {
+ final HttpFields fields = _fields;
+ return fields.getFieldNamesCollection();
+ }
+
+ @Override
+ public String getHeader(String name)
+ {
+ return _fields.get(name);
+ }
+
+ @Override
+ public Collection<String> getHeaders(String name)
+ {
+ final HttpFields fields = _fields;
+ Collection<String> i = fields.getValuesList(name);
+ if (i == null)
+ return Collections.emptyList();
+ return i;
+ }
+
+ @Override
+ public void addHeader(String name, String value)
+ {
+ if (isIncluding())
+ {
+ if (name.startsWith(SET_INCLUDE_HEADER_PREFIX))
+ name = name.substring(SET_INCLUDE_HEADER_PREFIX.length());
+ else
+ return;
+ }
+
+ if (HttpHeader.CONTENT_TYPE.is(name))
+ {
+ setContentType(value);
+ return;
+ }
+
+ if (HttpHeader.CONTENT_LENGTH.is(name))
+ {
+ setHeader(name,value);
+ return;
+ }
+
+ _fields.add(name, value);
+ }
+
+ @Override
+ public void setIntHeader(String name, int value)
+ {
+ if (!isIncluding())
+ {
+ _fields.putLongField(name, value);
+ if (HttpHeader.CONTENT_LENGTH.is(name))
+ _contentLength = value;
+ }
+ }
+
+ @Override
+ public void addIntHeader(String name, int value)
+ {
+ if (!isIncluding())
+ {
+ _fields.add(name, Integer.toString(value));
+ if (HttpHeader.CONTENT_LENGTH.is(name))
+ _contentLength = value;
+ }
+ }
+
+ @Override
+ public void setStatus(int sc)
+ {
+ if (sc <= 0)
+ throw new IllegalArgumentException();
+ if (!isIncluding())
+ {
+ _status = sc;
+ _reason = null;
+ }
+ }
+
+ @Override
+ @Deprecated
+ public void setStatus(int sc, String sm)
+ {
+ setStatusWithReason(sc,sm);
+ }
+
+ public void setStatusWithReason(int sc, String sm)
+ {
+ if (sc <= 0)
+ throw new IllegalArgumentException();
+ if (!isIncluding())
+ {
+ _status = sc;
+ _reason = sm;
+ }
+ }
+
+ @Override
+ public String getCharacterEncoding()
+ {
+ if (_characterEncoding == null)
+ _characterEncoding = StringUtil.__ISO_8859_1;
+ return _characterEncoding;
+ }
+
+ @Override
+ public String getContentType()
+ {
+ return _contentType;
+ }
+
+ @Override
+ public ServletOutputStream getOutputStream() throws IOException
+ {
+ if (_outputType == OutputType.WRITER)
+ throw new IllegalStateException("WRITER");
+ _outputType = OutputType.STREAM;
+ return _out;
+ }
+
+ public boolean isWriting()
+ {
+ return _outputType == OutputType.WRITER;
+ }
+
+ @Override
+ public PrintWriter getWriter() throws IOException
+ {
+ if (_outputType == OutputType.STREAM)
+ throw new IllegalStateException("STREAM");
+
+ if (_outputType == OutputType.NONE)
+ {
+ /* get encoding from Content-Type header */
+ String encoding = _characterEncoding;
+ if (encoding == null)
+ {
+ if (_mimeType!=null && _mimeType.isCharsetAssumed())
+ encoding=_mimeType.getCharsetString();
+ else
+ {
+ encoding = MimeTypes.inferCharsetFromContentType(_contentType);
+ if (encoding == null)
+ encoding = StringUtil.__ISO_8859_1;
+ setCharacterEncoding(encoding,false);
+ }
+ }
+
+ Locale locale = getLocale();
+
+ if (_writer != null && _writer.isFor(locale,encoding))
+ _writer.reopen();
+ else
+ {
+ if (StringUtil.__ISO_8859_1.equalsIgnoreCase(encoding))
+ _writer = new ResponseWriter(new Iso88591HttpWriter(_out),locale,encoding);
+ else if (StringUtil.__UTF8.equalsIgnoreCase(encoding))
+ _writer = new ResponseWriter(new Utf8HttpWriter(_out),locale,encoding);
+ else
+ _writer = new ResponseWriter(new EncodingHttpWriter(_out, encoding),locale,encoding);
+ }
+
+ // Set the output type at the end, because setCharacterEncoding() checks for it
+ _outputType = OutputType.WRITER;
+ }
+ return _writer;
+ }
+
+ @Override
+ public void setContentLength(int len)
+ {
+ // Protect from setting after committed as default handling
+ // of a servlet HEAD request ALWAYS sets _content length, even
+ // if the getHandling committed the response!
+ if (isCommitted() || isIncluding())
+ return;
+
+ _contentLength = len;
+ if (_contentLength > 0)
+ {
+ long written = _out.getWritten();
+ if (written > len)
+ throw new IllegalArgumentException("setContentLength(" + len + ") when already written " + written);
+
+ _fields.putLongField(HttpHeader.CONTENT_LENGTH, len);
+ if (isAllContentWritten(written))
+ {
+ try
+ {
+ closeOutput();
+ }
+ catch(IOException e)
+ {
+ throw new RuntimeIOException(e);
+ }
+ }
+ }
+ else if (_contentLength==0)
+ {
+ long written = _out.getWritten();
+ if (written > 0)
+ throw new IllegalArgumentException("setContentLength(0) when already written " + written);
+ _fields.put(HttpHeader.CONTENT_LENGTH, "0");
+ }
+ else
+ _fields.remove(HttpHeader.CONTENT_LENGTH);
+ }
+
+ public long getContentLength()
+ {
+ return _contentLength;
+ }
+
+ public boolean isAllContentWritten(long written)
+ {
+ return (_contentLength >= 0 && written >= _contentLength);
+ }
+
+ public void closeOutput() throws IOException
+ {
+ switch (_outputType)
+ {
+ case WRITER:
+ _writer.close();
+ if (!_out.isClosed())
+ _out.close();
+ break;
+ case STREAM:
+ getOutputStream().close();
+ break;
+ default:
+ _out.close();
+ }
+ }
+
+ public long getLongContentLength()
+ {
+ return _contentLength;
+ }
+
+ public void setLongContentLength(long len)
+ {
+ // Protect from setting after committed as default handling
+ // of a servlet HEAD request ALWAYS sets _content length, even
+ // if the getHandling committed the response!
+ if (isCommitted() || isIncluding())
+ return;
+ _contentLength = len;
+ _fields.putLongField(HttpHeader.CONTENT_LENGTH.toString(), len);
+ }
+
+ @Override
+ public void setContentLengthLong(long length)
+ {
+ setLongContentLength(length);
+ }
+
+ @Override
+ public void setCharacterEncoding(String encoding)
+ {
+ setCharacterEncoding(encoding,true);
+ }
+
+ private void setCharacterEncoding(String encoding, boolean explicit)
+ {
+ if (isIncluding() || isWriting())
+ return;
+
+ if (_outputType == OutputType.NONE && !isCommitted())
+ {
+ if (encoding == null)
+ {
+ _explicitEncoding=false;
+
+ // Clear any encoding.
+ if (_characterEncoding != null)
+ {
+ _characterEncoding = null;
+
+ if (_mimeType!=null)
+ {
+ _mimeType=_mimeType.getBaseType();
+ _contentType=_mimeType.asString();
+ _fields.put(_mimeType.getContentTypeField());
+ }
+ else if (_contentType != null)
+ {
+ _contentType = MimeTypes.getContentTypeWithoutCharset(_contentType);
+ _fields.put(HttpHeader.CONTENT_TYPE, _contentType);
+ }
+ }
+ }
+ else
+ {
+ // No, so just add this one to the mimetype
+ _explicitEncoding = explicit;
+ _characterEncoding = HttpGenerator.__STRICT?encoding:StringUtil.normalizeCharset(encoding);
+ if (_mimeType!=null)
+ {
+ _contentType=_mimeType.getBaseType().asString()+ ";charset=" + _characterEncoding;
+ _mimeType = MimeTypes.CACHE.get(_contentType);
+ if (_mimeType==null || HttpGenerator.__STRICT)
+ _fields.put(HttpHeader.CONTENT_TYPE, _contentType);
+ else
+ _fields.put(_mimeType.getContentTypeField());
+ }
+ else if (_contentType != null)
+ {
+ _contentType = MimeTypes.getContentTypeWithoutCharset(_contentType) + ";charset=" + _characterEncoding;
+ _fields.put(HttpHeader.CONTENT_TYPE, _contentType);
+ }
+ }
+ }
+ }
+
+ @Override
+ public void setContentType(String contentType)
+ {
+ if (isCommitted() || isIncluding())
+ return;
+
+ if (contentType == null)
+ {
+ if (isWriting() && _characterEncoding != null)
+ throw new IllegalSelectorException();
+
+ if (_locale == null)
+ _characterEncoding = null;
+ _mimeType = null;
+ _contentType = null;
+ _fields.remove(HttpHeader.CONTENT_TYPE);
+ }
+ else
+ {
+ _contentType = contentType;
+ _mimeType = MimeTypes.CACHE.get(contentType);
+
+ String charset;
+ if (_mimeType!=null && _mimeType.getCharset()!=null && !_mimeType.isCharsetAssumed())
+ charset=_mimeType.getCharsetString();
+ else
+ charset = MimeTypes.getCharsetFromContentType(contentType);
+
+ if (charset == null)
+ {
+ if (_characterEncoding != null)
+ {
+ _contentType = contentType + ";charset=" + _characterEncoding;
+ _mimeType = null;
+ }
+ }
+ else if (isWriting() && !charset.equalsIgnoreCase(_characterEncoding))
+ {
+ // too late to change the character encoding;
+ _mimeType = null;
+ _contentType = MimeTypes.getContentTypeWithoutCharset(_contentType);
+ if (_characterEncoding != null)
+ _contentType = _contentType + ";charset=" + _characterEncoding;
+ }
+ else
+ {
+ _characterEncoding = charset;
+ _explicitEncoding = true;
+ }
+
+ if (HttpGenerator.__STRICT || _mimeType==null)
+ _fields.put(HttpHeader.CONTENT_TYPE, _contentType);
+ else
+ {
+ _contentType=_mimeType.asString();
+ _fields.put(_mimeType.getContentTypeField());
+ }
+ }
+
+ }
+
+ @Override
+ public void setBufferSize(int size)
+ {
+ if (isCommitted() || getContentCount() > 0)
+ throw new IllegalStateException("cannot set buffer size on committed response");
+ if (size <= 0)
+ size = __MIN_BUFFER_SIZE;
+ _out.setBufferSize(size);
+ }
+
+ @Override
+ public int getBufferSize()
+ {
+ return _out.getBufferSize();
+ }
+
+ @Override
+ public void flushBuffer() throws IOException
+ {
+ if (!_out.isClosed())
+ _out.flush();
+ }
+
+ @Override
+ public void reset()
+ {
+ resetForForward();
+ _status = 200;
+ _reason = null;
+ _contentLength = -1;
+ _fields.clear();
+
+ String connection = _channel.getRequest().getHeader(HttpHeader.CONNECTION.asString());
+
+ if (connection != null)
+ {
+ for (String value: StringUtil.csvSplit(null,connection,0,connection.length()))
+ {
+ HttpHeaderValue cb = HttpHeaderValue.CACHE.get(value);
+
+ if (cb != null)
+ {
+ switch (cb)
+ {
+ case CLOSE:
+ _fields.put(HttpHeader.CONNECTION, HttpHeaderValue.CLOSE.toString());
+ break;
+
+ case KEEP_ALIVE:
+ if (HttpVersion.HTTP_1_0.is(_channel.getRequest().getProtocol()))
+ _fields.put(HttpHeader.CONNECTION, HttpHeaderValue.KEEP_ALIVE.toString());
+ break;
+ case TE:
+ _fields.put(HttpHeader.CONNECTION, HttpHeaderValue.TE.toString());
+ break;
+ default:
+ }
+ }
+ }
+ }
+ }
+
+ public void reset(boolean preserveCookies)
+ {
+ if (!preserveCookies)
+ reset();
+ else
+ {
+ ArrayList<String> cookieValues = new ArrayList<String>(5);
+ Enumeration<String> vals = _fields.getValues(HttpHeader.SET_COOKIE.asString());
+ while (vals.hasMoreElements())
+ cookieValues.add(vals.nextElement());
+ reset();
+ for (String v:cookieValues)
+ _fields.add(HttpHeader.SET_COOKIE, v);
+ }
+ }
+
+ public void resetForForward()
+ {
+ resetBuffer();
+ _outputType = OutputType.NONE;
+ }
+
+ @Override
+ public void resetBuffer()
+ {
+ if (isCommitted())
+ throw new IllegalStateException("cannot reset buffer on committed response");
+
+ _out.resetBuffer();
+ }
+
+ protected MetaData.Response newResponseMetaData()
+ {
+ return new MetaData.Response(_channel.getRequest().getHttpVersion(), getStatus(), getReason(), _fields, getLongContentLength());
+ }
+
+ /** Get the MetaData.Response committed for this response.
+ * This may differ from the meta data in this response for
+ * exceptional responses (eg 4xx and 5xx responses generated
+ * by the container) and the committedMetaData should be used
+ * for logging purposes.
+ * @return The committed MetaData or a {@link #newResponseMetaData()}
+ * if not yet committed.
+ */
+ public MetaData.Response getCommittedMetaData()
+ {
+ MetaData.Response meta = _channel.getCommittedMetaData();
+ if (meta==null)
+ return newResponseMetaData();
+ return meta;
+ }
+
+ @Override
+ public boolean isCommitted()
+ {
+ return _channel.isCommitted();
+ }
+
+ @Override
+ public void setLocale(Locale locale)
+ {
+ if (locale == null || isCommitted() || isIncluding())
+ return;
+
+ _locale = locale;
+ _fields.put(HttpHeader.CONTENT_LANGUAGE, locale.toString().replace('_', '-'));
+
+ if (_outputType != OutputType.NONE)
+ return;
+
+ if (_channel.getRequest().getContext() == null)
+ return;
+
+ String charset = _channel.getRequest().getContext().getContextHandler().getLocaleEncoding(locale);
+
+ if (charset != null && charset.length() > 0 && !_explicitEncoding)
+ setCharacterEncoding(charset,false);
+ }
+
+ @Override
+ public Locale getLocale()
+ {
+ if (_locale == null)
+ return Locale.getDefault();
+ return _locale;
+ }
+
+ @Override
+ public int getStatus()
+ {
+ return _status;
+ }
+
+ public String getReason()
+ {
+ return _reason;
+ }
+
+ public HttpFields getHttpFields()
+ {
+ return _fields;
+ }
+
+ public long getContentCount()
+ {
+ return _out.getWritten();
+ }
+
+ @Override
+ public String toString()
+ {
+ return String.format("%s %d %s%n%s", _channel.getRequest().getHttpVersion(), _status, _reason == null ? "" : _reason, _fields);
+ }
+
+
+ public void putHeaders(HttpContent content,long contentLength, boolean etag)
+ {
+ HttpField lm = content.getLastModified();
+ if (lm!=null)
+ _fields.put(lm);
+
+ if (contentLength==0)
+ {
+ _fields.put(content.getContentLength());
+ _contentLength=content.getContentLengthValue();
+ }
+ else if (contentLength>0)
+ {
+ _fields.putLongField(HttpHeader.CONTENT_LENGTH,contentLength);
+ _contentLength=contentLength;
+ }
+
+ HttpField ct=content.getContentType();
+ if (ct!=null)
+ {
+ _fields.put(ct);
+ _contentType=ct.getValue();
+ _characterEncoding=content.getCharacterEncoding();
+ _mimeType=content.getMimeType();
+ }
+
+ HttpField ce=content.getContentEncoding();
+ if (ce!=null)
+ _fields.put(ce);
+
+ if (etag)
+ {
+ HttpField et = content.getETag();
+ if (et!=null)
+ _fields.put(et);
+ }
+ }
+
+ public static void putHeaders(HttpServletResponse response, HttpContent content, long contentLength, boolean etag)
+ {
+ long lml=content.getResource().lastModified();
+ if (lml>=0)
+ response.setDateHeader(HttpHeader.LAST_MODIFIED.asString(),lml);
+
+ if (contentLength==0)
+ contentLength=content.getContentLengthValue();
+ if (contentLength >=0)
+ {
+ if (contentLength<Integer.MAX_VALUE)
+ response.setContentLength((int)contentLength);
+ else
+ response.setHeader(HttpHeader.CONTENT_LENGTH.asString(),Long.toString(contentLength));
+ }
+
+ String ct=content.getContentTypeValue();
+ if (ct!=null && response.getContentType()==null)
+ response.setContentType(ct);
+
+ String ce=content.getContentEncodingValue();
+ if (ce!=null)
+ response.setHeader(HttpHeader.CONTENT_ENCODING.asString(),ce);
+
+ if (etag)
+ {
+ String et=content.getETagValue();
+ if (et!=null)
+ response.setHeader(HttpHeader.ETAG.asString(),et);
+ }
+ }
+}