From 645808b65204ad2e42841e8effff533d13a158a8 Mon Sep 17 00:00:00 2001 From: rwalpole Date: Wed, 10 Dec 2014 09:46:08 +0000 Subject: [PATCH 01/10] elda-lda/pom.xml [ignore] modified epi-repository ptotcol to http --- elda-lda/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/elda-lda/pom.xml b/elda-lda/pom.xml index ac4c62fd7..8062b16c8 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 From dc865d241a9ceca0fba4f0846aa611461cfa57bc Mon Sep 17 00:00:00 2001 From: rwalpole Date: Wed, 10 Dec 2014 09:48:10 +0000 Subject: [PATCH 02/10] [feature] added javax.servlet.Context application attribute to VelocityEngine --- .../epimorphics/lda/renderers/velocity/VelocityRendering.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 aa8cd46fd..c40d2060b 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 @@ -183,7 +183,7 @@ protected VelocityEngine createVelocityEngine() { Properties p = getProperties( velocityPath ); VelocityEngine ve = new VelocityEngine(); - + ve.setApplicationAttribute("javax.servlet.Context", servletContext); ve.init( p ); return ve; From 76f442837ee48ddc8490950d1066ebb6333a1080 Mon Sep 17 00:00:00 2001 From: rwalpole Date: Thu, 11 Dec 2014 15:29:09 +0000 Subject: [PATCH 03/10] [refactor] moved all dependencies into a dependencyManagement block as they are all explicit dependencies of sub modules --- pom.xml | 145 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 73 insertions(+), 72 deletions(-) diff --git a/pom.xml b/pom.xml index e4dcd51b5..1d49f6c50 100755 --- a/pom.xml +++ b/pom.xml @@ -111,78 +111,79 @@ - - - - org.apache.velocity - velocity - ${ver.velocity} - - - - org.apache.lucene - lucene-core - ${ver.lucene} - - - - javax.servlet - 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 + 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 + + + + + + From 00f3d7b156717073bef8dcfeb2bcde1fe4589af3 Mon Sep 17 00:00:00 2001 From: rwalpole Date: Thu, 11 Dec 2014 15:42:47 +0000 Subject: [PATCH 04/10] [refactor] moved explicit dependencies into this module's pom --- elda-lda/pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/elda-lda/pom.xml b/elda-lda/pom.xml index 2db33b10f..709ab6f72 100755 --- a/elda-lda/pom.xml +++ b/elda-lda/pom.xml @@ -98,6 +98,11 @@ compile + + javax.servlet + servlet-api + + org.jmock jmock-junit4 @@ -114,6 +119,15 @@ jmock-legacy 2.6.0 + + xmlunit + xmlunit + + + junit + junit + + From 45f039bd12ad6c0ba16e228bb568cef4f0d98caf Mon Sep 17 00:00:00 2001 From: rwalpole Date: Thu, 11 Dec 2014 15:44:08 +0000 Subject: [PATCH 05/10] [feature] changed getRefreshInterval method access to protected to allow for extension --- .../main/java/com/epimorphics/lda/restlets/RouterRestlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7aca09094..a99a8d605 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 @@ -172,7 +172,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 ); From 36f30216b5b2aba04bf8afa0b4484ffafef56016 Mon Sep 17 00:00:00 2001 From: rwalpole Date: Thu, 11 Dec 2014 15:45:07 +0000 Subject: [PATCH 06/10] [feature] chaned addBaseFilepath method access to protected to allow for extension --- .../java/com/epimorphics/lda/restlets/RouterRestletSupport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ef17da188..1aaf24c6d 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 @@ -131,7 +131,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(); From b2b1b9c9b2b11093424dbf185d3eb38eb74da178 Mon Sep 17 00:00:00 2001 From: rwalpole Date: Thu, 11 Dec 2014 15:51:09 +0000 Subject: [PATCH 07/10] [ignore] reversion of previous commit which added javax.servlet.Context application attribute to VelocityEngine --- .../epimorphics/lda/renderers/velocity/VelocityRendering.java | 1 - 1 file changed, 1 deletion(-) 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 4facf69b1..681f4c801 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 @@ -183,7 +183,6 @@ protected VelocityEngine createVelocityEngine() { Properties p = getProperties( velocityPath ); VelocityEngine ve = new VelocityEngine(); - ve.setApplicationAttribute("javax.servlet.Context", servletContext); ve.init( p ); return ve; From bc8eeab759c91881c7d2d02c85732d9d082e613c Mon Sep 17 00:00:00 2001 From: walpolrx Date: Mon, 27 Apr 2015 15:14:51 +0100 Subject: [PATCH 08/10] [bugfix] corrected artifactId for javax.servlet-api --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 40ec70a2d..2134af7e6 100755 --- a/pom.xml +++ b/pom.xml @@ -118,10 +118,10 @@ lucene-core ${ver.lucene} - + javax.servlet - servlet-api + javax.servlet-api ${ver.servlet-api} jar provided From 7136f8112127271516a70c315018956315e571ef Mon Sep 17 00:00:00 2001 From: walpolrx Date: Mon, 27 Apr 2015 15:15:35 +0100 Subject: [PATCH 09/10] [ignore] removed javax.servlet-api dependency --- elda-lda/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/elda-lda/pom.xml b/elda-lda/pom.xml index 20644a78a..1ac13b6b6 100755 --- a/elda-lda/pom.xml +++ b/elda-lda/pom.xml @@ -98,11 +98,6 @@ compile - - javax.servlet - servlet-api - - org.jmock jmock-junit4 From 987e8cdb74a343cd3e4b4ddd283249fdc4077321 Mon Sep 17 00:00:00 2001 From: walpolrx Date: Mon, 27 Apr 2015 17:14:58 +0100 Subject: [PATCH 10/10] [ignore] removed redundant dependencies --- pom.xml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/pom.xml b/pom.xml index 2134af7e6..6b0fbf56d 100755 --- a/pom.xml +++ b/pom.xml @@ -113,12 +113,6 @@ ${ver.velocity} - - org.apache.lucene - lucene-core - ${ver.lucene} - - javax.servlet javax.servlet-api @@ -180,18 +174,6 @@ - - org.apache.velocity - velocity - ${ver.velocity} - - - - org.apache.lucene - lucene-core - ${ver.lucene} - - javax.servlet javax.servlet-api @@ -216,12 +198,6 @@ compile - - xmlunit - xmlunit - ${ver.xmlunit} - - log4j log4j