Remove useless TTCN-3 data strutures; Editorial changes in AtsCise.tplan2 (9ec7703e) · Commits · CDM - Common information sharing environment and Data Model / CISE Data Model

titan-test-system-framework @ f69933a7

Original line number	Diff line number	Diff line
		Subproject commit 6901c1c381950f308d2b1643e90757248ae99eab
		Subproject commit f69933a762635155275283e4f8594f0f3aff9a24

ttcn/LibCise/ttcn/LibCise_Pixits.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -273,7 +273,7 @@ module LibCise_Pixits {
		modulepar InformationSecurityClassificationType PX_METADATA_INFORMATION_SECURITY_CLASSIFICATION
		:= nonClassified;

		modulepar http_www_cise_eu_datamodel_v1_entity_metadata.InformationSensitivityDegreeType PX_METADATA_informationSensitivityDegree
		modulepar http_www_cise_eu_datamodel_v1_entity_metadata.InformationSensitivityDegreeType PX_METADATA_INFORMATIONSENSITIVITYDEGREE
		:= nonSpecified;

		modulepar XSD.String PX_METADATA_LANGUAGE := "UK";

ttcn/LibCise/ttcn/LibCise_Templates.ttcn

+23 −23

Original line number	Diff line number	Diff line
		@@ -2684,29 +2684,29 @@ module LibCise_Templates {
		xMLGeometry := p_xMLGeometry
		} // End of template mw_geometry

		template (omit) CorrelatedWithRel m_correlated_with_rel(
		in template (omit) UniqueIdentifier p_uniqueIdentifier := omit,
		in template (omit) CorrelationType p_correlationType := omit,
		in template (omit) XSD.DateTime p_correlatedIn := omit,
		in template (omit) Organization_derivations p_correlatedBy := omit
		) := {
		uniqueIdentifier := p_uniqueIdentifier,
		correlationType := p_correlationType,
		correlatedIn := p_correlatedIn,
		correlatedBy := p_correlatedBy
		} // End of template m_correlated_with_rel

		template (present) CorrelatedWithRel mw_correlated_with_rel(
		template (present) UniqueIdentifier p_uniqueIdentifier := ?,
		template CorrelationType p_correlationType := *,
		template XSD.DateTime p_correlatedIn := /,
		template Organization_derivations p_correlatedBy := **/
		) := {
		uniqueIdentifier := p_uniqueIdentifier,
		correlationType := p_correlationType,
		correlatedIn := p_correlatedIn/*,
		correlatedBy := p_correlatedBy*/
		} // End of template mw_correlated_with_rel
		// template (omit) CorrelatedWithRel m_correlated_with_rel(
		// in template (omit) UniqueIdentifier p_uniqueIdentifier := omit,
		// in template (omit) CorrelationType p_correlationType := omit,
		// in template (omit) XSD.DateTime p_correlatedIn := omit,
		// in template (omit) Organization_derivations p_correlatedBy := omit
		// ) := {
		// uniqueIdentifier := p_uniqueIdentifier,
		// correlationType := p_correlationType,
		// correlatedIn := p_correlatedIn,
		// correlatedBy := p_correlatedBy
		// } // End of template m_correlated_with_rel

		// template (present) CorrelatedWithRel mw_correlated_with_rel(
		// template (present) UniqueIdentifier p_uniqueIdentifier := ?,
		// template CorrelationType p_correlationType := *,
		// template XSD.DateTime p_correlatedIn := /,
		// template Organization_derivations p_correlatedBy := **/
		// ) := {
		// uniqueIdentifier := p_uniqueIdentifier,
		// correlationType := p_correlationType,
		// correlatedIn := p_correlatedIn/*,
		// correlatedBy := p_correlatedBy*/
		// } // End of template mw_correlated_with_rel

		template (value) SelectorCondition m_selector_condition(
		in template (value) http_www_cise_eu_servicemodel_v1_message.String_derivations p_selector,

ttcn/LibCise/ttcn/LibCise_TypesAndValues.ttcn

+48 −48

Original line number	Diff line number	Diff line
		@@ -29,55 +29,55 @@ module LibCise_TypesAndValues {
		// Signature
		import from http_www_w3_org_2000_09_xmldsig all;

		group commons {
		// group commons {

		// type record InvolvedAgentRel {
		// Agent_derivations agent optional,
		// AgentRoleInEventType agentRole optional,
		// Period involvementPeriod optional
		// }

		// type record LocationRel {
		// Location_derivations location optional,
		// Period dateTime optional,
		// EventAreaType eventArea optional,
		// LocationRoleInEventType locationRole optional,
		// SourceType sourceType optional
		// }

		// type record DocumentRelItem {
		// Document document optional
		// } // End of type DocumentRelItem

		// type record ImpliedRiskRel {
		// Risk risk optional
		// }

		// type record InvolvedAgentRelItem {
		// Agent_derivations agent optional,
		// AgentRoleInObjectType agentRole optional,
		// DutyType duty optional,
		// Period involvementPeriod optional,
		// XSD.Boolean transitPassenger optional
		// } // End of type Vessel_InvolvedAgentRelItem

		// type record InvolvedEventRelItem {
		// Event_derivations event optional,
		// ObjectRoleInEventType objectRole optional,
		// Period involvementPeriod optional
		// } // End of type InvolvedEventRelItem

		// type record CorrelatedWithRel {
		// UniqueIdentifier uniqueIdentifier optional,
		// CorrelationType correlationType optional,
		// XSD.DateTime correlatedIn optional,
		// Organization_derivations correlatedBy optional
		// } // End of type

		type record InvolvedAgentRel {
		Agent_derivations agent optional,
		AgentRoleInEventType agentRole optional,
		Period involvementPeriod optional
		}

		type record LocationRel {
		Location_derivations location optional,
		Period dateTime optional,
		EventAreaType eventArea optional,
		LocationRoleInEventType locationRole optional,
		SourceType sourceType optional
		}

		type record DocumentRelItem {
		Document document optional
		} // End of type DocumentRelItem

		type record ImpliedRiskRel {
		Risk risk optional
		}

		type record InvolvedAgentRelItem {
		Agent_derivations agent optional,
		AgentRoleInObjectType agentRole optional,
		DutyType duty optional,
		Period involvementPeriod optional,
		XSD.Boolean transitPassenger optional
		} // End of type Vessel_InvolvedAgentRelItem

		type record InvolvedEventRelItem {
		Event_derivations event optional,
		ObjectRoleInEventType objectRole optional,
		Period involvementPeriod optional
		} // End of type InvolvedEventRelItem

		type record CorrelatedWithRel {
		UniqueIdentifier uniqueIdentifier optional,
		CorrelationType correlationType optional,
		XSD.DateTime correlatedIn optional,
		Organization_derivations correlatedBy optional
		} // End of type

		} with {
		encode "XML";
		variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
		} // End of group commons
		// } with {
		// encode "XML";
		// variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
		// } // End of group commons

		group vessels_types {

test-purposes/AtsCise/AtsCise.tplan2

+2 −2

File changed.

Contains only whitespace changes.