vmassol     2003/08/10 07:00:54

  Modified:    samples/servlet/src/scripts/j2ee12 Tag: CACTUS_15_BRANCH
                        build.properties
               samples/servlet Tag: CACTUS_15_BRANCH
                        build.properties.sample
               samples/servlet/src/scripts/j2ee13 Tag: CACTUS_15_BRANCH
                        build.properties
               .        Tag: CACTUS_15_BRANCH build.properties.sample
               documentation/docs/xdocs Tag: CACTUS_15_BRANCH testedon.xml
  Log:
  Merged from HEAD
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.9.2.2   +2 -2      
jakarta-cactus/samples/servlet/src/scripts/j2ee12/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/samples/servlet/src/scripts/j2ee12/build.properties,v
  retrieving revision 1.9.2.1
  retrieving revision 1.9.2.2
  diff -u -r1.9.2.1 -r1.9.2.2
  --- build.properties  9 Aug 2003 14:59:16 -0000       1.9.2.1
  +++ build.properties  10 Aug 2003 14:00:54 -0000      1.9.2.2
  @@ -38,5 +38,5 @@
   #cactus.home.tomcat4x = c:/Apps/jakarta-tomcat-4.1.24
   #cactus.home.tomcat5x = c:/Apps/jakarta-tomcat-5.0.3
   #cactus.home.orion1x = c:/Apps/orion-1.6.0
  -#cactus.home.orion2x = c:/Apps/orion-2.0.1
  +#cactus.home.orion2x = c:/Apps/orion-2.0.2
   #cactus.home.weblogic7x = c:/bea/weblogic700
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.9.2.2   +2 -2      jakarta-cactus/samples/servlet/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/samples/servlet/build.properties.sample,v
  retrieving revision 1.9.2.1
  retrieving revision 1.9.2.2
  diff -u -r1.9.2.1 -r1.9.2.2
  --- build.properties.sample   9 Aug 2003 14:59:16 -0000       1.9.2.1
  +++ build.properties.sample   10 Aug 2003 14:00:54 -0000      1.9.2.2
  @@ -52,7 +52,7 @@
   #cactus.home.tomcat4x = c:/Apps/jakarta-tomcat-4.1.24
   #cactus.home.tomcat5x = c:/Apps/jakarta-tomcat-5.0.3
   #cactus.home.orion1x = c:/Apps/orion-1.6.0
  -#cactus.home.orion2x = c:/Apps/orion-2.0.1
  +#cactus.home.orion2x = c:/Apps/orion-2.0.2
   #cactus.home.jboss3x = c:/Apps/jboss-3.2.1
   #cactus.home.weblogic7x = c:/bea/weblogic700
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.8.2.2   +2 -2      
jakarta-cactus/samples/servlet/src/scripts/j2ee13/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/samples/servlet/src/scripts/j2ee13/build.properties,v
  retrieving revision 1.8.2.1
  retrieving revision 1.8.2.2
  diff -u -r1.8.2.1 -r1.8.2.2
  --- build.properties  9 Aug 2003 14:59:16 -0000       1.8.2.1
  +++ build.properties  10 Aug 2003 14:00:54 -0000      1.8.2.2
  @@ -43,6 +43,6 @@
   #cactus.home.tomcat4x = c:/Apps/jakarta-tomcat-4.1.24
   #cactus.home.tomcat5x = c:/Apps/jakarta-tomcat-5.0.3
   #cactus.home.orion1x = c:/Apps/orion-1.6.0
  -#cactus.home.orion2x = c:/Apps/orion-2.0.1
  +#cactus.home.orion2x = c:/Apps/orion-2.0.2
   #cactus.home.jboss3x = c:/Apps/jboss-3.2.1
   #cactus.home.weblogic7x = c:/bea/weblogic700
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.78.2.2  +2 -2      jakarta-cactus/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/build.properties.sample,v
  retrieving revision 1.78.2.1
  retrieving revision 1.78.2.2
  diff -u -r1.78.2.1 -r1.78.2.2
  --- build.properties.sample   9 Aug 2003 14:49:33 -0000       1.78.2.1
  +++ build.properties.sample   10 Aug 2003 14:00:54 -0000      1.78.2.2
  @@ -163,7 +163,7 @@
   #cactus.home.tomcat4x = c:/Apps/jakarta-tomcat-4.1.24
   #cactus.home.tomcat5x = c:/Apps/jakarta-tomcat-5.0.3
   #cactus.home.orion1x = c:/Apps/orion-1.6.0
  -#cactus.home.orion2x = c:/Apps/orion-2.0.1
  +#cactus.home.orion2x = c:/Apps/orion-2.0.2
   #cactus.home.jboss3x = c:/Apps/jboss-3.2.1
   #cactus.home.weblogic7x = c:/bea/weblogic700
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.38.2.2  +2 -1      jakarta-cactus/documentation/docs/xdocs/testedon.xml
  
  Index: testedon.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/testedon.xml,v
  retrieving revision 1.38.2.1
  retrieving revision 1.38.2.2
  diff -u -r1.38.2.1 -r1.38.2.2
  --- testedon.xml      9 Aug 2003 15:56:47 -0000       1.38.2.1
  +++ testedon.xml      10 Aug 2003 14:00:54 -0000      1.38.2.2
  @@ -108,10 +108,11 @@
             </tr>
             <tr>
               <td>Orion</td>
  -            <td>1.6.0b, 2.0.1</td>
  +            <td>1.6.0b, 2.0.1, 2.0.2</td>
               <td>1.2, 1.3</td>
               <td>
                 Does <strong>not</strong> work under JDK version 1.4 or later
  +              but works with JDK 1.3.1.
               </td>
             </tr>
             <tr>
  
  
  

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

Reply via email to