Commit d2de69c7 authored by garciay's avatar garciay
Browse files

Re-organize Geopriv CivicAddress

parent 42b051eb
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ PATH_PATCHES=`pwd`
if [ -d ${PATH_PATCHES} ]
then
    # Update Ng112
    cp ${PATH_PATCHES}/ng112.bash ${PATH_DEV_EMCOM}/src/AtsNg112/bin
    cp ${PATH_PATCHES}/ng112_generate_makefile.bash ${PATH_DEV_EMCOM}/src/AtsNg112/bin
    cp ${PATH_PATCHES}/run_mtc.bash ${PATH_DEV_EMCOM}/src/AtsNg112/bin
    cp ${PATH_PATCHES}/run_ptcs.bash ${PATH_DEV_EMCOM}/src/AtsNg112/bin
    cp ${PATH_PATCHES}/run_all.bash ${PATH_DEV_EMCOM}/src/AtsNg112/bin
+2 −2
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ 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
  import from urn_ietf_params_xml_ns_pidf_geopriv10_civicAddr language "XSD" all
    with {
        extension "File:../xsd/RFC4119_geopriv10_civicloc.xsd";
        extension "File:../xsd/RFC5139_pdif_geopriv10_civic_address.xsd";
    }

  // RFC3863 
+6 −6
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ module LibNg112_EncdecDeclarations {
        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_civicAddr language "XSD" all
    with {
        extension "File:../xsd/RFC4119_geopriv10_civicloc.xsd";
        extension "File:../xsd/RFC5139_pdif_geopriv10_civic_address.xsd";
    }
  
  // RFC3863 
@@ -33,9 +33,9 @@ module LibNg112_EncdecDeclarations {
    }
  
  // OpenGIS
  import from urn_ietf_params_xml_ns_pidf_geopriv10_geoShape language "XSD" all
  import from http_www_opengis_net_pidflo_1_0 language "XSD" all
    with {
    extension "File:../xsd/OGC_GLM_Geoshape.xsd";
        extension "File:../xsd/GLM-pidf-lo-shape.xsd";
    }
  import from http_www_opengis_net_gml language "XSD" all
  with {
+183 −0
Original line number Diff line number Diff line
/*******************************************************************************
* Copyright (c) 2000-2016 Ericsson Telecom AB
*
* XSD to TTCN-3 Translator version: CRL 113 200/5 R4D                       
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
//
//  File:          NoTargetNamespace.ttcn
//  Description:
//  References:
//  Rev:
//  Prodnr:
//  Updated:       Fri Mar  4 09:23:30 2016
//  Contact:       http://ttcn.ericsson.se
//
////////////////////////////////////////////////////////////////////////////////
//	Generated from file(s):
//	- Ims3gpp.xsd
//			/* xml version = "1.0" encoding = "UTF-8" */
//			/* targetnamespace = "NoTargetNamespace" */
////////////////////////////////////////////////////////////////////////////////
//     Modification header(s):
//-----------------------------------------------------------------------------
//  Modified by:
//  Modification date:
//  Description:
//  Modification contact:
//------------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////


module NoTargetNamespace {


import from XSD all;


type record TIMS3GPP
{
	XSD.Decimal version,
	record of XSD.String attr optional,
	union {
		TAlternativeService alternative_service,
		XSD.String service_info
	} choice,
	record of XSD.String elem_list
}
with {
  variant "name as uncapitalized";
  variant (version) "attribute";
  variant (attr) "anyAttributes";
  variant (choice) "untagged";
  variant (choice.alternative_service) "name as 'alternative-service'";
  variant (choice.service_info) "name as 'service-info'";
  variant (elem_list) "untagged";
  variant (elem_list[-]) "anyElement";
};


type record TAlternativeService
{
	record of XSD.String attr optional,
	TType type_,
	XSD.String reason,
	record of XSD.String elem_list
}
with {
  variant "name as uncapitalized";
  variant (attr) "anyAttributes";
  variant (type_) "name as 'type'";
  variant (elem_list) "untagged";
  variant (elem_list[-]) "anyElement";
};


type record TType
{
	record of XSD.String attr optional,
	record of XSD.String elem_list
}
with {
  variant "name as uncapitalized";
  variant (attr) "anyAttributes";
  variant (elem_list) "untagged";
  variant (elem_list[-]) "anyElement";
};


type record TAction
{
	record of XSD.String attr optional,
	record of XSD.String elem_list
}
with {
  variant "name as uncapitalized";
  variant (attr) "anyAttributes";
  variant (elem_list) "untagged";
  variant (elem_list[-]) "anyElement";
};


/* root element */


type TIMS3GPP Ims_3gpp
with {
  variant "name as 'ims-3gpp'";
  variant "element";
};


/* emergency element for //ims-3gpp//alternative-service//type */


type record Emergency
{

}
with {
  variant "name as uncapitalized";
  variant "element";
};


/* restoration element for //ims-3gpp//alternative-service//type */


type record Restoration
{

}
with {
  variant "name as uncapitalized";
  variant "element";
};


/* action element for //ims-3gpp//alternative-service */


type TAction Action
with {
  variant "name as uncapitalized";
  variant "element";
};


/* emergency-registration element for //ims-3gpp//alternative-service//action */


type record Emergency_registration
{

}
with {
  variant "name as 'emergency-registration'";
  variant "element";
};


/* initial-registration element for //ims-3gpp//alternative-service//action */


type record Initial_registration
{

}
with {
  variant "name as 'initial-registration'";
  variant "element";
};


}
with {
  encode "XML";
  variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
  variant "elementFormQualified";
}
Loading