hlship      2003/04/07 11:17:35

  Modified:    .        Readme.html
               web      faq.html new.html
               config/jboss/deploy/jbossweb.sar/META-INF jboss-service.xml
               framework/src/org/apache/tapestry/parse Tapestry_1_4.dtd
  Log:
  Update demo deployment to use JBoss 3.0.6.
  
  Revision  Changes    Path
  1.87      +4 -4      jakarta-tapestry/Readme.html
  
  Index: Readme.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/Readme.html,v
  retrieving revision 1.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- Readme.html	29 Mar 2003 18:49:12 -0000	1.86
  +++ Readme.html	7 Apr 2003 18:17:34 -0000	1.87
  @@ -58,7 +58,7 @@
   <ul>
   <li><a href="http://sf.net/projects/jetty">Jetty</a> servlet container, release 4.2 or above.
   <li><a href="http://jakarta.apache.org/tomcat/index.html">Tomcat</a> servlet container, release 4.1 or above.
  -<li><a href="http://www.jboss.org">JBoss</a> application server, release 3.0.4. 
  +<li><a href="http://www.jboss.org">JBoss</a> application server, release 3.0.6. 
           Running the Virtual Library application&nbsp;requires JBoss.</li>         
   
   </ul>
  @@ -86,9 +86,9 @@
   <p>To run the Tapestry Workbench and the Virtual Library applications with the 
   <a href="http://sourceforge.net/projects/jboss">JBoss</a> server:
   			<ul>
  -				<li>Download and install <a href="http://prdownloads.sourceforge.net/jboss/jboss-3.0.4.zip?download">JBoss 3.0.4</a>.
  +				<li>Download and install <a href="http://prdownloads.sourceforge.net/jboss/jboss-3.0.6.zip?download">JBoss 3.0.6</a>.
   				<br>JBoss is an open-source application server, used to run the database and Enterprise JavaBeans in the Virtual Library.
  -<p><span class="hyper-em">This auto-configuration requires JBoss 3.0.4 exactly, not a later release.  
  +<p><span class="hyper-em">This auto-configuration requires JBoss 3.0.6 exactly, not a later release.  
   This only affects these turn-key
   demos, not deployment of your own Tapestry applications.</span></p>
   				<li>
  
  
  
  1.13      +1 -1      jakarta-tapestry/web/faq.html
  
  Index: faq.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/web/faq.html,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- faq.html	30 Mar 2003 17:04:39 -0000	1.12
  +++ faq.html	7 Apr 2003 18:17:34 -0000	1.13
  @@ -173,7 +173,7 @@
               turn-key demonstrations. You can download Tapestry and JBoss 
               and have a real J2EE application running in about a minute! 
               The scripts that configure JBoss are sensitive to the particular 
  -            release of JBoss, it must be release 3.0.4.
  +            release of JBoss, it must be release 3.0.6.
   			
   			<p>However, Tapestry 
               applications are 100% container agnostic ... Tapestry doesn't care 
  
  
  
  1.150     +2 -1      jakarta-tapestry/web/new.html
  
  Index: new.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/web/new.html,v
  retrieving revision 1.149
  retrieving revision 1.150
  diff -u -r1.149 -r1.150
  --- new.html	3 Apr 2003 03:41:56 -0000	1.149
  +++ new.html	7 Apr 2003 18:17:34 -0000	1.150
  @@ -22,6 +22,7 @@
   <li><a href="doc/ComponentReference/Shell.html">Shell</a> comp;onent now allows multiple stylesheets.</li>
   <li>Added a <a href="doc/api/org/apache/tapestry/util/io/DataSqueezer.html">DataSqueezer</a> adaptor for
   <code>Enum</code> types.</li>
  +<li>Switch over to using JBoss 3.0.6</li>
   </ul>
   
   <pre>
  
  
  
  1.3       +49 -80    jakarta-tapestry/config/jboss/deploy/jbossweb.sar/META-INF/jboss-service.xml
  
  Index: jboss-service.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/config/jboss/deploy/jbossweb.sar/META-INF/jboss-service.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jboss-service.xml	17 Jan 2003 17:38:33 -0000	1.2
  +++ jboss-service.xml	7 Apr 2003 18:17:34 -0000	1.3
  @@ -11,7 +11,7 @@
        | environment.
      -->
   
  -  <mbean code="org.jboss.jetty.JettyService" name="jboss.web:service=JBossWeb">
  +  <mbean code="org.jboss.jetty.JettyService" name="jboss.web:service=WebServer">
   
       <!-- ================================================================= -->
       <!-- Your webdefault.xml file - The default settings for every webapp  -->
  @@ -38,6 +38,15 @@
       <attribute name="Java2ClassLoadingCompliance">true</attribute>
   
       <!-- ================================================================= -->
  +    <!-- If you require JAAS authentication, configure the name of the     -->
  +    <!-- attribute in which you expect to find the JAAS active subject:    -->
  +    <!--                                                                   -->
  +    <!-- Commenting out this configuration will disable JAAS support       -->
  +    <!-- ================================================================= -->
  +
  +    <attribute name="SubjectAttributeName">j_subject</attribute>
  +
  +    <!-- ================================================================= -->
       <!-- Configuring Jetty. The XML fragment contained in the              -->
       <!-- name="ConfigurationElement" attribute is a Jetty-style            -->
       <!-- configuration specification.  It is used to configure Jetty with  -->
  @@ -126,6 +135,7 @@
       </Call>
     </Call>
   
  +
          <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
          <!-- Add and configure a NIO HTTP listener to port 8888              -->
          <!-- This listener should be used to replace the standard HTTP       -->
  @@ -159,96 +169,55 @@
   
          <!-- ======================================================= -->
          <!-- New Distributed Session Manager                         -->
  -       <!-- (This will all soon be published via JMX interface too) -->
          <!-- ======================================================= -->
   
  -       <Set name="DistributableHttpSessionManagerClass">org.mortbay.j2ee.session.Manager</Set>
  -
  -      <!-- THESE ARE ALTERNATIVES - uncomment one and it will be used as the default -->
  -
  -      <!-- this interceptor stack is for an EXTENDED session using JavaGroups -->
  -      <!-- you will need the 'all' config -->
  -      <Set name="DistributableHttpSessionStoreClass">org.mortbay.j2ee.session.JGStore</Set>
  -      <Set name="DistributableHttpSessionInterceptorClasses">
  -       <New class="java.util.ArrayList">
  -        <Call name="add"><Arg>org.mortbay.j2ee.session.ValidationInterceptor</Arg></Call>
  -        <Call name="add"><Arg>org.mortbay.j2ee.session.TypeCheckingInterceptor</Arg></Call>
  -        <Call name="add"><Arg>org.mortbay.j2ee.session.BindingInterceptor</Arg></Call>
  -        <Call name="add"><Arg>org.mortbay.j2ee.session.MarshallingInterceptor</Arg></Call>
  -        <Call name="add"><Arg>org.mortbay.j2ee.session.SynchronizationInterceptor</Arg></Call>
  -       </New>
  -      </Set>
  -     <!--
  -     -->
  +       <!--
  +       These can be set on a per webapp basis in WEB-INF/jetty-web.xml
  +       -->
   
  -     <!-- this interceptor stack is for an EXTENDED session using a CMP EJB -->
  -     <!-- you will need to setup the dds in jbossweb-ejbs.jar, according to your installation -->
  -     <!--
  -     <Set name="DistributableHttpSessionStoreClass">org.mortbay.j2ee.session.CMPStore</Set>
  -      <Set name="DistributableHttpSessionInterceptorClasses">
  -       <New class="java.util.ArrayList">
  -        <Call name="add"><Arg>org.mortbay.j2ee.session.TransactionInterceptor</Arg></Call>
  -        <Call name="add"><Arg>org.jboss.jetty.session.SecurityInterceptor</Arg></Call>
  -        <Call name="add"><Arg>org.mortbay.j2ee.session.ValidationInterceptor</Arg></Call>
  -        <Call name="add"><Arg>org.mortbay.j2ee.session.TypeCheckingInterceptor</Arg></Call>
  -        <Call name="add"><Arg>org.mortbay.j2ee.session.BindingInterceptor</Arg></Call>
  -        <Call name="add"><Arg>org.mortbay.j2ee.session.MarshallingInterceptor</Arg></Call>
  +      <Set name="DistributableSessionManagerPrototype">
  +       <New class="org.mortbay.j2ee.session.Manager">
  +        <Set name="scavengerPeriod">600</Set>
  +        <!-- NYI
  +        <Set name="workerName">node1</Set>
  +        -->
  +        <Set name="interceptorStack">
  +         <Array type="org.mortbay.j2ee.session.StateInterceptor">
  +<!--
  +          <Item><New class="org.mortbay.j2ee.session.DebugInterceptor"/></Item>
  +-->
  +          <Item><New class="org.mortbay.j2ee.session.ValidatingInterceptor"/></Item>
  +          <Item><New class="org.mortbay.j2ee.session.TypeCheckingInterceptor"/></Item>
  +          <Item><New class="org.mortbay.j2ee.session.BindingInterceptor"/></Item>
  +          <Item><New class="org.mortbay.j2ee.session.PublishingInterceptor"/></Item>
  +          <Item><New class="org.mortbay.j2ee.session.SubscribingInterceptor"/></Item>
  +          <Item><New class="org.mortbay.j2ee.session.SynchronizingInterceptor"/></Item>
  +         </Array>
  +        </Set>
  +        <!-- Put this back in for distributable support under 'all' configuration
  +        <Set name="store">
  +         <New class="org.mortbay.j2ee.session.JGStore">
  +          <Set name="actualMaxInactiveInterval">604800</Set>
  +          <Set name="scavengerPeriod">3600</Set>
  +          <Set name="scavengerExtraTime">900</Set>
  +          <Set name="protocolStack">UDP(mcast_addr=228.8.8.8;mcast_port=45566;ip_ttl=32;ucast_recv_buf_size=16000;ucast_send_buf_size=16000;mcast_send_buf_size=32000;mcast_recv_buf_size=64000;loopback=true):PING(timeout=2000;num_initial_members=3):MERGE2(min_interval=5000;max_interval=10000):FD_SOCK:VERIFY_SUSPECT(timeout=1500):pbcast.STABLE(desired_avg_gossip=20000):pbcast.NAKACK(gc_lag=50;retransmit_timeout=300,600,1200,2400,4800;max_xmit_size=8192):UNICAST(timeout=2000):FRAG(frag_size=8192;down_thread=false;up_thread=false):pbcast.GMS(join_timeout=5000;join_retry_timeout=2000;shun=false;print_local_addr=true):pbcast.STATE_TRANSFER</Set>
  +          <Set name="subClusterName">DefaultSubCluster</Set>
  +          <Set name="retrievalTimeOut">20000</Set>
  +          <Set name="distributionTimeOut">5000</Set>
  +          <Set name="distributionMode">GET_ALL</Set>
  +         </New>
  +        </Set>
  +        -->
          </New>
         </Set>
  -     -->
   
  -      <!-- For testing DistributableHttpSessionManager with Watchdog -->
  +      <!-- For testing the Distributable SessionManager with e.g. Watchdog -->
         <!--
  -       <Set name="Distributable">true</Set>
  +      <Set name="forceDistributable">true</Set>
         -->
   
  -       <!-- ====================================== -->
  -       <!-- also needed for distributable sessions -->
  -       <!-- ====================================== -->
  -
  -       <!--
  -       These can be set on a per webapp basis in WEB-INF/jetty-web.xml
  -       -->
  -
  -       <!--
  -       If someone specifies -1 for their maxInactiveInterval - how
  -       long should we REALLY leave the session before GC ? a week,
  -       a year, ... (in seconds) - a week
  -       -->
  -       <Set name="HttpSessionActualMaxInactiveInterval">604800</Set>
  -
  -       <!--
  -       How regularly should we GC locally held distributable sessions ?
  -       (in seconds)... - every 10 mins
  -       -->
  -       <Set name="LocalHttpSessionScavengePeriod">600</Set>
  -
  -       <!--
  -       How regularly should we GC distributable sessions with no
  -       locally held counterpart (in seconds)? - 1 hour
  -       -->
  -       <Set name="DistributableHttpSessionScavengePeriod">3600</Set>
  -
  -       <!--
  -       How much older than it's maxInactiveInterval should the
  -       distributable counterpart of a session be, before it is
  -       GC-ed by the ditributable-scavenger ? This should always be
  -       MORE than the local scavenge period, so that a session is
  -       GC-ed locally first.(in seconds) - every 15 mins
  -       -->
  -       <Set name="DistributableHttpSessionScavengeOffset">900</Set>
  -
         </Configure>
        </attribute>
  -
  -    <!-- ================================================================= -->
  -    <!-- If you require JAAS authentication, configure the name of the     -->
  -    <!-- attribute in which you expect to find the JAAS active subject:    -->
  -    <!--                                                                   -->
  -    <!-- Commenting out this configuration will disable JAAS support       -->
  -    <!-- ================================================================= -->
  -
  -    <attribute name="SubjectAttributeName">j_subject</attribute>
   
     </mbean>
   
  
  
  
  1.3       +1 -1      jakarta-tapestry/framework/src/org/apache/tapestry/parse/Tapestry_1_4.dtd
  
  Index: Tapestry_1_4.dtd
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/parse/Tapestry_1_4.dtd,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Tapestry_1_4.dtd	23 Mar 2003 23:18:30 -0000	1.2
  +++ Tapestry_1_4.dtd	7 Apr 2003 18:17:34 -0000	1.3
  @@ -465,7 +465,7 @@
       
   -->
   
  -<!ELEMENT property-specification EMPTY>
  +<!ELEMENT property-specification (#PCDATA)>
   <!ATTLIST property-specification
     name CDATA #REQUIRED
     type CDATA #IMPLIED