2006/ws/policy build.xml,1.11,1.12 extract-glist.xsl,1.5,1.6

Update of /sources/public/2006/ws/policy
In directory hutz:/tmp/cvs-serv871/ws/policy

Modified Files:
	build.xml extract-glist.xsl 
Log Message:
Build for glossary uses now saxon8, which is in a subdirectory.

Index: build.xml
===================================================================
RCS file: /sources/public/2006/ws/policy/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- build.xml	10 Sep 2006 19:17:20 -0000	1.11
+++ build.xml	24 Sep 2006 12:49:29 -0000	1.12
@@ -2,6 +2,9 @@
      Philippe Le Hegaret, W3C -->
      
 <project name="WS-Policy 1.5" default="main" basedir=".">
+    <path id="saxon8.classpath">
+<pathelement location="saxon8/saxon8.jar"/>
+</path>
 	<property name="stylesheet" value="xmlspec-policy.xsl"/>
 	<property name="glossary"
 	value="extract-glist.xsl"/>
@@ -53,8 +56,20 @@
 	</target>
 
     <target name="glossaries" description="Generates glossary entries out of temdef elements">
-        <xslt style="${glossary}" in="ws-policy-framework.xml" out="glossary-framework.xml"/>
-       <xslt style="${glossary}" in="ws-policy-attachment.xml" out="glossary-attachment.xml"/>
+        <java fork="true" classname="net.sf.saxon.Transform">
+<classpath refid="saxon8.classpath"/>
+<arg value="-o"/>
+<arg value="glossary-framework.xml"/>
+<arg value="ws-policy-framework.xml"/>
+<arg value="${glossary}"/>
+</java>
+<java fork="true" classname="net.sf.saxon.Transform">
+<classpath refid="saxon8.classpath"/>
+<arg value="-o"/>
+<arg value="glossary-attachment.xml"/>
+<arg value="ws-policy-attachment.xml"/>
+<arg value="${glossary}"/>
+</java>
  </target>
         <path id="diffmk.classpath">
             <pathelement location="${basedir}/diffmk.jar"/>
@@ -67,7 +82,7 @@
       <arg value="-diff"/>
       <arg value="both"/>
       <arg value="-words"/>
-      <arg value="ws-policy-framework-tr${last-public-draft}.xml"/>
+      <arg value="prev-pub/ws-policy-framework.xml"/>
       <arg value="ws-policy-framework.xml"/>
       <arg value="ws-policy-framework-diff${last-public-draft}.xml"/>
       <classpath path="diffmk.jar:DiffMk.properties">    
@@ -79,7 +94,7 @@
       <arg value="-diff"/>
       <arg value="both"/>
       <arg value="-words"/>
-      <arg value="ws-policy-attachment-tr${last-public-draft}.xml"/>
+      <arg value="prev-pub/ws-policy-attachment.xml"/>
       <arg value="ws-policy-attachment.xml"/>
       <arg value="ws-policy-attachment-diff${last-public-draft}.xml"/>
       <classpath path="diffmk.jar:DiffMk.properties">    

Index: extract-glist.xsl
===================================================================
RCS file: /sources/public/2006/ws/policy/extract-glist.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- extract-glist.xsl	23 Sep 2006 09:47:57 -0000	1.5
+++ extract-glist.xsl	24 Sep 2006 12:49:29 -0000	1.6
@@ -12,7 +12,7 @@
                 <xsl:variable name="termRefId">
                     <xsl:value-of select="p"/>
                 </xsl:variable>
-                <xsl:copy-of select=" doc('ws-policy-framework.xml')//termdef[string(@id)=string($termRefId)]"/>
+                <xsl:copy-of select="doc('ws-policy-framework.xml')//termdef[string(@id)=string($termRefId)]"/>
             </xsl:for-each>
             </ulist>
         </xsl:variable>

Received on Sunday, 24 September 2006 12:49:43 UTC