Issue #4.

Author: highsource

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/SimplifyPlugin.java

@@ -161,6 +161,10 @@ private void simplifyReferencePropertyInfoAsReferencePropertyInfo(
 					model, property, element);
 			classInfo.getProperties().add(index++, referencePropertyInfo);
 		}
+		if (property.isMixed()) {
+			classInfo.getProperties().add(index++,
+					createContentReferencePropertyInfo(model, property));
+		}
 		classInfo.getProperties().remove(property);
 	}
 
@@ -192,6 +196,10 @@ private void simplifyReferencePropertyInfoAsElementPropertyInfo(
 				classInfo.getProperties().add(index++, elementPropertyInfo);
 			}
 		}
+		if (property.isMixed()) {
+			classInfo.getProperties().add(index++,
+					createContentReferencePropertyInfo(model, property));
+		}
 		classInfo.getProperties().remove(property);
 	}
 
@@ -242,14 +250,24 @@ private CReferencePropertyInfo createReferencePropertyInfo(
 			final Model model, CReferencePropertyInfo property, CElement element) {
 		final String propertyName = createPropertyName(model, element);
 		final CReferencePropertyInfo referencePropertyInfo = new CReferencePropertyInfo(
-				propertyName, true, false, property.isMixed(),
-				element.getSchemaComponent(), element.getCustomizations(),
-				element.getLocator(), property.isDummy(), property.isContent(),
+				propertyName, true, false, false, element.getSchemaComponent(),
+				element.getCustomizations(), element.getLocator(),
+				property.isDummy(), property.isContent(),
 				property.isMixedExtendedCust());
 		referencePropertyInfo.getElements().add(element);
 		return referencePropertyInfo;
 	}
 
+	private CReferencePropertyInfo createContentReferencePropertyInfo(
+			final Model model, CReferencePropertyInfo property) {
+		final String propertyName = "content";
+		final CReferencePropertyInfo referencePropertyInfo = new CReferencePropertyInfo(
+				propertyName, true, false, true, property.getSchemaComponent(),
+				property.getCustomizations(), property.getLocator(), false,
+				true, property.isMixedExtendedCust());
+		return referencePropertyInfo;
+	}
+
 	private CElementPropertyInfo createElementPropertyInfo(final Model model,
 			CElementPropertyInfo property, CTypeRef typeRef) {
 		final String propertyName = createPropertyName(model, typeRef);

pom.xml

@@ -152,7 +152,7 @@
 			<dependency>
 				<groupId>javax.xml.bind</groupId>
 				<artifactId>jaxb-api</artifactId>
-				<version>2.1</version>
+				<version>${jaxb.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.sun.xml.bind</groupId>

tests/issues/.classpath

@@ -7,7 +7,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/classes" path="target/generated-sources/xjc">
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="target/generated-sources/xjc">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>

tests/issues/.settings/org.eclipse.core.resources.prefs

@@ -3,4 +3,5 @@ encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
+encoding//target/generated-sources/xjc=UTF-8
 encoding/<project>=UTF-8

tests/issues/src/main/resources/schema.xsd

@@ -332,5 +332,18 @@
 		</xs:sequence>
 	</xs:complexType>
 
+	<xs:complexType name="ghIssue4" mixed="true">
+		<xs:sequence>
+			<xs:element name="a" type="xs:string">
+				<xs:annotation>
+				<xs:appinfo>
+					<simplify:as-element-property/>
+				</xs:appinfo>
+			</xs:annotation>
+			</xs:element>
+			<xs:element name="b" type="xs:int"/>
+		</xs:sequence> 
+	</xs:complexType>
+
 
 </xs:schema>

tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GhIssue4Test.java

@@ -0,0 +1,30 @@
+package org.jvnet.jaxb2_commons.tests.issues;
+
+import java.io.StringWriter;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import javax.xml.namespace.QName;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class GhIssue4Test {
+
+	@Test
+	public void contextIsSuccessfullyCreated() throws JAXBException {
+		final JAXBContext context = JAXBContext.newInstance(GhIssue4.class);
+		final GhIssue4 value = new GhIssue4();
+		value.getA().add("a");
+		value.getB().add(2);
+		value.getcontent().add("Test");
+
+		final StringWriter sw = new StringWriter();
+		context.createMarshaller().marshal(
+				new JAXBElement<GhIssue4>(new QName("test"), GhIssue4.class,
+						value), sw);
+		Assert.assertTrue(sw.toString().endsWith(
+				"<test><a>a</a><b>2</b>Test</test>"));
+	}
+}