From 4c4cc7041c4b29d137c4550216b7b80d2f6f7753 Mon Sep 17 00:00:00 2001 From: inoussa Date: Mon, 29 Sep 2008 12:35:06 +0000 Subject: [PATCH] remove no longer needed include files git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@578 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- wst/trunk/config_objects.pas | 3 -- wst/trunk/metadata_service.pas | 2 - wst/trunk/metadata_service_binder.pas | 4 -- wst/trunk/metadata_service_imp.pas | 4 -- wst/trunk/server_listener.pas | 3 -- wst/trunk/server_service_soap.pas | 3 -- wst/trunk/server_service_xmlrpc.pas | 3 -- wst/trunk/tests/test_suite/test_parsers.pas | 57 +++++++++++++++++++++ 8 files changed, 57 insertions(+), 22 deletions(-) diff --git a/wst/trunk/config_objects.pas b/wst/trunk/config_objects.pas index 6a0e35213..c6d4155a1 100644 --- a/wst/trunk/config_objects.pas +++ b/wst/trunk/config_objects.pas @@ -17,9 +17,6 @@ unit config_objects; interface uses SysUtils, Classes, base_service_intf; -{$INCLUDE wst.inc} -{$INCLUDE wst_delphi.inc} - type TwstConfigItem = class(TBaseComplexRemotable); diff --git a/wst/trunk/metadata_service.pas b/wst/trunk/metadata_service.pas index 7c900d9fd..f0a631906 100644 --- a/wst/trunk/metadata_service.pas +++ b/wst/trunk/metadata_service.pas @@ -19,8 +19,6 @@ uses Classes, SysUtils, base_service_intf, metadata_repository; -{$INCLUDE wst.inc} - type TWSTMtdOperationParam = class(TBaseComplexRemotable) diff --git a/wst/trunk/metadata_service_binder.pas b/wst/trunk/metadata_service_binder.pas index 17fa59ff3..62a19e463 100644 --- a/wst/trunk/metadata_service_binder.pas +++ b/wst/trunk/metadata_service_binder.pas @@ -11,12 +11,8 @@ interface uses SysUtils, Classes, base_service_intf, server_service_intf, metadata_service; -{$INCLUDE wst.inc} -{$INCLUDE wst_delphi.inc} - type - TWSTMetadataService_ServiceBinder=class(TBaseServiceBinder) Protected procedure GetRepositoryListHandler(AFormatter:IFormatterResponse; AContext : ICallContext); diff --git a/wst/trunk/metadata_service_imp.pas b/wst/trunk/metadata_service_imp.pas index cb51ac104..4dd0f1e50 100644 --- a/wst/trunk/metadata_service_imp.pas +++ b/wst/trunk/metadata_service_imp.pas @@ -12,12 +12,8 @@ Interface Uses SysUtils, Classes, base_service_intf, server_service_intf, server_service_imputils, metadata_service; -{$INCLUDE wst.inc} -{$INCLUDE wst_delphi.inc} - Type - TWSTMetadataService_ServiceImp=class(TSimpleFactoryItem,IWSTMetadataService) Protected function GetRepositoryList():TArrayOfStringRemotable; diff --git a/wst/trunk/server_listener.pas b/wst/trunk/server_listener.pas index 4c35de59b..7f2d1fb65 100644 --- a/wst/trunk/server_listener.pas +++ b/wst/trunk/server_listener.pas @@ -18,9 +18,6 @@ interface uses Classes, SysUtils; -{$INCLUDE wst.inc} -{$INCLUDE wst_delphi.inc} - const sSEPARATOR = '/'; sSERVICES_PREFIXE = 'services'; diff --git a/wst/trunk/server_service_soap.pas b/wst/trunk/server_service_soap.pas index 0ca340696..b146cf46e 100644 --- a/wst/trunk/server_service_soap.pas +++ b/wst/trunk/server_service_soap.pas @@ -21,9 +21,6 @@ uses base_service_intf, server_service_intf, server_service_imputils, base_soap_formatter; -{$INCLUDE wst.inc} -{$INCLUDE wst_delphi.inc} - type { TSOAPFormatter } diff --git a/wst/trunk/server_service_xmlrpc.pas b/wst/trunk/server_service_xmlrpc.pas index 956790d50..1cd6268b2 100644 --- a/wst/trunk/server_service_xmlrpc.pas +++ b/wst/trunk/server_service_xmlrpc.pas @@ -21,9 +21,6 @@ uses base_service_intf, server_service_intf, base_xmlrpc_formatter; -{$INCLUDE wst.inc} -{$INCLUDE wst_delphi.inc} - type {$M+} diff --git a/wst/trunk/tests/test_suite/test_parsers.pas b/wst/trunk/tests/test_suite/test_parsers.pas index 9207a62b9..8c4ba2061 100644 --- a/wst/trunk/tests/test_suite/test_parsers.pas +++ b/wst/trunk/tests/test_suite/test_parsers.pas @@ -37,6 +37,7 @@ type function LoadComplexType_Class_Schema() : TwstPasTreeContainer;virtual;abstract; function LoadComplexType_Class_default_values() : TwstPasTreeContainer;virtual;abstract; function LoadComplexType_Class_properties_extended_metadata() : TwstPasTreeContainer;virtual;abstract; + function LoadComplexType_Class_properties_extended_metadata2() : TwstPasTreeContainer;virtual;abstract; function LoadComplexType_Class_Embedded_Schema() : TwstPasTreeContainer;virtual;abstract; function LoadComplexType_Class_Extend_Simple_Schema() : TwstPasTreeContainer;virtual;abstract; @@ -64,6 +65,7 @@ type procedure ComplexType_Class(); procedure ComplexType_Class_default_values(); procedure ComplexType_Class_properties_extended_metadata(); + procedure ComplexType_Class_properties_extended_metadata2(); procedure ComplexType_Class_Embedded(); procedure ComplexType_Class_Extend_Simple_Schema(); @@ -97,6 +99,7 @@ type function LoadComplexType_Class_Schema() : TwstPasTreeContainer;override; function LoadComplexType_Class_default_values() : TwstPasTreeContainer;override; function LoadComplexType_Class_properties_extended_metadata() : TwstPasTreeContainer;override; + function LoadComplexType_Class_properties_extended_metadata2() : TwstPasTreeContainer;override; function LoadComplexType_Class_Embedded_Schema() : TwstPasTreeContainer;override; function LoadComplexType_Class_Extend_Simple_Schema() : TwstPasTreeContainer;override; @@ -127,6 +130,7 @@ type function LoadSimpleType_Enum_Schema() : TwstPasTreeContainer;override; function LoadComplexType_Class_default_values() : TwstPasTreeContainer;override; function LoadComplexType_Class_properties_extended_metadata() : TwstPasTreeContainer;override; + function LoadComplexType_Class_properties_extended_metadata2() : TwstPasTreeContainer;override; function LoadSimpleType_Enum_Embedded_Schema() : TwstPasTreeContainer;override; function LoadSimpleType_AliasToNativeType_Schema() : TwstPasTreeContainer;override; @@ -1411,6 +1415,49 @@ begin end; end; +procedure TTest_CustomXsdParser.ComplexType_Class_properties_extended_metadata2; +const s_ProjectType = 'ProjectType'; +var + tr : TwstPasTreeContainer; + clsType : TPasClassType; + mdl : TPasModule; + elt : TPasElement; + i : Integer; + p : TPasProperty; +begin + tr := LoadComplexType_Class_properties_extended_metadata2(); + mdl := tr.FindModule('uri:sample'); + CheckNotNull(mdl); + elt := tr.FindElement(s_ProjectType); + CheckNotNull(elt,s_ProjectType); + CheckIs(elt,TPasClassType); + clsType := elt as TPasClassType; + p := nil; + for i := 0 to Pred(clsType.Members.Count) do begin + if TPasElement(clsType.Members[i]).InheritsFrom(TPasProperty) and + SameText('ProjectLeader',TPasElement(clsType.Members[i]).Name) + then begin + p := TPasProperty(clsType.Members[i]); + Break; + end; + end; + CheckNotNull(p,'Property non found : "ProjectLeader"'); + CheckEquals('uri:sample#Person', tr.Properties.GetValue(p,'commonj.sdo#propertyType'), 'extended metadata'); + + p := nil; + for i := 0 to Pred(clsType.Members.Count) do begin + if TPasElement(clsType.Members[i]).InheritsFrom(TPasProperty) and + SameText('ProjectLeaderArray',TPasElement(clsType.Members[i]).Name) + then begin + p := TPasProperty(clsType.Members[i]); + Break; + end; + end; + CheckNotNull(p,'Property non found : "ProjectLeaderArray"'); + CheckEquals('uri:sample#Person', tr.Properties.GetValue(p,'commonj.sdo#propertyType'), 'extended metadata'); + +end; + { TTest_XsdParser } function TTest_XsdParser.ParseDoc(const ADoc: string): TwstPasTreeContainer; @@ -1529,6 +1576,11 @@ begin Result := ParseDoc(x_complexType_class_properties_extended_metadata); end; +function TTest_XsdParser.LoadComplexType_Class_properties_extended_metadata2: TwstPasTreeContainer; +begin + Result := ParseDoc(x_complexType_class_properties_extended_metadata + '_2'); +end; + { TTest_WsdlParser } function TTest_WsdlParser.ParseDoc(const ADoc: string): TwstPasTreeContainer; @@ -1890,6 +1942,11 @@ begin Result := ParseDoc(x_complexType_class_properties_extended_metadata); end; +function TTest_WsdlParser.LoadComplexType_Class_properties_extended_metadata2: TwstPasTreeContainer; +begin + Result := ParseDoc(x_complexType_class_properties_extended_metadata + '_2'); +end; + initialization RegisterTest('XSD parser',TTest_XsdParser.Suite); RegisterTest('WSDL parser',TTest_WsdlParser.Suite);