diff --git a/elda-lda/pom.xml b/elda-lda/pom.xml index c499ade99..e10494b1e 100755 --- a/elda-lda/pom.xml +++ b/elda-lda/pom.xml @@ -16,7 +16,7 @@ epi-public-s3-snapshot Epimorphics S3 snapshot repository - s3://epi-repository/snapshot + http://epi-repository.s3.amazonaws.com/snapshot false @@ -28,7 +28,7 @@ epi-public-s3-release Epimorphics S3 release repository - s3://epi-repository/release + http://epi-repository.s3.amazonaws.com/release true @@ -131,6 +131,15 @@ jmock-legacy 2.6.0 + + xmlunit + xmlunit + + + junit + junit + + diff --git a/elda-lda/src/main/java/com/epimorphics/lda/renderers/velocity/VelocityRendering.java b/elda-lda/src/main/java/com/epimorphics/lda/renderers/velocity/VelocityRendering.java index a6c29f8e6..d149094ce 100644 --- a/elda-lda/src/main/java/com/epimorphics/lda/renderers/velocity/VelocityRendering.java +++ b/elda-lda/src/main/java/com/epimorphics/lda/renderers/velocity/VelocityRendering.java @@ -198,7 +198,6 @@ public VelocityEngine createVelocityEngine() { Properties p = getProperties( velocityPath ); VelocityEngine ve = new VelocityEngine(); - ve.init( p ); return ve; diff --git a/elda-lda/src/main/java/com/epimorphics/lda/restlets/RouterRestlet.java b/elda-lda/src/main/java/com/epimorphics/lda/restlets/RouterRestlet.java index b202a5d6e..9d41d04b9 100755 --- a/elda-lda/src/main/java/com/epimorphics/lda/restlets/RouterRestlet.java +++ b/elda-lda/src/main/java/com/epimorphics/lda/restlets/RouterRestlet.java @@ -181,7 +181,7 @@ static synchronized Router getRouterFor(ServletContext con) { return r.router; } - private static long getRefreshInterval(String contextPath) { + protected static long getRefreshInterval(String contextPath) { long delay = TimestampedRouter.DEFAULT_INTERVAL; String intervalFileName = "/etc/elda/conf.d/" + contextPath + "/delay.int"; InputStream is = EldaFileManager.get().open( intervalFileName ); diff --git a/elda-lda/src/main/java/com/epimorphics/lda/restlets/RouterRestletSupport.java b/elda-lda/src/main/java/com/epimorphics/lda/restlets/RouterRestletSupport.java index 77359ec2d..0c5c7b616 100644 --- a/elda-lda/src/main/java/com/epimorphics/lda/restlets/RouterRestletSupport.java +++ b/elda-lda/src/main/java/com/epimorphics/lda/restlets/RouterRestletSupport.java @@ -133,7 +133,7 @@ public static Router createRouterFor( ServletContext con ) { there may be multiple servlet contexts so we add a new only only if its not already in the instance's locator list. */ - private static void addBaseFilepath(String baseFilePath) { + protected static void addBaseFilepath(String baseFilePath) { FileManager fm = EldaFileManager.get(); for (Iterator il = fm.locators(); il.hasNext();) { Locator l = il.next(); diff --git a/pom.xml b/pom.xml index 835cca214..07d88c44f 100755 --- a/pom.xml +++ b/pom.xml @@ -102,21 +102,76 @@ + + + + + org.apache.velocity + velocity + ${ver.velocity} + + + + javax.servlet + javax.servlet-api + ${ver.servlet-api} + jar + provided + + + + junit + junit + ${ver.junit} + jar + compile + + + + org.slf4j + slf4j-api + ${ver.slf4j} + jar + compile + + + + xmlunit + xmlunit + ${ver.xmlunit} + + + + log4j + log4j + ${ver.log4j} + jar + compile + + + javax.mail + mail + + + javax.jms + jms + + + com.sun.jdmk + jmxtools + + + com.sun.jmx + jmxri + + + + + + - - org.apache.velocity - velocity - ${ver.velocity} - - - - org.apache.lucene - lucene-core - ${ver.lucene} - - javax.servlet javax.servlet-api @@ -141,12 +196,6 @@ compile - - xmlunit - xmlunit - ${ver.xmlunit} - - log4j log4j