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 bo...@apache.org on 2002/07/24 13:34:37 UTC
cvs commit: jakarta-alexandria/proposal/gump/java Module.java
bodewig 2002/07/24 04:34:37
Modified: proposal/gump/stylesheet bash.xsl update.xsl win2k.xsl
proposal/gump/java Module.java
Log:
Initial Subversion support.
In the module use something like
<svn url="http://svn.collab.net/repos/svn/trunk" />
instead of the CVS element for subversion repositories.
<svn> takes an optional srcdir attribute that deteremines the name of
the directory we are checking out to (defaults to the module's name).
Revision Changes Path
1.81 +54 -0 jakarta-alexandria/proposal/gump/stylesheet/bash.xsl
Index: bash.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/bash.xsl,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- bash.xsl 13 Jul 2002 23:42:08 -0000 1.80
+++ bash.xsl 24 Jul 2002 11:34:37 -0000 1.81
@@ -714,6 +714,60 @@
</xsl:template>
<!-- =================================================================== -->
+ <!-- svn update -->
+ <!-- =================================================================== -->
+
+ <xsl:template match="svn">
+
+ <!-- update -->
+
+ <xsl:text>test -d </xsl:text>
+ <xsl:value-of select="translate(@srcdir,'\','/')"/>
+ <xsl:text> && export CMD="svn update </xsl:text>
+ <xsl:value-of select="@srcdir"/>
+ <xsl:text>" </xsl:text>
+
+ <!-- checkout -->
+
+ <xsl:text>test -d </xsl:text>
+ <xsl:value-of select="translate(@srcdir,'\','/')"/>
+
+ <xsl:text> || export CMD="svn checkout </xsl:text>
+ <xsl:value-of select="@url"/>
+ <xsl:text> -d </xsl:text>
+ <xsl:value-of select="@srcdir"/>
+ <xsl:text>" </xsl:text>
+
+ <!-- execute -->
+
+ <xsl:text>eval "echo $CMD $OUT" </xsl:text>
+ <xsl:text>eval "echo $OUT" </xsl:text>
+
+ <xsl:text>if ! eval </xsl:text>
+ <xsl:if test="$cmd-prefix">
+ <xsl:text>"</xsl:text>
+ <xsl:value-of select="$cmd-prefix"/>
+ <xsl:text>" </xsl:text>
+ </xsl:if>
+ <xsl:text>"$CMD $OUT 2>&1"; then </xsl:text>
+
+ <xsl:text>sleep 90 </xsl:text>
+ <xsl:text>echo Retrying... </xsl:text>
+
+ <xsl:text>eval </xsl:text>
+ <xsl:if test="$cmd-prefix">
+ <xsl:text>"</xsl:text>
+ <xsl:value-of select="$cmd-prefix"/>
+ <xsl:text>" </xsl:text>
+ </xsl:if>
+ <xsl:text>"$CMD $OUT 2>&1" ||\ </xsl:text>
+ <xsl:text>export STATUS=FAILED </xsl:text>
+
+ <xsl:text>fi </xsl:text>
+
+ </xsl:template>
+
+ <!-- =================================================================== -->
<!-- support for capturing and including static text -->
<!-- =================================================================== -->
1.18 +2 -1 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- update.xsl 23 Oct 2001 19:35:52 -0000 1.17
+++ update.xsl 24 Jul 2002 11:34:37 -0000 1.18
@@ -128,6 +128,7 @@
<content>
<logic name="{@name}">
<xsl:apply-templates select="cvs"/>
+ <xsl:apply-templates select="svn"/>
</logic>
</content>
</html>
@@ -146,6 +147,6 @@
</xsl:copy>
</xsl:template>
- <xsl:template match="module[not(cvs)]"/>
+ <xsl:template match="module[not(cvs) and not(svn)]"/>
</xsl:stylesheet>
1.39 +36 -0 jakarta-alexandria/proposal/gump/stylesheet/win2k.xsl
Index: win2k.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/win2k.xsl,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- win2k.xsl 23 Apr 2002 17:45:32 -0000 1.38
+++ win2k.xsl 24 Jul 2002 11:34:37 -0000 1.39
@@ -624,6 +624,42 @@
</xsl:template>
<!-- =================================================================== -->
+ <!-- svn update -->
+ <!-- =================================================================== -->
+
+ <xsl:template match="svn">
+ <xsl:text>SET STATUS=SUCCESS </xsl:text>
+
+ <!-- update -->
+
+ <xsl:text>if exist </xsl:text>
+ <xsl:value-of select="translate(@srcdir,'/','\')"/>
+ <xsl:text> SET CMD=svn update </xsl:text>
+ <xsl:value-of select="@srcdir"/>
+ <xsl:text> </xsl:text>
+
+ <!-- checkout -->
+
+ <xsl:text>if not exist </xsl:text>
+ <xsl:value-of select="translate(@srcdir,'/','\')"/>
+
+ <xsl:text> SET CMD=svn checkout </xsl:text>
+ <xsl:value-of select="@url"/>
+ <xsl:text> -d </xsl:text>
+ <xsl:value-of select="@srcdir"/>
+ <xsl:text> </xsl:text>
+
+ <!-- execute -->
+
+ <xsl:text>@echo %CMD% %OUT% </xsl:text>
+ <xsl:text>@echo. %OUT% </xsl:text>
+ <xsl:text>%CMD% %OUT% 2>&1 </xsl:text>
+ <xsl:text>if errorlevel 1 SET STATUS=FAILED </xsl:text>
+ <xsl:text>if not "%1"=="all" goto eoj </xsl:text>
+
+ </xsl:template>
+
+ <!-- =================================================================== -->
<!-- support for capturing and including static text -->
<!-- =================================================================== -->
1.17 +5 -0 jakarta-alexandria/proposal/gump/java/Module.java
Index: Module.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/java/Module.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Module.java 27 May 2002 17:53:49 -0000 1.16
+++ Module.java 24 Jul 2002 11:34:37 -0000 1.17
@@ -97,6 +97,11 @@
description = (Element) child;
} else if (child.getNodeName().equals("url")) {
url = (Element) child;
+ } else if (child.getNodeName().equals("svn")) {
+ Element svn = (Element) child;
+ if (svn.getAttributeNode("srcdir") == null) {
+ svn.setAttribute("srcdir", name);
+ }
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>