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

@@ -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);

wst/trunk/metadata_service.pas

@@ -19,8 +19,6 @@ uses
   Classes, SysUtils,
   base_service_intf, metadata_repository;
 
-{$INCLUDE wst.inc}
-
 type
 
   TWSTMtdOperationParam = class(TBaseComplexRemotable)

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);

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;

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';

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 }

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+}

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);