src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java

@@ -41,10 +41,12 @@
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.annotation.XmlAttachmentRef;
 import javax.xml.bind.annotation.XmlID;
 import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlMimeType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.namespace.QName;
 
 import com.sun.codemodel.internal.ClassType;
 import com.sun.codemodel.internal.JAnnotatable;
 import com.sun.codemodel.internal.JClass;

@@ -94,11 +96,12 @@
 import com.sun.tools.internal.xjc.outline.EnumOutline;
 import com.sun.tools.internal.xjc.outline.FieldOutline;
 import com.sun.tools.internal.xjc.outline.Outline;
 import com.sun.tools.internal.xjc.outline.PackageOutline;
 import com.sun.tools.internal.xjc.util.CodeModelClassFactory;
-import com.sun.xml.internal.bind.v2.runtime.SwaRefAdapter;
+import com.sun.xml.internal.bind.v2.model.core.PropertyInfo;
+import com.sun.xml.internal.bind.v2.runtime.SwaRefAdapterMarker;
 import com.sun.xml.internal.xsom.XmlString;
 import com.sun.istack.internal.NotNull;
 import com.sun.tools.internal.xjc.model.CReferencePropertyInfo;
 
 /**

@@ -768,11 +771,11 @@
      * (such as {@link XmlID}, {@link XmlIDREF}, and {@link XmlMimeType} if necessary.
      */
     public final void generateAdapterIfNecessary(CPropertyInfo prop, JAnnotatable field) {
         CAdapter adapter = prop.getAdapter();
         if (adapter != null) {
-            if (adapter.getAdapterIfKnown() == SwaRefAdapter.class) {
+            if (adapter.getAdapterIfKnown() == SwaRefAdapterMarker.class) {
                 field.annotate(XmlAttachmentRef.class);
             } else {
                 // [RESULT]
                 // @XmlJavaTypeAdapter( Foo.class )
                 XmlJavaTypeAdapterWriter xjtw = field.annotate2(XmlJavaTypeAdapterWriter.class);