commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject cvs commit: jakarta-commons/jelly/xdocs faq.xml gettingstarted.xml index.xml irc.xml jellyswt.xml jellyunit.xml navigation.xml overview.xml pipeline.xml tutorial.xml
Date Thu, 25 Dec 2003 22:09:58 GMT
polx        2003/12/25 14:09:58

  Modified:    jelly    maven.xml
               jelly/xdocs faq.xml gettingstarted.xml index.xml irc.xml
                        jellyswt.xml jellyunit.xml navigation.xml
                        overview.xml pipeline.xml tutorial.xml
  Log:
  Website is now built with maven site but this takes very long (about an hour) and relies
on being able to invoke maven executable back (!).
  Fixed many inaccuracies in the presentation pages.
  Some of these pages could be moved to their taglib as was done with JellySwing.
  Paul
  
  Revision  Changes    Path
  1.65      +53 -42    jakarta-commons/jelly/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/maven.xml,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- maven.xml	22 Sep 2003 15:22:57 -0000	1.64
  +++ maven.xml	25 Dec 2003 22:09:58 -0000	1.65
  @@ -2,8 +2,7 @@
   
     <!-- create the lib and bin directories in the binary distro -->
     <preGoal name="dist:build">
  -
  -    <echo>About to create lib and bin directories in ${maven.dist.assembly.dir}</echo>
  +<echo>About to create lib and bin directories in ${maven.dist.assembly.dir}</echo>
   
       <mkdir dir="${maven.dist.assembly.dir}/bin"/>
       <mkdir dir="${maven.dist.assembly.dir}/lib"/>
  @@ -126,13 +125,9 @@
   
   
     <!-- ===================================================================== -->
  -  <!-- GENERATE THE LIBRARY AND JELLYDOC DOCUMENTATION                       -->
  +  <!-- GENERATE THE TAG-LIBRARY LIST                       -->
     <!-- ===================================================================== -->
     <preGoal name="xdoc:transform">
  -    <!-- use a template to create the plugins home page
  -       if it's an xdoc, it must be done before xdoc:transform
  -       and should generate to ${maven.gen.docs}/libs/index.xml
  -      -->
         
       <!-- can't pass anything into the jellydoc doclet so its hard coded to target -->
     
       <mkdir dir="target"/>
  @@ -173,50 +168,29 @@
     </preGoal>
   
     <preGoal name="xdoc">
  -    <maven:reactor
  -      basedir="${basedir}"
  -      includes="jelly-tags/*/project.xml"
  -      goals="jellydoc,maven-jdepend-plugin:report,maven-javadoc-plugin:report,maven-junit-report-plugin:report,maven-changelog-plugin:report,xdoc:transform"
  -      banner="Generating jellydoc for"
  -      ignoreFailures="false"
  -    />
  -
  -  <!--    
  -        <attainGoal name="maven-checkstyle-plugin:report"/>
  -        <attainGoal name="maven-changelog-plugin:report"/>
  -        <attainGoal name="maven-developer-activity-plugin:report"/>
  -        <attainGoal name="maven-file-activity-plugin:report"/>
  -        <attainGoal name="maven-junit-report-plugin:report"/>
  -        <attainGoal name="maven-linkcheck-plugin:report"/>
  -        <attainGoal name="maven-tasklist-plugin:report"/>    
  -  -->        
  -        
     <!--        
       This runs out of memory - have a feeling its the velocity & xdoc plugin
  -    
  -    <maven:reactor
  +    -->
  +    <!-- <maven:reactor
         basedir="${basedir}"
         includes="jelly-tags/*/project.xml"
         goals="site"
         banner="Generating site for"
         ignoreFailures="false"
  -    />
  -    -->
  -    
  +    />-->
  +		<!-- PL: instead... invoke maven from the command-line directly for
  +			each directory in jelly-tags. -->
  +		<attainGoal name="tags:build-site-individually"/>
  +		
  +		<!-- then copy all the results to docs/libs -->
       <j:if test="${context.getVariable('maven.docs.dest') == null}">
         <j:set var="maven.docs.dest" value="target/docs"/>
       </j:if>
       
       <!-- create the parent directory for the docs -->
       <mkdir dir="${maven.docs.dest}/libs" />
  -  
  -    <!-- copy them all to ${maven.docs.dest}/libs/${plugin.id}/ -->
  -    <fileScanner var="pluginProjects">
  -      <fileset dir="${basedir}">
  -        <include name="jelly-tags/*/project.xml" />
  -      </fileset>
  -    </fileScanner>
       
  +    <!-- copy them all to ${maven.docs.dest}/libs/${plugin.id}/ -->
       <j:forEach items="${pluginProjects.iterator()}" var="plugin">
         <j:set var="pluginName" value="${plugin.parentFile.name}" />
         <mkdir dir="${maven.docs.dest}/libs/${pluginName}/" />
  @@ -233,7 +207,49 @@
       
     </preGoal>
   
  +	<goal name="tags:build-site-individually">
   
  +    <fileScanner var="taglibProjects">
  +      <fileset dir="${basedir}">
  +        <include name="jelly-tags/*/project.xml" />
  +      </fileset>
  +    </fileScanner>
  +			
  +		<property name="mavenCmd" value="maven"/>
  +		
  +    <j:forEach items="${taglibProjects.iterator()}" var="taglib">
  +      <j:set var="tlName" value="${taglib.parentFile.name}" />
  +			<echo>Processing tablib ${tlName}.</echo>
  +			<j:set var="dir" value="${basedir}/jelly-tags/${tlName}"/>
  +			<uptodate property="siteIsBuilt">
  +				<srcfiles dir="${dir}" excludes="target/**/*"/>
  +				<mapper type="merge" to="${dir}/target/docs/index.html"/>
  +				</uptodate>
  +		  <echo>Tag-library ${tlname}'s site is up-to-date ? "${siteIsBuilt}"</echo>
  +			<j:if test="${!siteIsBuilt}">
  +				<echo>Building tag-library ${tlname}'s site.</echo>
  +				<echo>Outputting navigation to ${dir}/target/generated-xdocs/navigation.xml.</echo>
  +				<mkdir dir="${dir}/target/generated-xdocs"/>
  +					<copy file="${basedir}/jelly-tags/tag-navigation.xml" tofile="${dir}/target/generated-xdocs/navigation.xml"
  +							overwrite="true">
  +						<filterchain> 
  +							<replacetokens><token key="pom.name" value="jelly-${tlName}"/></replacetokens>
  +							</filterchain>
  +					  </copy>
  +
  +					<exec executable="${mavenCmd}"
  +						failonerror="true" dir="${dir}">
  +					<arg value="jellydoc"/>
  +					<arg value="site"/>
  +					<arg value="-Dmaven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html"/>
  +					<arg value="-Dmaven.xdoc.poweredby.image=maven-feather.png"/>
  +					<arg value="-Dmaven.xdoc.date=left"/>
  +					<arg value="-Dmaven.license.licenseFile=${basedir}/LICENSE.txt"/>
  +					</exec>
  +				</j:if>
  +			</j:forEach>
  +		
  +			</goal>
   
   
     <!-- demo programs -->
  @@ -286,11 +302,6 @@
       description="A private target invoked by the async demo">
       <echo>YYYY</echo>
     </goal>
  -
  -  <!--
  -   | Disable some goals not currently working with CVS HEAD 
  -   |-->
  -  <goal name="maven-license-plugin:report"/>
   
   
     <!-- define the classpath used to run examples -->
  
  
  
  1.10      +19 -24    jakarta-commons/jelly/xdocs/faq.xml
  
  Index: faq.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/xdocs/faq.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- faq.xml	15 Sep 2003 20:35:01 -0000	1.9
  +++ faq.xml	25 Dec 2003 22:09:58 -0000	1.10
  @@ -124,14 +124,14 @@
           <dd>
           	Try the following code. Note that the runScript() method below is overloaded and
can take a File, URL etc.
   <code>
  -<pre>
  +<source>
   // pass the output of the script somewhere
   Writer someWriter = new FileWriter( "output.xml" );
   XMLOutput output = XMLOutput.createXMLOutput( someWriter );
   
   // now run a script using a URL
   JellyContext context = new JellyContext();
  -context.runScript( "foo.jelly", output );</pre>
  +context.runScript( "foo.jelly", output );</source>
   </code>
           </dd>
         </dl>
  @@ -196,7 +196,7 @@
           </dd>
           <dd>
   <code>
  -<pre>
  +<source>
   &lt;j:jelly xmlns:j="jelly:core" xmlns:foo="jelly:com.acme.something.MyTagLibrary"&gt;
   
     &lt;foo:bar x="12&gt;
  @@ -204,7 +204,7 @@
     &lt;/foo:bar&gt;
   
   &lt;/j:jelly&gt;
  -</pre>
  +</source>
   </code>
           </dd>
           <dd>
  @@ -216,7 +216,7 @@
           </dd>
           <dd>
   <code>
  -<pre>
  +<source>
   &lt;j:jelly xmlns:j="jelly:core" xmlns:foo="jelly:foo"&gt;
   
     &lt;foo:bar x="12&gt;
  @@ -224,7 +224,7 @@
     &lt;/foo:bar&gt;
   
   &lt;/j:jelly&gt;
  -</pre>
  +</source>
   </code>
           </dd>
         </dl>
  @@ -243,7 +243,7 @@
           </dd>
           <dd>
   <code>
  -<pre>
  +<source>
   public class FooTag extends TagSupport {
     private String value;
   
  @@ -252,25 +252,25 @@
   
   
     .
  -}</pre>
  +}</source>
   </code>
                   </dd>
           <dd>
           Then if you were to use it like this...
   <code>
  -<pre>
  +<source>
     &lt;my:foo value="${customer.fullName}"/&gt;
  -</pre>
  +</source>
   </code>
           Then this would be equivalent in pseudocode to
   <code>
  -<pre>
  +<source>
   FooTag tag = FooTag();
   ...
   tag.setValue( ((Customer) context.getVariable("customer")).getFullName() );
   ...
   tag.doTag(output);
  -</pre>
  +</source>
   </code>
                </dd>
           <dd>
  @@ -285,8 +285,7 @@
             For example if you want to evaluate the expression as an Iterator you can use
a property
             on your Tag of type Expression so that in your Tag you can use the Expression.evaluateAsIterator()
             method. This is how the &lt;x:forEach&gt; tag currently is implemented
for example.
  -<code>
  -<pre>
  +<source>
   public class FooTag extends TagSupport {
     private Expression value;
   
  @@ -298,8 +297,7 @@
       Iterator iter = expression.evaluateAsIterator();
               ...
     }
  -}</pre>
  -</code>
  +}</source>
           </dd>
         </dl>
               <dl>
  @@ -314,8 +312,8 @@
             a CDATA section to create a DTD.  The following Jelly script:
           </dd>
                   <dd>
  -<code>
  -<pre>
  +
  +<source>
   &lt;?xml version="1.0"?>
   
   &lt;j:file xmlns:j="jelly:core" var="foo" escapeText="false">
  @@ -329,23 +327,20 @@
       &lt;foo/>
       
   &lt;/j:file>
  -</pre>
  -</code>
  +</source>
   </dd>
   <dd>
      will produce this output:
           </dd>
   <dd>
  -<code>
  -<pre>
  +<source>
   &lt;?xml version="1.0" encoding="UTF-8"?>
   &lt;!DOCTYPE foo [
       &lt;!ELEMENT foo (#PCDATA)>
   ]>
   
   &lt;foo/>
  -</pre>
  -</code>
  +</source>
   </dd>
         </dl>
       </section>
  
  
  
  1.3       +30 -8     jakarta-commons/jelly/xdocs/gettingstarted.xml
  
  Index: gettingstarted.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/xdocs/gettingstarted.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- gettingstarted.xml	23 Jun 2003 02:30:49 -0000	1.2
  +++ gettingstarted.xml	25 Dec 2003 22:09:58 -0000	1.3
  @@ -11,11 +11,12 @@
   
   <section name="Getting Started">
   
  +
   <p>
   The easiest way to get started with Jelly is to try out the <a href="tutorial.html">tutorials</a>.

   Before you try out any of the tutorials, you'll need to install Maven first.
   For more details on how to install Maven please refer to the 
  -<a href="http://maven.apache.org/start/index.html">Maven documentation</a>
  +<a href="http://maven.apache.org/">Maven documentation</a>
   </p>
   
   <p>
  @@ -34,7 +35,7 @@
   <li>
   Get a source distribution of Jelly. 
   The easiest way to do this is (until we have nightly builds working) is to grab a CVS checkout.
  -Jelly currently resides in the jelly directory inside jakarta-commons-sandbox.
  +Jelly currently resides in the jelly directory inside jakarta-commons.
   There are instructions on performing CVS checkouts 
   <a href="http://jakarta.apache.org/site/cvsindex.html">here</a>
   </li>
  @@ -46,20 +47,41 @@
   which should contain a <i>project.xml</i> file required by Maven. Then type
   </p>
   
  -<pre>
  -	maven test
  -</pre>
  +<source>maven jar</source>
   
   <p>
  -This should download all the required jars required to build and run all the example Jelly
scripts,
  -compile all the code and build and run all the unit test cases. 
  +This should download all the required jars required to build and run the core jelly,
  +compile all the code and build and run the unit test cases. 
   </p>
   
  +</section>
  +
  +<section name="Tag-libraries">
  +<p> 
  +  Your next task is to choose the tag-libraries you are interested to and to
  +  build them. For all of them, you can build using <code>maven jar</code>.
  +  </p>
  +<p>
  +  Beware that some tag-libraries have dependencies that cannot be distributed
  +  by the maven repository distribution for license reasons. The tag-libraries
  +    <a href="libs/email/index.html">email</a>,
  +    <a href="libs/soap/index.html"></a>, and
  +    <a href="libs/jetty/index.html"></a>
  +  are known to require such.
  +  Please browse to their dependency-list in order to download the
  +  named jars, rename-them, and put them at the appropriate place
  +  in the maven repository. (you could also delete these directories)
  +  </p>
  +  <p>
  +    Once all dependencies are honoured, you can also build it all using
  +    <code>maven dist</code>, however, maven may become out of resources;
  +    changing the environment variable MAVEN_OPTS (e.g. to -Xmx768m...) might help.
  +    </p>
   <p>
   Once you've got this far, it might be time to try out one of the <a href="tutorial.html">tutorials</a>

   </p>
  -
   </section>
  +
   
   </body>
   
  
  
  
  1.15      +11 -11    jakarta-commons/jelly/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/xdocs/index.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- index.xml	23 Jun 2003 02:30:49 -0000	1.14
  +++ index.xml	25 Dec 2003 22:09:58 -0000	1.15
  @@ -31,7 +31,7 @@
   
   <p>
   Jelly has native support for a Velocity-like expression language called
  -<a href="http://jakarta.apache.org/commons/sandbox/jexl/">Jexl</a> 
  +<a href="http://jakarta.apache.org/commons/jexl/">Jexl</a> 
   which is a superset of the JSP, JSTL and JSF expression languages
   as  well as support for other pluggable expression languages like XPath via 
   <a href="http://jaxen.org">Jaxen</a>, JavaScript, beanshell and Jython.
  @@ -66,11 +66,11 @@
   </p> 
   
   
  -<pre>
  +<source>
   &lt;document time="${now}"&gt;
     Welcome ${user.name} to Jelly!
   &lt;/document&gt;
  -</pre>
  +</source>
   
   
   <p> 
  @@ -93,7 +93,7 @@
   
   <p>
   Also Jelly Tags can be defined at runtime in dynamic Jelly script using the 
  -<a href="tags.html#jelly:define">define</a> tag 
  +<a href="libs/define/tags.html">define</a> tag 
   library so that simple yet powerful macros can be made very easily using just Jelly script.
   </p>
   
  @@ -107,7 +107,7 @@
   For example imagine if you had written the following bean
   </p>
   
  -<pre>
  +<source>
   public class MyTask {
   
       // 'doIt' method that does some function/task...
  @@ -123,14 +123,14 @@
           this.y = y;
       }
   }
  -</pre>
  +</source>
   
   <p>
   Then you can use this bean in a script by defining a new tag library and
   then using the new tag as follows...
   </p>
   
  -<pre>
  +<source>
   &lt;j:jelly xmlns:j="jelly:core" xmlns:define="jelly:define" xmlns:my="myTagLib"&gt;
   
     &lt;define:taglib uri="myTagLib"&gt;
  @@ -142,7 +142,7 @@
     &lt;my:foo x="2" y="cheese"/&gt;
   
   &lt;/j:jelly&gt;
  -</pre>
  +</source>
   
   <p>
   This mechanism is kinda similar to using a &lt;taskdef&gt; in Ant except that the
  @@ -214,7 +214,7 @@
   
   <p>
   In addition there is a tag library called the Jelly Stylesheet Library (
  -<a href="tags.html#jelly:jsl">JSL</a>) for
  +<a href="libs/jsl/tags.html">JSL</a>) for
   performing XSLT-style declarative processing of XML documents using a pattern match approach.
   </p>
   
  @@ -229,11 +229,11 @@
   then format the results neatly as XML.
   </p>
   
  -<pre>
  +<source>
   &lt;babelfish:translate from="en" to="fr"&gt;
     Welcome ${user.name} to Jelly!
   &lt;/babelfish:translate&gt;
  -</pre>
  +</source>
   
   <p>
   A Jelly script is an XML document, which means that Jelly can process itself.
  
  
  
  1.2       +2 -3      jakarta-commons/jelly/xdocs/irc.xml
  
  Index: irc.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/xdocs/irc.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- irc.xml	30 Jul 2002 14:46:29 -0000	1.1
  +++ irc.xml	25 Dec 2003 22:09:58 -0000	1.2
  @@ -21,10 +21,8 @@
         </p>
   
         <blockquote>
  -        <pre>
               server: <b>irc.werken.com</b>
                 port: <b>6667</b>
  -        </pre>
         </blockquote>
   
         <p>
  @@ -37,6 +35,7 @@
         or <code><b>#maven</b></code>.
         </p>
   
  +      <!-- PL: sadly disabled archives...
         <subsection name="Logs">
           <p>
           Many of the channels hosted by The Werken Company are archived
  @@ -48,7 +47,7 @@
           <a href="http://irc.werken.com/channels/jelly/">#jelly archive</a>
           </p>
         </subsection>
  -      
  +      -->
   
       </section>
       
  
  
  
  1.3       +4 -6      jakarta-commons/jelly/xdocs/jellyswt.xml
  
  Index: jellyswt.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/xdocs/jellyswt.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jellyswt.xml	31 Jan 2003 14:09:16 -0000	1.2
  +++ jellyswt.xml	25 Dec 2003 22:09:58 -0000	1.3
  @@ -21,16 +21,14 @@
         </p>
         <p>
           There is an example JellySWT script
  -        <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons-sandbox/jelly/jelly-tags/swt/src/test/org/apache/commons/jelly/tags/swt/example.jelly?rev=HEAD">here</a>
  +        <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons/jelly/jelly-tags/swt/src/test/org/apache/commons/jelly/tags/swt/example.jelly?rev=HEAD">here</a>
         </p>
         <p>
  -        To try running the example, cd into the <i>jelly/jelly-tags/swt</i>
directory 
  -        and then type the following command then you should see a full SWT user interface

  +        To try running the example, cd into the <i>[jelly-home]/jelly-tags/swt</i>
directory 
  +        and type the following command, you should see a full SWT user interface 
           appear with pull down menus, a simple form, a table, toolbar buttons, tooltip etc.
         </p>
  -      <source>
  -	maven demo
  -      </source>
  +      <source>maven demo</source>
       </section>
       
       <section name="Running SWT"> 
  
  
  
  1.7       +14 -14    jakarta-commons/jelly/xdocs/jellyunit.xml
  
  Index: jellyunit.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/xdocs/jellyunit.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- jellyunit.xml	5 Sep 2002 17:58:40 -0000	1.6
  +++ jellyunit.xml	25 Dec 2003 22:09:58 -0000	1.7
  @@ -14,7 +14,7 @@
           if you wish to test XML, XPath, SQL, HTTP, JMS or SOAP interactions.
         </p>
         <p>
  -        JellyUnit works by using the <a href="tags.html#jelly:junit">JUnit library
</a> in a Jelly script
  +        JellyUnit works by using the <a href="libs/junit/tags.html">JUnit library
</a> in a Jelly script
           to create JUnit TestSuite and TestCase objects. 
           There are all the usual JUnit assertion tests available such as &lt;assert&gt;

           &lt;assertEquals&gt; and &lt;fail&gt;. You can use both Jexl and
XPath expressions in the 
  @@ -34,18 +34,18 @@
       <section name="Examples"> 
         <p>
           There is a simple example JellyUnit script
  -        <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/junit/suite.jelly?rev=HEAD">here</a>
  +        <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons/jelly/jelly-tags/junit/src/test/org/apache/commons/jelly/tags/junit/suite.jelly?rev=HEAD">here</a>
         </p>
         <p>
  -        An example demonstrating the use of the <a href="tags.html#jelly:betwixt">Betwixt</a>
library is 
  -        <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/betwixt/suite.jelly?rev=HEAD">here</a>
  +        An example demonstrating the use of the <a href="libs/betwixt/tags.html">Betwixt</a>
library is 
  +        <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons/jelly/jelly-tags/betwixt/src/test/org/apache/commons/jelly/betwixt/suite.jelly?rev=HEAD">here</a>
           along with a common shared test script
  -        <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/betwixt/common.jelly?rev=HEAD">here</a>
  +        <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons/jelly/jelly-tags/betwixt/src/test/org/apache/commons/jelly/betwixt/common.jelly?rev=HEAD">here</a>
         </p>
         <p>
  -      	The <a href="http://jakarta.apache.org/commons/sandbox/jelly/tags.html#jelly:validate">validate</a>
library can be used to perform XML validation inside JellyUnit.
  +      	The <a href="libs/validate/tags.html">validate</a> library can be used
to perform XML validation inside JellyUnit.
         	For example there's an example JellyUnit script validating XML 
  -      	<a href="http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/validate/suite.jelly?rev=HEAD">here</a>
  +      	<a href="http://cvs.apache.org/viewcvs/jakarta-commons/jelly/jelly-tags/validate/src/test/org/apache/commons/jelly/tags/validate/suite.jelly?rev=HEAD">here</a>
         </p>
       </section>
   
  @@ -67,10 +67,10 @@
           without requiring the underlying services
         </p>
         <p>
  -        There's an and example of using Mock Tags via the <a href="tags.html#jelly:define">define</a>
library 
  -        <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/mock/suite.jelly?rev=HEAD">here</a>
  +        There's an and example of using Mock Tags via the <a href="libs/define/tags.html">define</a>
library 
  +        <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons/jelly/jelly-tags/define/src/test/org/apache/commons/jelly/tags/mock/suite.jelly?rev=HEAD">here</a>
           which creates the mock tags, inside a JellyUnit test case and then invokes this
example 
  -        <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/mock/service.jelly?rev=HEAD">service</a>
  +        <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons/jelly/jelly-tags/define/src/test/org/apache/commons/jelly/tags/mock/service.jelly?rev=HEAD">service</a>
           using the mock tags rather than the underlying SQL and web service tags.
           Running the same service from outside of the Mock Tags JellyUnit test case would
use the real tag implementations.
         </p>
  @@ -80,18 +80,18 @@
       <section name="Integration with TestRunners"> 
         <p>
           To integrate cleanly inside JUnit TestRunner frameworks there is a helper class,
  -        <a href="apidocs/org/apache/commons/jelly/tags/junit/JellyTestSuite.html">JellyTestSuite</a>
  +        <a href="libs/junit/apidocs/org/apache/commons/jelly/tags/junit/JellyTestSuite.html">JellyTestSuite</a>
           which you can derive from
           to produce a single Java class which has a static <i>suite()</i> method
to create a TestSuite object 
           containing all the test cases created by the JellyUnit files.
   		There is an 
  -        <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/junit/TestJUnit.java?rev=HEAD">example</a>
  +        <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons/jelly/jelly-tags/junit/src/test/org/apache/commons/jelly/junit/TestJUnit.java?rev=HEAD">example</a>
           of this in action.
         </p>
         <p>So if you had a test suite defined in a jelly script <a>suite.jelly</a>
in a package com.acme.foo
         	then you could create a class, capable of being ran inside any JUnit test runner
framework as follows
         </p>
  -<pre>
  +<source>
   package com.acme.foo;
         
   import junit.framework.TestSuite;
  @@ -107,7 +107,7 @@
           return createTestSuite(TestFoo.class, "suite.jelly");        
       }
   }
  -</pre>
  +</source>
       </section>
     </body>
   </document>
  
  
  
  1.20      +3 -3      jakarta-commons/jelly/xdocs/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/xdocs/navigation.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- navigation.xml	8 Feb 2003 19:29:10 -0000	1.19
  +++ navigation.xml	25 Dec 2003 22:09:58 -0000	1.20
  @@ -2,7 +2,7 @@
   <project name="Jelly">
   
     <title>Jelly</title>
  -  <organizationLogo href="/images/jakarta-logo-blue.gif">Jakarta</organizationLogo>
  +  <organizationLogo href="http://jakarta.apache.org/images/jakarta-logo.gif">Jakarta</organizationLogo>
   
     <body>
       <menu name="Jelly">
  @@ -14,14 +14,14 @@
         <item name="Download"                href="http://www.ibiblio.org/maven/commons-jelly/distributions/"/>
       </menu>
       <menu name="Community">
  -      <item name="News Blog"			         href="http://blogs.werken.com/projects/jelly/"/>
  +      <!-- <item name="News Blog"			         href="http://blogs.werken.com/projects/jelly/"/>-->
         <item name="IRC"					   				 href="/irc.html"/>
         <item name="Powered By"              href="/powered.html"/>
         <item name="To Do List"              href="/todo.html"/>
       </menu>
       <menu name="Features">
         <item name="JellyUnit"               href="/jellyunit.html"/>
  -      <item name="JellySwing"              href="/jellyswing.html"/>
  +      <item name="JellySwing"              href="/libs/swing/index.html"/>
         <item name="JellySWT"                href="/jellyswt.html"/>
         <item name="XML Pipeline"            href="/pipeline.html"/>
         <item name="Core Tags"               href="/tags.html"/>
  
  
  
  1.10      +4 -4      jakarta-commons/jelly/xdocs/overview.xml
  
  Index: overview.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/xdocs/overview.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- overview.xml	7 Feb 2003 09:54:30 -0000	1.9
  +++ overview.xml	25 Dec 2003 22:09:58 -0000	1.10
  @@ -15,7 +15,7 @@
   elements can be bound to a Java <i>Tag</i> which is a Java bean that performs

   some function. Here's an example action</p>
   
  -<pre>
  +<source>
   public class FooTag extends TagSupport {    
       private int count;
       public void setCount(int count) {
  @@ -27,14 +27,14 @@
               getBody().run( context, output );
           }
       }
  -}</pre>
  +}</source>
   
   <p>Then in a Jelly script this tag could be used as follows:-</p>
   
  -<pre>
  +<source>
   &lt;f:foo count=&quot;123&quot;&gt;
       something...
  -&lt;/f:foo&gt;</pre>
  +&lt;/f:foo&gt;</source>
   
   <p>Jelly is totally extendable 
   via custom actions (in a similar way to JSP custom tags) as well as cleanly integrating
with scripting 
  
  
  
  1.2       +18 -17    jakarta-commons/jelly/xdocs/pipeline.xml
  
  Index: pipeline.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/xdocs/pipeline.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- pipeline.xml	11 Dec 2002 20:02:46 -0000	1.1
  +++ pipeline.xml	25 Dec 2003 22:09:58 -0000	1.2
  @@ -76,16 +76,16 @@
   
   <ul>
   	<li>
  -		parsing XML, transforming it with XSLT or using XPath via the <a href="">xml</a>
library
  +		parsing XML, transforming it with XSLT or using XPath via the <a href="libs/xml/tags.html">xml</a>
library
   	</li>
   	<li>
  -		parsing HTML via the <a href="tags.html#jelly:html">html</a> library
  +		parsing HTML via the <a href="libs/html/tags.html">html</a> library
   	</li>
   	<li>
  -		performing XML validation against DTD, XML Schema or RelaxNG using the <a href="tags.html#jelly:validate">validate</a>
library
  +		performing XML validation against DTD, XML Schema or RelaxNG using the <a href="libs/validate/tags.html">validate</a>
library
   	</li>
   	<li>
  -		performing SOAP operations via Apache Axis with the <a href="tags.html#jelly:soap">soap</a>
library
  +		performing SOAP operations via Apache Axis with the <a href="libs/soap/tags.html">soap</a>
library
   	</li>
   	<li>
   		mixing and matching the processing of XML in pipelines with support for other libraries
like 
  @@ -98,19 +98,20 @@
   pipelines don't have to be linear. At any point in the chain, custom logic can decide what
to do next.
   </p>
   
  -<pre>
  -  &lt;j:if test="${myBean.fooEnabled('uk')}&gt;
  -    &lt;j:file name="${userdir}/results.html"&gt;
  -      &lt;x:transform xslt="asHTML.xsl"&gt;
  -        &lt;soap:invoke endpoint="http://com.myserver/..."&gt;
  -          &lt;x:transform xslt="foo.xsl"&gt;
  -            &lt;x:parse xml="${myBean.getSomeURL()}"/&gt;
  -          &lt;x:transform&gt;
  -        &lt;/soap:invoke&gt;
  -      &lt;/x:transform&gt;
  -    &lt;/j:file&gt;
  -  &lt;/j:if&gt;		
  -</pre>
  +<source><![CDATA[
  +  <j:if test="${myBean.fooEnabled('uk')}>
  +    <j:file name="${userdir}/results.html">
  +      <x:transform xslt="asHTML.xsl">
  +        <soap:invoke endpoint="http://com.myserver/...">
  +          <x:transform xslt="foo.xsl">
  +            <x:parse xml="${myBean.getSomeURL()}"/>
  +          <x:transform>
  +        </soap:invoke>
  +      </x:transform>
  +    </j:file>
  +  </j:if>		
  +]]>
  +</source>
   
   </subsection>.
   
  
  
  
  1.7       +24 -24    jakarta-commons/jelly/xdocs/tutorial.xml
  
  Index: tutorial.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/xdocs/tutorial.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- tutorial.xml	4 Sep 2003 02:37:59 -0000	1.6
  +++ tutorial.xml	25 Dec 2003 22:09:58 -0000	1.7
  @@ -70,7 +70,7 @@
   
   
   <p>
  -The JellySwing demo shows how you can use Jelly (using the <a href="tags.html#jelly:jellyswing">JellySwing</a>
library) to build the UI for a Swing java program.
  +The JellySwing demo shows how you can use Jelly (using the <a href="libs/swing/tags.html">JellySwing</a>
library) to build the UI for a Swing java program.
   </p>
   
   <p>
  @@ -88,8 +88,8 @@
   </p>
   
   <p>
  -To run the swing demo type "maven demo:swing"
  -(View the <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/swing/example.jelly?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">demo
script</a>). You should see a window open with
  +To run the swing demo, go to directory jelly-tags/swing and  type "maven demo:swing"
  +(View the <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons/jelly/src/test/org/apache/commons/jelly/tags/swing/example.jelly?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">demo
script</a>). You should see a window open with
   some swing components. You can test the actions by selecting a menu item or
   pressing the button. The actions in this demo simply output a message to the
   console. A more practical action could be to invoke a bean, call a script
  @@ -97,11 +97,11 @@
   </p>
   
   <p>
  -If you look at the <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/swing/example.jelly?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">jelly
code for this demo</a>, you will see
  +If you look at the <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons/jelly/src/test/org/apache/commons/jelly/tags/swing/example.jelly?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">jelly
code for this demo</a>, you will see
   that building a UI is pretty simple. For example, a menu bar is simply:
   </p>
   
  -<pre>
  +<source>
       &lt;menuBar&gt;
         &lt;menu text="File"&gt;
           &lt;menuItem&gt;
  @@ -112,7 +112,7 @@
         &lt;/menu&gt;
         ... more menus/menu items
       &lt;/menuBar&gt;
  -</pre>
  +</source>
   
   <p>
   As you can see, nested elements are automatically added to parent components
  @@ -124,12 +124,12 @@
   "new" tag (from the jelly:core taglib):
   </p>
   
  -<pre>
  +<source>
       &lt;scrollPane&gt;
         &lt;j:new className="org.apache.commons.jelly.swing.MyTableModel" var="tableModel"/&gt;
         &lt;table model="${tableModel}"/&gt;
       &lt;/scrollPane&gt;
  -</pre>
  +</source>
   
   <p>
   The nice thing about this is that any component (or model in this case) that
  @@ -145,7 +145,7 @@
   </p>
   
   <p>
  -To start the JellyRunner type "maven jelly:runner" (View the <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/swing/run.jelly?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">demo
source</a>).
  +To start the JellyRunner type "maven jelly:runner" (View the <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons/jelly/src/test/org/apache/commons/jelly/tags/swing/run.jelly?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">demo
source</a>).
   </p>
   
   </subsection>
  @@ -153,7 +153,7 @@
   <subsection name="Homepage Builder (JellySwing Edition)">
   
   <p>
  -This is a good chance to use the Jelly Runner. Find HomepageBuilder.jelly, which is located
in /src/test/org/apache/commons/jelly/demos/ (View the <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/demos/homepageBuilder.jelly?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">demo
source</a>).
  +This is a good chance to use the Jelly Runner. Find HomepageBuilder.jelly, which is located
in /src/test/org/apache/commons/jelly/demos/ (View the <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos/homepageBuilder.jelly?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">demo
source</a>).
   </p>
   
   <p>
  @@ -203,14 +203,14 @@
   </p>
   
   <p>
  -To run the demo type "maven demo:embed" (View the <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/demos/HomepageBuilder.java?rev=HEAD">demo
source</a>).
  +To run the demo type "maven demo:embed" (View the <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos/HomepageBuilder.java?rev=HEAD">demo
source</a>).
   </p>
   
   <p>
   The code that actually runs Jelly is the following.
   </p>
   
  -<pre>
  +<source>
       OutputStream output = new FileOutputStream("demopage.html");
       JellyContext context = new JellyContext();
   
  @@ -228,13 +228,13 @@
       XMLOutput xmlOutput = XMLOutput.createXMLOutput(output);
       context.runScript("src/test/org/apache/commons/jelly/demos/"+template), xmlOutput);
           xmlOutput.flush();
  -</pre>
  +</source>
   
   <p>
   The Jelly template looks like this:
   </p>
   
  -<pre>
  +<source>
      &lt;?xml version="1.0"?&gt;
      &lt;j:jelly trim="false" xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:html="jelly:html"&gt;
        &lt;html&gt;
  @@ -253,7 +253,7 @@
          &lt;/body&gt;
        &lt;/html&gt;
      &lt;/j:jelly&gt;
  -</pre>
  +</source>
   
   <p>
   As you can see, it's pretty straighforward to call a Jelly script programatically. First
you need a context to run the script in. You can think of the context as the "environment"
in which the script runs. The script can use and modify variables in the context however it
wishes. Then you need an XML output stream where the output of the script will be sent. In
some cases, like this one, the XML output is the essential product of the script. In other
cases, it may just be a "byproduct" of running the script, used for logging, etc. This is
the case when you are running a maven build, for example.
  @@ -270,14 +270,14 @@
   <section name="Transforming XML With JSL">
   
   <p>
  -With the <a href="tags.html#jelly:jsl">JSL tag library</a>, you can transform
XML documents in an XSLT-like manner.
  +With the <a href="libs/jsl/tags.html">JSL tag library</a>, you can transform
XML documents in an XSLT-like manner.
   </p>
   
   <p>
  -To run the demo type "maven demo:jsl" (View the <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/jsl/example.jelly?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">demo
source</a>). The demo transforms the demo source into HTML and ouputs it to the command
line, like this:
  +To run the demo type "maven demo:jsl" (View the <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons/jelly/jelly-tags/jsl/src/test/org/apache/commons/jelly/tags/jsl/example.jelly?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">demo
source</a>). The demo transforms the demo source into HTML and ouputs it to the command
line, like this:
   </p>
   
  -<pre>
  +<source>
      &lt;html&gt;
        &lt;body&gt;
          &lt;h1&gt;Output&lt;/h1&gt;
  @@ -289,14 +289,14 @@
          &lt;/small&gt;
        &lt;/body&gt;
      &lt;/html&gt;
  -</pre>
  +</source>
   
   <p>
   Of course, this HTML could just as easly be going to a file or out to a browser in a HTTP
response.
   </p>
   
   <p>
  -If you look at the <a href="tags.html#jelly:jsl">JSL tag library</a> documentation,
you'll see that the JSL taglib consists of a mere four tags: style, template, stylesheet,
and applyTemplates. Since many of the standard XSLT tags are already part of other Jelly taglibs,
such as forEach and choose, these are the only others we really need. Moreover, much of the
power of XSLT comes with using XPath expressions, which are natively supported by Jelly.
  +If you look at the <a href="libs/jsl/tags.html">JSL tag library</a> documentation,
you'll see that the JSL taglib consists of a mere four tags: style, template, stylesheet,
and applyTemplates. Since many of the standard XSLT tags are already part of other Jelly taglibs,
such as forEach and choose, these are the only others we really need. Moreover, much of the
power of XSLT comes with using XPath expressions, which are natively supported by Jelly.
   </p>
   
   <p>
  @@ -310,20 +310,20 @@
   <section name="Parsing HTML">
   
   <p>
  -This demo demonstrates the use the handy parse tag in the <A HREF="tags.html#jelly:html">HTML
tag library</A>
  +This demo demonstrates the use the handy parse tag in the <A HREF="libs/html/tags.html">HTML
tag library</A>
   </p>
   
   <p>
  -To run the demo type "maven demo:html" (View the <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/html/example.jelly?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">demo
source</a>).
  +To run the demo type "maven demo:html" (View the <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons/jelly/jelly-tags/html/src/test/org/apache/commons/jelly/tags/html/example.jelly?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">demo
source</a>).
   </p>
   
   <p>
   As you can see in the demo script, parsing an HTML file is simple:
   </p>
   
  -<pre>
  +<source>
       &lt;html:parse var="doc" html="index.html"/&gt;
  -</pre>
  +</source>
   
   <p>
   Once you have parsed the document you can treat it the same way as a parsed XML document,
i.e. applying JSL transformations, querying the document with XPath expressions, and so on.
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message