From 5abacafd430141e6b6d21403c581f1a14d7fed04 Mon Sep 17 00:00:00 2001 From: szznax Date: Tue, 29 Dec 2009 23:21:10 +0000 Subject: [PATCH] fix for [HER-1729] add (deprecated) style code from Engine class to Flash class * Heritrix.java added CLAP protocol to access representations via classloader * EngineApplication.java added staticDir resource to serve static files under "/engine/static" also added org.archive.crawler.restlet package to hold static files * EngineResource.java added to static CSS resource * Engine.css style for flashACK/NACK/ADVISORY divs --- .../main/java/org/archive/crawler/Heritrix.java | 1 + .../crawler/restlet/EngineApplication.java | 5 +++++ .../archive/crawler/restlet/EngineResource.java | 1 + .../org/archive/crawler/restlet/Engine.css | 16 ++++++++++++++++ 4 files changed, 23 insertions(+) create mode 100644 engine/src/main/resources/org/archive/crawler/restlet/Engine.css diff --git a/engine/src/main/java/org/archive/crawler/Heritrix.java b/engine/src/main/java/org/archive/crawler/Heritrix.java index 4e7fb15f..6418cf17 100644 --- a/engine/src/main/java/org/archive/crawler/Heritrix.java +++ b/engine/src/main/java/org/archive/crawler/Heritrix.java @@ -327,6 +327,7 @@ public class Heritrix { } } component.getClients().add(Protocol.FILE); + component.getClients().add(Protocol.CLAP); Guard guard = new RateLimitGuard(null, ChallengeScheme.HTTP_DIGEST, "Authentication Required"); guard.getSecrets().put(authLogin, authPassword.toCharArray()); diff --git a/engine/src/main/java/org/archive/crawler/restlet/EngineApplication.java b/engine/src/main/java/org/archive/crawler/restlet/EngineApplication.java index 6378eb40..1d875b63 100644 --- a/engine/src/main/java/org/archive/crawler/restlet/EngineApplication.java +++ b/engine/src/main/java/org/archive/crawler/restlet/EngineApplication.java @@ -111,6 +111,11 @@ public class EngineApplication extends Application { router.attach("/engine/job/{job}/beans/{beanPath}",BeanBrowseResource.class); router.attach("/engine/job/{job}/script",ScriptResource.class); + // static files (won't serve directory, but will serve files in it) + String resource = "clap://class/org/archive/crawler/restlet"; + Directory staticDir = new Directory(getContext(),resource); + router.attach("/engine/static/",staticDir); + return router; } diff --git a/engine/src/main/java/org/archive/crawler/restlet/EngineResource.java b/engine/src/main/java/org/archive/crawler/restlet/EngineResource.java index dc746ac7..b07303e4 100644 --- a/engine/src/main/java/org/archive/crawler/restlet/EngineResource.java +++ b/engine/src/main/java/org/archive/crawler/restlet/EngineResource.java @@ -219,6 +219,7 @@ public class EngineResource extends BaseResource { PrintWriter pw = new PrintWriter(writer); pw.println(""+engineTitle+""); pw.println(""); + pw.println(""); pw.println("

"+engineTitle+"

"); diff --git a/engine/src/main/resources/org/archive/crawler/restlet/Engine.css b/engine/src/main/resources/org/archive/crawler/restlet/Engine.css new file mode 100644 index 00000000..56f3395d --- /dev/null +++ b/engine/src/main/resources/org/archive/crawler/restlet/Engine.css @@ -0,0 +1,16 @@ +.flashACK { + margin-bottom: 16px; + padding: 8px; + background-color: lavender; +} +.flashNACK { + margin-bottom: 16px; + padding: 8px; + background-color: pink; +} +.flashADVISORY { + margin-bottom: 16px; + padding: 8px; + background-color: khaki; +} +