rubys 01/08/07 07:13:06
Modified: proposal/gump rubix.xml rubypad.xml
proposal/gump/profile gump.xml
proposal/gump/stylesheet defaults.xsl
Log:
Factor out installed packages into the profile. Of course, the
workspace can still override individual entries as necessary.
Revision Changes Path
1.43 +4 -21 jakarta-alexandria/proposal/gump/rubix.xml
Index: rubix.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/rubix.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- rubix.xml 2001/08/05 12:19:35 1.42
+++ rubix.xml 2001/08/07 14:13:06 1.43
@@ -1,6 +1,7 @@
-<workspace basedir="/home/rubys/jakarta" cvsdir="/home/rubys/jakarta/cvs"
- version="0.2">
+<?xml version="1.0" ?>
+<workspace basedir="/home/rubys/jakarta" pkgdir="/opt" version="0.3">
+
<property name="build.sysclasspath" value="only"/>
<profile href="profile/gump.xml"/>
@@ -10,26 +11,8 @@
<project name="phpservlet" home="/home/rubys/php">
<jar name="lib/php/phpsrvlt.jar"/>
</project>
-
- <!-- Installed packages -->
-
- <project name="ejb" home="/opt/ejb-2_0-pfd"/>
- <project name="j2ee-connector" home="/opt/j2ee_connector-1_0-pfd2"/>
- <project name="jaas" home="/opt/jaas1_0"/>
- <project name="jaf" home="/opt/jaf-1.0.1"/>
- <project name="javamail" home="/opt/javamail-1.2"/>
- <project name="jaxp" home="/opt/jaxp1.0.1"/>
- <project name="jaxp1.1" home="/opt/jaxp-1.1"/>
- <project name="jdbc" home="/opt/jdbc2_0"/>
- <project name="jms" home="/opt/jms1.0.2"/>
- <project name="jmx" home="/opt/jmx-1_0"/>
- <project name="jndi" home="/opt/jndi1_2_1"/>
- <project name="jsse" home="/opt/jsse1.0.2"/>
- <project name="jta" home="/opt/jta-spec1_0_1"/>
- <project name="jts" home="/opt/jts1_0"/>
- <project name="tranquilo" home="/opt/xsdlib-20010424"/>
- <!-- CVS Repository overrides -->
+ <!-- Repository overrides -->
<repository name="jakarta" method="ext" user="rubys" path="/home/cvs"/>
<repository name="xml" method="ext" user="rubys" path="/home/cvs"/>
1.40 +3 -19 jakarta-alexandria/proposal/gump/rubypad.xml
Index: rubypad.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/rubypad.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- rubypad.xml 2001/08/07 13:06:55 1.39
+++ rubypad.xml 2001/08/07 14:13:06 1.40
@@ -1,26 +1,10 @@
-<workspace basedir="D:\jakarta" cvsdir="D:\jakarta\cvs" version="0.2">
+<?xml version="1.0" ?>
+<workspace basedir="D:\jakarta" pkgdir="C:\opt" version="0.3">
+
<property name="build.sysclasspath" value="only"/>
<profile href="profile/gump.xml"/>
-
- <!-- Installed packages -->
-
- <project name="ejb" home="C:\ejb-2_0-pfd"/>
- <project name="j2ee-connector" home="C:\j2ee_connector-1_0-pfd2"/>
- <project name="jaas" home="C:\jaas1_0"/>
- <project name="jaf" home="C:\jaf-1.0.1"/>
- <project name="javamail" home="C:\javamail-1.2"/>
- <project name="jaxp" home="C:\jaxp1.0.1"/>
- <project name="jaxp1.1" home="C:\jaxp-1.1"/>
- <project name="jdbc" home="C:\jdbc2_0"/>
- <project name="jms" home="C:\jms1.0.2"/>
- <project name="jmx" home="C:\jmx-1_0"/>
- <project name="jndi" home="C:\jndi1_2_1"/>
- <project name="jsse" home="C:\jsse1.0.2"/>
- <project name="jta" home="C:\jta-spec1_0_1"/>
- <project name="jts" home="C:\jts1_0"/>
- <project name="tranquilo" home="C:\xsdlib-20010424"/>
<!-- Project overrides -->
1.18 +18 -0 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gump.xml 2001/08/05 12:19:36 1.17
+++ gump.xml 2001/08/07 14:13:06 1.18
@@ -95,6 +95,24 @@
<project href="project/jts.xml"/>
<project href="project/tranquilo.xml"/>
+ <!-- Installed packages -->
+
+ <project name="ejb" package="ejb-2_0-pfd"/>
+ <project name="j2ee-connector" package="j2ee_connector-1_0-pfd2"/>
+ <project name="jaas" package="jaas1_0"/>
+ <project name="jaf" package="jaf-1.0.1"/>
+ <project name="javamail" package="javamail-1.2"/>
+ <project name="jaxp" package="jaxp1.0.1"/>
+ <project name="jaxp1.1" package="jaxp-1.1"/>
+ <project name="jdbc" package="jdbc2_0"/>
+ <project name="jms" package="jms1.0.2"/>
+ <project name="jmx" package="jmx-1_0"/>
+ <project name="jndi" package="jndi1_2_1"/>
+ <project name="jsse" package="jsse1.0.2"/>
+ <project name="jta" package="jta-spec1_0_1"/>
+ <project name="jts" package="jts1_0"/>
+ <project name="tranquilo" package="xsdlib-20010424"/>
+
<!-- CVS Repository definitions -->
<repository href="repository/dbxml.xml"/>
<repository href="repository/devworks.xml"/>
1.5 +14 -1 jakarta-alexandria/proposal/gump/stylesheet/defaults.xsl
Index: defaults.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/defaults.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- defaults.xsl 2001/08/05 16:50:34 1.4
+++ defaults.xsl 2001/08/07 14:13:06 1.5
@@ -16,7 +16,7 @@
<xsl:template match="workspace">
<xsl:variable name="basedir" select="@basedir"/>
- <xsl:variable name="version">0.2</xsl:variable>
+ <xsl:variable name="version">0.3</xsl:variable>
<xsl:if test="not(@version)">
<xsl:message terminate="yes">
@@ -60,6 +60,14 @@
</xsl:attribute>
</xsl:if>
+ <!-- default cvs directory, if not present -->
+ <xsl:if test="not(@cvsdir)">
+ <xsl:attribute name="cvsdir">
+ <xsl:value-of select="$basedir"/>
+ <xsl:text>/cvs</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
+
<!-- default build style, if not present -->
<xsl:if test="not(@build-sequence)">
<xsl:attribute name="build-sequence">
@@ -129,6 +137,11 @@
</xsl:when>
<xsl:when test="home/@dir">
<xsl:value-of select="@dir"/>
+ </xsl:when>
+ <xsl:when test="@package">
+ <xsl:value-of select="../@pkgdir"/>
+ <xsl:text>/</xsl:text>
+ <xsl:value-of select="@package"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$basedir"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
