2002/ws/desc/tools setup-namespaces,1.22,1.23

Update of /sources/public/2002/ws/desc/tools
In directory homer:/tmp/cvs-serv29203

Modified Files:
	setup-namespaces 
Log Message:
Enabled definition of namespace URIs over several documents


Index: setup-namespaces
===================================================================
RCS file: /sources/public/2002/ws/desc/tools/setup-namespaces,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** setup-namespaces	7 Jun 2005 09:58:33 -0000	1.22
--- setup-namespaces	1 Aug 2005 13:51:15 -0000	1.23
***************
*** 76,83 ****
  
  sub readFromTemplate() {
!     my ($fn) = @_;
      my $c = &readFromDoc("templates/$fn");
!     $c =~ s|\@TRLOC\@|$Y/$DOC|g;
!     $c =~ s|\@TITLE\@|$TITLE|g;
      $c =~ s|\@Y\@|$Y|g;
      $c =~ s|\@M\@|$M|g;
--- 76,85 ----
  
  sub readFromTemplate() {
!     my ($fn, $common) = @_;
      my $c = &readFromDoc("templates/$fn");
!     if ($common != 1) {
! 	$c =~ s|\@TRLOC\@|$Y/$DOC|g;
! 	$c =~ s|\@TITLE\@|$TITLE|g;
!     }
      $c =~ s|\@Y\@|$Y|g;
      $c =~ s|\@M\@|$M|g;
***************
*** 143,148 ****
  
  sub genRDDLFromTemplate() {
!     my ($t, $d, $ns, $latest, $ext) = @_;
!     my $c = &readFromTemplate("rddl.$ext");
      $c =~ s|\@NS\@|$ns|g;
      $c =~ s|\@LATEST\@|http://www.w3.org/2002/ws/desc/ns/$latest.xsd|g;
--- 145,161 ----
  
  sub genRDDLFromTemplate() {
!     my ($t, $d, $ns, $latest, $common, $ext) = @_;
!     my $c = &readFromTemplate("rddl.$ext", $common);
!     if ($common) {
! 	# Common to Part 1 and 2
! 	# Watch out for this: it will break if the documents change name!
! 	my $D2 = $DOC;
! 	$D2 =~ s/wsdl20/wsdl20-adjuncts/;
! 	my $T2 = $TITLE;
! 	$T2 =~ s/1: Core Language/2: Adjuncts/;
! 	$c =~ s|href="http://www.w3.org/TR/\@TRLOC\@/"\>\@TITLE\@\</a\>|href="http://www.w3.org/TR/$Y/$DOC/">$TITLE</a> and <a href="http://www.w3.org/TR/$Y/$D2/">$T2</a>|;
! 	$c =~ s|\@TITLE\@|$TITLE and $T2|;
! 	$c =~ s|specification\.|specifications.|g;
!     }
      $c =~ s|\@NS\@|$ns|g;
      $c =~ s|\@LATEST\@|http://www.w3.org/2002/ws/desc/ns/$latest.xsd|g;
***************
*** 159,168 ****
  
  sub moveSchema() {
!     my ($s, $d, $ns, $latest) = @_;
      my $src = "$PUBDIR/$s";
      my $dst = "$TARGET/$d.xsd";
      move($src, $dst) || die "mv $src $dst: $!";
      print "Installed $d.xsd\n";
!     &genRDDLDoc($TARGET, $d, $ns, $latest);
  }
  
--- 172,185 ----
  
  sub moveSchema() {
!     my ($s, $d, $ns, $latest, $common) = @_;
      my $src = "$PUBDIR/$s";
      my $dst = "$TARGET/$d.xsd";
      move($src, $dst) || die "mv $src $dst: $!";
      print "Installed $d.xsd\n";
!     if ($common == 1) {
! 	&genRDDLDoc($TARGET, $d, $ns, $latest, 1);
!     } else {
! 	&genRDDLDoc($TARGET, $d, $ns, $latest, 0);
!     }
  }
  
***************
*** 170,174 ****
      &moveSchema("wsdl20.xsd", "wsdl20", "WSDL 2.0", "wsdl20");
      &moveSchema("wsdl20-instance.xsd", "../wsdl-instance", "WSDL Instance", "wsdl-instance");
!     &moveSchema("wsdl20-extensions.xsd", "../wsdl-extensions", "WSDL Extensions", "wsdl-extensions");
  }
  elsif ($ID eq 'PART2') {
--- 187,191 ----
      &moveSchema("wsdl20.xsd", "wsdl20", "WSDL 2.0", "wsdl20");
      &moveSchema("wsdl20-instance.xsd", "../wsdl-instance", "WSDL Instance", "wsdl-instance");
!     &moveSchema("wsdl20-extensions.xsd", "../wsdl-extensions", "WSDL Extensions", "wsdl-extensions", 1);
  }
  elsif ($ID eq 'PART2') {
***************
*** 176,180 ****
      &moveSchema("wsdl20-http.xsd", "http", "WSDL 2.0 HTTP Binding", "http");
      &moveSchema("wsdl20-rpc.xsd", "rpc", "WSDL 2.0 RPC Style", "rpc");
-     &moveSchema("wsdl20-extensions.xsd", "../wsdl-extensions", "WSDL Extensions", "wsdl-extensions");
  }
  
--- 193,196 ----

Received on Monday, 1 August 2005 13:51:23 UTC