Commit dfc2f6db authored by garciay's avatar garciay
Browse files

Add RFC 5222 - LoST

parent fbced3a4

docker/Dockerfile

+1 −3
Original line number Diff line number Diff line
@@ -78,9 +78,7 @@ RUN echo "docker-titan-STF549" > /etc/hostname \ 
    && . /home/etsi/.bashrc \

    && mkdir -p bin lib include tmp frameworks docs man dev \

    && chown etsi:etsi bin lib include tmp frameworks docs man dev \

    && echo "**********************************************************************" \

    && echo "etsi ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers \

    && echo "**********************************************************************"

    && echo "etsi ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers



USER etsi

scripts/merge_emcom_project.bash

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ chmod 775 ${VAGRANT_DIR} 


# Execution path

RUN_PATH="${0%/*}"

PATH_DEV_EMCOM=`pwd`/../etsi_emcom

PATH_DEV_EMCOM=`pwd`/../../etsi_emcom



# Update ETSI Framework files

echo 'Merging ETSI Framework files'
@@ -234,6 +234,6 @@ do 
    rm $i

done



chmod -R 664 ${VAGRANT_DIR}

chmod -R 664 ${VAGRANT_DIR}/*.*

exit 0

ttcn/AtsNg112/AtsNg112_TestCases.ttcn

+13 −3
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ module AtsNg112_TestCases { 
    with {

        extension "File:../xsd/RFC4119_geopriv10_basic_policy.xsd";

    }

  

  import from urn_ietf_params_xml_ns_pidf_geopriv10_civicLoc language "XSD" all

    with {

        extension "File:../xsd/RFC4119_geopriv10_civicloc.xsd";
@@ -42,8 +41,19 @@ module AtsNg112_TestCases { 
    }

  

  // OpenGIS

  import from urn_ietf_params_xml_ns_pidf_geopriv10_geoShape language "XSD" all;

  import from http_www_opengis_net_gml language "XSD" all;

  import from urn_ietf_params_xml_ns_pidf_geopriv10_geoShape language "XSD" all

    with {

        extension "File:../xsd/OGC_GLM_Geoshape.xsd";

    }

  import from http_www_opengis_net_gml language "XSD" all

    with {

        extension "File:../xsd/gmlBase.xsd";

        extension "File:../xsd/basicTypes.xsd";

        extension "File:../xsd/measures.xsd";

        extension "File:../xsd/geometryPrimitives.xsd";

        extension "File:../xsd/geometryBasic0d1d.xsd";

        extension "File:../xsd/geometryBasic2d.xsd";

    }

  

  // Libcommon

  import from LibCommon_Time all;

ttcn/LibEmcom/LibNg112/ttcn/LibNg112_EncdecDeclarations.ttcn

+40 −10
Original line number Diff line number Diff line
@@ -3,19 +3,49 @@ module LibNg112_EncdecDeclarations { 
  import from XSD all;

  

  // RFC5985 Held

  import from urn_ietf_params_xml_ns_geopriv_held language "XSD" all;

  import from urn_ietf_params_xml_ns_geopriv_held_id language "XSD" all;

  import from urn_ietf_params_xml_ns_pidf_geopriv10 language "XSD" all;

  import from urn_ietf_params_xml_ns_pidf_geopriv10_basicPolicy language "XSD" all;

  import from urn_ietf_params_xml_ns_geopriv_held language "XSD" all

    with {

        extension "File:../xsd/RFC5985_held.xsd";

    }

  // RFC6155 Held ID

  import from urn_ietf_params_xml_ns_geopriv_held_id language "XSD" all

    with {

        extension "File:../xsd/RFC6155_held_id.xsd";

    }

  import from urn_ietf_params_xml_ns_pidf_geopriv10 language "XSD" all

    with {

        extension "File:../xsd/RFC4119_geopriv10.xsd";

    }

  import from urn_ietf_params_xml_ns_pidf_geopriv10_basicPolicy language "XSD" all

    with {

        extension "File:../xsd/RFC4119_geopriv10_basic_policy.xsd";

    }

  

  import from urn_ietf_params_xml_ns_pidf_geopriv10_civicLoc language "XSD" all;

  import from urn_ietf_params_xml_ns_pidf_geopriv10_civicLoc language "XSD" all

    with {

        extension "File:../xsd/RFC4119_geopriv10_civicloc.xsd";

    }

  

  // 

  import from urn_ietf_params_xml_ns_pidf language "XSD" all;

  // RFC3863 

  import from urn_ietf_params_xml_ns_pidf language "XSD" all

    with {

        extension "File:../xsd/RFC3863_pidf.xsd";

    }

  

  // OpenGIS

  import from urn_ietf_params_xml_ns_pidf_geopriv10_geoShape language "XSD" all;

  import from http_www_opengis_net_gml language "XSD" all;

  import from urn_ietf_params_xml_ns_pidf_geopriv10_geoShape language "XSD" all

  with {

    extension "File:../xsd/OGC_GLM_Geoshape.xsd";

  }

  import from http_www_opengis_net_gml language "XSD" all

  with {

    extension "File:../xsd/gmlBase.xsd";

    extension "File:../xsd/basicTypes.xsd";

    extension "File:../xsd/measures.xsd";

    extension "File:../xsd/geometryPrimitives.xsd";

    extension "File:../xsd/geometryBasic0d1d.xsd";

    extension "File:../xsd/geometryBasic2d.xsd";

  }

  

  external function enc_LocationRequest(in LocationRequest p_loction_request) return octetstring

  with { extension "prototype (convert) encode(XER:XER_EXTENDED)" };

ttcn/LibEmcom/LibNg112/ttcn/LibNg112_Pixits.ttcn

+13 −2
Original line number Diff line number Diff line
@@ -3,8 +3,19 @@ module LibNg112_Pixits { 
  import from XSD all;

  

  // OpenGIS

  import from urn_ietf_params_xml_ns_pidf_geopriv10_geoShape language "XSD" all;

  import from http_www_opengis_net_gml language "XSD" all;

  import from urn_ietf_params_xml_ns_pidf_geopriv10_geoShape language "XSD" all

  with {

    extension "File:../xsd/OGC_GLM_Geoshape.xsd";

  }

  import from http_www_opengis_net_gml language "XSD" all

  with {

    extension "File:../xsd/gmlBase.xsd";

    extension "File:../xsd/basicTypes.xsd";

    extension "File:../xsd/measures.xsd";

    extension "File:../xsd/geometryPrimitives.xsd";

    extension "File:../xsd/geometryBasic0d1d.xsd";

    extension "File:../xsd/geometryBasic2d.xsd";

  }



  /**

   * @desc Epsilon for Double valules comparison