commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: jakarta-commons/jelly/jelly-tags/sql/src/test/org/apache/commons/jelly/tags/sql TestJUnit.java
Date Thu, 09 Sep 2004 12:16:06 GMT
dion        2004/09/09 05:16:06

  Modified:    jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql
                        DataSourceWrapper.java ParamTag.java QueryTag.java
                        RowTag.java TransactionTag.java SqlTagLibrary.java
                        DriverTag.java ResultSetTag.java UpdateTag.java
                        ResultImpl.java DateParamTag.java
                        DataSourceUtil.java SetDataSourceTag.java
                        SqlTagSupport.java
               jelly/jelly-tags/quartz/src/java/org/apache/commons/jelly/tags/quartz
                        QuartzTagLibrary.java QuartzTagSupport.java
                        CronTriggerTag.java WaitForSchedulerTag.java
                        TriggerTag.java JellyJob.java JobTag.java
               jelly/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap
                        InvokeTag.java SoapTagLibrary.java
               jelly/jelly-tags/sql/src/java/javax/servlet/jsp/jstl/sql
                        Result.java ResultSupport.java ResultImpl.java
                        SQLExecutionTag.java
               jelly/jelly-tags/sql/src/test/org/apache/commons/jelly/tags/sql
                        TestJUnit.java
  Log:
  Fix license file whitespace
  
  Revision  Changes    Path
  1.4       +4 -4      jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/DataSourceWrapper.java
  
  Index: DataSourceWrapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/DataSourceWrapper.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DataSourceWrapper.java	25 Feb 2004 01:31:57 -0000	1.3
  +++ DataSourceWrapper.java	9 Sep 2004 12:16:03 -0000	1.4
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,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.
  @@ -30,7 +30,7 @@
   /**
    * <p>A simple <code>DataSource</code> wrapper for the standard
    * <code>DriverManager</code> class.
  - * 
  + *
    * @author Hans Bergsten
    */
   public class DataSourceWrapper implements DataSource {
  
  
  
  1.5       +6 -6      jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/ParamTag.java
  
  Index: ParamTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/ParamTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ParamTag.java	25 Feb 2004 01:31:57 -0000	1.4
  +++ ParamTag.java	9 Sep 2004 12:16:03 -0000	1.5
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,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.
  @@ -25,18 +25,18 @@
   /**
    * <p>Tag handler for &lt;Param&gt; in JSTL, used to set
    * parameter values for a SQL statement.</p>
  - * 
  + *
    * @author Hans Bergsten
    */
   
   public class ParamTag extends TagSupport {
       protected Object value;
   
  -    
  +
       public void setValue(Object value) {
           this.value = value;
       }
  -    
  +
       //*********************************************************************
       // Tag logic
   
  
  
  
  1.5       +15 -15    jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/QueryTag.java
  
  Index: QueryTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/QueryTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- QueryTag.java	25 Feb 2004 01:31:57 -0000	1.4
  +++ QueryTag.java	9 Sep 2004 12:16:03 -0000	1.5
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,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.
  @@ -32,8 +32,8 @@
   
   
   /**
  - * <p>Tag handler for &lt;Query&gt; in JSTL.  
  - * 
  + * <p>Tag handler for &lt;Query&gt; in JSTL.
  + *
    * @author Hans Bergsten
    * @author Justyna Horwat
    */
  @@ -127,7 +127,7 @@
           String sqlStatement = null;
   
           log.debug( "About to lookup connection" );
  -        
  +
           ResultSet rs = null;
           Statement statement = null;
           try {
  @@ -153,7 +153,7 @@
                   throw new JellyTagException(Resources.getMessage("PARAM_BAD_VALUE"));
               }
   
  -            /* 
  +            /*
                * Note! We must not use the setMaxRows() method on the
                * the statement to limit the number of rows, since the
                * Result factory must be able to figure out the correct
  @@ -163,24 +163,24 @@
               if ( log.isDebugEnabled() ) {
                   log.debug( "About to execute query: " + sqlStatement );
               }
  -            
  +
               if ( hasParameters() ) {
                   PreparedStatement ps = conn.prepareStatement(sqlStatement);
                   statement = ps;
  -                setParameters(ps);            
  +                setParameters(ps);
                   rs = ps.executeQuery();
               }
               else {
                   statement = conn.createStatement();
                   rs = statement.executeQuery(sqlStatement);
               }
  -            
  +
               result = new ResultImpl(rs, startRow, maxRows);
               context.setVariable(var, result);
  -            
  -            // always close the result set first since it may be closed by 
  -            // JDBC 3 when closing statements 
  -            
  +
  +            // always close the result set first since it may be closed by
  +            // JDBC 3 when closing statements
  +
               // lets nullify before we close in case we get exceptions
               // while closing, we don't want to try to close again
               ResultSet tempRs = rs;
  @@ -200,7 +200,7 @@
                   }
                   catch (SQLException e) {
                       log.error("Caught exception while closing result set: " + e, e);
  -                } 
  +                }
               }
               if (statement != null) {
                   try {
  
  
  
  1.5       +7 -7      jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/RowTag.java
  
  Index: RowTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/RowTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- RowTag.java	25 Feb 2004 01:31:57 -0000	1.4
  +++ RowTag.java	9 Sep 2004 12:16:03 -0000	1.5
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,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.
  @@ -20,14 +20,14 @@
   import org.apache.commons.jelly.XMLOutput;
   
   /**
  - * Adds a new row to a parent &lt;resultSet&gt; Tag. 
  + * Adds a new row to a parent &lt;resultSet&gt; Tag.
    * This tag is useful for unit testing with Mock Tags to simulate the results returned by databases.
  - * 
  + *
    */
   public class RowTag extends MapTagSupport {
  -    
  +
       // Tag interface
  -    //------------------------------------------------------------------------- 
  +    //-------------------------------------------------------------------------
       public void doTag(XMLOutput output) throws JellyTagException {
           ResultSetTag tag = (ResultSetTag) findAncestorWithClass( ResultSetTag.class );
           if ( tag == null ) {
  
  
  
  1.5       +6 -6      jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/TransactionTag.java
  
  Index: TransactionTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/TransactionTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TransactionTag.java	25 Feb 2004 01:31:57 -0000	1.4
  +++ TransactionTag.java	9 Sep 2004 12:16:03 -0000	1.5
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,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.
  @@ -27,8 +27,8 @@
   import org.apache.commons.jelly.tags.Resources;
   
   /**
  - * <p>Tag handler for &lt;Transaction&gt; in JSTL.  
  - * 
  + * <p>Tag handler for &lt;Transaction&gt; in JSTL.
  + *
    * @author Hans Bergsten
    */
   
  @@ -122,7 +122,7 @@
               throw new JellyTagException(e);
           }
   
  -        // lets commit          
  +        // lets commit
           try {
               conn.commit();
           }
  
  
  
  1.4       +5 -5      jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/SqlTagLibrary.java
  
  Index: SqlTagLibrary.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/SqlTagLibrary.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SqlTagLibrary.java	25 Feb 2004 01:31:57 -0000	1.3
  +++ SqlTagLibrary.java	9 Sep 2004 12:16:03 -0000	1.4
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,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.
  @@ -33,7 +33,7 @@
           registerTag("setDataSource", SetDataSourceTag.class);
           registerTag("transaction", TransactionTag.class);
           registerTag("update", UpdateTag.class);
  -        
  +
           // extension tags for Mock Tags support
           registerTag("resultSet", ResultSetTag.class);
           registerTag("row", RowTag.class);
  
  
  
  1.5       +5 -5      jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/DriverTag.java
  
  Index: DriverTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/DriverTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DriverTag.java	25 Feb 2004 01:31:57 -0000	1.4
  +++ DriverTag.java	9 Sep 2004 12:16:03 -0000	1.5
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,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.
  @@ -23,7 +23,7 @@
   /**
    * <p>Tag handler for &lt;Driver&gt; in JSTL, used to create
    * a simple DataSource for prototyping.</p>
  - * 
  + *
    * @author Hans Bergsten
    */
   public class DriverTag extends TagSupport {
  @@ -111,7 +111,7 @@
       private String getPassword() {
           return getInitParameter(PASSWORD);
       }
  -    
  +
       protected String getInitParameter(String key) {
           return "";
       }
  
  
  
  1.5       +14 -14    jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/ResultSetTag.java
  
  Index: ResultSetTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/ResultSetTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ResultSetTag.java	25 Feb 2004 01:31:57 -0000	1.4
  +++ ResultSetTag.java	9 Sep 2004 12:16:03 -0000	1.5
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,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.
  @@ -25,39 +25,39 @@
   import org.apache.commons.jelly.XMLOutput;
   
   /**
  - * This Tag creates a result set object based on its body content via child row tags. 
  + * This Tag creates a result set object based on its body content via child row tags.
    * This tag is useful for unit testing with Mock Tags to simulate the results returned by databases.
  - * 
  + *
    */
   public class ResultSetTag extends TagSupport {
  -    
  +
       private List rows;
       private String var;
  -    
  -    /** 
  +
  +    /**
        * Adds the given row to the list of rows
        */
       public void addRow(Map row) {
           rows.add(row);
  -    }                    
  -    
  +    }
  +
       // Tag interface
  -    //------------------------------------------------------------------------- 
  +    //-------------------------------------------------------------------------
       public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
           if (var == null) {
               throw new MissingAttributeException( "var" );
           }
           rows = new ArrayList();
           invokeBody(output);
  -        
  +
           // now lets create a new Result implementation
           ResultImpl results = new ResultImpl( rows );
           context.setVariable(var, results);
           rows = null;
       }
  -    
  +
       // Properties
  -    //------------------------------------------------------------------------- 
  +    //-------------------------------------------------------------------------
       /**
        * Sets the variable to export the result set to.
        */
  
  
  
  1.5       +6 -6      jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/UpdateTag.java
  
  Index: UpdateTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/UpdateTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- UpdateTag.java	25 Feb 2004 01:31:57 -0000	1.4
  +++ UpdateTag.java	9 Sep 2004 12:16:03 -0000	1.5
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,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.
  @@ -28,8 +28,8 @@
   import org.apache.commons.logging.LogFactory;
   
   /**
  - * <p>Tag handler for &lt;Update&gt; in JSTL.  
  - * 
  + * <p>Tag handler for &lt;Update&gt; in JSTL.
  + *
    * @author Hans Bergsten
    * @author Justyna Horwat
    */
  @@ -38,7 +38,7 @@
   
       /** The Log to which logging calls will be made. */
       private static final Log log = LogFactory.getLog(UpdateTag.class);
  -    
  +
       /*
        * Instance variables that are not for attributes
        */
  
  
  
  1.4       +15 -15    jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/ResultImpl.java
  
  Index: ResultImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/ResultImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ResultImpl.java	25 Feb 2004 01:31:57 -0000	1.3
  +++ ResultImpl.java	9 Sep 2004 12:16:03 -0000	1.4
  @@ -1,18 +1,18 @@
   /*
    * Copyright 2002,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.
  - */ 
  + */
   
   package org.apache.commons.jelly.tags.sql;
   
  @@ -22,8 +22,8 @@
   
   /**
    * <p>This class creates a cached version of a <tt>ResultSet</tt>.
  - * It's represented as a <tt>Result</tt> implementation, capable of 
  - * returing an array of <tt>Row</tt> objects containing a <tt>Column</tt> 
  + * It's represented as a <tt>Result</tt> implementation, capable of
  + * returing an array of <tt>Row</tt> objects containing a <tt>Column</tt>
    * instance for each column in the row.</p>
    *
    * <p>Note -- this is a private copy for the RI to avoid making the
  @@ -51,7 +51,7 @@
        */
       public ResultImpl(ResultSet rs, int startRow, int maxRows)
           throws SQLException {
  -            
  +
           rowMap = new ArrayList();
           rowByIndex = new ArrayList();
   
  @@ -73,11 +73,11 @@
           int processedRows = 0;
           while (rs.next()) {
               if ((maxRows != -1) && (processedRows == maxRows)) {
  -                isLimited = true; 
  +                isLimited = true;
                   break;
               }
               Object[] columns = new Object[noOfColumns];
  -            SortedMap columnMap = 
  +            SortedMap columnMap =
                   new TreeMap(String.CASE_INSENSITIVE_ORDER);
   
               // JDBC uses 1 as the lowest index!
  @@ -102,7 +102,7 @@
        * @param listOfMaps is a list of Maps where a Map represents a Row keyed by the column name
        */
       public ResultImpl(List listOfMaps) {
  -            
  +
           rowMap = new ArrayList();
           rowByIndex = new ArrayList();
           isLimited = false;
  @@ -113,21 +113,21 @@
               Map row = (Map) iter.next();
               keySet.addAll( row.keySet() );
           }
  -        
  +
           // Create the column name array
           int noOfColumns = keySet.size();
  -        columnNames = new String[noOfColumns];        
  +        columnNames = new String[noOfColumns];
           int i = 0;
           for (Iterator iter = keySet.iterator(); iter.hasNext(); i++ ) {
               columnNames[i] = (String) iter.next();
           }
  -        
  +
           // Now add each row to the result set
           for (Iterator iter = listOfMaps.iterator(); iter.hasNext(); ) {
               Map row = (Map) iter.next();
  -            
  +
               Object[] columns = new Object[noOfColumns];
  -            SortedMap columnMap = 
  +            SortedMap columnMap =
                   new TreeMap(String.CASE_INSENSITIVE_ORDER);
   
               for (i = 0; i < noOfColumns; i++) {
  
  
  
  1.5       +5 -5      jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/DateParamTag.java
  
  Index: DateParamTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/DateParamTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DateParamTag.java	25 Feb 2004 01:31:57 -0000	1.4
  +++ DateParamTag.java	9 Sep 2004 12:16:03 -0000	1.5
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,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.
  @@ -27,7 +27,7 @@
   /**
    * <p>Tag handler for &lt;Param&gt; in JSTL, used to set
    * parameter values for a SQL statement.</p>
  - * 
  + *
    * @author Justyna Horwat
    */
   
  @@ -54,7 +54,7 @@
   
       //*********************************************************************
       // Properties
  -    
  +
       public void setValue(Date value) {
           this.value = value;
       }
  
  
  
  1.5       +4 -4      jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/DataSourceUtil.java
  
  Index: DataSourceUtil.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/DataSourceUtil.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DataSourceUtil.java	25 Feb 2004 01:31:57 -0000	1.4
  +++ DataSourceUtil.java	9 Sep 2004 12:16:03 -0000	1.5
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,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.
  @@ -33,7 +33,7 @@
    * <code>DriverManager</code> class.
    *
    * TO DO: need to cache DataSource
  - * 
  + *
    * @author Justyna Horwat
    */
   public class DataSourceUtil {
  
  
  
  1.5       +4 -4      jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/SetDataSourceTag.java
  
  Index: SetDataSourceTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/SetDataSourceTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SetDataSourceTag.java	25 Feb 2004 01:31:57 -0000	1.4
  +++ SetDataSourceTag.java	9 Sep 2004 12:16:03 -0000	1.5
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,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.
  @@ -28,7 +28,7 @@
   /**
    * <p>Tag handler for &lt;SetDataSource&gt; in JSTL, used to create
    * a simple DataSource for prototyping.</p>
  - * 
  + *
    * @author Hans Bergsten
    * @author Justyna Horwat
    */
  
  
  
  1.5       +8 -8      jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/SqlTagSupport.java
  
  Index: SqlTagSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/SqlTagSupport.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SqlTagSupport.java	25 Feb 2004 01:31:57 -0000	1.4
  +++ SqlTagSupport.java	9 Sep 2004 12:16:03 -0000	1.5
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,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.
  @@ -30,8 +30,8 @@
   import org.apache.commons.jelly.tags.Resources;
   
   /**
  - * <p>Abstract base class for any SQL related tag in JSTL.  
  - * 
  + * <p>Abstract base class for any SQL related tag in JSTL.
  + *
    * @author Hans Bergsten
    * @author Justyna Horwat
    * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  @@ -99,8 +99,8 @@
        */
       public void setSql(String sql) {
           this.sql = sql;
  -    }    
  -    
  +    }
  +
   
       //*********************************************************************
       // Public utility methods
  @@ -125,7 +125,7 @@
       protected boolean hasParameters() {
           return parameters != null && parameters.size() > 0;
       }
  -    
  +
       protected void clearParameters() {
           parameters = null;
       }
  
  
  
  1.4       +3 -3      jakarta-commons/jelly/jelly-tags/quartz/src/java/org/apache/commons/jelly/tags/quartz/QuartzTagLibrary.java
  
  Index: QuartzTagLibrary.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/quartz/src/java/org/apache/commons/jelly/tags/quartz/QuartzTagLibrary.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- QuartzTagLibrary.java	25 Feb 2004 01:31:58 -0000	1.3
  +++ QuartzTagLibrary.java	9 Sep 2004 12:16:04 -0000	1.4
  @@ -2,13 +2,13 @@
   
   /*
    * Copyright 2002,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.
  
  
  
  1.4       +4 -4      jakarta-commons/jelly/jelly-tags/quartz/src/java/org/apache/commons/jelly/tags/quartz/QuartzTagSupport.java
  
  Index: QuartzTagSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/quartz/src/java/org/apache/commons/jelly/tags/quartz/QuartzTagSupport.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- QuartzTagSupport.java	25 Feb 2004 01:31:58 -0000	1.3
  +++ QuartzTagSupport.java	9 Sep 2004 12:16:04 -0000	1.4
  @@ -2,13 +2,13 @@
   
   /*
    * Copyright 2002,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.
  @@ -56,7 +56,7 @@
               final Scheduler newSched = factory.getScheduler();
   
               sched = newSched;
  -            
  +
               getContext().setVariable( SCHED_VAR_NAME,
                                         newSched );
   
  
  
  
  1.5       +7 -7      jakarta-commons/jelly/jelly-tags/quartz/src/java/org/apache/commons/jelly/tags/quartz/CronTriggerTag.java
  
  Index: CronTriggerTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/quartz/src/java/org/apache/commons/jelly/tags/quartz/CronTriggerTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CronTriggerTag.java	25 Feb 2004 01:31:58 -0000	1.4
  +++ CronTriggerTag.java	9 Sep 2004 12:16:04 -0000	1.5
  @@ -2,13 +2,13 @@
   
   /*
    * Copyright 2002,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.
  @@ -17,7 +17,7 @@
    */
   
   import java.text.ParseException;
  - 
  +
   import org.apache.commons.jelly.JellyTagException;
   import org.apache.commons.jelly.XMLOutput;
   import org.apache.commons.jelly.MissingAttributeException;
  @@ -157,9 +157,9 @@
           return this.jobGroup;
       }
   
  -    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
  +    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       //     org.apache.commons.jelly.Tag
  -    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
  +    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   
       /** Perform this tag.
        *
  @@ -205,7 +205,7 @@
           trigger.setJobName( getJobName() );
           trigger.setJobGroup( getJobGroup() );
           trigger.setStartTime( new Date() );
  -        
  +
           try {
               Scheduler sched = getScheduler();
               sched.scheduleJob( trigger );
  
  
  
  1.5       +6 -6      jakarta-commons/jelly/jelly-tags/quartz/src/java/org/apache/commons/jelly/tags/quartz/WaitForSchedulerTag.java
  
  Index: WaitForSchedulerTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/quartz/src/java/org/apache/commons/jelly/tags/quartz/WaitForSchedulerTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WaitForSchedulerTag.java	25 Feb 2004 01:31:58 -0000	1.4
  +++ WaitForSchedulerTag.java	9 Sep 2004 12:16:04 -0000	1.5
  @@ -2,13 +2,13 @@
   
   /*
    * Copyright 2002,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.
  @@ -39,14 +39,14 @@
       {
           // intentionally left blank.
       }
  -    
  +
       // ------------------------------------------------------------
       //     Instance methods
       // ------------------------------------------------------------
   
  -    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
  +    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       //     org.apache.commons.jelly.Tag
  -    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
  +    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   
       /** Perform this tag.
        *
  
  
  
  1.4       +3 -3      jakarta-commons/jelly/jelly-tags/quartz/src/java/org/apache/commons/jelly/tags/quartz/TriggerTag.java
  
  Index: TriggerTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/quartz/src/java/org/apache/commons/jelly/tags/quartz/TriggerTag.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TriggerTag.java	25 Feb 2004 01:31:58 -0000	1.3
  +++ TriggerTag.java	9 Sep 2004 12:16:04 -0000	1.4
  @@ -2,13 +2,13 @@
   
   /*
    * Copyright 2002,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.
  
  
  
  1.4       +5 -5      jakarta-commons/jelly/jelly-tags/quartz/src/java/org/apache/commons/jelly/tags/quartz/JellyJob.java
  
  Index: JellyJob.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/quartz/src/java/org/apache/commons/jelly/tags/quartz/JellyJob.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JellyJob.java	25 Feb 2004 01:31:58 -0000	1.3
  +++ JellyJob.java	9 Sep 2004 12:16:04 -0000	1.4
  @@ -2,13 +2,13 @@
   
   /*
    * Copyright 2002,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.
  @@ -47,9 +47,9 @@
       //     Instance methods
       // ------------------------------------------------------------
   
  -    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
  +    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       //     org.quartz.Job
  -    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
  +    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   
       /** Execute this job.
        *
  
  
  
  1.5       +6 -6      jakarta-commons/jelly/jelly-tags/quartz/src/java/org/apache/commons/jelly/tags/quartz/JobTag.java
  
  Index: JobTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/quartz/src/java/org/apache/commons/jelly/tags/quartz/JobTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JobTag.java	25 Feb 2004 01:31:58 -0000	1.4
  +++ JobTag.java	9 Sep 2004 12:16:04 -0000	1.5
  @@ -2,13 +2,13 @@
   
   /*
    * Copyright 2002,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.
  @@ -92,9 +92,9 @@
           return this.group;
       }
   
  -    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
  +    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       //     org.apache.commons.jelly.Tag
  -    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
  +    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   
       /** Perform this tag.
        *
  @@ -124,7 +124,7 @@
   
           data.put( "jelly.output",
                     output );
  -        
  +
           data.put( "jelly.context",
                     getContext() );
   
  
  
  
  1.5       +13 -13    jakarta-commons/jelly/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/InvokeTag.java
  
  Index: InvokeTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/InvokeTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- InvokeTag.java	25 Feb 2004 01:31:57 -0000	1.4
  +++ InvokeTag.java	9 Sep 2004 12:16:05 -0000	1.5
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,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.
  @@ -31,7 +31,7 @@
   
   /**
    * Invokes a web service
  - * 
  + *
    * @author <a href="mailto:jim@bnainc.net">James Birchfield</a>
    * @version $Revision$
    */
  @@ -43,7 +43,7 @@
       private String method = null;
       private Service service;
       private Object params;
  -    
  +
       public InvokeTag() {
       }
   
  @@ -59,7 +59,7 @@
           if (method == null) {
               throw new MissingAttributeException("method");
           }
  -        
  +
           Object[] params = getParamArray();
           if (params == null) {
               params = new Object[]{ getBodyText() };
  @@ -73,7 +73,7 @@
           if (service == null) {
               service = createService();
           }
  -        
  +
           Object answer = null;
           try {
               Call call = (Call) service.createCall();
  @@ -84,17 +84,17 @@
               call.setOperationName(new QName(namespace, method));
   
               answer = call.invoke(params);
  -        } 
  +        }
           catch (MalformedURLException e) {
               throw new JellyTagException(e);
  -        } 
  +        }
           catch (ServiceException e) {
               throw new JellyTagException(e);
           }
           catch (RemoteException e) {
               throw new JellyTagException(e);
           }
  -        
  +
           if (var != null) {
               context.setVariable(var, answer);
           }
  @@ -124,7 +124,7 @@
       public void setMethod(String method) {
           this.method = method;
       }
  -    
  +
       /**
        * Returns the service to be used by this web service invocation.
        * @return Service
  @@ -149,7 +149,7 @@
       }
   
       /**
  -     * Sets the parameters for this SOAP call. This can be an array or collection of 
  +     * Sets the parameters for this SOAP call. This can be an array or collection of
        * SOAPBodyElements or types.
        */
       public void setParams(Object params) {
  
  
  
  1.4       +4 -4      jakarta-commons/jelly/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/SoapTagLibrary.java
  
  Index: SoapTagLibrary.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/SoapTagLibrary.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SoapTagLibrary.java	25 Feb 2004 01:31:57 -0000	1.3
  +++ SoapTagLibrary.java	9 Sep 2004 12:16:05 -0000	1.4
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,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.
  
  
  
  1.5       +4 -4      jakarta-commons/jelly/jelly-tags/sql/src/java/javax/servlet/jsp/jstl/sql/Result.java
  
  Index: Result.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/java/javax/servlet/jsp/jstl/sql/Result.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Result.java	25 Feb 2004 01:31:59 -0000	1.4
  +++ Result.java	9 Sep 2004 12:16:05 -0000	1.5
  @@ -1,18 +1,18 @@
   /*
    * Copyright 2002,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.
  - */ 
  + */
   
   package javax.servlet.jsp.jstl.sql;
   
  
  
  
  1.5       +4 -4      jakarta-commons/jelly/jelly-tags/sql/src/java/javax/servlet/jsp/jstl/sql/ResultSupport.java
  
  Index: ResultSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/java/javax/servlet/jsp/jstl/sql/ResultSupport.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ResultSupport.java	25 Feb 2004 01:31:59 -0000	1.4
  +++ ResultSupport.java	9 Sep 2004 12:16:06 -0000	1.5
  @@ -1,18 +1,18 @@
   /*
    * Copyright 2002,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.
  - */ 
  + */
   
   package javax.servlet.jsp.jstl.sql;
   
  
  
  
  1.5       +9 -9      jakarta-commons/jelly/jelly-tags/sql/src/java/javax/servlet/jsp/jstl/sql/ResultImpl.java
  
  Index: ResultImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/java/javax/servlet/jsp/jstl/sql/ResultImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ResultImpl.java	25 Feb 2004 01:31:59 -0000	1.4
  +++ ResultImpl.java	9 Sep 2004 12:16:06 -0000	1.5
  @@ -1,18 +1,18 @@
   /*
    * Copyright 2002,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.
  - */ 
  + */
   
   package javax.servlet.jsp.jstl.sql;
   
  @@ -21,8 +21,8 @@
   
   /**
    * <p>This class creates a cached version of a <tt>ResultSet</tt>.
  - * It's represented as a <tt>Result</tt> implementation, capable of 
  - * returing an array of <tt>Row</tt> objects containing a <tt>Column</tt> 
  + * It's represented as a <tt>Result</tt> implementation, capable of
  + * returing an array of <tt>Row</tt> objects containing a <tt>Column</tt>
    * instance for each column in the row.   It is not part of the JSTL
    * API; it serves merely as a back-end to ResultSupport's static methods.
    * Thus, we scope its access to the package.
  @@ -48,7 +48,7 @@
        * @exception if a database error occurs
        */
       public ResultImpl(ResultSet rs, int startRow, int maxRows)
  -        throws SQLException 
  +        throws SQLException
       {
           rowMap = new ArrayList();
           rowByIndex = new ArrayList();
  @@ -71,11 +71,11 @@
           int processedRows = 0;
           while (rs.next()) {
               if ((maxRows != -1) && (processedRows == maxRows)) {
  -                isLimited = true; 
  +                isLimited = true;
                   break;
               }
               Object[] columns = new Object[noOfColumns];
  -            SortedMap columnMap = 
  +            SortedMap columnMap =
                   new TreeMap(String.CASE_INSENSITIVE_ORDER);
   
               // JDBC uses 1 as the lowest index!
  
  
  
  1.5       +5 -5      jakarta-commons/jelly/jelly-tags/sql/src/java/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java
  
  Index: SQLExecutionTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/java/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SQLExecutionTag.java	25 Feb 2004 01:31:59 -0000	1.4
  +++ SQLExecutionTag.java	9 Sep 2004 12:16:06 -0000	1.5
  @@ -1,18 +1,18 @@
   /*
    * Copyright 2002,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.
  - */ 
  + */
   
   package javax.servlet.jsp.jstl.sql;
   
  @@ -38,7 +38,7 @@
    * <p>The <code>SQLExcecutionTag</code> interface is exposed in order
    * to support custom parameter actions which may retrieve their
    * parameters from any source and process them before substituting
  - * them for a parameter marker in the sQL statement of the 
  + * them for a parameter marker in the sQL statement of the
    * enclosing <code>SQLExecutionTag</code> action</p>
    *
    * @author Justyna Horwat
  
  
  
  1.4       +7 -7      jakarta-commons/jelly/jelly-tags/sql/src/test/org/apache/commons/jelly/tags/sql/TestJUnit.java
  
  Index: TestJUnit.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/test/org/apache/commons/jelly/tags/sql/TestJUnit.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestJUnit.java	25 Feb 2004 01:31:59 -0000	1.3
  +++ TestJUnit.java	9 Sep 2004 12:16:06 -0000	1.4
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,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.
  @@ -20,7 +20,7 @@
   
   import org.apache.commons.jelly.tags.junit.JellyTestSuite;
   
  -/** 
  +/**
    * A helper class to run jelly test cases as part of Ant's JUnit tests
    *
    * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  @@ -31,8 +31,8 @@
       public static void main( String[] args ) throws Exception {
           TestRunner.run( suite() );
       }
  -    
  +
       public static TestSuite suite() throws Exception {
  -        return createTestSuite(TestJUnit.class, "suite.jelly");        
  +        return createTestSuite(TestJUnit.class, "suite.jelly");
       }
   }
  
  
  

---------------------------------------------------------------------
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