Changeset 753


Ignore:
Timestamp:
Mar 14, 2016, 10:34:09 AM (9 years ago)
Author:
djay
Message:

Add the MapServer? 7.0.1 internal support. Add the ZOO-Client API reference in the official documentation. Add support for exotic openssl location.

Location:
trunk/zoo-project
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/zoo-project/HISTORY.txt

    r752 r753  
    11Version 1.6.0-dev
    2   * Add CORS support
    3   * Fix issue when dealing with Array in JavaScript support
     2  * Add the MapServer 7.0.1 internal support.
     3  * Support for exotic location of openssl.
     4  * Add ZOO-Client API documentation reference in the official documentation.
     5  * Add CORS support.
     6  * Fix issue when dealing with Array in JavaScript support.
    47  * Update the Centos installation procedure.
    58  * Small fixes in java support.

  • trunk/zoo-project/zoo-client/lib/tpl/payload_Execute.mustache

    r752 r753  
    22../wpsExecute_request.xsd" language="{{language}}">
    33  <!-- template-version: 0.21 -->
    4         <ows:Identifier>{{Identifier}}</ows:Identifier>
    5         <wps:DataInputs>
     4  <ows:Identifier>{{Identifier}}</ows:Identifier>
     5  <wps:DataInputs>
    66{{#DataInputs}}
    77{{#is_literal}}
    8                 <wps:Input>
    9                         <ows:Identifier>{{identifier}}</ows:Identifier>
    10                         <wps:Data>
    11                                 <wps:LiteralData{{#dataType}} dataType="{{dataType}}"{{/dataType}}>{{value}}</wps:LiteralData>
    12                         </wps:Data>
    13                 </wps:Input>
     8    <wps:Input>
     9      <ows:Identifier>{{identifier}}</ows:Identifier>
     10      <wps:Data>
     11        <wps:LiteralData{{#dataType}} dataType="{{dataType}}"{{/dataType}}>{{value}}</wps:LiteralData>
     12      </wps:Data>
     13    </wps:Input>
    1414{{/is_literal}}
    1515{{#is_bbox}}
    16                 <wps:Input>
    17                         <ows:Identifier>{{identifier}}</ows:Identifier>
    18                         <wps:Data>
    19                                 <wps:BoundingBoxData ows:crs="{{crs}}" ows:dimensions="{{dimension}}">
    20             <ows:LowerCorner>{{lowerCorner}}</ows:LowerCorner>
    21             <ows:UpperCorner>{{upperCorner}}</ows:UpperCorner>
    22          </wps:BoundingBoxData>
    23                         </wps:Data>
    24                 </wps:Input>
     16    <wps:Input>
     17      <ows:Identifier>{{identifier}}</ows:Identifier>
     18      <wps:Data>
     19        <wps:BoundingBoxData ows:crs="{{crs}}" ows:dimensions="{{dimension}}">
     20          <ows:LowerCorner>{{lowerCorner}}</ows:LowerCorner>
     21          <ows:UpperCorner>{{upperCorner}}</ows:UpperCorner>
     22        </wps:BoundingBoxData>
     23      </wps:Data>
     24    </wps:Input>
    2525{{/is_bbox}}
    2626{{#is_complex}}
    2727{{#is_reference}}
    2828{{#is_get}}
    29                 <wps:Input>
    30                         <ows:Identifier>{{identifier}}</ows:Identifier>
    31                         <wps:Reference xlink:href="{{href}}"{{#schema}} schema="{{shema}}"{{/schema}}{{#mimeType}} mimeType="{{mimeType}}"{{/mimeType}}{{#encoding}} encoding="{{encoding}}"{{/encoding}}/>
    32                 </wps:Input>
     29    <wps:Input>
     30      <ows:Identifier>{{identifier}}</ows:Identifier>
     31      <wps:Reference xlink:href="{{href}}"{{#schema}} schema="{{shema}}"{{/schema}}{{#mimeType}} mimeType="{{mimeType}}"{{/mimeType}}{{#encoding}} encoding="{{encoding}}"{{/encoding}}/>
     32    </wps:Input>
    3333{{/is_get}}
    3434{{#is_post}}
    35                 <wps:Input>
    36                         <ows:Identifier>{{identifier}}</ows:Identifier>
    37                         <wps:Reference xlink:href="{{href}}" method="{{method}}" {{#schema}} schema="{{shema}}"{{/schema}}{{#mimeType}} mimeType="{{mimeType}}"{{/mimeType}}{{#encoding}} encoding="{{encoding}}"{{/encoding}}>
     35    <wps:Input>
     36      <ows:Identifier>{{identifier}}</ows:Identifier>
     37      <wps:Reference xlink:href="{{href}}" method="{{method}}" {{#schema}} schema="{{shema}}"{{/schema}}{{#mimeType}} mimeType="{{mimeType}}"{{/mimeType}}{{#encoding}} encoding="{{encoding}}"{{/encoding}}>
    3838{{#headers}}
    39                           <wps:Header key="{{key}}" value="{{value}}" />
     39        <wps:Header key="{{key}}" value="{{value}}" />
    4040{{/headers}}
    41                           <wps:Body>{{{value}}}</wps:Body>
    42                         </wps:Reference>
    43                 </wps:Input>
     41        <wps:Body>{{{value}}}</wps:Body>
     42      </wps:Reference>
     43    </wps:Input>
    4444{{/is_post}}
    4545{{/is_reference}}
    4646{{^is_reference}}
    47                 <wps:Input>
     47    <wps:Input>
    4848      <ows:Identifier>{{identifier}}</ows:Identifier>
    4949      <wps:Data>
    50         <wps:ComplexData{{#schema}} schema="{{shema}}"{{/schema}}{{#mimeType}} mimeType="{{mimeType}}"{{/mimeType}}{{#encoding}} encoding="{{encoding}}"{{/encoding}}>{{#is_XML}}
    51          {{{value}}}{{/is_XML}}{{^is_XML}}<![CDATA[{{{value}}}]]>{{/is_XML}}
    52         </wps:ComplexData>
     50        <wps:ComplexData{{#schema}} schema="{{shema}}"{{/schema}}{{#mimeType}} mimeType="{{mimeType}}"{{/mimeType}}{{#encoding}} encoding="{{encoding}}"{{/encoding}}>{{#is_XML}}{{{value}}}{{/is_XML}}{{^is_XML}}<![CDATA[{{{value}}}]]>{{/is_XML}}</wps:ComplexData>
    5351      </wps:Data>
    5452    </wps:Input>
    … …  
    5654{{/is_complex}}
    5755{{/DataInputs}}
    58         </wps:DataInputs>       
    59         <wps:ResponseForm>
     56  </wps:DataInputs>     
     57  <wps:ResponseForm>
    6058{{#RawDataOutput}}
    6159{{#DataOutputs}}

  • trunk/zoo-project/zoo-kernel/Makefile.in

    r745 r753  
    5858
    5959service_internal_ms.o: service_internal_ms.c
    60         gcc ${JS_ENABLED} ${JSCFLAGS} ${XML2CFLAGS} ${CFLAGS} -fPIC -c service_internal_ms.c
     60        gcc ${JS_ENABLED} ${GDAL_CFLAGS}  ${JSCFLAGS} ${XML2CFLAGS} ${CFLAGS} -fPIC -c service_internal_ms.c
    6161
    6262service_internal_python.o: service_internal_python.c service.h

  • trunk/zoo-project/zoo-kernel/ZOOMakefile.opts.in

    r740 r753  
    6868
    6969ZOO_CFLAGS=-I${ZRPATH}/../thirds/cgic206/ -I${ZRPATH}/zoo-kernel/
    70 ZOO_LDFLAGS=-lcrypto -luuid
     70ZOO_LDFLAGS=@OPENSSL_LDFLAGS@ -luuid
    7171
    7272JAVACFLAGS=@JAVA_CPPFLAGS@
    … …  
    9696SAGA_FILE=@SAGA_FILE@
    9797
    98 CFLAGS=@RELY_ON_DB@ @DEB_DEF@ -fpic ${FCGI_CFLAGS} ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
    99 LDFLAGS=-lzoo_service @DEFAULT_LIBS@ -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS}  ${FCGI_LDFLAGS} -lcrypto -luuid ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${MACOS_LD_NET_FLAGS} ${YAML_LDFLAGS} ${OTBLDFLAGS} ${SAGA_LDFLAGS}
     98CFLAGS=@RELY_ON_DB@ @DEB_DEF@ -fpic @OPENSSL_CFLAGS@ ${FCGI_CFLAGS} ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
     99LDFLAGS=-lzoo_service @DEFAULT_LIBS@ -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS}  ${FCGI_LDFLAGS} @OPENSSL_LDFLAGS@ -luuid ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${MACOS_LD_NET_FLAGS} ${YAML_LDFLAGS} ${OTBLDFLAGS} ${SAGA_LDFLAGS}
    100100

  • trunk/zoo-project/zoo-kernel/configure.ac

    r740 r753  
    3838AC_FUNC_REALLOC
    3939AC_CHECK_FUNCS([dup2 getcwd memset setenv strdup strstr])
     40
     41#============================================================================
     42# Detect if openssl is available
     43#============================================================================
     44
     45AC_ARG_WITH([openssl],
     46    [AS_HELP_STRING([--with-openssl=PATH], [Specifies an alternative location for the openssl library])],
     47    [OPENSSL_DIR="$withval"], [OPENSSL_DIR="/usr/"])
     48OPENSSL_CFLAGS="-I$OPENSSL_DIR/include"
     49OPENSSL_LDFLAGS="-lcrypto -L$OPENSSL_DIR/lib -lssl"
     50CPPFLAGS_SAVE="$CPPFLAGS"
     51CPPFLAGS="$OPENSSL_CFLAGS"
     52LIBS_SAVE="$LIBS"
     53LIBS="$OPENSSL_LDFLAGS"
     54AC_CHECK_HEADERS([openssl/md5.h openssl/hmac.h openssl/evp.h openssl/bio.h openssl/buffer.h],
     55                        [], [AC_MSG_ERROR([could not find header file $i related to openssl])])
     56AC_CHECK_LIB(crypto, BIO_f_base64,
     57                        [], [AC_MSG_ERROR([could not find $i function in openssl library])])
     58AC_SUBST([OPENSSL_CFLAGS])
     59AC_SUBST([OPENSSL_LDFLAGS])
    4060
    4161#============================================================================
    … …  
    333353       [MS_SRC_PATH="$withval"], [MS_SRC_PATH=""])
    334354
     355AC_ARG_WITH([ms-version],
     356       [AS_HELP_STRING([--with-ms-version=VERSION], [Specifies the MapServer version to build against])],
     357       [MS_VERSION="$withval"], [MS_VERSION=""])
     358
    335359if test -z $MS_SRC_PATH;
    336360then
    … …  
    345369               AC_MSG_RESULT([Using MacOS X Framework for MapServer])
    346370       else
     371        if test "x$MS_VERSION" = "x7";
     372        then
     373                MS_LDFLAGS="-L$MS_SRC_PATH/lib -lmapserver"
     374                MS_CPPFLAGS="-DUSE_MS -I$MS_SRC_PATH/include/mapserver "
     375                AC_MSG_RESULT([Using user-specified MapServer src path: $MS_SRC_PATH])
     376        else
    347377               if test -d $MS_SRC_PATH; then
    348378                       MS_LDFLAGS="-L$MS_SRC_PATH -lmapserver `$MS_SRC_PATH/mapserver-config --libs`"
    … …  
    353383                       AC_MSG_ERROR([the user-specified mapserver-config file $MS_SRC_PATH does not exist])
    354384               fi
     385        fi
    355386       fi
    356387       MS_FILE="service_internal_ms.o"

  • trunk/zoo-project/zoo-kernel/service_internal_ms.c

    r752 r753  
    669669    if(initClass((myLayer->CLASS[myLayer->numclasses])) == -1)
    670670      return -1;
     671#if MS_VERSION_MAJOR<7
    671672    myLayer->CLASS[myLayer->numclasses]->type = myLayer->type;
     673#endif
    672674    if(msGrowClassStyles(myLayer->CLASS[myLayer->numclasses]) == NULL)
    673675      return -1;
    … …  
    918920            if(initClass((myLayer->CLASS[myLayer->numclasses])) == -1)
    919921              return -1;
     922#if MS_VERSION_MAJOR<7
    920923            myLayer->CLASS[myLayer->numclasses]->type = myLayer->type;
     924#endif
    921925            if(msGrowClassStyles(myLayer->CLASS[myLayer->numclasses]) == NULL)
    922926              return -1;
Note: See TracChangeset for help on using the changeset viewer.

Download now !

Search

Context Navigation

Main Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png