cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anathan...@apache.org
Subject svn commit: r348399 - in /cocoon: blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/java/sel.xsl trunk/status.xml
Date Wed, 23 Nov 2005 09:04:44 GMT
Author: anathaniel
Date: Wed Nov 23 01:04:31 2005
New Revision: 348399

URL: http://svn.apache.org/viewcvs?rev=348399&view=rev
Log:
Database block: Renaming AttributeImpl xspAttr to _xspAttr was not applied to ESQL logicsheet.
That caused compliation errors in all XSPs using it.

Modified:
    cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
    cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/java/sel.xsl
    cocoon/trunk/status.xml

Modified: cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl?rev=348399&r1=348398&r2=348399&view=diff
==============================================================================
--- cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
(original)
+++ cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
Wed Nov 23 01:04:31 2005
@@ -21,7 +21,7 @@
  * @author <a href="mailto:balld@apache.org">Donald Ball</a>
  * @author <a href="mailto:tcurdt@apache.org">Torsten Curdt</a>
  * @author <a href="mailto:haul@apache.org">Christian Haul</a>
- * @version CVS $Revision: 1.9 $ $Date: 2004/03/17 11:28:17 $
+ * @version CVS $Id$
 -->
 
 <xsl:stylesheet version="1.0"
@@ -180,7 +180,7 @@
             }
       </xsl:if>
 
-            protected void _esql_printObject ( Object obj, AttributesImpl xspAttr) throws
SAXException
+            protected void _esql_printObject(Object obj) throws SAXException
             {
                if ( obj instanceof List) {
            ListIterator j=((List)obj).listIterator();
@@ -189,7 +189,7 @@
                        while (j.hasNext()){
                       <xsp:element name="sql-list-item">
                         <xsp:attribute name="pos"><xsp:expr>j.nextIndex()</xsp:expr></xsp:attribute>
-                        <xsp:logic>this._esql_printObject(j.next(),xspAttr);</xsp:logic>
+                        <xsp:logic>this._esql_printObject(j.next());</xsp:logic>
                       </xsp:element>
                        };
                      </xsp:logic>
@@ -200,7 +200,7 @@
                       <xsp:logic>
                         while (j.hasNext()){
                            <xsp:element name="sql-set-item">
-                 <xsp:logic>this._esql_printObject(j.next(),xspAttr);</xsp:logic>
+                 <xsp:logic>this._esql_printObject(j.next());</xsp:logic>
                    </xsp:element>
                         };
                       </xsp:logic>
@@ -694,7 +694,7 @@
                       <xsp:logic>
                         Object[] _esql_struct = ((Struct) _esql_query.getResultSet().getObject(_esql_i)).getAttributes();
                         for ( int _esql_k=0; _esql_k&lt;_esql_struct.length; _esql_k++){
-                        <xsp:element name="sql-row-item"><xsp:logic>this._esql_printObject(_esql_struct[_esql_k],xspAttr);</xsp:logic></xsp:element>
+                        <xsp:element name="sql-row-item"><xsp:logic>this._esql_printObject(_esql_struct[_esql_k]);</xsp:logic></xsp:element>
                         }
                       </xsp:logic>
                     </xsp:element>
@@ -705,7 +705,7 @@
                     // to retrieve any type (i.e. bit and bit varying)
                     // so don't handle complex types different for postgres
                     if (!_esql_connection.getURL().startsWith("jdbc:postgresql:")) {
-                       this._esql_printObject(_esql_query.getResultSet().getObject(_esql_i),
xspAttr);
+                       this._esql_printObject(_esql_query.getResultSet().getObject(_esql_i));
                        break;
                     }
 

Modified: cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/java/sel.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/java/sel.xsl?rev=348399&r1=348398&r2=348399&view=diff
==============================================================================
--- cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/java/sel.xsl
(original)
+++ cocoon/blocks/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/java/sel.xsl
Wed Nov 23 01:04:31 2005
@@ -15,12 +15,11 @@
   limitations under the License.
 -->
 
-<!-- $Id: sel.xsl,v 1.2 2004/03/17 11:28:22 crossley Exp $-->
 <!--
  * Sel Logicsheet (?)
  *
  * @author <a href="mailto:tcurdt@dff.st">Torsten Curdt</a>
- * @version CVS $Revision: 1.2 $ $Date: 2004/03/17 11:28:22 $
+ * @version CVS $Id$
 -->
 
 <xsl:stylesheet version="1.0"
@@ -38,7 +37,6 @@
     <xsl:for-each select=".//sel:subpage|.//sel:default-subpage">
       <xsp:logic>
       private void _<xsl:value-of select="translate(parent::sel:subpage-set/@parameter,'
-','__')"/>_<xsl:value-of select="translate(@name,' -','__')"/>_case() throws SAXException
{
-        AttributesImpl xspAttr = new AttributesImpl();
         <xsl:apply-templates/>
       }
       </xsp:logic>

Modified: cocoon/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?rev=348399&r1=348398&r2=348399&view=diff
==============================================================================
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Wed Nov 23 01:04:31 2005
@@ -175,6 +175,10 @@
   <!-- These are the changes from the last 2.1.x version. -->
  <changes>
   <release version="@version@" date="@date@">
+    <action dev="AN" type="fix" fixes-bug="COCOON-1691" due-to="Feliciano Borrego" due-to-email="felibv@gmail.com">
+      Database block: Renaming AttributeImpl xspAttr to _xspAttr was not applied to ESQL
logicsheet.
+      That caused compliation errors in all XSPs using it.
+    </action>
     <action dev="CZ" type="update">
       AbstractSAXTransformer supports removal of own namespace prefixes.
     </action>



Mime
View raw message