commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject cvs commit: jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/strategy/alt TestElementsAlt.java
Date Thu, 15 Jan 2004 20:41:29 GMT
rdonkin     2004/01/15 12:41:29

  Modified:    betwixt/src/test/org/apache/commons/betwixt/dotbetwixt Tag:
                        REFACTORING-BRANCH_2004-01-13 TestMsgParser.java
               betwixt/src/test/org/apache/commons/betwixt/examples/rss
                        Tag: REFACTORING-BRANCH_2004-01-13 Channel.java
                        Image.java Item.java RSSApplication.java
                        TestRSS.java TextInput.java
               betwixt/src/test/org/apache/commons/betwixt/recursion Tag:
                        REFACTORING-BRANCH_2004-01-13 TestRecursion.java
               betwixt/src/test/org/apache/commons/betwixt/schema Tag:
                        REFACTORING-BRANCH_2004-01-13 TestSchema.java
               betwixt/src/test/org/apache/commons/betwixt/strategy Tag:
                        REFACTORING-BRANCH_2004-01-13 TestElementsIO.java
               betwixt/src/test/org/apache/commons/betwixt/strategy/alt
                        Tag: REFACTORING-BRANCH_2004-01-13
                        TestElementsAlt.java
  Log:
  Costmetic tidying.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.2   +7 -7      jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/dotbetwixt/TestMsgParser.java
  
  Index: TestMsgParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/dotbetwixt/TestMsgParser.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- TestMsgParser.java	15 Jan 2004 19:50:56 -0000	1.1.2.1
  +++ TestMsgParser.java	15 Jan 2004 20:41:28 -0000	1.1.2.2
  @@ -7,7 +7,7 @@
    * 
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2004 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -63,10 +63,10 @@
   import java.io.StringReader;
   import java.io.StringWriter;
   
  +import junit.framework.TestCase;
  +
   import org.apache.commons.betwixt.io.BeanReader;
   import org.apache.commons.betwixt.io.BeanWriter;
  -
  -import junit.framework.TestCase;
   /**
    * Tests the marshalling and unmarshalling of MsgBeans with Betwixt.
    * The problem tested here is that an element without an updater would
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +4 -9      jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/examples/rss/Channel.java
  
  Index: Channel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/examples/rss/Channel.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- Channel.java	12 Jan 2004 20:29:27 -0000	1.1
  +++ Channel.java	15 Jan 2004 20:41:28 -0000	1.1.2.1
  @@ -62,12 +62,7 @@
   
   package org.apache.commons.betwixt.examples.rss;
   
  -import java.io.OutputStream;
  -import java.io.OutputStreamWriter;
  -import java.io.PrintWriter;
   import java.io.Serializable;
  -import java.io.UnsupportedEncodingException;
  -import java.io.Writer;
   import java.util.ArrayList;
   import java.util.List;
   
  
  
  
  1.1.2.1   +4 -5      jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/examples/rss/Image.java
  
  Index: Image.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/examples/rss/Image.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- Image.java	12 Jan 2004 20:31:50 -0000	1.1
  +++ Image.java	15 Jan 2004 20:41:28 -0000	1.1.2.1
  @@ -62,7 +62,6 @@
   
   package org.apache.commons.betwixt.examples.rss;
   
  -import java.io.PrintWriter;
   import java.io.Serializable;
   
   
  
  
  
  1.1.2.1   +4 -5      jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/examples/rss/Item.java
  
  Index: Item.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/examples/rss/Item.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- Item.java	12 Jan 2004 20:30:18 -0000	1.1
  +++ Item.java	15 Jan 2004 20:41:28 -0000	1.1.2.1
  @@ -62,7 +62,6 @@
   
   package org.apache.commons.betwixt.examples.rss;
   
  -import java.io.PrintWriter;
   import java.io.Serializable;
   
   
  
  
  
  1.2.2.1   +4 -5      jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/examples/rss/RSSApplication.java
  
  Index: RSSApplication.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/examples/rss/RSSApplication.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- RSSApplication.java	12 Jan 2004 22:16:08 -0000	1.2
  +++ RSSApplication.java	15 Jan 2004 20:41:28 -0000	1.2.2.1
  @@ -63,7 +63,6 @@
   package org.apache.commons.betwixt.examples.rss;
   
   import java.io.File;
  -
   import java.util.Iterator;
   
   import org.apache.commons.betwixt.io.BeanReader;
  
  
  
  1.2.2.1   +6 -5      jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/examples/rss/TestRSS.java
  
  Index: TestRSS.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/examples/rss/TestRSS.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- TestRSS.java	12 Jan 2004 22:16:08 -0000	1.2
  +++ TestRSS.java	15 Jan 2004 20:41:28 -0000	1.2.2.1
  @@ -62,8 +62,9 @@
   
   package org.apache.commons.betwixt.examples.rss;
   
  -import org.apache.commons.betwixt.AbstractTestCase;
   import java.io.File;
  +
  +import org.apache.commons.betwixt.AbstractTestCase;
   
   /**
    * <p>Test case for example.</p>
  
  
  
  1.1.2.1   +4 -5      jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/examples/rss/TextInput.java
  
  Index: TextInput.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/examples/rss/TextInput.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- TextInput.java	12 Jan 2004 20:33:34 -0000	1.1
  +++ TextInput.java	15 Jan 2004 20:41:28 -0000	1.1.2.1
  @@ -62,7 +62,6 @@
   
   package org.apache.commons.betwixt.examples.rss;
   
  -import java.io.PrintWriter;
   import java.io.Serializable;
   
   
  
  
  
  No                   revision
  No                   revision
  1.13.2.2  +9 -9      jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/recursion/TestRecursion.java
  
  Index: TestRecursion.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/recursion/TestRecursion.java,v
  retrieving revision 1.13.2.1
  retrieving revision 1.13.2.2
  diff -u -r1.13.2.1 -r1.13.2.2
  --- TestRecursion.java	14 Jan 2004 22:51:35 -0000	1.13.2.1
  +++ TestRecursion.java	15 Jan 2004 20:41:29 -0000	1.13.2.2
  @@ -7,7 +7,7 @@
    * 
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2004 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -245,7 +245,7 @@
           writer.getXMLIntrospector().setWrapCollectionsInElement(wrapIt);
           // we don't want to write Id attributes to every element
           // we just want our opbject model written nothing more..
  -        writer.setWriteIDs(false);
  +        writer.getBindingConfiguration().setMapIDs(false);
           // the source has 2 spaces indention and \n as line seperator.
           writer.setIndent("  ");
           writer.setEndOfLine("\n");
  @@ -276,7 +276,7 @@
           BeanWriter writer = new BeanWriter(out);
           writer.setWriteEmptyElements( true );
           writer.getXMLIntrospector().setAttributesForPrimitives(true);
  -        writer.setWriteIDs(true);
  +        writer.getBindingConfiguration().setMapIDs(true);
           writer.write(bean);
           
           String xml = "<?xml version='1.0'?><IdBean notId='Not ID' id='Hello, World'/>";
  @@ -302,7 +302,7 @@
           StringWriter stringWriter = new StringWriter();
           BeanWriter writer = new BeanWriter(stringWriter);
           writer.setWriteEmptyElements( true );
  -        writer.setWriteIDs(false);
  +        writer.getBindingConfiguration().setMapIDs(false);
           writer.write(alpha);
   
           String xml = "<?xml version='1.0'?><Element><name>Alpha</name><elements><element>"
  @@ -332,7 +332,7 @@
           StringWriter stringWriter = new StringWriter();
           BeanWriter writer = new BeanWriter(stringWriter);
           writer.setWriteEmptyElements( true );
  -        writer.setWriteIDs(false);
  +        writer.getBindingConfiguration().setMapIDs(false);
           
           //SimpleLog log = new SimpleLog("[testCyclicReferenceStack2:BeanWriter]");
           //log.setLevel(SimpleLog.LOG_LEVEL_TRACE);
  
  
  
  No                   revision
  No                   revision
  1.9.2.2   +6 -6      jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/schema/TestSchema.java
  
  Index: TestSchema.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/schema/TestSchema.java,v
  retrieving revision 1.9.2.1
  retrieving revision 1.9.2.2
  diff -u -r1.9.2.1 -r1.9.2.2
  --- TestSchema.java	13 Jan 2004 21:49:47 -0000	1.9.2.1
  +++ TestSchema.java	15 Jan 2004 20:41:29 -0000	1.9.2.2
  @@ -7,7 +7,7 @@
    * 
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2004 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -223,7 +223,7 @@
           writer.getXMLIntrospector().setWrapCollectionsInElement(wrapCollectionsInElement);
           // we don't want to write Id attributes to every element
           // we just want our opbject model written nothing more..
  -        writer.setWriteIDs(false);
  +        writer.getBindingConfiguration().setMapIDs(false);
           // the source has 2 spaces indention and \n as line seperator.
           writer.setIndent("  ");
           writer.setEndOfLine("\n");
  
  
  
  No                   revision
  No                   revision
  1.5.2.1   +5 -5      jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/strategy/TestElementsIO.java
  
  Index: TestElementsIO.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/strategy/TestElementsIO.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- TestElementsIO.java	9 Oct 2003 20:52:10 -0000	1.5
  +++ TestElementsIO.java	15 Jan 2004 20:41:29 -0000	1.5.2.1
  @@ -7,7 +7,7 @@
    * 
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2004 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -161,7 +161,7 @@
           
           result.setXMLIntrospector(newXMLIntrospector(mapper));
           result.enablePrettyPrint();
  -        result.setWriteIDs(false);
  +        result.getBindingConfiguration().setMapIDs(false);
           return result;
       }
   
  
  
  
  No                   revision
  No                   revision
  1.5.2.1   +5 -5      jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/strategy/alt/TestElementsAlt.java
  
  Index: TestElementsAlt.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/strategy/alt/TestElementsAlt.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- TestElementsAlt.java	9 Oct 2003 20:52:11 -0000	1.5
  +++ TestElementsAlt.java	15 Jan 2004 20:41:29 -0000	1.5.2.1
  @@ -7,7 +7,7 @@
    * 
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2004 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -166,7 +166,7 @@
           
           result.setXMLIntrospector(newXMLIntrospector(mapper));
           result.enablePrettyPrint();
  -        result.setWriteIDs(false);
  +        result.getBindingConfiguration().setMapIDs(false);
           return result;
       }
   
  
  
  

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