Upgraded to XJC 2.2.11.

highsource · Nov 8, 2014 · ad7f3cd · ad7f3cd
1 parent f7929e3
commit ad7f3cd
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 17 deletions.
diff --git a/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/mapping/AttributesMapping.java b/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/mapping/AttributesMapping.java
@@ -30,7 +30,7 @@
 import com.sun.tools.xjc.model.CEnumLeafInfo;
 import com.sun.tools.xjc.model.CPropertyInfo;
 import com.sun.tools.xjc.model.CTypeInfo;
-import com.sun.tools.xjc.outline.Aspect;
+import  com.sun.tools.xjc.model.Aspect;
 import com.sun.tools.xjc.outline.ClassOutline;
 import com.sun.tools.xjc.outline.FieldOutline;
 

diff --git a/...n/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/WrapCollectionAttribute.java b/...n/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/WrapCollectionAttribute.java
@@ -34,7 +34,7 @@
 import com.sun.tools.xjc.model.CPropertyInfo;
 import com.sun.tools.xjc.model.CTypeRef;
 import com.sun.tools.xjc.model.CElementPropertyInfo.CollectionMode;
-import com.sun.tools.xjc.outline.Aspect;
+import  com.sun.tools.xjc.model.Aspect;
 import com.sun.tools.xjc.outline.FieldOutline;
 import com.sun.tools.xjc.reader.Ring;
 import com.sun.tools.xjc.reader.xmlschema.BGMBuilder;

diff --git a/...gin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/WrapCollectionElement.java b/...gin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/WrapCollectionElement.java
@@ -36,7 +36,7 @@
 import com.sun.tools.xjc.model.CPluginCustomization;
 import com.sun.tools.xjc.model.CPropertyInfo;
 import com.sun.tools.xjc.model.CTypeRef;
-import com.sun.tools.xjc.outline.Aspect;
+import  com.sun.tools.xjc.model.Aspect;
 import com.sun.tools.xjc.outline.FieldOutline;
 import com.sun.tools.xjc.reader.Ring;
 import com.sun.tools.xjc.reader.xmlschema.BGMBuilder;

diff --git a/...main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/WrapCollectionHeteroReference.java b/...main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/WrapCollectionHeteroReference.java
@@ -39,7 +39,7 @@
 import com.sun.tools.xjc.model.CReferencePropertyInfo;
 import com.sun.tools.xjc.model.CTypeRef;
 import com.sun.tools.xjc.model.CElementPropertyInfo.CollectionMode;
-import com.sun.tools.xjc.outline.Aspect;
+import  com.sun.tools.xjc.model.Aspect;
 import com.sun.tools.xjc.outline.FieldOutline;
 import com.sun.tools.xjc.reader.Ring;
 import com.sun.tools.xjc.reader.xmlschema.BGMBuilder;

diff --git a/...lugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/WrapCollectionValue.java b/...lugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/WrapCollectionValue.java
@@ -34,7 +34,7 @@
 import com.sun.tools.xjc.model.CTypeRef;
 import com.sun.tools.xjc.model.CValuePropertyInfo;
 import com.sun.tools.xjc.model.CElementPropertyInfo.CollectionMode;
-import com.sun.tools.xjc.outline.Aspect;
+import  com.sun.tools.xjc.model.Aspect;
 import com.sun.tools.xjc.outline.FieldOutline;
 import com.sun.tools.xjc.reader.Ring;
 import com.sun.tools.xjc.reader.xmlschema.BGMBuilder;

diff --git a/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/naming/impl/DefaultNaming.java b/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/naming/impl/DefaultNaming.java
@@ -30,7 +30,7 @@
 import com.sun.tools.xjc.model.CPropertyInfo;
 import com.sun.tools.xjc.model.CTypeInfo;
 import com.sun.tools.xjc.model.nav.NType;
-import com.sun.tools.xjc.outline.Aspect;
+import  com.sun.tools.xjc.model.Aspect;
 import com.sun.tools.xjc.outline.ClassOutline;
 import com.sun.tools.xjc.outline.FieldOutline;
 import com.sun.tools.xjc.outline.Outline;

diff --git a/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/AbstractField.java b/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/AbstractField.java
@@ -1,6 +1,6 @@
 package org.jvnet.hyperjaxb3.xjc.generator.bean.field;
 
-import static com.sun.tools.xjc.outline.Aspect.IMPLEMENTATION;
+import static  com.sun.tools.xjc.model.Aspect.IMPLEMENTATION;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -38,7 +38,7 @@
 import com.sun.tools.xjc.model.CTypeRef;
 import com.sun.tools.xjc.model.CValuePropertyInfo;
 import com.sun.tools.xjc.model.nav.NClass;
-import com.sun.tools.xjc.outline.Aspect;
+import  com.sun.tools.xjc.model.Aspect;
 import com.sun.tools.xjc.outline.ClassOutline;
 import com.sun.tools.xjc.outline.FieldAccessor;
 import com.sun.tools.xjc.outline.FieldOutline;

diff --git a/.../main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/AbstractWrapCollectionField.java b/.../main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/AbstractWrapCollectionField.java
@@ -18,7 +18,7 @@
 import com.sun.tools.xjc.generator.bean.MethodWriter;
 import com.sun.tools.xjc.model.CPropertyInfo;
 import com.sun.tools.xjc.model.CReferencePropertyInfo;
-import com.sun.tools.xjc.outline.Aspect;
+import  com.sun.tools.xjc.model.Aspect;
 import com.sun.tools.xjc.outline.FieldAccessor;
 
 public abstract class AbstractWrapCollectionField extends AbstractField {

diff --git a/...in/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/AbstractWrappingField.java b/...in/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/AbstractWrappingField.java
@@ -17,7 +17,7 @@
 import com.sun.tools.xjc.generator.bean.MethodWriter;
 import com.sun.tools.xjc.model.CClassInfo;
 import com.sun.tools.xjc.model.CPropertyInfo;
-import com.sun.tools.xjc.outline.Aspect;
+import  com.sun.tools.xjc.model.Aspect;
 import com.sun.tools.xjc.outline.FieldAccessor;
 
 public abstract class AbstractWrappingField extends AbstractField {

diff --git a/...gin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/JAXBElementNameField.java b/...gin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/JAXBElementNameField.java
@@ -11,7 +11,7 @@
 import com.sun.tools.xjc.model.CNonElement;
 import com.sun.tools.xjc.model.CPropertyInfo;
 import com.sun.tools.xjc.model.CReferencePropertyInfo;
-import com.sun.tools.xjc.outline.Aspect;
+import  com.sun.tools.xjc.model.Aspect;
 
 public class JAXBElementNameField extends AbstractWrappingField {
 

diff --git a/...in/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/JAXBElementValueField.java b/...in/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/JAXBElementValueField.java
@@ -11,7 +11,7 @@
 import com.sun.tools.xjc.model.CNonElement;
 import com.sun.tools.xjc.model.CPropertyInfo;
 import com.sun.tools.xjc.model.CReferencePropertyInfo;
-import com.sun.tools.xjc.outline.Aspect;
+import  com.sun.tools.xjc.model.Aspect;
 
 public class JAXBElementValueField extends AbstractWrappingField {
 

diff --git a/...main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/SingleEnumValueWrappingField.java b/...main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/SingleEnumValueWrappingField.java
@@ -7,7 +7,7 @@
 import com.sun.tools.xjc.generator.bean.ClassOutlineImpl;
 import com.sun.tools.xjc.model.CEnumLeafInfo;
 import com.sun.tools.xjc.model.CPropertyInfo;
-import com.sun.tools.xjc.outline.Aspect;
+import  com.sun.tools.xjc.model.Aspect;
 
 public class SingleEnumValueWrappingField extends AbstractWrappingField {
 

diff --git a/...main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/SingleWrappingClassInfoField.java b/...main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/SingleWrappingClassInfoField.java
@@ -7,7 +7,7 @@
 import com.sun.tools.xjc.generator.bean.ClassOutlineImpl;
 import com.sun.tools.xjc.model.CClassInfo;
 import com.sun.tools.xjc.model.CPropertyInfo;
-import com.sun.tools.xjc.outline.Aspect;
+import  com.sun.tools.xjc.model.Aspect;
 
 public class SingleWrappingClassInfoField extends AbstractWrappingField {
 

diff --git a/...c/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/SingleWrappingElementField.java b/...c/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/SingleWrappingElementField.java
@@ -7,7 +7,7 @@
 import com.sun.tools.xjc.generator.bean.ClassOutlineImpl;
 import com.sun.tools.xjc.model.CPropertyInfo;
 import com.sun.tools.xjc.model.CTypeRef;
-import com.sun.tools.xjc.outline.Aspect;
+import  com.sun.tools.xjc.model.Aspect;
 
 public class SingleWrappingElementField extends SingleWrappingField {
 

diff --git a/...main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/SingleWrappingReferenceField.java b/...main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/SingleWrappingReferenceField.java
@@ -18,7 +18,7 @@
 import com.sun.tools.xjc.model.CNonElement;
 import com.sun.tools.xjc.model.CPropertyInfo;
 import com.sun.tools.xjc.model.CReferencePropertyInfo;
-import com.sun.tools.xjc.outline.Aspect;
+import  com.sun.tools.xjc.model.Aspect;
 
 public class SingleWrappingReferenceField extends AdaptingWrappingField {
 

diff --git a/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/model/CExternalLeafInfo.java b/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/model/CExternalLeafInfo.java
@@ -15,7 +15,7 @@
 import com.sun.tools.xjc.model.CNonElement;
 import com.sun.tools.xjc.model.nav.NType;
 import com.sun.tools.xjc.model.nav.NavigatorImpl;
-import com.sun.tools.xjc.outline.Aspect;
+import  com.sun.tools.xjc.model.Aspect;
 import com.sun.tools.xjc.outline.Outline;
 import com.sun.xml.bind.v2.model.annotation.Locatable;
 import com.sun.xml.bind.v2.model.core.ID;