Merge pull request #16 from maartenplieger/master

Spring boot 2.0, Refactored to use spring boot tomcat instead of standalone tomcat
KNMI · Apr 4, 2019 · 32deee0 · 32deee0
2 parents c4bde32 + b4fe880
commit 32deee0
Show file tree

Hide file tree

Showing 69 changed files with 3,664 additions and 820 deletions.
diff --git a/.classpath b/.classpath
@@ -25,7 +25,6 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="adaguc-services-1.0.11">
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <property name="java-output-path" value="/adaguc-services/target/classes"/>
-        <property name="context-root" value="adaguc-services"/>
-    </wb-module>
-</project-modules>
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId"/>
diff --git a/Docker/adaguc-services-config.xml b/Docker/adaguc-services-config.xml
@@ -5,7 +5,22 @@
   <basedir>/adaguc/basedir</basedir>
   <server>
     <port>8080</port>
+    <porthttps>8443</porthttps>
+    <contextpath>/adaguc-services</contextpath>
   </server>
+  <security>
+    <enablessl>true</enablessl>
+
+    <truststore>/adaguc/security/truststore.ts</truststore>
+    <trustrootscadirectory>/root/.globus/certificates/</trustrootscadirectory>
+    <truststorepassword>changeit</truststorepassword>
+
+    <keystore>/adaguc/security/keystore.jks</keystore>
+    <keystorepassword>password</keystorepassword>
+    <keystoretype>JKS</keystoretype>
+    <keyalias>tomcat</keyalias>
+
+  </security>
   <adaguc-server>
     <adagucexecutable>/adaguc/adaguc-server-master/bin/adagucserver</adagucexecutable>
     <export>ADAGUC_PATH=/adaguc/adaguc-server-master/</export>

diff --git a/Docker/start.sh b/Docker/start.sh
@@ -172,4 +172,4 @@ then
 fi  
 
 echo "Starting TOMCAT Server" && \
-java -jar /adaguc/adaguc-services.war
+java -jar /adaguc/adaguc-services.jar
diff --git a/Docker/tomcat-server.xml b/Docker/tomcat-server.xml
diff --git a/Dockerfile b/Dockerfile
@@ -29,14 +29,19 @@ RUN yum update -y && yum install -y \
     maven \
     openssl
 
+# Install newer numpy
+RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+RUN python get-pip.py
+RUN pip install numpy netcdf4 six lxml    
+
 RUN mkdir /adaguc
 
 # Install adaguc-services from the context
 WORKDIR /adaguc/adaguc-services
 COPY /src/ /adaguc/adaguc-services/src/
 COPY pom.xml /adaguc/adaguc-services/pom.xml
 RUN mvn package
-RUN cp /adaguc/adaguc-services/target/adaguc-services-*.war /adaguc/adaguc-services.war
+RUN cp /adaguc/adaguc-services/target/adaguc-services-*.jar /adaguc/adaguc-services.jar
 
 # Install adaguc-server from github
 WORKDIR /adaguc

diff --git a/README.md b/README.md
@@ -26,5 +26,7 @@ For creating a new package:
 4) You can for example start this with java -jar demo-${VERSION}-SNAPSHOT.jar
 
 
+# Versions
 
+1.1.0 - Uses spring boot 2.0
 
diff --git a/adaguc-services-config.xml.example b/adaguc-services-config.xml.example
@@ -9,6 +9,7 @@
 
   <server>
     <port>8090</port>
+    <contextpath>/adaguc-services</contextpath>
   </server>
 
   <security>
@@ -49,10 +50,29 @@
     <export>USE_FONTCONFIG=False</export>
   </pywps-server>
 
+  <oauth2>
+    <provider name="google">    
+      <!-- New application can be created at https://congetEnabledsole.developers.google.com/apis/credentials -->
+      <authloc>https://accounts.google.com/o/oauth2/auth</authloc>                                                                                                                                                                                         
+      <tokenloc>https://accounts.google.com/o/oauth2/token</tokenloc>                                                                                                                                                                                      
+      <clientid>***</clientid>                                                                                                                                                        
+      <clientsecret>***</clientsecret>                                                                                                                                                                                                
+      <scope>email</scope>                                                                                                                                                                                                                                 
+      <logo>images/google.png</logo>                                                                                                                                                                                                         
+      <description>Sign in with Google</description>    
+    </provider>                                                                                                                                                                                                                                            
+  </oauth2> 
+
   <basket>
     <enabled>true</enabled>
   </basket>
 
+  <autowms>
+    <enabled>true</enabled>
+    <autowmspath>/data/adaguc-autowms/</autowmspath>
+    <datasetpath>/data/adaguc-datasets/</datasetpath>
+  </autowms>
+
   <joblist>
     <enabled>true</enabled>
   </joblist>
@@ -62,5 +82,15 @@
     <catalogpath>{ENV.ADAGUCSERVICES}/data/adaguc-services-base/catalog</catalogpath>
   </datasetcatalog>
 
+  <servicehealth>
+    <enabled>true</enabled>
+    <servicehealthpath>/data/adaguc-servicehealth/</servicehealthpath>
+  </servicehealth>
+
+  <esgfsearch>
+    <enabled>true</enabled>
+    <cachelocation>/tmp/esgfsearch</cachelocation>
+    <searchurl>https://esg-dn1.nsc.liu.se/esg-search/search?</searchurl>
+  </esgfsearch>
 
 </adaguc-services>