Merge pull request #10 from EBIvariation/hotfix/swagger-host

Customisable configuration EVA-388

Author: jmmut

eva-server/pom.xml

@@ -49,6 +49,24 @@
         <finalName>eva</finalName>
 
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <webResources>
+                        <resource>
+                            <filtering>true</filtering>
+                            <directory>src/main/webapp</directory>
+                            <includes>
+                                <include>**/web.xml</include>
+                            </includes>
+                        </resource>
+                    </webResources>
+                    <warSourceDirectory>src/main/webapp</warSourceDirectory>
+                    <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
@@ -62,6 +80,13 @@
                 </configuration>
             </plugin>
         </plugins>
+        
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
     </build>
 
 </project>

eva-server/src/main/resources/eva.properties

@@ -1,12 +1,12 @@
-eva.mongo.host=
-eva.mongo.user=
-eva.mongo.passwd=
-eva.mongo.auth.db=
+eva.mongo.host=${eva.mongo.host}
+eva.mongo.user=${eva.mongo.user}
+eva.mongo.passwd=${eva.mongo.passwd}
+eva.mongo.auth.db=${eva.mongo.auth.db}
 
-eva.mongo.collections.variants=
-eva.mongo.collections.files=
+eva.mongo.collections.variants=${eva.mongo.collections.variants}
+eva.mongo.collections.files=${eva.mongo.collections.files}
 
-eva.version=
+eva.version=${eva.version}
 
-eva.evapro.datasource=dstest
+eva.evapro.datasource=${eva.evapro.datasource}
 

eva-server/src/main/webapp/WEB-INF/web.xml

@@ -40,7 +40,7 @@
         </init-param>
         <init-param>
           <param-name>swagger.api.basepath</param-name>
-          <param-value>http://localhost:8080/webservices/rest</param-value>
+          <param-value>${eva.context.root}/webservices/rest</param-value>
         </init-param>
         <load-on-startup>2</load-on-startup>
     </servlet>
@@ -51,9 +51,10 @@
     </welcome-file-list>
 
     <resource-ref>
-        <description>JDBC Data Source</description>
-        <res-ref-name>jdbc/dstest</res-ref-name>
+        <description>EVAPRO Data Source</description>
+        <res-ref-name>jdbc/${eva.evapro.datasource}</res-ref-name>
         <res-type>javax.sql.DataSource</res-type>
         <res-auth>Container</res-auth>
     </resource-ref>
-</web-app>
+</web-app>
+

eva-server/src/main/webapp/webservices/api/index.html

@@ -33,7 +33,7 @@
       if (url && url.length > 1) {
         url = decodeURIComponent(url[1]);
       } else {
-        url = "http://www.ebi.ac.uk/eva/webservices/rest/swagger.json";
+        url = window.location.protocol + "//" + window.location.host + "/eva/webservices/rest/swagger.json";
       }
 
       // Pre load translate...