You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@tcl.apache.org by da...@apache.org on 2003/06/11 17:18:34 UTC

cvs commit: tcl-site/presentations/apache-tcl .htaccess common.tcl conclusion.rvt index.rvt intro.rvt order.txt outputproc.rvt style.css about-apache.rvt apache-1.3.rvt apache-architecture.rvt apache-introduction.rvt apache-platform.rvt arch arch.png c-code1.png c-code2.png c-code3.png channelstruct.rvt child-init.rvt configcode.rvt configuration.rvt confs confs.png dirconfig.rvt dowhile.tcl embed-tcl-solution.rvt embed-tcl.rvt embed-tcl.tcl example1.tcl further-information.rvt global-data.rvt globals.tcl handler-problems.rvt handlers.rvt init-handler.rvt module-struct.rvt namespace-pages.rvt namespaces.tcl normal-tcl-scripts.rvt plan.txt rivetexample.rvt serverconfig.rvt simple-handler.rvt simplehandler.c tcl-c-features.rvt tcl-connector.png tcl-example-1.rvt tcl-example-2.rvt tcl-features.rvt tcl-intro.rvt tcl-namespaces.rvt tcl-scripting.rvt userconfig.rvt writing-modules.rvt

davidw      2003/06/11 08:18:34

  Modified:    presentations/apache-tcl .htaccess common.tcl conclusion.rvt
                        index.rvt intro.rvt order.txt outputproc.rvt
                        style.css
  Removed:     presentations/apache-tcl about-apache.rvt apache-1.3.rvt
                        apache-architecture.rvt apache-introduction.rvt
                        apache-platform.rvt arch arch.png c-code1.png
                        c-code2.png c-code3.png channelstruct.rvt
                        child-init.rvt configcode.rvt configuration.rvt
                        confs confs.png dirconfig.rvt dowhile.tcl
                        embed-tcl-solution.rvt embed-tcl.rvt embed-tcl.tcl
                        example1.tcl further-information.rvt
                        global-data.rvt globals.tcl handler-problems.rvt
                        handlers.rvt init-handler.rvt module-struct.rvt
                        namespace-pages.rvt namespaces.tcl
                        normal-tcl-scripts.rvt plan.txt rivetexample.rvt
                        serverconfig.rvt simple-handler.rvt simplehandler.c
                        tcl-c-features.rvt tcl-connector.png
                        tcl-example-1.rvt tcl-example-2.rvt
                        tcl-features.rvt tcl-intro.rvt tcl-namespaces.rvt
                        tcl-scripting.rvt userconfig.rvt
                        writing-modules.rvt
  Log:
  Reverted to old files... cleaned up mess.
  
  Revision  Changes    Path
  1.4       +0 -1      tcl-site/presentations/apache-tcl/.htaccess
  
  Index: .htaccess
  ===================================================================
  RCS file: /home/cvs/tcl-site/presentations/apache-tcl/.htaccess,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- .htaccess	9 Jun 2003 15:14:06 -0000	1.3
  +++ .htaccess	11 Jun 2003 15:18:33 -0000	1.4
  @@ -1,4 +1,3 @@
  -
   RivetUserConf BeforeScript "source [file join [pwd] common.tcl]"
   
   
  
  
  
  1.7       +1 -3      tcl-site/presentations/apache-tcl/common.tcl
  
  Index: common.tcl
  ===================================================================
  RCS file: /home/cvs/tcl-site/presentations/apache-tcl/common.tcl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- common.tcl	9 Jun 2003 15:14:07 -0000	1.6
  +++ common.tcl	11 Jun 2003 15:18:33 -0000	1.7
  @@ -14,13 +14,11 @@
   
       proc ::makeindex {} {
   	puts "<ul>"
  -	set i 0
   	foreach fl [getorder] {
  -	    set flttml "$fl.rvt?index=$i"
  +	    set flttml "$fl.rvt"
   	    puts [subst {
   		<li style="font-size:small ; list-style-type:square ; list-style-image: none"><a href="$flttml">$fl</a></li>
   	    }]
  -	    incr i
   	}
   	puts "</ul>"
       }
  
  
  
  1.3       +11 -16    tcl-site/presentations/apache-tcl/conclusion.rvt
  
  Index: conclusion.rvt
  ===================================================================
  RCS file: /home/cvs/tcl-site/presentations/apache-tcl/conclusion.rvt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- conclusion.rvt	9 Jun 2003 15:14:07 -0000	1.2
  +++ conclusion.rvt	11 Jun 2003 15:18:33 -0000	1.3
  @@ -8,23 +8,18 @@
     <body>
       <? prevnext "<h1>Conclusion</h1>" ?>
   
  -    <p>Unfortunately, within a limited time, it's impossible to cover
  -    all the intricacies and possibilities that Apache and Tcl offer,
  -    but I hope to have shown that using these two systems lets you do
  -    some very powerful things.  </p>
  +    <p>Thanks for listening!</p>
   
  -    <p>It may not seem like it in just an hour, but Rivet is
  -    simple. It is less than 5000 lines of code, and yet it provides
  -    most of what PHP does, with easily 1/10th the code.  It does this
  -    by carefully reutilizing everything it can from Apache and
  -    Tcl.</p>
  -
  -    <p>
  -      I hope that by showing you some of what is possible, you will be
  -      able to further explore, and hopefully create something new and
  -      interesting!
  +    <p>More information is available here:
       </p>
  +    <ul>
  +      <li><a href="http://tcl.apache.org">http://tcl.apache.org</a></li>
  +      <li><a href="http://www.tcl.tk">http://www.tcl.tk</a></li>
  +    </ul>
  +    <p>I can be reached at <a
  +	href="mailto:davidw@dedasys.com">davidw@dedasys.com</a> -
  +	please feel free to write.</p>
   
  -    <?footer?>
  -  </body>
  +  <?footer?>
  +</body>
   </html>
  
  
  
  1.3       +1 -1      tcl-site/presentations/apache-tcl/index.rvt
  
  Index: index.rvt
  ===================================================================
  RCS file: /home/cvs/tcl-site/presentations/apache-tcl/index.rvt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.rvt	9 Jun 2003 15:14:07 -0000	1.2
  +++ index.rvt	11 Jun 2003 15:18:34 -0000	1.3
  @@ -6,7 +6,7 @@
     </head>
   
     <body class="splash">
  -    <? prevnext {<img src="logo.gif" alt="Apache Tcl"></img>} ?>
  +    <? prevnext {<h1 align="center" class="splash">Apache Tcl</h1>} ?>
   
       <h2 align="center" class="splash">David N. Welton</h2>
       <p align="center">
  
  
  
  1.3       +9 -10     tcl-site/presentations/apache-tcl/intro.rvt
  
  Index: intro.rvt
  ===================================================================
  RCS file: /home/cvs/tcl-site/presentations/apache-tcl/intro.rvt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- intro.rvt	9 Jun 2003 15:14:07 -0000	1.2
  +++ intro.rvt	11 Jun 2003 15:18:34 -0000	1.3
  @@ -1,21 +1,20 @@
   <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
   <html>
     <head>
  -    <title></title>
  +    <title>Introduction</title>
       <link rel="stylesheet" href="style.css">
     </head>
   
     <body>
  -    <? prevnext "<h1>Introduction</h1>" ?>
  +    <? prevnext "<h1>Apache Tcl Introduction</h1>" ?>
   
  -    Apache's web server and Tcl are both very flexible systems that
  -    give the programmer tools to extend and modify them in
  -    interesting, unique and powerful ways.  We will talk about the
  -    many possibilities offered by Apache and Tcl's C API's, briefly
  -    introduce the Tcl programming language and its concept of acting
  -    as a command language for lower-level components, and also discuss
  -    some interesting aspects of integrating Apache and Tcl.
  +    Apache Tcl is, of course, the name for the projects which have the
  +    Apache web server and Tcl language in common, but more than that, we
  +    have all arrived at this junction between Apache and Tcl because we
  +    have found it to be the optimal solution.
   
  -    <?footer?>
  +    <p align="center"><img src="prato.jpg" alt="Prato della Valle"></p>
  +
  +    <? footer ?>
     </body>
   </html>
  
  
  
  1.5       +30 -31    tcl-site/presentations/apache-tcl/order.txt
  
  Index: order.txt
  ===================================================================
  RCS file: /home/cvs/tcl-site/presentations/apache-tcl/order.txt,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- order.txt	9 Jun 2003 15:14:07 -0000	1.4
  +++ order.txt	11 Jun 2003 15:18:34 -0000	1.5
  @@ -1,35 +1,34 @@
   index
   intro
  -apache-introduction
  -about-apache
  -apache-platform
  -tcl-intro
  -tcl-scripting
  -tcl-features
  -tcl-c-features
  -tcl-example-1
  -tcl-example-2
  -apache-1.3
  -writing-modules
  -apache-architecture
  -module-struct
  -init-handler
  -child-init
  -configuration
  -configcode
  -serverconfig
  -dirconfig
  -userconfig
  -handlers
  -simple-handler
  -handler-problems
  -namespace-pages
  -tcl-namespaces
  -global-data
  -embed-tcl
  -embed-tcl-solution
  -normal-tcl-scripts
  -channelstruct
  +survey
  +apache1
  +apache2
  +tcl1
  +ousterhout
  +tclfeatures
  +goodlanguage
  +tclweb
  +tclwebhistory
  +tclexample1
  +bored
  +apache_tcl
  +current_products
  +mod_dtcl
  +neowebscript
  +mod_tcl
  +websh
  +rivet
  +rivetexample1
  +strategies
  +rivetexample2
  +anotherphoto
  +integration
  +tclcoverview
  +initialization
  +servingpages
  +tclchannels
   outputproc
  +apachec
  +integration2
   conclusion
  -further-information
  +end
  \ No newline at end of file
  
  
  
  1.3       +15 -13    tcl-site/presentations/apache-tcl/outputproc.rvt
  
  Index: outputproc.rvt
  ===================================================================
  RCS file: /home/cvs/tcl-site/presentations/apache-tcl/outputproc.rvt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- outputproc.rvt	9 Jun 2003 15:14:07 -0000	1.2
  +++ outputproc.rvt	11 Jun 2003 15:18:34 -0000	1.3
  @@ -1,31 +1,33 @@
   <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
   <html>
     <head>
  -    <title>Tcl Channel Output</title>
  +    <title>Channel output proc</title>
       <link rel="stylesheet" href="style.css">
     </head>
   
     <body>
  -    <? prevnext "<h1>Tcl Channel Output</h1>" ?>
  +    <? prevnext "<h1>Channel output proc</h1>" ?>
   
  -   <pre>
  -<span class="keyword">static</span> <span class="type">int</span>
  -<span class="function-name">outputproc</span>(ClientData instancedata, CONST84 <span class="type">char</span> *<span class="variable-name">buf</span>, <span class="type">int</span>
  -<span class="variable-name">toWrite</span>, <span class="type">int</span> *<span class="variable-name">errorCodePtr</span>)
  +    <p>A small example of the junction where Tcl and Apache meet.</p>
  +
  +    <pre>
  +static int
  +outputproc(ClientData instancedata, char *buf,
  +           int toWrite, int *errorCodePtr)
   {
       rivet_server_conf *rsc = (rivet_server_conf *)instancedata;
       rivet_interp_globals *globals =
  -	Tcl_GetAssocData(rsc-&gt;server_interp, <span class="string">&quot;rivet&quot;</span>, NULL);
  +	Tcl_GetAssocData(rsc->server_interp, "rivet", NULL);
   
  -    TclWeb_PrintHeaders(globals-&gt;req);
  -    <span class="keyword">if</span> (globals-&gt;req-&gt;content_sent == 0)
  +    TclWeb_PrintHeaders(globals->req);
  +    if (globals->req->content_sent == 0)
       {
  -	ap_rwrite(buf, toWrite, globals-&gt;r);
  -	ap_rflush(globals-&gt;r);
  +	ap_rwrite(buf, toWrite, globals->r);
  +	ap_rflush(globals->r);
       }
  -    <span class="keyword">return</span> toWrite;
  +    return toWrite;
   }
  -</pre>
  +    </pre>
   
       <?footer?>
     </body>
  
  
  
  1.6       +5 -36     tcl-site/presentations/apache-tcl/style.css
  
  Index: style.css
  ===================================================================
  RCS file: /home/cvs/tcl-site/presentations/apache-tcl/style.css,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- style.css	9 Jun 2003 15:14:07 -0000	1.5
  +++ style.css	11 Jun 2003 15:18:34 -0000	1.6
  @@ -10,9 +10,7 @@
   
   body.splash {
       font-size: 300%;
  -    #    background: url(logo.gif);
  -    background-position: bottom center;
  -    background-repeat: no-repeat;
  +    background: url(logo.gif);
   }
   
   
  @@ -31,6 +29,10 @@
       margin-bottom: 0.5em;
   }
   
  +pre {
  +    font-weight: bold;
  +}
  +
   #UL LI { list-style-image: url(bullet1.png) }
   #UL UL LI { list-style-image: url(bullet2.png) }
   
  @@ -74,36 +76,3 @@
       padding: 0.25em;
       background-color: #dddddd;
   }
  -
  -pre {
  -    font-weight: bold;
  -    color: #ffffff;
  -    background-color: #000000;
  -    margin: 1em;
  -    padding: 1em;
  -}
  -
  -span.string {
  -    color: #696969;
  -}
  -
  -span.function-name {
  -    color: #87cefa;
  -}
  -
  -span.keyword {
  -    color: #00ffff;
  -}
  -
  -span.comment {
  -    color: #ff7f24;
  -} /* font-lock-comment-face */
  -span.variable-name {
  -    color: #228b22;
  -} /* font-lock-variable-name-face */
  -span.type {
  -    color: #4682b4;
  -} /* font-lock-type-face */
  -span.builtin {
  -    color: #b0c4de;
  -} /* font-lock-builtin-face */
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org