diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java index 9be9605b6d..51c2533873 100644 --- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java +++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java @@ -20,6 +20,11 @@ public class SnapshotPushPostbackHandler extends AbstractHandler { // response.setContentType("text/html;charset=utf-8"); // response.setStatus(HttpServletResponse.SC_OK); baseRequest.setHandled(false); + if (request.getMethod().equals("POST") && request.getPathInfo().endsWith("postback")) { + System.out.println(request.getHeaderNames()); + } + +// System.out.println(request.getRemoteAddr()); // System.out.println("method: " + request.getMethod()); // System.out.println("pathInfo: " + request.getPathInfo()); // System.out.println("contextPath: " + request.getContextPath()); diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/CandidateSnapshot.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/CandidateSnapshot.java index 21c053a9d2..d127f1072b 100644 --- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/CandidateSnapshot.java +++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/CandidateSnapshot.java @@ -10,6 +10,7 @@ public interface CandidateSnapshot { public JsonElement getJsonRepresentation(); public int getPreviousVersionID(); + public String getProjectURL(); public void approveWithVersionID(int versionID); public String getProjectName(); public WLDirectoryNode getDirectoryNode(); diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java index faac9fbce8..2f636ecb63 100644 --- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java +++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java @@ -15,7 +15,7 @@ public interface WriteLatexDataSource { /* Called by request thread. */ public boolean repositoryExists(String projectName) throws FailedConnectionException; public List getWritableRepositories(String projectName) throws FailedConnectionException, InvalidProjectException; - public void putDirectoryContentsToProjectWithName(String projectName, RawDirectoryContents directoryContents) throws SnapshotPostException, IOException, FailedConnectionException; + public void putDirectoryContentsToProjectWithName(String projectName, RawDirectoryContents directoryContents, String remoteAddr) throws SnapshotPostException, IOException, FailedConnectionException; public void expectPostback(String projectName); /* Called by postback thread. */ diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java index 6f83b4731b..416324eef6 100644 --- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java +++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java @@ -25,7 +25,7 @@ public class WLReceivePackFactory implements ReceivePackFactory