Author: mac
Date: Thu Aug 25 02:31:10 2005
New Revision: 240026
URL: http://svn.apache.org/viewcvs?rev=240026&view=rev
Log:
Better css handling
Added:
webservices/jaxme/branches/MAVEN/xdocs/style/
- copied from r240023, webservices/jaxme/branches/MAVEN/xdocs/stylesheets/
Removed:
webservices/jaxme/branches/MAVEN/xdocs/stylesheets/
Modified:
webservices/jaxme/branches/MAVEN/common-build/maven.xml
webservices/jaxme/branches/MAVEN/common-build/site.jsl
webservices/jaxme/branches/MAVEN/maven.xml
webservices/jaxme/branches/MAVEN/project.properties
Modified: webservices/jaxme/branches/MAVEN/common-build/maven.xml
URL:
http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/common-build/maven.xml?rev=240026&r1=240025&r2=240026&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/common-build/maven.xml (original)
+++ webservices/jaxme/branches/MAVEN/common-build/maven.xml Thu Aug 25 02:31:10
2005
@@ -28,7 +28,6 @@
use a tab-enabled stylesheet -->
<j:if test="${multiprojectBasedir != null}">
<j:set var="maven.docs.dest"
value="${multiprojectBasedir}/${maven.multiproject.aggregateDir}${pom.artifactId}"
/>
- <j:set var="maven.xdoc.theme.url" value="${multiprojectCSS}"/>
</j:if>
<attainGoal name="clean"/>
Modified: webservices/jaxme/branches/MAVEN/common-build/site.jsl
URL:
http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/common-build/site.jsl?rev=240026&r1=240025&r2=240026&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/common-build/site.jsl (original)
+++ webservices/jaxme/branches/MAVEN/common-build/site.jsl Thu Aug 25 02:31:10
2005
@@ -34,7 +34,12 @@
<jsl:template match="document" trim="true">
<x:doctype name="html" publicId="-//W3C//DTD XHTML 1.0 Transitional//EN"
systemId="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-
+
+ <!-- If it is a multiproject, get its path -->
+ <j:if test="${multiprojects != null}">
+ <maven:rootRelativePath rootdir="${multiprojectBasedir}"
path="${outDir}" var="multiprojectRootRel"/>
+ </j:if>
+
<j:useBean var="navbean" class="org.apache.maven.NavBean"/>
<j:set var="location" value="${outFile.substring(destdir.length())}"/>
<util:replace var="location" oldChar="\" newChar="/" value="${location}"/>
@@ -132,6 +137,9 @@
<j:if test="${projectCssFile.exists()}"><![CDATA[
@import url("${relativePathForLocale}style/project.css");
]]></j:if>
+ <j:if test="${multiprojects != null}"><![CDATA[
+ @import url("${multiprojectRootRel}/style/maven-tabbed-theme.css");
+ ]]></j:if>
</style>
<link rel="stylesheet" type="text/css"
href="${relativePathForLocale}style/print.css" media="print"/>
@@ -233,8 +241,8 @@
<table summary="tab bar" border="0" cellpadding="0" cellspacing="0">
<tr>
<j:forEach items="${multiprojects}" var="reactorProject">
- <maven:rootRelativePath rootdir="${multiprojectBasedir}"
path="${outDir}" var="rootRel"/>
- <j:set var="relAggregateDir"
value="${rootRel}/${maven.multiproject.aggregateDir}${reactorProject.artifactId}/index.html"/>
+
+ <j:set var="relAggregateDir"
value="${multiprojectRootRel}/${maven.multiproject.aggregateDir}${reactorProject.artifactId}/index.html"/>
<td width="6"><img alt="" height="8" width="6"
src="skin/images/spacer.gif"/></td>
<td valign="bottom" align="center">
Modified: webservices/jaxme/branches/MAVEN/maven.xml
URL:
http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/maven.xml?rev=240026&r1=240025&r2=240026&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/maven.xml (original)
+++ webservices/jaxme/branches/MAVEN/maven.xml Thu Aug 25 02:31:10 2005
@@ -37,13 +37,14 @@
collectOnly="true"
collectionVar="multiprojects"
/>
+
+ <echo>Exposing multiprojects to subprojects</echo>
<!-- we now set on the parent context the multiprojects
and the base dir for the top level project
as well as a tab-enabled stylesheet -->
<j:set var="multiprojects" value="${multiprojects}"
scope="parent"/>
<j:set var="multiprojectBasedir" value="${maven.docs.dest}"
scope="parent"/>
- <j:set var="multiprojectCSS"
value="./../.${maven.xdoc.theme.url}" scope="parent"/>
<echo>Now building reactor projects: ${multiprojects}</echo>
Modified: webservices/jaxme/branches/MAVEN/project.properties
URL:
http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/project.properties?rev=240026&r1=240025&r2=240026&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/project.properties (original)
+++ webservices/jaxme/branches/MAVEN/project.properties Thu Aug 25 02:31:10 2005
@@ -14,14 +14,12 @@
# limitations under the License.
# -------------------------------------------------------------------
-maven.xdoc.theme.url=./style/maven-tabbed-theme.css
maven.xdoc.date=left
maven.xdoc.jsl=file:${basedir}/common-build/site.jsl
maven.multiproject.includes=projects/api/project.xml,projects/xs/project.xml,projects/js/project.xml,projects/jm/project.xml,projects/pm/project.xml
maven.multiproject.aggregateDir=projects/
#no docs for the top-level project for the moment
-#maven.docs.src=nill
maven.xdoc.xml.copy=**/manual/*.xml,site.xml
maven.linkcheck.exclude=projects
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
