Attachment #222581 for bug #383424

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 307-312 public class XMLCompositeCollectionMappingNodeValue extends XMLRelationshipMappi Link Here

(-)a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/oxm/XMLCompositeCollectionMappingNodeValue.java (+3 lines)
307	objectBuilder.removeExtraNamespacesFromNamespaceResolver(marshalRecord, extraNamespaces, session);	307	objectBuilder.removeExtraNamespacesFromNamespaceResolver(marshalRecord, extraNamespaces, session);
308		308
309	} else {	309	} else {
		310	if (xmlCompositeCollectionMapping.getReferenceClassName() != null && xmlCompositeCollectionMapping.getReferenceClassName().equals(XMLConstants.UNKNOWN_OR_TRANSIENT_CLASS)){
		311	throw XMLMarshalException.descriptorNotFoundInProject(value.getClass().getName());
		312	}
310	xPathNode.startElement(marshalRecord, xPathFragment, object, session, namespaceResolver, null, value);	313	xPathNode.startElement(marshalRecord, xPathFragment, object, session, namespaceResolver, null, value);
311		314
312	QName schemaType = ((XMLField) xmlCompositeCollectionMapping.getField()).getSchemaTypeForValue(value, session);	315	QName schemaType = ((XMLField) xmlCompositeCollectionMapping.getField()).getSchemaTypeForValue(value, session);




import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;


        if (((keepAsElementPolicy == UnmarshalKeepAsElementPolicy.KEEP_UNKNOWN_AS_ELEMENT) || (keepAsElementPolicy == UnmarshalKeepAsElementPolicy.KEEP_ALL_AS_ELEMENT)) && objectValue instanceof Node) {
            if(isSelfFragment){
                NodeList children = ((org.w3c.dom.Element) objectValue).getChildNodes();
                int childrenLength  = children.getLength();
                    for(int i =0; i<childrenLength ; i++) {
                        Node next = children.item(i);
                        if(next.getNodeType() == Node.ELEMENT_NODE){
                            marshalRecord.node(next, marshalRecord.getNamespaceResolver());
                            return true;
                        }else if(next.getNodeType() == Node.TEXT_NODE){
                            marshalRecord.characters(((Text)next).getNodeValue());
                            return true;
                        }
                    }
                return false;
            }else{
                marshalRecord.node((Node) objectValue, marshalRecord.getNamespaceResolver());
                return true;

            }
            objectBuilder.removeExtraNamespacesFromNamespaceResolver(marshalRecord, extraNamespaces, session);
        } else {
            if (xmlCompositeObjectMapping.getReferenceClassName() !=null && xmlCompositeObjectMapping.getReferenceClassName().equals(XMLConstants.UNKNOWN_OR_TRANSIENT_CLASS)){
                throw XMLMarshalException.descriptorNotFoundInProject(objectValue.getClass().getName());
            }
            
            if (!(isSelfFragment || xPathFragment.nameIsText())) {
                xPathNode.startElement(marshalRecord, xPathFragment, object, session, namespaceResolver, null, objectValue);
            }

Lines 106-111 public class XMLConstants { Link Here

(-)a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/oxm/XMLConstants.java (+1 lines)
106	public static final String ANY_TYPE = "anyType";	106	public static final String ANY_TYPE = "anyType";
107	public static final String ANY_URI = "anyURI";	107	public static final String ANY_URI = "anyURI";
108	public static final String SWA_REF = "swaRef";	108	public static final String SWA_REF = "swaRef";
		109	public static final String UNKNOWN_OR_TRANSIENT_CLASS = "UNKNOWN_OR_TRANSIENT_CLASS";
109		110
110	// Schema Type QNames	111	// Schema Type QNames
111	public static final QName ANY_QNAME = new QName(SCHEMA_URL, ANY);	112	public static final QName ANY_QNAME = new QName(SCHEMA_URL, ANY);

Lines 289-294 public class XMLCompositeCollectionMapping extends AbstractCompositeCollectionMa Link Here

(-)a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/oxm/mappings/XMLCompositeCollectionMapping.java (-1 / +10 lines)
289	return true;	289	return true;
290	}	290	}
291		291
		292
		293	public void convertClassNamesToClasses(ClassLoader classLoader){
		294	if(referenceClassName != null && referenceClassName.equals(XMLConstants.UNKNOWN_OR_TRANSIENT_CLASS)){
		295	return;
		296	}
		297	super.convertClassNamesToClasses(classLoader);
		298	}
292	/**	299	/**
293	* INTERNAL:	300	* INTERNAL:
294	* The mapping is initialized with the given session. This mapping is fully initialized	301	* The mapping is initialized with the given session. This mapping is fully initialized
Lines 297-303 public class XMLCompositeCollectionMapping extends AbstractCompositeCollectionMa Link Here
297	public void initialize(AbstractSession session) throws DescriptorException {	304	public void initialize(AbstractSession session) throws DescriptorException {
298	//modified so that reference class on composite mappings is no longer mandatory	305	//modified so that reference class on composite mappings is no longer mandatory
299	if ((getReferenceClass() == null) && (getReferenceClassName() != null)) {	306	if ((getReferenceClass() == null) && (getReferenceClassName() != null)) {
300	setReferenceClass(session.getDatasourcePlatform().getConversionManager().convertClassNameToClass(getReferenceClassName()));	307	if(!getReferenceClassName().equals(XMLConstants.UNKNOWN_OR_TRANSIENT_CLASS)){
		308	setReferenceClass(session.getDatasourcePlatform().getConversionManager().convertClassNameToClass(getReferenceClassName()));
		309	}
301	}	310	}
302	if (getReferenceClass() != null) {	311	if (getReferenceClass() != null) {
303	super.initialize(session);	312	super.initialize(session);

Lines 324-329 public class XMLCompositeObjectMapping extends AbstractCompositeObjectMapping im Link Here

(-)a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/oxm/mappings/XMLCompositeObjectMapping.java (-1 / +12 lines)
324	return this.inverseReferenceMapping.getSetMethodName();	324	return this.inverseReferenceMapping.getSetMethodName();
325	}	325	}
326		326
		327
		328	public void convertClassNamesToClasses(ClassLoader classLoader){
		329	if(referenceClassName != null && referenceClassName.equals(XMLConstants.UNKNOWN_OR_TRANSIENT_CLASS)){
		330	return;
		331	}
		332	super.convertClassNamesToClasses(classLoader);
		333	}
		334
		335
327	/**	336	/**
328	* INTERNAL:	337	* INTERNAL:
329	* The mapping is initialized with the given session. This mapping is fully initialized	338	* The mapping is initialized with the given session. This mapping is fully initialized
Lines 332-338 public class XMLCompositeObjectMapping extends AbstractCompositeObjectMapping im Link Here
332	public void initialize(AbstractSession session) throws DescriptorException {	341	public void initialize(AbstractSession session) throws DescriptorException {
333	//modified so that reference class on composite mappings is no longer mandatory	342	//modified so that reference class on composite mappings is no longer mandatory
334	if ((getReferenceClass() == null) && (getReferenceClassName() != null)) {	343	if ((getReferenceClass() == null) && (getReferenceClassName() != null)) {
335	setReferenceClass(session.getDatasourcePlatform().getConversionManager().convertClassNameToClass(getReferenceClassName()));	344	if(!getReferenceClassName().equals(XMLConstants.UNKNOWN_OR_TRANSIENT_CLASS)){
		345	setReferenceClass(session.getDatasourcePlatform().getConversionManager().convertClassNameToClass(getReferenceClassName()));
		346	}
336	}	347	}
337	if (getReferenceClass() != null) {	348	if (getReferenceClass() != null) {
338	super.initialize(session);	349	super.initialize(session);

Added Link Here

(-)a/moxy/eclipselink.moxy.test/resource/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/element.json (+1 lines)
1	{"root":{}}

Added Link Here

(-)a/moxy/eclipselink.moxy.test/resource/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/element.xml (+1 lines)
1	<ns0:root xmlns:ns0="AGroupDef/annotation"/>

Added Link Here

(-)a/moxy/eclipselink.moxy.test/resource/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/text.json (+1 lines)
1	{"doc":"thetext"}

Added Link Here

(-)a/moxy/eclipselink.moxy.test/resource/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/text.xml (+1 lines)
1	<doc>thetext</doc>




/*******************************************************************************
 * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
 * which accompanies this distribution.
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:
 *     Denise Smith - October 18, 2012
 ******************************************************************************/
package org.eclipse.persistence.testing.jaxb.annotations.xmltransient;

import java.util.List;

public class ObjectWithTransient {
    public String testString;
    public TransientClass transientThing;
    public List<TransientClass> transientThings;
}




/*******************************************************************************
 * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
 * which accompanies this distribution.
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:
 *     Denise Smith - October 18, 2012
 ******************************************************************************/
package org.eclipse.persistence.testing.jaxb.annotations.xmltransient;

import java.util.ArrayList;

import javax.xml.bind.MarshalException;

import org.eclipse.persistence.exceptions.XMLMarshalException;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;

public class ObjectWithTransientListTestCases extends JAXBWithJSONTestCases{
 
    public ObjectWithTransientListTestCases(String name) throws Exception {
        super(name);
        setClasses(new Class[] { ObjectWithTransient.class });
    }

    @Override
    protected Object getControlObject() {
        ObjectWithTransient obj = new ObjectWithTransient();
        obj.testString = "theTest";
        TransientClass transientThing = new TransientClass();
        obj.transientThings = new ArrayList<TransientClass>();
        obj.transientThings.add(transientThing);
        
        return obj;
    }
    
    public boolean isUnmarshalTest(){
        return false;
    }
    
    
    public void testJSONMarshalToOutputStream() throws Exception{
        try{
            super.testJSONMarshalToOutputStream();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);
            Throwable actualException = ((XMLMarshalException)linkedException).getCause();
            assertTrue(actualException instanceof XMLMarshalException);
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)actualException).getErrorCode());
            return;
        }catch (Exception e) {
e.printStackTrace();
        }
        fail("An exception should have been thrown");
    }
    
    public void testJSONMarshalToOutputStream_FORMATTED() throws Exception{
        try{
            super.testJSONMarshalToOutputStream_FORMATTED();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);
            Throwable actualException = ((XMLMarshalException)linkedException).getCause();
            assertTrue(actualException instanceof XMLMarshalException);
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)actualException).getErrorCode());
            return;
        }
        fail("An exception should have been thrown");
    }
    
    public void testJSONMarshalToStringWriter() throws Exception{
        try{
            super.testJSONMarshalToStringWriter();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)linkedException).getErrorCode());
            return;
        }
        fail("An exception should have been thrown");
    } 
    
    public void testJSONMarshalToStringWriter_FORMATTED() throws Exception{
        try{
            super.testJSONMarshalToStringWriter_FORMATTED();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)linkedException).getErrorCode());
            return;
        }
        fail("An exception should have been thrown");
    }
    
    public void testObjectToContentHandler() throws Exception{
        try{
            super.testObjectToContentHandler();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);            
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)linkedException).getErrorCode());
            return;
        }
        fail("An exception should have been thrown");
    }
    
    public void testObjectToOutputStream() throws Exception{
        try{
            super.testObjectToOutputStream();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);
            Throwable actualException = ((XMLMarshalException)linkedException).getCause();
            assertTrue(actualException instanceof XMLMarshalException);
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)actualException).getErrorCode());
            return;
        }
        fail("An exception should have been thrown");
    }
    
    public void testObjectToOutputStreamASCIIEncoding() throws Exception{
        try{
            super.testObjectToOutputStreamASCIIEncoding();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);
            Throwable actualException = ((XMLMarshalException)linkedException).getCause();
            assertTrue(actualException instanceof XMLMarshalException);
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)actualException).getErrorCode());
            return;
        }
        fail("An exception should have been thrown");
    }
    
    public void testObjectToXMLDocument() throws Exception{
        try{
            super.testObjectToXMLDocument();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);            
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)linkedException).getErrorCode());      return;
        }
        fail("An exception should have been thrown");
    }
    
    public void testObjectToXMLEventWriter() throws Exception{
        try{
            super.testObjectToXMLEventWriter();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);            
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)linkedException).getErrorCode());     
            return;
        }
        fail("An exception should have been thrown");
    }
    public void testObjectToXMLStreamWriter() throws Exception{
        try{
            super.testObjectToXMLStreamWriter();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);            
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)linkedException).getErrorCode());
            return;
        }
        fail("An exception should have been thrown");
    }
    public void testObjectToXMLStreamWriterRecord() throws Exception{
        try{
            super.testObjectToXMLStreamWriterRecord();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);            
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)linkedException).getErrorCode());
            return;
        }
        fail("An exception should have been thrown");
    }
    
    public void testObjectToXMLStringWriter() throws Exception{
        try{
            super.testObjectToXMLStringWriter();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);            
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)linkedException).getErrorCode());
            return;
        }
        fail("An exception should have been thrown");
    }
}




/*******************************************************************************
 * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
 * which accompanies this distribution.
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:
 *     Denise Smith - October 18, 2012
 ******************************************************************************/
package org.eclipse.persistence.testing.jaxb.annotations.xmltransient;

import java.util.ArrayList;

import javax.xml.bind.MarshalException;

import org.eclipse.persistence.exceptions.XMLMarshalException;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;

public class ObjectWithTransientTestCases extends JAXBWithJSONTestCases{

    public ObjectWithTransientTestCases(String name) throws Exception {
        super(name);
        setClasses(new Class[] { ObjectWithTransient.class });
    }

    @Override
    protected Object getControlObject() {
        ObjectWithTransient obj = new ObjectWithTransient();
        obj.testString = "theTest";
        obj.transientThing = new TransientClass();
        return obj;
    }
    
    public boolean isUnmarshalTest(){
        return false;
    }
    
    public void testJSONMarshalToOutputStream() throws Exception{
        try{
            super.testJSONMarshalToOutputStream();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);
            Throwable actualException = ((XMLMarshalException)linkedException).getCause();
            assertTrue(actualException instanceof XMLMarshalException);
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)actualException).getErrorCode());
            return;
        }
        fail("An exception should have been thrown");
    }
    
    public void testJSONMarshalToOutputStream_FORMATTED() throws Exception{
        try{
            super.testJSONMarshalToOutputStream_FORMATTED();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);
            Throwable actualException = ((XMLMarshalException)linkedException).getCause();
            assertTrue(actualException instanceof XMLMarshalException);
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)actualException).getErrorCode());
            return;
        }
        fail("An exception should have been thrown");
    }
    
    public void testJSONMarshalToStringWriter() throws Exception{
        try{
            super.testJSONMarshalToStringWriter();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)linkedException).getErrorCode());
            return;
        }
        fail("An exception should have been thrown");
    } 
    
    public void testJSONMarshalToStringWriter_FORMATTED() throws Exception{
        try{
            super.testJSONMarshalToStringWriter_FORMATTED();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)linkedException).getErrorCode());
            return;
        }
        fail("An exception should have been thrown");
    }
    
    public void testObjectToContentHandler() throws Exception{
        try{
            super.testObjectToContentHandler();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);            
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)linkedException).getErrorCode());
            return;
        }
        fail("An exception should have been thrown");
    }
    
    public void testObjectToOutputStream() throws Exception{
        try{
            super.testObjectToOutputStream();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);
            Throwable actualException = ((XMLMarshalException)linkedException).getCause();
            assertTrue(actualException instanceof XMLMarshalException);
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)actualException).getErrorCode());
            return;
        }
        fail("An exception should have been thrown");
    }
    
    public void testObjectToOutputStreamASCIIEncoding() throws Exception{
        try{
            super.testObjectToOutputStreamASCIIEncoding();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);
            Throwable actualException = ((XMLMarshalException)linkedException).getCause();
            assertTrue(actualException instanceof XMLMarshalException);
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)actualException).getErrorCode());
            return;
        }
        fail("An exception should have been thrown");
    }
    
    public void testObjectToXMLDocument() throws Exception{
        try{
            super.testObjectToXMLDocument();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);            
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)linkedException).getErrorCode());      return;
        }
        fail("An exception should have been thrown");
    }
    
    public void testObjectToXMLEventWriter() throws Exception{
        try{
            super.testObjectToXMLEventWriter();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);            
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)linkedException).getErrorCode());     
            return;
        }
        fail("An exception should have been thrown");
    }
    public void testObjectToXMLStreamWriter() throws Exception{
        try{
            super.testObjectToXMLStreamWriter();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);            
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)linkedException).getErrorCode());
            return;
        }
        fail("An exception should have been thrown");
    }
    public void testObjectToXMLStreamWriterRecord() throws Exception{
        try{
            super.testObjectToXMLStreamWriterRecord();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);            
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)linkedException).getErrorCode());
            return;
        }
        fail("An exception should have been thrown");
    }
    
    public void testObjectToXMLStringWriter() throws Exception{
        try{
            super.testObjectToXMLStringWriter();
        }catch(MarshalException e){
            Throwable linkedException = e.getLinkedException();
            assertTrue(linkedException instanceof XMLMarshalException);            
            assertEquals("Wrong XMLMarshalExcpetion was thrown",XMLMarshalException.DESCRIPTOR_NOT_FOUND_IN_PROJECT ,((XMLMarshalException)linkedException).getErrorCode());
            return;
        }
        fail("An exception should have been thrown");
    }
}

Lines 26-31 public class XmlTransientTestSuite extends TestCase { Link Here

(-)a/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/XmlTransientTestSuite.java (+2 lines)
26	suite.addTestSuite(PropOrderTestCases.class);	26	suite.addTestSuite(PropOrderTestCases.class);
27	suite.addTestSuite(TransientClassTestCases.class);	27	suite.addTestSuite(TransientClassTestCases.class);
28	suite.addTestSuite(PropertyOverrideTestCases.class);	28	suite.addTestSuite(PropertyOverrideTestCases.class);
		29	suite.addTestSuite(ObjectWithTransientTestCases.class);
		30	suite.addTestSuite(ObjectWithTransientListTestCases.class);
29	return suite;	31	return suite;
30	}	32	}
31		33




package org.eclipse.persistence.testing.jaxb.jaxbelement.dom;

import javax.xml.bind.JAXBElement;
import javax.xml.parsers.DocumentBuilderFactory;

import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
import org.w3c.dom.Element;

public class ElementTestCases extends JAXBWithJSONTestCases{

    private final static String XML_RESOURCE = "org/eclipse/persistence/testing/jaxb/jaxbelement/dom/element.xml";
    private final static String JSON_RESOURCE = "org/eclipse/persistence/testing/jaxb/jaxbelement/dom/element.json";

    
    public ElementTestCases(String name) throws Exception {
        super(name);
        setContextPath("org.eclipse.persistence.testing.jaxb.jaxbelement.dom");
        setControlDocument(XML_RESOURCE);
        setControlJSON(JSON_RESOURCE);
    }

    @Override
    protected Object getControlObject() {
        ObjectFactory factory = new ObjectFactory();
        Document doc;
        try {
            doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();                 
            Element elm = doc.createElementNS("AGroupDef/annotation", "rootchild");
            elm.setTextContent("");
            JAXBElement  obj = factory.createRoot(elm);
            return obj;
        } catch (Exception e) {
            e.printStackTrace();
            fail("An exception was thrown.");            
            return null;
        }
    }
    

}




//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-147 
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
// Any modifications to this file will be lost upon recompilation of the source schema. 
// Generated on: 2012.10.18 at 09:37:32 AM EDT 
//


package org.eclipse.persistence.testing.jaxb.jaxbelement.dom;

import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlElementDecl;
import javax.xml.bind.annotation.XmlRegistry;
import javax.xml.namespace.QName;


/**
 * This object contains factory methods for each 
 * Java content interface and Java element interface 
 * generated in the generated package. 
 * <p>An ObjectFactory allows you to programatically 
 * construct new instances of the Java representation 
 * for XML content. The Java representation of XML 
 * content can consist of schema derived interfaces 
 * and classes representing the binding of schema 
 * type definitions, element declarations and model 
 * groups.  Factory methods for each of these are 
 * provided in this class.
 * 
 */
@XmlRegistry
public class ObjectFactory {

    private final static QName _Doc_QNAME = new QName("", "doc");
    private final static QName _Root_QNAME = new QName("AGroupDef/annotation", "root");

    /**
     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: generated
     * 
     */
    public ObjectFactory() {
    }

    /**
     * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}}
     * 
     */
    @XmlElementDecl(namespace = "", name = "doc")
    public JAXBElement<Object> createDoc(Object value) {
        return new JAXBElement<Object>(_Doc_QNAME, Object.class, null, value);
    }
    
    /**
     * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}}
     * 
     */
    @XmlElementDecl(namespace = "AGroupDef/annotation", name = "root")
    public JAXBElement<Object> createRoot(Object value) {
        return new JAXBElement<Object>(_Root_QNAME, Object.class, null, value);
    }

}




package org.eclipse.persistence.testing.jaxb.jaxbelement.dom;

import javax.xml.bind.JAXBElement;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;

import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
import org.w3c.dom.Element;

public class TextNodeTestCases extends JAXBWithJSONTestCases{

    private final static String XML_RESOURCE = "org/eclipse/persistence/testing/jaxb/jaxbelement/dom/text.xml";
    private final static String JSON_RESOURCE = "org/eclipse/persistence/testing/jaxb/jaxbelement/dom/text.json";

    
    public TextNodeTestCases(String name) throws Exception {
        super(name);
        setContextPath("org.eclipse.persistence.testing.jaxb.jaxbelement.dom");
        setControlDocument(XML_RESOURCE);
        setControlJSON(JSON_RESOURCE);
    }

    @Override
    protected Object getControlObject() {
        ObjectFactory factory = new ObjectFactory();
        Document doc;
        try {
            doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();       
            Element elm = doc.createElementNS(null, "abcdef");
            elm.setTextContent("thetext");
            Object value = elm;
            JAXBElement  obj = factory.createDoc(value);
            return obj;
        } catch (Exception e) {
            e.printStackTrace();
            fail("An exception was thrown.");            
            return null;
        }
    }
    

}




                JavaClass typeClass = property.getActualType();
                TypeInfo targetInfo = typeInfo.get(typeClass.getQualifiedName());
                if (targetInfo != null && targetInfo.isTransient() && property.getXmlElements() == null) {
                    property.setTransientType(true);
                }
                // only one XmlValue is allowed per class, and if there is one
                // only XmlAttributes are allowed

        property.setElement(javaHasAnnotations);

        // if there is a TypeInfo for ptype check it for transient, otherwise
        // check the class        
        if (isCollectionType(ptype)) {
            JavaClass componentType = helper.getJavaClass(Object.class);;
            if(ptype.hasActualTypeArguments()){
                ArrayList typeArgs =  (ArrayList) ptype.getActualTypeArguments();
                if(typeArgs.size() > 0) {
                    componentType = (JavaClass) typeArgs.get(0);                    
                } 
                    property.setType(parent);
                    break;
                }
                // if there is a TypeInfo for parent check it for transient,
                // otherwise check the class
                TypeInfo parentTypeInfo = typeInfo.get(parent.getQualifiedName());
                if ((parentTypeInfo != null && !parentTypeInfo.isTransient()) || !helper.isAnnotationPresent(parent, XmlTransient.class)) {
                    property.setType(parent);
                    break;
                }
                parent = parent.getSuperclass();
            }
            
            updatePropertyType(property, ptype, componentType);
        }else{
            updatePropertyType(property, ptype, ptype);
        }
        if((ptype.isArray()  && !areEquals(ptype, byte[].class))  || (property.isCollectionType(ptype) && !helper.isAnnotationPresent(javaHasAnnotations, XmlList.class)) ){
        	property.setNillable(true);

        return property;
    }

    
    private void updatePropertyType(Property property, JavaClass ptype, JavaClass componentType){
        TypeInfo componentTypeInfo = typeInfo.get(componentType);
        if((componentTypeInfo != null && !componentTypeInfo.isTransient()) || !helper.isAnnotationPresent(componentType, XmlTransient.class)){
            property.setType(ptype);
        }else{
            JavaClass parent = componentType.getSuperclass();
            while (parent != null) {
                if (parent.getName().equals(JAVA_LANG_OBJECT)) {
                    property.setTransientType(true);
                    property.setType(ptype);
                    break;
                }
                // if there is a TypeInfo for parent check it for transient,
                // otherwise check the class
                TypeInfo parentTypeInfo = typeInfo.get(parent.getQualifiedName());
                if ((parentTypeInfo != null && !parentTypeInfo.isTransient()) || !helper.isAnnotationPresent(parent, XmlTransient.class)) {
                    property.setType(parent);
                    break;
                }
                parent = parent.getSuperclass();
            }
        }
    }
    
    /**
     * Build a new 'choice' property. Here, we flag a new property as a 'choice'
     * and create/set an XmlModel XmlElements object based on the @XmlElements

Lines 1282-1287 public class MappingsGenerator { Link Here

(-)a/moxy/org.eclipse.persistence.moxy/src/org/eclipse/persistence/jaxb/compiler/MappingsGenerator.java (-1 / +7 lines)
1282	} else {	1282	} else {
1283	mapping.setReferenceClassName(referenceClassName);	1283	mapping.setReferenceClassName(referenceClassName);
1284	}	1284	}
		1285	if(property.isTransientType()){
		1286	mapping.setReferenceClassName(XMLConstants.UNKNOWN_OR_TRANSIENT_CLASS);
		1287	}
1285		1288
1286	if (property.getInverseReferencePropertyName() != null) {	1289	if (property.getInverseReferencePropertyName() != null) {
1287	mapping.setContainerAttributeName(property.getInverseReferencePropertyName());	1290	mapping.setContainerAttributeName(property.getInverseReferencePropertyName());
Lines 1988-1999 public class MappingsGenerator { Link Here
1988	XMLField xmlField = getXPathForField(property, namespaceInfo, false);	1991	XMLField xmlField = getXPathForField(property, namespaceInfo, false);
1989	mapping.setXPath(xmlField.getXPath());	1992	mapping.setXPath(xmlField.getXPath());
1990		1993
1991	if (referenceClassName == null){	1994	if (referenceClassName == null){
1992	((XMLField)mapping.getField()).setIsTypedTextField(true);	1995	((XMLField)mapping.getField()).setIsTypedTextField(true);
1993	((XMLField)mapping.getField()).setSchemaType(XMLConstants.ANY_TYPE_QNAME);	1996	((XMLField)mapping.getField()).setSchemaType(XMLConstants.ANY_TYPE_QNAME);
1994	} else {	1997	} else {
1995	mapping.setReferenceClassName(referenceClassName);	1998	mapping.setReferenceClassName(referenceClassName);
1996	}	1999	}
		2000	if(property.isTransientType()){
		2001	mapping.setReferenceClassName(XMLConstants.UNKNOWN_OR_TRANSIENT_CLASS);
		2002	}
1997		2003
1998	if (property.isRequired()) {	2004	if (property.isRequired()) {
1999	((XMLField) mapping.getField()).setRequired(true);	2005	((XMLField) mapping.getField()).setRequired(true);




    private List<XmlJoinNodes> xmlJoinNodesList;
    private boolean isSuperClassProperty;

    private boolean isTransientType;
    private static final String MARSHAL_METHOD_NAME = "marshal";
    
    
    public Property() {}

    public Property(Helper helper) {

        return isRequired;
    }
    


    public boolean isTransientType() {
        return isTransientType;
    }

    public void setTransientType(boolean isTransientType) {
        this.isTransientType = isTransientType;
    }

    public void setIsRequired(boolean b) {
        isRequired = b;
    }

Return to bug 383424

Lines 49-54 import org.w3c.dom.Element; Link Here

(-)a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/oxm/XMLCompositeObjectMappingNodeValue.java (-6 / +16 lines)
49	import org.w3c.dom.NamedNodeMap;	49	import org.w3c.dom.NamedNodeMap;
50	import org.w3c.dom.Node;	50	import org.w3c.dom.Node;
51	import org.w3c.dom.NodeList;	51	import org.w3c.dom.NodeList;
		52	import org.w3c.dom.Text;
52	import org.xml.sax.Attributes;	53	import org.xml.sax.Attributes;
53	import org.xml.sax.SAXException;	54	import org.xml.sax.SAXException;
54		55
Lines 181-193 public class XMLCompositeObjectMappingNodeValue extends XMLRelationshipMappingNo Link Here
181	if (((keepAsElementPolicy == UnmarshalKeepAsElementPolicy.KEEP_UNKNOWN_AS_ELEMENT) \|\| (keepAsElementPolicy == UnmarshalKeepAsElementPolicy.KEEP_ALL_AS_ELEMENT)) && objectValue instanceof Node) {	182	if (((keepAsElementPolicy == UnmarshalKeepAsElementPolicy.KEEP_UNKNOWN_AS_ELEMENT) \|\| (keepAsElementPolicy == UnmarshalKeepAsElementPolicy.KEEP_ALL_AS_ELEMENT)) && objectValue instanceof Node) {
182	if(isSelfFragment){	183	if(isSelfFragment){
183	NodeList children = ((org.w3c.dom.Element) objectValue).getChildNodes();	184	NodeList children = ((org.w3c.dom.Element) objectValue).getChildNodes();
184	for(int i =0, size=children.getLength(); i<size ; i++) {	185	int childrenLength = children.getLength();
185	Node next = children.item(i);	186	for(int i =0; i<childrenLength ; i++) {
186	if(next.getNodeType() == Node.ELEMENT_NODE){	187	Node next = children.item(i);
187	marshalRecord.node(next, marshalRecord.getNamespaceResolver());	188	if(next.getNodeType() == Node.ELEMENT_NODE){
188	return true;	189	marshalRecord.node(next, marshalRecord.getNamespaceResolver());
		190	return true;
		191	}else if(next.getNodeType() == Node.TEXT_NODE){
		192	marshalRecord.characters(((Text)next).getNodeValue());
		193	return true;
		194	}
189	}	195	}
190	}	196	return false;
191	}else{	197	}else{
192	marshalRecord.node((Node) objectValue, marshalRecord.getNamespaceResolver());	198	marshalRecord.node((Node) objectValue, marshalRecord.getNamespaceResolver());
193	return true;	199	return true;
Lines 228-233 public class XMLCompositeObjectMappingNodeValue extends XMLRelationshipMappingNo Link Here
228	}	234	}
229	objectBuilder.removeExtraNamespacesFromNamespaceResolver(marshalRecord, extraNamespaces, session);	235	objectBuilder.removeExtraNamespacesFromNamespaceResolver(marshalRecord, extraNamespaces, session);
230	} else {	236	} else {
		237	if (xmlCompositeObjectMapping.getReferenceClassName() !=null && xmlCompositeObjectMapping.getReferenceClassName().equals(XMLConstants.UNKNOWN_OR_TRANSIENT_CLASS)){
		238	throw XMLMarshalException.descriptorNotFoundInProject(objectValue.getClass().getName());
		239	}
		240
231	if (!(isSelfFragment \|\| xPathFragment.nameIsText())) {	241	if (!(isSelfFragment \|\| xPathFragment.nameIsText())) {
232	xPathNode.startElement(marshalRecord, xPathFragment, object, session, namespaceResolver, null, objectValue);	242	xPathNode.startElement(marshalRecord, xPathFragment, object, session, namespaceResolver, null, objectValue);
233	}	243	}

Lines 834-840 public class AnnotationsProcessor { Link Here

(-)a/moxy/org.eclipse.persistence.moxy/src/org/eclipse/persistence/jaxb/compiler/AnnotationsProcessor.java (-20 / +38 lines)
834	JavaClass typeClass = property.getActualType();	834	JavaClass typeClass = property.getActualType();
835	TypeInfo targetInfo = typeInfo.get(typeClass.getQualifiedName());	835	TypeInfo targetInfo = typeInfo.get(typeClass.getQualifiedName());
836	if (targetInfo != null && targetInfo.isTransient() && property.getXmlElements() == null) {	836	if (targetInfo != null && targetInfo.isTransient() && property.getXmlElements() == null) {
837	throw JAXBException.invalidReferenceToTransientClass(jClass.getQualifiedName(), property.getPropertyName(), typeClass.getQualifiedName());	837	property.setTransientType(true);
838	}	838	}
839	// only one XmlValue is allowed per class, and if there is one	839	// only one XmlValue is allowed per class, and if there is one
840	// only XmlAttributes are allowed	840	// only XmlAttributes are allowed
Lines 1825-1850 public class AnnotationsProcessor { Link Here
1825	property.setElement(javaHasAnnotations);	1825	property.setElement(javaHasAnnotations);
1826		1826
1827	// if there is a TypeInfo for ptype check it for transient, otherwise	1827	// if there is a TypeInfo for ptype check it for transient, otherwise
1828	// check the class	1828	// check the class
1829	TypeInfo pTypeInfo = typeInfo.get(ptype.getQualifiedName());	1829	if (isCollectionType(ptype)) {
1830	if ((pTypeInfo != null && !pTypeInfo.isTransient()) \|\| !helper.isAnnotationPresent(ptype, XmlTransient.class)) {	1830	JavaClass componentType = helper.getJavaClass(Object.class);;
1831	property.setType(ptype);	1831	if(ptype.hasActualTypeArguments()){
1832	} else {	1832	ArrayList typeArgs = (ArrayList) ptype.getActualTypeArguments();
1833	JavaClass parent = ptype.getSuperclass();	1833	if(typeArgs.size() > 0) {
1834	while (parent != null) {	1834	componentType = (JavaClass) typeArgs.get(0);
1835	if (parent.getName().equals(JAVA_LANG_OBJECT)) {	1835	}
1836	property.setType(parent);
1837	break;
1838	}
1839	// if there is a TypeInfo for parent check it for transient,
1840	// otherwise check the class
1841	TypeInfo parentTypeInfo = typeInfo.get(parent.getQualifiedName());
1842	if ((parentTypeInfo != null && !parentTypeInfo.isTransient()) \|\| !helper.isAnnotationPresent(parent, XmlTransient.class)) {
1843	property.setType(parent);
1844	break;
1845	}
1846	parent = parent.getSuperclass();
1847	}	1836	}
		1837
		1838	updatePropertyType(property, ptype, componentType);
		1839	}else{
		1840	updatePropertyType(property, ptype, ptype);
1848	}	1841	}
1849	if((ptype.isArray() && !areEquals(ptype, byte[].class)) \|\| (property.isCollectionType(ptype) && !helper.isAnnotationPresent(javaHasAnnotations, XmlList.class)) ){	1842	if((ptype.isArray() && !areEquals(ptype, byte[].class)) \|\| (property.isCollectionType(ptype) && !helper.isAnnotationPresent(javaHasAnnotations, XmlList.class)) ){
1850	property.setNillable(true);	1843	property.setNillable(true);
Lines 1958-1963 public class AnnotationsProcessor { Link Here
1958	return property;	1951	return property;
1959	}	1952	}
1960		1953
		1954
		1955	private void updatePropertyType(Property property, JavaClass ptype, JavaClass componentType){
		1956	TypeInfo componentTypeInfo = typeInfo.get(componentType);
		1957	if((componentTypeInfo != null && !componentTypeInfo.isTransient()) \|\| !helper.isAnnotationPresent(componentType, XmlTransient.class)){
		1958	property.setType(ptype);
		1959	}else{
		1960	JavaClass parent = componentType.getSuperclass();
		1961	while (parent != null) {
		1962	if (parent.getName().equals(JAVA_LANG_OBJECT)) {
		1963	property.setTransientType(true);
		1964	property.setType(ptype);
		1965	break;
		1966	}
		1967	// if there is a TypeInfo for parent check it for transient,
		1968	// otherwise check the class
		1969	TypeInfo parentTypeInfo = typeInfo.get(parent.getQualifiedName());
		1970	if ((parentTypeInfo != null && !parentTypeInfo.isTransient()) \|\| !helper.isAnnotationPresent(parent, XmlTransient.class)) {
		1971	property.setType(parent);
		1972	break;
		1973	}
		1974	parent = parent.getSuperclass();
		1975	}
		1976	}
		1977	}
		1978
1961	/**	1979	/**
1962	* Build a new 'choice' property. Here, we flag a new property as a 'choice'	1980	* Build a new 'choice' property. Here, we flag a new property as a 'choice'
1963	* and create/set an XmlModel XmlElements object based on the @XmlElements	1981	* and create/set an XmlModel XmlElements object based on the @XmlElements

Lines 139-146 public class Property implements Cloneable { Link Here

(-)a/moxy/org.eclipse.persistence.moxy/src/org/eclipse/persistence/jaxb/compiler/Property.java (+12 lines)
139	private List<XmlJoinNodes> xmlJoinNodesList;	139	private List<XmlJoinNodes> xmlJoinNodesList;
140	private boolean isSuperClassProperty;	140	private boolean isSuperClassProperty;
141		141
		142	private boolean isTransientType;
142	private static final String MARSHAL_METHOD_NAME = "marshal";	143	private static final String MARSHAL_METHOD_NAME = "marshal";
143		144
		145
144	public Property() {}	146	public Property() {}
145		147
146	public Property(Helper helper) {	148	public Property(Helper helper) {
Lines 407-412 public class Property implements Cloneable { Link Here
407	return isRequired;	409	return isRequired;
408	}	410	}
409		411
		412
		413
		414	public boolean isTransientType() {
		415	return isTransientType;
		416	}
		417
		418	public void setTransientType(boolean isTransientType) {
		419	this.isTransientType = isTransientType;
		420	}
		421
410	public void setIsRequired(boolean b) {	422	public void setIsRequired(boolean b) {
411	isRequired = b;	423	isRequired = b;
412	}	424	}

Lines 26-31 import org.eclipse.persistence.testing.jaxb.inheritance.ns.JAXBInheritanceSubTyp Link Here

(-)a/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/JAXBTestSuite2.java (+4 lines)
26	import org.eclipse.persistence.testing.jaxb.inheritance.ns.JAXBInheritanceSubTypeTestCases;	26	import org.eclipse.persistence.testing.jaxb.inheritance.ns.JAXBInheritanceSubTypeTestCases;
27	import org.eclipse.persistence.testing.jaxb.inheritance.simple.XmlValueInheritanceTestCases;	27	import org.eclipse.persistence.testing.jaxb.inheritance.simple.XmlValueInheritanceTestCases;
28	import org.eclipse.persistence.testing.jaxb.jaxbelement.complex.JAXBElementComplexTestCases;	28	import org.eclipse.persistence.testing.jaxb.jaxbelement.complex.JAXBElementComplexTestCases;
		29	import org.eclipse.persistence.testing.jaxb.jaxbelement.dom.ElementTestCases;
		30	import org.eclipse.persistence.testing.jaxb.jaxbelement.dom.TextNodeTestCases;
29	import org.eclipse.persistence.testing.jaxb.jaxbelement.nested.JAXBElementNestedTestCases;	31	import org.eclipse.persistence.testing.jaxb.jaxbelement.nested.JAXBElementNestedTestCases;
30	import org.eclipse.persistence.testing.jaxb.jaxbelement.nil.JAXBElementNilTestCases;	32	import org.eclipse.persistence.testing.jaxb.jaxbelement.nil.JAXBElementNilTestCases;
31	import org.eclipse.persistence.testing.jaxb.jaxbelement.simple.JAXBElementBase64TestCases;	33	import org.eclipse.persistence.testing.jaxb.jaxbelement.simple.JAXBElementBase64TestCases;
Lines 80-85 public class JAXBTestSuite2 extends TestCase { Link Here
80	suite.addTestSuite(org.eclipse.persistence.testing.jaxb.xmlenum.XmlValueAnnotationWithEnumTestCases.class);	82	suite.addTestSuite(org.eclipse.persistence.testing.jaxb.xmlenum.XmlValueAnnotationWithEnumTestCases.class);
81	suite.addTestSuite(org.eclipse.persistence.testing.jaxb.xmlenum.XmlEnumChoiceObjectTestCases.class);	83	suite.addTestSuite(org.eclipse.persistence.testing.jaxb.xmlenum.XmlEnumChoiceObjectTestCases.class);
82	suite.addTestSuite(org.eclipse.persistence.testing.jaxb.xmlenum.XmlEnumChoiceCollectionTestCases.class);	84	suite.addTestSuite(org.eclipse.persistence.testing.jaxb.xmlenum.XmlEnumChoiceCollectionTestCases.class);
		85	suite.addTestSuite(TextNodeTestCases.class);
		86	suite.addTestSuite(ElementTestCases.class);
83	suite.addTestSuite(JAXBElementSimpleTestCases.class);	87	suite.addTestSuite(JAXBElementSimpleTestCases.class);
84	suite.addTestSuite(JAXBElementNestedTestCases.class);	88	suite.addTestSuite(JAXBElementNestedTestCases.class);
85	suite.addTestSuite(JAXBElementComplexTestCases.class);	89	suite.addTestSuite(JAXBElementComplexTestCases.class);

Added Link Here

(-)a/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/ObjectWithTransient.java (+21 lines)
1	/*******************************************************************************
2	* Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved.
3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5	* which accompanies this distribution.
6	* The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7	* and the Eclipse Distribution License is available at
8	* http://www.eclipse.org/org/documents/edl-v10.php.
9	*
10	* Contributors:
11	* Denise Smith - October 18, 2012
12	******************************************************************************/
13	package org.eclipse.persistence.testing.jaxb.annotations.xmltransient;
14
15	import java.util.List;
16
17	public class ObjectWithTransient {
18	public String testString;
19	public TransientClass transientThing;
20	public List<TransientClass> transientThings;
21	}

Added Link Here

(-)a/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/ElementTestCases.java (+41 lines)
1	package org.eclipse.persistence.testing.jaxb.jaxbelement.dom;
2
3	import javax.xml.bind.JAXBElement;
4	import javax.xml.parsers.DocumentBuilderFactory;
5
6	import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
7	import org.w3c.dom.Document;
8	import org.w3c.dom.Element;
9
10	public class ElementTestCases extends JAXBWithJSONTestCases{
11
12	private final static String XML_RESOURCE = "org/eclipse/persistence/testing/jaxb/jaxbelement/dom/element.xml";
13	private final static String JSON_RESOURCE = "org/eclipse/persistence/testing/jaxb/jaxbelement/dom/element.json";
14
15
16	public ElementTestCases(String name) throws Exception {
17	super(name);
18	setContextPath("org.eclipse.persistence.testing.jaxb.jaxbelement.dom");
19	setControlDocument(XML_RESOURCE);
20	setControlJSON(JSON_RESOURCE);
21	}
22
23	@Override
24	protected Object getControlObject() {
25	ObjectFactory factory = new ObjectFactory();
26	Document doc;
27	try {
28	doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
29	Element elm = doc.createElementNS("AGroupDef/annotation", "rootchild");
30	elm.setTextContent("");
31	JAXBElement obj = factory.createRoot(elm);
32	return obj;
33	} catch (Exception e) {
34	e.printStackTrace();
35	fail("An exception was thrown.");
36	return null;
37	}
38	}
39
40
41	}

Added Link Here

(-)a/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/ObjectFactory.java (+62 lines)
1	//
2	// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-147
3	// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
4	// Any modifications to this file will be lost upon recompilation of the source schema.
5	// Generated on: 2012.10.18 at 09:37:32 AM EDT
6	//
7
8
9	package org.eclipse.persistence.testing.jaxb.jaxbelement.dom;
10
11	import javax.xml.bind.JAXBElement;
12	import javax.xml.bind.annotation.XmlElementDecl;
13	import javax.xml.bind.annotation.XmlRegistry;
14	import javax.xml.namespace.QName;
15
16
17	/**
18	* This object contains factory methods for each
19	* Java content interface and Java element interface
20	* generated in the generated package.
21	* <p>An ObjectFactory allows you to programatically
22	* construct new instances of the Java representation
23	* for XML content. The Java representation of XML
24	* content can consist of schema derived interfaces
25	* and classes representing the binding of schema
26	* type definitions, element declarations and model
27	* groups. Factory methods for each of these are
28	* provided in this class.
29	*
30	*/
31	@XmlRegistry
32	public class ObjectFactory {
33
34	private final static QName _Doc_QNAME = new QName("", "doc");
35	private final static QName _Root_QNAME = new QName("AGroupDef/annotation", "root");
36
37	/**
38	* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: generated
39	*
40	*/
41	public ObjectFactory() {
42	}
43
44	/**
45	* Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}}
46	*
47	*/
48	@XmlElementDecl(namespace = "", name = "doc")
49	public JAXBElement<Object> createDoc(Object value) {
50	return new JAXBElement<Object>(_Doc_QNAME, Object.class, null, value);
51	}
52
53	/**
54	* Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}}
55	*
56	*/
57	@XmlElementDecl(namespace = "AGroupDef/annotation", name = "root")
58	public JAXBElement<Object> createRoot(Object value) {
59	return new JAXBElement<Object>(_Root_QNAME, Object.class, null, value);
60	}
61
62	}