Return-Path: Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: (qmail 27302 invoked from network); 19 Mar 2007 03:30:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Mar 2007 03:30:46 -0000 Received: (qmail 90130 invoked by uid 500); 19 Mar 2007 03:30:54 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 90106 invoked by uid 500); 19 Mar 2007 03:30:54 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 90097 invoked by uid 99); 19 Mar 2007 03:30:54 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 Mar 2007 20:30:54 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 Mar 2007 20:30:46 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id CF6D11A9838; Sun, 18 Mar 2007 20:30:25 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r519815 - in /cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src: cayenne/java/org/apache/cayenne/xml/ tests/java/org/apache/cayenne/xml/ tests/resources/xmlcoding/ Date: Mon, 19 Mar 2007 03:30:25 -0000 To: commits@cayenne.apache.org From: kmenard@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070319033025.CF6D11A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kmenard Date: Sun Mar 18 20:30:24 2007 New Revision: 519815 URL: http://svn.apache.org/viewvc?view=rev&rev=519815 Log: CAY-597: XML Encoder with Mapping outputs incorrect XML. Added the analogous fix for encoded collections. This should handle all the problem cases reported in CAY-597 now. Modified: cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/xml/SerializableEntity.java cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/xml/XMLDecoderTst.java cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/xml/XMLEncoderTst.java cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/resources/xmlcoding/collection-mapped.xml cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/resources/xmlcoding/collection-mapping.xml Modified: cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/xml/SerializableEntity.java URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/xml/SerializableEntity.java?view=diff&rev=519815&r1=519814&r2=519815 ============================================================================== --- cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/xml/SerializableEntity.java (original) +++ cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/xml/SerializableEntity.java Sun Mar 18 20:30:24 2007 @@ -68,6 +68,9 @@ while (it.hasNext()) { encodeObject(encoder, it.next(), false); } + + // Make sure we pop the node we just pushed -- needed for fix to CAY-597. + encoder.pop(); } } else { Modified: cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/xml/XMLDecoderTst.java URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/xml/XMLDecoderTst.java?view=diff&rev=519815&r1=519814&r2=519815 ============================================================================== --- cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/xml/XMLDecoderTst.java (original) +++ cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/xml/XMLDecoderTst.java Sun Mar 18 20:30:24 2007 @@ -123,6 +123,7 @@ TestObject decoded = (TestObject) object; TestObject george = new TestObject(); + george.setAge(76); george.setName("George"); assertEquals(decoded, george); @@ -130,10 +131,12 @@ assertEquals(children.size(), 2); TestObject bill = new TestObject(); + bill.setAge(34); bill.setName("Bill"); assertEquals(children.get(0), bill); TestObject sue = new TestObject(); + sue.setAge(31); sue.setName("Sue"); assertEquals(children.get(1), sue); Modified: cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/xml/XMLEncoderTst.java URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/xml/XMLEncoderTst.java?view=diff&rev=519815&r1=519814&r2=519815 ============================================================================== --- cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/xml/XMLEncoderTst.java (original) +++ cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/xml/XMLEncoderTst.java Sun Mar 18 20:30:24 2007 @@ -184,6 +184,7 @@ XMLEncoder encoder = new XMLEncoder(CayenneTestResources.getResourceURL( XML_DATA_DIR + "collection-mapping.xml").toExternalForm()); TestObject george = new TestObject(); + george.setAge(76); george.setName("George"); george.addChild(new TestObject("Bill", 34, true)); Modified: cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/resources/xmlcoding/collection-mapped.xml URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/resources/xmlcoding/collection-mapped.xml?view=diff&rev=519815&r1=519814&r2=519815 ============================================================================== --- cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/resources/xmlcoding/collection-mapped.xml (original) +++ cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/resources/xmlcoding/collection-mapped.xml Sun Mar 18 20:30:24 2007 @@ -2,6 +2,7 @@ George Bill +34 Sue @@ -9,5 +10,7 @@ Mike 3 +31 +76 Modified: cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/resources/xmlcoding/collection-mapping.xml URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/resources/xmlcoding/collection-mapping.xml?view=diff&rev=519815&r1=519814&r2=519815 ============================================================================== --- cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/resources/xmlcoding/collection-mapping.xml (original) +++ cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/resources/xmlcoding/collection-mapping.xml Sun Mar 18 20:30:24 2007 @@ -1,12 +1,19 @@ + + - + + +