From 17c417dad5c7be28df4b6e1fd25ec56b484faaff Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 26 May 2011 17:22:03 -0400
Subject: [PATCH] Changed git.otherUrls to web.otherUrls.
---
src/com/gitblit/wicket/pages/RawPage.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RawPage.java b/src/com/gitblit/wicket/pages/RawPage.java
index 18b91bc..acda03a 100644
--- a/src/com/gitblit/wicket/pages/RawPage.java
+++ b/src/com/gitblit/wicket/pages/RawPage.java
@@ -1,23 +1,34 @@
+/*
+ * Copyright 2011 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.gitblit.wicket.pages;
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
-import com.gitblit.StoredSettings;
+import com.gitblit.GitBlit;
+import com.gitblit.Keys;
import com.gitblit.utils.JGitUtils;
-import com.gitblit.wicket.GitBlitWebApp;
import com.gitblit.wicket.WicketUtils;
-
public class RawPage extends WebPage {
@@ -29,14 +40,10 @@
redirectToInterceptPage(new RepositoriesPage());
}
final String repositoryName = WicketUtils.getRepositoryName(params);
- final String objectId = WicketUtils.getObject(params);
+ final String objectId = WicketUtils.getObject(params);
final String blobPath = WicketUtils.getPath(params);
- ServletWebRequest servletWebRequest = (ServletWebRequest) getRequest();
- HttpServletRequest req = servletWebRequest.getHttpServletRequest();
- req.getServerName();
-
- Repository r = GitBlitWebApp.get().getRepository(req, repositoryName);
+ Repository r = GitBlit.self().getRepository(repositoryName);
if (r == null) {
error("Can not load repository " + repositoryName);
redirectToInterceptPage(new RepositoriesPage());
@@ -52,10 +59,10 @@
// Map the extensions to types
Map<String, Integer> map = new HashMap<String, Integer>();
- for (String ext : StoredSettings.getStrings("imageExtensions")) {
+ for (String ext : GitBlit.getStrings(Keys.web.imageExtensions)) {
map.put(ext.toLowerCase(), 2);
}
- for (String ext : StoredSettings.getStrings("binaryExtensions")) {
+ for (String ext : GitBlit.getStrings(Keys.web.binaryExtensions)) {
map.put(ext.toLowerCase(), 3);
}
@@ -82,10 +89,11 @@
add(c);
} else {
// plain text
- Label blobLabel = new Label("rawText", JGitUtils.getRawContentAsString(r, commit, blobPath));
+ Label blobLabel = new Label("rawText", JGitUtils.getRawContentAsString(r, commit,
+ blobPath));
WicketUtils.setCssClass(blobLabel, "plainprint");
add(blobLabel);
}
r.close();
- }
+ }
}
--
Gitblit v1.9.1