Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
ma-impl
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
eccochu
ma-impl
Commits
740347f9
Commit
740347f9
authored
8 years ago
by
Eike Cochu
Browse files
Options
Downloads
Patches
Plain Diff
added missing ui dependency
parent
02c19e11
Branches
master
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docker/Dockerfile
+2
-2
2 additions, 2 deletions
docker/Dockerfile
vipra-ui/bower.json
+2
-1
2 additions, 1 deletion
vipra-ui/bower.json
vipra-util/src/main/java/de/vipra/util/model/ArticleWord.java
+1
-0
1 addition, 0 deletions
...a-util/src/main/java/de/vipra/util/model/ArticleWord.java
with
5 additions
and
3 deletions
docker/Dockerfile
+
2
−
2
View file @
740347f9
...
@@ -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.3
3
ENV
TOMCAT_VERSION 8.0.3
7
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.d
e/tomcat/tomcat-
$TOMCAT_MAJOR
/v
$TOMCAT_VERSION
/bin/apache-tomcat-
$TOMCAT_VERSION
.tar.gz |
tar
xvfz -
&&
\
wget
-O-
http://
mirror.23media.de/apach
e/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
...
...
This diff is collapsed.
Click to expand it.
vipra-ui/bower.json
+
2
−
1
View file @
740347f9
...
@@ -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"
}
}
}
}
This diff is collapsed.
Click to expand it.
vipra-util/src/main/java/de/vipra/util/model/ArticleWord.java
+
1
−
0
View file @
740347f9
...
@@ -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
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment