diff options
| author | kmoore | 2012-05-02 21:54:30 +0000 |
|---|---|---|
| committer | kmoore | 2012-05-02 21:54:30 +0000 |
| commit | 0828e2f6a4b875fb98666135392a4469f2773fc6 (patch) | |
| tree | 487678ccf8137bfd39fc74b0465ba785de1a1363 /jpa | |
| parent | 84c442586a730e5c0de85dee621b1beeb8b9f668 (diff) | |
| download | webtools.dali-0828e2f6a4b875fb98666135392a4469f2773fc6.tar.gz webtools.dali-0828e2f6a4b875fb98666135392a4469f2773fc6.tar.xz webtools.dali-0828e2f6a4b875fb98666135392a4469f2773fc6.zip | |
378288 - Tolerance for EclipseLink multitenant TABLE_PER_TENANT support
Diffstat (limited to 'jpa')
2 files changed, 4 insertions, 2 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMultitenancyImpl2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMultitenancyImpl2_3.java index adc71a7b7d..68246d4e69 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMultitenancyImpl2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMultitenancyImpl2_3.java @@ -33,6 +33,7 @@ import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; import org.eclipse.jpt.jpa.db.Table; +import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkEntity; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMappedSuperclass; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMultitenantType2_3; @@ -673,7 +674,7 @@ public class JavaEclipseLinkMultitenancyImpl2_3 @Override public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { super.validate(messages, reporter, astRoot); - if (getSpecifiedType() == EclipseLinkMultitenantType2_3.TABLE_PER_TENANT) { + if (getSpecifiedType() == EclipseLinkMultitenantType2_3.TABLE_PER_TENANT && !JptJpaEclipseLinkCorePlugin.nodeIsEclipseLink2_4Compatible(this)) { messages.add( DefaultEclipseLinkJpaValidationMessages.buildMessage( IMessage.NORMAL_SEVERITY, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMultitenancyImpl2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMultitenancyImpl2_3.java index 4e12dff7de..9b298be332 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMultitenancyImpl2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMultitenancyImpl2_3.java @@ -28,6 +28,7 @@ import org.eclipse.jpt.jpa.core.internal.context.NamedColumnTextRangeResolver; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode; import org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping; import org.eclipse.jpt.jpa.db.Table; +import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkEntity; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMappedSuperclass; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMultitenantType2_3; @@ -693,7 +694,7 @@ public class OrmEclipseLinkMultitenancyImpl2_3 @Override public void validate(List<IMessage> messages, IReporter reporter) { super.validate(messages, reporter); - if (getType() == EclipseLinkMultitenantType2_3.TABLE_PER_TENANT) { + if (getType() == EclipseLinkMultitenantType2_3.TABLE_PER_TENANT && !JptJpaEclipseLinkCorePlugin.nodeIsEclipseLink2_4Compatible(this)) { messages.add( DefaultEclipseLinkJpaValidationMessages.buildMessage( IMessage.NORMAL_SEVERITY, |