[jboss-cvs] JBossAS SVN: r71820 - in trunk/docbook-support/jbossorg-docbook-xslt: src/main/resources/xslt/org/jboss and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Apr 9 07:16:59 EDT 2008


Author: newtonm
Date: 2008-04-09 07:16:59 -0400 (Wed, 09 Apr 2008)
New Revision: 71820

Modified:
   trunk/docbook-support/jbossorg-docbook-xslt/pom.xml
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/xhtml-common.xsl
Log:
Changed image paths for community images. Added XSL params for header links alternative text. Tidied up pom.xml, removed redundant dependencies and added scm section.

Modified: trunk/docbook-support/jbossorg-docbook-xslt/pom.xml
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/pom.xml	2008-04-09 10:12:48 UTC (rev 71819)
+++ trunk/docbook-support/jbossorg-docbook-xslt/pom.xml	2008-04-09 11:16:59 UTC (rev 71820)
@@ -2,77 +2,64 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jboss</groupId>
-    <artifactId>jbossorg-docbook-xslt</artifactId>
-    <packaging>jar</packaging>
-    <version>1.1.0-SNAPSHOT</version>
+  <groupId>org.jboss</groupId>
+  <artifactId>jbossorg-docbook-xslt</artifactId>
+  <packaging>jar</packaging>
+  <version>1.1.0-SNAPSHOT</version>
 
-    <name>JBoss.org DocBook XSLT</name>
-    <description>The main project to transform DocBook XML into XHTML and other formats for JBoss.org Documentation.</description>
-    <url>http://jboss.org</url>
+  <name>JBoss Community DocBook XSLT</name>
+  <description>The main project to transform DocBook XML into XHTML and other formats for JBoss Community Documentation.</description>
+  <url>http://www.jboss.org</url>
 
-    <dependencies>
-        <dependency>
-            <groupId>net.sf.docbook</groupId>
-            <artifactId>docbook</artifactId>
-        </dependency>
-                    <dependency>
-                        <groupId>com.uwyn</groupId>
-                        <artifactId>jhighlight</artifactId>
-                        <version>1.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>de.java2html</groupId>
-                        <artifactId>java2html</artifactId>
-                        <version>5.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.richfaces.docs</groupId>
-                        <artifactId>highlight</artifactId>
-                        <version>3.1.4.GA</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.jboss.docs</groupId>
-                        <artifactId>highlight</artifactId>
-                        <version>1.0-SNAPSHOT</version>
-                    </dependency>
-    </dependencies>
+  <organization>
+    <name>JBoss.org</name>
+    <url>http://www.jboss.org</url>
+  </organization>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>net.sf.docbook</groupId>
-                <artifactId>docbook</artifactId>
-                <version>1.72.0</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+  <scm>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/trunk/docbook-support/jbossorg-docbook-xslt/</developerConnection>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/trunk/docbook-support/jbossorg-docbook-xslt/</connection>
+  </scm>
 
-   <build>
-      <extensions>
-         <extension>
-            <groupId>org.apache.maven.wagon</groupId>
-            <artifactId>wagon-webdav</artifactId>
-            <version>1.0-beta-2</version>
-         </extension>
-      </extensions>
-   </build>
+  <dependencies>
+    <dependency>
+      <groupId>net.sf.docbook</groupId>
+      <artifactId>docbook</artifactId>
+      <version>1.72.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.docs</groupId>
+      <artifactId>highlight</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
 
-    <distributionManagement>
-        <repository>
-            <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
-            <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
-            <!-- todo : replace this with direct svn access once the svnkit providers are available -->
-            <id>repository.jboss.org</id>
-            <url>file://${maven.repository.root}</url>
-        </repository>
-        <snapshotRepository>
-            <id>snapshots.jboss.org</id>
-            <name>JBoss Snapshot Repository</name>
-            <url>dav:https://snapshots.jboss.org/maven2</url>
-        </snapshotRepository>
-    </distributionManagement>
+  <build>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-webdav</artifactId>
+        <version>1.0-beta-2</version>
+      </extension>
+    </extensions>
+  </build>
 
+  <distributionManagement>
+    <repository>
+      <!-- Copy the dist to the local checkout of the JBoss Repository at ${maven.repository.root} -->
+      <!-- It is anticipated that ${maven.repository.root} is set in user's settings.xml file -->
+      <!-- TODO : Replace this with direct svn access once the svnkit providers are available -->
+      <id>repository.jboss.org</id>
+      <name>JBoss Repository</name>
+      <url>file://${maven.repository.root}</url>
+    </repository>
+    <snapshotRepository>
+      <id>snapshots.jboss.org</id>
+      <name>JBoss Snapshot Repository</name>
+      <url>dav:https://snapshots.jboss.org/maven2</url>
+    </snapshotRepository>
+  </distributionManagement>
+
 </project>

Modified: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl	2008-04-09 10:12:48 UTC (rev 71819)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl	2008-04-09 11:16:59 UTC (rev 71820)
@@ -25,6 +25,8 @@
 
 <xsl:param name="jbossOrgHref" select="'http://www.jboss.org'" />
 <xsl:param name="commDocHref" select="'http://labs.jboss.com/projects/docs'" />
+<xsl:param name="jbossOrgLinkText" select="'JBoss.org'" />
+<xsl:param name="commDocLinkText" select="'Community Documentation'" />
 
 <xsl:param name="confidential" select="0"/>
 
@@ -109,7 +111,7 @@
 							<xsl:text>jbossOrg_href</xsl:text>
 						</xsl:attribute>
 						<strong>
-						        JBoss.org	
+						        <xsl:value-of select="$jbossOrgLinkText"/>	
 						</strong>
 					</a>
 					<a>
@@ -120,7 +122,7 @@
 							<xsl:text>commDoc_href</xsl:text>
 						</xsl:attribute>
 						<strong>
-						        Community Documentation	
+						        <xsl:value-of select="$commDocLinkText"/>	
 						</strong>
 					</a>
 				</p>

Modified: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl	2008-04-09 10:12:48 UTC (rev 71819)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl	2008-04-09 11:16:59 UTC (rev 71820)
@@ -64,7 +64,7 @@
       <xsl:if test="$img.src.path != ''">
          <xsl:value-of select="$img.src.path"/>
       </xsl:if>
-      <xsl:text>images/callouts/</xsl:text>
+      <xsl:text>images/community/callouts/</xsl:text>
    </xsl:param>
 
    <xsl:param name="programlisting.font" select="'verdana,helvetica,sans-serif'" />
@@ -263,7 +263,7 @@
 <!-- Admonitions -->
 <xsl:param name="admon.graphics" select="1"/>
 <xsl:param name="admon.graphics.path">
-	<xsl:if test="$img.src.path != ''"><xsl:value-of select="$img.src.path"/></xsl:if><xsl:text>images/</xsl:text>
+	<xsl:if test="$img.src.path != ''"><xsl:value-of select="$img.src.path"/></xsl:if><xsl:text>images/community/</xsl:text>
 </xsl:param>
 <xsl:param name="admon.graphics.extension" select="'.svg'"/>
 <xsl:attribute-set name="admonition.title.properties">

Modified: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl	2008-04-09 10:12:48 UTC (rev 71819)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl	2008-04-09 11:16:59 UTC (rev 71820)
@@ -23,6 +23,8 @@
         
     <xsl:param name="jbossOrgHref" select="'http://www.jboss.org'" />
     <xsl:param name="commDocHref" select="'http://labs.jboss.com/projects/docs'" />
+    <xsl:param name="jbossOrgLinkText" select="'JBoss.org'" />
+    <xsl:param name="commDocLinkText" select="'Community Documentation'" />
 
 <!-- Ignore image scaling in html version -->
 <xsl:param name="ignore.image.scaling" select="1"/> 
@@ -56,7 +58,7 @@
 							<xsl:text>jbossOrg_href</xsl:text>
 						</xsl:attribute>
 						<strong>
-						        JBoss.org	
+						        <xsl:value-of select="$jbossOrgLinkText"/>	
 						</strong>
 					</a>
 					<a>
@@ -67,7 +69,7 @@
 							<xsl:text>commDoc_href</xsl:text>
 						</xsl:attribute>
 						<strong>
-						        Community Documentation	
+						        <xsl:value-of select="$commDocLinkText"/>	
 						</strong>
 					</a>
 				</p>

Modified: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/xhtml-common.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/xhtml-common.xsl	2008-04-09 10:12:48 UTC (rev 71819)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/xhtml-common.xsl	2008-04-09 11:16:59 UTC (rev 71820)
@@ -39,7 +39,7 @@
    <xsl:param name="callout.graphics.number.limit">15</xsl:param>
    <xsl:param name="callout.icon.size">12px</xsl:param>
    <xsl:param name="callout.graphics.extension">.png</xsl:param>
-   <xsl:param name="callout.graphics.path">images/callouts/</xsl:param>
+   <xsl:param name="callout.graphics.path">images/community/callouts/</xsl:param>
    
    <!-- Place callout marks at this column in annotated areas. The algorithm using this number doesn't
         know about highlighted code with extra span elements so we need to pad each line at the start
@@ -76,7 +76,7 @@
 <!-- Admonition Graphics -->
 <xsl:param name="admon.graphics" select="1"/>
 <xsl:param name="admon.style" select="''"/>
-<xsl:param name="admon.graphics.path">images/</xsl:param>
+<xsl:param name="admon.graphics.path">images/community/</xsl:param>
 
 <xsl:param name="chunker.output.doctype-public" select="'-//W3C//DTD XHTML 1.0 Strict//EN'"/>
 <xsl:param name="chunker.output.doctype-system" select="'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'"/>




More information about the jboss-cvs-commits mailing list