diff --git a/vipra-backend/.settings/org.eclipse.wst.common.component b/vipra-backend/.settings/org.eclipse.wst.common.component index fee11a2f426f91987d99e904782e2e9c558d37a6..212d3f4ff80ff555890e2782805b6d8c40fd3ac8 100644 --- a/vipra-backend/.settings/org.eclipse.wst.common.component +++ b/vipra-backend/.settings/org.eclipse.wst.common.component @@ -5,10 +5,10 @@ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/src/main/public"/> - <dependent-module archiveName="util-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/vipra-util/vipra-util"> + <dependent-module archiveName="vipra-util-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/vipra-util/vipra-util"> <dependency-type>uses</dependency-type> </dependent-module> - <property name="java-output-path" value="/vipra-backend/target/classes"/> <property name="context-root" value="vipra"/> + <property name="java-output-path" value="/vipra-backend/target/classes"/> </wb-module> </project-modules> diff --git a/vipra-backend/.settings/org.eclipse.wst.common.project.facet.core.xml b/vipra-backend/.settings/org.eclipse.wst.common.project.facet.core.xml index d59fb58d14dd57692727e9b2e695dd99cd5929ce..ac1b92e998d47a4423ca0ace37495eabe8ae86b8 100644 --- a/vipra-backend/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/vipra-backend/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <faceted-project> <fixed facet="wst.jsdt.web"/> - <installed facet="wst.jsdt.web" version="1.0"/> - <installed facet="jst.jaxrs" version="2.0"/> - <installed facet="jst.web" version="3.1"/> <installed facet="java" version="1.8"/> + <installed facet="jst.web" version="3.1"/> + <installed facet="jst.jaxrs" version="2.0"/> + <installed facet="wst.jsdt.web" version="1.0"/> </faceted-project> diff --git a/vipra-backend/pom.xml b/vipra-backend/pom.xml index 73c6ff9eda36c317668dfffb5bac585ca3502218..f20a493014601fd4f72e9e8ef5481efcfa84c7fe 100644 --- a/vipra-backend/pom.xml +++ b/vipra-backend/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>de.vipra</groupId> - <artifactId>backend</artifactId> + <artifactId>vipra-backend</artifactId> <version>0.0.1-SNAPSHOT</version> <packaging>war</packaging> @@ -106,7 +106,7 @@ <!-- Workspace --> <dependency> <groupId>de.vipra</groupId> - <artifactId>util</artifactId> + <artifactId>vipra-util</artifactId> <version>0.0.1-SNAPSHOT</version> </dependency> </dependencies> diff --git a/vipra-cmd/pom.xml b/vipra-cmd/pom.xml index 9b81219dcc7b123f3f47fd173cb4698ebaf6c10c..efc95329132d8f80e04dd6672475f04f16ef507f 100644 --- a/vipra-cmd/pom.xml +++ b/vipra-cmd/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>de.vipra</groupId> - <artifactId>cmd</artifactId> + <artifactId>vipra-cmd</artifactId> <version>0.0.1-SNAPSHOT</version> <packaging>jar</packaging> @@ -67,7 +67,7 @@ <!-- Workspace --> <dependency> <groupId>de.vipra</groupId> - <artifactId>util</artifactId> + <artifactId>vipra-util</artifactId> <version>0.0.1-SNAPSHOT</version> </dependency> </dependencies> diff --git a/vipra-ui/app/index.html b/vipra-ui/app/index.html index 80951609cf22fc7ffc86b08b6cff780287604d0c..e3dbfd1002647b514eec3a3d363e344e2c54b348 100644 --- a/vipra-ui/app/index.html +++ b/vipra-ui/app/index.html @@ -56,13 +56,13 @@ <div class="collapse navbar-collapse" id="vipra-navbar-collapse-1"> <ul class="nav navbar-nav"> <li ui-sref-active="active"> - <a ui-sref="explorer">Explorer</a> + <a ui-sref="explorer"><span class="mnemonic">E</span>xplorer</a> </li> <li ui-sref-active="active"> - <a ui-sref="articles">Articles</a> + <a ui-sref="articles"><span class="mnemonic">A</span>rticles</a> </li> <li ui-sref-active="active"> - <a ui-sref="topics">Topics</a> + <a ui-sref="topics"><span class="mnemonic">T</span>opics</a> </li> </ul> <form class="navbar-form navbar-left" role="search" ng-hide="$state.current.name === 'index'"> @@ -73,7 +73,7 @@ </form> <ul class="nav navbar-nav navbar-right"> <li ng-class="{'text-italic':rootModels.topicModel}"> - <a data-toggle="modal" data-target="#topicModelModal" ng-bind-template="{{rootModels.topicModel ? rootModels.topicModel.id : 'Models'}}" ng-attr-title="{{rootModels.topicModel.modelConfig.description}}"></a> + <a ng-click="chooseTopicModel()" ng-bind-template="{{rootModels.topicModel ? rootModels.topicModel.id : 'Models'}}" ng-attr-title="{{rootModels.topicModel.modelConfig.description}}"></a> </li> <li ui-sref-active="active"> <a ui-sref="about"> diff --git a/vipra-ui/app/js/controllers.js b/vipra-ui/app/js/controllers.js index e2493affbc3117036ddc424c42f502a4a4a5530c..980e7a074bdfbbab7ae5b9c7a364168957967560 100644 --- a/vipra-ui/app/js/controllers.js +++ b/vipra-ui/app/js/controllers.js @@ -18,15 +18,18 @@ search: null }; - TopicModelFactory.query({ - fields: '_all' - }, function(data) { - $scope.topicModels = data; - }, function(err) { - $scope.errors = err; - }); + $scope.queryTopicModels = function() { + TopicModelFactory.query({ + fields: '_all' + }, function(data) { + $scope.topicModels = data; + }, function(err) { + $scope.errors = err; + }); + }; $scope.chooseTopicModel = function() { + $scope.queryTopicModels(); $scope.rootModels.topicModelModalOpen = true; $('#topicModelModal').modal(); if ($scope.rootModels.topicModel) diff --git a/vipra-ui/app/less/app.less b/vipra-ui/app/less/app.less index 28b0aceefed40d77770937a8afe4c9f33ea4130c..9cefe0e5ee68d74f9bb08226635ee8d9250680ce 100644 --- a/vipra-ui/app/less/app.less +++ b/vipra-ui/app/less/app.less @@ -411,6 +411,13 @@ topic-menu { font-style: italic; } +.mnemonic { + *:hover > &, + *:hover { + text-decoration: underline; + } +} + @-moz-keyframes spin { 100% { -moz-transform: rotateY(360deg); diff --git a/vipra-util/pom.xml b/vipra-util/pom.xml index 4fd1e61073c4524385a864d85907668045e26228..4793ef1c0f61b5e2e6d8934ba87ccf675f01342e 100644 --- a/vipra-util/pom.xml +++ b/vipra-util/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>de.vipra</groupId> - <artifactId>util</artifactId> + <artifactId>vipra-util</artifactId> <version>0.0.1-SNAPSHOT</version> <properties> diff --git a/vm/bootstrap.sh b/vm/bootstrap.sh index c5041735ae0aae02a4ae2b25105512822ff1d1af..3f16a108e4f441315b79eccee2ad437e293ef43d 100644 --- a/vm/bootstrap.sh +++ b/vm/bootstrap.sh @@ -20,10 +20,11 @@ echo "TOMCAT8_GROUP=vagrant" >> /etc/default/tomcat8 chown -R vagrant.vagrant /var/log/tomcat8 /var/cache/tomcat8 /var/lib/tomcat8/conf/* # webapp directory -rm -f /vagrant/vm/webapps +rm -rf /vagrant/vm/webapps mkdir /vagrant/vm/webapps ln -sf /vagrant/vm/webapps /var/lib/tomcat8/webapps +systemctl enable tomcat8 systemctl restart tomcat8 # ----------------------------------------------------------------------------- @@ -33,6 +34,7 @@ wget https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/ gdebi -n elasticsearch-2.1.1.deb rm elasticsearch-2.1.1.deb +systemctl enable elasticsearch systemctl restart elasticsearch # -----------------------------------------------------------------------------