Skip to content

Commit

Permalink
modified: Dockerfile
Browse files Browse the repository at this point in the history
- fixed loading of the config

modified:   README.md
- added some more TODOs

modified:   pom.xml
- this is the NDE Termennetwerk not the Registry

modified:   src/main/java/nl/knaw/huc/di/nde/TermDTO.java
- cleanup

modified:   src/main/java/nl/knaw/huc/di/nde/TermDTO.java
  • Loading branch information
menzowindhouwer committed Nov 28, 2018
1 parent b98e3c7 commit ccdca12
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ RUN mvn package

EXPOSE 8080

ENTRYPOINT ["mvn","-Dexec.args=-Dexec.args=-Dnde.config=`pwd`/conf/termennetwerk.xml -classpath %classpath nl.knaw.huc.di.nde.Main", "-Dexec.executable=java", "org.codehaus.mojo:exec-maven-plugin:1.5.0:exec"]
ENTRYPOINT ["mvn","-Dexec.args=-Dnde.config=/app/nde-termennetwerk/conf/termennetwerk.xml -classpath %classpath nl.knaw.huc.di.nde.Main", "-Dexec.executable=java", "org.codehaus.mojo:exec-maven-plugin:1.5.0:exec"]
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,6 @@ $ curl -XPOST -H 'Content-Type:application/graphql' -d 'query { terms(match:"Ab
* [ ] keep the languages
* [ ] query multiple datasets and merge the results
* [ ] fuller support for the NDE API design
* [ ] how to deal with different response times
* [ ] use Dropwizard
* [ ] ...
12 changes: 4 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@

<modelVersion>4.0.0</modelVersion>

<groupId>nl.knaw.meertens</groupId>
<artifactId>nde-registry</artifactId>
<groupId>nl.knaw.huc.di</groupId>
<artifactId>nde-termennetwerk</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>NDE Registry</name>
<name>NDE Termennetwerk</name>

<dependencyManagement>
<dependencies>
Expand All @@ -34,10 +34,6 @@
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
</dependency>
<!--<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-moxy</artifactId>
</dependency>-->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down Expand Up @@ -104,7 +100,7 @@
</execution>
</executions>
<configuration>
<mainClass>nl.knaw.meertens.nde.Main</mainClass>
<mainClass>nl.knaw.huc.di.nde.Main</mainClass>
</configuration>
</plugin>
</plugins>
Expand Down
1 change: 0 additions & 1 deletion src/main/java/nl/knaw/huc/di/nde/TermDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import java.util.List;

public class TermDTO {

public URI uri;
public List<String> prefLabel;
public List<String> altLabel;
Expand Down

0 comments on commit ccdca12

Please sign in to comment.