Skip to content
Snippets Groups Projects
Commit 740347f9 authored by Eike Cochu's avatar Eike Cochu
Browse files

added missing ui dependency

parent 02c19e11
Branches master
No related tags found
No related merge requests found
...@@ -2,7 +2,7 @@ FROM ubuntu:15.10 ...@@ -2,7 +2,7 @@ FROM ubuntu:15.10
MAINTAINER Eike Cochu <eike@cochu.com> MAINTAINER Eike Cochu <eike@cochu.com>
ENV ES_VERSION 2.3.1 ENV ES_VERSION 2.3.1
ENV TOMCAT_MAJOR 8 ENV TOMCAT_MAJOR 8
ENV TOMCAT_VERSION 8.0.33 ENV TOMCAT_VERSION 8.0.37
RUN echo "deb http://ppa.launchpad.net/nginx/stable/ubuntu wily main" >> /etc/apt/sources.list && \ RUN echo "deb http://ppa.launchpad.net/nginx/stable/ubuntu wily main" >> /etc/apt/sources.list && \
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C300EE8C && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C300EE8C && \
apt-get update && \ apt-get update && \
...@@ -12,7 +12,7 @@ RUN echo "deb http://ppa.launchpad.net/nginx/stable/ubuntu wily main" >> /etc/ap ...@@ -12,7 +12,7 @@ RUN echo "deb http://ppa.launchpad.net/nginx/stable/ubuntu wily main" >> /etc/ap
mkdir -p /webroot /var/log/supervisor /data/db && \ mkdir -p /webroot /var/log/supervisor /data/db && \
wget --no-check-certificate -O- https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/$ES_VERSION/elasticsearch-$ES_VERSION.tar.gz | tar xvfz - && \ wget --no-check-certificate -O- https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/$ES_VERSION/elasticsearch-$ES_VERSION.tar.gz | tar xvfz - && \
mv elasticsearch-$ES_VERSION elasticsearch && \ mv elasticsearch-$ES_VERSION elasticsearch && \
wget -O- http://apache.openmirror.de/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz | tar xvfz - && \ wget -O- http://mirror.23media.de/apache/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz | tar xvfz - && \
mv apache-tomcat-$TOMCAT_VERSION tomcat mv apache-tomcat-$TOMCAT_VERSION tomcat
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY tomcat-users.xml /tomcat/conf/tomcat-users.xml COPY tomcat-users.xml /tomcat/conf/tomcat-users.xml
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
"angular-hotkeys": "chieffancypants/angular-hotkeys#^1.x", "angular-hotkeys": "chieffancypants/angular-hotkeys#^1.x",
"eonasdan-bootstrap-datetimepicker": "^4.x", "eonasdan-bootstrap-datetimepicker": "^4.x",
"angulartics-google-analytics": "^0.1.4", "angulartics-google-analytics": "^0.1.4",
"angular-loading-bar": "^0.9.0" "angular-loading-bar": "^0.9.0",
"jquery-layout": "^1.4.3"
} }
} }
...@@ -19,6 +19,7 @@ public class ArticleWord implements Comparable<ArticleWord>, Serializable { ...@@ -19,6 +19,7 @@ public class ArticleWord implements Comparable<ArticleWord>, Serializable {
public ArticleWord() {} public ArticleWord() {}
public ArticleWord(final String word, final int count) { public ArticleWord(final String word, final int count) {
// TODO NPE
this.word = word.toLowerCase().trim(); this.word = word.toLowerCase().trim();
this.count = count; this.count = count;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment