Replace RawPage with RawServlet

James Moger

2014-05-05 ff17f7bac432b4ba8310ba3ea335748a34859d50

 src/main/java/com/gitblit/wicket/pages/BlobPage.java

@@ -24,10 +24,12 @@
import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.image.Image;

import org.apache.wicket.markup.html.link.BookmarkablePageLink;

import org.apache.wicket.markup.html.link.ExternalLink;

import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.Keys;

import com.gitblit.servlet.RawServlet;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.CacheControl;

@@ -57,8 +59,8 @@
               WicketUtils.newPathParameter(repositoryName, objectId, blobPath))

               .setEnabled(false));

         add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class).setEnabled(false));

         add(new BookmarkablePageLink<Void>("rawLink", RawPage.class,

               WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

         String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, objectId, blobPath);

         add(new ExternalLink("rawLink",  rawUrl));

         add(new CommitHeaderPanel("commitHeader", objectId));

         add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId));

         Component c = new Label("blobText", JGitUtils.getStringContent(r, objectId, encodings));

@@ -87,8 +89,8 @@
               WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

         add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,

               WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

         add(new BookmarkablePageLink<Void>("rawLink", RawPage.class,

               WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

         String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, objectId, blobPath);

         add(new ExternalLink("rawLink", rawUrl));



         add(new CommitHeaderPanel("commitHeader", repositoryName, commit));



@@ -115,7 +117,7 @@
            case 2:

               // image blobs

               add(new Label("blobText").setVisible(false));

               add(new ExternalImage("blobImage", urlFor(RawPage.class, WicketUtils.newPathParameter(repositoryName, objectId, blobPath)).toString()));

               add(new ExternalImage("blobImage", rawUrl));

               break;

            case 3:

               // binary blobs