jmartin 01/02/28 02:05:04
Modified: src/java/org/apache/alexandria/jxr CodeTransform.java
src/xml workspace.xsd
src/xsl build.build.xsl build.test.xsl left-advanced.xsl
Log:
Changed home element to be home-page to avoid confusion with gumps use of
home
Revision Changes Path
1.18 +4 -4
jakarta-alexandria/src/java/org/apache/alexandria/jxr/CodeTransform.java
Index: CodeTransform.java
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/src/java/org/apache/alexandria/jxr/CodeTransform.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- CodeTransform.java 2001/02/05 00:25:05 1.17
+++ CodeTransform.java 2001/02/28 10:05:02 1.18
@@ -693,10 +693,10 @@
String home = "";
- if( this.metadata.getProject().getHome() != null ) {
- home = this.metadata.getProject().getHome();
- } else if ( this.metadata.getRepository().getHome() != null ) {
- home = this.metadata.getRepository().getHome();
+ if( this.metadata.getProject().getHomePage() != null ) {
+ home = this.metadata.getProject().getHomePage();
+ } else if ( this.metadata.getRepository().getHomePage() != null ) {
+ home = this.metadata.getRepository().getHomePage();
}
home = "<a href=\"" + home + "\">" + home + "</a>";
1.2 +2 -2 jakarta-alexandria/src/xml/workspace.xsd
Index: workspace.xsd
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xml/workspace.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.xsd 2001/02/04 23:54:33 1.1
+++ workspace.xsd 2001/02/28 10:05:02 1.2
@@ -17,7 +17,7 @@
<element name="root" type="string" minOccurs="1"
maxOccurs="1"/>
<!-- FIX ME: castor doesn't support the URL datatype... change this..
-->
- <element name="home" type="string" minOccurs="1"
maxOccurs="1"/>
+ <element name="home-page" type="string" minOccurs="1"
maxOccurs="1"/>
<!-- optional elements -->
@@ -53,7 +53,7 @@
The URL for this module's homepage.
-->
<!-- FIX ME: castor doesn't support the URL datatype... change this..
-->
- <element name="home" type="string" minOccurs="1"
maxOccurs="1"/>
+ <element name="home-page" type="string" minOccurs="1"
maxOccurs="1"/>
<!--
A description of what this module does.
1.12 +23 -25 jakarta-alexandria/src/xsl/build.build.xsl
Index: build.build.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/build.build.xsl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.build.xsl 2001/02/22 09:32:40 1.11
+++ build.build.xsl 2001/02/28 10:05:03 1.12
@@ -11,7 +11,7 @@
<target name="all">
<xsl:attribute name="depends">
<xsl:for-each select = "project">
- <xsl:if test="../build">
+ <xsl:if test="build">
<xsl:if test="position()!=1"><xsl:text>,</xsl:text></xsl:if>
<xsl:value-of select="module"/><xsl:text>.</xsl:text>
<xsl:value-of select="@tag"/>
@@ -27,42 +27,40 @@
</xsl:template>
<xsl:template match="project">
- <xsl:variable name="module" select="module"/>
- <xsl:variable name="javasrc" select="javasrc"/>
- <xsl:variable name="build.file" select="build/@file"/>
- <xsl:variable name="build.target" select="build/@target"/>
- <xsl:variable name="build.classpath" select="build/@classpath"/>
-
<xsl:if test="build">
- <target name="{$module}.{@tag}">
+ <target name="{module}.{@tag}">
<echo file="logs/alexandria.log" append="yes">
- Building <xsl:value-of select="$module"/><xsl:value-of select="@tag"/>
+ Building <xsl:value-of select="module"/><xsl:value-of select="@tag"/>
</echo>
<java
fork="true"
classname="org.apache.tools.ant.Main">
- <arg value="-buildfile" />
- <arg
value="${{content.dir}}/cvs/{$module}/{@tag}/{$module}/{$build.file}" />
- <arg value="{$build.target}" />
+ <xsl:if test="build/@file">
+ <arg value="-buildfile" />
+ <arg value="${{content.dir}}/cvs/{module}/{@tag}/{module}/build/@file"
/>
+ </xsl:if>
+ <xsl:if test="build/@target">
+ <arg value="build/@target" />
+ </xsl:if>
<arg value="-listener" />
<arg value="org.apache.tools.ant.XmlLogger" />
<arg value="-listener" />
<arg value="org.apache.alexandria.blame.BlameListener" />
- <arg value="-DXmlLogger.file=logs/{$module}.{@tag}.build.log.xml" />
- <jvmarg value="-Dalexandria.module={$module}" />
+ <arg value="-DXmlLogger.file=logs/{module}.{@tag}.build.log.xml" />
+ <jvmarg value="-Dalexandria.module={module}" />
<jvmarg value="-Dalexandria.tag={@tag}" />
- <jvmarg
value="-Dalexandria.content.dir=${{content.dir}}/cvs/{$module}/{@tag}/{$module}/{$javasrc}/"
/>
+ <jvmarg
value="-Dalexandria.content.dir=${{content.dir}}/cvs/{module}/{@tag}/{module}/{javasrc}/"
/>
<jvmarg value="-Dant.home=${{ant.home}}" />
<jvmarg value="-Djava.compiler=NONE" />
<arg value="-logfile" />
- <arg value="logs/{$module}.{@tag}.build.log" />
+ <arg value="logs/{module}.{@tag}.build.log" />
<xsl:for-each select="build/arg">
<xsl:element name="arg">
<xsl:attribute name="value">-D<xsl:value-of
select="@name"/>=<xsl:value-of select="@value"/></xsl:attribute>
</xsl:element>
</xsl:for-each>
<classpath>
- <pathelement path="{$build.classpath}"/>
+ <pathelement path="build/@classpath"/>
<pathelement path="${{ant.home}}/lib/ant.jar"/>
<pathelement path="/usr/share/java/ant.jar"/>
<pathelement path="/usr/share/java/optional.jar"/>
@@ -82,25 +80,25 @@
</java>
<xstyle
- in="logs/{$module}.{@tag}.build.log.xml"
+ in="logs/{module}.{@tag}.build.log.xml"
style="xsl/blog.xsl"
- out="${{content.dir}}/cvs/{$module}/{@tag}/{$module}/build.html" />
+ out="${{content.dir}}/cvs/{module}/{@tag}/{module}/build.html" />
<xstyle
- in="var/{$module}.{@tag}.blame.xml"
+ in="var/{module}.{@tag}.blame.xml"
style="xsl/blame.kull.xsl"
- out="var/{$module}.{@tag}.blame.trim.xml">
+ out="var/{module}.{@tag}.blame.trim.xml">
<param name="limit" expression="${{blame.size}}"/>
</xstyle>
<move
- file="var/{$module}.{@tag}.blame.trim.xml"
- tofile="var/{$module}.{@tag}.blame.xml"/>
+ file="var/{module}.{@tag}.blame.trim.xml"
+ tofile="var/{module}.{@tag}.blame.xml"/>
<xstyle
- in="var/{$module}.{@tag}.blame.xml"
+ in="var/{module}.{@tag}.blame.xml"
style="xsl/blame.xsl"
- out="${{content.dir}}/html/{$module}.{@tag}.blame.html" />
+ out="${{content.dir}}/html/{module}.{@tag}.blame.html" />
</target>
</xsl:if>
</xsl:template>
1.14 +1 -1 jakarta-alexandria/src/xsl/build.test.xsl
Index: build.test.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/build.test.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.test.xsl 2001/02/22 09:32:40 1.13
+++ build.test.xsl 2001/02/28 10:05:03 1.14
@@ -15,7 +15,7 @@
<xsl:for-each select = "project">
<xsl:if test="test">
<xsl:if test="position()!=1"><xsl:text>,</xsl:text></xsl:if>
- <xsl:value-of select="../module"/><xsl:text>.</xsl:text>
+ <xsl:value-of select="module"/><xsl:text>.</xsl:text>
<xsl:value-of select="@tag"/>
</xsl:if>
</xsl:for-each>
1.16 +1 -2 jakarta-alexandria/src/xsl/left-advanced.xsl
Index: left-advanced.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/left-advanced.xsl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- left-advanced.xsl 2001/02/22 09:32:40 1.15
+++ left-advanced.xsl 2001/02/28 10:05:03 1.16
@@ -30,7 +30,6 @@
<xsl:template match="project">
<xsl:if test="@show='true'">
- <xsl:variable name="build.file" select="build/@file" />
<xsl:variable name="test.file" select="test/@file" />
<xsl:variable name="repository"
select="/workspace/repository[@name=current()/@repository]" />
@@ -54,7 +53,7 @@
insDoc(level2, gLnk(2, "Browse","<xsl:value-of
select="$browse-url"/>/alexandria.index.html" ));
</xsl:if>
- <xsl:if test="string-length( $build.file ) > 0">
+ <xsl:if test="build">
<!-- Build Log -->
insDoc(level2, gLnk(2, "Build Log","<xsl:value-of
select="$browse-url"/>/build.html"));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
