forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r526405 - in /forrest/trunk/whiteboard/forrestdoc: ./ src/ src/resources/javadoc/ src/resources/vizant/ src/resources/ws/
Date Sat, 07 Apr 2007 08:31:57 GMT
Author: crossley
Date: Sat Apr  7 01:31:56 2007
New Revision: 526405

URL: http://svn.apache.org/viewvc?view=rev&rev=526405
Log:
Whitespace changes only. Using xmlformat. Issue: FOR-644

Modified:
    forrest/trunk/whiteboard/forrestdoc/build.xml
    forrest/trunk/whiteboard/forrestdoc/core.xml
    forrest/trunk/whiteboard/forrestdoc/src/ant.xml
    forrest/trunk/whiteboard/forrestdoc/src/java.xml
    forrest/trunk/whiteboard/forrestdoc/src/js.xml
    forrest/trunk/whiteboard/forrestdoc/src/resources/javadoc/xml2dot.xsl
    forrest/trunk/whiteboard/forrestdoc/src/resources/vizant/xml2dot.xsl
    forrest/trunk/whiteboard/forrestdoc/src/resources/vizant/xml2html.xsl
    forrest/trunk/whiteboard/forrestdoc/src/resources/vizant/xml2tg.xsl
    forrest/trunk/whiteboard/forrestdoc/src/resources/ws/dir2projects-summary.xsl
    forrest/trunk/whiteboard/forrestdoc/src/resources/ws/dir2projects.xsl

Modified: forrest/trunk/whiteboard/forrestdoc/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrestdoc/build.xml?view=diff&rev=526405&r1=526404&r2=526405
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/build.xml (original)
+++ forrest/trunk/whiteboard/forrestdoc/build.xml Sat Apr  7 01:31:56 2007
@@ -17,146 +17,119 @@
 -->
 <project
  name="forrestdoc" default="project" basedir=".">
-
-   <!-- init -->
-   <tstamp />
-   <property file="build.properties"/>
-   
-   <path id="lib.classpath">
-      <fileset  dir="${lib.dir}">
-         <include name="*.jar" />
-      </fileset>
-      <fileset dir="${ant.home}/lib">
-         <include name="*.jar" />
-      </fileset>
-   </path>
-
-   <path id="task.classpath">
-      <path refid="lib.classpath"/>
-      <pathelement path="${build.classes.dir}"/>
-      <pathelement path="${ant.build.dir}"/>
-   </path>
-
-   <mkdir dir="${ant.build.dir}" />
-   <javac srcdir="${ant.src.dir}"
+<!-- init -->
+  <tstamp />
+  <property file="build.properties"/>
+  <path id="lib.classpath">
+    <fileset  dir="${lib.dir}">
+      <include name="*.jar" />
+    </fileset>
+    <fileset dir="${ant.home}/lib">
+      <include name="*.jar" />
+    </fileset>
+  </path>
+  <path id="task.classpath">
+    <path refid="lib.classpath"/>
+    <pathelement path="${build.classes.dir}"/>
+    <pathelement path="${ant.build.dir}"/>
+  </path>
+  <mkdir dir="${ant.build.dir}" />
+  <javac srcdir="${ant.src.dir}"
           debug="true"
           destdir="${ant.build.dir}"
           classpathref="lib.classpath" />
-             
-   <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
-   <taskdef name="extendedpathconvert" classname="org.apache.forrest.tools.taskdefs.PathConvert" classpathref="task.classpath"/>
-  
-   <!-- Targets -->
-   
-   <target name="compile"
+  <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
+  <taskdef name="extendedpathconvert" classname="org.apache.forrest.tools.taskdefs.PathConvert" classpathref="task.classpath"/>
+<!-- Targets -->
+  <target name="compile"
            description="Compile the java code from ${src} into ${target}">
-      <mkdir dir="${build.classes.dir}" />
-      <javac srcdir="${src.dir}"
+    <mkdir dir="${build.classes.dir}" />
+    <javac srcdir="${src.dir}"
              debug="true"
              destdir="${build.classes.dir}"
              classpathref="lib.classpath" />
-   </target>
-
-   <target name="jar" depends="compile"
-           description="Put everything in ${target} into the ${jar.name}.jar file">   
-      <mkdir dir="${dist.dir}" />
-      <jar jarfile="${dist.dir}/${jar.name}-${version}.jar"
+  </target>
+  <target name="jar" depends="compile"
+           description="Put everything in ${target} into the ${jar.name}.jar file">
+    <mkdir dir="${dist.dir}" />
+    <jar jarfile="${dist.dir}/${jar.name}-${version}.jar"
            basedir="${build.classes.dir}" />
-      <jar jarfile="${dist.dir}/${jar.name}-anttools-${version}.jar"
+    <jar jarfile="${dist.dir}/${jar.name}-anttools-${version}.jar"
            basedir="${ant.build.dir}" />
-   </target>
-
-   <target name="clean"
-           description="Delete the ${target} and ${dist} directory trees">   
-      <delete dir="${build.dir}" />
-      <delete dir="${dist.dir}" />
-   </target>
-   
-   <target name="all" 
+  </target>
+  <target name="clean"
+           description="Delete the ${target} and ${dist} directory trees">
+    <delete dir="${build.dir}" />
+    <delete dir="${dist.dir}" />
+  </target>
+  <target name="all" 
            description="test this project" 
-           depends="project">
-   </target>   
-   
-   <target name="project"  depends="compile"
+           depends="project"></target>
+  <target name="project"  depends="compile"
            description="create all possible docs for this project">
-         <echo>START</echo>
-         <trycatch property="foo" reference="bar">
-         <try>
-            <ant antfile="core.xml" dir="." target="project"
+    <echo>START</echo>
+    <trycatch property="foo" reference="bar">
+      <try>
+        <ant antfile="core.xml" dir="." target="project"
                 inheritAll="true" inheritRefs="true"/>
-         </try>
-         <catch>
-           <echo>In &lt;catch&gt;.</echo>
-         </catch>
-         <finally>
-           <echo>In &lt;finally&gt;.</echo>
-         </finally>
-       </trycatch>
-   </target>    
-   
-   <!-- driver targets -->   
-   
-   <target name="ws"  depends="compile"
+      </try>
+      <catch>
+        <echo>In &lt;catch&gt;.</echo>
+      </catch>
+      <finally>
+        <echo>In &lt;finally&gt;.</echo>
+      </finally>
+    </trycatch>
+  </target>
+<!-- driver targets -->
+  <target name="ws"  depends="compile"
            description="create all possible docs for this workspace">
-           
-     <property name="resolved.ws.dir" location="${ws.dir}"/>
-     <!--
+    <property name="resolved.ws.dir" location="${ws.dir}"/>
+<!--
      <property name="ws.build.dir" location="${ws.dir}/build/forrestdoc"/>    
      <property name="ws.temp.dir" location="${ws.dir}/build/temp"/>     
      -->
-     <property name="ws.build.dir" location="./build/ws/forrestdoc"/>    
-     <property name="ws.temp.dir" location="./build/temp/ws"/>     
-          
-     <mkdir dir="${ws.build.dir}" />
-     <mkdir dir="${ws.temp.dir}" />              
-              
-     <dirset dir="${ws.dir}" id="ws.project.dirs">
-        <include name="*"/>
-        <exclude name=".*"/>
-        <exclude name="Copy of*"/>
-        <exclude name="build"/>
-     </dirset>
-     
-     <extendedpathconvert pathsep="," type="xml" file="${ws.temp.dir}/dirs.xml" refid="ws.project.dirs">
-       <map from="${resolved.ws.dir}" to=""/>
-     </extendedpathconvert>     
-    
-     <xslt in="${ws.temp.dir}/dirs.xml" 
+    <property name="ws.build.dir" location="./build/ws/forrestdoc"/>
+    <property name="ws.temp.dir" location="./build/temp/ws"/>
+    <mkdir dir="${ws.build.dir}" />
+    <mkdir dir="${ws.temp.dir}" />
+    <dirset dir="${ws.dir}" id="ws.project.dirs">
+      <include name="*"/>
+      <exclude name=".*"/>
+      <exclude name="Copy of*"/>
+      <exclude name="build"/>
+    </dirset>
+    <extendedpathconvert pathsep="," type="xml" file="${ws.temp.dir}/dirs.xml" refid="ws.project.dirs">
+      <map from="${resolved.ws.dir}" to=""/>
+    </extendedpathconvert>
+    <xslt in="${ws.temp.dir}/dirs.xml" 
            out="${ws.build.dir}/projects.html" style="${resources.dir}/ws/dir2projects.xsl" />
-     <xslt in="${ws.temp.dir}/dirs.xml" 
-           out="${ws.build.dir}/projects-summary.html" style="${resources.dir}/ws/dir2projects-summary.xsl" />    
-     <copy file="${resources.dir}/ws/index.html" todir="${ws.build.dir}"/>    
-     <copy file="${resources.dir}/ws/styles.css" todir="${ws.build.dir}"/>
-               
+    <xslt in="${ws.temp.dir}/dirs.xml" 
+           out="${ws.build.dir}/projects-summary.html" style="${resources.dir}/ws/dir2projects-summary.xsl" />
+    <copy file="${resources.dir}/ws/index.html" todir="${ws.build.dir}"/>
+    <copy file="${resources.dir}/ws/styles.css" todir="${ws.build.dir}"/>
     <for param="current.project.dir">
       <path>
-       <dirset  refid="ws.project.dirs"/>
-      </path> 
-        <sequential>
-         <echo>START @{current.project.dir}</echo>
-         <trycatch property="foo" reference="bar">
-         <try>
+        <dirset  refid="ws.project.dirs"/>
+      </path>
+      <sequential>
+        <echo>START @{current.project.dir}</echo>
+        <trycatch property="foo" reference="bar">
+          <try>
             <ant antfile="core.xml" dir="." target="project"
                 inheritAll="true" inheritRefs="true">
               <property name="project.dir"    value="@{current.project.dir}"/>
-              <property name="target.dir"  value="${ws.build.dir}"/>  
-           </ant>
-         </try>
-         <catch>
-           <echo>In &lt;catch&gt;.</echo>
-         </catch>
-         <finally>
-           <echo>In &lt;finally&gt;.</echo>
-         </finally>
-       </trycatch>
-
-
-
-        </sequential>          
-    </for>          
-    
-   </target>    
-   
-   
+              <property name="target.dir"  value="${ws.build.dir}"/>
+            </ant>
+          </try>
+          <catch>
+            <echo>In &lt;catch&gt;.</echo>
+          </catch>
+          <finally>
+            <echo>In &lt;finally&gt;.</echo>
+          </finally>
+        </trycatch>
+      </sequential>
+    </for>
+  </target>
 </project>
-

Modified: forrest/trunk/whiteboard/forrestdoc/core.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrestdoc/core.xml?view=diff&rev=526405&r1=526404&r2=526405
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/core.xml (original)
+++ forrest/trunk/whiteboard/forrestdoc/core.xml Sat Apr  7 01:31:56 2007
@@ -17,27 +17,20 @@
 -->
 <project
  name="forrestdoc" default="dist" basedir=".">
-
-   <property name="project.dir"   location="."/>  
-   <property name="target.dir"   location="${project.dir}/build/forrestdoc"/>  
-
-   <basename property="project.dirname"  file="${project.dir}"/>
-   <property name="project.target.dir"   location="${target.dir}/${project.dirname}"/>  
-         
-   <echo>Using Project dir: ${project.dir}</echo>
-   <echo>Using Target dir: ${project.target.dir}</echo>
-
-   <import file="./src/java.xml"/>   
-   <import file="./src/ant.xml"/>
-   <import file="./src/js.xml"/>   
-   
-   <target name="project" 
+  <property name="project.dir"   location="."/>
+  <property name="target.dir"   location="${project.dir}/build/forrestdoc"/>
+  <basename property="project.dirname"  file="${project.dir}"/>
+  <property name="project.target.dir"   location="${target.dir}/${project.dirname}"/>
+  <echo>Using Project dir: ${project.dir}</echo>
+  <echo>Using Target dir: ${project.target.dir}</echo>
+  <import file="./src/java.xml"/>
+  <import file="./src/ant.xml"/>
+  <import file="./src/js.xml"/>
+  <target name="project" 
            description="create all possible docs for this project" 
            depends="javasrc, jsdoc, xml, uml, javadoc, vizant">
-      <copy todir="${project.target.dir}">
-        <fileset dir="${resources.dir}/common" casesensitive="yes"/>
-      </copy> 
-   </target>    
-         
+    <copy todir="${project.target.dir}">
+      <fileset dir="${resources.dir}/common" casesensitive="yes"/>
+    </copy>
+  </target>
 </project>
-

Modified: forrest/trunk/whiteboard/forrestdoc/src/ant.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrestdoc/src/ant.xml?view=diff&rev=526405&r1=526404&r2=526405
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/src/ant.xml (original)
+++ forrest/trunk/whiteboard/forrestdoc/src/ant.xml Sat Apr  7 01:31:56 2007
@@ -17,26 +17,21 @@
 -->
 <project
  name="forrestdoc-ant" default="dist" basedir=".">
-
-   <condition property="ant.build.available">
-      <available file="${project.dir}/build.xml"/>
+  <condition property="ant.build.available">
+    <available file="${project.dir}/build.xml"/>
   </condition>
-  
-   <echo>ant buildfine available: ${ant.build.available}</echo>
-     
-   <property name="target.vizant.dir"  location="${project.target.dir}/vizant" />
-
-   <target name="vizant" depends="runvizant, antxml2formats" if="ant.build.available"/>
-   
-   <target name="runvizant" if="ant.build.available">
-      <mkdir dir="${target.vizant.dir}" />
-      <taskdef name="vizant" classname="org.apache.forrest.forrestdoc.ant.doc.Vizant">
-         <classpath refid="task.classpath"/>
-      </taskdef>   
-      <vizant antfile="${project.dir}/build.xml" 
+  <echo>ant buildfine available: ${ant.build.available}</echo>
+  <property name="target.vizant.dir"  location="${project.target.dir}/vizant" />
+  <target name="vizant" depends="runvizant, antxml2formats" if="ant.build.available"/>
+  <target name="runvizant" if="ant.build.available">
+    <mkdir dir="${target.vizant.dir}" />
+    <taskdef name="vizant" classname="org.apache.forrest.forrestdoc.ant.doc.Vizant">
+      <classpath refid="task.classpath"/>
+    </taskdef>
+    <vizant antfile="${project.dir}/build.xml" 
               outfile="${target.vizant.dir}/buildgraph.xml" 
               uniqueref="true">
-       <!--       
+<!--       
          <attrstmt type="graph"> 
            <attr name="ranksep" value="1.0"/>
            <attr name="nodesep" value="0.5"/>
@@ -68,52 +63,43 @@
             <attr name="color" value="grey95"/>
           </attrstmt>
         </subgraph>
-       --> 
-      </vizant>        
-   </target>
-
-   <target name="antxml2formats" if="ant.build.available">
-      <xslt in="${target.vizant.dir}/buildgraph.xml" out="${target.vizant.dir}/target.dot" style="${resources.dir}/vizant/xml2dot.xsl" />
-
-      <antcall target="dot">
-        <param name="dot.source" value="${target.vizant.dir}/target.dot"/>
-        <param name="dot.dest" value="${target.vizant.dir}/vizant"/>
-      </antcall> 
- 
-       <antcall target="dot">
-        <param name="dot.format" value="svg"/>
-        <param name="dot.source" value="${target.vizant.dir}/target.dot"/>
-        <param name="dot.dest" value="${target.vizant.dir}/vizant"/>
-      </antcall> 
-      
-      <xslt in="${target.vizant.dir}/buildgraph.xml" out="${target.vizant.dir}/target.html" style="${resources.dir}/vizant/xml2html.xsl" />
-
-      <xslt in="${target.vizant.dir}/buildgraph.xml" out="${target.vizant.dir}/buildtg.xml" style="${resources.dir}/vizant/xml2tg.xsl" />    
-      <copy file="${target.vizant.dir}/buildtg.xml" tofile="${target.vizant.dir}/InitialXML._xml"/>  
-      <copy todir="${target.vizant.dir}">
-        <fileset dir="${resources.dir}/touchgraph" casesensitive="yes"/>
-      </copy>          
-
-      <copy todir="${target.vizant.dir}">
-        <fileset dir="${resources.dir}/vizant" casesensitive="yes"/>
-      </copy>      
-   </target>
-
-   <target name="tg" if="ant.build.available">
+       -->
+    </vizant>
+  </target>
+  <target name="antxml2formats" if="ant.build.available">
+    <xslt in="${target.vizant.dir}/buildgraph.xml" out="${target.vizant.dir}/target.dot" style="${resources.dir}/vizant/xml2dot.xsl" />
+    <antcall target="dot">
+      <param name="dot.source" value="${target.vizant.dir}/target.dot"/>
+      <param name="dot.dest" value="${target.vizant.dir}/vizant"/>
+    </antcall>
+    <antcall target="dot">
+      <param name="dot.format" value="svg"/>
+      <param name="dot.source" value="${target.vizant.dir}/target.dot"/>
+      <param name="dot.dest" value="${target.vizant.dir}/vizant"/>
+    </antcall>
+    <xslt in="${target.vizant.dir}/buildgraph.xml" out="${target.vizant.dir}/target.html" style="${resources.dir}/vizant/xml2html.xsl" />
+    <xslt in="${target.vizant.dir}/buildgraph.xml" out="${target.vizant.dir}/buildtg.xml" style="${resources.dir}/vizant/xml2tg.xsl" />
+    <copy file="${target.vizant.dir}/buildtg.xml" tofile="${target.vizant.dir}/InitialXML._xml"/>
+    <copy todir="${target.vizant.dir}">
+      <fileset dir="${resources.dir}/touchgraph" casesensitive="yes"/>
+    </copy>
+    <copy todir="${target.vizant.dir}">
+      <fileset dir="${resources.dir}/vizant" casesensitive="yes"/>
+    </copy>
+  </target>
+  <target name="tg" if="ant.build.available">
     <java classname="com.touchgraph.linkbrowser.TGLinkBrowser" fork="yes">
-     <arg value="${target.vizant.dir}/buildtg.xml"/>
-     <classpath>
-       <path>
+      <arg value="${target.vizant.dir}/buildtg.xml"/>
+      <classpath>
+        <path>
           <fileset dir="${target.vizant.dir}" casesensitive="yes">
-           <patternset>
-             <include name="**/*.jar"/>
-             <include name="**/*.zip"/>
-           </patternset>
-         </fileset>  
-       </path> 
-     </classpath>
-      </java>
-   </target>
-   
+            <patternset>
+              <include name="**/*.jar"/>
+              <include name="**/*.zip"/>
+            </patternset>
+          </fileset>
+        </path>
+      </classpath>
+    </java>
+  </target>
 </project>
-

Modified: forrest/trunk/whiteboard/forrestdoc/src/java.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrestdoc/src/java.xml?view=diff&rev=526405&r1=526404&r2=526405
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/src/java.xml (original)
+++ forrest/trunk/whiteboard/forrestdoc/src/java.xml Sat Apr  7 01:31:56 2007
@@ -17,132 +17,114 @@
 -->
 <!-- made to be imported in the main forrestdoc build driver -->
 <project  name="forrestdoc-java">
-
-   <property name="target.javasrc.dir" location="${project.target.dir}/javasrc" />
-   <property name="target.javadoc.dir" location="${project.target.dir}/javadoc" />
-   <property name="target.xml.dir"     location="${project.target.dir}/xml" />
-   <property name="target.dot.dir"     location="${project.target.dir}/dot" />
-   <property name="target.uml.dir"     location="${project.target.dir}/uml" />
-
-   <presetdef name="fjavadoc">
-     <javadoc 
+  <property name="target.javasrc.dir" location="${project.target.dir}/javasrc" />
+  <property name="target.javadoc.dir" location="${project.target.dir}/javadoc" />
+  <property name="target.xml.dir"     location="${project.target.dir}/xml" />
+  <property name="target.dot.dir"     location="${project.target.dir}/dot" />
+  <property name="target.uml.dir"     location="${project.target.dir}/uml" />
+  <presetdef name="fjavadoc">
+    <javadoc 
            useexternalfile="true">
-       <fileset dir="${project.dir}" defaultexcludes="yes">
+      <fileset dir="${project.dir}" defaultexcludes="yes">
         <include name="**/*.java" />
-       </fileset>
+      </fileset>
     </javadoc>
-   </presetdef>
-   
-   <target name="javasrc">
-      <mkdir dir="${target.javasrc.dir}" />
-      <taskdef name="javasrc" classname="org.apache.forrest.forrestdoc.java.src.JavaSrcTask">
-        <classpath refid="task.classpath"/>
-      </taskdef>
-      <javasrc srcDir="${project.dir}" 
+  </presetdef>
+  <target name="javasrc">
+    <mkdir dir="${target.javasrc.dir}" />
+    <taskdef name="javasrc" classname="org.apache.forrest.forrestdoc.java.src.JavaSrcTask">
+      <classpath refid="task.classpath"/>
+    </taskdef>
+    <javasrc srcDir="${project.dir}" 
                destDir="${target.javasrc.dir}" 
                recurse="true"
                title="${project.dirname}"
                verbose="false"/>
-   </target>   
-
-
-   <target name="clijavasrc">
-      <mkdir dir="${target.javasrc.dir}" />
-      <java classname="org.apache.forrest.forrestdoc.java.src.Pass1"
+  </target>
+  <target name="clijavasrc">
+    <mkdir dir="${target.javasrc.dir}" />
+    <java classname="org.apache.forrest.forrestdoc.java.src.Pass1"
              fork="true"
              dir="."
              failonerror="true"
              maxmemory="256m">
-         <sysproperty key="recurse" value="true" />
-         <sysproperty key="verbose" value="false" />
-         <sysproperty  key="title" value="Java Code Documentation" />
-         <sysproperty key="outdir" path="${target.javasrc.dir}" />
-         <arg value="${project.dir}" />
-         <classpath refid="task.classpath"/>
-      </java>
-
-      <java classname="org.apache.forrest.forrestdoc.java.src.Pass2"
+      <sysproperty key="recurse" value="true" />
+      <sysproperty key="verbose" value="false" />
+      <sysproperty  key="title" value="Java Code Documentation" />
+      <sysproperty key="outdir" path="${target.javasrc.dir}" />
+      <arg value="${project.dir}" />
+      <classpath refid="task.classpath"/>
+    </java>
+    <java classname="org.apache.forrest.forrestdoc.java.src.Pass2"
             fork="true"
             dir="."
             failonerror="true"
             maxmemory="256m">
-         <sysproperty key="recurse" value="true" />
-         <sysproperty key="verbose" value="false" />
-         <sysproperty key="title" value="Java Code Documentation" />
-         <sysproperty key="outdir" path="${target.javasrc.dir}" />
-         <arg value="${project.dir}" />
-         <classpath refid="task.classpath"/>
-      </java>
-
-      <copy file="${resources.dir}/javasrc/styles.css"
+      <sysproperty key="recurse" value="true" />
+      <sysproperty key="verbose" value="false" />
+      <sysproperty key="title" value="Java Code Documentation" />
+      <sysproperty key="outdir" path="${target.javasrc.dir}" />
+      <arg value="${project.dir}" />
+      <classpath refid="task.classpath"/>
+    </java>
+    <copy file="${resources.dir}/javasrc/styles.css"
             todir="${target.javasrc.dir}"
             filtering="off" />
-   </target>
-   
-   <target name="uml" depends="xml, xml2dot, dot">
-       <antcall target="dot">
-        <param name="dot.format" value="svg"/>
-      </antcall>    
-   </target>
-   <target name="umlgraph" depends="umldoclet, dot"/>
-         
-   <target name="umldoclet">
-        <fjavadoc>
-         <doclet name="org.apache.forrest.forrestdoc.java.doc.UmlDoclet"
+  </target>
+  <target name="uml" depends="xml, xml2dot, dot">
+    <antcall target="dot">
+      <param name="dot.format" value="svg"/>
+    </antcall>
+  </target>
+  <target name="umlgraph" depends="umldoclet, dot"/>
+  <target name="umldoclet">
+    <fjavadoc>
+      <doclet name="org.apache.forrest.forrestdoc.java.doc.UmlDoclet"
                  path="./build/classes/">
-              <!--  <param name="-horizontal" value="true"/> -->
-              <!--   <param name="-attributes" value="true"/> -->
-              <!--  <param name="-operations" value="true"/> -->
-              <!--   <param name="-visibility" value="true"/>  -->                          
-              <!--  <param name="-types" value="true"/> -->       
-               <param name="-all" value="true"/>                     
-       </doclet>
-     </fjavadoc>
-   </target>
-
-   <target name="javadoc">
-      <mkdir dir="${target.javadoc.dir}" />
-        <fjavadoc destDir="${target.javadoc.dir}"
+<!--  <param name="-horizontal" value="true"/> -->
+<!--   <param name="-attributes" value="true"/> -->
+<!--  <param name="-operations" value="true"/> -->
+<!--   <param name="-visibility" value="true"/>  -->
+<!--  <param name="-types" value="true"/> -->
+        <param name="-all" value="true"/>
+      </doclet>
+    </fjavadoc>
+  </target>
+  <target name="javadoc">
+    <mkdir dir="${target.javadoc.dir}" />
+    <fjavadoc destDir="${target.javadoc.dir}"
                   author = "true"
                   version="true">
 <!--    <doctitle><![CDATA[<h1>Test</h1>]]></doctitle>
     <header><![CDATA[<h2>header</h2>]]></header>
     <footer><![CDATA[<h3>footer</h3>]]></footer>    
     <bottom><![CDATA[<i>Copyright &#169; 2000 Dummy Corp. All Rights Reserved.</i>]]></bottom>
--->    
-    <tag name="todo" scope="all" description="To do:" />
-    <link href="http://developer.java.sun.com/developer/products/xml/docs/api/"/>
-     </fjavadoc>
-   </target>   
-   
-   <target name="xml">
-      <mkdir dir="${target.xml.dir}" />
-        <fjavadoc>
-      
-         <doclet name="org.apache.forrest.forrestdoc.java.doc.XMLDoclet"
+-->
+      <tag name="todo" scope="all" description="To do:" /><link href="http://developer.java.sun.com/developer/products/xml/docs/api/"/>
+    </fjavadoc>
+  </target>
+  <target name="xml">
+    <mkdir dir="${target.xml.dir}" />
+    <fjavadoc>
+      <doclet name="org.apache.forrest.forrestdoc.java.doc.XMLDoclet"
                  path="./build/classes/">
-       <!--   <param name="-foo" value="foovalue"/>
+<!--   <param name="-foo" value="foovalue"/>
           <param name="-bar" value="barvalue"/> -->
-       </doclet>
-     </fjavadoc>
-     <move file="simple.xml" tofile="${target.xml.dir}/xmldocs.xml"/>
-   </target>   
-      
-   <target name="xml2dot">
-      <copy file="${resources.dir}/javadoc/javadoc-v04draft.dtd" todir="${target.xml.dir}" filtering="off" />
-     <xslt force="true" in="${target.xml.dir}/xmldocs.xml" out="${target.dot.dir}/graph.dot" style="${resources.dir}/javadoc/xml2dot.xsl"/>
-   </target>   
-  
-   <target name="dot">
-      <mkdir dir="${target.uml.dir}" />
-      <property name="dot.format" value="png"/> 
-      <property name="dot.source" value="${target.dot.dir}/graph.dot"/> 
-      <property name="dot.dest" value="${target.uml.dir}/graph"/> 
-                  
-      <exec executable="dot">
-         <arg line="-T${dot.format} ${dot.source} -o ${dot.dest}.${dot.format}" />
-      </exec>
-   </target>
-   
+      </doclet>
+    </fjavadoc>
+    <move file="simple.xml" tofile="${target.xml.dir}/xmldocs.xml"/>
+  </target>
+  <target name="xml2dot">
+    <copy file="${resources.dir}/javadoc/javadoc-v04draft.dtd" todir="${target.xml.dir}" filtering="off" />
+    <xslt force="true" in="${target.xml.dir}/xmldocs.xml" out="${target.dot.dir}/graph.dot" style="${resources.dir}/javadoc/xml2dot.xsl"/>
+  </target>
+  <target name="dot">
+    <mkdir dir="${target.uml.dir}" />
+    <property name="dot.format" value="png"/>
+    <property name="dot.source" value="${target.dot.dir}/graph.dot"/>
+    <property name="dot.dest" value="${target.uml.dir}/graph"/>
+    <exec executable="dot">
+      <arg line="-T${dot.format} ${dot.source} -o ${dot.dest}.${dot.format}" />
+    </exec>
+  </target>
 </project>
-

Modified: forrest/trunk/whiteboard/forrestdoc/src/js.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrestdoc/src/js.xml?view=diff&rev=526405&r1=526404&r2=526405
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/src/js.xml (original)
+++ forrest/trunk/whiteboard/forrestdoc/src/js.xml Sat Apr  7 01:31:56 2007
@@ -17,14 +17,10 @@
 -->
 <project
  name="forrestdoc-js" default="dist" basedir=".">
-
-   <property name="target.jsdoc.dir"   location="${project.target.dir}/jsdoc" />
-   
-   <target name="jsdoc">
-      <mkdir dir="${target.jsdoc.dir}" />
-      <taskdef name="jsdoc" classname="org.apache.forrest.forrestdoc.js.doc.JSDocTask" classpath="./build/classes/"/>
-      <jsdoc jSDir="${project.dir}" destDir="${target.jsdoc.dir}" />
-   </target>   
-      
+  <property name="target.jsdoc.dir"   location="${project.target.dir}/jsdoc" />
+  <target name="jsdoc">
+    <mkdir dir="${target.jsdoc.dir}" />
+    <taskdef name="jsdoc" classname="org.apache.forrest.forrestdoc.js.doc.JSDocTask" classpath="./build/classes/"/>
+    <jsdoc jSDir="${project.dir}" destDir="${target.jsdoc.dir}" />
+  </target>
 </project>
-

Modified: forrest/trunk/whiteboard/forrestdoc/src/resources/javadoc/xml2dot.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrestdoc/src/resources/javadoc/xml2dot.xsl?view=diff&rev=526405&r1=526404&r2=526405
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/src/resources/javadoc/xml2dot.xsl (original)
+++ forrest/trunk/whiteboard/forrestdoc/src/resources/javadoc/xml2dot.xsl Sat Apr  7 01:31:56 2007
@@ -16,10 +16,8 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	
-    <xsl:output method = "text"   
+  <xsl:output method = "text"   
                 omit-xml-declaration="yes"/>
-
 <!--
 	c46 [label="CharScanner"];
 	c46 -> c45 [dir=back,arrowtail=empty];
@@ -35,7 +33,7 @@
 	c50 [label="{Task\n||}", fontname="Helvetica-Oblique"];
 	c50 -> c49 [dir=back,arrowtail=empty];
 -->
-	<xsl:template match="javadoc">#!/usr/local/bin/dot
+  <xsl:template match="javadoc">#!/usr/local/bin/dot
 #
 # Class diagram 
 #
@@ -46,66 +44,61 @@
 			node [fontname="Helvetica",fontsize=9,shape=record];
 			cluster [fontname="Helvetica",fontsize=9,shape=record];
 					
-			<xsl:apply-templates/>	
-			
-			<xsl:for-each select="package/class">
-				<xsl:if test="extends_class and extends_class/classref/@name!='java.lang.Object'">
-		            <xsl:call-template name="fullname">
-                      <xsl:with-param name="name" select="extends_class/classref/@name"/>
-                    </xsl:call-template>
+			<xsl:apply-templates/>
+    <xsl:for-each select="package/class">
+      <xsl:if test="extends_class and extends_class/classref/@name!='java.lang.Object'">
+        <xsl:call-template name="fullname">
+          <xsl:with-param name="name" select="extends_class/classref/@name"/>
+        </xsl:call-template>
                      -> 	   
 		              <xsl:call-template name="fullname">
-                        <xsl:with-param name="name" select="../@name"/>
-                        <xsl:with-param name="parentname" select="@name"/>
-                       </xsl:call-template> [dir=back,arrowtail=empty];
+          <xsl:with-param name="name" select="../@name"/>
+          <xsl:with-param name="parentname" select="@name"/>
+        </xsl:call-template> [dir=back,arrowtail=empty];
 				</xsl:if>
-				<xsl:if test="implements">
-				 <xsl:for-each select="implements/interfaceref">
-				 	<xsl:call-template name="fullname">
-                      <xsl:with-param name="name" select="../../../@name"/>
-                      <xsl:with-param name="parentname" select="../../@name"/>
-                    </xsl:call-template>
+      <xsl:if test="implements">
+        <xsl:for-each select="implements/interfaceref">
+          <xsl:call-template name="fullname">
+            <xsl:with-param name="name" select="../../../@name"/>
+            <xsl:with-param name="parentname" select="../../@name"/>
+          </xsl:call-template>
 		            -> 
 		            <xsl:call-template name="fullname">
-                      <xsl:with-param name="name" select="@name"/>
-                    </xsl:call-template>
+            <xsl:with-param name="name" select="@name"/>
+          </xsl:call-template>
                     [dir=back,arrowtail=empty,style=dashed];
 		         </xsl:for-each>
+      </xsl:if>
+    </xsl:for-each>
+    <xsl:for-each select="package/interface">
+      <xsl:if test="extends_class and extends_class/classref/@name!='java.lang.Object'">
+        <xsl:value-of select="extends_class/classref/@name"/> -> <xsl:value-of select="../@name"/>.<xsl:value-of select="@name"/> [dir=back,arrowtail=empty];
 				</xsl:if>
-           </xsl:for-each>
-           
-			<xsl:for-each select="package/interface">
-				<xsl:if test="extends_class and extends_class/classref/@name!='java.lang.Object'">
-		            <xsl:value-of select="extends_class/classref/@name"/> -> <xsl:value-of select="../@name"/>.<xsl:value-of select="@name"/> [dir=back,arrowtail=empty];
-				</xsl:if>
-				<xsl:if test="implements">
-				 <xsl:for-each select="implements/interfaceref">
-		            <xsl:value-of select="../../../@name"/>.<xsl:value-of select="../../@name"/> -> <xsl:value-of select="@name"/> [dir=back,arrowtail=empty,style=dashed];
+      <xsl:if test="implements">
+        <xsl:for-each select="implements/interfaceref">
+          <xsl:value-of select="../../../@name"/>.<xsl:value-of select="../../@name"/> -> <xsl:value-of select="@name"/> [dir=back,arrowtail=empty,style=dashed];
 		         </xsl:for-each>
-				</xsl:if>
-           </xsl:for-each>
+      </xsl:if>
+    </xsl:for-each>
            
            		
 		}
 	</xsl:template>
-	
-	<xsl:template match="package">
+  <xsl:template match="package">
 		subgraph cluster<xsl:call-template name="fullname">
-                          <xsl:with-param name="name" select="@name"/>
-                        </xsl:call-template> {
+      <xsl:with-param name="name" select="@name"/>
+    </xsl:call-template> {
 		node [style=filled];
 		
 						
-			<xsl:apply-templates/>	
-
-		<!-- rank same, min, max, source or sink
+			<xsl:apply-templates/>
+<!-- rank same, min, max, source or sink
              rankdir TB LR (left to right) or TB (top to bottom)
              ranksep .75 separation between ranks, in inches.
              ratio approximate aspect ratio desired, fill or auto
              remincross if true and there are multiple clusters, re-run crossing minimization
            -->
-           
-        <!-- rank=same; 
+<!-- rank=same; 
              rankdir=TB;
              ranksep=1;
              ratio=fill; 
@@ -118,129 +111,123 @@
 			
 		}
 	</xsl:template>
-	
-	<xsl:template match="class">
-      <xsl:call-template name="fullname">
-        <xsl:with-param name="name" select="../@name"/>
-        <xsl:with-param name="parentname" select="@name"/>
-      </xsl:call-template> [
+  <xsl:template match="class">
+    <xsl:call-template name="fullname">
+      <xsl:with-param name="name" select="../@name"/>
+      <xsl:with-param name="parentname" select="@name"/>
+    </xsl:call-template> [
          <xsl:choose>
-           <xsl:when test="@extensiblity='abstract'">
+      <xsl:when test="@extensiblity='abstract'">
              color="#848684", fillcolor="#ced7ce", fontname="Helvetica-Italic"           	
            </xsl:when>
-           <xsl:otherwise>
+      <xsl:otherwise>
              color="#9c0031", fillcolor="#ffffce", 
            </xsl:otherwise>
-           </xsl:choose>
-           <!-- need to replace newline chars with \n -->
-           <!--comment="<xsl:value-of select="doc" />" ,-->
+    </xsl:choose>
+<!-- need to replace newline chars with \n -->
+<!--comment="<xsl:value-of select="doc" />" ,-->
             URL="<xsl:call-template name="filepath">
-                   <xsl:with-param name="name" select="../@name"/>
-                   <xsl:with-param name="parentname" select="@name"/>
-                 </xsl:call-template>", 
+      <xsl:with-param name="name" select="../@name"/>
+      <xsl:with-param name="parentname" select="@name"/>
+    </xsl:call-template>", 
             style=filled, 
             label="{<xsl:value-of select="@name"/>\n|<!--
-            --><xsl:if test="show">
-                <xsl:for-each select = "field">
-                 <xsl:choose>
-                 	<xsl:when test="@access='public'">+</xsl:when>
-                 	<xsl:when test="@access='private'">-</xsl:when>
-                 	<xsl:when test="@access='protected'">#</xsl:when>                 	                   
-                 	<xsl:otherwise>/</xsl:otherwise>
-                 </xsl:choose>
-                 <xsl:call-template name="substring-after-last">
-                     <xsl:with-param name="input" select="returns/primitive/@type" />
-                     <xsl:with-param name="marker" select="'.'" />
-                 </xsl:call-template>
-                 <xsl:call-template name="substring-after-last">
-                     <xsl:with-param name="input" select="returns/classref/@name" />
-                     <xsl:with-param name="marker" select="'.'" />
-                 </xsl:call-template>\l<!--                              
-            --></xsl:for-each>
-              </xsl:if>|<xsl:if test="show"><!--
+            -->
+    <xsl:if test="show">
+      <xsl:for-each select = "field">
+        <xsl:choose>
+          <xsl:when test="@access='public'">+</xsl:when>
+          <xsl:when test="@access='private'">-</xsl:when>
+          <xsl:when test="@access='protected'">#</xsl:when>
+          <xsl:otherwise>/</xsl:otherwise>
+        </xsl:choose>
+        <xsl:call-template name="substring-after-last">
+          <xsl:with-param name="input" select="returns/primitive/@type" />
+          <xsl:with-param name="marker" select="'.'" />
+        </xsl:call-template>
+        <xsl:call-template name="substring-after-last">
+          <xsl:with-param name="input" select="returns/classref/@name" />
+          <xsl:with-param name="marker" select="'.'" />
+        </xsl:call-template>\l<!--                              
+            -->
+      </xsl:for-each>
+    </xsl:if>|<xsl:if test="show">
+<!--
                   constructor  
-            --><xsl:for-each select = "method">
-                 <xsl:choose>
-                 	<xsl:when test="@access='public'">+</xsl:when>
-                 	<xsl:when test="@access='private'">-</xsl:when>
-                 	<xsl:when test="@access='protected'">#</xsl:when>                 	                   
-                 	<xsl:otherwise>/</xsl:otherwise>
-                 </xsl:choose>
-                 <xsl:call-template name="substring-after-last">
-                     <xsl:with-param name="input" select="returns/primitive/@type" />
-                     <xsl:with-param name="marker" select="'.'" />
-                 </xsl:call-template>
-                 <xsl:call-template name="substring-after-last">
-                     <xsl:with-param name="input" select="returns/classref/@name" />
-                     <xsl:with-param name="marker" select="'.'" />
-                 </xsl:call-template><xsl:text> </xsl:text><xsl:value-of select="@name" />( <!--
-              --><xsl:for-each select = "parameter">
-                   <xsl:value-of select="primitive/@type" />
-                   <xsl:call-template name="substring-after-last">
-                     <xsl:with-param name="input" select="classref/@name" />
-                     <xsl:with-param name="marker" select="'.'" />
-                   </xsl:call-template>,<!--
-              --></xsl:for-each>)\l<!--                              
-            --></xsl:for-each><!--            
-           --></xsl:if>}"];
-	</xsl:template>
-	
-	<xsl:template match="interface">
-	   <xsl:call-template name="fullname">
-        <xsl:with-param name="name" select="../@name"/>
-        <xsl:with-param name="parentname" select="@name"/>
-      </xsl:call-template> [ color="#9c0031", fillcolor="#deffff", label="{«interface»\n<xsl:value-of select="@name"/>\n}"];
-	</xsl:template>
-			
-        
-         
-	<xsl:template match="doc">
-	</xsl:template>
-	
-	<xsl:template match="extends">
-	</xsl:template>
-
-	<xsl:template match="field">
-	</xsl:template>
-		
-	<xsl:template match="constructor">
-	</xsl:template>
-
-	<xsl:template match="method">
+            -->
+      <xsl:for-each select = "method">
+        <xsl:choose>
+          <xsl:when test="@access='public'">+</xsl:when>
+          <xsl:when test="@access='private'">-</xsl:when>
+          <xsl:when test="@access='protected'">#</xsl:when>
+          <xsl:otherwise>/</xsl:otherwise>
+        </xsl:choose>
+        <xsl:call-template name="substring-after-last">
+          <xsl:with-param name="input" select="returns/primitive/@type" />
+          <xsl:with-param name="marker" select="'.'" />
+        </xsl:call-template>
+        <xsl:call-template name="substring-after-last">
+          <xsl:with-param name="input" select="returns/classref/@name" />
+          <xsl:with-param name="marker" select="'.'" />
+        </xsl:call-template>
+        <xsl:text></xsl:text>
+        <xsl:value-of select="@name" />( <!--
+              -->
+        <xsl:for-each select = "parameter">
+          <xsl:value-of select="primitive/@type" />
+          <xsl:call-template name="substring-after-last">
+            <xsl:with-param name="input" select="classref/@name" />
+            <xsl:with-param name="marker" select="'.'" />
+          </xsl:call-template>,<!--
+              -->
+        </xsl:for-each>)\l<!--                              
+            -->
+      </xsl:for-each>
+<!--            
+           -->
+    </xsl:if>}"];
 	</xsl:template>
-
+  <xsl:template match="interface">
+    <xsl:call-template name="fullname">
+      <xsl:with-param name="name" select="../@name"/>
+      <xsl:with-param name="parentname" select="@name"/>
+    </xsl:call-template> [ color="#9c0031", fillcolor="#deffff", label="{«interface»\n<xsl:value-of select="@name"/>\n}"];
+	</xsl:template>
+  <xsl:template match="doc"></xsl:template>
+  <xsl:template match="extends"></xsl:template>
+  <xsl:template match="field"></xsl:template>
+  <xsl:template match="constructor"></xsl:template>
+  <xsl:template match="method"></xsl:template>
   <xsl:template name="fullname">
     <xsl:param name="name"/>
     <xsl:param name="parentname"/>
-
-      <xsl:call-template name="replace-string">
-        <xsl:with-param name="text" select="$name"/>
-        <xsl:with-param name="replace" select="'.'"/>
-        <xsl:with-param name="with" select="'_'"/>
-      </xsl:call-template><xsl:if test = "$parentname!=''">_</xsl:if><xsl:call-template name="replace-string">
-        <xsl:with-param name="text" select="$parentname"/>
-        <xsl:with-param name="replace" select="'.'"/>
-        <xsl:with-param name="with" select="'_'"/>
-      </xsl:call-template>
-      
-  </xsl:template>	
-  
+    <xsl:call-template name="replace-string">
+      <xsl:with-param name="text" select="$name"/>
+      <xsl:with-param name="replace" select="'.'"/>
+      <xsl:with-param name="with" select="'_'"/>
+    </xsl:call-template>
+    <xsl:if test = "$parentname!=''">_</xsl:if>
+    <xsl:call-template name="replace-string">
+      <xsl:with-param name="text" select="$parentname"/>
+      <xsl:with-param name="replace" select="'.'"/>
+      <xsl:with-param name="with" select="'_'"/>
+    </xsl:call-template>
+  </xsl:template>
   <xsl:template name="filepath">
     <xsl:param name="name"/>
     <xsl:param name="parentname"/>
-
-      <xsl:call-template name="replace-string">
-        <xsl:with-param name="text" select="$name"/>
-        <xsl:with-param name="replace" select="'.'"/>
-        <xsl:with-param name="with" select="'/'"/>
-      </xsl:call-template><xsl:if test = "$parentname!=''">/</xsl:if><xsl:call-template name="replace-string">
-        <xsl:with-param name="text" select="$parentname"/>
-        <xsl:with-param name="replace" select="'.'"/>
-        <xsl:with-param name="with" select="'/'"/>
-      </xsl:call-template>
-      
+    <xsl:call-template name="replace-string">
+      <xsl:with-param name="text" select="$name"/>
+      <xsl:with-param name="replace" select="'.'"/>
+      <xsl:with-param name="with" select="'/'"/>
+    </xsl:call-template>
+    <xsl:if test = "$parentname!=''">/</xsl:if>
+    <xsl:call-template name="replace-string">
+      <xsl:with-param name="text" select="$parentname"/>
+      <xsl:with-param name="replace" select="'.'"/>
+      <xsl:with-param name="with" select="'/'"/>
+    </xsl:call-template>
   </xsl:template>
-  	
   <xsl:template name="replace-string">
     <xsl:param name="text"/>
     <xsl:param name="replace"/>
@@ -260,25 +247,21 @@
         <xsl:value-of select="$text"/>
       </xsl:otherwise>
     </xsl:choose>
-  </xsl:template>			
-  
-<xsl:template name="substring-after-last">
-<xsl:param name="input" />
-<xsl:param name="marker" />
-
-<xsl:choose>
-  <xsl:when test="contains($input,$marker)">
-    <xsl:call-template name="substring-after-last">
-      <xsl:with-param name="input" 
+  </xsl:template>
+  <xsl:template name="substring-after-last">
+    <xsl:param name="input" />
+    <xsl:param name="marker" />
+    <xsl:choose>
+      <xsl:when test="contains($input,$marker)">
+        <xsl:call-template name="substring-after-last">
+          <xsl:with-param name="input" 
           select="substring-after($input,$marker)" />
-      <xsl:with-param name="marker" select="$marker" />
-    </xsl:call-template>
-  </xsl:when>
-  <xsl:otherwise>
-   <xsl:value-of select="$input" />
-  </xsl:otherwise>
- </xsl:choose>
-
-</xsl:template>
-				
+          <xsl:with-param name="marker" select="$marker" />
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$input" />
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/forrestdoc/src/resources/vizant/xml2dot.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrestdoc/src/resources/vizant/xml2dot.xsl?view=diff&rev=526405&r1=526404&r2=526405
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/src/resources/vizant/xml2dot.xsl (original)
+++ forrest/trunk/whiteboard/forrestdoc/src/resources/vizant/xml2dot.xsl Sat Apr  7 01:31:56 2007
@@ -16,10 +16,8 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-   <xsl:output method = "text" />
-
-	<xsl:template match="graph">
+  <xsl:output method = "text" />
+  <xsl:template match="graph">
       digraph "<xsl:value-of select="@name" />" {
       
       <xsl:text>
@@ -28,31 +26,25 @@
       edge [color="grey70"]
       <!-- edge .antcall [label="antcall", fontcolor="gray70", fontsize" value="9"]
       node .default [color="pink"] -->
-      </xsl:text>
-         
-       <xsl:apply-templates />
+    </xsl:text>
+    <xsl:apply-templates />
       }
 	</xsl:template>
-
-	<xsl:template match="attributes">
-	 <xsl:value-of select="@type" /> [  
+  <xsl:template match="attributes">
+    <xsl:value-of select="@type" /> [  
        <xsl:apply-templates select="attribute"/>
       ];
 	</xsl:template>
-	
-	<xsl:template match="attribute">
+  <xsl:template match="attribute">
 	 "<xsl:value-of select="@name" />"="<xsl:value-of select="@value" />",
 	</xsl:template>
-		
-	<xsl:template match="node">
+  <xsl:template match="node">
 	   "<xsl:value-of select="@id" />";
 	</xsl:template>
-	
-	<xsl:template match="edge">
+  <xsl:template match="edge">
 	  "<xsl:value-of select="@from" />" -> "<xsl:value-of select="@to" />";
 	</xsl:template>
-
-	<xsl:template match="subgraph">
+  <xsl:template match="subgraph">
   	 subgraph 
   	   <if select="@numcluster">
   	             "cluster:<xsl:value-of select="@numcluster" />"
@@ -64,5 +56,4 @@
          <xsl:apply-templates />  	     
        }
 	</xsl:template>
-   
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/forrestdoc/src/resources/vizant/xml2html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrestdoc/src/resources/vizant/xml2html.xsl?view=diff&rev=526405&r1=526404&r2=526405
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/src/resources/vizant/xml2html.xsl (original)
+++ forrest/trunk/whiteboard/forrestdoc/src/resources/vizant/xml2html.xsl Sat Apr  7 01:31:56 2007
@@ -16,22 +16,21 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-   <xsl:output method = "html" />
-
-	<xsl:template match="graph">
-      <html> 
-       <head>
-         <meta http-equiv="content-type" content="text/html; charset=ISO8859-1" />
-         <title>Vizant - Ant task to visualize buildfiles</title>
-         <link rel="stylesheet" href="main.css" media="all" />
-        </head>
-        <body>
-         <h1><xsl:value-of select="@name" /></h1>
-         <xsl:apply-templates />
-        </body>
-      </html>
-	</xsl:template>
+  <xsl:output method = "html" />
+  <xsl:template match="graph">
+    <html>
+      <head>
+        <meta http-equiv="content-type" content="text/html; charset=ISO8859-1" />
+        <title>Vizant - Ant task to visualize buildfiles</title><link rel="stylesheet" href="main.css" media="all" />
+      </head>
+      <body>
+        <h1>
+          <xsl:value-of select="@name" />
+        </h1>
+        <xsl:apply-templates />
+      </body>
+    </html>
+  </xsl:template>
 <!--
 	<xsl:template match="attributes">
 	 <h3><xsl:value-of select="@type" /></h3> 
@@ -41,22 +40,25 @@
 	<xsl:template match="attribute">
 	  <xsl:value-of select="@name" />=<xsl:value-of select="@value" /><br />
 	</xsl:template>
--->		
-	<xsl:template match="node">
-	   <h2><a name="{@id}"><xsl:value-of select="@id" /></a></h2>
-	</xsl:template>
-	
-	<xsl:template match="edge">
-	  <xsl:value-of select="@from" /> -> <a href="#{@to}"><xsl:value-of select="@to" /></a><br />
-	</xsl:template>
-
-	<xsl:template match="subgraph">
-  	 <h2>subgraph  
+-->
+  <xsl:template match="node">
+    <h2><a name="{@id}">
+      <xsl:value-of select="@id" /></a>
+    </h2>
+  </xsl:template>
+  <xsl:template match="edge">
+    <xsl:value-of select="@from" /> -> <a href="#{@to}">
+    <xsl:value-of select="@to" /></a>
+    <br />
+  </xsl:template>
+  <xsl:template match="subgraph">
+    <h2>subgraph  
   	   <if select="@numcluster">
   	             "cluster:<xsl:value-of select="@numcluster" />"
-  	          </if></h2>
-  	    <h3>label"="<xsl:value-of select="@label" /></h3>
-         <xsl:apply-templates />  	     
-	</xsl:template>
-   
+  	          </if>
+    </h2>
+    <h3>label"="<xsl:value-of select="@label" />
+    </h3>
+    <xsl:apply-templates />
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/forrestdoc/src/resources/vizant/xml2tg.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrestdoc/src/resources/vizant/xml2tg.xsl?view=diff&rev=526405&r1=526404&r2=526405
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/src/resources/vizant/xml2tg.xsl (original)
+++ forrest/trunk/whiteboard/forrestdoc/src/resources/vizant/xml2tg.xsl Sat Apr  7 01:31:56 2007
@@ -16,25 +16,23 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-   <xsl:output method = "xml" />
-
-	<xsl:template match="graph">
-       <TOUCHGRAPH_LB version="1.20">
-         <NODESET>	
-          <xsl:apply-templates select="node"/>
-	    </NODESET>	  
-        <EDGESET>	
-          <xsl:apply-templates select="edge" />
-	    </EDGESET>	  
-        <PARAMETERS>
-          <PARAM name="offsetX" value="627"/>
-          <PARAM name="rotateSB" value="0"/>
-          <PARAM name="zoomSB" value="-7"/>
-          <PARAM name="offsetY" value="19"/>
-        </PARAMETERS>
-      </TOUCHGRAPH_LB>        
-	</xsl:template>
+  <xsl:output method = "xml" />
+  <xsl:template match="graph">
+    <TOUCHGRAPH_LB version="1.20">
+      <NODESET>
+        <xsl:apply-templates select="node"/>
+      </NODESET>
+      <EDGESET>
+        <xsl:apply-templates select="edge" />
+      </EDGESET>
+      <PARAMETERS>
+        <PARAM name="offsetX" value="627"/>
+        <PARAM name="rotateSB" value="0"/>
+        <PARAM name="zoomSB" value="-7"/>
+        <PARAM name="offsetY" value="19"/>
+      </PARAMETERS>
+    </TOUCHGRAPH_LB>
+  </xsl:template>
 <!--
 	<xsl:template match="attributes">
 	 <h3><xsl:value-of select="@type" /></h3> 
@@ -44,44 +42,54 @@
 	<xsl:template match="attribute">
 	  <xsl:value-of select="@name" />"="<xsl:value-of select="@value" /><br />
 	</xsl:template>
--->		
-	<xsl:template match="node">
-      
-        <NODE>
-             <xsl:attribute name="nodeID"><xsl:value-of select="@id"/></xsl:attribute>        
-            <NODE_LOCATION x="534" y="87" visible="true"/>
-            <NODE_LABEL shape="2" backColor="00A0F0" textColor="FFFFFF" fontSize="18">
-              <xsl:attribute name="label"><xsl:value-of select="@id"/></xsl:attribute>
-            </NODE_LABEL>
-            
-            <NODE_URL url="" urlIsLocal="false" urlIsXML="false"/>
-            <NODE_HINT width="150" height="-1" isHTML="false"><!-- the description -->
-              <xsl:attribute name="hint"><xsl:value-of select="@id"/></xsl:attribute>
-            </NODE_HINT>
-        </NODE>      
-	</xsl:template>
-	
-	<xsl:template match="edge">
-      <EDGE type="1" length="80" visible="true" color="A0A0A0">
-         <xsl:attribute name="fromID"><xsl:value-of select="@from"/></xsl:attribute>
-         <xsl:attribute name="toID"><xsl:value-of select="@to"/></xsl:attribute>
-      </EDGE>		
-	</xsl:template>
-
-	<xsl:template match="subgraph">
-        <NODE>
-             <xsl:attribute name="nodeID"><xsl:value-of select="@label"/></xsl:attribute>        
-            <NODE_LOCATION x="534" y="87" visible="true"/>
-            <NODE_LABEL shape="2" backColor="00A0F0" textColor="FFFFFF" fontSize="18">
-              <xsl:attribute name="label"><xsl:value-of select="@label"/></xsl:attribute>
-            </NODE_LABEL>
-            
-            <NODE_URL url="" urlIsLocal="false" urlIsXML="false"/>
-            <NODE_HINT width="150" height="-1" isHTML="false">
-              <xsl:attribute name="hint">subgraph:cluster:<xsl:value-of select="@numcluster"/>:<xsl:value-of select="@label"/></xsl:attribute>
-            </NODE_HINT>
-        </NODE>        	  
-        <xsl:apply-templates />  	     
-	</xsl:template>
-   
+-->
+  <xsl:template match="node">
+    <NODE>
+      <xsl:attribute name="nodeID">
+        <xsl:value-of select="@id"/>
+      </xsl:attribute>
+      <NODE_LOCATION x="534" y="87" visible="true"/>
+      <NODE_LABEL shape="2" backColor="00A0F0" textColor="FFFFFF" fontSize="18">
+        <xsl:attribute name="label">
+          <xsl:value-of select="@id"/>
+        </xsl:attribute>
+      </NODE_LABEL>
+      <NODE_URL url="" urlIsLocal="false" urlIsXML="false"/>
+      <NODE_HINT width="150" height="-1" isHTML="false">
+<!-- the description -->
+        <xsl:attribute name="hint">
+          <xsl:value-of select="@id"/>
+        </xsl:attribute>
+      </NODE_HINT>
+    </NODE>
+  </xsl:template>
+  <xsl:template match="edge">
+    <EDGE type="1" length="80" visible="true" color="A0A0A0">
+      <xsl:attribute name="fromID">
+        <xsl:value-of select="@from"/>
+      </xsl:attribute>
+      <xsl:attribute name="toID">
+        <xsl:value-of select="@to"/>
+      </xsl:attribute>
+    </EDGE>
+  </xsl:template>
+  <xsl:template match="subgraph">
+    <NODE>
+      <xsl:attribute name="nodeID">
+        <xsl:value-of select="@label"/>
+      </xsl:attribute>
+      <NODE_LOCATION x="534" y="87" visible="true"/>
+      <NODE_LABEL shape="2" backColor="00A0F0" textColor="FFFFFF" fontSize="18">
+        <xsl:attribute name="label">
+          <xsl:value-of select="@label"/>
+        </xsl:attribute>
+      </NODE_LABEL>
+      <NODE_URL url="" urlIsLocal="false" urlIsXML="false"/>
+      <NODE_HINT width="150" height="-1" isHTML="false">
+        <xsl:attribute name="hint">subgraph:cluster:<xsl:value-of select="@numcluster"/>:<xsl:value-of select="@label"/>
+        </xsl:attribute>
+      </NODE_HINT>
+    </NODE>
+    <xsl:apply-templates />
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/forrestdoc/src/resources/ws/dir2projects-summary.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrestdoc/src/resources/ws/dir2projects-summary.xsl?view=diff&rev=526405&r1=526404&r2=526405
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/src/resources/ws/dir2projects-summary.xsl (original)
+++ forrest/trunk/whiteboard/forrestdoc/src/resources/ws/dir2projects-summary.xsl Sat Apr  7 01:31:56 2007
@@ -16,33 +16,34 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	<xsl:output method = "html" encoding="Windows-1252" />
-	
-	<xsl:template match="/">	
-<html><head>
-<link rel="stylesheet" type="text/css" href="styles.css"/></head><body>
-<h2>Forrestdoc run for Gump Workspace</h2>
-<table class="summary">
-<thead>
-<tr>
-<th>Projects</th>
-</tr>
-</thead>
-<tbody>
-			
-			  <xsl:apply-templates/>
-</tbody>
-</table>
-
-
-          <hr></hr>Made with Apache ForrestDoc.
-</body></html>
-	</xsl:template>
-	
-	<xsl:template match="pathelement">	
-       <xsl:variable name="dir" select="substring(.,2)" />
-       <xsl:variable name="url" select="concat(substring(.,2),'/index.html')" />
-       <tr><td><a href="{$url}"><xsl:value-of select="$dir" /></a></td></tr>
-    </xsl:template>
-	
+  <xsl:output method = "html" encoding="Windows-1252" />
+  <xsl:template match="/">
+    <html>
+      <head><link rel="stylesheet" type="text/css" href="styles.css"/>
+      </head>
+      <body>
+        <h2>Forrestdoc run for Gump Workspace</h2>
+        <table class="summary">
+          <thead>
+            <tr>
+              <th>Projects</th>
+            </tr>
+          </thead>
+          <tbody>
+            <xsl:apply-templates/>
+          </tbody>
+        </table>
+        <hr></hr>Made with Apache ForrestDoc.
+</body>
+    </html>
+  </xsl:template>
+  <xsl:template match="pathelement">
+    <xsl:variable name="dir" select="substring(.,2)" />
+    <xsl:variable name="url" select="concat(substring(.,2),'/index.html')" />
+    <tr>
+      <td><a href="{$url}">
+        <xsl:value-of select="$dir" /></a>
+      </td>
+    </tr>
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/forrestdoc/src/resources/ws/dir2projects.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrestdoc/src/resources/ws/dir2projects.xsl?view=diff&rev=526405&r1=526404&r2=526405
==============================================================================
--- forrest/trunk/whiteboard/forrestdoc/src/resources/ws/dir2projects.xsl (original)
+++ forrest/trunk/whiteboard/forrestdoc/src/resources/ws/dir2projects.xsl Sat Apr  7 01:31:56 2007
@@ -16,22 +16,28 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	<xsl:output method = "html" encoding="Windows-1252" />
-	
-	<xsl:template match="/">	
-<html><head><link rel="stylesheet" type="text/css" href="styles.css"/></head><body>
-<h3 class="packageListItem">Projects</h3>
-<p class="packageListItem"><A HREF="projects-summary.html" TARGET="projects-summaryFrame">Summary</A></p>
-<br/>
-			
-			  <xsl:apply-templates/>
-</body></html>
-	</xsl:template>
-	
-	<xsl:template match="pathelement">	
-       <xsl:variable name="dir" select="substring(.,2)" />
-       <xsl:variable name="url" select="concat(substring(.,2),'/index.html')" />
-         <p class="packageListItem"><a href="{$url}" TARGET="projects-summaryFrame"><xsl:value-of select="$dir" /></a></p>
-    </xsl:template>
-	
+  <xsl:output method = "html" encoding="Windows-1252" />
+  <xsl:template match="/">
+    <html>
+      <head><link rel="stylesheet" type="text/css" href="styles.css"/>
+      </head>
+      <body>
+        <h3 class="packageListItem">Projects</h3>
+        <p class="packageListItem">
+          <A HREF="projects-summary.html" TARGET="projects-summaryFrame">Summary</A>
+        </p>
+        <br/>
+        <xsl:apply-templates/>
+      </body>
+    </html>
+  </xsl:template>
+  <xsl:template match="pathelement">
+    <xsl:variable name="dir" select="substring(.,2)" />
+    <xsl:variable name="url" select="concat(substring(.,2),'/index.html')" />
+    <p class="packageListItem">
+      <a href="{$url}" TARGET="projects-summaryFrame">
+      <xsl:value-of select="$dir" />
+      </a>
+    </p>
+  </xsl:template>
 </xsl:stylesheet>



Mime
View raw message