commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r190509 [2/2] - in /jakarta/commons/proper/betwixt/trunk: ./ src/java/org/apache/commons/betwixt/ src/java/org/apache/commons/betwixt/digester/ src/java/org/apache/commons/betwixt/expression/ src/java/org/apache/commons/betwixt/io/ src/java/org/apache/commons/betwixt/io/id/ src/java/org/apache/commons/betwixt/io/read/ src/java/org/apache/commons/betwixt/registry/ src/java/org/apache/commons/betwixt/schema/ src/java/org/apache/commons/betwixt/strategy/ src/test/org/apache/commons/betwixt/ src/test/org/apache/commons/betwixt/derived/ src/test/org/apache/commons/betwixt/io/read/ src/test/org/apache/commons/betwixt/recursion/ src/test/org/apache/commons/betwixt/schema/ src/test/org/apache/commons/betwixt/strategy/ xdocs/ xdocs/guide/
Date Mon, 13 Jun 2005 21:08:35 GMT
Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/io/read/TestBindTimeTypeMapping.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/io/read/TestBindTimeTypeMapping.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/io/read/TestBindTimeTypeMapping.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/io/read/TestBindTimeTypeMapping.java
Mon Jun 13 14:08:33 2005
@@ -152,7 +152,7 @@
         		"	</animal>" +
         		"</Animals>";
         
-        xmlAssertIsomorphicContent(parseString(expected), parseString(out));
+        xmlAssertIsomorphicContent(parseString(expected), parseString(out), true);
     }
     
     public void testBindTimeTypeRead() throws Exception {

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/io/read/TestMaps.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/io/read/TestMaps.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/io/read/TestMaps.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/io/read/TestMaps.java
Mon Jun 13 14:08:33 2005
@@ -19,6 +19,7 @@
 
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -48,21 +49,44 @@
         bean.addSomeThingy("Thorkell", "The Tall");
         writer.write(bean);
         String xml = out.getBuffer().toString();
-        String expected = "<?xml version='1.0'?><BeanWithConcreteMap>" +
-            "<entry>" +
-            "<key>Swein</key>" +
-            "<value>Forkbeard</value>" +
-            "</entry>" +
-            "<entry>" +
-            "<key>Thorkell</key>" +
-            "<value>The Tall</value>" +
-            "</entry>" +
-            "<entry>" +
-            "<key>Aethelred</key>" +
-            "<value>The Unready</value>" +
-            "</entry>" +
-            "</BeanWithConcreteMap>";
-        xmlAssertIsomorphicContent(parseString(expected), parseString(xml));
+        
+        StringBuffer buffer = new StringBuffer("<?xml version='1.0'?><BeanWithConcreteMap>");
+        for (Iterator it=bean.getSomeThingies().keySet().iterator(); it.hasNext();)
+        {
+            String key = (String) it.next();
+            if ("Aethelred".equals(key))
+            {
+                buffer.append(
+                        "<entry>" +
+                        "<key>Aethelred</key>" +
+                        "<value>The Unready</value>" +
+                        "</entry>");
+                
+            }
+            else if ("Swein".equals(key))
+            {
+                buffer.append(
+                        "<entry>" +
+                        "<key>Swein</key>" +
+                        "<value>Forkbeard</value>" +
+                        "</entry>");
+                
+            }
+            else if ("Thorkell".equals(key))
+            {
+                buffer.append(
+                        "<entry>" +
+                        "<key>Thorkell</key>" +
+                        "<value>The Tall</value>" +
+                        "</entry>");
+                
+            }
+        }
+        buffer.append("</BeanWithConcreteMap>");
+        
+        String expected = buffer.toString();
+        
+        xmlAssertIsomorphicContent(parseString(expected), parseString(xml), true);
     }
 
     
@@ -140,7 +164,7 @@
                 + "    </addressBookItems>\n"
                 + "  </AddressBook>\n";
     
-        assertEquals(xml, outputWriter.toString());
+        xmlAssertIsomorphicContent(parseString(xml), parseString(outputWriter.toString()),
true);
         BeanReader reader = new BeanReader();
         reader.registerBeanClass(AddressBook.class);
         StringReader xmlReader = new StringReader(outputWriter.toString());

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/recursion/TestSharedIDGeneration.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/recursion/TestSharedIDGeneration.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/recursion/TestSharedIDGeneration.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/recursion/TestSharedIDGeneration.java
Mon Jun 13 14:08:33 2005
@@ -15,6 +15,8 @@
  */ 
 package org.apache.commons.betwixt.recursion;
 
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
 import java.io.StringWriter;
 
 import org.apache.commons.betwixt.AbstractTestCase;
@@ -39,12 +41,32 @@
         BeanWriter writer = new BeanWriter(out);
         writer.write(hybrid);
         
+        boolean isAlienBeforePerson = false;
+        PropertyDescriptor[] propertyDescriptors = Introspector.getBeanInfo(HybridBean.class).getPropertyDescriptors();
+        
+        for(int i=0; i<propertyDescriptors.length;i++) {
+             String methodName = propertyDescriptors[i].getName();
+             if ("alien".equals(methodName)) {
+                 isAlienBeforePerson = true;
+                 break;
+             } else if ("person".equals(methodName)) {
+                 isAlienBeforePerson = false;
+                 break;
+             }
+        }
         String expected = "<?xml version='1.0'?><HybridBean id='1'>" +
-        		"<alien id='2'><name id='3'><moniker>Me</moniker></name></alien>"
+
-        		"<person id='4'><name idref='3'/></person>" +
+        		"<person id='2'><name id='3'><moniker>Me</moniker></name></person>"
+
+        		"<alien id='4'><name idref='3'/></alien>" +
         		"</HybridBean>";
         
-        xmlAssertIsomorphic(parseString(expected), parseString(out));
+        if (isAlienBeforePerson) {
+            expected = "<?xml version='1.0'?><HybridBean id='1'>" +
+            "<alien id='2'><name id='3'><moniker>Me</moniker></name></alien>"
+
+            "<person id='4'><name idref='3'/></person>" +
+            "</HybridBean>";
+        }
+        
+        xmlAssertIsomorphic(parseString(expected), parseString(out), true);
     }
     
 }

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/schema/TestSchemaGeneration.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/schema/TestSchemaGeneration.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/schema/TestSchemaGeneration.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/schema/TestSchemaGeneration.java
Mon Jun 13 14:08:33 2005
@@ -17,6 +17,9 @@
 
 package org.apache.commons.betwixt.schema;
 
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
 import java.io.StringWriter;
 
 import org.apache.commons.betwixt.AbstractTestCase;
@@ -130,83 +133,188 @@
         
         String xsd = out.getBuffer().toString();
         
-        String expected ="<?xml version='1.0'?><xsd:schema xmlns:xsd='http://www.w3.org/2001/XMLSchema'>"
+
-        		"<xsd:element name='OrderLineBean' type='org.apache.commons.betwixt.schema.OrderLineBean'/>"
+
-        		"<xsd:complexType name='org.apache.commons.betwixt.schema.OrderLineBean'>"
+
-        		"<xsd:sequence>" +
-        		"<xsd:element name='product' type='org.apache.commons.betwixt.schema.ProductBean'
minOccurs='0' maxOccurs='1'/>" +
-        		"</xsd:sequence>" +
-        		"<xsd:attribute name='quantity' type='xsd:string'/>" +
-        		"</xsd:complexType>" +
-        		"<xsd:complexType name='org.apache.commons.betwixt.schema.ProductBean'>"
+
-        		"<xsd:sequence/>" +
-        		"<xsd:attribute name='barcode' type='xsd:string'/>" +
-        		"<xsd:attribute name='code' type='xsd:string'/>" +
-        		"<xsd:attribute name='display-name' type='xsd:string'/>" +
-        		"<xsd:attribute name='name' type='xsd:string'/>" +
-        		"</xsd:complexType>" +
-        		"</xsd:schema>";
+        // different JVMs may return different orders during reflection
+        StringBuffer buffer = new StringBuffer("<?xml version='1.0'?><xsd:schema
xmlns:xsd='http://www.w3.org/2001/XMLSchema'>" +
+                "<xsd:element name='OrderLineBean' type='org.apache.commons.betwixt.schema.OrderLineBean'/>"
+
+                "<xsd:complexType name='org.apache.commons.betwixt.schema.OrderLineBean'>"
+
+                "<xsd:sequence>" +
+                "<xsd:element name='product' type='org.apache.commons.betwixt.schema.ProductBean'
minOccurs='0' maxOccurs='1'/>" +
+                "</xsd:sequence>" +
+                "<xsd:attribute name='quantity' type='xsd:string'/>" +
+                "</xsd:complexType>" +
+                "<xsd:complexType name='org.apache.commons.betwixt.schema.ProductBean'>"
+
+                "<xsd:sequence/>");
+        
+        PropertyDescriptor[] propertyDescriptors = Introspector.getBeanInfo(ProductBean.class).getPropertyDescriptors();
+        for (int i=0; i<propertyDescriptors.length; i++)
+        {
+            PropertyDescriptor propertyDescriptor = propertyDescriptors[i];
+            if ("barcode".equals(propertyDescriptor.getName()))
+            {
+                buffer.append("<xsd:attribute name='barcode' type='xsd:string'/>");
+            }
+            else if ("code".equals(propertyDescriptor.getName()))
+            {
+                buffer.append("<xsd:attribute name='code' type='xsd:string'/>");
+            }
+            else if ("displayName".equals(propertyDescriptor.getName()))
+            {
+                buffer.append("<xsd:attribute name='display-name' type='xsd:string'/>");
+            }
+            else if ("name".equals(propertyDescriptor.getName()))
+            {
+                buffer.append("<xsd:attribute name='name' type='xsd:string'/>");
+            }
+        }
+        buffer.append("</xsd:complexType>" +
+                "</xsd:schema>");
+        
+        String expected = buffer.toString();
 
-            
         xmlAssertIsomorphicContent(parseString(expected), parseString(xsd), true);
     }
     
     public void testOrder() throws Exception {
         SchemaTranscriber transcriber = new SchemaTranscriber();
-        transcriber.getXMLIntrospector().getConfiguration().setElementNameMapper(new HyphenatedNameMapper());
-        transcriber.getXMLIntrospector().getConfiguration().setAttributeNameMapper(new HyphenatedNameMapper());
-        transcriber.getXMLIntrospector().getConfiguration().setAttributesForPrimitives(true);
-        transcriber.getXMLIntrospector().getConfiguration().setWrapCollectionsInElement(false);
+        transcriber.getXMLIntrospector().getConfiguration()
+                .setElementNameMapper(new HyphenatedNameMapper());
+        transcriber.getXMLIntrospector().getConfiguration()
+                .setAttributeNameMapper(new HyphenatedNameMapper());
+        transcriber.getXMLIntrospector().getConfiguration()
+                .setAttributesForPrimitives(true);
+        transcriber.getXMLIntrospector().getConfiguration()
+                .setWrapCollectionsInElement(false);
         Schema schema = transcriber.generate(OrderBean.class);
-        
+
         StringWriter out = new StringWriter();
         out.write("<?xml version='1.0'?>");
         BeanWriter writer = new BeanWriter(out);
-        writer.setBindingConfiguration(transcriber.createSchemaBindingConfiguration());
-        writer.getXMLIntrospector().setConfiguration(transcriber.createSchemaIntrospectionConfiguration());
+        writer.setBindingConfiguration(transcriber
+                .createSchemaBindingConfiguration());
+        writer.getXMLIntrospector().setConfiguration(
+                transcriber.createSchemaIntrospectionConfiguration());
         writer.write(schema);
-        
+
         String xsd = out.getBuffer().toString();
+
+        PropertyDescriptor[] propertyDescriptors = Introspector.getBeanInfo(
+                OrderBean.class).getPropertyDescriptors();
+        boolean linesFirst = false;
+        for (int i = 0; i < propertyDescriptors.length; i++) {
+            PropertyDescriptor propertyDescriptor = propertyDescriptors[i];
+            if ("lines".equals(propertyDescriptor.getName())) {
+                linesFirst = true;
+                break;
+            } else if ("customer".equals(propertyDescriptor.getName())) {
+                linesFirst = false;
+                break;
+            }
+        }
+
         
-        String expected = "<?xml version='1.0'?><xsd:schema xmlns:xsd='http://www.w3.org/2001/XMLSchema'>"
+
-        		"<xsd:element name='order-bean' type='org.apache.commons.betwixt.schema.OrderBean'/>"
+
-        		"" +
-        		"<xsd:complexType name='org.apache.commons.betwixt.schema.OrderBean'>" +
-        		"	<xsd:sequence>" +
-        		"		<xsd:element name='customer' type='org.apache.commons.betwixt.schema.CustomerBean'
minOccurs='0' maxOccurs='1'/>" +
-        		"		<xsd:element name='line' type='org.apache.commons.betwixt.schema.OrderLineBean'
minOccurs='0' maxOccurs='unbounded'/>" +
-        		"	</xsd:sequence>" +
-        		"	<xsd:attribute name='code' type='xsd:string'/>" +
-        		"</xsd:complexType>" +
-        		"" +
-        		"<xsd:complexType name='org.apache.commons.betwixt.schema.CustomerBean'>"
+
-        		"	<xsd:sequence/>" +
-        		"	<xsd:attribute name='code' type='xsd:string'/>" +
-        		"	<xsd:attribute name='country' type='xsd:string'/>" +
-        		"	<xsd:attribute name='name' type='xsd:string'/>" +
-        		"	<xsd:attribute name='postcode' type='xsd:string'/>" +
-        		"	<xsd:attribute name='street' type='xsd:string'/>" +
-        		"	<xsd:attribute name='town' type='xsd:string'/>" +
-        		"</xsd:complexType>" +
-        		"" +
-        		"<xsd:complexType name='org.apache.commons.betwixt.schema.OrderLineBean'>"
+
-        		"	<xsd:sequence>" +
-        		"		<xsd:element name='product' type='org.apache.commons.betwixt.schema.ProductBean'
minOccurs='0' maxOccurs='1'/>" +
-        		"	</xsd:sequence>" +
-        		"	<xsd:attribute name='quantity' type='xsd:string'/>" +
-        		"</xsd:complexType>" +
-        		"" +
-        		"<xsd:complexType name='org.apache.commons.betwixt.schema.ProductBean'>"
+
-        		"	<xsd:sequence/>" +
-        		"		<xsd:attribute name='barcode' type='xsd:string'/>" +
-        		"		<xsd:attribute name='code' type='xsd:string'/>" +
-        		"		<xsd:attribute name='display-name' type='xsd:string'/>" +
-        		"		<xsd:attribute name='name' type='xsd:string'/>" +
-        		"	</xsd:complexType>" +
-        		"" +
-        		"</xsd:schema>";
-    
-         xmlAssertIsomorphicContent(parseString(xsd), parseString(expected));
+        StringBuffer buffer = new StringBuffer(
+                "<?xml version='1.0'?><xsd:schema xmlns:xsd='http://www.w3.org/2001/XMLSchema'>"
+                        + "<xsd:element name='order-bean' type='org.apache.commons.betwixt.schema.OrderBean'/>"
+                        + ""
+                        + "<xsd:complexType name='org.apache.commons.betwixt.schema.OrderBean'>"
+                        + "	<xsd:sequence>");
+
+        if (linesFirst) {
+            buffer.append("     <xsd:element name='line' type='org.apache.commons.betwixt.schema.OrderLineBean'
minOccurs='0' maxOccurs='unbounded'/>");
+            buffer.append("        <xsd:element name='customer' type='org.apache.commons.betwixt.schema.CustomerBean'
minOccurs='0' maxOccurs='1'/>");
+        } else {
+            buffer.append("        <xsd:element name='customer' type='org.apache.commons.betwixt.schema.CustomerBean'
minOccurs='0' maxOccurs='1'/>");
+            buffer.append("     <xsd:element name='line' type='org.apache.commons.betwixt.schema.OrderLineBean'
minOccurs='0' maxOccurs='unbounded'/>");
+        }
+
+        buffer.append("	</xsd:sequence>"
+                        + "	<xsd:attribute name='code' type='xsd:string'/>"
+                        + "</xsd:complexType>"
+                        + "");
+                        
+        if (linesFirst) {
+            writeExpectedOrderLineBeanType(buffer);
+            writeExpectedCustomerBeanType(buffer);            
+        } else {
+            writeExpectedCustomerBeanType(buffer);            
+            writeExpectedOrderLineBeanType(buffer);
+        }
+                
+        buffer.append("</xsd:schema>");
+
+        String expected = buffer.toString();
+
+         xmlAssertIsomorphicContent(parseString(xsd), parseString(expected), true);
+    }
+
+    /**
+     * @param buffer
+     * @throws IntrospectionException
+     */
+    private void writeExpectedOrderLineBeanType(StringBuffer buffer) throws IntrospectionException
{
+        PropertyDescriptor[] propertyDescriptors;
+        buffer.append("<xsd:complexType name='org.apache.commons.betwixt.schema.OrderLineBean'>"
+                        + "	<xsd:sequence>"
+                        + "		<xsd:element name='product' type='org.apache.commons.betwixt.schema.ProductBean'
minOccurs='0' maxOccurs='1'/>"
+                        + "	</xsd:sequence>"
+                        + "	<xsd:attribute name='quantity' type='xsd:string'/>"
+                        + "</xsd:complexType>"
+                        + ""
+                        + "<xsd:complexType name='org.apache.commons.betwixt.schema.ProductBean'>"
+                        + "	<xsd:sequence/>");
+
+        propertyDescriptors = Introspector.getBeanInfo(ProductBean.class)
+                .getPropertyDescriptors();
+        for (int i = 0; i < propertyDescriptors.length; i++) {
+            PropertyDescriptor propertyDescriptor = propertyDescriptors[i];
+            if ("barcode".equals(propertyDescriptor.getName())) {
+                buffer
+                        .append("<xsd:attribute name='barcode' type='xsd:string'/>");
+            } else if ("code".equals(propertyDescriptor.getName())) {
+                buffer.append("<xsd:attribute name='code' type='xsd:string'/>");
+            } else if ("displayName".equals(propertyDescriptor.getName())) {
+                buffer
+                        .append("<xsd:attribute name='display-name' type='xsd:string'/>");
+            } else if ("name".equals(propertyDescriptor.getName())) {
+                buffer.append("<xsd:attribute name='name' type='xsd:string'/>");
+            }
+        }
+        buffer.append("	</xsd:complexType>");
+    }
+
+    /**
+     * @param buffer
+     * @throws IntrospectionException
+     */
+    private void writeExpectedCustomerBeanType(StringBuffer buffer) throws IntrospectionException
{
+        PropertyDescriptor[] propertyDescriptors;
+        buffer.append("<xsd:complexType name='org.apache.commons.betwixt.schema.CustomerBean'>"
+                        + "	<xsd:sequence/>");
+
+        propertyDescriptors = Introspector.getBeanInfo(CustomerBean.class)
+                .getPropertyDescriptors();
+        for (int i = 0; i < propertyDescriptors.length; i++) {
+            PropertyDescriptor propertyDescriptor = propertyDescriptors[i];
+            if ("code".equals(propertyDescriptor.getName())) {
+                buffer.append("<xsd:attribute name='code' type='xsd:string'/>");
+            } else if ("country".equals(propertyDescriptor.getName())) {
+                buffer
+                        .append("<xsd:attribute name='country' type='xsd:string'/>");
+            } else if ("name".equals(propertyDescriptor.getName())) {
+                buffer.append("<xsd:attribute name='name' type='xsd:string'/>");
+            } else if ("postcode".equals(propertyDescriptor.getName())) {
+                buffer
+                        .append("<xsd:attribute name='postcode' type='xsd:string'/>");
+            } else if ("street".equals(propertyDescriptor.getName())) {
+                buffer
+                        .append("<xsd:attribute name='street' type='xsd:string'/>");
+            } else if ("town".equals(propertyDescriptor.getName())) {
+                buffer.append("<xsd:attribute name='town' type='xsd:string'/>");
+            }
+        }
+
+        buffer.append("</xsd:complexType>"
+                        + "");
     }
     
 }

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestConversionFlavour.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestConversionFlavour.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestConversionFlavour.java
(original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestConversionFlavour.java
Mon Jun 13 14:08:33 2005
@@ -105,7 +105,7 @@
                 "        </mapped>" +
                 "        </alpha>";
          
-        xmlAssertIsomorphicContent(parseString(xml), parseString(out));
+        xmlAssertIsomorphicContent(parseString(xml), parseString(out), true);
     }
     
 

Modified: jakarta/commons/proper/betwixt/trunk/xdocs/community.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/xdocs/community.xml?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/xdocs/community.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/xdocs/community.xml Mon Jun 13 14:08:33 2005
@@ -29,45 +29,10 @@
             </p>
         <p>
 Anyone is welcome to create new content about Betwixt providing that they 
-observe the usual rules of netiquette.
+observe the usual rules of netiquette. Please note that you will need to register
+before you can make changes.
             </p>
         </section>
-    <section name="IRC">
-      <p>
-      The Werken Company runs an IRC server with a permenant Betwixt channel. 
-      (Thanks <a href='http://blogs.werken.com/people/bob/'>Bob</a>!)
-      </p>
-      <p>
-      To access the IRC server, point an appropriate IRC client at:
-      </p>
-      
-      <source>
-             server: irc.werken.com
-               port: 6667
-            channel: #betwixt
-      </source>
-      
-      <p>
-      For those who use <a href="http://www.mozilla.org/">Mozilla</a>, here's
a 
-      <a href="irc://irc.werken.com:6667/#betwixt">quick link to #betwixt</a>.
-      </p>
-      <p>
-      Most business is still conducted on the commons-dev mailing list. (And so it should
be!)
-      But project members find IRC useful to roll around ideas, discuss designs - or just
hang out.
-      You're welcome to join us.
-      </p>
-    <subsection name='Logs'>
-        <p>
-        Many of the channels hosted by The Werken Company are archived
-        and available through the 
-        <a href="http://irc.werken.com/channels/">Werken IRC Archives</a>.
-        </p>
-
-        <p>
-        Here's the <a href="http://irc.werken.com/channels/betwixt/">Betwixt archive</a>
-        </p>
-    </subsection>
-  </section>
   </body>
 </document>
 

Modified: jakarta/commons/proper/betwixt/trunk/xdocs/faq.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/xdocs/faq.xml?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/xdocs/faq.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/xdocs/faq.xml Mon Jun 13 14:08:33 2005
@@ -179,10 +179,7 @@
           </a>
         </dt>
         <dd>
-            At the moment,  <code>BeanWriter</code> is the only way to output
the xml.
-            This writes the xml (as characters) to standard java io streams. 
-            Work will begin on a SAX-based writer (which will generate SAX events)
-            very soon.
+            Betwixt can output xml as streaming text or as SAX events.
         </dd>
       </dl>
       <dl>
@@ -227,9 +224,8 @@
 beanWriter.setWriteIDs(false);
 </source>
             and then Betwixt will no longer automatically add <code>ID</code>
attributes.
-            Once this property is set (to false), BeanWroter will throw a 
-            <code>CyclicReferenceException</code> when any cyclic references
which are 
-            encountered in the bean graph.
+            Once this property is set (to false), when a cycle reference is encountered
+            in the bean graph, a <code>CyclicReferenceException</code> will be
thrown.
         </dd>
       </dl>   
 
@@ -273,10 +269,9 @@
           </a>
         </dt>
         <dd>
-            Betwixt uses <a href='http://jakarta.apache.org/commons/digester.html'>Digester</a>
for bean
-            reading. There are problems integrating the last release with custom digester
rules. 
-            The CVS HEAD version of betwixt now supports this and so users who need to do
this should 
-            upgrade.
+            Betwixt uses <a href='http://jakarta.apache.org/commons/digester/index.html'>Digester</a>
for bean
+            reading. With care and knowledge of the way that Betwixt reads beans,
+            extra rules can be used to add custom functionality.
         </dd>
         <dt>
           <a name="bean-read-failure">
@@ -328,7 +323,7 @@
         <dd>
           Betwixt uses Maven for its build system. So you should be able to build Betwixt
just like
           any other Maven enabled project. Please see the 
-          <a href="http://jakarta.apache.org/turbine/maven/start/index.html">Maven</a>

+          <a href="http://maven.apache.org/start/index.html">Maven</a> 
           documentation for details.
         </dd>
       </dl>

Modified: jakarta/commons/proper/betwixt/trunk/xdocs/guide/binding.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/xdocs/guide/binding.xml?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/xdocs/guide/binding.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/xdocs/guide/binding.xml Mon Jun 13 14:08:33 2005
@@ -50,7 +50,7 @@
     
     <p>
     <strong>Note</strong> that the attribute and element names given in a .betwixt
file (as usual)
-    override the name mapping settings on the <code>XMLIntrotrospector</code>.
+    override the name mapping settings on the <code>XMLIntrospector</code>.
     </p>
 
 <subsection name="Using A Custom Type Name To Element Name Mapping">
@@ -305,7 +305,7 @@
 <subsection name="Caching and the XMLRegistry">
     
     <p>
-    Introspection is slow and so caching the results improves preformance. Though the writers

+    Introspection is slow and so caching the results improves performance. Though the writers

     and readers can - by nature - only be used safely in a single thread, a single 
     <code>XMLIntrospector</code> instance can be safely shared amongst multiple
threads. Sharing a
     single instance will improve performance by sharing it's <code>XMLBeanInfo</code>
cache.
@@ -581,7 +581,7 @@
 
         <subsection name='Using ConvertUtils To Customize Conversion Of Primitives'>
             <p>
-<code>ConvertUtils</code> is part of <a href='http://jakarta.apache.org/commons/beanutils.html'>commons-beanutils</a>
+<code>ConvertUtils</code> is part of <a href='http://jakarta.apache.org/commons/beanutils/index.html'>commons-beanutils</a>
 and it can be used to flexibly convert strings to objects and back again. By default, Betwixt
uses ConvertUtils to 
 perform these conversions and so standard <code>ConvertUtils</code> methods can
be called to customize these 
 conversions.
@@ -596,7 +596,7 @@
         </p>
             <p>
 The default strategy uses <code>ConvertUtils</code> from  
-<a href='http://jakarta.apache.org/commons/beanutils.html'>commons-beanutils</a>
to perform these conversions.
+<a href='http://jakarta.apache.org/commons/beanutils/index.html'>commons-beanutils</a>
to perform these conversions.
 This is a powerful component that allows flexible customization of the conversion process.
         </p>
             <p>

Modified: jakarta/commons/proper/betwixt/trunk/xdocs/guide/derived.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/xdocs/guide/derived.xml?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/xdocs/guide/derived.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/xdocs/guide/derived.xml Mon Jun 13 14:08:33 2005
@@ -26,7 +26,7 @@
 <section name='Derived Beans'>
         <subsection name='What Is A Derived Bean?'>
             <p>
-A derived bean is one which runtime class differs from the mapped property type
+A derived bean is one whose runtime class differs from the mapped property type
 (as determined during introspection).
                 </p>
     </subsection>   

Modified: jakarta/commons/proper/betwixt/trunk/xdocs/guide/examples.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/xdocs/guide/examples.xml?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/xdocs/guide/examples.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/xdocs/guide/examples.xml Mon Jun 13 14:08:33 2005
@@ -32,7 +32,7 @@
     xml and back again. A round trip, no less!
     </p>
     <p>
-    In order to run these simple examples, the classpath needs to contain Betwixt and all
it's 
+    In order to run these simple examples, the classpath needs to contain Betwixt and all
its 
     <a href='../dependencies'>dependencies</a>. Note that any 
     <a href='http://java.sun.com/xml/jaxp/index.html'>JAXP (1.1 or later)</a>
compliant parser 
     can be used to replace xerces and xml-apis. JUnit is not required to run betwixt (but
is needed

Modified: jakarta/commons/proper/betwixt/trunk/xdocs/guide/integration.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/xdocs/guide/integration.xml?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/xdocs/guide/integration.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/xdocs/guide/integration.xml Mon Jun 13 14:08:33 2005
@@ -24,7 +24,7 @@
 
 <body>
 
-    <section name='Cocooon'>
+    <section name='Cocoon'>
         <p>
 <a href='http://cocoon.apache.org/'>Cocoon</a> is a web development framework
(and more)
 built around component pipelines and XML. A transformer is available for Cocoon which 

Modified: jakarta/commons/proper/betwixt/trunk/xdocs/guide/output.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/xdocs/guide/output.xml?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/xdocs/guide/output.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/xdocs/guide/output.xml Mon Jun 13 14:08:33 2005
@@ -18,14 +18,14 @@
 <document>
 
  <properties>
-  <title>Outputing Results</title>
+  <title>Outputting Results</title>
   <author email="rdonkin@apache.org">Robert Burrell Donkin</author>
  </properties>
 
 <body>
-<section name='Outputing Results (Of Bean Writing)'>
+<section name='Outputting Results (Of Bean Writing)'>
         <p>
-Betwixt is flexible when it comes to outputing the results of bean writing.
+Betwixt is flexible when it comes to outputting the results of bean writing.
 The abstract <code>AbstractBeanWriter</code> class provides a basic framework
 with an implementation API inspired by <a href='http://www.saxproject.org/'>SAX</a>.
 Betwixt ships with writers that support SAX and textual streams
@@ -34,7 +34,7 @@
 </section>
 <section name='Pushing Results to a Textual Stream'>
         <p>
-<code>BeanWriter</code> push results to a textual stream. This can be used
+<code>BeanWriter</code> pushes results to a textual stream. This can be used
 to efficiently push content through a socket or just to create a simple String.
 Note that only document fragments are created so you may need to append any
 prologs before writing the bean.
@@ -121,7 +121,7 @@
 </section>
 <section name='Pushing Results to SAX'>
         <p>
-<code>SAXBeanWriter</code> push results to a SAX content handler. 
+<code>SAXBeanWriter</code> pushes events to a SAX content handler. 
 This allows Betwixt to efficiently participate as a content generator
 in SAX-based pipelines such as <a href='http://cocoon.apache.org/'>cocoon</a>.
     </p>

Modified: jakarta/commons/proper/betwixt/trunk/xdocs/guide/reading.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/xdocs/guide/reading.xml?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/xdocs/guide/reading.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/xdocs/guide/reading.xml Mon Jun 13 14:08:33 2005
@@ -141,7 +141,7 @@
     
     <p>
     Digester uses <code>Rule</code>'s to specify the xml mapping (for more details
see the 
-    <a href='http://jakarta.apache.org/commons/digester.html'>Digester documentation</a>).
+    <a href='http://jakarta.apache.org/commons/digester/index.html'>Digester documentation</a>).
     Betwixt provides a custom ruleset (<code>BeanRuleSet</code>). This creates
<code>Rule</code>'s that
     implement the standard Betwixt mapping for a class. <code>BeanReader.registerBeanClass</code>

     uses this <code>RuleSet</code> to add these standard betwixt mapping <code>Rule</code>'s

Modified: jakarta/commons/proper/betwixt/trunk/xdocs/guide/tutorial.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/xdocs/guide/tutorial.xml?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/xdocs/guide/tutorial.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/xdocs/guide/tutorial.xml Mon Jun 13 14:08:33 2005
@@ -44,7 +44,7 @@
 object model</a> for 
 RSS 0.91. This was originally created for 
 <a href='http://jakarta.apache.org/commons/digester/index.html'>Digester</a>

-by Craig R. McClanahan and Ted Husted with a few ammendments for this tutorial.
+by Craig R. McClanahan and Ted Husted with a few amendments for this tutorial.
 There are only four main objects in the model: 
     </p>
         <ul>

Modified: jakarta/commons/proper/betwixt/trunk/xdocs/guide/writing.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/xdocs/guide/writing.xml?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/xdocs/guide/writing.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/xdocs/guide/writing.xml Mon Jun 13 14:08:33 2005
@@ -28,13 +28,13 @@
             <p>
 A <strong>DynaBean</strong> is a pseudo-bean whose properties may differ between
instances of the same Class.
 Pseudo-introspection of the available properties uses a pseudo-class of type DynaClass.
-For more details see <a href='http://jakarta.apache.org/commons/beanutils.html'>BeanUtils</a>.
+For more details see <a href='http://jakarta.apache.org/commons/beanutils/index.html'>BeanUtils</a>.
                 </p>
             <p>
-Betwixt now supports the (correct) writing of objects implementating DynaBean. Rather than
using standard
+Betwixt now supports the (correct) writing of objects implementing DynaBean. Rather than
using standard
 introspection for these objects, <code>Betwixt</code> now interrogates the DynaClass.
Using .betwixt files
-with DynaBeans is not yet supported and special behaviour of DynaBeans can be overridden
by specifying a 
-.betwixt file.
+with DynaBeans is not yet supported. The special behaviour of DynaBean classes will be overridden
when a
+.betwixt file is present.
                 </p>
     </subsection>
         <subsection name='Writing Entity Beans'>
@@ -42,7 +42,7 @@
 Entity beans are a kind of Enterprise Java Bean. For more details see the
 <a href='http://java.sun.com/j2ee/'>J2EE</a> specification. They are a common
way to persist data.
 When dealing with an entity bean, you usually deal with the remote interface rather than
the
-concrete implementation. There is no gaurantee that the class presented by the container
will be
+concrete implementation. There is no guarantee that the class presented by the container
will be
 the class your created to provide the bean's functionality. 
 Indeed, <code>Proxy</code> implementations are 
 one common way in which the remote interfaces are implemented. 

Modified: jakarta/commons/proper/betwixt/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/xdocs/index.xml?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/xdocs/index.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/xdocs/index.xml Mon Jun 13 14:08:33 2005
@@ -129,7 +129,7 @@
     </p>
     <p>
         You can get the nightly builds from 
-        <a href="http://jakarta.apache.org/builds/jakarta-commons/nightly/commons-betwixt/">here</a>
+        <a href="http://cvs.apache.org/builds/jakarta-commons/nightly/commons-betwixt/">here</a>
     </p>
 </section>
 

Modified: jakarta/commons/proper/betwixt/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/xdocs/navigation.xml?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/xdocs/navigation.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/xdocs/navigation.xml Mon Jun 13 14:08:33 2005
@@ -38,15 +38,15 @@
       <item name="Community" href="/community.html"/>
       <item name="Powered By" href="/powered.html"/>
       <item name="Tasks" href="/tasks.html"/>
-      <item name="SVN" href="http://svn.apache.org/viewcvs/jakarta-commons/betwixt/"/>
-      <!--item name="Javadoc (CVS latest)" href="apidocs/index.html"/-->
+      <item name="View SVN" href="http://svn.apache.org/viewcvs.cgi/jakarta/commons/proper/betwixt/trunk/"/>
+      <item name="SVN" href="http://svn.apache.org/repos/asf/jakarta/commons/proper/betwixt/"/>
     </menu>
     <menu name="User guide">
       <item name="Getting Started"         href="/guide/start.html"/>
       <item name="Binding Beans"           href="/guide/binding.html"/>
       <item name="Derived Bindings"        href="/guide/derived.html"/>
       <item name="Writing Beans(Advanced)" href="/guide/writing.html"/>
-      <item name="Outputing The Results"   href="/guide/output.html"/>
+      <item name="Outputting The Results"   href="/guide/output.html"/>
       <item name="Reading Beans(Advanced)" href="/guide/reading.html"/>
       <item name="Integrating" 	           href="/guide/integration.html"/>
       <item name="Examples"                href="/guide/examples.html"/>

Modified: jakarta/commons/proper/betwixt/trunk/xdocs/tasks.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/xdocs/tasks.xml?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/xdocs/tasks.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/xdocs/tasks.xml Mon Jun 13 14:08:33 2005
@@ -564,14 +564,28 @@
             </li>
         </ul>
     </subsection>
-        <subsection name='Dependencies'>
+</section>
+	<section name='Dependencies'>
+		<subsection name='0.6.1'>
             <p>
                 <ul>
                     <li>
-Upgraded <code>commons-beanutils</code> to <code>1.6.1</code>.
+Upgraded <code>commons-beanutils</code> to <code>1.7.0</code>.
                 </li>
                     <li>
-Upgraded <code>commons-digester</code> to <code>1.5</code>.
+Upgraded <code>commons-digester</code> to <code>1.6</code>.
+                </li>
+            </ul>
+        </p>
+    </subsection>
+	<subsection name='0.5'>
+            <p>
+                <ul>
+                    <li>
+Upgraded <code>commons-beanutils</code> to <code>1.6.1</code>
+                </li>
+                    <li>
+Upgraded <code>commons-digester</code> to <code>1.5</code>
                 </li>
             </ul>
         </p>



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