remm        01/09/24 14:56:31

  Modified:    src/wrappers/catalina server.xml
               src/wrappers/catalina/root index.jsp
               src/wrappers/catalina/root/WEB-INF web.xml
               src/wrappers/catalina/root/WEB-INF/classes
                        slide-root.properties
  Log:
  - Update the welcome webapp.
  - Add some setup instructions.
  - Remove Struts debug info.
  - Known issue: The default namespace name isn't displayed. The namespace
    name in the admin webapp isn't either. I wasn't able to find the cause of the
    problem.
  
  Revision  Changes    Path
  1.6       +1 -1      jakarta-slide/src/wrappers/catalina/server.xml
  
  Index: server.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/wrappers/catalina/server.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- server.xml        2001/09/24 08:17:09     1.5
  +++ server.xml        2001/09/24 21:56:31     1.6
  @@ -3,7 +3,7 @@
     <Listener className="wrappers.catalina.SlideServerListener" />
   
     <!-- Define the Tomcat Stand-Alone Service -->
  -  <Service name="Slide-Tomcat Standalone">
  +  <Service name="Slide Tomcat">
   
       <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
       <Connector className="org.apache.catalina.connector.http.HttpConnector"
  
  
  
  1.3       +15 -4     jakarta-slide/src/wrappers/catalina/root/index.jsp
  
  Index: index.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/wrappers/catalina/root/index.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.jsp 2001/09/24 08:44:24     1.2
  +++ index.jsp 2001/09/24 21:56:31     1.3
  @@ -51,16 +51,27 @@
   
               <hr>
   
  -            <bean:message key="manager-conf.text"/>
  -            <br>
  -            <bean:message key="slide-conf.text"/>
  +            <ul>
  +              <li><bean:message key="manager-conf.text"/></li>
  +              <li><bean:message key="slide-conf.text"/></li>
  +            </ul>
   
  +            <hr>
  +            <bean:message key="domain.text"/>
  +            <hr>
  +
               <slide:domain id="domain">
  +
  +               <bean:message key="defaultnamespace.text"/><bean:write name="domain" 
property="defaultNamespace" filter="true"/>
               
                  <logic:iterate id="name" name="domain" property="namespaceNames">
                     <hr>
                     <bean:message key="namespace.label"/><bean:write name="name" 
filter="true"/>
  -                  <a href='<bean:write name="name" filter="true"/>'><bean:message 
key="browse.label"/></a>
  +                  <ul>
  +                     <li><a href='<bean:write name="name" 
filter="true"/>'><bean:message key="browse.label"/></a> <bean:message 
key="view.text"/><bean:write name="name" filter="true"/></li>
  +                     <li><bean:message key="edit.text"/><bean:write name="name" 
filter="true"/></li>
  +                     <li><bean:message key="admin.text"/><bean:write name="name" 
filter="true"/></li>
  +                  </ul>
                     <hr>
                     
                  </logic:iterate>
  
  
  
  1.2       +0 -33     jakarta-slide/src/wrappers/catalina/root/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/wrappers/catalina/root/WEB-INF/web.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- web.xml   2001/09/24 08:17:09     1.1
  +++ web.xml   2001/09/24 21:56:31     1.2
  @@ -6,27 +6,6 @@
   
   <web-app>
     
  -  <!-- Context Initialization Parameters
  -       
  -       Use these parameters to specify the path to the domain configuration 
  -       file and the specific namespace to use, if necessary.
  -       
  -       If you don't specify the domain parameter, it is assumed that the 
  -       domain will already be initialized when this context is started, or 
  -       that you've specified the path to the domain configuration file in 
  -       slide.properties.
  -       
  -       If you don't specify the namespace parameter, the default namespace will
  -       be used, if available. -->
  -  <!-- context-param>
  -    <param-name>domain</param-name>
  -    <param-value>/Domain.xml</param-value>
  -  </context-param -->
  -  <!-- context-param>
  -    <param-name>namespace</param-name>
  -    <param-value>slide</param-value>
  -  </context-param -->
  -  
     <!-- Action Servlet Configuration -->
     <servlet>
       <servlet-name>action</servlet-name>
  @@ -41,18 +20,6 @@
       </init-param>
       <init-param>
         <param-name>nocache</param-name>
  -      <param-value>true</param-value>
  -    </init-param>
  -    <init-param>
  -      <param-name>debug</param-name>
  -      <param-value>0</param-value>
  -    </init-param>
  -    <init-param>
  -      <param-name>detail</param-name>
  -      <param-value>2</param-value>
  -    </init-param>
  -    <init-param>
  -      <param-name>validate</param-name>
         <param-value>true</param-value>
       </init-param>
       <load-on-startup>2</load-on-startup>
  
  
  
  1.2       +9 -4      
jakarta-slide/src/wrappers/catalina/root/WEB-INF/classes/slide-root.properties
  
  Index: slide-root.properties
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/wrappers/catalina/root/WEB-INF/classes/slide-root.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- slide-root.properties     2001/09/24 08:17:09     1.1
  +++ slide-root.properties     2001/09/24 21:56:31     1.2
  @@ -1,6 +1,6 @@
   # general
  -app.title=Slide Main
  -app.welcome=Welcome to Slide 1.0.15.
  +app.title=Apache Slide 1.0.15
  +app.welcome=Welcome to Apache Slide.
   home.title=Home
   namespace.label=Namespace: 
   browse.label=View
  @@ -8,8 +8,13 @@
   administer.label=Admin
   
   # messages
  -manager-conf.text=To access the Tomcat manager web application, you must edit the 
conf/tomcat-users.xml file, and define a user with role manager.
  -slide-conf.text=To edit or administer a Slide namespace, you must properly 
configure one user with root privileges. For example, it can be done for the default 
namespace by editing the conf/slide/slide.data file and uncommenting the indicated 
element.
  +domain.text=The Slide Domain contains the following namespaces:
  +manager-conf.text=To access the Tomcat manager web application, the 
conf/tomcat-users.xml file must be edited, and a user with role manager must be 
defined.
  +slide-conf.text=To edit or administer a Slide namespace, one user with root 
privileges should be present in the namespace. For example, it can be done for the 
default namespace by editing the conf/slide/slide.data file and uncommenting the 
indicated element.
  +view.text= namespace, by accessing port 8080 using the path /
  +edit.text=After completing the configuration steps described above, the namespace 
can be edited using WebDAV by any user defined in the namespace by accessing port 8081 
using the path /
  +admin.text=After completing the configuration steps described above, the namespace 
can be administered by accessing port 8082 using the path /
  +defaultnamespace.text=Default namespace:
   
   # doc
   doc.title=Doc
  
  
  

Reply via email to