Commits

Anonymous committed ce93695 Merge

Merge my branch with jims corrections

  • Participants
  • Parent commits 4e072b7, 585403b

Comments (0)

Files changed (7)

src/main/java/uk/ac/cam/ch/wwmm/swtest/AssessmentResource.java

File contents unchanged.

src/main/java/uk/ac/cam/ch/wwmm/swtest/DataResource.java

     @Get
     public Representation getData() throws IOException, URISyntaxException {
         File file = new File(this.getClass().getResource("root-dir.zip").toURI());
-        System.out.println("File "+file.getName());
         Representation rep = new FileRepresentation(file, MediaType.APPLICATION_ZIP);
         return rep;
     }

src/main/java/uk/ac/cam/ch/wwmm/swtest/ErrorResource.java

         getResponse().setStatus(Status.SERVER_ERROR_SERVICE_UNAVAILABLE);
         return getApplication().template("error.ftl", model, MediaType.TEXT_HTML);
     }
-
 }

src/main/java/uk/ac/cam/ch/wwmm/swtest/IndexResource.java

File contents unchanged.

src/main/java/uk/ac/cam/ch/wwmm/swtest/SubmitResource.java

File contents unchanged.

src/main/java/uk/ac/cam/ch/wwmm/swtest/SwTestApplication.java

File contents unchanged.

src/main/resources/uk/ac/cam/ch/wwmm/swtest/templates/info.ftl

File contents unchanged.