From b500454fdf6815e7979067501fc3b56fd4a55ff9 Mon Sep 17 00:00:00 2001 From: Andreas Kraft <an.kraft@googlemail.com> Date: Mon, 27 Apr 2015 16:12:22 +0200 Subject: [PATCH] Clean up the root directory: Moved ant build files to SDT/schema subdirectories and removed superflous src directory from the top level. --- {etc => SDT/schema/etc}/anttasks.xml | 0 {etc => SDT/schema/etc}/common.xml | 0 {etc => SDT/schema/etc}/default.properties | 0 {etc => SDT/schema/etc}/properties.xml | 0 .../schema/etc}/tasks/_addPrivateLibs.xml | 0 .../schema/etc}/tasks/_buildNative.xml | 0 .../etc}/tasks/_checkDependentProjects.xml | 0 .../etc}/tasks/_cleanDependentProjects.xml | 0 .../schema/etc}/tasks/_getBuildNumber.xml | 0 .../etc}/tasks/_handleProjectProperties.xml | 0 .../schema/etc}/tasks/_importManifest.xml | 0 .../tasks/_includeExternalResourcesInJar.xml | 0 {etc => SDT/schema/etc}/tasks/_prepare.xml | 0 .../schema/etc}/tasks/_preparebuild.xml | 0 .../schema/etc}/tasks/_setClassPath.xml | 0 {etc => SDT/schema/etc}/tasks/all.xml | 0 {etc => SDT/schema/etc}/tasks/allforced.xml | 0 {etc => SDT/schema/etc}/tasks/build.xml | 0 {etc => SDT/schema/etc}/tasks/buildjar.xml | 0 {etc => SDT/schema/etc}/tasks/clean.xml | 0 {etc => SDT/schema/etc}/tasks/collect.xml | 0 {etc => SDT/schema/etc}/tasks/compile.xml | 0 .../schema/etc}/tasks/compilenative.xml | 0 {etc => SDT/schema/etc}/tasks/doc.xml | 0 {etc => SDT/schema/etc}/tasks/eclipse.xml | 0 .../schema/lib}/ant/ant-contrib-1.0b3.jar | Bin {libs => SDT/schema/lib}/ant/antDialog.jar | Bin .../schema/lib}/ant/antSetLogLevel.jar | Bin {libs => SDT/schema/lib}/ant/bnd-0.0.378.jar | Bin .../schema/lib}/ant/svnClientAdapter.jar | Bin {libs => SDT/schema/lib}/ant/svnant.jar | Bin {libs => SDT/schema/lib}/ant/svnjavahl.jar | Bin src/domain.rng | 234 ------------------ src/domain.xsd | 190 -------------- src/xml.xsd | 5 - 35 files changed, 429 deletions(-) rename {etc => SDT/schema/etc}/anttasks.xml (100%) rename {etc => SDT/schema/etc}/common.xml (100%) rename {etc => SDT/schema/etc}/default.properties (100%) rename {etc => SDT/schema/etc}/properties.xml (100%) rename {etc => SDT/schema/etc}/tasks/_addPrivateLibs.xml (100%) rename {etc => SDT/schema/etc}/tasks/_buildNative.xml (100%) rename {etc => SDT/schema/etc}/tasks/_checkDependentProjects.xml (100%) rename {etc => SDT/schema/etc}/tasks/_cleanDependentProjects.xml (100%) rename {etc => SDT/schema/etc}/tasks/_getBuildNumber.xml (100%) rename {etc => SDT/schema/etc}/tasks/_handleProjectProperties.xml (100%) rename {etc => SDT/schema/etc}/tasks/_importManifest.xml (100%) rename {etc => SDT/schema/etc}/tasks/_includeExternalResourcesInJar.xml (100%) rename {etc => SDT/schema/etc}/tasks/_prepare.xml (100%) rename {etc => SDT/schema/etc}/tasks/_preparebuild.xml (100%) rename {etc => SDT/schema/etc}/tasks/_setClassPath.xml (100%) rename {etc => SDT/schema/etc}/tasks/all.xml (100%) rename {etc => SDT/schema/etc}/tasks/allforced.xml (100%) rename {etc => SDT/schema/etc}/tasks/build.xml (100%) rename {etc => SDT/schema/etc}/tasks/buildjar.xml (100%) rename {etc => SDT/schema/etc}/tasks/clean.xml (100%) rename {etc => SDT/schema/etc}/tasks/collect.xml (100%) rename {etc => SDT/schema/etc}/tasks/compile.xml (100%) rename {etc => SDT/schema/etc}/tasks/compilenative.xml (100%) rename {etc => SDT/schema/etc}/tasks/doc.xml (100%) rename {etc => SDT/schema/etc}/tasks/eclipse.xml (100%) rename {libs => SDT/schema/lib}/ant/ant-contrib-1.0b3.jar (100%) rename {libs => SDT/schema/lib}/ant/antDialog.jar (100%) rename {libs => SDT/schema/lib}/ant/antSetLogLevel.jar (100%) rename {libs => SDT/schema/lib}/ant/bnd-0.0.378.jar (100%) rename {libs => SDT/schema/lib}/ant/svnClientAdapter.jar (100%) rename {libs => SDT/schema/lib}/ant/svnant.jar (100%) rename {libs => SDT/schema/lib}/ant/svnjavahl.jar (100%) delete mode 100644 src/domain.rng delete mode 100644 src/domain.xsd delete mode 100644 src/xml.xsd diff --git a/etc/anttasks.xml b/SDT/schema/etc/anttasks.xml similarity index 100% rename from etc/anttasks.xml rename to SDT/schema/etc/anttasks.xml diff --git a/etc/common.xml b/SDT/schema/etc/common.xml similarity index 100% rename from etc/common.xml rename to SDT/schema/etc/common.xml diff --git a/etc/default.properties b/SDT/schema/etc/default.properties similarity index 100% rename from etc/default.properties rename to SDT/schema/etc/default.properties diff --git a/etc/properties.xml b/SDT/schema/etc/properties.xml similarity index 100% rename from etc/properties.xml rename to SDT/schema/etc/properties.xml diff --git a/etc/tasks/_addPrivateLibs.xml b/SDT/schema/etc/tasks/_addPrivateLibs.xml similarity index 100% rename from etc/tasks/_addPrivateLibs.xml rename to SDT/schema/etc/tasks/_addPrivateLibs.xml diff --git a/etc/tasks/_buildNative.xml b/SDT/schema/etc/tasks/_buildNative.xml similarity index 100% rename from etc/tasks/_buildNative.xml rename to SDT/schema/etc/tasks/_buildNative.xml diff --git a/etc/tasks/_checkDependentProjects.xml b/SDT/schema/etc/tasks/_checkDependentProjects.xml similarity index 100% rename from etc/tasks/_checkDependentProjects.xml rename to SDT/schema/etc/tasks/_checkDependentProjects.xml diff --git a/etc/tasks/_cleanDependentProjects.xml b/SDT/schema/etc/tasks/_cleanDependentProjects.xml similarity index 100% rename from etc/tasks/_cleanDependentProjects.xml rename to SDT/schema/etc/tasks/_cleanDependentProjects.xml diff --git a/etc/tasks/_getBuildNumber.xml b/SDT/schema/etc/tasks/_getBuildNumber.xml similarity index 100% rename from etc/tasks/_getBuildNumber.xml rename to SDT/schema/etc/tasks/_getBuildNumber.xml diff --git a/etc/tasks/_handleProjectProperties.xml b/SDT/schema/etc/tasks/_handleProjectProperties.xml similarity index 100% rename from etc/tasks/_handleProjectProperties.xml rename to SDT/schema/etc/tasks/_handleProjectProperties.xml diff --git a/etc/tasks/_importManifest.xml b/SDT/schema/etc/tasks/_importManifest.xml similarity index 100% rename from etc/tasks/_importManifest.xml rename to SDT/schema/etc/tasks/_importManifest.xml diff --git a/etc/tasks/_includeExternalResourcesInJar.xml b/SDT/schema/etc/tasks/_includeExternalResourcesInJar.xml similarity index 100% rename from etc/tasks/_includeExternalResourcesInJar.xml rename to SDT/schema/etc/tasks/_includeExternalResourcesInJar.xml diff --git a/etc/tasks/_prepare.xml b/SDT/schema/etc/tasks/_prepare.xml similarity index 100% rename from etc/tasks/_prepare.xml rename to SDT/schema/etc/tasks/_prepare.xml diff --git a/etc/tasks/_preparebuild.xml b/SDT/schema/etc/tasks/_preparebuild.xml similarity index 100% rename from etc/tasks/_preparebuild.xml rename to SDT/schema/etc/tasks/_preparebuild.xml diff --git a/etc/tasks/_setClassPath.xml b/SDT/schema/etc/tasks/_setClassPath.xml similarity index 100% rename from etc/tasks/_setClassPath.xml rename to SDT/schema/etc/tasks/_setClassPath.xml diff --git a/etc/tasks/all.xml b/SDT/schema/etc/tasks/all.xml similarity index 100% rename from etc/tasks/all.xml rename to SDT/schema/etc/tasks/all.xml diff --git a/etc/tasks/allforced.xml b/SDT/schema/etc/tasks/allforced.xml similarity index 100% rename from etc/tasks/allforced.xml rename to SDT/schema/etc/tasks/allforced.xml diff --git a/etc/tasks/build.xml b/SDT/schema/etc/tasks/build.xml similarity index 100% rename from etc/tasks/build.xml rename to SDT/schema/etc/tasks/build.xml diff --git a/etc/tasks/buildjar.xml b/SDT/schema/etc/tasks/buildjar.xml similarity index 100% rename from etc/tasks/buildjar.xml rename to SDT/schema/etc/tasks/buildjar.xml diff --git a/etc/tasks/clean.xml b/SDT/schema/etc/tasks/clean.xml similarity index 100% rename from etc/tasks/clean.xml rename to SDT/schema/etc/tasks/clean.xml diff --git a/etc/tasks/collect.xml b/SDT/schema/etc/tasks/collect.xml similarity index 100% rename from etc/tasks/collect.xml rename to SDT/schema/etc/tasks/collect.xml diff --git a/etc/tasks/compile.xml b/SDT/schema/etc/tasks/compile.xml similarity index 100% rename from etc/tasks/compile.xml rename to SDT/schema/etc/tasks/compile.xml diff --git a/etc/tasks/compilenative.xml b/SDT/schema/etc/tasks/compilenative.xml similarity index 100% rename from etc/tasks/compilenative.xml rename to SDT/schema/etc/tasks/compilenative.xml diff --git a/etc/tasks/doc.xml b/SDT/schema/etc/tasks/doc.xml similarity index 100% rename from etc/tasks/doc.xml rename to SDT/schema/etc/tasks/doc.xml diff --git a/etc/tasks/eclipse.xml b/SDT/schema/etc/tasks/eclipse.xml similarity index 100% rename from etc/tasks/eclipse.xml rename to SDT/schema/etc/tasks/eclipse.xml diff --git a/libs/ant/ant-contrib-1.0b3.jar b/SDT/schema/lib/ant/ant-contrib-1.0b3.jar similarity index 100% rename from libs/ant/ant-contrib-1.0b3.jar rename to SDT/schema/lib/ant/ant-contrib-1.0b3.jar diff --git a/libs/ant/antDialog.jar b/SDT/schema/lib/ant/antDialog.jar similarity index 100% rename from libs/ant/antDialog.jar rename to SDT/schema/lib/ant/antDialog.jar diff --git a/libs/ant/antSetLogLevel.jar b/SDT/schema/lib/ant/antSetLogLevel.jar similarity index 100% rename from libs/ant/antSetLogLevel.jar rename to SDT/schema/lib/ant/antSetLogLevel.jar diff --git a/libs/ant/bnd-0.0.378.jar b/SDT/schema/lib/ant/bnd-0.0.378.jar similarity index 100% rename from libs/ant/bnd-0.0.378.jar rename to SDT/schema/lib/ant/bnd-0.0.378.jar diff --git a/libs/ant/svnClientAdapter.jar b/SDT/schema/lib/ant/svnClientAdapter.jar similarity index 100% rename from libs/ant/svnClientAdapter.jar rename to SDT/schema/lib/ant/svnClientAdapter.jar diff --git a/libs/ant/svnant.jar b/SDT/schema/lib/ant/svnant.jar similarity index 100% rename from libs/ant/svnant.jar rename to SDT/schema/lib/ant/svnant.jar diff --git a/libs/ant/svnjavahl.jar b/SDT/schema/lib/ant/svnjavahl.jar similarity index 100% rename from libs/ant/svnjavahl.jar rename to SDT/schema/lib/ant/svnjavahl.jar diff --git a/src/domain.rng b/src/domain.rng deleted file mode 100644 index ecf4fc7..0000000 --- a/src/domain.rng +++ /dev/null @@ -1,234 +0,0 @@ -<grammar xmlns="http://relaxng.org/ns/structure/1.0" - datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> - - - <start> - <ref name="Domain"/> - </start> - - <define name="Imports"> - <optional> - <element name="Imports"> - <zeroOrMore> - <ref name="Domain"/> - </zeroOrMore> - </element> - </optional> - </define> - - <define name="Domain"> - <element name="Domain"> - <optional> - - <!-- still having some problems with included documents ... - the included document is given the attribute xml:base ... - but my schema does not permit this ... - - This almost generates the correct schema ... but it - doesn't have the correct schemaLocation - - <attribute ns="http://www.w3.org/XML/1998/namespace" name="base"> <data type="anyURI"/> - </attribute> - --> - <attribute name="xml:base"> - <data type="anyURI"/> - </attribute> - - </optional> - <attribute name="id"> - <data type="ID"/> - </attribute> - <ref name="Imports"/> - <optional> - <element name="Modules"> - <zeroOrMore> - <element name="ModuleClass"> - <ref name="ModuleDef"/> - </element> - </zeroOrMore> - </element> - </optional> - <optional> - <element name="Devices"> - <zeroOrMore> - <element name="Device"> - <attribute name="id"> - <data type="Name"/> - </attribute> - <element name="DeviceInfo"> - <interleave> - <element name="Name"> - <text/> - </element> - <element name="Vendor"> - <text/> - </element> - </interleave> - </element> - <ref name="Doc"/> - <optional> - <ref name="Modules"/> - </optional> - </element> - </zeroOrMore> - </element> - </optional> - </element> - </define> - - <define name="DataType"> - <choice> - <value>integer</value> - <value>boolean</value> - <value>string</value> - </choice> - </define> - - <define name="DocText"> - <zeroOrMore> - <choice> - <text/> - <element name="em"> - <text/> - </element> - <element name="b"> - <text/> - </element> - <element name="tt"> - <text/> - </element> - </choice> - </zeroOrMore> - </define> - - <define name="Doc"> - <optional> - <element name="Doc"> - <choice> - <ref name="DocText"/> - <zeroOrMore> - <choice> - <element name="p"> - <ref name="DocText"/> - </element> - <element name="img"> - <attribute name="src"/> - <element name="caption"> - <text/> - </element> - </element> - </choice> - </zeroOrMore> - </choice> - </element> - </optional> - </define> - - <define name="ModuleDef"> - <attribute name="name"> - <text/> - </attribute> - <optional> - <element name="extends"> - <attribute name="domain"> - <data type="IDREF"/> - </attribute> - <attribute name="class"/> - </element> - </optional> - <ref name="Doc"/> - <optional> - <ref name="Actions"/> - </optional> - <optional> - <ref name="Data"/> - </optional> - <optional> - <ref name="Events"/> - </optional> - </define> - - <define name="Modules"> - <element name="Modules"> - <zeroOrMore> - <element name="Module"> - <ref name="ModuleDef"/> - </element> - </zeroOrMore> - </element> - </define> - - <define name="Actions"> - <element name="Actions"> - <zeroOrMore> - <element name="Action"> - <attribute name="name"> - <text/> - </attribute> - <optional> - <attribute name="type"> - <ref name="DataType"/> - </attribute> - </optional> - <ref name="Doc"/> - <zeroOrMore> - <element name="Arg"> - <attribute name="name"/> - <attribute name="type"> - <ref name="DataType"/> - </attribute> - <ref name="Doc"/> - </element> - </zeroOrMore> - </element> - </zeroOrMore> - </element> - </define> - - <define name="Data"> - <element name="Data"> - <zeroOrMore> - <element name="DataPoint"> - <attribute name="name"> - <text/> - </attribute> - <optional> - <attribute name="type"> - <ref name="DataType"/> - </attribute> - </optional> - <optional> - <attribute name="writable"> - <data type="boolean"/> - </attribute> - </optional> - <ref name="Doc"/> - </element> - </zeroOrMore> - </element> - </define> - - <define name="Events"> - <element name="Events"> - <zeroOrMore> - <element name="Event"> - <attribute name="name"> - <text/> - </attribute> - </element> - </zeroOrMore> - </element> - </define> - - <!-- --> - - - - <!-- --> - - - - - -</grammar> - diff --git a/src/domain.xsd b/src/domain.xsd deleted file mode 100644 index fe3ea3f..0000000 --- a/src/domain.xsd +++ /dev/null @@ -1,190 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema targetNamespace="http://hgi.org/xml/dal/1.0" - xmlns="http://hgi.org/xml/dal/1.0" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified"> - <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/03/xml.xsd"/> - <xs:group name="Imports"> - <xs:sequence> - <xs:element minOccurs="0" ref="Imports"/> - </xs:sequence> - </xs:group> - <xs:element name="Imports"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="Domain"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="Domain"> - <xs:complexType> - <xs:sequence> - <xs:group ref="Imports"/> - <xs:element minOccurs="0" name="Modules"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="ModuleClass"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element minOccurs="0" ref="Devices"/> - </xs:sequence> - <xs:attribute ref="xml:base"/> - <xs:attribute name="id" use="required" type="xs:ID"/> - </xs:complexType> - </xs:element> - <xs:element name="ModuleClass" type="ModuleDef"/> - <xs:element name="Devices"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="Device"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="Device"> - <xs:complexType> - <xs:sequence> - <xs:element ref="DeviceInfo"/> - <xs:group ref="Doc"/> - <xs:element minOccurs="0" ref="Modules"/> - </xs:sequence> - <xs:attribute name="id" use="required" type="xs:Name"/> - </xs:complexType> - </xs:element> - <xs:element name="DeviceInfo"> - <xs:complexType> - <xs:all> - <xs:element ref="Name"/> - <xs:element ref="Vendor"/> - </xs:all> - </xs:complexType> - </xs:element> - <xs:element name="Name" type="xs:string"/> - <xs:element name="Vendor" type="xs:string"/> - <xs:simpleType name="DataType"> - <xs:restriction base="xs:token"> - <xs:enumeration value="integer"/> - <xs:enumeration value="boolean"/> - <xs:enumeration value="string"/> - </xs:restriction> - </xs:simpleType> - <xs:group name="DocText"> - <xs:sequence> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="em"/> - <xs:element ref="b"/> - <xs:element ref="tt"/> - </xs:choice> - </xs:sequence> - </xs:group> - <xs:element name="em" type="xs:string"/> - <xs:element name="b" type="xs:string"/> - <xs:element name="tt" type="xs:string"/> - <xs:group name="Doc"> - <xs:sequence> - <xs:element minOccurs="0" ref="Doc"/> - </xs:sequence> - </xs:group> - <xs:element name="Doc"> - <xs:complexType mixed="true"> - <xs:choice> - <xs:group ref="DocText"/> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="p"/> - <xs:element ref="img"/> - </xs:choice> - </xs:choice> - </xs:complexType> - </xs:element> - <xs:element name="p"> - <xs:complexType mixed="true"> - <xs:group ref="DocText"/> - </xs:complexType> - </xs:element> - <xs:element name="img"> - <xs:complexType> - <xs:sequence> - <xs:element ref="caption"/> - </xs:sequence> - <xs:attribute name="src" use="required"/> - </xs:complexType> - </xs:element> - <xs:element name="caption" type="xs:string"/> - <xs:complexType name="ModuleDef"> - <xs:sequence> - <xs:element minOccurs="0" ref="extends"/> - <xs:group ref="Doc"/> - <xs:element minOccurs="0" ref="Actions"/> - <xs:element minOccurs="0" ref="Data"/> - <xs:element minOccurs="0" ref="Events"/> - </xs:sequence> - <xs:attribute name="name" use="required"/> - </xs:complexType> - <xs:element name="extends"> - <xs:complexType> - <xs:attribute name="domain" use="required" type="xs:IDREF"/> - <xs:attribute name="class" use="required"/> - </xs:complexType> - </xs:element> - <xs:element name="Modules"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="Module"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="Module" type="ModuleDef"/> - <xs:element name="Actions"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="Action"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="Action"> - <xs:complexType> - <xs:sequence> - <xs:group ref="Doc"/> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="Arg"/> - </xs:sequence> - <xs:attribute name="name" use="required"/> - <xs:attribute name="type" type="DataType"/> - </xs:complexType> - </xs:element> - <xs:element name="Arg"> - <xs:complexType> - <xs:group ref="Doc"/> - <xs:attribute name="name" use="required"/> - <xs:attribute name="type" use="required" type="DataType"/> - </xs:complexType> - </xs:element> - <xs:element name="Data"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="DataPoint"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="DataPoint"> - <xs:complexType> - <xs:group ref="Doc"/> - <xs:attribute name="name" use="required"/> - <xs:attribute name="type" type="DataType"/> - <xs:attribute name="writable" type="xs:boolean"/> - </xs:complexType> - </xs:element> - <xs:element name="Events"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="Event"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="Event"> - <xs:complexType> - <xs:attribute name="name" use="required"/> - </xs:complexType> - </xs:element> - <!----> - <!----> -</xs:schema> diff --git a/src/xml.xsd b/src/xml.xsd deleted file mode 100644 index d60043f..0000000 --- a/src/xml.xsd +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.w3.org/XML/1998/namespace"> - <xs:import schemaLocation="domain.xsd"/> - <xs:attribute name="base" type="xs:anyURI"/> -</xs:schema> -- GitLab