commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dmi...@apache.org
Subject cvs commit: jakarta-commons/jxpath/xdocs/stylesheets project.xml
Date Wed, 26 Feb 2003 01:45:01 GMT
dmitri      2003/02/25 17:45:01

  Modified:    jxpath   STATUS.html project.xml
               jxpath/src/java/org/apache/commons/jxpath/ri/model/dynamic
                        DynamicPropertyPointer.java
               jxpath/xdocs release-notes-1.1.xml
               jxpath/xdocs/stylesheets project.xml
  Log:
  B2 build preparations
  
  Revision  Changes    Path
  1.8       +9 -3      jakarta-commons/jxpath/STATUS.html
  
  Index: STATUS.html
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/STATUS.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- STATUS.html	25 Jun 2002 22:46:15 -0000	1.7
  +++ STATUS.html	26 Feb 2003 01:45:01 -0000	1.8
  @@ -54,7 +54,7 @@
   <h3>
   3. RELEASE INFO</h3>
   Current Release: <b>1.0</b>
  -<p>Planned Next Release: <b>1.1, timeframe: 1 August, 2002</b>
  +<p>Planned Next Release: <b>1.1, timeframe: 1 March, 2003</b>
   <p>See the
   <a href="#Action Items">Action Items</a> list for tasks that
   need to be completed prior to this release.
  @@ -80,18 +80,24 @@
   <th WIDTH="80%">Action Item</th>
   
   <th WIDTH="20%">Volunteer</th>
  +
  +<td><b>Status</b></td>
   </tr>
   
   <tr>
   <td>Support for DynaBeans.</td>
   
  -<td ALIGN=CENTER>Dmitri Plotnikov</td>
  +<td>Dmitri Plotnikov</td>
  +
  +<td>Done</td>
   </tr>
   
   <tr>
   <td>Support for JDOM</td>
   
   <td>Dmitri Plotnikov</td>
  +
  +<td>Done</td>
   </tr>
   </table>
   
  
  
  
  1.11      +7 -7      jakarta-commons/jxpath/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/project.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- project.xml	11 Jan 2003 05:41:21 -0000	1.10
  +++ project.xml	26 Feb 2003 01:45:01 -0000	1.11
  @@ -4,16 +4,16 @@
     <extend>../project.xml</extend>
     <name>JXPath</name>
     <id>commons-jxpath</id>
  -  <currentVersion>1.1-alpha</currentVersion>
  +  <currentVersion>1.1b2</currentVersion>
     <inceptionYear>2001</inceptionYear>
     <shortDescription>XPath for Java Objects</shortDescription>
     <description>A package of Java utility methods for accessing and modifying object
properties</description>
   
     <versions>
       <version>
  -      <id>b1</id>
  -      <name>1.1-a1</name>
  -      <tag>JXPATH_1_1_A1</tag>
  +      <id>b2</id>
  +      <name>1.1-b2</name>
  +      <tag>JXPATH_1_1_B2</tag>
       </version>
     </versions>
   
  @@ -43,12 +43,12 @@
       </dependency>
       <dependency>
         <id>junit</id>
  -      <type>required</type>
  -      <version>3.7</version>
  +      <!-- type>required</type-->
  +      <version>3.8</version>
       </dependency>
       <dependency>
         <id>ant+optional</id>
  -      <version>1.4.1</version>
  +      <version>1.5.1</version>
       </dependency>
       <dependency>
         <id>xml-apis</id>
  
  
  
  1.3       +17 -6     jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPropertyPointer.java
  
  Index: DynamicPropertyPointer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPropertyPointer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DynamicPropertyPointer.java	11 Jan 2003 05:41:26 -0000	1.2
  +++ DynamicPropertyPointer.java	26 Feb 2003 01:45:01 -0000	1.3
  @@ -62,6 +62,7 @@
   package org.apache.commons.jxpath.ri.model.dynamic;
   
   import java.util.Arrays;
  +import java.util.Map;
   
   import org.apache.commons.jxpath.AbstractFactory;
   import org.apache.commons.jxpath.DynamicPropertyHandler;
  @@ -289,17 +290,27 @@
   
       public void remove() {
           if (index == WHOLE_COLLECTION) {
  -            handler.setProperty(getBean(), getPropertyName(), null);
  +            removeKey();
           }
           else if (isCollection()) {
               Object collection = ValueUtils.remove(getBaseValue(), index);
               handler.setProperty(getBean(), getPropertyName(), collection);
           }
           else if (index == 0) {
  -            handler.setProperty(getBean(), getPropertyName(), null);
  +            removeKey();
           }
       }
   
  +    private void removeKey() {
  +        Object bean = getBean();
  +        if (bean instanceof Map) {
  +            ((Map) bean).remove(getPropertyName());
  +        }
  +        else {
  +            handler.setProperty(bean, getPropertyName(), null);
  +        }
  +    }
  +    
       public String asPath() {
           StringBuffer buffer = new StringBuffer();
           buffer.append(getParent().asPath());
  
  
  
  1.3       +19 -15    jakarta-commons/jxpath/xdocs/release-notes-1.1.xml
  
  Index: release-notes-1.1.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/xdocs/release-notes-1.1.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- release-notes-1.1.xml	29 Jan 2003 18:11:05 -0000	1.2
  +++ release-notes-1.1.xml	26 Feb 2003 01:45:01 -0000	1.3
  @@ -1,13 +1,16 @@
  -<?xml version="1.0"?>
  +<?xml version="1.0" encoding="UTF-8"?>
   <document>
  -   <properties>
  -      <title>Contributors</title>
  -      <author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author>
  -      <author email="dmitri@apache.org">Dmitri Plotnikov</author>
  -      <revision>$Id$</revision>
  -   </properties>
  +  <properties>
  +    <title>
  +       JXPath Release Notes 1.1
  +    </title>
  +    <author email="dmitri@apache.org">
  +       Dmitri Plotnikov
  +    </author>
  +  </properties>
  +
  +  <body>
   
  -   <body>
     <section name="JXPath 1.1 Release Notes">
       <p>
         Most changes in 1.1 are in the internal implementation and do not affect
  @@ -44,14 +47,14 @@
             The <code>format-number</code> XSLT function is now supported.
             In order to provide full conformance with the standard, we also
             needed to introduce the format customization mechanism known in
  -          XSLT as <code>&amp;lt;xsl:decimal-format&amp;gt;</code> (see
  +          XSLT as <code>&lt;xsl:decimal-format&gt;</code> (see
             <a href="http://www.w3schools.com/xsl/el_decimal-format.asp">
             W3Schools tutorial</a>).  The new methods of JXPathContext:
             <code>setDecimalFormatSymbols</code> and
             <code>getDecimalFormatSymbols</code> fulfill that requirement.
           </li>
           <li>
  -          The <code>attribute::</code> axis is now supported for models other
than
  +          The <code>attribute::</code> axis is now supported models other than
             DOM/JDOM.  For beans and maps it is interpreted the same way as
             the <code>"child::"</code> axis.
           </li>
  @@ -74,10 +77,11 @@
        </p>
   
       </section>
  +
       <section name="Acknowledgements">
         <p>
           Great thanks to everybody who reported problems, helped to trace them,
  -        suggested changes or simply provided encouragement. Special thanks to
  +        suggested changed or simply provided encouragement. Special thanks to
           <ul>
             <li>Trond Aasan</li>
             <li>Bjorn Bength</li>
  @@ -96,7 +100,7 @@
             <li>Per Kreipke</li>
             <li>Kees Kuip</li>
             <li>David Li</li>
  -          <li>Ulrich Nicolas Lisse</li>
  +          <li>Ulrich Nicolas Lissé</li>
             <li>Costin Manolache</li>
             <li>Thorsten Mauch</li>
             <li>Craig R. McClanahan</li>
  @@ -117,7 +121,7 @@
           </ul>
           Thanks!
         </p>
  -    </section>
   
  -   </body>
  -</document>
  +    </section>
  +  </body>
  +</document>
  \ No newline at end of file
  
  
  
  1.8       +7 -7      jakarta-commons/jxpath/xdocs/stylesheets/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jxpath/xdocs/stylesheets/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	7 Feb 2003 00:51:40 -0000	1.7
  +++ project.xml	26 Feb 2003 01:45:01 -0000	1.8
  @@ -10,7 +10,7 @@
       -->
       <body>
          <menu name="Home">
  -           <item name="Jakarta&amp;nbsp;Commons"          href="http://jakarta.apache.org/commons/index.html"
/>
  +           <item name="Jakarta Commons"          href="http://jakarta.apache.org/commons/index.html"
/>
              <item name="JXPath"                        href="/index.html" />
          </menu>
          <menu name="Information">
  @@ -18,15 +18,15 @@
              <item name="Overview"                      href="/overview.html"/>
              <item name="News"                          href="http://jakarta.apache.org/commons/pool/news.html"/>
   -->
  -           <item name="Client API&amp;nbsp;Documentation"   href="/apidocs/org/apache/commons/jxpath/package-summary.html"/>
  -           <item name="Complete API&amp;nbsp;Docs"        href="/apidocs/index.html"/>
  +           <item name="Client API Documentation"   href="/apidocs/org/apache/commons/jxpath/package-summary.html"/>
  +           <item name="Complete API Docs"        href="/apidocs/index.html"/>
              <item name="User's Guide"                  href="/users-guide.html"/>
              <!-- item name="JXPath Design"                 href="/design.html"/ -->
          </menu>
          <menu name="Project Files">
              <item name="Status"                        href="http://cvs.apache.org/viewcvs/~checkout~/jakarta-commons/jxpath/STATUS.html?content-type=text/html"/>
              <item name="CVS"                           href="http://cvs.apache.org/viewcvs/jakarta-commons/jxpath/"/>
  -           <item name="Original&amp;nbsp;Proposal"        href="http://cvs.apache.org/viewcvs/~checkout~/jakarta-commons/jxpath/PROPOSAL.html?content-type=text/html"/>
  +           <item name="Original Proposal"        href="http://cvs.apache.org/viewcvs/~checkout~/jakarta-commons/jxpath/PROPOSAL.html?content-type=text/html"/>
          </menu>
          <menu name="Downloads">
              <item name="Release"                       href="http://jakarta.apache.org/builds/jakarta-commons/release/commons-jxpath/"/>
  @@ -37,9 +37,9 @@
              <item name="License"                       href="http://jakarta.apache.org/commons/license.html"/>
          </menu>
          <menu name="Jakarta Community">
  -           <item name="Get&amp;nbsp;Involved"             href="http://jakarta.apache.org/site/getinvolved.html"/>
  -           <item name="Mailing&amp;nbsp;Lists"            href="http://jakarta.apache.org/site/mail.html"/>
  -           <item name="CVS&amp;nbsp;Repositories"         href="http://jakarta.apache.org/site/cvsindex.html"/>
  +           <item name="Get Involved"             href="http://jakarta.apache.org/site/getinvolved.html"/>
  +           <item name="Mailing Lists"            href="http://jakarta.apache.org/site/mail.html"/>
  +           <item name="CVS Repositories"         href="http://jakarta.apache.org/site/cvsindex.html"/>
          </menu>
       </body>
   </project>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message