- From: Arthur Ryman <aryman@dev.w3.org>
- Date: Tue, 12 Oct 2004 03:07:21 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/wsdl20
In directory hutz:/tmp/cvs-serv29696
Modified Files:
build.xml zml2html.xsl wsdl20-z-1.xml
Log Message:
Implemented links to show and hide Z Notation in the specifications.
Index: wsdl20-z-1.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/wsdl20-z-1.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wsdl20-z-1.xml 11 Oct 2004 21:58:31 -0000 1.2
--- wsdl20-z-1.xml 12 Oct 2004 03:07:18 -0000 1.3
***************
*** 396,417 ****
<p>The properties of the Definitions component are as follows:</p>
<ulist>
! <item><p>{interfaces} OPTIONAL. Let <z:i>interfaces</z:i> be a set of Interface components.
</p></item>
! <item><p>{bindings} OPTIONAL. Let <z:i>bindings</z:i> be a set of Binding components.
</p></item>
! <item><p>{services} OPTIONAL. Let <z:i>services</z:i> be a set of Service components.
</p></item>
! <item><p>{element declarations} OPTIONAL. Let <z:i>elementDeclarations</z:i> be a set of named element
declarations, each one isomorphic to a global element
declaration as defined by XML Schema.</p></item>
! <item><p>{type definitions} OPTIONAL. Let <z:i>typeDefinitions</z:i> be a set of named type
definitions, each one isomorphic to a global type definition
as defined by XML Schema.</p></item>
</ulist>
!
<schema xmlns="http://www.w3.org/2004/zml" name="DefinitionsComponent">
interfaces : <finset/> InterfaceComponent <nl/>
--- 396,419 ----
<p>The properties of the Definitions component are as follows:</p>
<ulist>
! <item><p>{interfaces} OPTIONAL. A set of Interface components.
</p></item>
! <item><p>{bindings} OPTIONAL. A set of Binding components.
</p></item>
! <item><p>{services} OPTIONAL. A set of Service components.
</p></item>
! <item><p>{element declarations} OPTIONAL. A set of named element
declarations, each one isomorphic to a global element
declaration as defined by XML Schema.</p></item>
! <item><p>{type definitions} OPTIONAL. A set of named type
definitions, each one isomorphic to a global type definition
as defined by XML Schema.</p></item>
</ulist>
!
! <z:notation name="DefinitionsComponent">
! <p>The properties of the Definitions component are described by <z:i>DefinitionsComponent</z:i>:</p>
<schema xmlns="http://www.w3.org/2004/zml" name="DefinitionsComponent">
interfaces : <finset/> InterfaceComponent <nl/>
***************
*** 421,424 ****
--- 423,427 ----
typeDefinitions : <finset/> TypeDefinitionComponent
</schema>
+ </z:notation>
<p>The set of interfaces/binding/services/etc. available in the
***************
*** 464,471 ****
QName. Thus, QNames of components must be unique within the
space of those components in a given target namespace.</p>
!
<p>The QName uniqueness constraint on components is expressed
by <z:i>DefinitionsComponent1</z:i>:</p>
-
<schema xmlns="http://www.w3.org/2004/zml" name="DefinitionsComponent1">
DefinitionsComponent
--- 467,474 ----
QName. Thus, QNames of components must be unique within the
space of those components in a given target namespace.</p>
!
! <z:notation name="DefinitionsComponent1">
<p>The QName uniqueness constraint on components is expressed
by <z:i>DefinitionsComponent1</z:i>:</p>
<schema xmlns="http://www.w3.org/2004/zml" name="DefinitionsComponent1">
DefinitionsComponent
***************
*** 486,503 ****
<t1/> x.qName = y.qName <implies/> x = y
</schema>
-
<ulist>
-
<item><p>No two interfaces have the same QName.</p></item>
-
<item><p>No two bindings have the same QName.</p></item>
-
<item><p>No two services have the same QName.</p></item>
-
<item><p>No two element declarations have the same QName.</p></item>
-
<item><p>No two type definitions have the same QName.</p></item>
-
</ulist>
<p>In addition to WSDL components and type system
components, additional extension components MAY be added via
--- 489,501 ----
<t1/> x.qName = y.qName <implies/> x = y
</schema>
<ulist>
<item><p>No two interfaces have the same QName.</p></item>
<item><p>No two bindings have the same QName.</p></item>
<item><p>No two services have the same QName.</p></item>
<item><p>No two element declarations have the same QName.</p></item>
<item><p>No two type definitions have the same QName.</p></item>
</ulist>
+ </z:notation>
+
<p>In addition to WSDL components and type system
components, additional extension components MAY be added via
Index: build.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build.xml 11 Oct 2004 21:58:31 -0000 1.1
--- build.xml 12 Oct 2004 03:07:18 -0000 1.2
***************
*** 35,43 ****
<target name="html" description="Transforms xml into html.">
! <xslt in="wsdl20-z.xml" out="wsdl20-z.html" style="xmlspec-wsdl-z.xsl"/>
! <xslt in="wsdl20-z-1.xml" out="wsdl20-z-1.html" style="xmlspec-wsdl-z.xsl"/>
</target>
! <target name="main" depends="html" description="Creates all output files."/>
</project>
\ No newline at end of file
--- 35,58 ----
<target name="html" description="Transforms xml into html.">
! <xslt in="wsdl20-z.xml" out="wsdl20-z.html" style="xmlspec-wsdl-z.xsl" />
! <xslt in="wsdl20-z-1.xml" out="wsdl20-z-1.html" style="xmlspec-wsdl-z.xsl">
! <param name="showZed" expression="true" />
! <param name="fullSpecification" expression="wsdl20-z-1.html" />
! <param name="shortSpecification" expression="wsdl20-z-1-short.html" />
! </xslt>
! <xslt in="wsdl20-z-1.xml" out="wsdl20-z-1-short.html" style="xmlspec-wsdl-z.xsl">
! <param name="showZed" expression="false" />
! <param name="fullSpecification" expression="wsdl20-z-1.html" />
! <param name="shortSpecification" expression="wsdl20-z-1-short.html" />
! </xslt>
</target>
! <target name="clean" description="Deletes generated files.">
! <delete file="wsdl20-z.html" />
! <delete file="wsdl20-z-1.html" />
! <delete file="wsdl20-z-1-short.html" />
! </target>
!
! <target name="main" depends="clean, html" description="Creates all output files." />
</project>
\ No newline at end of file
Index: zml2html.xsl
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/zml2html.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** zml2html.xsl 11 Oct 2004 21:58:31 -0000 1.2
--- zml2html.xsl 12 Oct 2004 03:07:18 -0000 1.3
***************
*** 26,30 ****
<!--
ChangeLog:
!
2004-10-10: Arthur Ryman <ryman@ca.ibm.com>
- simplified ZML to make authoring easier
--- 26,30 ----
<!--
ChangeLog:
!
2004-10-10: Arthur Ryman <ryman@ca.ibm.com>
- simplified ZML to make authoring easier
***************
*** 39,42 ****
--- 39,80 ----
<xsl:import href="zml2html-symbols.xsl" />
+ <xsl:param name="showZed">true</xsl:param>
+ <xsl:param name="fullSpecification">specification.html</xsl:param>
+ <xsl:param name="shortSpecification">
+ specification-short.html
+ </xsl:param>
+
+ <xsl:template match="z:notation">
+ <xsl:choose>
+ <xsl:when test="$showZed='true'">
+ <p>
+ <span class="zi">
+ <a name="{@name}"
+ href="{$shortSpecification}#{@name}">
+ <xsl:text>
+ Hide formal definition of
+ </xsl:text>
+ <xsl:value-of select="@name" />
+ </a>
+ </span>
+ </p>
+ <xsl:apply-templates />
+ </xsl:when>
+ <xsl:otherwise>
+ <p>
+ <span class="zi">
+ <a name="{@name}"
+ href="{$fullSpecification}#{@name}">
+ <xsl:text>
+ Show formal definition of
+ </xsl:text>
+ <xsl:value-of select="@name" />
+ </a>
+ </span>
+ </p>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
<xsl:template match="z:zed">
<table class="zzed">
Received on Tuesday, 12 October 2004 03:07:21 UTC