Ticket #307: t307-renamed-war-and-endpoints-to-rasdaman.patch

File t307-renamed-war-and-endpoints-to-rasdaman.patch, 3.8 KB (added by abeccati, 11 years ago)

interim work

  • applications/petascope/Makefile.am 

    From 498927cee918bcddf33f6daaa9bf8795b6eaceac Mon Sep 17 00:00:00 2001
From: Alan Beccati <a.beccati@jacobs-university.de>
Date: Mon, 25 Nov 2013 19:00:13 +0100
Subject: [PATCH] ticket:307 renamed war and endpoints to rasdaman

---
 applications/petascope/Makefile.am                 |    4 +--
 .../petascope/src/main/webapp/WEB-INF/web.xml.in   |   27 +++++++++++++++-----
 systemtest/conf/test.cfg                           |    8 +++---
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/applications/petascope/Makefile.am b/applications/petascope/Makefile.am
index c6f5b69..10d2aa2 100644
    a b BUILD = build  
    5050DIST      = $(BUILD)/dist
    5151WEB       = $(BUILD)/web
    5252CLASSES   = $(WEB)/WEB-INF/classes
    53 NAME      = petascope
     53NAME      = rasdaman
    5454WAR_NAME  = $(NAME).war
    5555WAR       = $(DIST)/$(WAR_NAME)
    5656APIDOCS   = $(BUILD)/apidocs
    … … clean:  
    189189# build jar file
    190190.PHONY: jar
    191191jar: compileit
    192         $(CD) $(CLASSES); $(JAR) $(JARFLAGS) ../../../petascope.jar .
     192        $(CD) $(CLASSES); $(JAR) $(JARFLAGS) ../../../$(NAME).jar .
    193193
    194194# inject petascope libs into the 52n wps
    195195.PHONY: wps

  • applications/petascope/src/main/webapp/WEB-INF/web.xml.in 

    diff --git a/applications/petascope/src/main/webapp/WEB-INF/web.xml.in b/applications/petascope/src/main/webapp/WEB-INF/web.xml.in
index dab7da0..9bd8eae 100644
    a b  
    5151                <param-value>/wms-messages/raswms_msgs_en</param-value>
    5252        </init-param>
    5353    </servlet>
     54   
    5455    <servlet-mapping>
    5556        <servlet-name>PetaScope Interface</servlet-name>
    5657        <url-pattern>/*</url-pattern>
    5758    </servlet-mapping>
    5859    <servlet-mapping>
    59         <servlet-name>wcpsServlet</servlet-name>
    60         <url-pattern>/wcps</url-pattern>
     60        <servlet-name>PetaScope Interface</servlet-name>
     61        <url-pattern>/ows/wps</url-pattern>
     62    </servlet-mapping>
     63        <servlet-mapping>
     64        <servlet-name>WmsServlet</servlet-name>
     65        <url-pattern>/ows/wms</url-pattern>
    6166    </servlet-mapping>
     67
    6268    <servlet-mapping>
    63         <servlet-name>wcstServlet</servlet-name>
    64         <url-pattern>/wcst</url-pattern>
     69        <servlet-name>PetaScope Interface</servlet-name>
     70        <url-pattern>/ows/wcs</url-pattern>
    6571    </servlet-mapping>
     72    <!-- the above should be replaced with a WCS Interface that handles
     73     different versions of the WCS protocol, invoking the proper classes
     74     and providing overall access to wcs wcs2 and wcst
    6675    <servlet-mapping>
    6776        <servlet-name>Wcs2Servlet</servlet-name>
    6877        <url-pattern>/wcs2</url-pattern>
    6978    </servlet-mapping>
    7079    <servlet-mapping>
    71         <servlet-name>WmsServlet</servlet-name>
    72         <url-pattern>/wms</url-pattern>
     80        <servlet-name>wcstServlet</servlet-name>
     81        <url-pattern>/wcst</url-pattern>
     82    </servlet-mapping>
     83        -->
     84       
     85    <servlet-mapping>
     86        <servlet-name>wcpsServlet</servlet-name>
     87        <url-pattern>/wcps</url-pattern>
    7388    </servlet-mapping>
    7489    <servlet-mapping>
    7590        <servlet-name>RasqlServlet</servlet-name>

  • systemtest/conf/test.cfg 

    diff --git a/systemtest/conf/test.cfg b/systemtest/conf/test.cfg
index 60b1caf..bdc6ae0 100644
    a b export PG_PORT=5432  
    5757export PS_DB=petascopedb
    5858
    5959export WCPS_PORT=8080
    60 export PETASCOPE_URL="http://localhost:$WCPS_PORT/petascope"
    61 export WCS_URL="$PETASCOPE_URL"
    62 export WCPS_URL="$PETASCOPE_URL/wcps"
    63 export WMS_URL="$PETASCOPE_URL/wms"
     60export PETASCOPE_URL="http://localhost:$WCPS_PORT/rasdaman"
     61export WCS_URL="$PETASCOPE_URL/ows/wcs"
     62export WCPS_URL="$PETASCOPE_URL/ows/wcps"
     63export WMS_URL="$PETASCOPE_URL/ows/wms"
    6464
    6565# ------------------------------------------------------------------------------
    6666# secore connection details