diff --git a/basics/pom.xml-merge b/basics/pom.xml-merge index f27126311..a8d99620e 100644 --- a/basics/pom.xml-merge +++ b/basics/pom.xml-merge @@ -234,8 +234,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin ${maven-jaxb2-plugin.version} diff --git a/basics/testing/src/main/java/org/jvnet/jaxb2_commons/lang/ExtendedJAXBEqualsStrategy.java b/basics/testing/src/main/java/org/jvnet/jaxb2_commons/lang/ExtendedJAXBEqualsStrategy.java index cd9befe04..e969b7450 100644 --- a/basics/testing/src/main/java/org/jvnet/jaxb2_commons/lang/ExtendedJAXBEqualsStrategy.java +++ b/basics/testing/src/main/java/org/jvnet/jaxb2_commons/lang/ExtendedJAXBEqualsStrategy.java @@ -7,6 +7,9 @@ import org.jvnet.jaxb2_commons.locator.ObjectLocator; import org.w3c.dom.Node; +import java.math.BigDecimal; +import java.util.Objects; + public class ExtendedJAXBEqualsStrategy extends JAXBEqualsStrategy { @Override @@ -21,6 +24,11 @@ protected boolean equalsInternal(ObjectLocator leftLocator, return equalsInternal(leftLocator, rightLocator, (XMLGregorianCalendar) lhs, (XMLGregorianCalendar) rhs); + } else if (lhs instanceof BigDecimal + && rhs instanceof BigDecimal) { + return equalsInternal(leftLocator, rightLocator, + (BigDecimal) lhs, (BigDecimal) rhs); + } else { return super.equalsInternal(leftLocator, rightLocator, lhs, rhs); } @@ -34,11 +42,31 @@ protected boolean equalsInternal(ObjectLocator leftLocator, .toGregorianCalendar().getTimeInMillis()); } + protected boolean equalsInternal(ObjectLocator leftLocator, + ObjectLocator rightLocator, + BigDecimal left, + BigDecimal right) { + if (Objects.equals(left, right)) { + return true; + } + if (left == null || right == null) { + return false; + } + return left.compareTo(right) == 0; + } + protected boolean equalsInternal(ObjectLocator leftLocator, ObjectLocator rightLocator, Node lhs, Node rhs) { final Diff diff = new Diff(new DOMSource((Node) lhs), new DOMSource( (Node) rhs)); return diff.identical(); } + public static JAXBEqualsStrategy INSTANCE2 = new ExtendedJAXBEqualsStrategy(); + @SuppressWarnings("deprecation") + public static EqualsStrategy INSTANCE = INSTANCE2; + + public static JAXBEqualsStrategy getInstance() { + return INSTANCE2; + } } diff --git a/hyperjaxb/dist/pom.xml b/hyperjaxb/dist/pom.xml index 422b3cf45..1716d8d86 100644 --- a/hyperjaxb/dist/pom.xml +++ b/hyperjaxb/dist/pom.xml @@ -1,16 +1,17 @@ - 4.0.0 - org.jvnet.hyperjaxb3 - hyperjaxb3-dist - pom - Hyperjaxb3 Distribution - org.jvnet.hyperjaxb3 - hyperjaxb3 - 0.6.3-SNAPSHOT + org.jvnet.jaxb + hyperjaxb3-parent + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-dist + pom + JAXB Tools :: Hyperjaxb3 :: Distribution + ${project.groupId} @@ -105,4 +106,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/.gitignore b/hyperjaxb/ejb/.gitignore deleted file mode 100644 index 93aa9b504..000000000 --- a/hyperjaxb/ejb/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -target -/extensions/hyperjaxb3-ejb-extensions.iml diff --git a/hyperjaxb/ejb/extensions/naming/custom-naming-pre_0_6_0/.gitignore b/hyperjaxb/ejb/extensions/naming/custom-naming-pre_0_6_0/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/extensions/naming/custom-naming-pre_0_6_0/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/extensions/naming/custom-naming-pre_0_6_0/pom.xml b/hyperjaxb/ejb/extensions/naming/custom-naming-pre_0_6_0/pom.xml index cbc99be7d..4f38e53d2 100644 --- a/hyperjaxb/ejb/extensions/naming/custom-naming-pre_0_6_0/pom.xml +++ b/hyperjaxb/ejb/extensions/naming/custom-naming-pre_0_6_0/pom.xml @@ -3,18 +3,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-extensions-naming - 0.6.3-SNAPSHOT + org.jvnet.jaxb + hyperjaxb3-ejb-extensions-naming + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-extensions-custom-naming-pre_0_6_0 jar - Hyperjaxb3 EJB Extensions Naming [custom-naming-pre_0_6_0] + JAXB Tools :: Hyperjaxb3 :: EJB :: Extensions :: Naming [custom-naming-pre_0_6_0] + - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-plugin - provided diff --git a/hyperjaxb/ejb/extensions/naming/pom.xml b/hyperjaxb/ejb/extensions/naming/pom.xml index a4615303a..187ed0635 100644 --- a/hyperjaxb/ejb/extensions/naming/pom.xml +++ b/hyperjaxb/ejb/extensions/naming/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-extensions - 0.6.3-SNAPSHOT + org.jvnet.jaxb + hyperjaxb3-ejb-extensions + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-extensions-naming pom - Hyperjaxb3 EJB Extensions Naming + JAXB Tools :: Hyperjaxb3 :: EJB :: Extensions :: Naming + custom-naming-pre_0_6_0 diff --git a/hyperjaxb/ejb/extensions/pom.xml b/hyperjaxb/ejb/extensions/pom.xml index 546fb8333..16694e914 100644 --- a/hyperjaxb/ejb/extensions/pom.xml +++ b/hyperjaxb/ejb/extensions/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb - 0.6.3-SNAPSHOT + org.jvnet.jaxb + hyperjaxb3-ejb + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-extensions pom - Hyperjaxb3 EJB Extensions + JAXB Tools :: Hyperjaxb3 :: EJB :: Extensions + naming diff --git a/hyperjaxb/ejb/plugin/.gitignore b/hyperjaxb/ejb/plugin/.gitignore deleted file mode 100644 index b8ea0ea98..000000000 --- a/hyperjaxb/ejb/plugin/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -.settings -.classpath -.project diff --git a/hyperjaxb/ejb/plugin/.settings/org.eclipse.core.resources.prefs b/hyperjaxb/ejb/plugin/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 29abf9995..000000000 --- a/hyperjaxb/ejb/plugin/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -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/=UTF-8 diff --git a/hyperjaxb/ejb/plugin/.settings/org.eclipse.jdt.core.prefs b/hyperjaxb/ejb/plugin/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 60105c1b9..000000000 --- a/hyperjaxb/ejb/plugin/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hyperjaxb/ejb/plugin/.settings/org.eclipse.m2e.core.prefs b/hyperjaxb/ejb/plugin/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/hyperjaxb/ejb/plugin/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hyperjaxb/ejb/plugin/pom.xml b/hyperjaxb/ejb/plugin/pom.xml index ab3cf1fa6..12511a94d 100644 --- a/hyperjaxb/ejb/plugin/pom.xml +++ b/hyperjaxb/ejb/plugin/pom.xml @@ -1,48 +1,55 @@ - 4.0.0 - hyperjaxb3-ejb-plugin - jar - Hyperjaxb3 EJB Plugin - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-ejb-plugin + jar + JAXB Tools :: Hyperjaxb3 :: EJB :: Plugin + - org.jvnet.annox - annox + org.jvnet.jaxb + jaxb-annox - org.jvnet.jaxb2_commons - jaxb2-basics-annotate + org.jvnet.jaxb + jaxb-basics-annotate - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tools - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-roundtrip - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-runtime - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-schemas-persistence - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-schemas-customizations + + + jakarta.xml.bind + jakarta.xml.bind-api + org.glassfish.jaxb jaxb-runtime @@ -58,6 +65,10 @@ jaxb-core provided + + org.glassfish.jaxb + xsom + - org.hibernate.javax.persistence - hibernate-jpa-2.1-api + javax.persistence + javax.persistence-api org.springframework @@ -78,4 +89,4 @@ install - \ No newline at end of file + diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/annotation/util/AnnotationUtils.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/annotation/util/AnnotationUtils.java index b9cae6851..f69763551 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/annotation/util/AnnotationUtils.java +++ b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/annotation/util/AnnotationUtils.java @@ -3,15 +3,15 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Array; -import org.jvnet.annox.model.XAnnotation; -import org.jvnet.annox.model.annotation.field.XAnnotationField; -import org.jvnet.annox.model.annotation.field.XArrayAnnotationField; -import org.jvnet.annox.model.annotation.field.XSingleAnnotationField; -import org.jvnet.annox.model.annotation.value.XBooleanAnnotationValue; -import org.jvnet.annox.model.annotation.value.XEnumAnnotationValue; -import org.jvnet.annox.model.annotation.value.XIntAnnotationValue; -import org.jvnet.annox.model.annotation.value.XStringAnnotationValue; -import org.jvnet.annox.model.annotation.value.XXAnnotationAnnotationValue; +import org.jvnet.jaxb.annox.model.XAnnotation; +import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.field.XArrayAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.field.XSingleAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.value.XBooleanAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XEnumAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XIntAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XStringAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XXAnnotationAnnotationValue; public class AnnotationUtils { diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/jpa2/strategy/annotate/CreateXAnnotations.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/jpa2/strategy/annotate/CreateXAnnotations.java index 7410165fc..0c1e2a22c 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/jpa2/strategy/annotate/CreateXAnnotations.java +++ b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/jpa2/strategy/annotate/CreateXAnnotations.java @@ -12,10 +12,10 @@ import javax.persistence.QueryHint; import javax.persistence.TemporalType; -import org.jvnet.annox.model.XAnnotation; -import org.jvnet.annox.model.annotation.field.XSingleAnnotationField; -import org.jvnet.annox.model.annotation.value.XClassByNameAnnotationValue; -import org.jvnet.annox.model.annotation.value.XEnumAnnotationValue; +import org.jvnet.jaxb.annox.model.XAnnotation; +import org.jvnet.jaxb.annox.model.annotation.field.XSingleAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.value.XClassByNameAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XEnumAnnotationValue; import org.jvnet.hyperjaxb3.annotation.util.AnnotationUtils; import com.sun.java.xml.ns.persistence.orm.AssociationOverride; diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/AnnotateOutline.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/AnnotateOutline.java index 0cc1b4ad2..4e439c539 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/AnnotateOutline.java +++ b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/AnnotateOutline.java @@ -8,7 +8,7 @@ import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jvnet.annox.model.XAnnotation; +import org.jvnet.jaxb.annox.model.XAnnotation; import org.jvnet.hyperjaxb3.ejb.plugin.EjbPlugin; import org.jvnet.hyperjaxb3.ejb.strategy.ignoring.Ignoring; import org.jvnet.hyperjaxb3.ejb.strategy.mapping.Mapping; diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/AnnotatingArrayValueVisitor.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/AnnotatingArrayValueVisitor.java index ac7ff45d6..efa2c2a9e 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/AnnotatingArrayValueVisitor.java +++ b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/AnnotatingArrayValueVisitor.java @@ -1,6 +1,6 @@ package org.jvnet.hyperjaxb3.ejb.strategy.annotate; -import org.jvnet.annox.model.annotation.value.XStringAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XStringAnnotationValue; import org.jvnet.hyperjaxb3.xsd.util.StringUtils; import com.sun.codemodel.JAnnotationArrayMember; diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/AnnotatingSingleValueVisitor.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/AnnotatingSingleValueVisitor.java index a3daa795a..ee0155349 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/AnnotatingSingleValueVisitor.java +++ b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/AnnotatingSingleValueVisitor.java @@ -1,6 +1,6 @@ package org.jvnet.hyperjaxb3.ejb.strategy.annotate; -import org.jvnet.annox.model.annotation.value.XStringAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XStringAnnotationValue; import org.jvnet.hyperjaxb3.xsd.util.StringUtils; import com.sun.codemodel.JAnnotationUse; diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/AnnotatingVisitor.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/AnnotatingVisitor.java index 58371020d..7b309b425 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/AnnotatingVisitor.java +++ b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/AnnotatingVisitor.java @@ -1,9 +1,9 @@ package org.jvnet.hyperjaxb3.ejb.strategy.annotate; -import org.jvnet.annox.model.XAnnotationFieldVisitor; -import org.jvnet.annox.model.annotation.field.XArrayAnnotationField; -import org.jvnet.annox.model.annotation.field.XSingleAnnotationField; -import org.jvnet.annox.model.annotation.value.XAnnotationValue; +import org.jvnet.jaxb.annox.model.XAnnotationFieldVisitor; +import org.jvnet.jaxb.annox.model.annotation.field.XArrayAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.field.XSingleAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue; import com.sun.codemodel.JAnnotationArrayMember; import com.sun.codemodel.JAnnotationUse; diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/Annotator.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/Annotator.java index 189c2097b..73edc0e2e 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/Annotator.java +++ b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/Annotator.java @@ -1,6 +1,6 @@ package org.jvnet.hyperjaxb3.ejb.strategy.annotate; -import org.jvnet.annox.model.XAnnotationFieldVisitor; +import org.jvnet.jaxb.annox.model.XAnnotationFieldVisitor; import com.sun.codemodel.JAnnotationUse; import com.sun.codemodel.JCodeModel; diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/CreateXAnnotations.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/CreateXAnnotations.java index 6f50f1f4f..cd6beb941 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/CreateXAnnotations.java +++ b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/CreateXAnnotations.java @@ -17,11 +17,11 @@ import javax.persistence.SqlResultSetMappings; import javax.persistence.TemporalType; -import org.jvnet.annox.model.XAnnotation; -import org.jvnet.annox.model.annotation.field.XArrayAnnotationField; -import org.jvnet.annox.model.annotation.field.XSingleAnnotationField; -import org.jvnet.annox.model.annotation.value.XClassByNameAnnotationValue; -import org.jvnet.annox.model.annotation.value.XEnumAnnotationValue; +import org.jvnet.jaxb.annox.model.XAnnotation; +import org.jvnet.jaxb.annox.model.annotation.field.XArrayAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.field.XSingleAnnotationField; +import org.jvnet.jaxb.annox.model.annotation.value.XClassByNameAnnotationValue; +import org.jvnet.jaxb.annox.model.annotation.value.XEnumAnnotationValue; import org.jvnet.hyperjaxb3.annotation.util.AnnotationUtils; import com.sun.java.xml.ns.persistence.orm.AssociationOverride; diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/customizing/impl/DefaultCustomizing.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/customizing/impl/DefaultCustomizing.java index 9827b3ca1..211d8b8a5 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/customizing/impl/DefaultCustomizing.java +++ b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/customizing/impl/DefaultCustomizing.java @@ -42,8 +42,8 @@ import org.jvnet.hyperjaxb3.xsom.SimpleTypeAnalyzer; import org.jvnet.hyperjaxb3.xsom.TypeUtils; import org.jvnet.jaxb2_commons.lang.JAXBMergeStrategy; -import org.jvnet.jaxb2_commons.lang.MergeFrom; -import org.jvnet.jaxb2_commons.lang.MergeStrategy; +import org.jvnet.jaxb2_commons.lang.MergeFrom2; +import org.jvnet.jaxb2_commons.lang.MergeStrategy2; import org.jvnet.jaxb2_commons.util.CustomizationUtils; import org.springframework.beans.factory.annotation.Required; @@ -1112,10 +1112,10 @@ public JaxbContext getJaxbContext(CPropertyInfo property) { return jaxbContext; } - private final static MergeStrategy MERGE_STRATEGY = new MergeableMergeStrategy( - JAXBMergeStrategy.INSTANCE); + private final static MergeStrategy2 MERGE_STRATEGY = new MergeableMergeStrategy( + JAXBMergeStrategy.INSTANCE2); - private void mergeFrom(T value, + private void mergeFrom(T value, T defaultValue) { value.mergeFrom(null, null, value, defaultValue, MERGE_STRATEGY); } @@ -1124,7 +1124,7 @@ private interface Merge { public void merge(M value, M defaultValue); } - private Merge merge() { + private Merge merge() { return new Merge() { public void merge(M value, M defaultValue) { DefaultCustomizing.this.mergeFrom(value, defaultValue); diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/mapping/AttributesMapping.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/mapping/AttributesMapping.java index e5c4df8f9..37fbfe5c4 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/mapping/AttributesMapping.java +++ b/hyperjaxb/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.model.Aspect; +import com.sun.tools.xjc.outline.Aspect; import com.sun.tools.xjc.outline.ClassOutline; import com.sun.tools.xjc.outline.FieldOutline; diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/DefaultCreateDefaultIdPropertyInfos.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/DefaultCreateDefaultIdPropertyInfos.java index 7a52f03a1..7b0863c8a 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/DefaultCreateDefaultIdPropertyInfos.java +++ b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/DefaultCreateDefaultIdPropertyInfos.java @@ -7,7 +7,7 @@ import javax.xml.namespace.QName; import org.apache.commons.lang3.Validate; -import org.jvnet.annox.util.ClassUtils; +import org.jvnet.jaxb.annox.util.ClassUtils; import org.jvnet.hyperjaxb3.ejb.schemas.customizations.Customizations; import org.jvnet.hyperjaxb3.ejb.schemas.customizations.GeneratedId; import org.jvnet.hyperjaxb3.ejb.schemas.customizations.Id; diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/DefaultCreateDefaultVersionPropertyInfos.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/DefaultCreateDefaultVersionPropertyInfos.java index fce97aa9e..44cb1b3c9 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/DefaultCreateDefaultVersionPropertyInfos.java +++ b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/DefaultCreateDefaultVersionPropertyInfos.java @@ -7,7 +7,7 @@ import javax.xml.namespace.QName; import org.apache.commons.lang3.Validate; -import org.jvnet.annox.util.ClassUtils; +import org.jvnet.jaxb.annox.util.ClassUtils; import org.jvnet.hyperjaxb3.ejb.schemas.customizations.Customizations; import org.jvnet.hyperjaxb3.ejb.schemas.customizations.GeneratedVersion; import org.jvnet.hyperjaxb3.ejb.schemas.customizations.Version; diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/WrapCollectionAttribute.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/WrapCollectionAttribute.java index 5abe94e5b..eaa47a17e 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/WrapCollectionAttribute.java +++ b/hyperjaxb/ejb/plugin/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.model.Aspect; +import com.sun.tools.xjc.outline.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/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/WrapCollectionElement.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/WrapCollectionElement.java index 77864c78f..d21ef3878 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/WrapCollectionElement.java +++ b/hyperjaxb/ejb/plugin/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.model.Aspect; +import com.sun.tools.xjc.outline.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/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/WrapCollectionHeteroReference.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/WrapCollectionHeteroReference.java index 8563da10c..0bf33b655 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/WrapCollectionHeteroReference.java +++ b/hyperjaxb/ejb/plugin/src/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.model.Aspect; +import com.sun.tools.xjc.outline.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/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/WrapCollectionValue.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/WrapCollectionValue.java index ca2fa4ce7..d15337d59 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/model/base/WrapCollectionValue.java +++ b/hyperjaxb/ejb/plugin/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.model.Aspect; +import com.sun.tools.xjc.outline.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/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/naming/impl/DefaultNaming.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/naming/impl/DefaultNaming.java index 62386c59d..a1a8e36e7 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/naming/impl/DefaultNaming.java +++ b/hyperjaxb/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.model.Aspect; +import com.sun.tools.xjc.outline.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/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/processor/ClassPersistenceProcessor.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/processor/ClassPersistenceProcessor.java index 702e9ac5c..47e8ebd64 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/processor/ClassPersistenceProcessor.java +++ b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/processor/ClassPersistenceProcessor.java @@ -139,7 +139,7 @@ protected Persistence createPersistence(EjbPlugin plugin, // targetPersistenceUnit.mergeFrom(persistenceUnit, // targetPersistenceUnit); targetPersistenceUnit.mergeFrom(null, null, persistenceUnit, - targetPersistenceUnit, JAXBMergeCollectionsStrategy.INSTANCE); + targetPersistenceUnit, JAXBMergeCollectionsStrategy.INSTANCE2); // persistenceUnit.copyTo(targetPersistenceUnit); targetPersistenceUnit.setName(persistenceUnitName); diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/processor/MappingFilePersistenceProcessor.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/processor/MappingFilePersistenceProcessor.java index 54e648587..0363afd5e 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/processor/MappingFilePersistenceProcessor.java +++ b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/ejb/strategy/processor/MappingFilePersistenceProcessor.java @@ -136,7 +136,7 @@ protected Persistence createPersistence(EjbPlugin plugin, } targetPersistenceUnit.mergeFrom(null, null, persistenceUnit, - targetPersistenceUnit, JAXBMergeCollectionsStrategy.INSTANCE); + targetPersistenceUnit, JAXBMergeCollectionsStrategy.INSTANCE2); targetPersistenceUnit.setName(persistenceUnitName); Collections.sort(targetPersistenceUnit.getMappingFile()); Collections.sort(targetPersistenceUnit.getClazz()); diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/jaxb2_commons/lang/MergeableMergeStrategy.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/jaxb2_commons/lang/MergeableMergeStrategy.java index 341d9a950..cb73d1458 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/jaxb2_commons/lang/MergeableMergeStrategy.java +++ b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/jaxb2_commons/lang/MergeableMergeStrategy.java @@ -2,116 +2,122 @@ import org.apache.commons.lang3.Validate; import org.jvnet.hyperjaxb3.ejb.schemas.customizations.Mergeable; -import org.jvnet.jaxb2_commons.lang.MergeStrategy; +import org.jvnet.jaxb2_commons.lang.MergeStrategy2; import org.jvnet.jaxb2_commons.locator.ObjectLocator; -public class MergeableMergeStrategy implements MergeStrategy { +public class MergeableMergeStrategy implements MergeStrategy2 { - private final MergeStrategy mergeStrategy; + private final MergeStrategy2 mergeStrategy; - public MergeableMergeStrategy(MergeStrategy mergeStrategy) { + public MergeableMergeStrategy(MergeStrategy2 mergeStrategy) { Validate.notNull(mergeStrategy); this.mergeStrategy = mergeStrategy; } + @Override + public Boolean shouldBeMergedAndSet(ObjectLocator leftLocator, ObjectLocator rightLocator, + boolean leftSet, boolean rightSet) { + return mergeStrategy.shouldBeMergedAndSet(leftLocator, rightLocator, leftSet, rightSet); + } + public boolean merge(ObjectLocator leftLocator, ObjectLocator rightLocator, - boolean left, boolean right) { - return mergeStrategy.merge(leftLocator, rightLocator, left, right); + boolean left, boolean right, boolean leftSet, boolean rightSet) { + return mergeStrategy.merge(leftLocator, rightLocator, left, right, leftSet, rightSet); } public byte merge(ObjectLocator leftLocator, ObjectLocator rightLocator, - byte left, byte right) { - return mergeStrategy.merge(leftLocator, rightLocator, left, right); + byte left, byte right, boolean leftSet, boolean rightSet) { + return mergeStrategy.merge(leftLocator, rightLocator, left, right, leftSet, rightSet); } public char merge(ObjectLocator leftLocator, ObjectLocator rightLocator, - char left, char right) { - return mergeStrategy.merge(leftLocator, rightLocator, left, right); + char left, char right, boolean leftSet, boolean rightSet) { + return mergeStrategy.merge(leftLocator, rightLocator, left, right, leftSet, rightSet); } public double merge(ObjectLocator leftLocator, ObjectLocator rightLocator, - double left, double right) { - return mergeStrategy.merge(leftLocator, rightLocator, left, right); + double left, double right, boolean leftSet, boolean rightSet) { + return mergeStrategy.merge(leftLocator, rightLocator, left, right, leftSet, rightSet); } public float merge(ObjectLocator leftLocator, ObjectLocator rightLocator, - float left, float right) { - return mergeStrategy.merge(leftLocator, rightLocator, left, right); + float left, float right, boolean leftSet, boolean rightSet) { + return mergeStrategy.merge(leftLocator, rightLocator, left, right, leftSet, rightSet); } public int merge(ObjectLocator leftLocator, ObjectLocator rightLocator, - int left, int right) { - return mergeStrategy.merge(leftLocator, rightLocator, left, right); + int left, int right, boolean leftSet, boolean rightSet) { + return mergeStrategy.merge(leftLocator, rightLocator, left, right, leftSet, rightSet); } public long merge(ObjectLocator leftLocator, ObjectLocator rightLocator, - long left, long right) { - return mergeStrategy.merge(leftLocator, rightLocator, left, right); + long left, long right, boolean leftSet, boolean rightSet) { + return mergeStrategy.merge(leftLocator, rightLocator, left, right, leftSet, rightSet); } public short merge(ObjectLocator leftLocator, ObjectLocator rightLocator, - short left, short right) { - return mergeStrategy.merge(leftLocator, rightLocator, left, right); + short left, short right, boolean leftSet, boolean rightSet) { + return mergeStrategy.merge(leftLocator, rightLocator, left, right, leftSet, rightSet); } public Object merge(ObjectLocator leftLocator, ObjectLocator rightLocator, - Object left, Object right) { + Object left, Object right, boolean leftSet, boolean rightSet) { if (left instanceof Mergeable) { final Mergeable mergeable = (Mergeable) left; if (mergeable.isMerge()) { - return mergeStrategy.merge(leftLocator, rightLocator, left, right); + return mergeStrategy.merge(leftLocator, rightLocator, left, right, leftSet, rightSet); } else { // Do not merge - return mergeStrategy.merge(leftLocator, rightLocator, left, null); + return mergeStrategy.merge(leftLocator, rightLocator, left, null, leftSet, rightSet); } } else { - return mergeStrategy.merge(leftLocator, rightLocator, left, right); + return mergeStrategy.merge(leftLocator, rightLocator, left, right, leftSet, rightSet); } } public boolean[] merge(ObjectLocator leftLocator, - ObjectLocator rightLocator, boolean[] left, boolean[] right) { - return mergeStrategy.merge(leftLocator, rightLocator, left, right); + ObjectLocator rightLocator, boolean[] left, boolean[] right, boolean leftSet, boolean rightSet) { + return mergeStrategy.merge(leftLocator, rightLocator, left, right, leftSet, rightSet); } public byte[] merge(ObjectLocator leftLocator, ObjectLocator rightLocator, - byte[] left, byte[] right) { - return mergeStrategy.merge(leftLocator, rightLocator, left, right); + byte[] left, byte[] right, boolean leftSet, boolean rightSet) { + return mergeStrategy.merge(leftLocator, rightLocator, left, right, leftSet, rightSet); } public char[] merge(ObjectLocator leftLocator, ObjectLocator rightLocator, - char[] left, char[] right) { - return mergeStrategy.merge(leftLocator, rightLocator, left, right); + char[] left, char[] right, boolean leftSet, boolean rightSet) { + return mergeStrategy.merge(leftLocator, rightLocator, left, right, leftSet, rightSet); } public double[] merge(ObjectLocator leftLocator, - ObjectLocator rightLocator, double[] left, double[] right) { - return mergeStrategy.merge(leftLocator, rightLocator, left, right); + ObjectLocator rightLocator, double[] left, double[] right, boolean leftSet, boolean rightSet) { + return mergeStrategy.merge(leftLocator, rightLocator, left, right, leftSet, rightSet); } public float[] merge(ObjectLocator leftLocator, ObjectLocator rightLocator, - float[] left, float[] right) { - return mergeStrategy.merge(leftLocator, rightLocator, left, right); + float[] left, float[] right, boolean leftSet, boolean rightSet) { + return mergeStrategy.merge(leftLocator, rightLocator, left, right, leftSet, rightSet); } public int[] merge(ObjectLocator leftLocator, ObjectLocator rightLocator, - int[] left, int[] right) { - return mergeStrategy.merge(leftLocator, rightLocator, left, right); + int[] left, int[] right, boolean leftSet, boolean rightSet) { + return mergeStrategy.merge(leftLocator, rightLocator, left, right, leftSet, rightSet); } public long[] merge(ObjectLocator leftLocator, ObjectLocator rightLocator, - long[] left, long[] right) { - return mergeStrategy.merge(leftLocator, rightLocator, left, right); + long[] left, long[] right, boolean leftSet, boolean rightSet) { + return mergeStrategy.merge(leftLocator, rightLocator, left, right, leftSet, rightSet); } public short[] merge(ObjectLocator leftLocator, ObjectLocator rightLocator, - short[] left, short[] right) { - return mergeStrategy.merge(leftLocator, rightLocator, left, right); + short[] left, short[] right, boolean leftSet, boolean rightSet) { + return mergeStrategy.merge(leftLocator, rightLocator, left, right, leftSet, rightSet); } public Object[] merge(ObjectLocator leftLocator, - ObjectLocator rightLocator, Object[] left, Object[] right) { - return mergeStrategy.merge(leftLocator, rightLocator, left, right); + ObjectLocator rightLocator, Object[] left, Object[] right, boolean leftSet, boolean rightSet) { + return mergeStrategy.merge(leftLocator, rightLocator, left, right, leftSet, rightSet); } } diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/AbstractField.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/AbstractField.java index 783505099..b3450f67f 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/AbstractField.java +++ b/hyperjaxb/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.model.Aspect.IMPLEMENTATION; +import static com.sun.tools.xjc.outline.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.model.Aspect; +import com.sun.tools.xjc.outline.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/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/AbstractWrapCollectionField.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/AbstractWrapCollectionField.java index ddf748743..f1e6d5aec 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/AbstractWrapCollectionField.java +++ b/hyperjaxb/ejb/plugin/src/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.model.Aspect; +import com.sun.tools.xjc.outline.Aspect; import com.sun.tools.xjc.outline.FieldAccessor; public abstract class AbstractWrapCollectionField extends AbstractField { diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/AbstractWrappingField.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/AbstractWrappingField.java index 5e28202ae..cdf858ff3 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/AbstractWrappingField.java +++ b/hyperjaxb/ejb/plugin/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.model.Aspect; +import com.sun.tools.xjc.outline.Aspect; import com.sun.tools.xjc.outline.FieldAccessor; public abstract class AbstractWrappingField extends AbstractField { diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/JAXBElementNameField.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/JAXBElementNameField.java index 4b038282e..613549a97 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/JAXBElementNameField.java +++ b/hyperjaxb/ejb/plugin/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.model.Aspect; +import com.sun.tools.xjc.outline.Aspect; public class JAXBElementNameField extends AbstractWrappingField { diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/JAXBElementValueField.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/JAXBElementValueField.java index f1f053ec6..cbfd51732 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/JAXBElementValueField.java +++ b/hyperjaxb/ejb/plugin/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.model.Aspect; +import com.sun.tools.xjc.outline.Aspect; public class JAXBElementValueField extends AbstractWrappingField { diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/SingleEnumValueWrappingField.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/SingleEnumValueWrappingField.java index 92cee57bb..ed9854e3c 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/SingleEnumValueWrappingField.java +++ b/hyperjaxb/ejb/plugin/src/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.model.Aspect; +import com.sun.tools.xjc.outline.Aspect; public class SingleEnumValueWrappingField extends AbstractWrappingField { diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/SingleWrappingClassInfoField.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/SingleWrappingClassInfoField.java index 03690e697..79f36c2ed 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/SingleWrappingClassInfoField.java +++ b/hyperjaxb/ejb/plugin/src/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.model.Aspect; +import com.sun.tools.xjc.outline.Aspect; public class SingleWrappingClassInfoField extends AbstractWrappingField { diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/SingleWrappingElementField.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/SingleWrappingElementField.java index 0e3035f48..7ffe71729 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/SingleWrappingElementField.java +++ b/hyperjaxb/ejb/plugin/src/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.model.Aspect; +import com.sun.tools.xjc.outline.Aspect; public class SingleWrappingElementField extends SingleWrappingField { diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/SingleWrappingReferenceField.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/SingleWrappingReferenceField.java index 2a69825c7..99a7224b4 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/generator/bean/field/SingleWrappingReferenceField.java +++ b/hyperjaxb/ejb/plugin/src/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.model.Aspect; +import com.sun.tools.xjc.outline.Aspect; public class SingleWrappingReferenceField extends AdaptingWrappingField { diff --git a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/model/CExternalLeafInfo.java b/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/model/CExternalLeafInfo.java index 5ddbf31ac..18d7dcfa2 100644 --- a/hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/xjc/model/CExternalLeafInfo.java +++ b/hyperjaxb/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.model.Aspect; +import com.sun.tools.xjc.outline.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; diff --git a/hyperjaxb/ejb/plugin/src/test/java/org/jvnet/hyperjaxb3/annotation/util/tests/AnnotationUtilsTest.java b/hyperjaxb/ejb/plugin/src/test/java/org/jvnet/hyperjaxb3/annotation/util/tests/AnnotationUtilsTest.java index 19cbbbdf3..9b4fa783a 100644 --- a/hyperjaxb/ejb/plugin/src/test/java/org/jvnet/hyperjaxb3/annotation/util/tests/AnnotationUtilsTest.java +++ b/hyperjaxb/ejb/plugin/src/test/java/org/jvnet/hyperjaxb3/annotation/util/tests/AnnotationUtilsTest.java @@ -6,8 +6,8 @@ import junit.framework.TestCase; -import org.jvnet.annox.model.XAnnotation; -import org.jvnet.annox.model.annotation.field.XAnnotationField; +import org.jvnet.jaxb.annox.model.XAnnotation; +import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField; import org.jvnet.hyperjaxb3.annotation.util.AnnotationUtils; public class AnnotationUtilsTest extends TestCase { diff --git a/hyperjaxb/ejb/pom.xml b/hyperjaxb/ejb/pom.xml index 87cfc8314..dcde01888 100644 --- a/hyperjaxb/ejb/pom.xml +++ b/hyperjaxb/ejb/pom.xml @@ -1,23 +1,24 @@ - 4.0.0 - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb - pom - Hyperjaxb3 EJB + - org.jvnet.hyperjaxb3 - hyperjaxb3 - 0.6.3-SNAPSHOT + org.jvnet.jaxb + hyperjaxb3-parent + 2.0.6-SNAPSHOT ../pom.xml + hyperjaxb3-ejb + pom + JAXB Tools :: Hyperjaxb3 :: EJB + schemas runtime roundtrip plugin - extensions + extensions diff --git a/hyperjaxb/ejb/roundtrip/.gitignore b/hyperjaxb/ejb/roundtrip/.gitignore deleted file mode 100644 index b8ea0ea98..000000000 --- a/hyperjaxb/ejb/roundtrip/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -.settings -.classpath -.project diff --git a/hyperjaxb/ejb/roundtrip/pom.xml b/hyperjaxb/ejb/roundtrip/pom.xml index e7b699bc5..b9a49a910 100644 --- a/hyperjaxb/ejb/roundtrip/pom.xml +++ b/hyperjaxb/ejb/roundtrip/pom.xml @@ -1,19 +1,21 @@ - 4.0.0 - hyperjaxb3-ejb-roundtrip - jar - Hyperjaxb3 EJB Roundtrip - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-ejb-roundtrip + jar + JAXB Tools :: Hyperjaxb3 :: EJB :: Roundtrip + - org.hibernate.javax.persistence - hibernate-jpa-2.1-api + javax.persistence + javax.persistence-api provided @@ -27,11 +29,11 @@ compile - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-testing - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-runtime provided @@ -53,4 +55,4 @@ install - \ No newline at end of file + diff --git a/hyperjaxb/ejb/roundtrip/src/main/java/org/jvnet/hyperjaxb3/ejb/test/RoundtripTest.java b/hyperjaxb/ejb/roundtrip/src/main/java/org/jvnet/hyperjaxb3/ejb/test/RoundtripTest.java index ff5ecf3c5..2efcc2cf8 100644 --- a/hyperjaxb/ejb/roundtrip/src/main/java/org/jvnet/hyperjaxb3/ejb/test/RoundtripTest.java +++ b/hyperjaxb/ejb/roundtrip/src/main/java/org/jvnet/hyperjaxb3/ejb/test/RoundtripTest.java @@ -116,24 +116,15 @@ protected void checkObjects(final Object object, final Object loadedObject) { public boolean equals(ObjectLocator leftLocator, ObjectLocator rightLocator, Object lhs, Object rhs) { if (!super.equals(leftLocator, rightLocator, lhs, rhs)) { - logger.debug("Objects are not equal."); - super.equals(leftLocator, rightLocator, lhs, rhs); - logger.debug("Left: " - + (lhs == null ? "null" : lhs.toString())); - if (leftLocator != null) { - logger.debug("At [" + leftLocator.getPathAsString() - + "]."); - } - logger.debug("Right: " - + (rhs == null ? "null" : rhs.toString())); - if (rightLocator != null) { - logger.debug("At [" + rightLocator.getPathAsString() - + "]."); - } + logger.debug("Objects are not equal." + + "\nLeft: " + + (lhs == null ? "null" : lhs.toString()) + + (leftLocator == null ? "" : ("\nAt [" + leftLocator.getPathAsString() + "].")) + + "\nRight: " + + (rhs == null ? "null" : rhs.toString()) + + (rightLocator == null ? "" : ("\nAt [" + rightLocator.getPathAsString() + "]."))); return false; - } else - - { + } else { return true; } } diff --git a/hyperjaxb/ejb/roundtrip/src/main/java/org/jvnet/hyperjaxb3/lang/builder/ExtendedJAXBEqualsStrategy.java b/hyperjaxb/ejb/roundtrip/src/main/java/org/jvnet/hyperjaxb3/lang/builder/ExtendedJAXBEqualsStrategy.java index 2dc75f948..65e2e0737 100644 --- a/hyperjaxb/ejb/roundtrip/src/main/java/org/jvnet/hyperjaxb3/lang/builder/ExtendedJAXBEqualsStrategy.java +++ b/hyperjaxb/ejb/roundtrip/src/main/java/org/jvnet/hyperjaxb3/lang/builder/ExtendedJAXBEqualsStrategy.java @@ -15,6 +15,15 @@ public class ExtendedJAXBEqualsStrategy extends org.jvnet.jaxb2_commons.lang.ExtendedJAXBEqualsStrategy { + + @Override + public boolean equals(ObjectLocator leftLocator, + ObjectLocator rightLocator, Object left, Object right, + boolean leftSet, boolean rightSet) { + // do not check leftSet === rightSet equality since default attributes looked different + return equals(leftLocator, rightLocator, left, right); + } + @Override protected boolean equalsInternal(ObjectLocator leftLocator, ObjectLocator rightLocator, Node lhs, Node rhs) { diff --git a/hyperjaxb/ejb/runtime/.gitignore b/hyperjaxb/ejb/runtime/.gitignore deleted file mode 100644 index b8ea0ea98..000000000 --- a/hyperjaxb/ejb/runtime/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -.settings -.classpath -.project diff --git a/hyperjaxb/ejb/runtime/pom.xml b/hyperjaxb/ejb/runtime/pom.xml index e362cc804..d9566e1c6 100644 --- a/hyperjaxb/ejb/runtime/pom.xml +++ b/hyperjaxb/ejb/runtime/pom.xml @@ -1,15 +1,17 @@ - 4.0.0 - hyperjaxb3-ejb-runtime - jar - Hyperjaxb3 EJB Runtime - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-ejb-runtime + jar + JAXB Tools :: Hyperjaxb3 :: EJB :: Runtime + org.apache.commons @@ -26,7 +28,7 @@ test - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime @@ -43,4 +45,4 @@ install - \ No newline at end of file + diff --git a/hyperjaxb/ejb/samples/.gitignore b/hyperjaxb/ejb/samples/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/samples/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/samples/customerservice-cxf/.gitignore b/hyperjaxb/ejb/samples/customerservice-cxf/.gitignore deleted file mode 100644 index b8ea0ea98..000000000 --- a/hyperjaxb/ejb/samples/customerservice-cxf/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -.settings -.classpath -.project diff --git a/hyperjaxb/ejb/samples/customerservice-cxf/pom.xml b/hyperjaxb/ejb/samples/customerservice-cxf/pom.xml index 489d81496..50eaae57e 100644 --- a/hyperjaxb/ejb/samples/customerservice-cxf/pom.xml +++ b/hyperjaxb/ejb/samples/customerservice-cxf/pom.xml @@ -1,14 +1,16 @@ 4.0.0 - hyperjaxb3-ejb-samples-customerservice-cxf - war - Hyperjaxb3 EJB Sample [customerservice-cxf] - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-samples - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-ejb-samples-customerservice-cxf + war + JAXB Tools :: Hyperjaxb3 :: EJB :: Sample [customerservice-cxf] + @@ -25,18 +27,23 @@ org.apache.cxf cxf-rt-frontend-jaxws - 2.2.6 + 3.3.13 org.apache.cxf cxf-rt-transports-http - 2.2.6 + 3.3.13 + + + org.apache.cxf.xjc-utils + cxf-xjc-runtime + 3.3.2 - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - ${hibernate-jpa-2.1-api.version} + javax.persistence + javax.persistence-api + ${jpa-api.version} org.hibernate @@ -45,7 +52,7 @@ - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-runtime ${project.version} @@ -60,7 +67,7 @@ org.slf4j slf4j-log4j12 - 1.6.1 + 1.7.36 log4j @@ -94,7 +101,6 @@ junit junit - 4.7 test @@ -103,12 +109,6 @@ 3.0.1.RELEASE test - - org.hisrc.hifaces20 - hifaces20-testing - 0.1.3 - test - @@ -125,23 +125,11 @@ - - - - true - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.cxf cxf-codegen-plugin - 2.2.6 + 3.3.13 generate-sources @@ -169,14 +157,14 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics - 0.6.0 + ${project.version} - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-plugin - 0.6.3-SNAPSHOT + ${project.version} @@ -193,6 +181,14 @@ + + true + maven-compiler-plugin + + 1.8 + 1.8 + + - \ No newline at end of file + diff --git a/hyperjaxb/ejb/samples/customerservice-cxf/src/main/wsdl/binding.xml b/hyperjaxb/ejb/samples/customerservice-cxf/src/main/wsdl/binding.xml index da0e062bb..532c9b255 100644 --- a/hyperjaxb/ejb/samples/customerservice-cxf/src/main/wsdl/binding.xml +++ b/hyperjaxb/ejb/samples/customerservice-cxf/src/main/wsdl/binding.xml @@ -8,11 +8,11 @@ + parseMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.parseDateTime" + printMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.printDateTime"/> + parseMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.parseDate" + printMethod="org.apache.cxf.xjc.runtime.DataTypeAdapter.printDate"/> \ No newline at end of file diff --git a/hyperjaxb/ejb/samples/customerservice-cxf/src/test/java/com/example/customerservice/test/ApplicationStartsIT.java b/hyperjaxb/ejb/samples/customerservice-cxf/src/test/java/com/example/customerservice/test/ApplicationStartsIT.java index 11cdb6ba1..6907c70b8 100644 --- a/hyperjaxb/ejb/samples/customerservice-cxf/src/test/java/com/example/customerservice/test/ApplicationStartsIT.java +++ b/hyperjaxb/ejb/samples/customerservice-cxf/src/test/java/com/example/customerservice/test/ApplicationStartsIT.java @@ -1,6 +1,6 @@ package com.example.customerservice.test; -import java.io.IOException; +/*import java.io.IOException; import java.net.URL; import junit.framework.Assert; @@ -27,4 +27,7 @@ public void checkApplicationStarts() throws IOException{ Assert.assertTrue(webAppEnvironment.isStarted()); Assert.assertNotNull(URLUtils.getContentAsString(new URL(webAppEnvironment.getBaseUrl() + "/CustomerServicePort?wsdl"))); } +}*/ +public class ApplicationStartsIT { + // FIXME } diff --git a/hyperjaxb/ejb/samples/customerservice-cxf/src/test/java/com/example/customerservice/test/CustomerServiceIT.java b/hyperjaxb/ejb/samples/customerservice-cxf/src/test/java/com/example/customerservice/test/CustomerServiceIT.java index db8c1760c..ba6108fa1 100644 --- a/hyperjaxb/ejb/samples/customerservice-cxf/src/test/java/com/example/customerservice/test/CustomerServiceIT.java +++ b/hyperjaxb/ejb/samples/customerservice-cxf/src/test/java/com/example/customerservice/test/CustomerServiceIT.java @@ -1,12 +1,13 @@ package com.example.customerservice.test; +/* import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import java.math.BigDecimal; import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; -import org.apache.cxf.tools.common.DataTypeAdapter; +import org.apache.cxf.xjc.runtime.DataTypeAdapter; import org.hisrc.hifaces20.testing.webappenvironment.WebAppEnvironment; import org.hisrc.hifaces20.testing.webappenvironment.annotations.PropertiesWebAppEnvironmentConfig; import org.hisrc.hifaces20.testing.webappenvironment.testing.junit4.WebAppEnvironmentRule; @@ -66,3 +67,7 @@ public void checkCustomerService() throws Exception { } } +*/ +public class CustomerServiceIT { + // FIXME +} \ No newline at end of file diff --git a/hyperjaxb/ejb/samples/customerservice-cxf/src/test/java/com/example/customerservice/test/RunSampleCustomerService.java b/hyperjaxb/ejb/samples/customerservice-cxf/src/test/java/com/example/customerservice/test/RunSampleCustomerService.java index 1fa0017c0..c4b55b436 100644 --- a/hyperjaxb/ejb/samples/customerservice-cxf/src/test/java/com/example/customerservice/test/RunSampleCustomerService.java +++ b/hyperjaxb/ejb/samples/customerservice-cxf/src/test/java/com/example/customerservice/test/RunSampleCustomerService.java @@ -1,5 +1,6 @@ package com.example.customerservice.test; +/* import org.hisrc.hifaces20.testing.webappenvironment.WebAppEnvironment; import org.hisrc.hifaces20.testing.webappenvironment.annotations.PropertiesWebAppEnvironmentConfig; import org.hisrc.hifaces20.testing.webappenvironment.testing.junit4.AbstractRunWebApp; @@ -12,3 +13,8 @@ public void setWebAppEnvironment(WebAppEnvironment webAppEnvironment) { } } +*/ + +public class RunSampleCustomerService { + // FIXME +} \ No newline at end of file diff --git a/hyperjaxb/ejb/samples/po-customized-toplink/.gitignore b/hyperjaxb/ejb/samples/po-customized-toplink/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/samples/po-customized-toplink/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/samples/po-customized-toplink/pom.xml b/hyperjaxb/ejb/samples/po-customized-toplink/pom.xml index a7b6a81d8..b8260c767 100644 --- a/hyperjaxb/ejb/samples/po-customized-toplink/pom.xml +++ b/hyperjaxb/ejb/samples/po-customized-toplink/pom.xml @@ -1,23 +1,24 @@ - 4.0.0 - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-samples-po-customized-toplink - pom - Hyperjaxb3 EJB Sample [po-customized-toplink] - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-samples - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-ejb-samples-po-customized-toplink + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Sample [po-customized-toplink] + - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-plugin - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-ant @@ -35,7 +36,7 @@ - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-roundtrip @@ -89,4 +90,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/samples/po-customized-toplink/project-build.xml b/hyperjaxb/ejb/samples/po-customized-toplink/project-build.xml index 7378196b6..e612e8609 100644 --- a/hyperjaxb/ejb/samples/po-customized-toplink/project-build.xml +++ b/hyperjaxb/ejb/samples/po-customized-toplink/project-build.xml @@ -132,8 +132,8 @@ destdir="${basedir}/target/classes" srcdir="${basedir}/src/main/java:${basedir}/target/generated-sources/xjc" classpathref="compile.path" - source="1.5" - target="1.5"> + source="1.8" + target="1.8"> @@ -148,8 +148,8 @@ destdir="${basedir}/target/test-classes" srcdir="${basedir}/src/test/java:${basedir}/target/generated-sources/xjc" classpathref="test-compile.path" - source="1.5" - target="1.5"> + source="1.8" + target="1.8"> diff --git a/hyperjaxb/ejb/samples/po-customized-toplink/project-pom.xml b/hyperjaxb/ejb/samples/po-customized-toplink/project-pom.xml index 3e94e0a49..8d5ffb7c4 100644 --- a/hyperjaxb/ejb/samples/po-customized-toplink/project-pom.xml +++ b/hyperjaxb/ejb/samples/po-customized-toplink/project-pom.xml @@ -2,7 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-samples-po-customized-toplink-maven ${project.version} jar @@ -19,7 +19,7 @@ ${jaxb.version} - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-runtime ${project.version} @@ -33,7 +33,7 @@ - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-roundtrip ${project.version} @@ -57,7 +57,7 @@ install - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin @@ -75,8 +75,8 @@ true maven-compiler-plugin - 1.5 - 1.5 + 1.8 + 1.8 diff --git a/hyperjaxb/ejb/samples/po-initial/.gitignore b/hyperjaxb/ejb/samples/po-initial/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/samples/po-initial/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/samples/po-initial/pom.xml b/hyperjaxb/ejb/samples/po-initial/pom.xml index 9d0ea3a51..569aff6a2 100644 --- a/hyperjaxb/ejb/samples/po-initial/pom.xml +++ b/hyperjaxb/ejb/samples/po-initial/pom.xml @@ -1,23 +1,24 @@ - 4.0.0 - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-samples-po-initial - pom - Hyperjaxb3 EJB Sample [po-initial] - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-samples - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-ejb-samples-po-initial + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Sample [po-initial] + - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-plugin - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-ant @@ -36,7 +37,7 @@ - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-roundtrip @@ -91,4 +92,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/samples/po-initial/project-build.xml b/hyperjaxb/ejb/samples/po-initial/project-build.xml index 900d8d4d6..65ffd67a4 100644 --- a/hyperjaxb/ejb/samples/po-initial/project-build.xml +++ b/hyperjaxb/ejb/samples/po-initial/project-build.xml @@ -140,8 +140,8 @@ destdir="${basedir}/target/classes" srcdir="${basedir}/src/main/java:${basedir}/target/generated-sources/xjc" classpathref="compile.path" - source="1.5" - target="1.5"> + source="1.8" + target="1.8"> @@ -156,8 +156,8 @@ destdir="${basedir}/target/test-classes" srcdir="${basedir}/src/test/java:${basedir}/target/generated-sources/xjc" classpathref="test-compile.path" - source="1.5" - target="1.5"> + source="1.8" + target="1.8"> diff --git a/hyperjaxb/ejb/samples/po-initial/project-pom.xml b/hyperjaxb/ejb/samples/po-initial/project-pom.xml index df969ce8d..557b3ba94 100644 --- a/hyperjaxb/ejb/samples/po-initial/project-pom.xml +++ b/hyperjaxb/ejb/samples/po-initial/project-pom.xml @@ -2,16 +2,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-samples-po-initial-maven ${project.version} jar Hyperjaxb3 Samples [po-initial:maven] - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - ${hibernate-jpa-2.1-api.version} + javax.persistence + javax.persistence-api + ${jpa-api.version} org.glassfish.jaxb @@ -19,7 +19,7 @@ ${jaxb.version} - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-runtime ${project.version} @@ -33,7 +33,7 @@ - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-roundtrip ${project.version} @@ -58,7 +58,7 @@ install - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin ${project.version} @@ -77,8 +77,8 @@ true maven-compiler-plugin - 1.6 - 1.6 + 1.8 + 1.8 diff --git a/hyperjaxb/ejb/samples/po-maven-jaxb2-plugin/.gitignore b/hyperjaxb/ejb/samples/po-maven-jaxb2-plugin/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/samples/po-maven-jaxb2-plugin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/samples/po-maven-jaxb2-plugin/pom.xml b/hyperjaxb/ejb/samples/po-maven-jaxb2-plugin/pom.xml index 9ca124cc7..40f9776f3 100644 --- a/hyperjaxb/ejb/samples/po-maven-jaxb2-plugin/pom.xml +++ b/hyperjaxb/ejb/samples/po-maven-jaxb2-plugin/pom.xml @@ -1,17 +1,17 @@ - 4.0.0 - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-samples-po-maven-jaxb2-plugin - 0.6.3-SNAPSHOT - jar - Hyperjaxb3 EJB Sample [po-maven-jaxb2-plugin] - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-samples - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-ejb-samples-po-maven-jaxb2-plugin + jar + JAXB Tools :: Hyperjaxb3 :: EJB :: Sample [po-maven-jaxb2-plugin] + install diff --git a/hyperjaxb/ejb/samples/po-maven-jaxb2-plugin/project-pom.xml b/hyperjaxb/ejb/samples/po-maven-jaxb2-plugin/project-pom.xml index 537843aca..b07f60fd3 100644 --- a/hyperjaxb/ejb/samples/po-maven-jaxb2-plugin/project-pom.xml +++ b/hyperjaxb/ejb/samples/po-maven-jaxb2-plugin/project-pom.xml @@ -2,16 +2,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-samples-po-maven-jaxb2-plugin ${project.version} jar Hyperjaxb3 Samples [po-maven-jaxb2-plugin] - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - ${hibernate-jpa-2.1-api.version} + javax.persistence + javax.persistence-api + ${jpa-api.version} org.glassfish.jaxb @@ -19,7 +19,7 @@ ${jaxb.version} - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-runtime ${project.version} @@ -28,7 +28,7 @@ - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-roundtrip ${project.version} @@ -67,9 +67,9 @@ ${basedir}/target/generated-sources/xjc - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - ${maven-jaxb2-plugin.version} + org.jvnet.jaxb + jaxb-maven-plugin + ${project.version} @@ -81,7 +81,7 @@ true - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-plugin ${project.version} @@ -99,8 +99,8 @@ true maven-compiler-plugin - 1.5 - 1.5 + 1.8 + 1.8 diff --git a/hyperjaxb/ejb/samples/pom.xml b/hyperjaxb/ejb/samples/pom.xml index c21bbe244..6eec857ae 100644 --- a/hyperjaxb/ejb/samples/pom.xml +++ b/hyperjaxb/ejb/samples/pom.xml @@ -1,24 +1,22 @@ - 4.0.0 - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-samples - pom - Hyperjaxb3 EJB Samples - 0.6.3-SNAPSHOT - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT ../pom.xml + hyperjaxb3-ejb-samples + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Samples + po-initial po-customized-toplink uniprot po-maven-jaxb2-plugin - @@ -28,6 +26,15 @@ + + + org.jvnet.jaxb + hyperjaxb3-maven-plugin + ${project.version} + maven-plugin + provided + + install @@ -40,7 +47,7 @@ none - attached + single @@ -53,7 +60,7 @@ none - attached + single @@ -72,10 +79,10 @@ none - + - + run @@ -86,9 +93,9 @@ none - + - + run @@ -99,9 +106,9 @@ none - + - + run @@ -137,4 +144,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/samples/uniprot/.gitignore b/hyperjaxb/ejb/samples/uniprot/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/samples/uniprot/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/samples/uniprot/pom.xml b/hyperjaxb/ejb/samples/uniprot/pom.xml index 759a7090d..aa07f38c9 100644 --- a/hyperjaxb/ejb/samples/uniprot/pom.xml +++ b/hyperjaxb/ejb/samples/uniprot/pom.xml @@ -1,23 +1,24 @@ - 4.0.0 - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-samples-uniprot - pom - Hyperjaxb3 EJB Sample [uniprot] - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-samples - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-ejb-samples-uniprot + jar + JAXB Tools :: Hyperjaxb3 :: EJB :: Sample [uniprot] + - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-plugin - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-ant @@ -36,7 +37,7 @@ - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-roundtrip @@ -90,4 +91,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/samples/uniprot/project-build.xml b/hyperjaxb/ejb/samples/uniprot/project-build.xml index b5eb6a6d6..b64ad3d9c 100644 --- a/hyperjaxb/ejb/samples/uniprot/project-build.xml +++ b/hyperjaxb/ejb/samples/uniprot/project-build.xml @@ -137,8 +137,8 @@ destdir="${basedir}/target/classes" srcdir="${basedir}/src/main/java:${basedir}/target/generated-sources/xjc" classpathref="compile.path" - source="1.5" - target="1.5"> + source="1.8" + target="1.8"> @@ -153,8 +153,8 @@ destdir="${basedir}/target/test-classes" srcdir="${basedir}/src/test/java:${basedir}/target/generated-sources/xjc" classpathref="test-compile.path" - source="1.5" - target="1.5"> + source="1.8" + target="1.8"> diff --git a/hyperjaxb/ejb/samples/uniprot/project-pom.xml b/hyperjaxb/ejb/samples/uniprot/project-pom.xml index ee34697dc..273fa9ecd 100644 --- a/hyperjaxb/ejb/samples/uniprot/project-pom.xml +++ b/hyperjaxb/ejb/samples/uniprot/project-pom.xml @@ -2,16 +2,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-samples-uniprot-maven ${project.version} jar Hyperjaxb3 Samples [uniprot:maven] - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - ${hibernate-jpa-2.1-api.version} + javax.persistence + javax.persistence-api + ${jpa-api.version} org.glassfish.jaxb @@ -19,7 +19,7 @@ ${jaxb.version} - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-runtime ${project.version} @@ -33,7 +33,7 @@ - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-roundtrip ${project.version} @@ -57,7 +57,7 @@ install - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin ${project.version} @@ -76,8 +76,8 @@ true maven-compiler-plugin - 1.5 - 1.5 + 1.8 + 1.8 diff --git a/hyperjaxb/ejb/schemas/customizations/.gitignore b/hyperjaxb/ejb/schemas/customizations/.gitignore deleted file mode 100644 index b8ea0ea98..000000000 --- a/hyperjaxb/ejb/schemas/customizations/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -.settings -.classpath -.project diff --git a/hyperjaxb/ejb/schemas/customizations/pom.xml b/hyperjaxb/ejb/schemas/customizations/pom.xml index 17e7a93bc..cac499f9d 100644 --- a/hyperjaxb/ejb/schemas/customizations/pom.xml +++ b/hyperjaxb/ejb/schemas/customizations/pom.xml @@ -1,17 +1,19 @@ 4.0.0 - hyperjaxb3-ejb-schemas-customizations - jar - Hyperjaxb3 EJB Schemas Customizations - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-schemas - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-ejb-schemas-customizations + jar + JAXB Tools :: Hyperjaxb3 :: EJB :: Schemas :: Customizations + - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime @@ -20,7 +22,7 @@ provided - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-tools @@ -29,7 +31,7 @@ provided - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-schemas-persistence @@ -44,53 +46,54 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin generate - - true - - customizations.xsd - - src/main/resources/catalog.cat - - -Xequals - -XhashCode - -Xinheritance - -Xcopyable - -Xmergeable - - - - org.jvnet.jaxb2_commons - jaxb2-basics - - - - - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-schemas-persistence - - - + + true + + customizations.xsd + + src/main/resources/catalog.cat + + -Xequals + -XhashCode + -Xinheritance + -Xcopyable + -Xmergeable + + + + org.jvnet.jaxb + jaxb2-basics + ${project.version} + + + + + org.jvnet.jaxb + hyperjaxb3-ejb-schemas-persistence + + + org.apache.maven.plugins maven-antrun-plugin - + site site - + Running the XSDDoc task @@ -98,7 +101,7 @@ out="${basedir}/target/site/xsddoc" doctitle="Hyperjaxb3 Customization schema" verbose="false" /> - + run @@ -115,4 +118,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/schemas/persistence/.gitignore b/hyperjaxb/ejb/schemas/persistence/.gitignore deleted file mode 100644 index b8ea0ea98..000000000 --- a/hyperjaxb/ejb/schemas/persistence/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -.settings -.classpath -.project diff --git a/hyperjaxb/ejb/schemas/persistence/pom.xml b/hyperjaxb/ejb/schemas/persistence/pom.xml index fbbdbfbe9..0549b9da8 100644 --- a/hyperjaxb/ejb/schemas/persistence/pom.xml +++ b/hyperjaxb/ejb/schemas/persistence/pom.xml @@ -2,17 +2,25 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - hyperjaxb3-ejb-schemas-persistence - jar - Hyperjaxb3 EJB Schemas Persistence + - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-schemas - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-ejb-schemas-persistence + jar + JAXB Tools :: Hyperjaxb3 :: EJB :: Schemas :: Persistence + + + org.jvnet.jaxb + jaxb2-basics + provided + - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime @@ -25,9 +33,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - ${maven-jaxb2-plugin.version} + org.jvnet.jaxb + jaxb-maven-plugin @@ -49,7 +56,7 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics @@ -57,4 +64,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/schemas/pom.xml b/hyperjaxb/ejb/schemas/pom.xml index a8a93b332..fac1841ed 100644 --- a/hyperjaxb/ejb/schemas/pom.xml +++ b/hyperjaxb/ejb/schemas/pom.xml @@ -1,16 +1,17 @@ - 4.0.0 - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-schemas - pom - Hyperjaxb3 EJB Schemas - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-ejb-schemas + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Schemas + persistence customizations @@ -18,4 +19,4 @@ install - \ No newline at end of file + diff --git a/hyperjaxb/ejb/templates/basic/.gitignore b/hyperjaxb/ejb/templates/basic/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/templates/basic/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/templates/basic/pom.xml b/hyperjaxb/ejb/templates/basic/pom.xml index 2a5e1f9e3..8650a4bd8 100644 --- a/hyperjaxb/ejb/templates/basic/pom.xml +++ b/hyperjaxb/ejb/templates/basic/pom.xml @@ -1,23 +1,24 @@ - 4.0.0 - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-template-basic - pom - Hyperjaxb3 EJB Template [basic] - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-templates - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-ejb-template-basic + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Template [basic] + - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-plugin - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-ant @@ -29,8 +30,8 @@ jaxb-runtime - org.hibernate.javax.persistence - hibernate-jpa-2.1-api + javax.persistence + javax.persistence-api @@ -40,7 +41,7 @@ - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-roundtrip @@ -94,4 +95,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/templates/basic/project-build.xml b/hyperjaxb/ejb/templates/basic/project-build.xml index 1c24c15fc..56d27822f 100644 --- a/hyperjaxb/ejb/templates/basic/project-build.xml +++ b/hyperjaxb/ejb/templates/basic/project-build.xml @@ -138,8 +138,8 @@ destdir="${basedir}/target/classes" srcdir="${basedir}/src/main/java:${basedir}/target/generated-sources/xjc" classpathref="compile.path" - source="1.5" - target="1.5"> + source="1.8" + target="1.8"> @@ -154,8 +154,8 @@ destdir="${basedir}/target/test-classes" srcdir="${basedir}/src/test/java:${basedir}/target/generated-sources/xjc" classpathref="test-compile.path" - source="1.5" - target="1.5"> + source="1.8" + target="1.8"> diff --git a/hyperjaxb/ejb/templates/basic/project-pom.xml b/hyperjaxb/ejb/templates/basic/project-pom.xml index 560a0e2f1..092143c76 100644 --- a/hyperjaxb/ejb/templates/basic/project-pom.xml +++ b/hyperjaxb/ejb/templates/basic/project-pom.xml @@ -2,16 +2,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-template-basic-maven ${project.version} jar Hyperjaxb3 Samples [po-initial:maven] - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - ${hibernate-jpa-2.1-api.version} + javax.persistence + javax.persistence-api + ${jpa-api.version} org.glassfish.jaxb @@ -19,7 +19,7 @@ ${jaxb.version} - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-runtime ${project.version} @@ -33,7 +33,7 @@ - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-roundtrip ${project.version} @@ -57,7 +57,7 @@ install - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin ${project.version} @@ -76,8 +76,8 @@ true maven-compiler-plugin - 1.5 - 1.5 + 1.8 + 1.8 diff --git a/hyperjaxb/ejb/templates/basic/src/it/java/.placeholder b/hyperjaxb/ejb/templates/basic/src/it/java/.placeholder new file mode 100644 index 000000000..fe01a2bff --- /dev/null +++ b/hyperjaxb/ejb/templates/basic/src/it/java/.placeholder @@ -0,0 +1 @@ +#empty file for parent folder to exist in git (java) \ No newline at end of file diff --git a/hyperjaxb/ejb/templates/pom.xml b/hyperjaxb/ejb/templates/pom.xml index 4375c2681..e00ad14b7 100644 --- a/hyperjaxb/ejb/templates/pom.xml +++ b/hyperjaxb/ejb/templates/pom.xml @@ -1,15 +1,17 @@ - 4.0.0 - hyperjaxb3-ejb-templates - pom - Hyperjaxb3 EJB Templates - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-ejb-templates + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Templates + basic @@ -25,7 +27,7 @@ none - attached + single @@ -38,7 +40,7 @@ none - attached + single @@ -60,7 +62,7 @@ none - + @@ -78,7 +80,7 @@ - + run @@ -89,7 +91,7 @@ none - + @@ -106,7 +108,7 @@ - + run @@ -117,9 +119,9 @@ none - + - + run @@ -155,4 +157,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/.gitignore b/hyperjaxb/ejb/tests/.gitignore deleted file mode 100644 index 53fd8f506..000000000 --- a/hyperjaxb/ejb/tests/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/err -/std diff --git a/hyperjaxb/ejb/tests/addressbook/.gitignore b/hyperjaxb/ejb/tests/addressbook/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/addressbook/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/addressbook/pom.xml b/hyperjaxb/ejb/tests/addressbook/pom.xml index 7e1238309..c9e4cc6c6 100644 --- a/hyperjaxb/ejb/tests/addressbook/pom.xml +++ b/hyperjaxb/ejb/tests/addressbook/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-addressbook jar - Hyperjaxb3 EJB Test [addressbook] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [addressbook] + @@ -27,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin com.pps.schema.tests.RoundtripTest @@ -35,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/ak/.gitignore b/hyperjaxb/ejb/tests/ak/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/ak/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/ak/pom.xml b/hyperjaxb/ejb/tests/ak/pom.xml index 9f6cb9b9b..16f75dbe0 100644 --- a/hyperjaxb/ejb/tests/ak/pom.xml +++ b/hyperjaxb/ejb/tests/ak/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-ak jar - Hyperjaxb3 EJB Test [ak] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [ak] + @@ -27,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.tests.ak.tests.RoundtripTest @@ -35,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/annox/.gitignore b/hyperjaxb/ejb/tests/annox/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/annox/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/annox/pom.xml b/hyperjaxb/ejb/tests/annox/pom.xml index b39e97611..404d88c07 100644 --- a/hyperjaxb/ejb/tests/annox/pom.xml +++ b/hyperjaxb/ejb/tests/annox/pom.xml @@ -3,18 +3,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-annox jar - Hyperjaxb3 EJB Test [annox] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [annox] + org.hibernate hibernate-search - 3.4.0.Final + ${hibernate-search.version} org.hibernate @@ -38,7 +40,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin @@ -49,7 +51,7 @@ org.hibernate hibernate-search - 3.0.0.GA + ${hibernate-search.version} org.hibernate @@ -60,4 +62,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/any/.gitignore b/hyperjaxb/ejb/tests/any/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/any/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/any/pom.xml b/hyperjaxb/ejb/tests/any/pom.xml index e8ce53df7..244ed4eb7 100644 --- a/hyperjaxb/ejb/tests/any/pom.xml +++ b/hyperjaxb/ejb/tests/any/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-any jar - Hyperjaxb3 EJB Test [any] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [any] + @@ -27,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.any.tests.RoundtripTest @@ -36,4 +38,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/bibtexml/.gitignore b/hyperjaxb/ejb/tests/bibtexml/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/bibtexml/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/bibtexml/pom.xml b/hyperjaxb/ejb/tests/bibtexml/pom.xml index cf5f0522b..dff9c5e76 100644 --- a/hyperjaxb/ejb/tests/bibtexml/pom.xml +++ b/hyperjaxb/ejb/tests/bibtexml/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-bibtexml jar - Hyperjaxb3 EJB Test [bibtexml] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [bibtexml] + @@ -27,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.tests.bibtexml.tests.RoundtripTest @@ -35,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/ccr/pom.xml b/hyperjaxb/ejb/tests/ccr/pom.xml index ea2416413..7e37ca996 100644 --- a/hyperjaxb/ejb/tests/ccr/pom.xml +++ b/hyperjaxb/ejb/tests/ccr/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-ccr jar - Hyperjaxb3 EJB Test [ccr] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [ccr] + @@ -27,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.tests.ccr.tests.RoundtripTest @@ -35,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/ccr/src/main/resources/binding.xjb b/hyperjaxb/ejb/tests/ccr/src/main/resources/binding.xjb index 54b8cce2b..6fa4c8884 100644 --- a/hyperjaxb/ejb/tests/ccr/src/main/resources/binding.xjb +++ b/hyperjaxb/ejb/tests/ccr/src/main/resources/binding.xjb @@ -1,6 +1,6 @@ - + - + diff --git a/hyperjaxb/ejb/tests/ccr/src/main/resources/schema.xsd b/hyperjaxb/ejb/tests/ccr/src/main/resources/schema.xsd index 936616f30..16faaae8f 100644 --- a/hyperjaxb/ejb/tests/ccr/src/main/resources/schema.xsd +++ b/hyperjaxb/ejb/tests/ccr/src/main/resources/schema.xsd @@ -1,7 +1,7 @@ diff --git a/hyperjaxb/ejb/tests/cda/pom.xml b/hyperjaxb/ejb/tests/cda/pom.xml index d8d124682..97d3f8221 100644 --- a/hyperjaxb/ejb/tests/cda/pom.xml +++ b/hyperjaxb/ejb/tests/cda/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-cda jar - Hyperjaxb3 EJB Test [cda] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [cda] + @@ -34,7 +36,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin @@ -45,4 +47,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/component-jpa2/.gitignore b/hyperjaxb/ejb/tests/component-jpa2/.gitignore deleted file mode 100644 index c96673847..000000000 --- a/hyperjaxb/ejb/tests/component-jpa2/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/derby.log -/target/ diff --git a/hyperjaxb/ejb/tests/component-jpa2/pom.xml b/hyperjaxb/ejb/tests/component-jpa2/pom.xml index 2c8d28c22..ddad4836f 100644 --- a/hyperjaxb/ejb/tests/component-jpa2/pom.xml +++ b/hyperjaxb/ejb/tests/component-jpa2/pom.xml @@ -2,13 +2,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-component-jpa2 jar - Hyperjaxb3 EJB Test [component-jpa2] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [component-jpa2] + @@ -19,7 +21,6 @@ org.apache.derby derby - 10.2.2.0 test @@ -27,7 +28,7 @@ install - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin diff --git a/hyperjaxb/ejb/tests/component/pom.xml b/hyperjaxb/ejb/tests/component/pom.xml index 3108e786a..a401276d8 100644 --- a/hyperjaxb/ejb/tests/component/pom.xml +++ b/hyperjaxb/ejb/tests/component/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-component jar - Hyperjaxb3 EJB Test [component] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [component] + @@ -27,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.tests.component.tests.RoundtripTest @@ -35,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/component/src/main/resources/schema.xsd b/hyperjaxb/ejb/tests/component/src/main/resources/schema.xsd index 760376c89..5000ec8f4 100644 --- a/hyperjaxb/ejb/tests/component/src/main/resources/schema.xsd +++ b/hyperjaxb/ejb/tests/component/src/main/resources/schema.xsd @@ -1,10 +1,10 @@ - - + diff --git a/hyperjaxb/ejb/tests/cu-one/.classpath b/hyperjaxb/ejb/tests/cu-one/.classpath deleted file mode 100644 index 4ea9c21ce..000000000 --- a/hyperjaxb/ejb/tests/cu-one/.classpath +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hyperjaxb/ejb/tests/cu-one/.gitignore b/hyperjaxb/ejb/tests/cu-one/.gitignore deleted file mode 100644 index 94f0cfcef..000000000 --- a/hyperjaxb/ejb/tests/cu-one/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.settings -/target diff --git a/hyperjaxb/ejb/tests/cu-one/.project b/hyperjaxb/ejb/tests/cu-one/.project deleted file mode 100644 index de3272d66..000000000 --- a/hyperjaxb/ejb/tests/cu-one/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - hyperjaxb3-ejb-tests-cu-one - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/hyperjaxb/ejb/tests/cu-one/pom.xml b/hyperjaxb/ejb/tests/cu-one/pom.xml index 779b9c9d4..5acf04cc8 100644 --- a/hyperjaxb/ejb/tests/cu-one/pom.xml +++ b/hyperjaxb/ejb/tests/cu-one/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-cuone jar - Hyperjaxb3 EJB Test [cuone] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [cuone] + @@ -34,7 +36,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin @@ -53,4 +55,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/custom-naming/.gitignore b/hyperjaxb/ejb/tests/custom-naming/.gitignore deleted file mode 100644 index 89e32937a..000000000 --- a/hyperjaxb/ejb/tests/custom-naming/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -target -.classpath -.project \ No newline at end of file diff --git a/hyperjaxb/ejb/tests/custom-naming/extension/.gitignore b/hyperjaxb/ejb/tests/custom-naming/extension/.gitignore deleted file mode 100644 index 89e32937a..000000000 --- a/hyperjaxb/ejb/tests/custom-naming/extension/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -target -.classpath -.project \ No newline at end of file diff --git a/hyperjaxb/ejb/tests/custom-naming/extension/pom.xml b/hyperjaxb/ejb/tests/custom-naming/extension/pom.xml index 39430bab3..6418716ed 100644 --- a/hyperjaxb/ejb/tests/custom-naming/extension/pom.xml +++ b/hyperjaxb/ejb/tests/custom-naming/extension/pom.xml @@ -3,16 +3,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests-custom-naming - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-custom-naming-extension jar - Hyperjaxb3 EJB Test [custom-naming-extension] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [custom-naming:extension] + - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-plugin provided @@ -20,4 +22,4 @@ test - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/custom-naming/extension/src/main/java/org/jvnet/hyperjaxb3/ejb/tests/customnaming/naming/impl/CustomNaming.java b/hyperjaxb/ejb/tests/custom-naming/extension/src/main/java/org/jvnet/hyperjaxb3/ejb/tests/customnaming/naming/impl/CustomNaming.java index fb0fab0c7..b5615b146 100644 --- a/hyperjaxb/ejb/tests/custom-naming/extension/src/main/java/org/jvnet/hyperjaxb3/ejb/tests/customnaming/naming/impl/CustomNaming.java +++ b/hyperjaxb/ejb/tests/custom-naming/extension/src/main/java/org/jvnet/hyperjaxb3/ejb/tests/customnaming/naming/impl/CustomNaming.java @@ -1,12 +1,13 @@ package org.jvnet.hyperjaxb3.ejb.tests.customnaming.naming.impl; +import org.jvnet.hyperjaxb3.ejb.strategy.mapping.Mapping; import org.jvnet.hyperjaxb3.ejb.strategy.naming.impl.DefaultNaming; public class CustomNaming extends DefaultNaming { @Override - public String getName(String draftName) { - return "FOO_" + super.getName(draftName); + public String getName(Mapping context, String draftName) { + return "FOO_" + super.getName(context, draftName); } } diff --git a/hyperjaxb/ejb/tests/custom-naming/pom.xml b/hyperjaxb/ejb/tests/custom-naming/pom.xml index 48e3eae16..3cde88520 100644 --- a/hyperjaxb/ejb/tests/custom-naming/pom.xml +++ b/hyperjaxb/ejb/tests/custom-naming/pom.xml @@ -1,20 +1,22 @@ - 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-custom-naming pom - Hyperjaxb3 EJB Test [custom-naming] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [custom-naming] + extension - schema + test - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/custom-naming/schema/.gitignore b/hyperjaxb/ejb/tests/custom-naming/schema/.gitignore deleted file mode 100644 index 89e32937a..000000000 --- a/hyperjaxb/ejb/tests/custom-naming/schema/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -target -.classpath -.project \ No newline at end of file diff --git a/hyperjaxb/ejb/tests/custom-naming/schema/pom.xml b/hyperjaxb/ejb/tests/custom-naming/schema/pom.xml index ee98d4329..61e5a6dae 100644 --- a/hyperjaxb/ejb/tests/custom-naming/schema/pom.xml +++ b/hyperjaxb/ejb/tests/custom-naming/schema/pom.xml @@ -3,20 +3,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests-custom-naming - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-custom-naming-schema jar - Hyperjaxb3 EJB Test [custom-naming-schema] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [custom-naming:schema] + org.apache.maven.shared maven-plugin-testing-harness 1.1 test - + @@ -29,19 +31,19 @@ hsqldb test - + test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.po.RoundtripTest @@ -49,7 +51,7 @@ - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests-custom-naming-extension ${project.version} @@ -57,4 +59,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/custom-naming/schema/src/test/java/org/jvnet/hyperjaxb3/ejb/tests/po/RunPoPlugin.java b/hyperjaxb/ejb/tests/custom-naming/schema/src/test/java/org/jvnet/hyperjaxb3/ejb/tests/po/RunPoPlugin.java index 74ad13e62..adab97007 100644 --- a/hyperjaxb/ejb/tests/custom-naming/schema/src/test/java/org/jvnet/hyperjaxb3/ejb/tests/po/RunPoPlugin.java +++ b/hyperjaxb/ejb/tests/custom-naming/schema/src/test/java/org/jvnet/hyperjaxb3/ejb/tests/po/RunPoPlugin.java @@ -56,9 +56,9 @@ public void testExecute() throws Exception { localRepository, null); final Hyperjaxb3Mojo generator = (Hyperjaxb3Mojo) lookupMojo( - "org.jvnet.hyperjaxb3", + "org.jvnet.jaxb", "hyperjaxb3-maven-plugin", - "0.5.4-SNAPSHOT", + "${project.version}", "generate", null); generator.setProject(mavenProject); generator.setLocalRepository(localRepository); diff --git a/hyperjaxb/ejb/tests/customType/pom.xml b/hyperjaxb/ejb/tests/customType/pom.xml index 57d441430..d503d0ed2 100644 --- a/hyperjaxb/ejb/tests/customType/pom.xml +++ b/hyperjaxb/ejb/tests/customType/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-customtype - jar - Hyperjaxb3 EJB Test [customtype] + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [customtype] + @@ -27,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.tests.customtype.tests.RoundtripTest @@ -35,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/customType/src/main/resources/binding.xjb b/hyperjaxb/ejb/tests/customType/src/main/resources/binding.xjb index fb186f46b..3fca21bd3 100644 --- a/hyperjaxb/ejb/tests/customType/src/main/resources/binding.xjb +++ b/hyperjaxb/ejb/tests/customType/src/main/resources/binding.xjb @@ -1,4 +1,4 @@ - + diff --git a/hyperjaxb/ejb/tests/customizations/pom.xml b/hyperjaxb/ejb/tests/customizations/pom.xml index 98f2ac7d2..cac759942 100644 --- a/hyperjaxb/ejb/tests/customizations/pom.xml +++ b/hyperjaxb/ejb/tests/customizations/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-customizations - jar - Hyperjaxb3 EJB Test [customizations] + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [customizations] + @@ -27,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.tests.customizations.tests.RoundtripTest @@ -35,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/customizations/src/main/resources/binding.xjb b/hyperjaxb/ejb/tests/customizations/src/main/resources/binding.xjb index 6d83da71e..30f1837f5 100644 --- a/hyperjaxb/ejb/tests/customizations/src/main/resources/binding.xjb +++ b/hyperjaxb/ejb/tests/customizations/src/main/resources/binding.xjb @@ -3,7 +3,7 @@ xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" - xmlns:hj="http://hyperjaxb2.jvnet.org/customizations" + xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations" jaxb:extensionBindingPrefixes="hj xjc"> diff --git a/hyperjaxb/ejb/tests/customizations/src/main/resources/schema.xsd b/hyperjaxb/ejb/tests/customizations/src/main/resources/schema.xsd index 4f3ef5b97..461506126 100644 --- a/hyperjaxb/ejb/tests/customizations/src/main/resources/schema.xsd +++ b/hyperjaxb/ejb/tests/customizations/src/main/resources/schema.xsd @@ -1,5 +1,5 @@ - @@ -161,13 +161,13 @@ + + + + + - - - - - diff --git a/hyperjaxb/ejb/tests/dc/.gitignore b/hyperjaxb/ejb/tests/dc/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/dc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/dc/pom.xml b/hyperjaxb/ejb/tests/dc/pom.xml index 33a6193e6..dcdd901e3 100644 --- a/hyperjaxb/ejb/tests/dc/pom.xml +++ b/hyperjaxb/ejb/tests/dc/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-dc - jar - Hyperjaxb3 EJB Test [dc] + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [dc] + @@ -25,7 +27,6 @@ org.apache.derby derby - 10.2.2.0 test @@ -38,12 +39,13 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin + src/main/resources/catalog.cat org.jvnet.hyperjaxb3.ejb.tests.dc.tests.RoundtripTest - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/dc/src/main/resources/dcterms.xsd b/hyperjaxb/ejb/tests/dc/src/main/resources/dcterms.xsd index 87e6b0aa1..ae1efb159 100644 --- a/hyperjaxb/ejb/tests/dc/src/main/resources/dcterms.xsd +++ b/hyperjaxb/ejb/tests/dc/src/main/resources/dcterms.xsd @@ -55,7 +55,6 @@ - diff --git a/hyperjaxb/ejb/tests/derby/.gitignore b/hyperjaxb/ejb/tests/derby/.gitignore deleted file mode 100644 index f9a81fec4..000000000 --- a/hyperjaxb/ejb/tests/derby/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target -/derby.log diff --git a/hyperjaxb/ejb/tests/derby/pom.xml b/hyperjaxb/ejb/tests/derby/pom.xml index 856097565..5330f1b29 100644 --- a/hyperjaxb/ejb/tests/derby/pom.xml +++ b/hyperjaxb/ejb/tests/derby/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-derby - jar - Hyperjaxb3 EJB Test [derby] + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [derby] + @@ -20,7 +22,6 @@ org.apache.derby derby - 10.2.2.0 test @@ -28,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.tests.derby.tests.RoundtripTest @@ -36,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/device/.gitignore b/hyperjaxb/ejb/tests/device/.gitignore deleted file mode 100644 index f9a81fec4..000000000 --- a/hyperjaxb/ejb/tests/device/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target -/derby.log diff --git a/hyperjaxb/ejb/tests/device/pom.xml b/hyperjaxb/ejb/tests/device/pom.xml index b96c1a346..551c79837 100644 --- a/hyperjaxb/ejb/tests/device/pom.xml +++ b/hyperjaxb/ejb/tests/device/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-device - jar - Hyperjaxb3 EJB Test [device] + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [device] + @@ -25,7 +27,6 @@ org.apache.derby derby - 10.2.2.0 test @@ -38,7 +39,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.device.tests.RoundtripTest @@ -46,4 +47,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/dl/pom.xml b/hyperjaxb/ejb/tests/dl/pom.xml index 5bf8b0cf8..76dfb9eae 100644 --- a/hyperjaxb/ejb/tests/dl/pom.xml +++ b/hyperjaxb/ejb/tests/dl/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-dl - jar - Hyperjaxb3 EJB Test [dl] + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [dl] + @@ -28,7 +30,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.dl.RoundtripTest @@ -38,4 +40,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/dom/.gitignore b/hyperjaxb/ejb/tests/dom/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/dom/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/dom/pom.xml b/hyperjaxb/ejb/tests/dom/pom.xml index 4e97093db..e6b8b46fd 100644 --- a/hyperjaxb/ejb/tests/dom/pom.xml +++ b/hyperjaxb/ejb/tests/dom/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-dom - jar - Hyperjaxb3 EJB Test [dom] + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [dom] + @@ -27,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.dom.tests.RoundtripTest @@ -35,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/dy/.gitignore b/hyperjaxb/ejb/tests/dy/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/dy/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/dy/pom.xml b/hyperjaxb/ejb/tests/dy/pom.xml index ab640d7ae..770779448 100644 --- a/hyperjaxb/ejb/tests/dy/pom.xml +++ b/hyperjaxb/ejb/tests/dy/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-dy - jar - Hyperjaxb3 EJB Test [dy] + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [dy] + @@ -27,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.dy.RoundtripTest @@ -35,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/ebxmlrr/.gitignore b/hyperjaxb/ejb/tests/ebxmlrr/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/ebxmlrr/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/ebxmlrr/pom.xml b/hyperjaxb/ejb/tests/ebxmlrr/pom.xml index e30e74290..535017c7f 100644 --- a/hyperjaxb/ejb/tests/ebxmlrr/pom.xml +++ b/hyperjaxb/ejb/tests/ebxmlrr/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-ebxmlrr - jar - Hyperjaxb3 EJB Test [ebxmlrr] + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [ebxmlrr] + @@ -27,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.tests.ebxmlrr.tests.RoundtripTest @@ -35,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/edxl/pom.xml b/hyperjaxb/ejb/tests/edxl/pom.xml index cac02225e..88891a978 100644 --- a/hyperjaxb/ejb/tests/edxl/pom.xml +++ b/hyperjaxb/ejb/tests/edxl/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-edxl - jar - Hyperjaxb3 EJB Test [edxl] + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [edxl] + @@ -27,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.tests.edxl.tests.RoundtripTest @@ -35,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/ek/.gitignore b/hyperjaxb/ejb/tests/ek/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/ek/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/ek/pom.xml b/hyperjaxb/ejb/tests/ek/pom.xml index 4b59ffb6c..caf4d7035 100644 --- a/hyperjaxb/ejb/tests/ek/pom.xml +++ b/hyperjaxb/ejb/tests/ek/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-ek - jar - Hyperjaxb3 EJB Test [ek] + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [ek] + @@ -27,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.tests.ek.tests.RoundtripTest @@ -35,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/embeddable-jpa2/.gitignore b/hyperjaxb/ejb/tests/embeddable-jpa2/.gitignore deleted file mode 100644 index c923399b4..000000000 --- a/hyperjaxb/ejb/tests/embeddable-jpa2/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -.classpath -.project diff --git a/hyperjaxb/ejb/tests/embeddable-jpa2/pom.xml b/hyperjaxb/ejb/tests/embeddable-jpa2/pom.xml index 0931b2af8..3403c763f 100644 --- a/hyperjaxb/ejb/tests/embeddable-jpa2/pom.xml +++ b/hyperjaxb/ejb/tests/embeddable-jpa2/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-embeddable-jpa2 - jar - Hyperjaxb3 EJB Test [embeddable-jpa2] + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [embeddable-jpa2] + @@ -27,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.embeddablejpa2.tests.RoundtripTest @@ -39,4 +41,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/embeddable/.gitignore b/hyperjaxb/ejb/tests/embeddable/.gitignore deleted file mode 100644 index f0e688f3f..000000000 --- a/hyperjaxb/ejb/tests/embeddable/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -.project -.classpath diff --git a/hyperjaxb/ejb/tests/embeddable/pom.xml b/hyperjaxb/ejb/tests/embeddable/pom.xml index 064d2421b..a0752643b 100644 --- a/hyperjaxb/ejb/tests/embeddable/pom.xml +++ b/hyperjaxb/ejb/tests/embeddable/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-embeddable - jar - Hyperjaxb3 EJB Test [embeddable] + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [embeddable] + @@ -27,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.embeddable.tests.RoundtripTest @@ -39,4 +41,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/eminq/.gitignore b/hyperjaxb/ejb/tests/eminq/.gitignore deleted file mode 100644 index c923399b4..000000000 --- a/hyperjaxb/ejb/tests/eminq/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -.classpath -.project diff --git a/hyperjaxb/ejb/tests/eminq/pom.xml b/hyperjaxb/ejb/tests/eminq/pom.xml index 8fbc79835..9695e4cc9 100644 --- a/hyperjaxb/ejb/tests/eminq/pom.xml +++ b/hyperjaxb/ejb/tests/eminq/pom.xml @@ -3,13 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-eminq - jar - Hyperjaxb3 EJB Test [eminq] + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [eminq] + @@ -27,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.tests.eminq.tests.RoundtripTest @@ -35,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/enum/.gitignore b/hyperjaxb/ejb/tests/enum/.gitignore deleted file mode 100644 index c923399b4..000000000 --- a/hyperjaxb/ejb/tests/enum/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -.classpath -.project diff --git a/hyperjaxb/ejb/tests/enum/pom.xml b/hyperjaxb/ejb/tests/enum/pom.xml index 80c280d41..7628db212 100644 --- a/hyperjaxb/ejb/tests/enum/pom.xml +++ b/hyperjaxb/ejb/tests/enum/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-enum jar - Hyperjaxb3 EJB Test [enum] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [enum] @@ -27,7 +28,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.tests.enums.tests.RoundtripTest @@ -35,4 +36,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/episodes/a/.gitignore b/hyperjaxb/ejb/tests/episodes/a/.gitignore deleted file mode 100644 index c923399b4..000000000 --- a/hyperjaxb/ejb/tests/episodes/a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -.classpath -.project diff --git a/hyperjaxb/ejb/tests/episodes/a/pom.xml b/hyperjaxb/ejb/tests/episodes/a/pom.xml index ca4cfe275..e4e674de2 100644 --- a/hyperjaxb/ejb/tests/episodes/a/pom.xml +++ b/hyperjaxb/ejb/tests/episodes/a/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests-episodes - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-episodes-a jar - Hyperjaxb3 EJB Test [episodes-a] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [episodes:a] @@ -27,7 +28,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.episodes.a.tests.RoundtripTest @@ -35,4 +36,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/episodes/b/.gitignore b/hyperjaxb/ejb/tests/episodes/b/.gitignore deleted file mode 100644 index c923399b4..000000000 --- a/hyperjaxb/ejb/tests/episodes/b/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -.classpath -.project diff --git a/hyperjaxb/ejb/tests/episodes/b/pom.xml b/hyperjaxb/ejb/tests/episodes/b/pom.xml index 9bfdd05e4..bfc64ef81 100644 --- a/hyperjaxb/ejb/tests/episodes/b/pom.xml +++ b/hyperjaxb/ejb/tests/episodes/b/pom.xml @@ -3,18 +3,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests-episodes - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-episodes-b jar - Hyperjaxb3 EJB Test [episodes-b] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [episodes:b] - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests-episodes-a - 0.6.3-SNAPSHOT + ${project.version} @@ -38,7 +39,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin true @@ -46,7 +47,7 @@ src/main/resources/persistence.xml - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests-episodes-a @@ -54,4 +55,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/episodes/pom.xml b/hyperjaxb/ejb/tests/episodes/pom.xml index 459e9bb40..e318f8bcc 100644 --- a/hyperjaxb/ejb/tests/episodes/pom.xml +++ b/hyperjaxb/ejb/tests/episodes/pom.xml @@ -1,15 +1,16 @@ - 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-episodes pom - Hyperjaxb3 EJB Test [episodes] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [episodes] a b @@ -17,4 +18,4 @@ test - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/equals-builder/builder/.gitignore b/hyperjaxb/ejb/tests/equals-builder/builder/.gitignore deleted file mode 100644 index c923399b4..000000000 --- a/hyperjaxb/ejb/tests/equals-builder/builder/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -.classpath -.project diff --git a/hyperjaxb/ejb/tests/equals-builder/builder/pom.xml b/hyperjaxb/ejb/tests/equals-builder/builder/pom.xml index 374bbf1dd..e2aa7f8e1 100644 --- a/hyperjaxb/ejb/tests/equals-builder/builder/pom.xml +++ b/hyperjaxb/ejb/tests/equals-builder/builder/pom.xml @@ -3,21 +3,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests-equals-builder - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-equals-builder-builder jar - Hyperjaxb3 EJB Test [equals-builder-builder] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [equals-builder:builder] - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-runtime test - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/equals-builder/pom.xml b/hyperjaxb/ejb/tests/equals-builder/pom.xml index f5751fe70..7bf31b8e6 100644 --- a/hyperjaxb/ejb/tests/equals-builder/pom.xml +++ b/hyperjaxb/ejb/tests/equals-builder/pom.xml @@ -1,15 +1,16 @@ - 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-equals-builder pom - Hyperjaxb3 EJB Test [equals-builder] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [equals-builder] builder schema @@ -17,4 +18,4 @@ test - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/equals-builder/schema/.gitignore b/hyperjaxb/ejb/tests/equals-builder/schema/.gitignore deleted file mode 100644 index c923399b4..000000000 --- a/hyperjaxb/ejb/tests/equals-builder/schema/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -.classpath -.project diff --git a/hyperjaxb/ejb/tests/equals-builder/schema/pom.xml b/hyperjaxb/ejb/tests/equals-builder/schema/pom.xml index d2ff06365..257147128 100644 --- a/hyperjaxb/ejb/tests/equals-builder/schema/pom.xml +++ b/hyperjaxb/ejb/tests/equals-builder/schema/pom.xml @@ -3,16 +3,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests-equals-builder - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-equals-builder-schema jar - Hyperjaxb3 EJB Test [equals-builder-schema] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [equals-builder:schema] - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests-equals-builder-builder ${project.version} @@ -33,7 +34,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.po.RoundtripTest @@ -42,7 +43,7 @@ - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests-equals-builder-builder @@ -50,4 +51,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/fpml-pretrade/.gitignore b/hyperjaxb/ejb/tests/fpml-pretrade/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/fpml-pretrade/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/fpml-pretrade/pom.xml b/hyperjaxb/ejb/tests/fpml-pretrade/pom.xml index 68190a44c..b716e959e 100644 --- a/hyperjaxb/ejb/tests/fpml-pretrade/pom.xml +++ b/hyperjaxb/ejb/tests/fpml-pretrade/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-fpml-pretrade jar - Hyperjaxb3 EJB Test [fpml-pretrade] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [fpml-pretrade] @@ -25,7 +26,6 @@ org.apache.derby derby - 10.2.2.0 test @@ -39,7 +39,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin @@ -54,7 +54,7 @@ -Xmx512m -verbose:gc - + - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/ids/.gitignore b/hyperjaxb/ejb/tests/ids/.gitignore deleted file mode 100644 index c923399b4..000000000 --- a/hyperjaxb/ejb/tests/ids/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -.classpath -.project diff --git a/hyperjaxb/ejb/tests/ids/pom.xml b/hyperjaxb/ejb/tests/ids/pom.xml index 178657363..ef5e69b29 100644 --- a/hyperjaxb/ejb/tests/ids/pom.xml +++ b/hyperjaxb/ejb/tests/ids/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-ids jar - Hyperjaxb3 EJB Test [ids] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [ids] @@ -27,7 +28,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.ids.tests.RoundtripTest @@ -36,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/ims-eportfolio/pom.xml b/hyperjaxb/ejb/tests/ims-eportfolio/pom.xml index e823bbe3a..0fcf7f8e6 100644 --- a/hyperjaxb/ejb/tests/ims-eportfolio/pom.xml +++ b/hyperjaxb/ejb/tests/ims-eportfolio/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-ims-eportfolio jar - Hyperjaxb3 EJB Test [ims-eportfolio] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [ims-eportfolio] @@ -28,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin true @@ -46,4 +47,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/ims-lip/.gitignore b/hyperjaxb/ejb/tests/ims-lip/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/ims-lip/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/ims-lip/pom.xml b/hyperjaxb/ejb/tests/ims-lip/pom.xml index 9af2666d2..ba20090b4 100644 --- a/hyperjaxb/ejb/tests/ims-lip/pom.xml +++ b/hyperjaxb/ejb/tests/ims-lip/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-ims-lip jar - Hyperjaxb3 EJB Test [ims-lip] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [ims-lip] @@ -28,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.imslip.RoundtripTest @@ -45,4 +46,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/ioda/.gitignore b/hyperjaxb/ejb/tests/ioda/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/ioda/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/ioda/pom.xml b/hyperjaxb/ejb/tests/ioda/pom.xml index 4bfdd707e..4622da54b 100644 --- a/hyperjaxb/ejb/tests/ioda/pom.xml +++ b/hyperjaxb/ejb/tests/ioda/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-ioda jar - Hyperjaxb3 EJB Test [ioda] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [ioda] @@ -27,7 +28,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.ioda.tests.RoundtripTest @@ -35,4 +36,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/issues-el/.gitignore b/hyperjaxb/ejb/tests/issues-el/.gitignore deleted file mode 100644 index f0e688f3f..000000000 --- a/hyperjaxb/ejb/tests/issues-el/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -.project -.classpath diff --git a/hyperjaxb/ejb/tests/issues-el/pom.xml b/hyperjaxb/ejb/tests/issues-el/pom.xml index 4423470fe..0a8a7f7b6 100644 --- a/hyperjaxb/ejb/tests/issues-el/pom.xml +++ b/hyperjaxb/ejb/tests/issues-el/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-issues-el jar - Hyperjaxb3 EJB Test [issues-el] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [issues-el] @@ -27,7 +28,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin ${project.version} @@ -36,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/issues-jpa2/.gitignore b/hyperjaxb/ejb/tests/issues-jpa2/.gitignore deleted file mode 100644 index c923399b4..000000000 --- a/hyperjaxb/ejb/tests/issues-jpa2/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -.classpath -.project diff --git a/hyperjaxb/ejb/tests/issues-jpa2/pom.xml b/hyperjaxb/ejb/tests/issues-jpa2/pom.xml index 7d4ce664e..df81eccfc 100644 --- a/hyperjaxb/ejb/tests/issues-jpa2/pom.xml +++ b/hyperjaxb/ejb/tests/issues-jpa2/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-jpa2-tests-issues-jpa2 jar - Hyperjaxb3 EJB Test [issues-jpa2] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [issues-jpa2] @@ -27,7 +28,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin jpa2 @@ -67,4 +68,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/issues-jpa2/src/test/java/org/jvnet/hyperjaxb3/ejb/tests/issuesjpa2/HJIII73Test.java b/hyperjaxb/ejb/tests/issues-jpa2/src/test/java/org/jvnet/hyperjaxb3/ejb/tests/issuesjpa2/HJIII73Test.java index de28dba1e..cca4d6a57 100644 --- a/hyperjaxb/ejb/tests/issues-jpa2/src/test/java/org/jvnet/hyperjaxb3/ejb/tests/issuesjpa2/HJIII73Test.java +++ b/hyperjaxb/ejb/tests/issues-jpa2/src/test/java/org/jvnet/hyperjaxb3/ejb/tests/issuesjpa2/HJIII73Test.java @@ -5,9 +5,9 @@ import junit.framework.Assert; import junit.framework.TestCase; -import org.jvnet.annox.reflect.AnnotatedElementFactory; -import org.jvnet.annox.reflect.DualAnnotatedElementFactory; -import org.jvnet.annox.reflect.ParameterizedAnnotatedElement; +import org.jvnet.jaxb.annox.reflect.AnnotatedElementFactory; +import org.jvnet.jaxb.annox.reflect.DualAnnotatedElementFactory; +import org.jvnet.jaxb.annox.reflect.ParameterizedAnnotatedElement; public class HJIII73Test extends TestCase { diff --git a/hyperjaxb/ejb/tests/issues-pre/.gitignore b/hyperjaxb/ejb/tests/issues-pre/.gitignore deleted file mode 100644 index c923399b4..000000000 --- a/hyperjaxb/ejb/tests/issues-pre/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -.classpath -.project diff --git a/hyperjaxb/ejb/tests/issues-pre/pom.xml b/hyperjaxb/ejb/tests/issues-pre/pom.xml index 77b882222..042961ba6 100644 --- a/hyperjaxb/ejb/tests/issues-pre/pom.xml +++ b/hyperjaxb/ejb/tests/issues-pre/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-issues-pre jar - Hyperjaxb3 EJB Test [issues-pre] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [issues-pre] @@ -21,4 +22,4 @@ test - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/issues-pre/src/main/java/org/jvnet/hyperjaxb3/ejb/tests/issues/pre/IssueHJIII45SuperClass.java b/hyperjaxb/ejb/tests/issues-pre/src/main/java/org/jvnet/hyperjaxb3/ejb/tests/issues/pre/IssueHJIII45SuperClass.java index fa99c051f..5a6df0f6a 100644 --- a/hyperjaxb/ejb/tests/issues-pre/src/main/java/org/jvnet/hyperjaxb3/ejb/tests/issues/pre/IssueHJIII45SuperClass.java +++ b/hyperjaxb/ejb/tests/issues-pre/src/main/java/org/jvnet/hyperjaxb3/ejb/tests/issues/pre/IssueHJIII45SuperClass.java @@ -8,10 +8,10 @@ import javax.persistence.MappedSuperclass; import javax.persistence.PrePersist; import javax.xml.bind.annotation.XmlElement; -import org.jvnet.jaxb2_commons.lang.Equals; -import org.jvnet.jaxb2_commons.lang.EqualsStrategy; -import org.jvnet.jaxb2_commons.lang.HashCode; -import org.jvnet.jaxb2_commons.lang.HashCodeStrategy; +import org.jvnet.jaxb2_commons.lang.Equals2; +import org.jvnet.jaxb2_commons.lang.EqualsStrategy2; +import org.jvnet.jaxb2_commons.lang.HashCode2; +import org.jvnet.jaxb2_commons.lang.HashCodeStrategy2; import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy; import org.jvnet.jaxb2_commons.locator.ObjectLocator; @@ -19,7 +19,7 @@ @MappedSuperclass -public abstract class IssueHJIII45SuperClass implements Serializable, Equals, HashCode{ +public abstract class IssueHJIII45SuperClass implements Serializable, Equals2, HashCode2 { private static final long serialVersionUID = 7724857660567518243L; @@ -49,7 +49,7 @@ private void prePersist() { - public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) { + public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy2 strategy) { if (!(object instanceof IssueHJIII45SuperClass)) { return false; } @@ -62,7 +62,9 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje lhsId = this.getId(); String rhsId; rhsId = that.getId(); - if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId)) { + if (!strategy.equals(LocatorUtils.property(thisLocator, "id", lhsId), + LocatorUtils.property(thatLocator, "id", rhsId), lhsId, rhsId, + this.id != null, that.id != null)) { return false; } } @@ -70,22 +72,22 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Obje } public boolean equals(Object object) { - final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE; + final EqualsStrategy2 strategy = JAXBEqualsStrategy.INSTANCE2; return equals(null, null, object, strategy); } - public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) { + public int hashCode(ObjectLocator locator, HashCodeStrategy2 strategy) { int currentHashCode = 1; { String theId; theId = this.getId(); - currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId); + currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "id", theId), currentHashCode, theId, this.id != null); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE2; return this.hashCode(null, strategy); } diff --git a/hyperjaxb/ejb/tests/issues/.gitignore b/hyperjaxb/ejb/tests/issues/.gitignore deleted file mode 100644 index b8ea0ea98..000000000 --- a/hyperjaxb/ejb/tests/issues/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -.settings -.classpath -.project diff --git a/hyperjaxb/ejb/tests/issues/pom.xml b/hyperjaxb/ejb/tests/issues/pom.xml index 4b8188fd0..ac484a897 100644 --- a/hyperjaxb/ejb/tests/issues/pom.xml +++ b/hyperjaxb/ejb/tests/issues/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-issues jar - Hyperjaxb3 EJB Test [issues] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [issues] @@ -23,17 +24,17 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests-po ${project.version} runtime - + - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests-issues-pre ${project.version} compile - + @@ -47,7 +48,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin ${project.version} @@ -57,11 +58,11 @@ - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests-issues-pre @@ -70,7 +71,7 @@ org.hibernate hibernate-search - 3.4.0.Final + ${hibernate-search.version} @@ -108,7 +109,6 @@ org.apache.maven.plugins maven-resources-plugin - 2.4.2 prepare-package @@ -117,16 +117,16 @@ ${project.build.outputDirectory} - + target/generated-resources/hbm2ddl true - - + + - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/issues/src/main/java/org/jvnet/hyperjaxb3/ejb/tests/issues/MyIssueXXXType.java b/hyperjaxb/ejb/tests/issues/src/main/java/org/jvnet/hyperjaxb3/ejb/tests/issues/MyIssueXXXType.java index fa9e36a56..de4607fcc 100644 --- a/hyperjaxb/ejb/tests/issues/src/main/java/org/jvnet/hyperjaxb3/ejb/tests/issues/MyIssueXXXType.java +++ b/hyperjaxb/ejb/tests/issues/src/main/java/org/jvnet/hyperjaxb3/ejb/tests/issues/MyIssueXXXType.java @@ -24,10 +24,10 @@ import javax.xml.bind.annotation.XmlType; import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.jvnet.jaxb2_commons.lang.Equals; -import org.jvnet.jaxb2_commons.lang.EqualsStrategy; -import org.jvnet.jaxb2_commons.lang.HashCode; -import org.jvnet.jaxb2_commons.lang.HashCodeStrategy; +import org.jvnet.jaxb2_commons.lang.Equals2; +import org.jvnet.jaxb2_commons.lang.EqualsStrategy2; +import org.jvnet.jaxb2_commons.lang.HashCode2; +import org.jvnet.jaxb2_commons.lang.HashCodeStrategy2; import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy; import org.jvnet.jaxb2_commons.locator.ObjectLocator; @@ -58,7 +58,7 @@ @Entity(name = "org.jvnet.hyperjaxb3.ejb.tests.issues.MyIssueXXXType") @Table(name = "MYISSUEXXXTYPE") @Inheritance(strategy = InheritanceType.JOINED) -public class MyIssueXXXType implements Serializable, Equals, HashCode { +public class MyIssueXXXType implements Serializable, Equals2, HashCode2 { @XmlAttribute protected String value; @@ -113,7 +113,7 @@ public void setHjid(Long value) { } public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, - Object object, EqualsStrategy strategy) { + Object object, EqualsStrategy2 strategy) { if (!(object instanceof MyIssueXXXType)) { return false; } @@ -128,7 +128,8 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, rhsValue = that.getValue(); if (!strategy.equals(LocatorUtils.property(thisLocator, "simpleSingle", lhsValue), LocatorUtils.property(thatLocator, - "simpleSingle", rhsValue), lhsValue, rhsValue)) { + "simpleSingle", rhsValue), lhsValue, rhsValue, + this.value != null, that.value != null)) { return false; } } @@ -136,7 +137,7 @@ public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, } public boolean equals(Object object) { - final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE; + final EqualsStrategy2 strategy = JAXBEqualsStrategy.INSTANCE2; return equals(null, null, object, strategy); } @@ -144,20 +145,20 @@ public void hashCode(HashCodeBuilder hashCodeBuilder) { hashCodeBuilder.append(this.getValue()); } - public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) { + public int hashCode(ObjectLocator locator, HashCodeStrategy2 strategy) { int currentHashCode = 1; { String theValue; theValue = this.getValue(); currentHashCode = strategy.hashCode(LocatorUtils.property(locator, - "value", theValue), currentHashCode, theValue); + "value", theValue), currentHashCode, theValue, value != null); } return currentHashCode; } public int hashCode() { - final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE; + final HashCodeStrategy2 strategy = JAXBHashCodeStrategy.INSTANCE2; return this.hashCode(null, strategy); } diff --git a/hyperjaxb/ejb/tests/issues/src/test/java/org/jvnet/hyperjaxb3/ejb/tests/issues/IssueHJIII28Test.java b/hyperjaxb/ejb/tests/issues/src/test/java/org/jvnet/hyperjaxb3/ejb/tests/issues/IssueHJIII28Test.java index a27471994..82086fa8a 100644 --- a/hyperjaxb/ejb/tests/issues/src/test/java/org/jvnet/hyperjaxb3/ejb/tests/issues/IssueHJIII28Test.java +++ b/hyperjaxb/ejb/tests/issues/src/test/java/org/jvnet/hyperjaxb3/ejb/tests/issues/IssueHJIII28Test.java @@ -5,9 +5,9 @@ import junit.framework.Assert; import junit.framework.TestCase; -import org.jvnet.annox.reflect.AnnotatedElementFactory; -import org.jvnet.annox.reflect.DualAnnotatedElementFactory; -import org.jvnet.annox.reflect.ParameterizedAnnotatedElement; +import org.jvnet.jaxb.annox.reflect.AnnotatedElementFactory; +import org.jvnet.jaxb.annox.reflect.DualAnnotatedElementFactory; +import org.jvnet.jaxb.annox.reflect.ParameterizedAnnotatedElement; public class IssueHJIII28Test extends TestCase { diff --git a/hyperjaxb/ejb/tests/issues/src/test/resources/log4j.properties b/hyperjaxb/ejb/tests/issues/src/test/resources/log4j.properties index 5d8eda910..242ebf0de 100644 --- a/hyperjaxb/ejb/tests/issues/src/test/resources/log4j.properties +++ b/hyperjaxb/ejb/tests/issues/src/test/resources/log4j.properties @@ -4,6 +4,6 @@ log4j.appender.stdout.target=system.out log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%m%n %c%n%n log4j.logger.org.apache.commons.digester=INFO -log4j.logger.org.jvnet.hyperjaxb3=DEBUG +log4j.logger.org.jvnet=DEBUG log4j.logger.org.hibernate=WARN log4j.logger.org.hibernate.SQL=debug \ No newline at end of file diff --git a/hyperjaxb/ejb/tests/issues/src/test/samples/issueHJIII92[0].xml b/hyperjaxb/ejb/tests/issues/src/test/tobefixed/issueHJIII92[0].xml similarity index 100% rename from hyperjaxb/ejb/tests/issues/src/test/samples/issueHJIII92[0].xml rename to hyperjaxb/ejb/tests/issues/src/test/tobefixed/issueHJIII92[0].xml diff --git a/hyperjaxb/ejb/tests/nml/.gitignore b/hyperjaxb/ejb/tests/nml/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/nml/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/nml/pom.xml b/hyperjaxb/ejb/tests/nml/pom.xml index 75fb04fb3..3e0634b0f 100644 --- a/hyperjaxb/ejb/tests/nml/pom.xml +++ b/hyperjaxb/ejb/tests/nml/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-nml jar - Hyperjaxb3 EJB Test [nml] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [nml] @@ -27,7 +28,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.nml.RoundtripTest @@ -35,4 +36,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/nokis/.gitignore b/hyperjaxb/ejb/tests/nokis/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/nokis/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/nokis/pom.xml b/hyperjaxb/ejb/tests/nokis/pom.xml index ffbb34a66..2588d76e0 100644 --- a/hyperjaxb/ejb/tests/nokis/pom.xml +++ b/hyperjaxb/ejb/tests/nokis/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests 0.6.1-SNAPSHOT hyperjaxb3-ejb-tests-nokis jar - Hyperjaxb3 EJB Test [nokis] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [nokis] @@ -27,7 +27,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.tests.nokis.tests.RoundtripTest diff --git a/hyperjaxb/ejb/tests/one/.gitignore b/hyperjaxb/ejb/tests/one/.gitignore deleted file mode 100644 index b8ea0ea98..000000000 --- a/hyperjaxb/ejb/tests/one/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -.settings -.classpath -.project diff --git a/hyperjaxb/ejb/tests/one/pom.xml b/hyperjaxb/ejb/tests/one/pom.xml index 6a8091989..d96c6a76a 100644 --- a/hyperjaxb/ejb/tests/one/pom.xml +++ b/hyperjaxb/ejb/tests/one/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-one jar - Hyperjaxb3 EJB Test [one] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [one] @@ -25,7 +26,6 @@ org.apache.derby derby - 10.2.2.0 test @@ -33,7 +33,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/onix30/.gitignore b/hyperjaxb/ejb/tests/onix30/.gitignore deleted file mode 100644 index c923399b4..000000000 --- a/hyperjaxb/ejb/tests/onix30/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -.classpath -.project diff --git a/hyperjaxb/ejb/tests/onix30/pom.xml b/hyperjaxb/ejb/tests/onix30/pom.xml index 1c384cad7..2db746c8c 100644 --- a/hyperjaxb/ejb/tests/onix30/pom.xml +++ b/hyperjaxb/ejb/tests/onix30/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-onix30 jar - Hyperjaxb3 EJB Test [onix30] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [onix30] @@ -25,7 +26,6 @@ org.apache.derby derby - 10.2.2.0 test @@ -33,7 +33,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.onix30.RoundtripTest @@ -44,4 +44,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/ota/.gitignore b/hyperjaxb/ejb/tests/ota/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/ota/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/ota/pom.xml b/hyperjaxb/ejb/tests/ota/pom.xml index 34f4f2952..468940500 100644 --- a/hyperjaxb/ejb/tests/ota/pom.xml +++ b/hyperjaxb/ejb/tests/ota/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-ota jar - Hyperjaxb3 EJB Test [ota] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [ota] @@ -37,25 +38,22 @@ org.slf4j slf4j-api - 1.6.1 - + org.slf4j slf4j-log4j12 - 1.6.1 - + test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin @@ -68,4 +66,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/ows/pom.xml b/hyperjaxb/ejb/tests/ows/pom.xml index 44912a6a4..4dbc220fd 100644 --- a/hyperjaxb/ejb/tests/ows/pom.xml +++ b/hyperjaxb/ejb/tests/ows/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-ows jar - Hyperjaxb3 EJB Test [ows] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [ows] @@ -27,7 +28,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin @@ -38,4 +39,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/ows/src/main/resources/ows/1.1.0/ows19115subset.xsd b/hyperjaxb/ejb/tests/ows/src/main/resources/ows/1.1.0/ows19115subset.xsd index ffbaa0913..704478891 100644 --- a/hyperjaxb/ejb/tests/ows/src/main/resources/ows/1.1.0/ows19115subset.xsd +++ b/hyperjaxb/ejb/tests/ows/src/main/resources/ows/1.1.0/ows19115subset.xsd @@ -13,7 +13,7 @@ elementFormDefault="qualified" version="1.1.0" xml:lang="en"> includes and imports ============================================================== --> - + diff --git a/hyperjaxb/ejb/tests/pesc/.gitignore b/hyperjaxb/ejb/tests/pesc/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/pesc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/pesc/pom.xml b/hyperjaxb/ejb/tests/pesc/pom.xml index 1c4b6231a..dab1cd6c6 100644 --- a/hyperjaxb/ejb/tests/pesc/pom.xml +++ b/hyperjaxb/ejb/tests/pesc/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-pesc jar - Hyperjaxb3 EJB Test [pesc] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [pesc] @@ -27,7 +28,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.tests.pesc.tests.RoundtripTest @@ -44,4 +45,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/plmxml/pom.xml b/hyperjaxb/ejb/tests/plmxml/pom.xml index 8a6e1f945..f117a4ef2 100644 --- a/hyperjaxb/ejb/tests/plmxml/pom.xml +++ b/hyperjaxb/ejb/tests/plmxml/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-plmxml jar - Hyperjaxb3 EJB Test [plmxml] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [plmxml] @@ -34,7 +35,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.plmxml.RoundtripTest @@ -46,7 +47,7 @@ -Xmx1024M - + - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/po-customized/.gitignore b/hyperjaxb/ejb/tests/po-customized/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/po-customized/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/po-customized/pom.xml b/hyperjaxb/ejb/tests/po-customized/pom.xml index 0e3360a34..b28e98366 100644 --- a/hyperjaxb/ejb/tests/po-customized/pom.xml +++ b/hyperjaxb/ejb/tests/po-customized/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-po-customized jar - Hyperjaxb3 EJB Test [po-customized] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [po-customized] @@ -28,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.pocustomized.RoundtripTest @@ -36,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/po-el-customized/.gitignore b/hyperjaxb/ejb/tests/po-el-customized/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/po-el-customized/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/po-el-customized/pom.xml b/hyperjaxb/ejb/tests/po-el-customized/pom.xml index a700eb37b..63b604c71 100644 --- a/hyperjaxb/ejb/tests/po-el-customized/pom.xml +++ b/hyperjaxb/ejb/tests/po-el-customized/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-po-el-customized jar - Hyperjaxb3 EJB Test [po-el-customized] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [po-el-customized] @@ -27,7 +28,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.pocel.RoundtripTest @@ -35,4 +36,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/po-jaxb/.gitignore b/hyperjaxb/ejb/tests/po-jaxb/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/po-jaxb/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/po-jaxb/pom.xml b/hyperjaxb/ejb/tests/po-jaxb/pom.xml index 0f7491d88..6e1b17180 100644 --- a/hyperjaxb/ejb/tests/po-jaxb/pom.xml +++ b/hyperjaxb/ejb/tests/po-jaxb/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-po-jaxb jar - Hyperjaxb3 EJB Test [po-jaxb] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [po-jaxb] @@ -37,11 +38,11 @@ **/*.java - + - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin -Xhyperjaxb3-jpa2 @@ -54,7 +55,7 @@ - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-plugin ${project.version} @@ -63,4 +64,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/po-jpa-2.1/.gitignore b/hyperjaxb/ejb/tests/po-jpa-2.1/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/po-jpa-2.1/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/po-jpa-2.1/pom.xml b/hyperjaxb/ejb/tests/po-jpa-2.1/pom.xml index 6720e9e2e..ea9a7dd28 100644 --- a/hyperjaxb/ejb/tests/po-jpa-2.1/pom.xml +++ b/hyperjaxb/ejb/tests/po-jpa-2.1/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests 0.6.1-SNAPSHOT hyperjaxb3-ejb-tests-po-jpa-2.1 jar - Hyperjaxb3 EJB Test [po-jpa-2.1] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [po-jpa-2.1] @@ -30,7 +30,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin-testing @@ -38,7 +38,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.po_jpa_v_2_1.RoundtripTest diff --git a/hyperjaxb/ejb/tests/po-mysql/.gitignore b/hyperjaxb/ejb/tests/po-mysql/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/hyperjaxb/ejb/tests/po-mysql/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/hyperjaxb/ejb/tests/po-mysql/pom.xml b/hyperjaxb/ejb/tests/po-mysql/pom.xml index 1e4c32e40..6af9653a2 100644 --- a/hyperjaxb/ejb/tests/po-mysql/pom.xml +++ b/hyperjaxb/ejb/tests/po-mysql/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-po-mysql jar - Hyperjaxb3 EJB Test [po-mysql] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [po-mysql] @@ -17,11 +18,11 @@ org.hibernate hibernate-entitymanager test - + - mysql - mysql-connector-java - 8.0.16 + com.mysql + mysql-connector-j + 8.0.33 test @@ -29,22 +30,22 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.po.RoundtripTest - org.codehaus.mojo - hibernate3-maven-plugin - 3.0 + de.jpdigital + hibernate56-ddl-maven-plugin + 2.5.0 generate-schema compile - run + gen-ddl @@ -53,18 +54,18 @@ - + - + - + - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - ${hibernate-jpa-2.1-api.version} + javax.persistence + javax.persistence-api + ${jpa-api.version} org.hibernate @@ -72,12 +73,12 @@ ${hibernate-entitymanager.version} - mysql - mysql-connector-java - 8.0.16 + com.mysql + mysql-connector-j + 8.0.33 - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/po-mysql/src/test/resources/persistence.properties b/hyperjaxb/ejb/tests/po-mysql/src/test/resources/persistence.properties index 51951d54b..a76439f0e 100644 --- a/hyperjaxb/ejb/tests/po-mysql/src/test/resources/persistence.properties +++ b/hyperjaxb/ejb/tests/po-mysql/src/test/resources/persistence.properties @@ -1,5 +1,5 @@ -hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.connection.driver_class=com.mysql.jdbc.Driver +hibernate.dialect=org.hibernate.dialect.MySQL8Dialect +hibernate.connection.driver_class=com.mysql.cj.jdbc.Driver hibernate.connection.username=root hibernate.connection.password=overkill hibernate.connection.url=jdbc:mysql://localhost/hj3 diff --git a/hyperjaxb/ejb/tests/po-tl-customized/.gitignore b/hyperjaxb/ejb/tests/po-tl-customized/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/po-tl-customized/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/po-tl-customized/pom.xml b/hyperjaxb/ejb/tests/po-tl-customized/pom.xml index 6705a9317..ca1b2a9ad 100644 --- a/hyperjaxb/ejb/tests/po-tl-customized/pom.xml +++ b/hyperjaxb/ejb/tests/po-tl-customized/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-po-tl-customized jar - Hyperjaxb3 EJB Test [po-tl-customized] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [po-tl-customized] @@ -33,7 +34,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.poctl.RoundtripTest @@ -41,4 +42,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/po/.gitignore b/hyperjaxb/ejb/tests/po/.gitignore deleted file mode 100644 index 1e07cafdf..000000000 --- a/hyperjaxb/ejb/tests/po/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -target -.settings -.classpath -.project diff --git a/hyperjaxb/ejb/tests/po/pom.xml b/hyperjaxb/ejb/tests/po/pom.xml index 39a858018..504659d40 100644 --- a/hyperjaxb/ejb/tests/po/pom.xml +++ b/hyperjaxb/ejb/tests/po/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-po jar - Hyperjaxb3 EJB Test [po] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [po] @@ -28,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.po.RoundtripTest @@ -36,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/polyform/.gitignore b/hyperjaxb/ejb/tests/polyform/.gitignore deleted file mode 100644 index c923399b4..000000000 --- a/hyperjaxb/ejb/tests/polyform/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -.classpath -.project diff --git a/hyperjaxb/ejb/tests/polyform/pom.xml b/hyperjaxb/ejb/tests/polyform/pom.xml index ba50e1563..66ba281c3 100644 --- a/hyperjaxb/ejb/tests/polyform/pom.xml +++ b/hyperjaxb/ejb/tests/polyform/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-polyform jar - Hyperjaxb3 EJB Test [polyform] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [polyform] @@ -25,7 +26,6 @@ org.apache.derby derby - 10.2.2.0 test @@ -33,7 +33,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/pom.xml b/hyperjaxb/ejb/tests/pom.xml index bd3b6f07c..e064baaef 100644 --- a/hyperjaxb/ejb/tests/pom.xml +++ b/hyperjaxb/ejb/tests/pom.xml @@ -1,15 +1,17 @@ - 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests pom - Hyperjaxb3 EJB Tests + JAXB Tools :: Hyperjaxb3 :: EJB :: Tests + any episodes @@ -126,14 +128,13 @@ - dc + derby device dom dy - ebxmlrr - edxl + ek embeddable embeddable-jpa2 @@ -143,7 +144,7 @@ equals-builder - ids + ioda @@ -154,8 +155,8 @@ one onix30 - ota - ows + + pesc po @@ -169,7 +170,7 @@ px regrep - sbml + sepa service simple @@ -181,28 +182,36 @@ uniprot verylong web - xacml - xmldsig + + ccr - cda - component + + custom-naming customType customizations dl fpml-pretrade - ims-eportfolio - ims-lip - nml - plmxml - po-mysql - rim - sml - star + + + + + + + test-network + + dc + ebxmlrr + ims-eportfolio + ims-lip + ows + rim + + @@ -210,13 +219,13 @@ jaxb-runtime - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-runtime org.slf4j - slf4j-nop - test + jcl-over-slf4j + ${slf4j.version} junit @@ -224,7 +233,7 @@ compile - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin-testing @@ -233,7 +242,7 @@ - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin ${project.version} @@ -255,7 +264,7 @@ org.hibernate hibernate-search - 3.4.0.Final + ${hibernate-search.version} @@ -266,11 +275,11 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin - -Xmx1024M -XX:MaxPermSize=128M -verbose:gc -Dlog4j.debug + -Xmx1024M -Dlog4j.debug - + @@ -311,4 +318,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/punit/core/.gitignore b/hyperjaxb/ejb/tests/punit/core/.gitignore deleted file mode 100644 index c923399b4..000000000 --- a/hyperjaxb/ejb/tests/punit/core/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -.classpath -.project diff --git a/hyperjaxb/ejb/tests/punit/core/pom.xml b/hyperjaxb/ejb/tests/punit/core/pom.xml index b2bfcc23a..463716b95 100644 --- a/hyperjaxb/ejb/tests/punit/core/pom.xml +++ b/hyperjaxb/ejb/tests/punit/core/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests-punit - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-punit-core jar - Hyperjaxb3 EJB Test [punit-core] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [punit:core] @@ -28,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.po.RoundtripTest @@ -37,4 +38,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/punit/ext/.gitignore b/hyperjaxb/ejb/tests/punit/ext/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/punit/ext/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/punit/ext/pom.xml b/hyperjaxb/ejb/tests/punit/ext/pom.xml index 97ce46be8..45767076d 100644 --- a/hyperjaxb/ejb/tests/punit/ext/pom.xml +++ b/hyperjaxb/ejb/tests/punit/ext/pom.xml @@ -3,16 +3,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests-punit - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-punit-ext jar - Hyperjaxb3 EJB Test [punit-ext] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [punit:ext] - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests-punit-core ${project.version} @@ -29,4 +30,4 @@ test - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/punit/pom.xml b/hyperjaxb/ejb/tests/punit/pom.xml index 09a3ee4d0..f23a1e254 100644 --- a/hyperjaxb/ejb/tests/punit/pom.xml +++ b/hyperjaxb/ejb/tests/punit/pom.xml @@ -3,15 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-punit pom - Hyperjaxb3 EJB Test [punit] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [punit] core ext - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/px/.gitignore b/hyperjaxb/ejb/tests/px/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/px/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/px/pom.xml b/hyperjaxb/ejb/tests/px/pom.xml index 67902ffde..305c647fa 100644 --- a/hyperjaxb/ejb/tests/px/pom.xml +++ b/hyperjaxb/ejb/tests/px/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-px jar - Hyperjaxb3 EJB Test [px] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [px] @@ -28,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.po.RoundtripTest @@ -37,4 +38,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/regrep/.gitignore b/hyperjaxb/ejb/tests/regrep/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/regrep/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/regrep/pom.xml b/hyperjaxb/ejb/tests/regrep/pom.xml index 947907e15..8ddc2db05 100644 --- a/hyperjaxb/ejb/tests/regrep/pom.xml +++ b/hyperjaxb/ejb/tests/regrep/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-regrep jar - Hyperjaxb3 EJB Test [regrep] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [regrep] @@ -28,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin @@ -36,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/rim/.gitignore b/hyperjaxb/ejb/tests/rim/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/rim/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/rim/pom.xml b/hyperjaxb/ejb/tests/rim/pom.xml index 9d3259acb..11c55c710 100644 --- a/hyperjaxb/ejb/tests/rim/pom.xml +++ b/hyperjaxb/ejb/tests/rim/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-rim jar - Hyperjaxb3 EJB Test [rim] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [rim] @@ -27,7 +28,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin @@ -39,4 +40,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/sbml/.gitignore b/hyperjaxb/ejb/tests/sbml/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/sbml/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/sbml/pom.xml b/hyperjaxb/ejb/tests/sbml/pom.xml index 2d67e8a21..11b91f4c9 100644 --- a/hyperjaxb/ejb/tests/sbml/pom.xml +++ b/hyperjaxb/ejb/tests/sbml/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-sbml jar - Hyperjaxb3 EJB Test [sbml] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [sbml] @@ -27,7 +28,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.tests.sbml.tests.RoundtripTest @@ -35,4 +36,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/sbml/src/main/resources/binding.xjb b/hyperjaxb/ejb/tests/sbml/src/main/resources/binding.xjb index a8a3b5e78..0f4b65e3d 100644 --- a/hyperjaxb/ejb/tests/sbml/src/main/resources/binding.xjb +++ b/hyperjaxb/ejb/tests/sbml/src/main/resources/binding.xjb @@ -1,7 +1,7 @@ diff --git a/hyperjaxb/ejb/tests/sbml/src/test/resources/log4j.properties b/hyperjaxb/ejb/tests/sbml/src/test/resources/log4j.properties index 4adaeee7c..9faa07e72 100644 --- a/hyperjaxb/ejb/tests/sbml/src/test/resources/log4j.properties +++ b/hyperjaxb/ejb/tests/sbml/src/test/resources/log4j.properties @@ -5,4 +5,4 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%m%n %c%n%n log4j.logger.org.apache.commons.digester=INFO log4j.logger.org.jvnet.hyperjaxb3=DEBUG -log4j.logger.org.hibernate=WARN \ No newline at end of file +log4j.logger.org.hibernate=DEBUG \ No newline at end of file diff --git a/hyperjaxb/ejb/tests/sepa/.gitignore b/hyperjaxb/ejb/tests/sepa/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/sepa/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/sepa/pom.xml b/hyperjaxb/ejb/tests/sepa/pom.xml index 149098682..140ffeb67 100644 --- a/hyperjaxb/ejb/tests/sepa/pom.xml +++ b/hyperjaxb/ejb/tests/sepa/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-sepa jar - Hyperjaxb3 EJB Test [sepa] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [sepa] @@ -28,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.sepa.RoundtripTest @@ -36,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/service/.gitignore b/hyperjaxb/ejb/tests/service/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/service/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/service/pom.xml b/hyperjaxb/ejb/tests/service/pom.xml index 09676cc3a..c092c6fdc 100644 --- a/hyperjaxb/ejb/tests/service/pom.xml +++ b/hyperjaxb/ejb/tests/service/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-service jar - Hyperjaxb3 EJB Test [service] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [service] @@ -27,7 +28,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.tests.service.tests.RoundtripTest @@ -35,4 +36,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/simple/.gitignore b/hyperjaxb/ejb/tests/simple/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/simple/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/simple/pom.xml b/hyperjaxb/ejb/tests/simple/pom.xml index 4b1f10461..a30278a81 100644 --- a/hyperjaxb/ejb/tests/simple/pom.xml +++ b/hyperjaxb/ejb/tests/simple/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-simple jar - Hyperjaxb3 EJB Test [simple] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [simple] @@ -27,7 +28,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.tests.simple.tests.RoundtripTest @@ -35,4 +36,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/sml/.gitignore b/hyperjaxb/ejb/tests/sml/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/sml/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/sml/pom.xml b/hyperjaxb/ejb/tests/sml/pom.xml index d48b8f68c..0e7ced791 100644 --- a/hyperjaxb/ejb/tests/sml/pom.xml +++ b/hyperjaxb/ejb/tests/sml/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-sml jar - Hyperjaxb3 EJB Test [sml] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [sml] @@ -27,7 +28,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin @@ -38,4 +39,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/st/.gitignore b/hyperjaxb/ejb/tests/st/.gitignore deleted file mode 100644 index f0e688f3f..000000000 --- a/hyperjaxb/ejb/tests/st/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -.project -.classpath diff --git a/hyperjaxb/ejb/tests/st/pom.xml b/hyperjaxb/ejb/tests/st/pom.xml index d832cf074..258124c2a 100644 --- a/hyperjaxb/ejb/tests/st/pom.xml +++ b/hyperjaxb/ejb/tests/st/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-st jar - Hyperjaxb3 EJB Test [st] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [st] @@ -28,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin @@ -37,4 +38,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/star/pom.xml b/hyperjaxb/ejb/tests/star/pom.xml index e4f0cf88a..4a7d5f765 100644 --- a/hyperjaxb/ejb/tests/star/pom.xml +++ b/hyperjaxb/ejb/tests/star/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-star jar - Hyperjaxb3 EJB Test [star] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [star] @@ -21,7 +22,6 @@ org.apache.derby derby - 10.2.2.0 test @@ -39,7 +39,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin @@ -52,4 +52,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/tp/.gitignore b/hyperjaxb/ejb/tests/tp/.gitignore deleted file mode 100644 index f0e688f3f..000000000 --- a/hyperjaxb/ejb/tests/tp/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target -.project -.classpath diff --git a/hyperjaxb/ejb/tests/tp/pom.xml b/hyperjaxb/ejb/tests/tp/pom.xml index 49988c78d..c10c800c9 100644 --- a/hyperjaxb/ejb/tests/tp/pom.xml +++ b/hyperjaxb/ejb/tests/tp/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-tp jar - Hyperjaxb3 EJB Test [tp] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [tp] @@ -28,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.tp.RoundtripTest @@ -37,4 +38,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/transient-ids/.gitignore b/hyperjaxb/ejb/tests/transient-ids/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/transient-ids/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/transient-ids/pom.xml b/hyperjaxb/ejb/tests/transient-ids/pom.xml index 92654ccec..6f36efd87 100644 --- a/hyperjaxb/ejb/tests/transient-ids/pom.xml +++ b/hyperjaxb/ejb/tests/transient-ids/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-transient-ids jar - Hyperjaxb3 EJB Test [transient-ids] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [transient-ids] @@ -28,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.transientids.RoundtripTest @@ -36,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/uniprot/.gitignore b/hyperjaxb/ejb/tests/uniprot/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/uniprot/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/uniprot/pom.xml b/hyperjaxb/ejb/tests/uniprot/pom.xml index 3cabc6fb1..20010cf65 100644 --- a/hyperjaxb/ejb/tests/uniprot/pom.xml +++ b/hyperjaxb/ejb/tests/uniprot/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-uniprot jar - Hyperjaxb3 EJB Test [uniprot] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [uniprot] @@ -28,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.uniprot.RoundtripTest @@ -36,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/verylong/pom.xml b/hyperjaxb/ejb/tests/verylong/pom.xml index 2b2dacde6..7fe9e7e91 100644 --- a/hyperjaxb/ejb/tests/verylong/pom.xml +++ b/hyperjaxb/ejb/tests/verylong/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-verylong jar - Hyperjaxb3 EJB Test [verylong] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [verylong] @@ -27,7 +28,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.verylong.RoundtripTest @@ -35,4 +36,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/web/.gitignore b/hyperjaxb/ejb/tests/web/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/web/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/web/pom.xml b/hyperjaxb/ejb/tests/web/pom.xml index 2d1815d33..6c32c15f6 100644 --- a/hyperjaxb/ejb/tests/web/pom.xml +++ b/hyperjaxb/ejb/tests/web/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-web jar - Hyperjaxb3 EJB Test [web] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [web] @@ -27,7 +28,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin @@ -38,4 +39,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/xacml/.gitignore b/hyperjaxb/ejb/tests/xacml/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/xacml/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/xacml/pom.xml b/hyperjaxb/ejb/tests/xacml/pom.xml index ebae68eb8..680485637 100644 --- a/hyperjaxb/ejb/tests/xacml/pom.xml +++ b/hyperjaxb/ejb/tests/xacml/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-xacml jar - Hyperjaxb3 EJB Test [xacml] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [xacml] @@ -27,7 +28,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.tests.xacml.tests.RoundtripTest @@ -35,4 +36,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tests/xmldsig/.gitignore b/hyperjaxb/ejb/tests/xmldsig/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/ejb/tests/xmldsig/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/ejb/tests/xmldsig/pom.xml b/hyperjaxb/ejb/tests/xmldsig/pom.xml index ca5983be7..34b289abe 100644 --- a/hyperjaxb/ejb/tests/xmldsig/pom.xml +++ b/hyperjaxb/ejb/tests/xmldsig/pom.xml @@ -3,13 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tests - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml hyperjaxb3-ejb-tests-xmldsig jar - Hyperjaxb3 EJB Test [xmldsig] + JAXB Tools :: Hyperjaxb3 :: EJB :: Test [xmldsig] @@ -28,7 +29,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin org.jvnet.hyperjaxb3.ejb.tests.xmldsig.RoundtripTest @@ -36,4 +37,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/ejb/tutorials/po/pom.xml b/hyperjaxb/ejb/tutorials/po/pom.xml index 10e92f294..b9c15df32 100644 --- a/hyperjaxb/ejb/tutorials/po/pom.xml +++ b/hyperjaxb/ejb/tutorials/po/pom.xml @@ -1,15 +1,17 @@ - 4.0.0 - hyperjaxb3-ejb-tutorials-po - pom - Hyperjaxb3 EJB Tutorial [po] - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tutorials - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-ejb-tutorials-po + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Tutorials [po] + step-one step-two diff --git a/hyperjaxb/ejb/tutorials/po/step-one/.gitignore b/hyperjaxb/ejb/tutorials/po/step-one/.gitignore deleted file mode 100644 index 781ec63d3..000000000 --- a/hyperjaxb/ejb/tutorials/po/step-one/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -target -target-eclipse -.settings -.classpath -.project diff --git a/hyperjaxb/ejb/tutorials/po/step-one/pom.xml b/hyperjaxb/ejb/tutorials/po/step-one/pom.xml index de5598ba1..14c465056 100644 --- a/hyperjaxb/ejb/tutorials/po/step-one/pom.xml +++ b/hyperjaxb/ejb/tutorials/po/step-one/pom.xml @@ -1,26 +1,29 @@ - 4.0.0 - hyperjaxb3-ejb-tutorials-po-step-one - jar - Hyperjaxb3 EJB Tutorial [po:step-one] + - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tutorials-po - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-ejb-tutorials-po-step-one + jar + JAXB Tools :: Hyperjaxb3 :: EJB :: Tutorials [po:step-one] + - org.hibernate.javax.persistence - hibernate-jpa-2.1-api + javax.persistence + javax.persistence-api org.glassfish.jaxb jaxb-runtime - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-runtime @@ -36,6 +39,11 @@ hibernate-entitymanager test + + org.jvnet.jaxb + jaxb2-basics-testing + test + org.slf4j slf4j-log4j12 @@ -52,7 +60,7 @@ install - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin ${project.version} @@ -66,14 +74,6 @@ true - - true - maven-compiler-plugin - - 1.6 - 1.6 - - diff --git a/hyperjaxb/ejb/tutorials/po/step-one/src/main/resources/po.xsd b/hyperjaxb/ejb/tutorials/po/step-one/src/main/resources/po.xsd index 2aba6c572..ccd34592c 100644 --- a/hyperjaxb/ejb/tutorials/po/step-one/src/main/resources/po.xsd +++ b/hyperjaxb/ejb/tutorials/po/step-one/src/main/resources/po.xsd @@ -27,7 +27,13 @@ - + + + + + + + @@ -45,7 +51,13 @@ - + + + + + + + diff --git a/hyperjaxb/ejb/tutorials/po/step-one/src/test/java/org/jvnet/hyperjaxb3/ejb/tutorials/po/stepone/HsqlBigDecimalTest.java b/hyperjaxb/ejb/tutorials/po/step-one/src/test/java/org/jvnet/hyperjaxb3/ejb/tutorials/po/stepone/HsqlBigDecimalTest.java index 340600eb0..ebe7b9671 100644 --- a/hyperjaxb/ejb/tutorials/po/step-one/src/test/java/org/jvnet/hyperjaxb3/ejb/tutorials/po/stepone/HsqlBigDecimalTest.java +++ b/hyperjaxb/ejb/tutorials/po/step-one/src/test/java/org/jvnet/hyperjaxb3/ejb/tutorials/po/stepone/HsqlBigDecimalTest.java @@ -31,7 +31,9 @@ public void test() throws Exception { ResultSet rs = stmt.executeQuery("SELECT * FROM test"); while (rs.next()) { - Assert.assertEquals(BigDecimal.ONE, rs.getBigDecimal(1)); + BigDecimal result = rs.getBigDecimal(1); + Assert.assertTrue(BigDecimal.ONE.compareTo(result) == 0); + Assert.assertEquals(BigDecimal.ONE, result.setScale(0)); } rs.close(); diff --git a/hyperjaxb/ejb/tutorials/po/step-one/src/test/java/org/jvnet/hyperjaxb3/ejb/tutorials/po/stepone/JAXBAndJPATest.java b/hyperjaxb/ejb/tutorials/po/step-one/src/test/java/org/jvnet/hyperjaxb3/ejb/tutorials/po/stepone/JAXBAndJPATest.java index d755d33a3..976803369 100644 --- a/hyperjaxb/ejb/tutorials/po/step-one/src/test/java/org/jvnet/hyperjaxb3/ejb/tutorials/po/stepone/JAXBAndJPATest.java +++ b/hyperjaxb/ejb/tutorials/po/step-one/src/test/java/org/jvnet/hyperjaxb3/ejb/tutorials/po/stepone/JAXBAndJPATest.java @@ -19,6 +19,8 @@ import javax.xml.transform.dom.DOMResult; import junit.framework.TestCase; +import org.junit.Assert; +import org.jvnet.jaxb2_commons.lang.ExtendedJAXBEqualsStrategy; public class JAXBAndJPATest extends TestCase { @@ -76,7 +78,8 @@ public void testRoundtrip() throws JAXBException { .createEntityManager(); final PurchaseOrderType beta = loadManager.find( PurchaseOrderType.class, id); - assertEquals("Objects are not equal.", alpha, beta); + // Using not default equals strategy since BigDecimal has errors in equals strict equality + Assert.assertTrue("Objects are not equal.", alpha.equals(null, null, beta, ExtendedJAXBEqualsStrategy.INSTANCE2)); final Marshaller marshaller = context.createMarshaller(); marshaller.marshal(objectFactory.createPurchaseOrder(beta), System.out); diff --git a/hyperjaxb/ejb/tutorials/po/step-three/.gitignore b/hyperjaxb/ejb/tutorials/po/step-three/.gitignore deleted file mode 100644 index 781ec63d3..000000000 --- a/hyperjaxb/ejb/tutorials/po/step-three/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -target -target-eclipse -.settings -.classpath -.project diff --git a/hyperjaxb/ejb/tutorials/po/step-three/pom.xml b/hyperjaxb/ejb/tutorials/po/step-three/pom.xml index ccad56b04..26f9483bc 100644 --- a/hyperjaxb/ejb/tutorials/po/step-three/pom.xml +++ b/hyperjaxb/ejb/tutorials/po/step-three/pom.xml @@ -1,15 +1,17 @@ - 4.0.0 - hyperjaxb3-ejb-tutorials-po-step-three - jar - Hyperjaxb3 EJB Tutorial [po:step-three] - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tutorials-po - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-ejb-tutorials-po-step-three + jar + JAXB Tools :: Hyperjaxb3 :: EJB :: Tutorials [po:step-three] + javax.persistence @@ -20,7 +22,7 @@ jaxb-runtime - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-runtime @@ -32,7 +34,7 @@ - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-roundtrip @@ -59,7 +61,7 @@ install - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin ${project.version} @@ -74,14 +76,6 @@ org.jvnet.hyperjaxb3.ejb.tutorials.po.stepthree.RoundtripTest - - true - maven-compiler-plugin - - 1.5 - 1.5 - - diff --git a/hyperjaxb/ejb/tutorials/po/step-two/.gitignore b/hyperjaxb/ejb/tutorials/po/step-two/.gitignore deleted file mode 100644 index b52588d91..000000000 --- a/hyperjaxb/ejb/tutorials/po/step-two/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -target -target-eclipse -.settings -.classpath -.project \ No newline at end of file diff --git a/hyperjaxb/ejb/tutorials/po/step-two/pom.xml b/hyperjaxb/ejb/tutorials/po/step-two/pom.xml index 9bd98bd4b..03a123964 100644 --- a/hyperjaxb/ejb/tutorials/po/step-two/pom.xml +++ b/hyperjaxb/ejb/tutorials/po/step-two/pom.xml @@ -1,26 +1,28 @@ - 4.0.0 - hyperjaxb3-ejb-tutorials-po-step-two - jar - Hyperjaxb3 EJB Tutorial [po:step-two] - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-tutorials-po - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-ejb-tutorials-po-step-two + jar + JAXB Tools :: Hyperjaxb3 :: EJB :: Tutorials [po:step-two] + - org.hibernate.javax.persistence - hibernate-jpa-2.1-api + javax.persistence + javax.persistence-api org.glassfish.jaxb jaxb-runtime - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-runtime @@ -32,7 +34,7 @@ - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-roundtrip @@ -59,7 +61,7 @@ install - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin ${project.version} @@ -76,14 +78,6 @@ org.jvnet.hyperjaxb3.ejb.tutorials.po.steptwo.RoundtripTest - - true - maven-compiler-plugin - - 1.5 - 1.5 - - diff --git a/hyperjaxb/ejb/tutorials/pom.xml b/hyperjaxb/ejb/tutorials/pom.xml index f9ab8472f..971a91104 100644 --- a/hyperjaxb/ejb/tutorials/pom.xml +++ b/hyperjaxb/ejb/tutorials/pom.xml @@ -1,27 +1,31 @@ - 4.0.0 - hyperjaxb3-ejb-tutorials - pom - Hyperjaxb3 EJB Tutorials - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-ejb-tutorials + pom + JAXB Tools :: Hyperjaxb3 :: EJB :: Tutorials + po - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + - \ No newline at end of file + diff --git a/hyperjaxb/maven/plugin/.classpath b/hyperjaxb/maven/plugin/.classpath deleted file mode 100644 index ebe4c830b..000000000 --- a/hyperjaxb/maven/plugin/.classpath +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hyperjaxb/maven/plugin/.gitignore b/hyperjaxb/maven/plugin/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/maven/plugin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/maven/plugin/.project b/hyperjaxb/maven/plugin/.project deleted file mode 100644 index e3bf2d0ed..000000000 --- a/hyperjaxb/maven/plugin/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - hyperjaxb3-maven-plugin - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/hyperjaxb/maven/plugin/.settings/org.eclipse.core.resources.prefs b/hyperjaxb/maven/plugin/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 29abf9995..000000000 --- a/hyperjaxb/maven/plugin/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -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/=UTF-8 diff --git a/hyperjaxb/maven/plugin/.settings/org.eclipse.jdt.core.prefs b/hyperjaxb/maven/plugin/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 60105c1b9..000000000 --- a/hyperjaxb/maven/plugin/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hyperjaxb/maven/plugin/.settings/org.eclipse.m2e.core.prefs b/hyperjaxb/maven/plugin/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/hyperjaxb/maven/plugin/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hyperjaxb/maven/plugin/pom.xml b/hyperjaxb/maven/plugin/pom.xml index ad1228001..200083c19 100644 --- a/hyperjaxb/maven/plugin/pom.xml +++ b/hyperjaxb/maven/plugin/pom.xml @@ -1,34 +1,35 @@ - 4.0.0 - org.jvnet.hyperjaxb3 - hyperjaxb3-maven-plugin - maven-plugin - Hyperjaxb3 Maven Plugin - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT ../pom.xml + hyperjaxb3-maven-plugin + maven-plugin + JAXB Tools :: Hyperjaxb3 :: Maven :: Plugin + - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-plugin - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.apache.maven maven-artifact ${maven.version} + provided - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing test @@ -44,14 +45,6 @@ org.apache.maven.plugins maven-plugin-plugin - - true - maven-compiler-plugin - - 1.6 - 1.6 - - @@ -62,4 +55,4 @@ - \ No newline at end of file + diff --git a/hyperjaxb/maven/plugin/src/main/java/org/jvnet/hyperjaxb3/maven2/Hyperjaxb3Mojo.java b/hyperjaxb/maven/plugin/src/main/java/org/jvnet/hyperjaxb3/maven2/Hyperjaxb3Mojo.java index 89ecd3a9a..c2a190194 100644 --- a/hyperjaxb/maven/plugin/src/main/java/org/jvnet/hyperjaxb3/maven2/Hyperjaxb3Mojo.java +++ b/hyperjaxb/maven/plugin/src/main/java/org/jvnet/hyperjaxb3/maven2/Hyperjaxb3Mojo.java @@ -36,9 +36,9 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; -import org.jvnet.mjiip.v_2.XJC2Mojo; import com.sun.tools.xjc.Options; +import org.jvnet.jaxb.maven.XJC2Mojo; @Mojo(name = "generate", defaultPhase = LifecyclePhase.GENERATE_SOURCES, requiresDependencyResolution = ResolutionScope.COMPILE, threadSafe = true) public class Hyperjaxb3Mojo extends XJC2Mojo { diff --git a/hyperjaxb/maven/plugin/src/test/java/org/jvnet/hyperjaxb3/maven2/tests/Hyperjaxb3MojoTest.java b/hyperjaxb/maven/plugin/src/test/java/org/jvnet/hyperjaxb3/maven2/tests/Hyperjaxb3MojoTest.java index ebe68ca32..ebff15844 100644 --- a/hyperjaxb/maven/plugin/src/test/java/org/jvnet/hyperjaxb3/maven2/tests/Hyperjaxb3MojoTest.java +++ b/hyperjaxb/maven/plugin/src/test/java/org/jvnet/hyperjaxb3/maven2/tests/Hyperjaxb3MojoTest.java @@ -4,8 +4,8 @@ import org.apache.maven.project.MavenProject; import org.jvnet.hyperjaxb3.maven2.Hyperjaxb3Mojo; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; public class Hyperjaxb3MojoTest extends RunXJC2Mojo { diff --git a/hyperjaxb/maven/pom.xml b/hyperjaxb/maven/pom.xml index fc3861e92..334e8764c 100644 --- a/hyperjaxb/maven/pom.xml +++ b/hyperjaxb/maven/pom.xml @@ -1,16 +1,17 @@ - 4.0.0 - org.jvnet.hyperjaxb3 - hyperjaxb3-maven - pom - Hyperjaxb3 Maven - org.jvnet.hyperjaxb3 - hyperjaxb3 - 0.6.3-SNAPSHOT + org.jvnet.jaxb + hyperjaxb3-parent + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-maven + pom + JAXB Tools :: Hyperjaxb3 :: Maven + plugin testing @@ -18,4 +19,4 @@ install - \ No newline at end of file + diff --git a/hyperjaxb/maven/testing/.classpath b/hyperjaxb/maven/testing/.classpath deleted file mode 100644 index 6fb34dac1..000000000 --- a/hyperjaxb/maven/testing/.classpath +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hyperjaxb/maven/testing/.gitignore b/hyperjaxb/maven/testing/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/hyperjaxb/maven/testing/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/hyperjaxb/maven/testing/.project b/hyperjaxb/maven/testing/.project deleted file mode 100644 index d187b75e3..000000000 --- a/hyperjaxb/maven/testing/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - hyperjaxb3-maven-plugin-testing - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/hyperjaxb/maven/testing/.settings/org.eclipse.core.resources.prefs b/hyperjaxb/maven/testing/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index cdfe4f1b6..000000000 --- a/hyperjaxb/maven/testing/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/hyperjaxb/maven/testing/.settings/org.eclipse.jdt.core.prefs b/hyperjaxb/maven/testing/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 60105c1b9..000000000 --- a/hyperjaxb/maven/testing/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hyperjaxb/maven/testing/.settings/org.eclipse.m2e.core.prefs b/hyperjaxb/maven/testing/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/hyperjaxb/maven/testing/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hyperjaxb/maven/testing/pom.xml b/hyperjaxb/maven/testing/pom.xml index 650636e18..5a23a8d59 100644 --- a/hyperjaxb/maven/testing/pom.xml +++ b/hyperjaxb/maven/testing/pom.xml @@ -1,16 +1,17 @@ - 4.0.0 - org.jvnet.hyperjaxb3 - hyperjaxb3-maven-plugin-testing - jar - Hyperjaxb3 Maven Plugin Testing - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven - 0.6.3-SNAPSHOT + 2.0.6-SNAPSHOT + ../pom.xml + hyperjaxb3-maven-plugin-testing + jar + JAXB Tools :: Hyperjaxb3 :: Maven :: Plugin Testing + junit @@ -18,15 +19,15 @@ compile - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-maven-plugin - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing + org.jvnet.jaxb + jaxb-maven-plugin-testing install - \ No newline at end of file + diff --git a/hyperjaxb/maven/testing/src/main/java/org/jvnet/hyperjaxb3/maven2/ejb/test/RunEjbHyperjaxb3Mojo.java b/hyperjaxb/maven/testing/src/main/java/org/jvnet/hyperjaxb3/maven2/ejb/test/RunEjbHyperjaxb3Mojo.java index a08e4efce..4c79f5435 100644 --- a/hyperjaxb/maven/testing/src/main/java/org/jvnet/hyperjaxb3/maven2/ejb/test/RunEjbHyperjaxb3Mojo.java +++ b/hyperjaxb/maven/testing/src/main/java/org/jvnet/hyperjaxb3/maven2/ejb/test/RunEjbHyperjaxb3Mojo.java @@ -2,8 +2,8 @@ import org.apache.maven.project.MavenProject; import org.jvnet.hyperjaxb3.maven2.Hyperjaxb3Mojo; -import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo; -import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo; +import org.jvnet.jaxb.maven.AbstractXJC2Mojo; +import org.jvnet.jaxb.maven.test.RunXJC2Mojo; public class RunEjbHyperjaxb3Mojo extends RunXJC2Mojo { diff --git a/hyperjaxb/misc/dynamic/pom.xml b/hyperjaxb/misc/dynamic/pom.xml index 38e447c6a..8e4b302f6 100644 --- a/hyperjaxb/misc/dynamic/pom.xml +++ b/hyperjaxb/misc/dynamic/pom.xml @@ -2,12 +2,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-dynamic jar Hyperjaxb3 EJB Hibernate - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3 0.5.7-SNAPSHOT @@ -18,7 +18,7 @@ test - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-plugin @@ -44,14 +44,6 @@ install - - true - maven-compiler-plugin - - 1.6 - 1.6 - - - - - - BSD-Style License - http://www.opensource.org/licenses/bsd-license.php - repo - - - - scm:git:git@github.com:highsource/hyperjaxb3.git - scm:git:git@github.com:highsource/hyperjaxb3.git - https://github.com/highsource/hyperjaxb3 - + ejb maven - 2.0.9 - 1.0.1 - 0.10.0 - 0.13.1 - 2.2.11 - 2.1 - 3.5 - 1.0.2 2.3.3 + 10.14.2.0 1.0.0.Final 1.0.0.Final - 4.1.7.Final + 2.2 + 5.4.33.Final @@ -86,182 +39,11 @@ dist - - java-home-parent-lib-tools-jar - - false - - ${java.home}/../lib/tools.jar - - - - - - - maven-antrun-plugin - - - sun.jdk - tools - 1.5.0 - system - ${java.home}/../lib/tools.jar - - - junit - junit - 4.8.1 - runtime - - - ant - ant-optional - 1.5.3-1 - - - - - - - - - java-home-parent-classes-classes-jar - - false - - ${java.home}/../Classes/classes.jar - - - - - - - maven-antrun-plugin - - - sun.jdk - tools - 1.5.0 - system - ${java.home}/../Classes/classes.jar - - - junit - junit - 4.8.1 - runtime - - - ant - ant-optional - 1.5.3-1 - - - - - - - - install - + org.apache.maven.plugins maven-plugin-plugin @@ -311,16 +93,8 @@ 2.0.0 - + --> - @@ -331,159 +105,6 @@ - - org.jvnet.jaxb2_commons - jaxb2-basics-runtime - ${jaxb2-basics.version} - - - org.jvnet.jaxb2_commons - jaxb2-basics-testing - ${jaxb2-basics.version} - - - org.jvnet.jaxb2_commons - jaxb2-basics-tools - ${jaxb2-basics.version} - - - org.jvnet.jaxb2_commons - jaxb2-basics - ${jaxb2-basics.version} - - - org.jvnet.jaxb2_commons - jaxb2-basics-annotate - ${jaxb2-basics-annotate.version} - - - org.jvnet.jaxb2_commons - jaxb2-basics-ant - ${jaxb2-basics.version} - - - - org.jvnet.hyperjaxb3 - hyperjaxb3-maven-plugin - ${project.version} - - - org.jvnet.hyperjaxb3 - hyperjaxb3-maven-plugin-testing - ${project.version} - - - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-roundtrip - ${project.version} - - - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-runtime - ${project.version} - - - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-schemas - ${project.version} - - - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-schemas-persistence - ${project.version} - - - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-schemas-customizations - ${project.version} - - - org.jvnet.hyperjaxb3 - hyperjaxb3-ejb-plugin - ${project.version} - - - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - ${maven-jaxb2-plugin.version} - - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-core - ${maven-jaxb2-plugin.version} - - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin-testing - ${maven-jaxb2-plugin.version} - - - - javax.xml.bind - jaxb-api - ${jaxb.version} - - - org.glassfish.jaxb - jaxb-runtime - ${jaxb.version} - - - org.glassfish.jaxb - jaxb-core - ${jaxb.version} - - - org.glassfish.jaxb - jaxb-xjc - ${jaxb.version} - - - - junit - junit - 4.8.1 - - - - org.apache.commons - commons-lang3 - 3.2.1 - - - commons-beanutils - commons-beanutils - 1.9.4 - - - commons-io - commons-io - 1.2 - - - commons-logging - commons-logging - 1.1.1 - - - log4j - log4j - - - logkit - logkit - - - avalon-framework - avalon-framework - - - javax.servlet - servlet-api - - - net.sourceforge.collections collections-generic @@ -493,23 +114,28 @@ log4j log4j - 1.2.14 + 1.2.17 org.slf4j slf4j-api - 1.6.1 + 1.7.36 org.slf4j slf4j-nop - 1.6.1 + 1.7.36 org.slf4j slf4j-log4j12 - 1.6.1 + 1.7.36 + + + commons-logging + commons-logging + 1.2 @@ -517,25 +143,7 @@ hibernate-entitymanager ${hibernate-entitymanager.version} - + javax.persistence @@ -553,9 +161,9 @@ ${hibernate-jpa-2.1-api.version} - javax.transaction - jta - 1.1 + javax.persistence + javax.persistence-api + ${jpa-api.version} @@ -569,18 +177,18 @@ toplink-essentials 2.1-60f - - - org.springframework - spring - 2.0.7 - org.hsqldb hsqldb ${hsqldb.version} + + + org.apache.derby + derby + ${derby.version} + net.sf.saxon @@ -592,35 +200,6 @@ saxon-dom 8.7 - - - xmlunit - xmlunit - 1.0 - - - - org.jvnet.annox - annox - ${annox.version} - - - org.apache.maven - maven-artifact - ${maven.version} - - - org.apache.maven.plugin-testing - maven-plugin-testing-tools - ${maven.plugin.testing.version} - test - - - org.apache.maven.plugin-testing - maven-plugin-testing-harness - ${maven.plugin.testing.version} - test - - \ No newline at end of file + diff --git a/jaxb-annotate-parent/samples/annotate/project-pom.xml b/jaxb-annotate-parent/samples/annotate/project-pom.xml index 5d554163e..a92a7151d 100644 --- a/jaxb-annotate-parent/samples/annotate/project-pom.xml +++ b/jaxb-annotate-parent/samples/annotate/project-pom.xml @@ -47,7 +47,7 @@ org.hibernate hibernate-search - 4.1.1.Final + ${hibernate-search.version} provided @@ -82,7 +82,7 @@ org.hibernate hibernate-search - 4.1.1.Final + ${hibernate-search.version} diff --git a/jaxb-annox-parent/jaxb-annox/META-INF/MANIFEST.MF b/jaxb-annox-parent/jaxb-annox/META-INF/MANIFEST.MF index b480bec8b..dd1778d8b 100644 --- a/jaxb-annox-parent/jaxb-annox/META-INF/MANIFEST.MF +++ b/jaxb-annox-parent/jaxb-annox/META-INF/MANIFEST.MF @@ -1,31 +1,31 @@ -Manifest-Version: 1.0 -Bnd-LastModified: 1693257226836 -Build-Jdk: 1.8.0_311 -Built-By: lschoelens -Bundle-Description: JAXB Annox is a part of JAXB Tools project which imp - lements support for reading and writing XML annotations. -Bundle-License: https://github.com/highsource/jaxb-tools/blob/master/LIC - ENSE -Bundle-ManifestVersion: 2 -Bundle-Name: JAXB Tools :: JAXB Annox -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-SymbolicName: org.jvnet.jaxb.annox -Bundle-Version: 2.0.5.SNAPSHOT -Created-By: Apache Maven Bundle Plugin -Export-Package: org.jvnet.jaxb.annox;version="2.0.5.SNAPSHOT",org.jvnet. - jaxb.annox.annotation;version="2.0.5.SNAPSHOT",org.jvnet.jaxb.annox.io; - version="2.0.5.SNAPSHOT",org.jvnet.jaxb.annox.model;uses:="org.jvnet.ja - xb.annox.reflect";version="2.0.5.SNAPSHOT",org.jvnet.jaxb.annox.parser; - uses:="org.jvnet.jaxb.annox.annotation,org.jvnet.jaxb.annox.model";vers - ion="2.0.5.SNAPSHOT",org.jvnet.jaxb.annox.reader;uses:="org.jvnet.jaxb. - annox.model,org.jvnet.jaxb.annox.reflect";version="2.0.5.SNAPSHOT",org. - jvnet.jaxb.annox.reader.resourced;uses:="org.jvnet.jaxb.annox.model,org - .jvnet.jaxb.annox.parser,org.jvnet.jaxb.annox.reader,org.jvnet.jaxb.ann - ox.reflect";version="2.0.5.SNAPSHOT",org.jvnet.jaxb.annox.reflect;uses: - ="org.jvnet.jaxb.annox.reader";version="2.0.5.SNAPSHOT",org.jvnet.jaxb. - annox.util;version="2.0.5.SNAPSHOT",org.jvnet.jaxb.annox.xml.bind;uses: - ="org.jvnet.jaxb.annox.reflect";version="2.0.5.SNAPSHOT" -Import-Package: org.apache.commons.lang3;version="3.12.0",org.apache.com - mons.lang3.builder;version="3.12.0" -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))" -Tool: Bnd-3.5.0.201709291849 +Manifest-Version: 1.0 +Bnd-LastModified: 1693302731978 +Build-Jdk: 17.0.2 +Built-By: lschoelens +Bundle-Description: JAXB Annox is a part of JAXB Tools project which imp + lements support for reading and writing XML annotations. +Bundle-License: https://github.com/highsource/jaxb-tools/blob/master/LIC + ENSE +Bundle-ManifestVersion: 2 +Bundle-Name: JAXB Tools :: JAXB Annox +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-SymbolicName: org.jvnet.jaxb.annox +Bundle-Version: 2.0.6.SNAPSHOT +Created-By: Apache Maven Bundle Plugin +Export-Package: org.jvnet.jaxb.annox;version="2.0.6.SNAPSHOT",org.jvnet. + jaxb.annox.annotation;version="2.0.6.SNAPSHOT",org.jvnet.jaxb.annox.io; + version="2.0.6.SNAPSHOT",org.jvnet.jaxb.annox.model;uses:="org.jvnet.ja + xb.annox.reflect";version="2.0.6.SNAPSHOT",org.jvnet.jaxb.annox.parser; + uses:="org.jvnet.jaxb.annox.annotation,org.jvnet.jaxb.annox.model";vers + ion="2.0.6.SNAPSHOT",org.jvnet.jaxb.annox.reader;uses:="org.jvnet.jaxb. + annox.model,org.jvnet.jaxb.annox.reflect";version="2.0.6.SNAPSHOT",org. + jvnet.jaxb.annox.reader.resourced;uses:="org.jvnet.jaxb.annox.model,org + .jvnet.jaxb.annox.parser,org.jvnet.jaxb.annox.reader,org.jvnet.jaxb.ann + ox.reflect";version="2.0.6.SNAPSHOT",org.jvnet.jaxb.annox.reflect;uses: + ="org.jvnet.jaxb.annox.reader";version="2.0.6.SNAPSHOT",org.jvnet.jaxb. + annox.util;version="2.0.6.SNAPSHOT",org.jvnet.jaxb.annox.xml.bind;uses: + ="org.jvnet.jaxb.annox.reflect";version="2.0.6.SNAPSHOT" +Import-Package: org.apache.commons.lang3;version="3.12.0",org.apache.com + mons.lang3.builder;version="3.12.0" +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))" +Tool: Bnd-3.5.0.201709291849 diff --git a/maven-plugin/plugin/src/test/resources/test-pom.xml b/maven-plugin/plugin/src/test/resources/test-pom.xml index 93942e9a2..7510c3d2f 100644 --- a/maven-plugin/plugin/src/test/resources/test-pom.xml +++ b/maven-plugin/plugin/src/test/resources/test-pom.xml @@ -1,6 +1,6 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.jvnet.jaxb2_commons samples-basic-maven @@ -9,14 +9,12 @@ JAXB2 Commons Samples - Basic Maven - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics - 0.6.0 - org.jvnet.jaxb2_commons + org.jvnet.jaxb jaxb2-basics-testing - 0.6.0 test @@ -42,9 +40,8 @@ - org.jvnet.jaxb2_commons - basic - 0.6.0 + org.jvnet.jaxb + jaxb2-basics diff --git a/pom.xml b/pom.xml index 79a427d1a..6b2b15f17 100644 --- a/pom.xml +++ b/pom.xml @@ -55,12 +55,13 @@ jaxb-annox-parent basics maven-plugin + hyperjaxb UTF-8 2.0.9 - + 1.2.2 1.10.12 1.4.5 @@ -75,6 +76,7 @@ 2.11.0 3.12.0 1.10.0 + 4.1.1.Final 2.5 4.13.2 1.7.36 @@ -95,6 +97,7 @@ 2.5.2 3.1.0 3.1.0 + 3.4.0 3.3.2 1.6.8 2.5.3 @@ -103,6 +106,7 @@ 3.7.1 3.0.1 2.21.0 + 2.21.0 3.3.13 0.1.1 @@ -247,7 +251,6 @@ FastInfoset ${fastinfoset.version} - org.glassfish.jaxb @@ -439,7 +442,7 @@ org.hibernate hibernate-search - 4.1.1.Final + ${hibernate-search.version} javax.transaction @@ -535,6 +538,47 @@ ${project.version} + + + org.jvnet.jaxb + hyperjaxb3-maven-plugin + ${project.version} + + + org.jvnet.jaxb + hyperjaxb3-maven-plugin-testing + ${project.version} + + + org.jvnet.jaxb + hyperjaxb3-ejb-roundtrip + ${project.version} + + + org.jvnet.jaxb + hyperjaxb3-ejb-runtime + ${project.version} + + + org.jvnet.jaxb + hyperjaxb3-ejb-schemas + ${project.version} + + + org.jvnet.jaxb + hyperjaxb3-ejb-schemas-persistence + ${project.version} + + + org.jvnet.jaxb + hyperjaxb3-ejb-schemas-customizations + ${project.version} + + + org.jvnet.jaxb + hyperjaxb3-ejb-plugin + ${project.version} + @@ -640,6 +684,10 @@ maven-jar-plugin ${maven-jar-plugin.version} + + maven-war-plugin + ${maven-war-plugin.version} + maven-javadoc-plugin ${maven-javadoc-plugin.version} @@ -668,6 +716,10 @@ maven-surefire-plugin ${maven-surefire-plugin.version} + + maven-failsafe-plugin + ${maven-failsafe-plugin.version} + org.apache.felix