Branch for 1.3.2 release.

.classpath

@@ -60,7 +60,7 @@
 	<classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.2/cglib-nodep-2.2.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/apache/velocity/velocity/1.5/velocity-1.5.jar"/>
 	<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar"/>
+	<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
 	<classpathentry kind="var" path="M2_REPO/ant/ant/1.6/ant-1.6.jar"/>
 	<classpathentry kind="var" path="M2_REPO/jakarta-regexp/jakarta-regexp/1.4/jakarta-regexp-1.4.jar"/>
 	<classpathentry kind="var" path="M2_REPO/ldapsdk/ldapsdk/4.1/ldapsdk-4.1.jar"/>
@@ -70,35 +70,34 @@
 	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/3.0.2.RELEASE/spring-aop-3.0.2.RELEASE.jar"/>
 	<classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-asm/3.0.2.RELEASE/spring-asm-3.0.2.RELEASE.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.0.5.RELEASE/spring-core-3.0.5.RELEASE.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/3.0.5.RELEASE/spring-expression-3.0.5.RELEASE.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.0.2.RELEASE/spring-beans-3.0.2.RELEASE.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.0.2.RELEASE/spring-core-3.0.2.RELEASE.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/3.0.2.RELEASE/spring-expression-3.0.2.RELEASE.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-orm/3.0.2.RELEASE/spring-orm-3.0.2.RELEASE.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.0.2.RELEASE/spring-context-3.0.2.RELEASE.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-tx/3.0.2.RELEASE/spring-tx-3.0.2.RELEASE.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/3.0.2.RELEASE/spring-jdbc-3.0.2.RELEASE.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/dbunit/dbunit/2.2.3/dbunit-2.2.3.jar"/>
 	<classpathentry kind="var" path="M2_REPO/junit-addons/junit-addons/1.4/junit-addons-1.4.jar"/>
 	<classpathentry kind="var" path="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.3/slf4j-api-1.4.3.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-nop/1.4.3/slf4j-nop-1.4.3.jar"/>
-	<classpathentry kind="var" path="M2_REPO/junit/junit/4.8.2/junit-4.8.2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/junit/junit/4.8.1/junit-4.8.1.jar"/>
 	<classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/easymock/easymock/3.0/easymock-3.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.4/easymock-2.4.jar"/>
 	<classpathentry kind="var" path="M2_REPO/edu/umd/cs/mtc/multithreadedtc/1.01/multithreadedtc-1.01.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/codehaus/castor/spring-orm/2.1/spring-orm-2.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/codehaus/castor/spring-orm/2.0-SNAPSHOT/spring-orm-2.0-SNAPSHOT.jar"/>
 	<classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.6/mysql-connector-java-5.1.6.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.3/commons-dbcp-1.3.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/3.0.5.RELEASE/spring-test-3.0.5.RELEASE.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.6.2.1/derby-10.6.2.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.3/commons-pool-1.3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/3.0.2.RELEASE/spring-test-3.0.2.RELEASE.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.6.1.0/derby-10.6.1.0.jar"/>
 	<classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/mockito/mockito-core/1.8.4/mockito-core-1.8.4.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
 	<classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"/>
 	<classpathentry kind="var" path="M2_REPO/stax/stax/1.2.0/stax-1.2.0.jar"/>
 	<classpathentry kind="var" path="M2_REPO"/>
 	<classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="eclipse"/>
 </classpath>

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>castor</name>
+	<name>castor132</name>
 	<comment>O/R mapping tool and XML data binding framework</comment>
 	<projects>
 	</projects>

anttask/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.codehaus.castor</groupId>
         <artifactId>castor</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.3.2</version>
     </parent>
 
 	<packaging>jar</packaging>
@@ -16,9 +16,9 @@
 	<url>http://www.castor.org</url>
 
     <scm>
-       <connection>scm:svn:http://svn.codehaus.org/castor/castor/trunk/anttask</connection>
-       <developerConnection>scm:svn:https://svn.codehaus.org/castor/castor/trunk/anttask</developerConnection>
-       <url>http://svn.castor.codehaus.org/browse/castor/castor/trunk/anttask</url>
+       <connection>scm:svn:http://svn.codehaus.org/castor/castor/tags/castor-1.3.2/anttask</connection>
+       <developerConnection>scm:svn:https://svn.codehaus.org/castor/castor/tags/castor-1.3.2/anttask</developerConnection>
+       <url>http://svn.castor.codehaus.org/browse/castor/castor/tags/castor-1.3.2/anttask</url>
     </scm>
 
 	<dependencies>

codegen-testcase-archetype/pom.xml

@@ -2,30 +2,20 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.codehaus.castor</groupId>
-	<artifactId>castor-archetype-codegen-testcase</artifactId>
-	<packaging>jar</packaging>
+	<artifactId>codegen-testcase</artifactId>
+	<packaging>maven-plugin</packaging>
     <name>Castor XML - Code generator JUnit test archetype</name>
 
     <parent>
         <groupId>org.codehaus.castor</groupId>
         <artifactId>castor</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.3.2-SNAPSHOT</version>
     </parent>
 
     <scm>
        <connection>scm:svn:http://svn.codehaus.org/castor/castor/trunk/codegen-testcase-archetype</connection>
        <developerConnection>scm:svn:https://svn.codehaus.org/castor/castor/trunk/codegen-testcase-archetype</developerConnection>
        <url>http://svn.castor.codehaus.org/browse/castor/castor/trunk/codegen-testcase-archetype</url>
     </scm>
-
-    <build>
-        <plugins>
-            <plugin>
-    	       <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-archetype-plugin</artifactId>
-               <version>2.0</version>
-            </plugin>
-        </plugins>
-    </build>
 
 </project>

codegen-testcase-archetype/src/main/resources/META-INF/maven/archetype.xml → codegen-testcase-archetype/src/main/resources/META-INF/archetype.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <archetype>
-	<id>castor-archetype-codegen-archetype</id>
+	<id>testcase-archetype</id>
 	<testSources>
 		<source>src/test/java/org/castor/xml/builder/test/TestSourceGenerator.java</source>
 	</testSources>

codegen-testcase-archetype/src/main/resources/archetype-resources/pom.xml

@@ -16,7 +16,7 @@
     <dependency>
     	<groupId>org.codehaus.castor</groupId>
     	<artifactId>castor-codegen</artifactId>
-    	<version>1.3.3-SNAPSHOT</version>
+    	<version>1.3.1-SNAPSHOT</version>
     	<scope>test</scope>
     </dependency>
   </dependencies>

codegen/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.codehaus.castor</groupId>
 		<artifactId>castor</artifactId>
-		<version>1.3.3-SNAPSHOT</version>
+		<version>1.3.2</version>
 	</parent>
 
 	<packaging>jar</packaging>
@@ -44,13 +44,13 @@
 
 	<scm>
 		<connection>
-			scm:svn:http://svn.codehaus.org/castor/castor/trunk/codegen
+			scm:svn:http://svn.codehaus.org/castor/castor/tags/castor-1.3.2/codegen
 		</connection>
 		<developerConnection>
-			scm:svn:https://svn.codehaus.org/castor/castor/trunk/codegen
+			scm:svn:https://svn.codehaus.org/castor/castor/tags/castor-1.3.2/codegen
 		</developerConnection>
 		<url>
-			http://svn.castor.codehaus.org/browse/castor/castor/trunk/codegen
+			http://svn.castor.codehaus.org/browse/castor/castor/tags/castor-1.3.2/codegen
 		</url>
 	</scm>
 

codegen/src/main/java/org/exolab/castor/builder/factory/SourceFactory.java

@@ -1846,7 +1846,7 @@ private void processAppInfo(final Annotated annotated, final ClassInfo cInfo) {
                          // TODO: Uncomment next line as soon as Annotation Classes have been updated!
 //                            cNature.setAccessMode(AccessMode.valueOf(table.getAccessMode().toString()));
                             PrimaryKey pk = table.getPrimaryKey();
-                            Iterator<? extends String> pIt = pk.iterateKey();
+                            Iterator<String> pIt = pk.iterateKey();
                             while (pIt.hasNext()) {
                                 cNature.addPrimaryKey(pIt.next());
                             }
@@ -2368,8 +2368,8 @@ private void handleField(final FieldInfo fieldInfo, final FactoryState state, fi
                         FieldInfo inheritedFieldInfo = base.getElementField(baseNodeName);
 
                         if (inheritedFieldInfo != null) {
-                            String namespaceURI = xmlNature.getNamespaceURI();
-                            if (namespaceURI != null && namespaceURI.equals(new XMLInfoNature(inheritedFieldInfo).getNamespaceURI())) {
+                            if (xmlNature.getNamespaceURI()
+                                    .equals(new XMLInfoNature(inheritedFieldInfo).getNamespaceURI())) {
                                 present = true;
                             }
                         }

codegen/src/main/java/org/exolab/castor/builder/factory/XMLFieldHandlerFactory.java

@@ -15,14 +15,16 @@
  */
 package org.exolab.castor.builder.factory;
 
-import org.apache.commons.lang.StringUtils;
+import org.castor.xml.JavaNaming;
+import org.castor.xml.JavaNamingImpl;
 import org.exolab.castor.builder.BuilderConfiguration;
 import org.exolab.castor.builder.info.CollectionInfo;
 import org.exolab.castor.builder.info.FieldInfo;
+import org.exolab.castor.builder.info.XMLInfo;
 import org.exolab.castor.builder.info.NodeType;
 import org.exolab.castor.builder.info.nature.XMLInfoNature;
-import org.exolab.castor.builder.types.XSClass;
 import org.exolab.castor.builder.types.XSListType;
+import org.exolab.castor.builder.types.XSClass;
 import org.exolab.castor.builder.types.XSType;
 import org.exolab.javasource.JClass;
 import org.exolab.javasource.JSourceCode;
@@ -194,15 +196,7 @@ private void createSetValueMethod(final FieldInfo member,
                 jsc.add("");
             }
         } // if primitive
-
-        if (xsType.isEnumerated() && StringUtils.isNotEmpty(member.getDefaultValue())) {
-            jsc.add("// default value supplied; as such, do not inject null values");
-            jsc.add("if (value == null) {");
-            jsc.addIndented("return;");
-            jsc.add("}");
-            jsc.add("");
-
-        }
+
         jsc.add("target.");
         jsc.append(member.getWriteMethodName());
         jsc.append("( ");

codegen/src/main/java/org/exolab/javasource/JClass.java

@@ -99,7 +99,7 @@ public final void addImport(final String className) {
      * {@inheritDoc}
      */
     public void addMember(final JMember jMember) {
-        if (jMember instanceof JField) {
+        if (jMember instanceof AbstractJField) {
             addField((JField) jMember);
         } else if (jMember instanceof JConstant) {
             addConstant(((JConstant) jMember));

codegen/src/main/resources/org/exolab/castor/builder/printing/templates/main.vm

@@ -72,18 +72,6 @@ import $import;
 #end
 #end
 
-## CONSTANDS *#
-#if( $jClass.getConstantCount() > 0 )
-#foreach( $constant in $jClass.getConstants() )
-#javadoc( $constant.getComment() "    " )
-#foreach( $annotation in $constant.getAnnotations() )
-#annotation( $annotation "    ")
-#end
-#member( $constant "    " )
-
-#end
-#end
-
 ## STATIC INITIALIZERS *#
 #staticInitializationCode($jClass "    ")
 

core/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.codehaus.castor</groupId>
         <artifactId>castor</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.3.2</version>
     </parent>
 
     <packaging>jar</packaging>
@@ -19,9 +19,9 @@
     </description>
 
     <scm>
-       <connection>scm:svn:http://svn.codehaus.org/castor/castor/trunk/core</connection>
-       <developerConnection>scm:svn:https://svn.codehaus.org/castor/castor/trunk/core</developerConnection>
-       <url>http://svn.castor.codehaus.org/browse/castor/castor/trunk/core</url>
+       <connection>scm:svn:http://svn.codehaus.org/castor/castor/tags/castor-1.3.2/core</connection>
+       <developerConnection>scm:svn:https://svn.codehaus.org/castor/castor/tags/castor-1.3.2/core</developerConnection>
+       <url>http://svn.castor.codehaus.org/browse/castor/castor/tags/castor-1.3.2/core</url>
     </scm>
 
     <dependencies>

core/src/main/java/org/castor/core/util/concurrent/ReadWriteLock.java

@@ -0,0 +1,70 @@
+/*
+ * File: ReadWriteLock.java Originally written by Doug Lea and released into the
+ * public domain. This may be used for any purposes whatsoever without
+ * acknowledgment. Thanks for the assistance and support of Sun Microsystems
+ * Labs, and everyone contributing, testing, and using this code. History: Date
+ * Who What 11Jun1998 dl Create public version
+ */
+
+package org.castor.core.util.concurrent;
+
+/**
+ * ReadWriteLocks maintain a pair of associated locks. The readLock may be held
+ * simultanously by multiple reader threads, so long as there are no writers.
+ * The writeLock is exclusive. ReadWrite locks are generally preferable to plain
+ * Sync locks or synchronized methods in cases where:
+ * <ul>
+ * <li>The methods in a class can be cleanly separated into those that only
+ * access (read) data vs those that modify (write).
+ * <li>Target applications generally have more readers than writers.
+ * <li>The methods are relatively time-consuming (as a rough rule of thumb,
+ * exceed more than a hundred instructions), so it pays to introduce a bit more
+ * overhead associated with ReadWrite locks compared to simple synchronized
+ * methods etc in order to allow concurrency among reader threads.
+ * </ul>
+ * Different implementation classes differ in policies surrounding which threads
+ * to prefer when there is contention. By far, the most commonly useful policy
+ * is WriterPreferenceReadWriteLock. The other implementations are targeted for
+ * less common, niche applications.
+ * <p>
+ * Standard usage:
+ * 
+ * <pre>
+ * class X {
+ *     ReadWriteLock rw;
+ * 
+ *     // ...
+ * 
+ * public void read() throws InterruptedException { 
+ *      rw.readLock().acquire();
+ *      try {
+ *        // ... do the read
+ *      }
+ *      finally {
+ *        rw.readlock().release()
+ *      }
+ *    }public void write() throws InterruptedException { 
+ *      rw.writeLock().acquire();
+ *      try {
+ *        // ... do the write
+ *      }
+ *      finally {
+ *        rw.writelock().release()
+ *      }
+ *    }}
+ * </pre>
+ * 
+ * @see Sync
+ *      <p>[ <a
+ *      href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html">
+ *      Introduction to this package. </a>]
+ */
+
+public interface ReadWriteLock {
+    /** get the readLock * */
+    Sync readLock();
+
+    /** get the writeLock * */
+    Sync writeLock();
+}
+

core/src/main/java/org/castor/core/util/concurrent/ReaderPreferenceReadWriteLock.java

@@ -0,0 +1,27 @@
+/*
+ * File: ReaderPreferenceReadWriteLock.java Originally written by Doug Lea and
+ * released into the public domain. This may be used for any purposes whatsoever
+ * without acknowledgment. Thanks for the assistance and support of Sun
+ * Microsystems Labs, and everyone contributing, testing, and using this code.
+ * History: Date Who What 11Jun1998 dl Create public version
+ */
+
+package org.castor.core.util.concurrent;
+
+/**
+ * A ReadWriteLock that prefers waiting readers over waiting writers when there
+ * is contention. The range of applicability of this class is very limited. In
+ * the majority of situations, writer preference locks provide more reasonable
+ * semantics.
+ * <p>[ <a
+ * href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html">
+ * Introduction to this package. </a>]
+ */
+
+public class ReaderPreferenceReadWriteLock
+        extends WriterPreferenceReadWriteLock {
+    protected boolean allowReader() {
+        return activeWriter_ == null;
+    }
+}
+