You are viewing a plain text version of this content. The canonical link for it is here.
Posted to alexandria-dev@jakarta.apache.org by ru...@apache.org on 2001/08/05 14:19:36 UTC

cvs commit: jakarta-alexandria/proposal/gump/stylesheet update.xsl

rubys       01/08/05 05:19:36

  Modified:    proposal/gump gen.java rubix.xml rubypad.xml
               proposal/gump/profile gump.xml
               proposal/gump/project bsf.xml
               proposal/gump/stylesheet update.xsl
  Log:
  Completely convert over to repository descriptors
  
  Revision  Changes    Path
  1.3       +7 -6      jakarta-alexandria/proposal/gump/gen.java
  
  Index: gen.java
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/gen.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- gen.java	2001/04/23 13:10:12	1.2
  +++ gen.java	2001/08/05 12:19:35	1.3
  @@ -115,24 +115,24 @@
          }
       }
   
  -    private void collapse(Hashtable projects, Node parent) {
  +    private void collapse(String type, Hashtable list, Node parent) {
          Node child=parent.getFirstChild();
          while (child != null) {
              Node next=child.getNextSibling();
  -           if (child.getNodeName().equals("project")) {
  +           if (child.getNodeName().equals(type)) {
                  Element project = (Element) child;
                  String name = project.getAttributeNode("name").getValue();
   
  -               Element priorDefinition = (Element)projects.get(name);
  +               Element priorDefinition = (Element)list.get(name);
                  if (priorDefinition == null) {
  -                   projects.put(name, project);
  +                   list.put(name, project);
                  } else {
                      copyChildren(project, priorDefinition);
                      project.getParentNode().removeChild(project);
                      project=priorDefinition;
                  }
   
  -               collapse(projects, project);
  +               collapse(type, list, project);
              }
              child=next;
          }
  @@ -158,7 +158,8 @@
       private gen(String source) throws Exception {
           Node workspace = parse(source);
           expand((Element)workspace.getFirstChild());
  -        collapse(new Hashtable(), workspace.getFirstChild());
  +        collapse("project", new Hashtable(), workspace.getFirstChild());
  +        collapse("repository", new Hashtable(), workspace.getFirstChild());
   
           Node resolved = transform(workspace, "defaults.xsl");
           output (resolved, "work/merge.xml");
  
  
  
  1.42      +3 -17     jakarta-alexandria/proposal/gump/rubix.xml
  
  Index: rubix.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/rubix.xml,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- rubix.xml	2001/07/16 11:13:37	1.41
  +++ rubix.xml	2001/08/05 12:19:35	1.42
  @@ -29,23 +29,9 @@
     <project name="jts"            home="/opt/jts1_0"/>
     <project name="tranquilo"      home="/opt/xsdlib-20010424"/>
   
  -  <cvs-repository>
  -    <tree name="bsf"
  -      root=":pserver:bsfadmin@oss.software.ibm.com:/usr/cvs/bsf"/>
  +  <!-- CVS Repository overrides -->
   
  -    <tree name="jakarta" root=":ext:rubys@cvs.apache.org:/home/cvs"/>
  -
  -    <tree name="jdom" root=":pserver:anonymous@cvs.jdom.org:/home/cvspublic"/>
  -
  -    <tree name="mozilla"
  -      root=":pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot"/>
  -
  -    <tree name="tigris" root=":pserver:guest@cvs.tigris.org:/cvs"/>
  -
  -    <tree name="whichever"
  -      root=":pserver:anoncvs@share.whichever.com:/home/cvspublic"/>
  -
  -    <tree name="xml" root=":ext:rubys@cvs.apache.org:/home/cvs"/>
  -  </cvs-repository>
  +  <repository name="jakarta" method="ext" user="rubys" path="/home/cvs"/>
  +  <repository name="xml" method="ext" user="rubys" path="/home/cvs"/>
   
   </workspace>
  
  
  
  1.38      +3 -17     jakarta-alexandria/proposal/gump/rubypad.xml
  
  Index: rubypad.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/rubypad.xml,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- rubypad.xml	2001/07/16 11:13:37	1.37
  +++ rubypad.xml	2001/08/05 12:19:35	1.38
  @@ -22,23 +22,9 @@
     <project name="jts"            home="C:\jts1_0"/>
     <project name="tranquilo"      home="C:\xsdlib-20010424"/>
   
  -  <cvs-repository>
  -    <tree name="bsf"
  -      root=":pserver:bsfadmin@oss.software.ibm.com:/usr/cvs/bsf"/>
  +  <!-- CVS Repository overrides -->
   
  -    <tree name="jakarta" root=":ext:rubys@cvs.apache.org:/home/cvs"/>
  -
  -    <tree name="jdom" root=":pserver:anonymous@cvs.jdom.org:/home/cvspublic"/>
  -
  -    <tree name="mozilla"
  -      root=":pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot"/>
  -
  -    <tree name="tigris" root=":pserver:guest@cvs.tigris.org:/cvs"/>
  -
  -    <tree name="whichever"
  -      root=":pserver:anoncvs@share.whichever.com:/home/cvspublic"/>
  -
  -    <tree name="xml" root=":ext:rubys@cvs.apache.org:/home/cvs"/>
  -  </cvs-repository>
  +  <repository name="jakarta" method="ext" user="rubys" path="/home/cvs"/>
  +  <repository name="xml" method="ext" user="rubys" path="/home/cvs"/>
   
   </workspace>
  
  
  
  1.17      +8 -2      jakarta-alexandria/proposal/gump/profile/gump.xml
  
  Index: gump.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/profile/gump.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- gump.xml	2001/07/31 16:57:00	1.16
  +++ gump.xml	2001/08/05 12:19:36	1.17
  @@ -95,10 +95,16 @@
     <project href="project/jts.xml"/>
     <project href="project/tranquilo.xml"/>
   
  -  <!-- CVS Repository overrides -->
  +  <!-- CVS Repository definitions -->
  +  <repository href="repository/dbxml.xml"/>
     <repository href="repository/devworks.xml"/>
     <repository href="repository/exolab.xml"/>
  -  <repository href="repository/dbxml.xml"/>
  +  <repository href="repository/jakarta.xml"/>
  +  <repository href="repository/jdom.xml"/>
  +  <repository href="repository/mozilla.xml"/>
     <repository href="repository/sourceforge.xml"/>
  +  <repository href="repository/tigris.xml"/>
  +  <repository href="repository/whichever.xml"/>
  +  <repository href="repository/xml.xml"/>
   
   </profile>
  
  
  
  1.4       +1 -1      jakarta-alexandria/proposal/gump/project/bsf.xml
  
  Index: bsf.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/bsf.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- bsf.xml	2001/04/25 15:28:04	1.3
  +++ bsf.xml	2001/08/05 12:19:36	1.4
  @@ -5,7 +5,7 @@
       Bean Scripting Framework
     </description>
   
  -  <cvs repository="bsf"/>
  +  <cvs repository="devworks" dir="bsf"/>
   
     <ant target="samples"/>
     <depend project="xml-xerces"/>
  
  
  
  1.7       +33 -5     jakarta-alexandria/proposal/gump/stylesheet/update.xsl
  
  Index: update.xsl
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/update.xsl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- update.xsl	2001/04/16 17:52:48	1.6
  +++ update.xsl	2001/08/05 12:19:36	1.7
  @@ -132,19 +132,47 @@
         <xsl:variable name="host-prefix" select="@host-prefix"/>
   
         <xsl:attribute name="repository">
  -        <xsl:for-each select="//repository[@name=$repository]/root">
  +        <xsl:for-each select="//repository[@name=$repository]">
   	  <xsl:text>:</xsl:text>
  -          <xsl:value-of select="method"/>
  +          <xsl:choose>
  +            <xsl:when test="@method">
  +              <xsl:value-of select="@method"/>
  +            </xsl:when>
  +            <xsl:otherwise>
  +              <xsl:value-of select="root/method"/>
  +            </xsl:otherwise>
  +          </xsl:choose>
   	  <xsl:text>:</xsl:text>
  -          <xsl:value-of select="user"/>
  +          <xsl:choose>
  +            <xsl:when test="@user">
  +              <xsl:value-of select="@user"/>
  +            </xsl:when>
  +            <xsl:otherwise>
  +              <xsl:value-of select="root/user"/>
  +            </xsl:otherwise>
  +          </xsl:choose>
   	  <xsl:text>@</xsl:text>
             <xsl:if test="$host-prefix">
               <xsl:value-of select="$host-prefix"/>
               <xsl:text>.</xsl:text>
             </xsl:if>
  -          <xsl:value-of select="hostname"/>
  +          <xsl:choose>
  +            <xsl:when test="@hostname">
  +              <xsl:value-of select="@hostname"/>
  +            </xsl:when>
  +            <xsl:otherwise>
  +              <xsl:value-of select="root/hostname"/>
  +            </xsl:otherwise>
  +          </xsl:choose>
   	  <xsl:text>:</xsl:text>
  -          <xsl:value-of select="path"/>
  +          <xsl:choose>
  +            <xsl:when test="@path">
  +              <xsl:value-of select="@path"/>
  +            </xsl:when>
  +            <xsl:otherwise>
  +              <xsl:value-of select="root/path"/>
  +            </xsl:otherwise>
  +          </xsl:choose>
             <xsl:if test="$dir">
               <xsl:text>/</xsl:text>
               <xsl:value-of select="$dir"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: alexandria-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: alexandria-dev-help@jakarta.apache.org