From 24805766b1396d37fd968a97e0c5e0e4ddb4ad9e Mon Sep 17 00:00:00 2001
From: Mike Conway <mike.conway@nih.gov>
Date: Wed, 8 Aug 2018 09:31:17 -0400
Subject: [PATCH] #1 fixup of spring props

---
 .gitignore                                | 54 +++++++++++++----------
 packaging/docker/Dockerfile               | 14 +++---
 packaging/docker/runit.sh                 |  4 +-
 pom.xml                                   | 13 ++++--
 src/main/resources/application.properties |  1 -
 5 files changed, 48 insertions(+), 38 deletions(-)
 delete mode 100644 src/main/resources/application.properties

diff --git a/.gitignore b/.gitignore
index fac0df2..732e577 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1,33 @@
-/target/
-!.mvn/wrapper/maven-wrapper.jar
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
+**/.classpath
+.DS_Store
+**/nb-configuration.xml
+**/.springBeans
+**/testing.properties
+**/*.eml
+**/Scripts
 .idea
-*.iws
 *.iml
-*.ipr
-test*.properties
-### NetBeans ###
-/nbproject/private/
-/build/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
+.project
+.idea
+.metadata
+.DS_Store
+Servers
+.settings
+.classpath
+mvn-repo
+bin
+*.war
+*.log
+*/nbactions.xml
+*.eml
+nbactions.xml
+testing.properties
+*/test-output
+JargonVersion.java
+**/${test.option.mount.basedir}
+**/*.*~
+*.*~
+.dbeaver*
+test.*.properties
+**/target
+target
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index 2fee3f3..2587cd3 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -1,16 +1,12 @@
-FROM tomcat:jre8-alpine
-LABEL organization="iRODS"
+FROM openjdk:8-jre-alpine
+LABEL organization="NIEHS"
 LABEL maintainer="michael.c.conway@gmail.com"
-LABEL description="iRODS Metalnx Browser"
+LABEL description="iRODS Metadata Template REST endpoint"
 ADD runit.sh /
 
-ADD emc-metalnx-web.war /usr/local/tomcat/webapps/
+ADD MetadataTemplateService.jar /
 CMD ["/runit.sh"]
 
 
 
-# build: docker build -t diceunc/metalnx:latest .
-
-#  -v /home/mcc/webdavcert:/tmp/cert
-
-# run:  docker run -d --rm -p 8080:8080 -v /etc/irods-ext:/etc/irods-ext  -v /home/mcc/webdavcert:/tmp/cert --add-host irods420.irodslocal:172.16.250.101 diceunc/metalnx:latest
+# build: docker build -t diceunc/metadata-templates-rest:latest .
diff --git a/packaging/docker/runit.sh b/packaging/docker/runit.sh
index e6b17ec..6dc1d89 100644
--- a/packaging/docker/runit.sh
+++ b/packaging/docker/runit.sh
@@ -9,5 +9,5 @@ else
    echo "No cert to import"
 fi
 
-echo "running catalina"
-catalina.sh run > /tmp/catalina.out
+echo "running app"
+java -jar /MetadataTemplateService.jar
diff --git a/pom.xml b/pom.xml
index 8c81482..c929d91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,13 @@
 			<version>${spring.boot.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<optional>true</optional>
+			<version>${spring.boot.version}</version>
+		</dependency>
+
 		<!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger2 -->
 		<dependency>
 			<groupId>io.springfox</groupId>
@@ -217,12 +224,12 @@
 						<configuration>
 							<tasks>
 								<delete
-									file="${basedir}/src/test/resources/test.rest.properties" />
+									file="${basedir}/src/test/resources/test.metadatatemplate.properties" />
 								<touch
-									file="${basedir}/src/test/resources/test.rest.properties"
+									file="${basedir}/src/test/resources/test.metadatatemplate.properties"
 									mkdirs="true" />
 								<echo
-									file="${basedir}/src/test/resources/test.rest.properties"
+									file="${basedir}/src/test/resources/test.metadatatemplate.properties"
 									append="true">
 									irods.host=${jargon.test.irods.host}
 									irods.port=${jargon.test.irods.port}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
deleted file mode 100644
index 2338e47..0000000
--- a/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-server.port=8088
\ No newline at end of file