Index: src/main/java/org/exolab/castor/xml/util/AnyNode2SAX2.java
===================================================================
--- src/main/java/org/exolab/castor/xml/util/AnyNode2SAX2.java	(Revision 7385)
+++ src/main/java/org/exolab/castor/xml/util/AnyNode2SAX2.java	(Arbeitskopie)
@@ -185,7 +185,7 @@
             }// attributes
 
             // -- namespace management
-            _context = _context.createNamespaces();
+//            _context = _context.createNamespaces();
             String nsPrefix = node.getNamespacePrefix();
             String nsURI = node.getNamespaceURI();
 
@@ -228,6 +228,7 @@
             // -- handle child&daughter elements
             tempNode = node.getFirstChild();
             while (tempNode != null) {
+            	_context = _context.createNamespaces();
                 processAnyNode(tempNode, handler);
                 tempNode = tempNode.getNextSibling();
             }
Index: src/doc/release-notes.xml
===================================================================
--- src/doc/release-notes.xml	(Revision 7385)
+++ src/doc/release-notes.xml	(Arbeitskopie)
@@ -400,6 +400,28 @@
                    unnecessary casts.</p>
             </summary>
             <bugs>
+                <bug id="2265" tool="jira">
+                    <description>
+                        Fixed problem where marshaller won't correctly handle situations 
+                        where a namespace URI is bound to more than one prefix on 
+                        sibling AnyNode elements, i.e. preserve the namespace prefices.
+                    </description>
+                    <contributor>
+                        <name>Vikas Rawat</name>
+                        <email>vikas.rawat@gmail.com</email>
+                    </contributor>
+                    <submitter>
+                        <name>Werner Guttmann</name>
+                        <email>wguttmn@codehaus.org</email>
+                    </submitter>
+                    <reporter>
+                        <name>Vikas Rawat</name>
+                        <email>vikas.rawat@gmail.com</email>
+                    </reporter>
+                    <type>Bug.</type>
+                    <module>Gen.</module>
+                    <date>20080118</date>
+                </bug>
                 <bug id="2264" tool="jira">
                     <description>
                         Added support for usage of 'mixed="1"' attributes for XML code generation.
Index: xmlctf/tests/MasterTestSuite/mapping/anyNode/preserveNamespacePrefices/mapping.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/mapping/anyNode/preserveNamespacePrefices/mapping.xml	(Revision 0)
+++ xmlctf/tests/MasterTestSuite/mapping/anyNode/preserveNamespacePrefices/mapping.xml	(Revision 0)
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Mapping DTD Version 1.0//EN"
+                           "http://castor.org/mapping.dtd">
+<mapping>
+
+    <class name="Entity">
+        <map-to xml="entity" />
+        <field name="name" type="java.lang.Object">
+            <bind-xml name="name" />
+        </field>
+    </class>
+
+</mapping>
+

Eigenschafts„nderungen: xmlctf\tests\MasterTestSuite\mapping\anyNode\preserveNamespacePrefices\mapping.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Index: xmlctf/tests/MasterTestSuite/mapping/anyNode/preserveNamespacePrefices/Entity.java
===================================================================
--- xmlctf/tests/MasterTestSuite/mapping/anyNode/preserveNamespacePrefices/Entity.java	(Revision 0)
+++ xmlctf/tests/MasterTestSuite/mapping/anyNode/preserveNamespacePrefices/Entity.java	(Revision 0)
@@ -0,0 +1,12 @@
+public final class Entity {
+    
+    private Object name;
+
+    public Object getName() {
+        return name;
+    }
+
+    public void setName(final Object name) {
+        this.name = name;
+    }
+}

Eigenschafts„nderungen: xmlctf\tests\MasterTestSuite\mapping\anyNode\preserveNamespacePrefices\Entity.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Index: xmlctf/tests/MasterTestSuite/mapping/anyNode/preserveNamespacePrefices/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/mapping/anyNode/preserveNamespacePrefices/TestDescriptor.xml	(Revision 0)
+++ xmlctf/tests/MasterTestSuite/mapping/anyNode/preserveNamespacePrefices/TestDescriptor.xml	(Revision 0)
@@ -0,0 +1,38 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+    <Name>
+        Test unmarshalling &amp; marshalling of AnyNode where the same namespace URI is
+        used for two elements, but assigned to different prefices.
+    </Name>
+    <Author>Werner Guttmann</Author>
+
+    <Comment>
+        Tests that the unmarshaller will correctly handle situations where a namespace URI
+        is bound to more than one prefix on sibling elements, i.e. preserve the namespace
+        prefices.
+    </Comment>
+
+    <BugFix>
+        <Reporter>Vikas Rawat</Reporter>
+        <Date_Report>2008-01-18</Date_Report>
+        <Date_Fix>2008-01-18</Date_Fix>
+        <Comment>http://jira.codehaus.org/browse/CASTOR-2265</Comment>
+    </BugFix>
+    
+    <Category>basic capability</Category>
+
+    <MarshallingTest>
+
+        <Root_Object>Entity</Root_Object>
+
+        <UnitTestCase>
+            <Name>Simple Test</Name>
+            <Mapping_File>mapping.xml</Mapping_File>
+            <Input>input.xml</Input>
+            <GoldFile>input.xml</GoldFile>
+        </UnitTestCase>
+
+    </MarshallingTest>
+
+</TestDescriptor>

Eigenschafts„nderungen: xmlctf\tests\MasterTestSuite\mapping\anyNode\preserveNamespacePrefices\TestDescriptor.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Index: xmlctf/tests/MasterTestSuite/mapping/anyNode/preserveNamespacePrefices/input.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/mapping/anyNode/preserveNamespacePrefices/input.xml	(Revision 0)
+++ xmlctf/tests/MasterTestSuite/mapping/anyNode/preserveNamespacePrefices/input.xml	(Revision 0)
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<entity>
+    <name>
+        <f:firstname xmlns:f="http://name.namespace">
+            <f:text>John</f:text>
+        </f:firstname>
+        <l:lastname xmlns:l="http://name.namespace">
+            <l:text>Right</l:text>
+        </l:lastname>
+    </name>
+</entity>
\ Kein Zeilenvorschub am Ende der Datei

Eigenschafts„nderungen: xmlctf\tests\MasterTestSuite\mapping\anyNode\preserveNamespacePrefices\input.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native