You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by rd...@apache.org on 2005/07/26 21:46:36 UTC
svn commit: r225380 - in /jakarta/commons/proper/betwixt/trunk: ./
src/java/org/apache/commons/betwixt/io/
src/test/org/apache/commons/betwixt/io/
src/test/org/apache/commons/betwixt/io/read/ xdocs/ xdocs/guide/
Author: rdonkin
Date: Tue Jul 26 12:46:14 2005
New Revision: 225380
URL: http://svn.apache.org/viewcvs?rev=225380&view=rev
Log:
Merged in branch RELEASE_0_7_BRANCH
Added:
jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/io/TestWriteIDs.java
- copied unchanged from r225376, jakarta/commons/proper/betwixt/branches/RELEASE_0_7_BRANCH/src/test/org/apache/commons/betwixt/io/TestWriteIDs.java
Modified:
jakarta/commons/proper/betwixt/trunk/RELEASE-NOTES.txt
jakarta/commons/proper/betwixt/trunk/build.xml
jakarta/commons/proper/betwixt/trunk/project.properties
jakarta/commons/proper/betwixt/trunk/project.xml
jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/AbstractBeanWriter.java
jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/io/read/TestBindTimeTypeMapping.java
jakarta/commons/proper/betwixt/trunk/xdocs/guide/integration.xml
jakarta/commons/proper/betwixt/trunk/xdocs/index.xml
jakarta/commons/proper/betwixt/trunk/xdocs/navigation.xml
Modified: jakarta/commons/proper/betwixt/trunk/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/RELEASE-NOTES.txt?rev=225380&r1=225379&r2=225380&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/RELEASE-NOTES.txt (original)
+++ jakarta/commons/proper/betwixt/trunk/RELEASE-NOTES.txt Tue Jul 26 12:46:14 2005
@@ -20,6 +20,9 @@
For more details see the tasks and change log documents.
+KNOWN DEFECTS
+ * .Betwixt file: the 'add-adder' attribute of the 'addDefaults' element is buggy.
+
ENHANCEMENTS AND BUG FIXES
* Fixed bug in nested element diagnosing empty elements.
* Added support for polymorphic mappings.
Modified: jakarta/commons/proper/betwixt/trunk/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/build.xml?rev=225380&r1=225379&r2=225380&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/build.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/build.xml Tue Jul 26 12:46:14 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--build.xml generated by maven from project.xml version 0.7
- on date June 13 2005, time 2259-->
+<!--build.xml generated by maven from project.xml version 0.8-dev
+ on date July 26 2005, time 2052-->
<project default="jar" name="commons-betwixt" basedir=".">
<property name="defaulttargetdir" value="target">
@@ -20,7 +20,7 @@
</property>
<property name="javadocdir" value="dist/docs/api">
</property>
- <property name="final.name" value="commons-betwixt-0.7">
+ <property name="final.name" value="commons-betwixt-0.8-dev">
</property>
<path id="build.classpath">
<fileset dir="${libdir}">
@@ -152,7 +152,7 @@
</tstamp>
<property name="copyright" value="Copyright &copy; The Apache Software Foundation. All Rights Reserved.">
</property>
- <property name="title" value="Betwixt 0.7 API">
+ <property name="title" value="Betwixt 0.8-dev API">
</property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.betwixt.*">
<classpath>
Modified: jakarta/commons/proper/betwixt/trunk/project.properties
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/project.properties?rev=225380&r1=225379&r2=225380&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/project.properties (original)
+++ jakarta/commons/proper/betwixt/trunk/project.properties Tue Jul 26 12:46:14 2005
@@ -22,7 +22,7 @@
maven.compile.optimize = off
maven.compile.deprecation = on
maven.compile.target = 1.1
-maven.target.source=1.2
+maven.compile.source=1.3
maven.jarResources.basedir=${basedir}/src/java
@@ -45,5 +45,3 @@
betwixt.repository=scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-commons/betwixt/
-maven.jdiff.old.tag=REFACTORING-BRANCH_2004-01-13_PRE-BRANCH
-maven.jdiff.new.tag=REFACTORING-BRANCH_2004-01-13
Modified: jakarta/commons/proper/betwixt/trunk/project.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/project.xml?rev=225380&r1=225379&r2=225380&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/project.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/project.xml Tue Jul 26 12:46:14 2005
@@ -78,6 +78,11 @@
<name>0.6</name>
<tag>BETWIXT_0_6</tag>
</version>
+ <version>
+ <id>0.7</id>
+ <name>0.7</name>
+ <tag>BETWIXT_0_7</tag>
+ </version>
</versions>
<developers>
Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/AbstractBeanWriter.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/AbstractBeanWriter.java?rev=225380&r1=225379&r2=225380&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/AbstractBeanWriter.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/AbstractBeanWriter.java Tue Jul 26 12:46:14 2005
@@ -1391,7 +1391,7 @@
// see if we have already have a matching attribute descriptor
AttributeDescriptor[] attributeDescriptors = descriptor.getAttributeDescriptors();
- length = attributeDescriptors.length;
+ length = super.getLength();
for (int i=0; i<length; i++) {
if (idAttributeName.equals(attributeDescriptors[i])) {
matchingAttribute = true;
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=225380&r1=225379&r2=225380&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 Tue Jul 26 12:46:14 2005
@@ -229,7 +229,7 @@
" <animal><call>Woof</call><latinName>Canis familiaris</latinName></animal>" +
"</Animals>";
- xmlAssertIsomorphicContent(parseString(expected), parseString(out));
+ xmlAssertIsomorphicContent(parseString(expected), parseString(out), true);
}
public void testIntrospectionTimeTypeRead() throws Exception {
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=225380&r1=225379&r2=225380&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/xdocs/guide/integration.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/xdocs/guide/integration.xml Tue Jul 26 12:46:14 2005
@@ -29,7 +29,7 @@
<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
allows Betwixt to be plugged into these pipelines.
-See the <a href='http://wiki.cocoondev.org/Wiki.jsp?page=BetwixtTransformer'>CocoonWiki</a>
+See the <a href='http://wiki.apache.org/cocoon/BetwixtTransformer'>CocoonWiki</a>
for documentation and example.
</p>
</section>
Modified: jakarta/commons/proper/betwixt/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/xdocs/index.xml?rev=225380&r1=225379&r2=225380&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/xdocs/index.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/xdocs/index.xml Tue Jul 26 12:46:14 2005
@@ -41,7 +41,8 @@
</section>
<section name="Releases">
- <subsection name='Betwixt 0.7 (Release Candidate 2 Available)'>
+
+ <subsection name='Betwixt 0.7'>
<p>
Betwixt 0.7 is a feature release.
A number of new strategies have been introduced to add flexibility. Improvements
@@ -57,14 +58,13 @@
<a href='tasks.html#Semantic%20Changes'>list of semantic incompatibilities</a>.
</p>
<p>
-This release is binary compatible with the 0.5 codebase but the methods deprecated
-in 0.5 are likely to be removed soon.
+This release is binary compatible with the 0.6 codebase but the methods deprecated
+in 0.6 (and earlier) are likely to be removed soon.
</p>
<p>
-The second release candidate for Betwixt is now
-<a href='http://people.apache.org/~rdonkin/commons-betwixt/'>available</a>.
-Please download and test this candidate. Feedback is welcomed and should be directed to the
-<a href='http://jakarta.apache.org/site/mail.html'>commons-dev</a> mailing list.
+Betwixt 0.7 is
+<a href='http://jakarta.apache.org/site/downloads/downloads_commons-betwixt.cgi'>available</a>
+in binary and source distributions.
</p>
</subsection>
<subsection name='Betwixt 0.6'>
Modified: jakarta/commons/proper/betwixt/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/xdocs/navigation.xml?rev=225380&r1=225379&r2=225380&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/xdocs/navigation.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/xdocs/navigation.xml Tue Jul 26 12:46:14 2005
@@ -53,6 +53,7 @@
<item name="Tutorial" href="/guide/tutorial.html"/>
</menu>
<menu name='Release Documentation'>
+ <item name='0.7' href='http://jakarta.apache.org/commons/betwixt/betwixt-0.7'/>
<item name='0.6' href='http://jakarta.apache.org/commons/betwixt/betwixt-0.6'/>
<item name='0.5' href='http://jakarta.apache.org/commons/betwixt/betwixt-0.5'/>
</menu>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org