Skip to content

extensibility modifications #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rwalpole wants to merge 13 commits into
base: master
Choose a base branch
from
Open

extensibility modifications #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
645808b
elda-lda/pom.xml
rwalpole Dec 10, 2014
dc865d2
[feature] added javax.servlet.Context application attribute to Veloci…
rwalpole Dec 10, 2014
ebd7bca
Merge branch 'master' of https://github.com/rwalpole/elda
rwalpole Dec 10, 2014
76f4428
[refactor] moved all dependencies into a dependencyManagement block a…
rwalpole Dec 11, 2014
00f3d7b
[refactor] moved explicit dependencies into this module's pom
rwalpole Dec 11, 2014
45f039b
[feature] changed getRefreshInterval method access to protected to al…
rwalpole Dec 11, 2014
36f3021
[feature] chaned addBaseFilepath method access to protected to allow …
rwalpole Dec 11, 2014
b2b1b9c
[ignore] reversion of previous commit which added javax.servlet.Conte…
rwalpole Dec 11, 2014
fc8d310
[merge] merged changes from upstream
rwalpole Apr 27, 2015
bc8eeab
[bugfix] corrected artifactId for javax.servlet-api
rwalpole Apr 27, 2015
7136f81
[ignore] removed javax.servlet-api dependency
rwalpole Apr 27, 2015
987e8cd
[ignore] removed redundant dependencies
rwalpole Apr 27, 2015
0e16f4f
Merge remote-tracking branch 'upstream/master'
rwalpole Dec 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions elda-lda/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<repository>
<id>epi-public-s3-snapshot</id>
<name>Epimorphics S3 snapshot repository</name>
<url>s3://epi-repository/snapshot</url>
<url>http://epi-repository.s3.amazonaws.com/snapshot</url>
<releases>
<enabled>false</enabled>
</releases>
Expand All @@ -28,7 +28,7 @@
<repository>
<id>epi-public-s3-release</id>
<name>Epimorphics S3 release repository</name>
<url>s3://epi-repository/release</url>
<url>http://epi-repository.s3.amazonaws.com/release</url>
<releases>
<enabled>true</enabled>
</releases>
Expand Down Expand Up @@ -131,6 +131,15 @@
<artifactId>jmock-legacy</artifactId>
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>

</dependencies>

<build>
Expand Down
1 change: 0 additions & 1 deletion elda-lda/src/main/java/com/epimorphics/lda/renderers/velocity/VelocityRendering.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ public VelocityEngine createVelocityEngine() {

Properties p = getProperties( velocityPath );
VelocityEngine ve = new VelocityEngine();

ve.init( p );

return ve;
Expand Down
2 changes: 1 addition & 1 deletion elda-lda/src/main/java/com/epimorphics/lda/restlets/RouterRestlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion elda-lda/src/main/java/com/epimorphics/lda/restlets/RouterRestletSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Locator> il = fm.locators(); il.hasNext();) {
Locator l = il.next();
Expand Down
85 changes: 67 additions & 18 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,21 +102,76 @@
</plugins>
</build>

<dependencyManagement>
<dependencies>

<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${ver.velocity}</version>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${ver.servlet-api}</version>
<type>jar</type>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${ver.junit}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${ver.slf4j}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<version>${ver.xmlunit}</version>
</dependency>

<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${ver.log4j}</version>
<type>jar</type>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</exclusion>
<exclusion>
<groupId>javax.jms</groupId>
<artifactId>jms</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jdmk</groupId>
<artifactId>jmxtools</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jmx</groupId>
<artifactId>jmxri</artifactId>
</exclusion>
</exclusions>
</dependency>

</dependencies>
</dependencyManagement>

<dependencies>

<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${ver.velocity}</version>
</dependency>

<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
<version>${ver.lucene}</version>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
Expand All @@ -141,12 +196,6 @@
<scope>compile</scope>
</dependency>

<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<version>${ver.xmlunit}</version>
</dependency>

<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
Expand Down