diff options
author | pfullbright | 2009-02-10 22:58:46 +0000 |
---|---|---|
committer | pfullbright | 2009-02-10 22:58:46 +0000 |
commit | 7d24a95daf00bb9d01064f5a33117297008335c4 (patch) | |
tree | 5a52798502eee927aec4b5b71dcc9568012d7771 /jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse | |
parent | 6db9e6f349350ead7146c2cd7058e94a20d3f5e2 (diff) | |
download | webtools.dali-7d24a95daf00bb9d01064f5a33117297008335c4.tar.gz webtools.dali-7d24a95daf00bb9d01064f5a33117297008335c4.tar.xz webtools.dali-7d24a95daf00bb9d01064f5a33117297008335c4.zip |
Turns out, eclipselink 1.0 actually supports all attribute mappings in embeddables
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse')
5 files changed, 13 insertions, 82 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLink1_1JpaFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLink1_1JpaFactory.java index c9743ac569..012e940e21 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLink1_1JpaFactory.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLink1_1JpaFactory.java @@ -11,18 +11,12 @@ package org.eclipse.jpt.eclipselink.core.internal; import org.eclipse.jpt.core.context.MappingFile; import org.eclipse.jpt.core.context.PersistentType.Owner; -import org.eclipse.jpt.core.context.java.JavaEmbeddable; import org.eclipse.jpt.core.context.java.JavaPersistentType; -import org.eclipse.jpt.core.context.orm.OrmEmbeddable; -import org.eclipse.jpt.core.context.orm.OrmPersistentType; import org.eclipse.jpt.core.context.persistence.MappingFileRef; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.core.resource.xml.JpaXmlResource; import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLink1_1JavaPersistentTypeImpl; import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLink1_1OrmXml; -import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.java.EclipseLinkJavaEmbeddable_1_1; -import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLinkOrmEmbeddable_1_1; -import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddable; public class EclipseLink1_1JpaFactory extends EclipseLinkJpaFactory @@ -48,15 +42,6 @@ public class EclipseLink1_1JpaFactory } - // **************** EclipseLink-specific ORM Context Model ***************** - - - @Override - public OrmEmbeddable buildEclipseLinkOrmEmbeddable(OrmPersistentType type, XmlEmbeddable resourceMapping) { - return new EclipseLinkOrmEmbeddable_1_1(type, resourceMapping); - } - - // **************** Java Context Model ************************************* @Override @@ -64,11 +49,6 @@ public class EclipseLink1_1JpaFactory return new EclipseLink1_1JavaPersistentTypeImpl(owner, jrpt); } - @Override - public JavaEmbeddable buildJavaEmbeddable(JavaPersistentType parent) { - return new EclipseLinkJavaEmbeddable_1_1(parent); - } - // // public EntityMappings buildEclipseLink1_1EntityMappings(EclipseLink1_1OrmXml parent, XmlEntityMappings xmlEntityMappings) { // EclipseLink1_1EntityMappingsImpl entityMappings = new EclipseLink1_1EntityMappingsImpl(parent); diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddableImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddableImpl.java index d3e1c24a66..83d3cd5e2b 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddableImpl.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddableImpl.java @@ -66,7 +66,13 @@ public class EclipseLinkJavaEmbeddableImpl extends GenericJavaEmbeddable impleme //********** Validation ******************************************** - + + @Override + public boolean attributeMappingKeyAllowed(String attributeMappingKey) { + // EclipseLink allows all mapping types within an embeddable + return true; + } + @Override public void validate(List<IMessage> messages, CompilationUnit astRoot) { super.validate(messages, astRoot); diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddableImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddableImpl.java index fd7336c938..41befef90e 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddableImpl.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddableImpl.java @@ -81,6 +81,12 @@ public class EclipseLinkOrmEmbeddableImpl extends GenericOrmEmbeddable // **************** validation ************************************** @Override + public boolean attributeMappingKeyAllowed(String attributeMappingKey) { + // EclipseLink allows all mapping types within an embeddable + return true; + } + + @Override public void validate(List<IMessage> messages) { super.validate(messages); this.customizer.validate(messages); diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/java/EclipseLinkJavaEmbeddable_1_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/java/EclipseLinkJavaEmbeddable_1_1.java deleted file mode 100644 index a4ae97a7ab..0000000000 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/java/EclipseLinkJavaEmbeddable_1_1.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 Oracle. - * All rights reserved. This program and the accompanying materials are - * made available under the terms of the Eclipse Public License v1.0 which - * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - *******************************************************************************/ -package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.java; - -import org.eclipse.jpt.core.context.java.JavaPersistentType; -import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaEmbeddableImpl; - -public class EclipseLinkJavaEmbeddable_1_1 - extends EclipseLinkJavaEmbeddableImpl -{ - public EclipseLinkJavaEmbeddable_1_1(JavaPersistentType parent) { - super(parent); - } - - - @Override - public boolean attributeMappingKeyAllowed(String attributeMappingKey) { - // EclipseLink 1.1 allows all mapping types within an embeddable - return true; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLinkOrmEmbeddable_1_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLinkOrmEmbeddable_1_1.java deleted file mode 100644 index 4e20b07f20..0000000000 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLinkOrmEmbeddable_1_1.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 Oracle. - * All rights reserved. This program and the accompanying materials are - * made available under the terms of the Eclipse Public License v1.0 which - * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - *******************************************************************************/ -package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm; - -import org.eclipse.jpt.core.context.orm.OrmPersistentType; -import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmEmbeddableImpl; -import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddable; - -public class EclipseLinkOrmEmbeddable_1_1 - extends EclipseLinkOrmEmbeddableImpl -{ - - public EclipseLinkOrmEmbeddable_1_1(OrmPersistentType parent, XmlEmbeddable resourceMapping) { - super(parent, resourceMapping); - } - - - @Override - public boolean attributeMappingKeyAllowed(String attributeMappingKey) { - // EclipseLink 1.1 allows all mapping types within an embeddable - return true; - } -} - |