taylor      2004/04/22 11:12:34

  Modified:    .        INSTALL INSTALL-WAR
               xdocs    changes.xml psml_db.xml
  Added:       .        TODO-RELEASE-1.5.txt
  Log:
  step #3 of release completed
  
  Revision  Changes    Path
  1.9       +6 -14     jakarta-jetspeed/INSTALL
  
  Index: INSTALL
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/INSTALL,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- INSTALL   17 Mar 2004 20:04:40 -0000      1.8
  +++ INSTALL   22 Apr 2004 18:12:33 -0000      1.9
  @@ -43,13 +43,9 @@
   1. Build Jetspeed
   -----------------------
   
  -cd <jetspeedRoot>/build
  +cd <jetspeedRoot>
   
  -[Win32/DOS] .\build war
  -
  -[Win32/cygnus] bash build.sh war
  -
  -[unix] ./build.sh war
  +maven war
   
   ----------------------------------------
   2. Get a Servlet 2.2 runner (container) 
  @@ -67,9 +63,9 @@
   4. Copy the Jetspeed WAR file to the Tomcat webapps directory
   ---------------------------------------------------------------
   
  -[Win32]  copy <jetspeedRoot>\bin\jetspeed.war <tomcat_home>\webapps\
  +[Win32]  copy <jetspeedRoot>\target\jetspeed.war <tomcat_home>\webapps\
   
  -[Unix]   cp <jetspeedRoot>/bin/jetspeed.war <tomcat_home>/webapps/
  +[Unix]   cp <jetspeedRoot>/target/jetspeed.war <tomcat_home>/webapps/
   
   
   
  @@ -131,11 +127,9 @@
     Sybase
      
   Jetspeed is distributed with a populated Hypersonic-SQL database. 
  -This database is selected as the default database in the 
  -Torque.properties file. 
   
  -To configure Jetspeed with a different database, modify the 
  -Torque.properties file. 
  +To configure Jetspeed with a different database, modify BOTH, the 
  +project.properties file in the Jetspeed root directory and the 
webapp/WEB-INF/conf/Torque.properties file. 
   
   Here is an example for MySQL:
   
  @@ -145,8 +139,6 @@
   torque.dsfactory.default.connection.user =  root
   torque.dsfactory.default.connection.password = 
   
  -
  -The Torque.properties file can be found in /webapp/WEB-INF/conf.
   
   The database scripts for setting up the database are included with the 
   source code distribution, under the src/sql/external folder. 
  
  
  
  1.7       +4 -10     jakarta-jetspeed/INSTALL-WAR
  
  Index: INSTALL-WAR
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/INSTALL-WAR,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- INSTALL-WAR       17 Mar 2004 20:04:40 -0000      1.6
  +++ INSTALL-WAR       22 Apr 2004 18:12:33 -0000      1.7
  @@ -48,9 +48,9 @@
   3. Copy the Jetspeed WAR file to the Tomcat webapps directory
   ---------------------------------------------------------------
   
  -[Win32]  copy <jetspeedRoot>\jetspeed.war <tomcat_home>\webapps\
  +[Win32]  copy <jetspeedRoot>\target\jetspeed.war <tomcat_home>\webapps\
   
  -[Unix]   cp <jetspeedRoot>/jetspeed.war <tomcat_home>/webapps/
  +[Unix]   cp <jetspeedRoot>/target/jetspeed.war <tomcat_home>/webapps/
   
   
   ----------------
  @@ -110,12 +110,8 @@
     Postgres
     Sybase
      
  -Jetspeed is distributed with a populated Hypersonic-SQL database. 
  -This database is selected as the default database in the 
  -Torque.properties file. 
  -
  -To configure Jetspeed with a different database, modify the 
  -Torque.properties file. 
  +To configure Jetspeed with a different database, modify BOTH, the 
  +project.properties file in the Jetspeed root directory and the 
webapp/WEB-INF/conf/Torque.properties file. 
   
   Here is an example for MySQL:
   
  @@ -124,8 +120,6 @@
   torque.dsfactory.default.connection.url = jdbc:mysql://localhost:3306/jetspeed
   torque.dsfactory.default.connection.user =  root
   torque.dsfactory.default.connection.password = 
  -
  -The Torque.properties file can be found in /webapp/WEB-INF/conf.
   
   The database scripts for setting up the database are included with the 
   source code distribution, under the src/sql/external folder. 
  
  
  
  1.1                  jakarta-jetspeed/TODO-RELEASE-1.5.txt
  
  Index: TODO-RELEASE-1.5.txt
  ===================================================================
  Copyright 2004 The Apache Software Foundation
  
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
  
      http://www.apache.org/licenses/LICENSE-2.0
  
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
  
  Task List for Jetspeed 1.5.1
  ---------------------------------------
  
         - Bug List - Fix all major and critical bugs
         - Cleanup All Documentation
         - Finish DB Registry implementation
         - LDAP Service - finish up
         - Deprecate ECS
         - Portlet event model + inter-portlet communication model
         - Secure portlet actions
         - Remove Build directory
         - Remove Torque in build directory, its been replaced by the Torque plugin
       
  
  
  
  
  
  1.187     +19 -1     jakarta-jetspeed/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
  retrieving revision 1.186
  retrieving revision 1.187
  diff -u -r1.186 -r1.187
  --- changes.xml       5 Apr 2004 20:05:59 -0000       1.186
  +++ changes.xml       22 Apr 2004 18:12:34 -0000      1.187
  @@ -27,6 +27,24 @@
     </properties>
   
   <body>
  +<section name="Changes since version 1.5">
  +<ul>
  +<!--
  +***
  +*** Format of change entry. The entry should be appended to the list.
  +*** Note: Optional text is inclosed in []
  +***
  +<li>
  +  action (add/remove/update/fix) - [Bug # xxx -] date - description (committer's 
initials) [Thanks to developer_name]
  +</li>
  +-->
  +</ul>
  +
  +<!-- This is the bottom of "changes since 1.5 which is NOT current.  Add
  +     changes to the current version!
  +-->
  +</section>
  +
   <section name="Changes since version 1.4">
   <ul>
   <!--
  
  
  
  1.9       +1 -2      jakarta-jetspeed/xdocs/psml_db.xml
  
  Index: psml_db.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/xdocs/psml_db.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- psml_db.xml       22 Apr 2004 17:20:33 -0000      1.8
  +++ psml_db.xml       22 Apr 2004 18:12:34 -0000      1.9
  @@ -147,8 +147,7 @@
                        Then you are ready to create the DB-PSML tables as described 
above.
                        </p>
                        <p>
  -                     Jetspeed also needs to be configured to access any other 
database besides Hypersonic. You do this by editing the file <b>project.properties</b> 
  -            in the root directory of the Jetspeed source.
  +                     Jetspeed also needs to be configured to access any other 
database besides Hypersonic. You do this by editing the file 
<b>webapp/WEB-INF/conf/Torque.properties</b>             
                   The default settings are:
                        </p>
                  <source>              
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to