Skip to content
GitLab
Commit a96ccd6b authored by Claus Nagel's avatar Claus Nagel
Browse files

removed SMIL from JAXB generated sources

parent b10b7151
Hide whitespace changes
Inline Side-by-side
schemas/binding.xjb
View file @ a96ccd6b
......@@ -509,26 +509,6 @@
</jaxb:schemaBindings>
</jaxb:bindings>
<!-- ==== -->
<!-- SMIL -->
<!-- ==== -->
<!-- Specific settings for the SMIL schema file 'smil20.xsd' -->
<jaxb:bindings schemaLocation="gml/3.1.1/smil/smil20.xsd" node="/xs:schema">
<jaxb:schemaBindings>
<!-- set package name of the generated classes -->
<jaxb:package name="org.w3._2001.smil20"/>
</jaxb:schemaBindings>
</jaxb:bindings>
<!-- Specific settings for the SMIL schema file 'smil20-language.xsd' -->
<jaxb:bindings schemaLocation="gml/3.1.1/smil/smil20-language.xsd" node="/xs:schema">
<jaxb:schemaBindings>
<!-- set package name of the generated classes -->
<jaxb:package name="org.w3._2001.smil20.language"/>
</jaxb:schemaBindings>
</jaxb:bindings>
<!-- =============== -->
<!-- Dummy ADE Hooks -->
<!-- =============== -->
......
schemas/gml/3.1.1/base/defaultStyle.xsd
View file @ a96ccd6b
<?xml version="1.0" encoding="UTF-8"?>
<schema targetNamespace="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" xmlns:smil20="http://www.w3.org/2001/SMIL20/" elementFormDefault="qualified" version="3.1.1.2">
<schema targetNamespace="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="3.1.1.2">
<annotation>
<appinfo source="urn:opengis:specification:gml:schema-defaultStyle:v3.1.0">defaultStyle.xsd</appinfo>
<documentation>
......@@ -15,7 +15,6 @@
============================================================== -->
<include schemaLocation="gml.xsd"/>
<include schemaLocation="measures.xsd"/>
<import namespace="http://www.w3.org/2001/SMIL20/" schemaLocation="../smil/smil20.xsd"/>
<!-- ==============================================================
the Style property
============================================================== -->
......@@ -141,10 +140,6 @@
<sequence>
<element name="spatialResolution" type="gml:ScaleType" minOccurs="0"/>
<element name="styleVariation" type="gml:StyleVariationType" minOccurs="0" maxOccurs="unbounded"/>
<element ref="smil20:animate" minOccurs="0" maxOccurs="unbounded"/>
<element ref="smil20:animateMotion" minOccurs="0" maxOccurs="unbounded"/>
<element ref="smil20:animateColor" minOccurs="0" maxOccurs="unbounded"/>
<element ref="smil20:set" minOccurs="0" maxOccurs="unbounded"/>
</sequence>
</extension>
</complexContent>
......
schemas/gml/3.1.1/smil/smil20-language.xsd deleted 100644 → 0
View file @ b10b7151
<?xml version="1.0" encoding="UTF-8"?>
<!--
=================== OpenGIS ============================
This schema is here because there are errors in publicly available smil schemas at w3c site.
One is acknowledged by w3c - it is typographical error described in SMIL errata document at:
http://www.w3.org/2001/07/REC-SMIL20-20010731-errata
under:
E30: Correction in the SMIL 2.0 utility Schema, section B.3.48 (revised 29 03 2002)
Others (at least one) are assumed after failed validation using Visual Studio .NET.
These smil schemas are reorganized to include in minimum number of files all and only definitions required by
defaultStyle.xsd. It was done to enable the validation of GML3.0 schemas.
When w3c fixes the public schemas these will be discarded
comment: Milan Trninic, Galdos Systems Inc., May 2002
=================== OpenGIS ============================
-->
<!--
XML Schema for the SMIL 2.0 Language
This is SMIL 2.0
Copyright: 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
See http://www.w3.org/Consortium/Legal/.
Public URI: http://www.w3.org/2001/SMIL20/smil20-language.xsd
Author: Aaron Michael Cohen (Intel)
Revision: 2001/07/15
Note: <any> wildcard element content is missing from most of the SMIL 2.0 elements because of a conflict
between substitutionGroups and wildcard content.
-->
<schema targetNamespace="http://www.w3.org/2001/SMIL20/Language" xmlns:smil20lang="http://www.w3.org/2001/SMIL20/Language" xmlns:smil20="http://www.w3.org/2001/SMIL20/" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
<!-- import the smil20 namespaces -->
<import namespace="http://www.w3.org/2001/SMIL20/" schemaLocation="smil20.xsd"/>
<element name="animate" type="smil20lang:animateType"/>
<complexType name="animateType">
<complexContent>
<extension base="smil20:animatePrototype">
<choice minOccurs="0" maxOccurs="unbounded">
<any namespace="##other" processContents="lax"/>
</choice>
<attributeGroup ref="smil20lang:CoreAttrs"/>
<attributeGroup ref="smil20lang:TimingAttrs"/>
<attributeGroup ref="smil20:animTargetAttrs"/>
<attributeGroup ref="smil20:animModeAttrs"/>
<attributeGroup ref="smil20:skipContentAttrs"/>
<anyAttribute namespace="##any" processContents="strict"/>
</extension>
</complexContent>
</complexType>
<attributeGroup name="CoreAttrs">
<attributeGroup ref="smil20:structureModuleAttrs"/>
<attributeGroup ref="smil20:alternateContentAttrs"/>
</attributeGroup>
<attributeGroup name="TimingAttrs">
<attributeGroup ref="smil20lang:BasicTimingAttrs"/>
<attributeGroup ref="smil20:syncBehaviorAttrs"/>
<attributeGroup ref="smil20:syncBehaviorDefaultAttrs"/>
<attributeGroup ref="smil20:restartTimingAttrs"/>
<attributeGroup ref="smil20:restartDefaultAttrs"/>
<attributeGroup ref="smil20:fillTimingAttrs"/>
<attributeGroup ref="smil20:fillDefaultAttrs"/>
</attributeGroup>
<attributeGroup name="BasicTimingAttrs">
<attributeGroup ref="smil20:beginEndTimingAttrs"/>
<attributeGroup ref="smil20:durTimingAttrs"/>
<attributeGroup ref="smil20:repeatTimingAttrs"/>
<attributeGroup ref="smil20:deprecatedRepeatTiming"/>
<attributeGroup ref="smil20:minMaxTimingAttrs"/>
</attributeGroup>
<element name="animateMotion" type="smil20lang:animateMotionType"/>
<complexType name="animateMotionType">
<complexContent>
<extension base="smil20:animateMotionPrototype">
<choice minOccurs="0" maxOccurs="unbounded">
<any namespace="##other" processContents="lax"/>
</choice>
<attributeGroup ref="smil20lang:CoreAttrs"/>
<attributeGroup ref="smil20lang:TimingAttrs"/>
<attributeGroup ref="smil20:animTargetAttrs"/>
<attributeGroup ref="smil20:animModeAttrs"/>
<attributeGroup ref="smil20:skipContentAttrs"/>
<anyAttribute namespace="##any" processContents="strict"/>
</extension>
</complexContent>
</complexType>
<element name="animateColor" type="smil20lang:animateColorType"/>
<complexType name="animateColorType">
<complexContent>
<extension base="smil20:animateColorPrototype">
<choice minOccurs="0" maxOccurs="unbounded">
<any namespace="##other" processContents="lax"/>
</choice>
<attributeGroup ref="smil20lang:CoreAttrs"/>
<attributeGroup ref="smil20lang:TimingAttrs"/>
<attributeGroup ref="smil20:animTargetAttrs"/>
<attributeGroup ref="smil20:animModeAttrs"/>
<attributeGroup ref="smil20:skipContentAttrs"/>
<anyAttribute namespace="##any" processContents="strict"/>
</extension>
</complexContent>
</complexType>
<element name="set" type="smil20lang:setType"/>
<complexType name="setType">
<complexContent>
<extension base="smil20:setPrototype">
<choice minOccurs="0" maxOccurs="unbounded">
<any namespace="##other" processContents="lax"/>
</choice>
<attributeGroup ref="smil20lang:CoreAttrs"/>
<attributeGroup ref="smil20lang:TimingAttrs"/>
<attributeGroup ref="smil20:animTargetAttrs"/>
<attributeGroup ref="smil20:skipContentAttrs"/>
<anyAttribute namespace="##any" processContents="strict"/>
</extension>
</complexContent>
</complexType>
</schema>
schemas/gml/3.1.1/smil/smil20.xsd deleted 100644 → 0
View file @ b10b7151
<?xml version="1.0" encoding="UTF-8"?>
<!--
=================== OpenGIS ============================
This schema is here because there are errors in publicly available smil schemas at w3c site.
One is acknowledged by w3c - it is typographical error described in SMIL errata document at:
http://www.w3.org/2001/07/REC-SMIL20-20010731-errata
under:
E30: Correction in the SMIL 2.0 utility Schema, section B.3.48 (revised 29 03 2002)
Others (at least one) are assumed after failed validation using Visual Studio .NET.
These smil schemas are reorganized to include in minimum number of files all and only definitions required by
defaultStyle.xsd. It was done to enable the validation of GML3.0 schemas.
When w3c fixes the public schemas these will be discarded
comment: Milan Trninic, Galdos Systems Inc., May 2002
comment#2: Milan Trninic, Galdos Systems Inc., Dec 2002
In order to validate with xerces, changed the "x:" prefix to "xml:" in the namespace declaration and reference to "lang" attribute
=================== OpenGIS ============================
-->
<!--
XML Schema for the SMIL 2.0 modules
This is SMIL 2.0
Copyright: 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
See http://www.w3.org/Consortium/Legal/.
Public URI: http://www.w3.org/2001/SMIL20/smil20.xsd
Author: Aaron Michael Cohen (Intel)
Revision: 2001/07/31
-->
<schema targetNamespace="http://www.w3.org/2001/SMIL20/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:smil20="http://www.w3.org/2001/SMIL20/" xmlns:smil20lang="http://www.w3.org/2001/SMIL20/Language" elementFormDefault="qualified">
<import namespace="http://www.w3.org/2001/SMIL20/Language" schemaLocation="smil20-language.xsd"/>
<!-- =============================================================
struct.xsd
============================================================== -->
<import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="../xml/xml.xsd"/>
<attributeGroup name="structureModuleAttrs">
<attribute name="id" type="ID" use="optional"/>
<attribute name="class" type="string" use="optional"/>
<attribute ref="xml:lang" use="optional"/>
</attributeGroup>
<!-- =============================================================
content.xsd
============================================================== -->
<attributeGroup name="skipContentAttrs">
<attribute name="skip-content" type="boolean" use="optional" default="true"/>
</attributeGroup>
<!-- =============================================================
media.xsd
============================================================== -->
<attributeGroup name="alternateContentAttrs">
<attribute name="alt" type="string" use="optional"/>
<attribute name="longdesc" type="anyURI" use="optional"/>
</attributeGroup>
<!-- =============================================================
utility.xsd
============================================================== -->
<simpleType name="nonNegativeDecimalType">
<restriction base="decimal">
<minInclusive value="0.0"/>
</restriction>
</simpleType>
<!-- =============================================================
animate.xsd
============================================================== -->
<element name="animate" type="smil20lang:animateType" substitutionGroup="smil20lang:animate"/>
<complexType name="animatePrototype">
<attributeGroup ref="smil20:animNamedTargetAttrs"/>
<attributeGroup ref="smil20:animAddAccumAttrs"/>
<attributeGroup ref="smil20:animValuesAttrs"/>
</complexType>
<attributeGroup name="animNamedTargetAttrs">
<attribute name="attributeName" type="string" use="required"/>
<attribute name="attributeType" use="optional" default="auto">
<simpleType>
<restriction base="string">
<enumeration value="XML"/>
<enumeration value="CSS"/>
<enumeration value="auto"/>
</restriction>
</simpleType>
</attribute>
</attributeGroup>
<attributeGroup name="animAddAccumAttrs">
<attribute name="additive" use="optional" default="replace">
<simpleType>
<restriction base="string">
<enumeration value="replace"/>
<enumeration value="sum"/>
</restriction>
</simpleType>
</attribute>
<attribute name="accumulate" use="optional" default="none">
<simpleType>
<restriction base="string">
<enumeration value="none"/>
<enumeration value="sum"/>
</restriction>
</simpleType>
</attribute>
</attributeGroup>
<attributeGroup name="animValuesAttrs">
<attributeGroup ref="smil20:animSetValuesAttrs"/>
<attribute name="from" type="string" use="optional"/>
<attribute name="by" type="string" use="optional"/>
<attribute name="values" type="string" use="optional"/>
</attributeGroup>
<attributeGroup name="animSetValuesAttrs">
<attribute name="to" type="string" use="optional"/>
</attributeGroup>
<attributeGroup name="animTargetAttrs">
<attribute name="targetElement" type="IDREF" use="optional"/>
</attributeGroup>
<attributeGroup name="animModeAttrs">
<attribute name="calcMode" use="optional" default="linear">
<simpleType>
<restriction base="string">
<enumeration value="discrete"/>
<enumeration value="linear"/>
<enumeration value="paced"/>
</restriction>
</simpleType>
</attribute>
</attributeGroup>
<element name="animateMotion" type="smil20lang:animateMotionType" substitutionGroup="smil20lang:animateMotion"/>
<complexType name="animateMotionPrototype">
<attributeGroup ref="smil20:animAddAccumAttrs"/>
<attributeGroup ref="smil20:animValuesAttrs"/>
<attribute name="origin" type="string" use="optional"/>
</complexType>
<element name="animateColor" type="smil20lang:animateColorType" substitutionGroup="smil20lang:animateColor"/>
<complexType name="animateColorPrototype">
<attributeGroup ref="smil20:animNamedTargetAttrs"/>
<attributeGroup ref="smil20:animAddAccumAttrs"/>
<attributeGroup ref="smil20:animValuesAttrs"/>
</complexType>
<element name="set" type="smil20lang:setType" substitutionGroup="smil20lang:set"/>
<complexType name="setPrototype">
<attributeGroup ref="smil20:animNamedTargetAttrs"/>
<attributeGroup ref="smil20:animSetValuesAttrs"/>
</complexType>
<!-- =============================================================
timing.xsd
============================================================== -->
<attributeGroup name="syncBehaviorAttrs">
<attribute name="syncBehavior" type="smil20:syncBehaviorType" default="default"/>
<attribute name="syncTolerance" type="string" use="optional"/>
</attributeGroup>
<simpleType name="syncBehaviorType">
<restriction base="string">
<enumeration value="canSlip"/>
<enumeration value="locked"/>
<enumeration value="independent"/>
<enumeration value="default"/>
</restriction>
</simpleType>
<attributeGroup name="syncBehaviorDefaultAttrs">
<attribute name="syncBehaviorDefault" type="smil20:syncBehaviorDefaultType" default="inherit"/>
<attribute name="syncToleranceDefault" type="string" default="inherit"/>
</attributeGroup>
<simpleType name="syncBehaviorDefaultType">
<restriction base="string">
<enumeration value="canSlip"/>
<enumeration value="locked"/>
<enumeration value="independent"/>
<enumeration value="inherit"/>
</restriction>
</simpleType>
<attributeGroup name="restartTimingAttrs">
<attribute name="restart" type="smil20:restartTimingType" default="default"/>
</attributeGroup>
<simpleType name="restartTimingType">
<restriction base="string">
<enumeration value="never"/>
<enumeration value="always"/>
<enumeration value="whenNotActive"/>
<enumeration value="default"/>
</restriction>
</simpleType>
<attributeGroup name="restartDefaultAttrs">
<attribute name="restartDefault" type="smil20:restartDefaultType" default="inherit"/>
</attributeGroup>
<simpleType name="restartDefaultType">
<restriction base="string">
<enumeration value="never"/>
<enumeration value="always"/>
<enumeration value="whenNotActive"/>
<enumeration value="inherit"/>
</restriction>
</simpleType>
<attributeGroup name="fillTimingAttrs">
<attribute name="fill" type="smil20:fillTimingAttrsType" default="default"/>
</attributeGroup>
<simpleType name="fillTimingAttrsType">
<restriction base="string">
<enumeration value="remove"/>
<enumeration value="freeze"/>
<enumeration value="hold"/>
<enumeration value="auto"/>
<enumeration value="default"/>
<enumeration value="transition"/>
</restriction>
</simpleType>
<attributeGroup name="fillDefaultAttrs">
<attribute name="fillDefault" type="smil20:fillDefaultType" default="inherit"/>
</attributeGroup>
<simpleType name="fillDefaultType">
<restriction base="string">
<enumeration value="remove"/>
<enumeration value="freeze"/>
<enumeration value="hold"/>
<enumeration value="auto"/>
<enumeration value="inherit"/>
<enumeration value="transition"/>
</restriction>
</simpleType>
<attributeGroup name="beginEndTimingAttrs">
<attribute name="begin" type="string"/>
<attribute name="end" type="string"/>
</attributeGroup>
<attributeGroup name="durTimingAttrs">
<attribute name="dur" type="string"/>
</attributeGroup>
<attributeGroup name="repeatTimingAttrs">
<attribute name="repeatDur" type="string"/>
<attribute name="repeatCount" type="smil20:nonNegativeDecimalType"/>
</attributeGroup>
<attributeGroup name="deprecatedRepeatTiming">
<attribute name="repeat" type="nonNegativeInteger"/>
</attributeGroup>
<attributeGroup name="minMaxTimingAttrs">
<attribute name="min" type="string"/>
<attribute name="max" type="string"/>
</attributeGroup>
</schema>
src/main/java/org/citygml4j/ade_xjc/ADESchemaCompiler.java
View file @ a96ccd6b
......@@ -285,7 +285,7 @@ public class ADESchemaCompiler {
BigInteger md5 = new BigInteger("0");
md5 = Util.dir2md5(schemaDir, md5);
if (!md5.toString(16).equals("bb750e0a6e76c779637ebc2dc983253a"))
if (!md5.toString(16).equals("e63ab0fde528fbafc380af37b792e914"))
throw new Exception("Contents of subfolder 'schemas' have been altered. Please restore its original state.");
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal