commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r190509 [1/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
Author: rdonkin
Date: Mon Jun 13 14:08:33 2005
New Revision: 190509

URL: http://svn.apache.org/viewcvs?rev=190509&view=rev
Log:
Merged in 179135:190500 RELEASE_0_6_1_BRANCH. Will tidy up and taken new branch for renumbered 0.7 release.

Modified:
    jakarta/commons/proper/betwixt/trunk/README.txt
    jakarta/commons/proper/betwixt/trunk/RELEASE-NOTES.txt
    jakarta/commons/proper/betwixt/trunk/build.xml
    jakarta/commons/proper/betwixt/trunk/maven.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/BeanProperty.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/BindingConfiguration.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/ElementDescriptor.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/IntrospectionConfiguration.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/Options.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/XMLIntrospector.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/ClassRule.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/ConfigRule.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/MappedPropertyRule.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/MultiMappingBeanInfoDigester.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/XMLIntrospectorHelper.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/expression/Context.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/expression/DynaBeanUpdater.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/expression/MethodUpdater.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/expression/TypedUpdater.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/AbstractBeanWriter.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/BeanCreateRule.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/BeanReader.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/BeanRuleSet.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/BeanWriter.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/WriteContext.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/id/RandomIDGenerator.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/read/ReadContext.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/registry/DefaultXMLBeanInfoRegistry.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/registry/PolymorphicReferenceResolver.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/Attribute.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/ComplexType.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/GlobalComplexType.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/GlobalElement.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/Schema.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/SimpleType.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/HyphenatedNameMapper.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/IdStoringStrategy.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/ListedClassNormalizer.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/MappingDerivationStrategy.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/MixedContentEncodingStrategy.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/ObjectStringConverter.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/PropertySuppressionStrategy.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/ValueSuppressionStrategy.java
    jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/package.html
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestClassProperty.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/derived/TestWriteClass.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/io/read/TestBindTimeTypeMapping.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/io/read/TestMaps.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/recursion/TestSharedIDGeneration.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/schema/TestSchemaGeneration.java
    jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestConversionFlavour.java
    jakarta/commons/proper/betwixt/trunk/xdocs/community.xml
    jakarta/commons/proper/betwixt/trunk/xdocs/faq.xml
    jakarta/commons/proper/betwixt/trunk/xdocs/guide/binding.xml
    jakarta/commons/proper/betwixt/trunk/xdocs/guide/derived.xml
    jakarta/commons/proper/betwixt/trunk/xdocs/guide/examples.xml
    jakarta/commons/proper/betwixt/trunk/xdocs/guide/integration.xml
    jakarta/commons/proper/betwixt/trunk/xdocs/guide/output.xml
    jakarta/commons/proper/betwixt/trunk/xdocs/guide/reading.xml
    jakarta/commons/proper/betwixt/trunk/xdocs/guide/tutorial.xml
    jakarta/commons/proper/betwixt/trunk/xdocs/guide/writing.xml
    jakarta/commons/proper/betwixt/trunk/xdocs/index.xml
    jakarta/commons/proper/betwixt/trunk/xdocs/navigation.xml
    jakarta/commons/proper/betwixt/trunk/xdocs/tasks.xml

Modified: jakarta/commons/proper/betwixt/trunk/README.txt
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/README.txt?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/README.txt (original)
+++ jakarta/commons/proper/betwixt/trunk/README.txt Mon Jun 13 14:08:33 2005
@@ -2,41 +2,15 @@
 =======================
 
 Welcome to the Betwixt component of the Jakarta Commons
-project.
+project (http://jakarta.apache.org/commons). 
 
-The Betwixt build process is now Mavenized!
+Betwixt uses Maven (http://maven.apache.org) for build 
+process management. 
 
-For those who haven't heard of Maven, its a unified 
-project build processor. See
+To build Betwixt using Maven type:
 
-	http://jakarta.apache.org/turbine/maven/ 
+   robert% maven
 
-for the Maven project documentation. This means that you
-now need to download and install Maven if you want to 
-build Betwixt. Full details of  how this can be done can 
-be found on the Maven site.
-
-Maven downloads all neccessary dependencies for you
-- so you don't need to worry about that any more!
-
-Maven uses a set of standard build commands. Here's a 
-couple to get you started:
-
-	robert% maven
-
-this executes 'java:jar' which compiles the source, 
-runs the unit tests and creates a jar.
-
-	robert% maven dist:build
-
-creates a distribution (including documentation) from
-the current source as well as doing everything that 
-the last comment did.
-
-See the maven documentation for more details and 
-information about the other standard build commands. 
-
-
-Note: 
-	Maven creates the documentation in 
-betwixt/target/docs rather than betwixt/dist/docs.
+Betwixt can also be build using ant from the build.xml file. 
+This file is generated by Maven and all required jars will be 
+downloaded.
\ No newline at end of file

Modified: jakarta/commons/proper/betwixt/trunk/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/RELEASE-NOTES.txt?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/RELEASE-NOTES.txt (original)
+++ jakarta/commons/proper/betwixt/trunk/RELEASE-NOTES.txt Mon Jun 13 14:08:33 2005
@@ -1,7 +1,7 @@
 $Id$
 
                          Commons Betwixt Package
-                               Version 0.6
+                              Version 0.6.1
                               Release Notes
 
 INTRODUCTION:
@@ -18,4 +18,53 @@
 made to some semantics. It is believed that the impact of these changes should 
 be minimal. 
 
-For more details see the tasks document.
\ No newline at end of file
+For more details see the tasks and change log documents.
+
+ENHANCEMENTS AND BUG FIXES
+ * 	Fixed bug in nested element diagnosing empty elements.
+ * 	Added support for polymorphic mappings. 
+    This allows the type of a property to be guessed at bind time
+    (rather than at compile time).
+ *	Added options to context. This replaces direct flavour mechanism. 
+   	(Flavour becomes just a specific option).
+ * 	Factored out id storage into strategy
+ *	anonymous collections now allowed in betwixt files
+ *	Improved introspection support for DynaBeans
+ *	Improved introspection for interfaces superinterface 
+    properties now checked.
+ *	Attribute suppression - Betwixt now allows the 
+    expression of certain values to be suppressed through a custom strategy.
+ *	Custom Dot Betwixt Documents - custom dot betwixt
+    documents can be passed in directly.
+ *	Multi mapping documents allowing several mappings to be
+    specified within a single document.
+ *	Improved support for derived beans bind time type
+    population now supported and enabled by default
+ *	All exceptions are now complex
+ *	PropertySuppressionStrategy added which allows 
+    course grained control of those properties which should be ignored by Betwixt.
+ *	Improved support for java.util collections API implementations.
+    Betwixt now recognizes additional properties on custom collection implementations.
+
+DEPRECATIONS
+ * 	ObjectStringConverter.objectToString replaced by method without flavour in signature 
+ * 	ObjectStringConverter.stringToObject replaced by method without flavour in signature
+
+SEMANTIC CHANGES
+ * 	Betwixt now (by default) suppresses the expression of all empty attributes.
+	The old behaviour can be restored by setting the ValueSuppressionStrategy
+	of the BindingConfiguration used by the writer to 
+	ValueSuppressionStrategy.ALLOW_ALL_VALUES
+ * 	Betwixt now defaults to bind time type mapping. Now read beans will (by default)
+	be populated by their bind time type (as opposed to their introspection time type).
+	Most users should notice no negative effects from this change. The previous behaviour
+	can be enabled by setting an introspection configuration property.
+ * 	All exceptions are now complex types. This is now more consistent but the default
+	binding for exceptions in java.lang package have been changed from simple to complex.
+ * 	Properties on collection implementations are now recognized (rather than ignored)
+	by Betwixt. Please use an appropriate ClassNormalizer for implementations
+	that need to hide their extra properties.
+
+DEPENDENCIES
+ * Upgraded commons-beanutils to 1.7.0
+ * Upgraded commons-digester to 1.6

Modified: jakarta/commons/proper/betwixt/trunk/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/build.xml?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/build.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/build.xml Mon Jun 13 14:08:33 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!--build.xml generated by maven from project.xml version 0.6.1-dev
-  on date October 13 2004, time 2122-->
+<!--build.xml generated by maven from project.xml version 0.6.1
+  on date June 3 2005, time 1039-->
 
 <project default="jar" name="commons-betwixt" basedir=".">
   <property name="defaulttargetdir" value="target">
@@ -20,8 +20,14 @@
   </property>
   <property name="javadocdir" value="dist/docs/api">
   </property>
-  <property name="final.name" value="commons-betwixt-0.6.1-dev">
+  <property name="final.name" value="commons-betwixt-0.6.1">
   </property>
+  <path id="build.classpath">
+    <fileset dir="${libdir}">
+      <include name="**/*.jar">
+      </include>
+    </fileset>
+  </path>
   <target name="init" description="o Initializes some properties">
     <mkdir dir="${libdir}">
     </mkdir>
@@ -29,6 +35,10 @@
       <equals arg2="only" arg1="${build.sysclasspath}">
       </equals>
     </condition>
+    <!--Test if JUNIT is present in ANT classpath-->
+
+    <available property="Junit.present" classname="junit.framework.Test">
+    </available>
   </target>
   <target name="compile" description="o Compile the code" depends="get-deps">
     <mkdir dir="${classesdir}">
@@ -38,11 +48,7 @@
         <pathelement location="src/java">
         </pathelement>
       </src>
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
+      <classpath refid="build.classpath">
       </classpath>
     </javac>
     <copy todir="${classesdir}">
@@ -51,12 +57,6 @@
         </include>
       </fileset>
     </copy>
-    <copy todir="${testclassesdir}">
-      <fileset dir="src/test">
-        <include name="**/*.betwixt">
-        </include>
-      </fileset>
-    </copy>
   </target>
   <target name="jar" description="o Create the jar" depends="compile,test">
     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
@@ -82,7 +82,7 @@
     <fail message="There were test failures.">
     </fail>
   </target>
-  <target name="internal-test" depends="compile-tests">
+  <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
     <mkdir dir="${testreportdir}">
     </mkdir>
     <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
@@ -93,10 +93,8 @@
       <formatter usefile="false" type="plain">
       </formatter>
       <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
+        <path refid="build.classpath">
+        </path>
         <pathelement path="${testclassesdir}">
         </pathelement>
         <pathelement path="${classesdir}">
@@ -110,7 +108,12 @@
       </batchtest>
     </junit>
   </target>
-  <target name="compile-tests" depends="compile">
+  <target name="junit-present" unless="Junit.present" depends="init">
+    <echo>================================= WARNING ================================</echo>
+    <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
     <mkdir dir="${testclassesdir}">
     </mkdir>
     <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
@@ -119,10 +122,8 @@
         </pathelement>
       </src>
       <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
+        <path refid="build.classpath">
+        </path>
         <pathelement path="${classesdir}">
         </pathelement>
       </classpath>
@@ -134,7 +135,7 @@
       </fileset>
     </copy>
   </target>
-  <target name="javadoc" description="o Generate javadoc">
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
     <mkdir dir="${javadocdir}">
     </mkdir>
     <tstamp>
@@ -143,20 +144,20 @@
     </tstamp>
     <property name="copyright" value="Copyright &amp;copy;  The Apache Software Foundation. All Rights Reserved.">
     </property>
-    <property name="title" value="Betwixt 0.6.1-dev API">
+    <property name="title" value="Betwixt 0.6.1 API">
     </property>
     <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.betwixt.*">
       <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-        <pathelement location="${defaulttargetdir}/${final.name}.jar">
-        </pathelement>
+        <path refid="build.classpath">
+        </path>
       </classpath>
     </javadoc>
   </target>
   <target name="get-deps" unless="noget" depends="init">
+    <!--Proxy settings works only with a JDK 1.2 and higher.-->
+
+    <setproxy>
+    </setproxy>
     <get dest="${libdir}/commons-logging-1.0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.2.jar">
     </get>
     <get dest="${libdir}/commons-beanutils-core-1.7.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-core-1.7.0.jar">
@@ -169,12 +170,6 @@
     </get>
     <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
     </get>
-    <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
-    </get>
-    <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar">
-    </get>
-    <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar">
-    </get>
   </target>
   <target name="install-maven">
     <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
@@ -182,4 +177,4 @@
     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
     </unjar>
   </target>
-</project>
+</project>
\ No newline at end of file

Modified: jakarta/commons/proper/betwixt/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/maven.xml?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/maven.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/maven.xml Mon Jun 13 14:08:33 2005
@@ -13,7 +13,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project default="java:jar" xmlns:j="jelly:core">
+<project default="jar:jar" xmlns:j="jelly:core">
 
   <!-- ================================================================== -->
   <!-- START : C O M M O N S - B U I L D                                  -->
@@ -50,19 +50,23 @@
     
     <copy todir="${maven.dist.bin.assembly.dir}">
       <fileset file='${basedir}/RELEASE-NOTES.txt'/>
+      <fileset file='${basedir}/NOTICE.txt'/>
     </copy>
 
   </preGoal>
   
   <preGoal name="dist:build-src">
-    
     <copy todir="${maven.dist.src.assembly.dir}">
-      <fileset file='${basedir}/RELEASE-NOTES.txt'/>
+        <fileset dir="${basedir}">
+            <include name="NOTICE.txt"/>
+            <include name="RELEASE-NOTES.txt"/>
+        </fileset>
     </copy>
 
+    <move todir="${maven.dist.src.assembly.dir}-src">
+      <fileset dir="${maven.dist.src.assembly.dir}"/>
+    </move>
   </preGoal>
-
-
 
   <goal name="test:classpath" prereqs="java:compile, test:compile"
         description="Compiles the tests and sets the testing classpath">

Modified: jakarta/commons/proper/betwixt/trunk/project.properties
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/project.properties?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/project.properties (original)
+++ jakarta/commons/proper/betwixt/trunk/project.properties Mon Jun 13 14:08:33 2005
@@ -21,6 +21,8 @@
 maven.compile.debug = on
 maven.compile.optimize = off
 maven.compile.deprecation = on
+maven.compile.target = 1.1
+maven.target.source=1.2
 
 maven.jarResources.basedir=${basedir}/src/java
 

Modified: jakarta/commons/proper/betwixt/trunk/project.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/project.xml?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/project.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/project.xml Mon Jun 13 14:08:33 2005
@@ -18,7 +18,7 @@
   <pomVersion>3</pomVersion>
   <name>Betwixt</name>
   <id>commons-betwixt</id>
-  <currentVersion>0.6.1</currentVersion>
+  <currentVersion>0.6.1RC3</currentVersion>
   <inceptionYear>2002</inceptionYear>
   <shortDescription>Commons Betwixt</shortDescription>
   <description>Commons Betwixt: mapping beans to XML</description>
@@ -69,15 +69,15 @@
 
   <versions>
     <version>
-      <id>0.6</id>
-      <name>0.6</name>
-      <tag>BETWIXT_0_6</tag>
-    </version>
-    <version>
       <id>0.5</id>
       <name>0.5</name>
       <tag>BETWIXT_0_5</tag>
     </version>
+    <version>
+      <id>0.6</id>
+      <name>0.6</name>
+      <tag>BETWIXT_0_6</tag>
+    </version>
   </versions>
 
   <developers>
@@ -142,7 +142,7 @@
     <dependency>
       <id>commons-logging</id>
       <version>1.0.2</version>
-      <url>http://jakarta.apache.org/commons/logging.html</url>
+      <url>http://jakarta.apache.org/commons/logging/</url>
     </dependency>
 
     <dependency>
@@ -150,7 +150,7 @@
       <typeId>jar</typeId>
       <artifactId>commons-beanutils-core</artifactId>
       <version>1.7.0</version>
-      <url>http://jakarta.apache.org/commons/beanutils.html</url>
+      <url>http://jakarta.apache.org/commons/beanutils/</url>
     </dependency>
     
     <dependency>
@@ -158,7 +158,7 @@
       <typeId>jar</typeId>
       <artifactId>commons-digester</artifactId>
       <version>1.6</version>
-      <url>http://jakarta.apache.org/commons/digester.html</url>
+      <url>http://jakarta.apache.org/commons/digester/</url>
     </dependency>
 
 <!-- runtime dependencies only required for testing and sample programs -->
@@ -206,6 +206,13 @@
             </resources>
         </unitTest>
         <resources>
+        	<resource>
+        		<directory>${basedir}</directory>
+        		<targetPath>META-INF</targetPath>
+        		<includes>
+        			<include>NOTICE.txt</include>
+        		</includes>
+        	</resource>
             <resource>
                 <directory>${pom.build.sourceDirectory}</directory>
                 <includes>
@@ -217,15 +224,19 @@
   	
 
   <reports>
+  	<!--
+  	These reports will be inaccurate until ASF wide conversion to SVN is completed
   	<report>maven-changelog-plugin</report>
    	<report>maven-changes-plugin</report>
     <report>maven-developer-activity-plugin</report>
     <report>maven-file-activity-plugin</report>
+    -->
     <report>maven-javadoc-plugin</report>
     <report>maven-jdepend-plugin</report>
     <report>maven-junit-report-plugin</report>
     <report>maven-jxr-plugin</report>
     <report>maven-license-plugin</report>
     <report>maven-tasklist-plugin</report>
+    <!-- Slow but useful when checking releases <report>maven-linkcheck-plugin</report>-->
   </reports>
 </project>

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/BeanProperty.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/BeanProperty.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/BeanProperty.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/BeanProperty.java Mon Jun 13 14:08:33 2005
@@ -141,7 +141,7 @@
      * Go through and work out whether it's a loop property, a primitive or a standard.
      * The class property is ignored.
      *
-     * @param beanProperty the BeanProperty specifying the property
+     * @param configuration <code>IntrospectionConfiguration</code>, not null
      * @return a correctly configured <code>NodeDescriptor</code> for the property
      */
     public Descriptor createXMLDescriptor( IntrospectionConfiguration configuration ) {

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/BindingConfiguration.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/BindingConfiguration.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/BindingConfiguration.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/BindingConfiguration.java Mon Jun 13 14:08:33 2005
@@ -136,6 +136,7 @@
     /**
      * Gets the <code>ValueSuppressionStrategy</code>.
      * This is used to control the expression of attributes with certain values.
+     * @since 0.6.1
      * @return <code>ValueSuppressionStrategy</code>, not null
      */
     public ValueSuppressionStrategy getValueSuppressionStrategy() {
@@ -145,6 +146,7 @@
     /**
      * Sets the <code>ValueSuppressionStrategy</code>.
      * This is used to control the expression of attributes with certain values.
+     * @since 0.6.1
      * @param valueSuppressionStrategy <code>ValueSuppressionStrategy</code>, not null
      */
     public void setValueSuppressionStrategy(
@@ -155,7 +157,8 @@
     /**
      * Gets the strategy used to manage storage and retrieval of id's.
      * 
-     * @return Returns the idStoringStrategy, not null
+     * @since 0.6.1
+     * @return Returns the <code>IdStoringStrategy</code>, not null
      */
     public IdStoringStrategy getIdMappingStrategy() {
         return idStoringStrategy;
@@ -164,8 +167,9 @@
     /**
      * Sets the strategy used to manage storage and retrieval of id's.
      * 
-     * @param idStoringStrategy
-     *            The idStoringStrategy to set, not null
+     * @since 0.6.1
+     * @param idMappingStrategy
+     *            <code>IdStoringStrategy</code> to be set, not null
      */
     public void setIdMappingStrategy(IdStoringStrategy idMappingStrategy) {
         this.idStoringStrategy = idMappingStrategy;

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/ElementDescriptor.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/ElementDescriptor.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/ElementDescriptor.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/ElementDescriptor.java Mon Jun 13 14:08:33 2005
@@ -173,11 +173,13 @@
      } 
     
     /**
-     * Is this a simple element?
+     * <p>Is this a simple element?</p>
+     * <p>
      * A simple element is one without child elements or attributes.
      * This corresponds to the simple type concept used in XML Schema.
      * TODO: need to consider whether it's sufficient to calculate
-     * which are simple types (and so don't get IDs assigned etc)
+     * which are simple types (and so don't get IDs assigned etc).
+     * </p>
      * @return true if it is a <code>SimpleType</code> element
      */
     public boolean isSimple() {
@@ -306,7 +308,7 @@
       * passed in, unless some other matches the name exactly.
       *
       * @param name the localname to be matched, not null
-      * @returns the child ElementDescriptor with the given name if one exists, 
+      * @return the child ElementDescriptor with the given name if one exists, 
       * otherwise null
       */
     public ElementDescriptor getElementDescriptor(String name) {
@@ -560,15 +562,17 @@
     }
     
     /**
-     * TODO is this implementation correct?
-     * maybe this method is unnecessary
+     * Does this describe a collective?
      */
     public boolean isCollective() {
+        // TODO is this implementation correct?
+        // maybe this method is unnecessary
         return isCollectiveType;
     }
     
     /**
      * Sets whether the element described is a collective.
+     * @since 0.6.1
      * @param isCollectiveType
      */
     public void setCollective(boolean isCollectiveType) {
@@ -576,9 +580,12 @@
     }
 
     /** 
-     * @todo is this really a good design?
+     * Finds the parent of the given descriptor.
+     * @param elementDescriptor <code>ElementDescriptor</code>
+     * @return <code>ElementDescriptor</code>, not null
      */
     public ElementDescriptor findParent(ElementDescriptor elementDescriptor) {
+        //TODO: is this really a good design?
         ElementDescriptor result = null;
         ElementDescriptor[] elementDescriptors = getElementDescriptors();
         for (int i=0, size=elementDescriptors.length; i<size; i++) {
@@ -610,13 +617,15 @@
     }
 
     /**
-     * Is this decriptor hollow?
+     * <p>Is this decriptor hollow?</p>
+     * <p>
      * A hollow descriptor is one which gives only the class that the subgraph
      * is mapped to rather than describing the entire subgraph.
      * A new <code>XMLBeanInfo</code> should be introspected 
      * and that used to describe the subgraph.
      * A hollow descriptor should not have any child descriptors. 
      * TODO: consider whether a subclass would be better
+     * </p>
      * @return true if this is hollow 
      */
     public boolean isHollow() {
@@ -631,18 +640,20 @@
      * and that used to describe the subgraph.
      * A hollow descriptor should not have any child descriptors. 
      * TODO: consider whether a subclass would be better
-     * @param true if this is hollow 
+     * @param isHollow true if this is hollow 
      */
     public void setHollow(boolean isHollow) {
         this.isHollow = isHollow;
     }  
     
     /**
-     * Is the bind time type to be used to determine the mapping?
+     * <p>Is the bind time type to be used to determine the mapping?</p>
+     * <p>
      * The mapping for an object property value can either be the 
      * introspection time type (based on the logical type of the property)
      * or the bind time type (based on the type of the actual instance).
-     * 
+     * </p>
+     * @since 0.6.1
      * @return true if the bind time type is to be used to determine the mapping,
      * false if the introspection time type is to be used
      */
@@ -655,7 +666,7 @@
     }
 
     /**
-     * <p>Sets whether the bind time type to be used to determine the mapping?
+     * <p>Sets whether the bind time type to be used to determine the mapping.
      * The mapping for an object property value can either be the 
      * introspection time type (based on the logical type of the property)
      * or the bind time type (based on the type of the actual instance).
@@ -664,6 +675,7 @@
      * So, the first time that this method is called the value will be set
      * but subsequent calls will be ignored.
      * </p>
+     * @since 0.6.1
      * @param useBindTimeTypeForMapping true if the bind time type is to be used to 
      * determine the mapping, false if the introspection time type is to be used
      */
@@ -674,9 +686,12 @@
     }
 
     /**
-     * Is this a polymorphic element?
+     * <p>Is this a polymorphic element?</p>
+     * <p>
      * A polymorphic element's name is not fixed at 
      * introspection time and it's resolution is postponed to bind time.
+     * </p>
+     * @since 0.6.1
      * @return true if {@link #getQualifiedName} is null, 
      * false otherwise
      */

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/IntrospectionConfiguration.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/IntrospectionConfiguration.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/IntrospectionConfiguration.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/IntrospectionConfiguration.java Mon Jun 13 14:08:33 2005
@@ -227,8 +227,10 @@
     }
     
     /**
-     * Should the original <code>java.reflect.Introspector</code> bean info search path be used?
-     * By default it will be false.
+     * <p>Should the original <code>java.reflect.Introspector</code> bean info search path be used?</p>
+     * <p>
+     * Default is false.
+     * </p>
      * 
      * @return boolean if the beanInfoSearchPath should be used.
      */
@@ -346,6 +348,7 @@
      * Gets the <code>MappingDerivationStrategy</code>
      * used to determine whether the bind or introspection time
      * type should determine the mapping.
+     * @since 0.6.1
      * @return <code>MappingDerivationStrategy</code>, not null
      */
     public MappingDerivationStrategy getMappingDerivationStrategy() {
@@ -355,6 +358,7 @@
      * Sets the <code>MappingDerivationStrategy</code>
      * used to determine whether the bind or introspection time
      * type should determine the mapping.
+     * @since 0.6.1
      * @param mappingDerivationStrategy <code>MappingDerivationStrategy</code>, not null
      */
     public void setMappingDerivationStrategy(
@@ -364,6 +368,7 @@
 
     /**
      * Gets the strategy which determines the properties to be ignored.
+     * @since 0.6.1
      * @return the <code>PropertySuppressionStrategy</code> to be used for introspection, not null
      */
     public PropertySuppressionStrategy getPropertySuppressionStrategy() {
@@ -372,6 +377,7 @@
     
     /**
      * Sets the strategy which determines the properties to be ignored.
+     * @since 0.6.1
      * @param propertySuppressionStrategy the <code>PropertySuppressionStrategy</code> to be used for introspection, not null
      */
     public void setPropertySuppressionStrategy(
@@ -381,7 +387,7 @@
     
     /** 
      * Is this a loop type class?
-     *
+     * @since 0.6.1
      * @param type is this <code>Class</code> a loop type?
      * @return true if the type is a loop type, or if type is null 
      */

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/Options.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/Options.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/Options.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/Options.java Mon Jun 13 14:08:33 2005
@@ -43,7 +43,7 @@
     
     /**
      * Gets the names of each option.
-     * @return 
+     * @return <code>String</code> array containing the name of each option
      */
     public String[] getNames() {
         Set names = valuesByName.keySet();

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/XMLIntrospector.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/XMLIntrospector.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/XMLIntrospector.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/XMLIntrospector.java Mon Jun 13 14:08:33 2005
@@ -247,6 +247,7 @@
      * is called. Therefore, a call to {@link #setPolymorphicReferenceResolver(PolymorphicReferenceResolver)}
      * with the instance may be necessary. 
      * </p>
+     * @since 0.6.1
      * @return <code>PolymorphicReferenceResolver</code>, not null
      */
     public PolymorphicReferenceResolver getPolymorphicReferenceResolver() {
@@ -266,6 +267,7 @@
      * is called. Therefore, a call to {@link #setPolymorphicReferenceResolver(PolymorphicReferenceResolver)}
      * with the instance may be necessary. 
      * </p>
+     * @since 0.6.1
      * @param polymorphicReferenceResolver The polymorphicReferenceResolver to set.
      */
     public void setPolymorphicReferenceResolver(
@@ -515,6 +517,7 @@
      * be registered by this method. Use {@link #register(Class, InputSource)}
      * instead.
      * </p>
+     * @since 0.6.1
      * @param aClass <code>Class</code>, not null
      * @param source <code>InputSource</code>, not null
      * @return <code>XMLBeanInfo</code> describing the mapping.
@@ -600,6 +603,7 @@
      * <strong>Note:</strong> that this method will override any existing mapping
      * for the speficied classes.
      * </p>
+     * @since 0.6.1
      * @param source <code>InputSource</code>, not null
      * @return <code>Class</code> array containing all mapped classes
      * @throws IntrospectionException
@@ -649,6 +653,7 @@
      * <strong>Note:</strong> that this method will override any existing mapping
      * for this class.
      * </p>
+     * @since 0.6.1
      * @param aClass <code>Class</code>, not null
      * @param source <code>InputSource</code>, not null
      * @throws SAXException when the source cannot be parsed
@@ -828,17 +833,16 @@
      * called multiple times. This is relatively expensive and so it'd be better
      * to push into a proper class and cache.
      * <br>
-     * TODO this probably does work properly with DynaBeans: need to push
-     * implementation into an class and expose it on BeanType.
-     *
-     * @param introspector use this <code>XMLIntrospector</code> for introspection
+     * 
      * @param rootDescriptor add defaults to this descriptor
      * @param beanClass the <code>Class</code> to which descriptor corresponds
      */
     public void defaultAddMethods( 
                                             ElementDescriptor rootDescriptor, 
                                             Class beanClass ) {
-                                              
+        // TODO: this probably does work properly with DynaBeans: need to push
+        // implementation into an class and expose it on BeanType.  
+        
         // lets iterate over all methods looking for one of the form
         // add*(PropertyType)
         if ( beanClass != null ) {
@@ -1392,12 +1396,13 @@
     
     /** 
      * Is this class a primitive?
-     * TODO: this method will probably be deprecated when primitive types
-     * are subsumed into the simple type concept 
+     * 
      * @param type the Class to test
      * @return true for primitive types 
      */
     public boolean isPrimitiveType(Class type) {
+        // TODO: this method will probably be deprecated when primitive types
+        // are subsumed into the simple type concept 
         TypeBindingStrategy.BindingType bindingType 
 			= configuration.getTypeBindingStrategy().bindingType( type ) ;
         boolean result = (bindingType.equals(TypeBindingStrategy.BindingType.PRIMITIVE));

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/ClassRule.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/ClassRule.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/ClassRule.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/ClassRule.java Mon Jun 13 14:08:33 2005
@@ -25,6 +25,7 @@
 
 /**
  * Digester Rule to process class elements.
+ * @since 0.6.1
  * @author Brian Pugh
  */
 public class ClassRule extends RuleSupport {

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/ConfigRule.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/ConfigRule.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/ConfigRule.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/ConfigRule.java Mon Jun 13 14:08:33 2005
@@ -23,6 +23,7 @@
 
 /**
  * Digester Rule to process config elements.
+ * @since 0.6.1
  * @author Brian Pugh
  */
 public class ConfigRule extends RuleSupport {

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/MappedPropertyRule.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/MappedPropertyRule.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/MappedPropertyRule.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/MappedPropertyRule.java Mon Jun 13 14:08:33 2005
@@ -26,7 +26,7 @@
   * Maybe a lot of this should be moved into <code>BeanUtils</code>.</p>
   *
   * @author Robert Burrell Donkin
-  * @sinec 0.5
+  * @since 0.5
   */
 public abstract class MappedPropertyRule extends RuleSupport {
 

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/MultiMappingBeanInfoDigester.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/MultiMappingBeanInfoDigester.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/MultiMappingBeanInfoDigester.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/MultiMappingBeanInfoDigester.java Mon Jun 13 14:08:33 2005
@@ -22,6 +22,7 @@
  * <code>XMLSingleMappingFileBeanInfoDigester</code> is a digester of XML files
  * containing XMLBeanInfo definitions for a JavaBeans.
  *
+ * @since 0.6.1
  * @author Brian Pugh
  */
 public class MultiMappingBeanInfoDigester extends XMLBeanInfoDigester {

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/XMLIntrospectorHelper.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/XMLIntrospectorHelper.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/XMLIntrospectorHelper.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/digester/XMLIntrospectorHelper.java Mon Jun 13 14:08:33 2005
@@ -551,7 +551,7 @@
      *
      * @param type is this <code>Class</code> a loop type?
      * @return true if the type is a loop type, or if type is null 
-     * @deprecated
+     * @deprecated 0.6.1 replaced by {@link org.apache.commons.betwixt.IntrospectionConfiguration#isLoopType(Class)}
      */
     public static boolean isLoopType(Class type) {
         // check for NPEs

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/expression/Context.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/expression/Context.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/expression/Context.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/expression/Context.java Mon Jun 13 14:08:33 2005
@@ -259,6 +259,7 @@
     /**
      * Gets the <code>ValueSuppressionStrategy</code>.
      * This is used to control the expression of attributes with certain values.
+     * @since 0.6.1
      * @return <code>ValueSuppressionStrategy</code>, not null
      */
     public ValueSuppressionStrategy getValueSuppressionStrategy() {
@@ -268,6 +269,7 @@
     /**
      * Sets the <code>ValueSuppressionStrategy</code>.
      * This is used to control the expression of attributes with certain values.
+     * @since 0.6.1
      * @param valueSuppressionStrategy <code>ValueSuppressionStrategy</code>, not null
      */
     public void setValueSuppressionStrategy(
@@ -277,7 +279,7 @@
     
     /**
      * Gets the strategy used to manage storage and retrieval of id's.
-     * 
+     * @since 0.6.1
      * @return Returns the idStoringStrategy, not null
      */
     public IdStoringStrategy getIdMappingStrategy() {
@@ -288,6 +290,7 @@
      * Gets the current <code>Options</code>.
      * @return <code>Options</code> that currently apply
      * or null if there are no current options.
+     * @since 0.6.1
      */
     public Options getOptions() {
         Options results = null;
@@ -304,6 +307,7 @@
      * is called once the options are no longer current.
      * This ensures that the previous options are reinstated.
      * </p>
+     * @since 0.6.1
      * @param options newly current <code>Options</code>, not null 
      */
     public void pushOptions(Options options) {
@@ -317,6 +321,7 @@
      * </p><p>
      * <stong>Note</strong> code calling this method should
      * have previsouly called {@link #popOptions}.
+     * @since 0.6.1
      */
     public void popOptions() {
         if (optionStack.isEmpty()) {

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/expression/DynaBeanUpdater.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/expression/DynaBeanUpdater.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/expression/DynaBeanUpdater.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/expression/DynaBeanUpdater.java Mon Jun 13 14:08:33 2005
@@ -20,6 +20,7 @@
 
 /**
  * Updates <code>DynaBean</code>'s.
+ * @since 0.6.1
  * @author <a href='http://jakarta.apache.org/commons'>Jakarta Commons Team</a>, <a href='http://www.apache.org'>Apache Software Foundation</a>
  */
 public class DynaBeanUpdater extends TypedUpdater {
@@ -50,7 +51,7 @@
     
     /**
      * Executes the update on the given code>DynaBean</code>
-     * @see org.apache.commons.betwixt.expression.TypedUpdater#executeUpdate(java.lang.Object, java.lang.Object)
+     * @see org.apache.commons.betwixt.expression.TypedUpdater#executeUpdate(Context, java.lang.Object, java.lang.Object)
      */
     protected void executeUpdate(Context context, Object bean, Object value) throws Exception {
         if (bean instanceof DynaBean)

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/expression/MethodUpdater.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/expression/MethodUpdater.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/expression/MethodUpdater.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/expression/MethodUpdater.java Mon Jun 13 14:08:33 2005
@@ -92,6 +92,7 @@
 
     /**
      * Updates the bean by method invocation.    
+     * @since 0.6.1
      */
     protected void executeUpdate(Context context, Object bean, Object newValue) throws Exception {
         if ( log.isDebugEnabled() ) {

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/expression/TypedUpdater.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/expression/TypedUpdater.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/expression/TypedUpdater.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/expression/TypedUpdater.java Mon Jun 13 14:08:33 2005
@@ -25,6 +25,7 @@
  * Abstracts common features for strongly typed <code>Updater</code>'s.
  * Strongly type <code>Updater</code>'s perform conversions based on this
  * the expected type before the bean update is invoked.
+ * @since 0.6.1
  * @author <a href='http://jakarta.apache.org/commons'>Jakarta Commons Team</a>, <a href='http://www.apache.org'>Apache Software Foundation</a>
  */
 public abstract class TypedUpdater implements Updater {

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=190509&r1=190508&r2=190509&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 Mon Jun 13 14:08:33 2005
@@ -38,14 +38,6 @@
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 
-// FIX ME!!!
-// Logging logic!
-
-// FIX ME!!
-// Error handling strategy!
-// i'm going to add SAXExceptions everywhere since it's the easiest way to make things work quick
-// but this is a poor strategy
-
 /**
   * <p>Abstract superclass for bean writers.
   * This class encapsulates the processing logic. 
@@ -192,8 +184,9 @@
      * {@link #write(Object)}.
      * </p>
      * @see #write(Object) since the standard notes also apply
+     * @since 0.6.1
      * @param bean <code>Object</code> to be written as xml, not null
-     * @param mapping <code>InputSource/code> containing an xml document
+     * @param source <code>InputSource/code> containing an xml document
      * specifying the mapping to be used (in the usual way), not null
      * @throws IOException
      * @throws SAXException

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/BeanCreateRule.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/BeanCreateRule.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/BeanCreateRule.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/BeanCreateRule.java Mon Jun 13 14:08:33 2005
@@ -540,8 +540,9 @@
         return (BeanReader) getDigester();
     }
     
-    /** Allows the navigation from a reference to a property object to the descriptor defining what 
-     * the property is. i.e. doing the join from a reference to a type to lookup its descriptor.
+    /** 
+     * Allows the navigation from a reference to a property object to the descriptor defining what 
+     * the property is. In other words, doing the join from a reference to a type to lookup its descriptor.
      * This could be done automatically by the NodeDescriptors. Refer to TODO.txt for more info.
      *
      * @param propertyDescriptor find descriptor for property object referenced by this descriptor

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/BeanReader.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/BeanReader.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/BeanReader.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/BeanReader.java Mon Jun 13 14:08:33 2005
@@ -201,9 +201,10 @@
      * It is recommended that use of the pre-registeration process provided
      * by {@link XMLIntrospector#register}  be considered as an alternative to this method.
      * </p>
-     * @see {@link #registerBeanClass(Class)} since the general notes given there
+     * @see #registerBeanClass(Class) since the general notes given there
      * apply equally to this 
-     * @see {@link XMLIntrospector#register(InputSource) for more details on the multi-mapping format
+     * @see XMLIntrospector#register(InputSource) for more details on the multi-mapping format
+     * @since 0.6.1
      * @param mapping <code>InputSource</code> giving the multi-mapping document specifying 
      * the mapping
      * @throws IntrospectionException
@@ -232,8 +233,9 @@
      * It is recommended that use of the pre-registeration process provided
      * by {@link XMLIntrospector#register}  be considered as an alternative to this method.
      * </p>
-     * @see {@link #registerBeanClass(Class)} since the general notes given there
+     * @see #registerBeanClass(Class) since the general notes given there
      * apply equally to this 
+     * @since 0.6.1
      * @param mapping <code>InputSource</code> giving the dot betwixt document specifying 
      * the mapping
      * @param beanClass <code>Class</code> that should be register

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/BeanRuleSet.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/BeanRuleSet.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/BeanRuleSet.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/BeanRuleSet.java Mon Jun 13 14:08:33 2005
@@ -95,7 +95,6 @@
      * @param introspector the <code>XMLIntrospector</code> used to introspect 
      * @param basePath specifies the (Digester-style) path under which the rules will be attached
      * @param baseElementDescriptor the <code>ElementDescriptor</code> used to create the rules
-     * @param baseBeanClass the <code>Class</code> whose mapping rules will be created
      * @param context the root Context that bean carrying Contexts should be obtained from, 
      * not null
      * @deprecated 0.6 use the constructor which takes a ReadContext instead
@@ -192,7 +191,7 @@
     //-------------------------------- Ruleset implementation
 
     /** 
-     * <p>Return namespace associated with this ruleset</p>
+     * <p>Gets the namespace associated with this ruleset.</p>
      *
      * <p><strong>Note</strong> namespaces are not currently supported.</p>
      * 

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/BeanWriter.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/BeanWriter.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/BeanWriter.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/BeanWriter.java Mon Jun 13 14:08:33 2005
@@ -290,12 +290,14 @@
     }
     
     /**
-     * Should an end tag be added for each empty element?
+     * <p>Should an end tag be added for each empty element?
+     * </p><p>
      * When this property is false then empty elements will
      * be written as <code>&lt;<em>element-name</em>/gt;</code>.
      * When this property is true then empty elements will
      * be written as <code>&lt;<em>element-name</em>gt;
      * &lt;/<em>element-name</em>gt;</code>.
+     * </p>
      * @return true if an end tag should be added
      */
     public boolean isEndTagForEmptyElement() {
@@ -303,7 +305,7 @@
     }
     
     /**
-     * Sets when an an end tag be added for each empty element?
+     * Sets when an an end tag be added for each empty element.
      * When this property is false then empty elements will
      * be written as <code>&lt;<em>element-name</em>/gt;</code>.
      * When this property is true then empty elements will

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/WriteContext.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/WriteContext.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/WriteContext.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/WriteContext.java Mon Jun 13 14:08:33 2005
@@ -30,7 +30,7 @@
  * It is likely that access will be required to methods in the
  * <code>Context</code> used by the {@link AbstractBeanWriter}
  * but it seems better to add these as neccessary using delegation
- * rather than extending {@link Context}.
+ * rather than extending {@link org.apache.commons.betwixt.expression.Context}.
  * </p>
  * @author <a href='http://jakarta.apache.org/'>Jakarta Commons Team</a>
  * @since 0.5

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/id/RandomIDGenerator.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/id/RandomIDGenerator.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/id/RandomIDGenerator.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/id/RandomIDGenerator.java Mon Jun 13 14:08:33 2005
@@ -57,7 +57,7 @@
     }
     
     /** 
-      * <p>Generates a random <code>ID</code><p>
+      * <p>Generates a random <code>ID</code>.</p>
       * 
       * <p>If the <code>PositiveIds</code> property is true, 
       * then this method will recursively call itself if the random

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/read/ReadContext.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/read/ReadContext.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/read/ReadContext.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/io/read/ReadContext.java Mon Jun 13 14:08:33 2005
@@ -319,7 +319,7 @@
 
 	/**
 	 * Pops an action mapping from the stack
-	 * @return
+	 * @return <code>MappingAction</code>, not null
 	 */
 	public MappingAction popMappingAction() {
 		return (MappingAction) actionMappingStack.pop();
@@ -358,7 +358,7 @@
     /**
      * Pops the last mapping <code>Object</code> from the 
      * stack containing beans that have been mapped.
-     * @return 
+     * @return the last bean pushed onto the stack
      */
 	public Object popBean() {
 		return objectStack.pop();
@@ -375,7 +375,7 @@
     /**
      * Gets the <code>XMLIntrospector</code> to be used to create
      * the mappings for the xml.
-     * @return <code>XMLIntrospector, not null
+     * @return <code>XMLIntrospector</code>, not null
      */
 	public XMLIntrospector getXMLIntrospector() {
         // read context is not intended to be used by multiple threads

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/registry/DefaultXMLBeanInfoRegistry.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/registry/DefaultXMLBeanInfoRegistry.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/registry/DefaultXMLBeanInfoRegistry.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/registry/DefaultXMLBeanInfoRegistry.java Mon Jun 13 14:08:33 2005
@@ -70,6 +70,7 @@
      * first suitable match. 
      * If a suitable one is found, then the class of that info is used. 
      * @see org.apache.commons.betwixt.registry.PolymorphicReferenceResolver#resolveType(org.apache.commons.betwixt.io.read.ElementMapping, org.apache.commons.betwixt.io.read.ReadContext)
+     * @since 0.6.1
      */
     public Class resolveType(ElementMapping mapping, ReadContext context) {
         Class result = null;

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/registry/PolymorphicReferenceResolver.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/registry/PolymorphicReferenceResolver.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/registry/PolymorphicReferenceResolver.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/registry/PolymorphicReferenceResolver.java Mon Jun 13 14:08:33 2005
@@ -26,13 +26,14 @@
  * When the xml is read, the type can then resolved from 
  * by calling {@link #resolveType}.
  * </p>
+ * @since 0.6.1
  * @author <a href='http://jakarta.apache.org/'>Jakarta Commons Team</a>
  */
 public interface PolymorphicReferenceResolver {
 
     /**
      * Resolves the bind-time type of a polymorphic element.
-     * @param descriptor <code>ElementMapping</code> describing the (polymorphic) element being mapped,
+     * @param mapping <code>ElementMapping</code> describing the (polymorphic) element being mapped,
      * not null
      * @param context <code>ReadContext</code>, not null
      * @return the <code>Class</code> describing the type to which this element should be bound,

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/Attribute.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/Attribute.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/Attribute.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/Attribute.java Mon Jun 13 14:08:33 2005
@@ -44,7 +44,7 @@
 
     /**
      * Gets the attribute name
-     * @return
+     * @return name of this attribute, not null
      */
     public String getName() {
         return name;
@@ -52,7 +52,7 @@
 
     /**
      * Sets the attribute name
-     * @param string
+     * @param string the name for this attribute, not null
      */
     public void setName(String string) {
         name = string;
@@ -60,7 +60,7 @@
 
 	/**
 	 * Gets the attribute type
-	 * @return
+	 * @return the type of this attribute
 	 */
 	public String getType() {
 		return type;
@@ -68,7 +68,7 @@
 
     /**
      * Sets the attribute type
-     * @param string
+     * @param string the attribute type
      */
     public void setType(String string) {
         type = string;

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/ComplexType.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/ComplexType.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/ComplexType.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/ComplexType.java Mon Jun 13 14:08:33 2005
@@ -12,7 +12,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */ 
+ */
 
 package org.apache.commons.betwixt.schema;
 
@@ -25,10 +25,11 @@
 import org.apache.commons.betwixt.XMLBeanInfo;
 
 /**
- * Models a <code>complexType</code>.
- * Global (top level) complex types are represented by {@link GlobalComplexType}.
- * Locally defined or referenced complex types are represented by {@link LocalComplexType}. 
- * @author <a href='http://jakarta.apache.org/'>Jakarta Commons Team</a>
+ * Models a <code>complexType</code>. Global (top level) complex types are
+ * represented by {@link GlobalComplexType}. Locally defined or referenced
+ * complex types are represented by {@link LocalComplexType}.
+ * 
+ * @author <a href='http://jakarta.apache.org/'>Jakarta Commons Team </a>
  * @version $Revision$
  */
 public abstract class ComplexType {
@@ -37,20 +38,27 @@
 
     protected List attributes = new ArrayList();
 
-    public ComplexType() {}
+    public ComplexType() {
+    }
 
-    public ComplexType(TranscriptionConfiguration configuration, ElementDescriptor elementDescriptor, Schema schema) throws IntrospectionException {
+    public ComplexType(TranscriptionConfiguration configuration,
+            ElementDescriptor elementDescriptor, Schema schema)
+            throws IntrospectionException {
         elementDescriptor = fillDescriptor(elementDescriptor, schema);
-        init(configuration, elementDescriptor, schema);      
+        init(configuration, elementDescriptor, schema);
     }
 
     /**
+     * Fills the given descriptor
+     * @since 0.6.1
      * @param elementDescriptor
      * @param schema
-     * @return
-     * @throws IntrospectionException
+     * @return @throws
+     *         IntrospectionException
      */
-    protected ElementDescriptor fillDescriptor(ElementDescriptor elementDescriptor, Schema schema) throws IntrospectionException {
+    protected ElementDescriptor fillDescriptor(
+            ElementDescriptor elementDescriptor, Schema schema)
+            throws IntrospectionException {
         if (elementDescriptor.isHollow()) {
             // need to introspector for filled descriptor
             Class type = elementDescriptor.getSingularPropertyType();
@@ -63,70 +71,81 @@
         return elementDescriptor;
     }
 
-    protected void init(TranscriptionConfiguration configuration, ElementDescriptor elementDescriptor, Schema schema) throws IntrospectionException {
-        
-        AttributeDescriptor[] attributeDescriptors = elementDescriptor.getAttributeDescriptors();
-        for (int i=0,length=attributeDescriptors.length; i<length ; i++) {
+    protected void init(TranscriptionConfiguration configuration,
+            ElementDescriptor elementDescriptor, Schema schema)
+            throws IntrospectionException {
+
+        AttributeDescriptor[] attributeDescriptors = elementDescriptor
+                .getAttributeDescriptors();
+        for (int i = 0, length = attributeDescriptors.length; i < length; i++) {
             //TODO: need to think about computing schema types from descriptors
             // this will probably depend on the class mapped to
             String uri = attributeDescriptors[i].getURI();
-            if (! SchemaTranscriber.W3C_SCHEMA_INSTANCE_URI.equals(uri)) {
+            if (!SchemaTranscriber.W3C_SCHEMA_INSTANCE_URI.equals(uri)) {
                 attributes.add(new Attribute(attributeDescriptors[i]));
             }
         }
-        
+
         //TODO: add support for spacing elements
-        ElementDescriptor[] elementDescriptors = elementDescriptor.getElementDescriptors();
-        for (int i=0,length=elementDescriptors.length; i<length ; i++) {
+        ElementDescriptor[] elementDescriptors = elementDescriptor
+                .getElementDescriptors();
+        for (int i = 0, length = elementDescriptors.length; i < length; i++) {
             if (elementDescriptors[i].isHollow()) {
-                elements.add(new ElementReference(configuration, elementDescriptors[i], schema));
-            } else if (elementDescriptors[i].isSimple()){
-                elements.add(new SimpleLocalElement(configuration, elementDescriptors[i], schema));
+                elements.add(new ElementReference(configuration,
+                        elementDescriptors[i], schema));
+            } else if (elementDescriptors[i].isSimple()) {
+                elements.add(new SimpleLocalElement(configuration,
+                        elementDescriptors[i], schema));
             } else {
-                elements.add(new ComplexLocalElement(configuration, elementDescriptors[i], schema));
+                elements.add(new ComplexLocalElement(configuration,
+                        elementDescriptors[i], schema));
             }
-        } 
+        }
     }
 
     /**
-    	 * Gets the elements contained by this type
-    	 * @return 
-    	 */
+     * Gets the elements contained by this type
+     * 
+     * @return <code>List</code> of contained elements, not null
+     */
     public List getElements() {
-    		return elements;
+        return elements;
     }
 
     /**
-    	 * Adds an element to those contained by this type
-    	 * @param element
-    	 */
+     * Adds an element to those contained by this type
+     * 
+     * @param element
+     */
     public void addElement(ElementReference element) {
         elements.add(element);
     }
-    
-    /**
-          * Adds an element to those contained by this type
-          * @param element
-          */
-     public void addElement(LocalElement element) {
-         elements.add(element);
-     }
 
+    /**
+     * Adds an element to those contained by this type
+     * 
+     * @param element
+     */
+    public void addElement(LocalElement element) {
+        elements.add(element);
+    }
 
     /**
-    	 * Gets the attributes contained by this type.
-    	 * @return
-    	 */
+     * Gets the attributes contained by this type.
+     * 
+     * @return <code>List</code> of attributes
+     */
     public List getAttributes() {
         return attributes;
     }
 
     /**
-    	 * Adds an attribute to those contained by this type
-    	 * @param attribute
-    	 */
+     * Adds an attribute to those contained by this type
+     * 
+     * @param attribute
+     */
     public void addAttribute(Attribute attribute) {
-    		attributes.add(attribute);
+        attributes.add(attribute);
     }
 
-}
+}
\ No newline at end of file

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/GlobalComplexType.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/GlobalComplexType.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/GlobalComplexType.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/GlobalComplexType.java Mon Jun 13 14:08:33 2005
@@ -48,6 +48,7 @@
 
     /**
      * Fills the complex type description.
+     * @since 0.6.1
      * @param configuration
      * @param elementDescriptor
      * @param schema
@@ -65,6 +66,7 @@
     
     /**
      * Does the given element descriptor match this complex type?
+     * @since 0.6.1
      * @param elementDescriptor
      * @return true if the descriptor matches
      */
@@ -75,7 +77,7 @@
     
 	/**
      * Gets the name of this type.
-     * @return
+     * @return the name of this type
      */
     public String getName() {
         return name;

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/GlobalElement.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/GlobalElement.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/GlobalElement.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/GlobalElement.java Mon Jun 13 14:08:33 2005
@@ -65,7 +65,7 @@
 
     /**
      * Gets the element type
-     * @return
+     * @return the type of the element
      */
     public String getType() {
         return type;

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/Schema.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/Schema.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/Schema.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/Schema.java Mon Jun 13 14:08:33 2005
@@ -127,6 +127,7 @@
      * Adds a new global complex type definition matching the given element descriptor.
      * If this element descriptor has already been mapped to a global type then 
      * that is returned.
+     * @since 0.6.1
      * @param configuration <code>TranscriptionConfiguration</code>, not null
      * @param elementDescriptor <code>ElementDescriptor</code>, not null
      * @return <code>GlobalComplexType</code>

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/SimpleType.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/SimpleType.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/SimpleType.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/schema/SimpleType.java Mon Jun 13 14:08:33 2005
@@ -29,7 +29,7 @@
 	
     /**
      * Gets the name
-     * @return
+     * @return the name of this type
      */
     public String getName() {
         return name;
@@ -37,7 +37,7 @@
 
     /**
      * Sets the name
-     * @param string
+     * @param name
      */
     public void setName(String name) {
         this.name = name;

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/HyphenatedNameMapper.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/HyphenatedNameMapper.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/HyphenatedNameMapper.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/HyphenatedNameMapper.java Mon Jun 13 14:08:33 2005
@@ -69,7 +69,7 @@
     
     /**
      * <p>The words within the bean name are deduced assuming the
-     * first-letter-capital (e.g. camel's hump) naming convention. For
+     * first-letter-capital (for example camel's hump) naming convention. For
      * example, the words in <code>FooBar</code> are <code>foo</code>
      * and <code>bar</code>.</p>
      * 
@@ -134,9 +134,11 @@
     }
     
     /** 
-     * Should the bean name be converted to upper case?
+     * <p>Should the bean name be converted to upper case?
+     * </p>
+     * <p>
      * Otherwise, it will be converted to lower case.
-     *
+     * </p>
      * @return whether upper or lower case conversions should be performed, 
      * which defaults to false for lower case
      */    

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/IdStoringStrategy.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/IdStoringStrategy.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/IdStoringStrategy.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/IdStoringStrategy.java Mon Jun 13 14:08:33 2005
@@ -41,7 +41,7 @@
      * Retrieves a reference for the given instance.
      * If a not null value is returned from this method,
      * then the bean content will not be written.
-     * Use {@link IDGenerator} strategy to vary the values
+     * Use {@link org.apache.commons.betwixt.io.IDGenerator} strategy to vary the values
      * written for a bean.
      * 
      * @param context

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/ListedClassNormalizer.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/ListedClassNormalizer.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/ListedClassNormalizer.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/ListedClassNormalizer.java Mon Jun 13 14:08:33 2005
@@ -70,7 +70,7 @@
     
     /**
       * Adds the given substitute to the list.
-      * This is a convenience method useful when {@link isStrickCheck} is false.
+      * This is a convenience method useful when {@link #isStrickCheck} is false.
       * In this case, any subclasses (if this is a class) or implementating classes
       * if this is an interface) will be subsituted with this value.
       * @param substitute sustitude this Class

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/MappingDerivationStrategy.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/MappingDerivationStrategy.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/MappingDerivationStrategy.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/MappingDerivationStrategy.java Mon Jun 13 14:08:33 2005
@@ -31,6 +31,7 @@
  * use bind time type mapping) and then dot betwixt files to provide
  * refinements.
  * </p>
+ * @since 0.6.1
  * @author <a href='http://jakarta.apache.org/commons'>Jakarta Commons Team</a>, 
  * <a href='http://www.apache.org'>Apache Software Foundation</a>
  */

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/MixedContentEncodingStrategy.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/MixedContentEncodingStrategy.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/MixedContentEncodingStrategy.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/MixedContentEncodingStrategy.java Mon Jun 13 14:08:33 2005
@@ -23,7 +23,7 @@
  * <p>Encodes body content.
  * </p><p>
  * <strong>Usage:</strong> 
- * Used by {@link BeanWriter} to encode body content before it is written
+ * Used by {@link org.apache.commons.betwixt.io.BeanWriter} to encode body content before it is written
  * into the textual output.
  * This gives flexibility in this stage allowing (for example)
  * some properties to use character escaping whilst others 

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/ObjectStringConverter.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/ObjectStringConverter.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/ObjectStringConverter.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/ObjectStringConverter.java Mon Jun 13 14:08:33 2005
@@ -52,7 +52,7 @@
       * @param type the property class of the object, not null
       * @param flavour a string allow symantic differences in formatting to be communicated
       * @param context the context, not null
-      * @deprecated  use {@link #objectToString(Object, Class, Context)} instead. 
+      * @deprecated 0.6.1 use {@link #objectToString(Object, Class, Context)} instead. 
       * The preferred way to support flavours is by setting the
       * <code>org.apache.commons.betwixt.FLAVOUR</code> option.
       * This can then be retrieved by calling {@link Context#getOptions()}
@@ -75,7 +75,7 @@
       * @param type the property class to be returned (if possible), not null
       * @param flavour a string allow symantic differences in formatting to be communicated
       * @param context the context, not null
-      * @deprecated use {@link #stringToObject(String, Class, Context)} instead.
+      * @deprecated 0.6.1 use {@link #stringToObject(String, Class, Context)} instead.
       * The preferred way to support flavours is by setting the
       * <code>org.apache.commons.betwixt.FLAVOUR</code> option.
       * This can then be retrieved by calling {@link Context#getOptions()}
@@ -91,6 +91,7 @@
       * This basic implementation returns object.toString() 
       * or an empty string if the given object is null.
       *
+      * @since 0.6.1
       * @param object the object to be converted, possibly null
       * @param type the property class of the object, not null
       * @param context the context, not null
@@ -107,6 +108,7 @@
       * the string to the given class type.
       * This basic implementation just returns a string.
       * 
+      * @since 0.6.1
       * @param value the String to be converted
       * @param type the property class to be returned (if possible), not null
       * @param context the context, not null

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/PropertySuppressionStrategy.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/PropertySuppressionStrategy.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/PropertySuppressionStrategy.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/PropertySuppressionStrategy.java Mon Jun 13 14:08:33 2005
@@ -21,6 +21,7 @@
  * Pluggable strategy specifying whether property's should be surpressed.
  * Implementations can be used to give rules about which properties 
  * should be ignored by Betwixt when introspecting.
+ * @since 0.6.1
  * @author <a href='http://jakarta.apache.org/commons'>Jakarta Commons Team</a>, <a href='http://www.apache.org'>Apache Software Foundation</a>
  */
 public abstract class PropertySuppressionStrategy {

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/ValueSuppressionStrategy.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/ValueSuppressionStrategy.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/ValueSuppressionStrategy.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/ValueSuppressionStrategy.java Mon Jun 13 14:08:33 2005
@@ -20,7 +20,8 @@
 /**
  * Determines whether the expression of an attribute with a values 
  * should be suppressed.
- * 
+ *
+ * @since 0.6.1 
  * @author <a href='http://jakarta.apache.org/commons'>Jakarta Commons Team</a>, <a href='http://www.apache.org'>Apache Software Foundation</a>
  */
 public abstract class ValueSuppressionStrategy {

Modified: jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/package.html
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/package.html?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/package.html (original)
+++ jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/package.html Mon Jun 13 14:08:33 2005
@@ -19,7 +19,7 @@
 <body>
 
   <p>This package contains a variety of plugin Strategy patterns that can be used to customize the
-  default behaviour.of the XMLIntrospector
+  default behaviours.
   </p>
   
   <p>

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestClassProperty.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestClassProperty.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestClassProperty.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/TestClassProperty.java Mon Jun 13 14:08:33 2005
@@ -66,7 +66,7 @@
                 });
 
         // test with class without dot-betwixt file...
-        Object bean = new Locale("de"); // just a bean with some properties
+        Object bean = new Locale("de", "de"); // just a bean with some properties
         beanWriter.write(bean);
 
         // was the class element written?..

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/derived/TestWriteClass.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/derived/TestWriteClass.java?rev=190509&r1=190508&r2=190509&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/derived/TestWriteClass.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/derived/TestWriteClass.java Mon Jun 13 14:08:33 2005
@@ -82,7 +82,7 @@
         		"<name>Sir Anthony Federick Blunt</name>" +
         		"</normal-person>";
         
-        xmlAssertIsomorphicContent("Expected secrets to be supressed", parseString(expected), parseString(out.toString()));
+        xmlAssertIsomorphicContent("Expected secrets to be supressed", parseString(expected), parseString(out.toString()), true);
 
     }
 }



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