rubys 01/02/05 10:37:24
Modified: proposal/gump rubix.xml rubypad.xml
proposal/gump/project jetspeed.xml turbine.xml village.xml
proposal/gump/stylesheet update.xsl
Log:
Add support for multiple directories in one repository
Revision Changes Path
1.3 +1 -11 jakarta-alexandria/proposal/gump/rubix.xml
Index: rubix.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/rubix.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rubix.xml 2001/02/05 17:00:11 1.2
+++ rubix.xml 2001/02/05 18:37:11 1.3
@@ -64,13 +64,9 @@
<project href="project/jsse.xml" home="/opt/jsse1.0.2"/>
<project href="project/jta.xml" home="/opt/jta-spec1_0_1"/>
-
<!-- CVS Repository overrides -->
<cvs-repository>
- <tree name="alexandria"
- root=":pserver:[EMAIL PROTECTED]:/products/cvs/alexandria"/>
-
<tree name="bsf"
root=":pserver:[EMAIL PROTECTED]:/usr/cvs/bsf"/>
@@ -80,9 +76,6 @@
<tree name="freemarker"
root=":pserver:[EMAIL PROTECTED]:/cvsroot/freemarker"/>
- <tree name="jetspeed"
- root=":pserver:[EMAIL PROTECTED]:/products/cvs/jetspeed"/>
-
<tree name="jakarta"
root=":pserver:[EMAIL PROTECTED]:/home/cvspublic"/>
@@ -97,14 +90,11 @@
<tree name="jservpub"
root=":pserver:[EMAIL PROTECTED]:/products/cvs/master"/>
- <tree name="turbine"
- root=":pserver:[EMAIL PROTECTED]:/products/cvs/turbine"/>
-
<tree name="xml"
root=":pserver:[EMAIL PROTECTED]:/home/cvspublic"/>
<tree name="working-dogs"
- root=":pserver:[EMAIL PROTECTED]:/products/cvs/external"/>
+ root=":pserver:[EMAIL PROTECTED]:/products/cvs"/>
</cvs-repository>
</workspace>
1.3 +1 -10 jakarta-alexandria/proposal/gump/rubypad.xml
Index: rubypad.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/rubypad.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rubypad.xml 2001/02/05 17:00:11 1.2
+++ rubypad.xml 2001/02/05 18:37:12 1.3
@@ -67,9 +67,6 @@
<!-- CVS Repository overrides -->
<cvs-repository>
- <tree name="alexandria"
- root=":pserver:[EMAIL PROTECTED]:/products/cvs/alexandria"/>
-
<tree name="bsf"
root=":pserver:[EMAIL PROTECTED]:/usr/cvs/bsf"/>
@@ -79,9 +76,6 @@
<tree name="freemarker"
root=":pserver:[EMAIL PROTECTED]:/cvsroot/freemarker"/>
- <tree name="jetspeed"
- root=":pserver:[EMAIL PROTECTED]:/products/cvs/jetspeed"/>
-
<tree name="jakarta" root=":pserver:rubys@localhost:/home/cvs"/>
<tree name="jdom" root=":pserver:[EMAIL PROTECTED]:/home/cvspublic"/>
@@ -95,13 +89,10 @@
<tree name="jservpub"
root=":pserver:[EMAIL PROTECTED]:/products/cvs/master"/>
- <tree name="turbine"
- root=":pserver:[EMAIL PROTECTED]:/products/cvs/turbine"/>
-
<tree name="xml" root=":pserver:rubys@localhost:/home/cvs"/>
<tree name="working-dogs"
- root=":pserver:[EMAIL PROTECTED]:/products/cvs/external"/>
+ root=":pserver:[EMAIL PROTECTED]:/products/cvs"/>
</cvs-repository>
</workspace>
1.3 +1 -1 jakarta-alexandria/proposal/gump/project/jetspeed.xml
Index: jetspeed.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jetspeed.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jetspeed.xml 2001/02/05 16:12:26 1.2
+++ jetspeed.xml 2001/02/05 18:37:17 1.3
@@ -5,7 +5,7 @@
Enterprise Information Portal
</description>
- <cvs repository="jetspeed"/>
+ <cvs repository="working-dogs" dir="jetspeed"/>
<ant buildfile="build/build.xml">
<property name="JAVAC" value="classic"/>
1.2 +1 -1 jakarta-alexandria/proposal/gump/project/turbine.xml
Index: turbine.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/turbine.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- turbine.xml 2001/02/04 18:03:52 1.1
+++ turbine.xml 2001/02/05 18:37:18 1.2
@@ -5,7 +5,7 @@
Servlet based framework
</description>
- <cvs repository="turbine"/>
+ <cvs repository="working-dogs" dir="turbine"/>
<ant buildfile="build/build-turbine.xml" target="package"/>
1.2 +1 -1 jakarta-alexandria/proposal/gump/project/village.xml
Index: village.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/village.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- village.xml 2001/02/04 18:03:52 1.1
+++ village.xml 2001/02/05 18:37:18 1.2
@@ -5,7 +5,7 @@
Database API
</description>
- <cvs repository="working-dogs"/>
+ <cvs repository="working-dogs" dir="external"/>
<ant buildfile="build/build-village.xml" target="package"/>
1.2 +13 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- update.xsl 2001/02/04 18:03:54 1.1
+++ update.xsl 2001/02/05 18:37:23 1.2
@@ -112,10 +112,21 @@
<xsl:template match="project[not(cvs)]"/>
+ <!-- =================================================================== -->
+ <!-- pre-resolve repository for later convenience -->
+ <!-- =================================================================== -->
+
<xsl:template match="cvs">
<xsl:variable name="repository" select="@repository"/>
- <cvs repository="{//cvs-repository/tree[@name=$repository]/@root}"
- srcdir="{ancestor::project/@srcdir}">
+ <cvs srcdir="{ancestor::project/@srcdir}">
+
+ <xsl:attribute name="repository">
+ <xsl:value-of select="//cvs-repository/tree[@name=$repository]/@root"/>
+ <xsl:if test="@dir">
+ <xsl:text>/</xsl:text>
+ <xsl:value-of select="@dir"/>
+ </xsl:if>
+ </xsl:attribute>
<xsl:apply-templates select="@*[not(name()='repository')]"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
