diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0')
6 files changed, 38 insertions, 33 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/EclipseLink2_0JpaPlatformProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/EclipseLink2_0JpaPlatformProvider.java index 3d4f8c64e3..0267271fa1 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/EclipseLink2_0JpaPlatformProvider.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/EclipseLink2_0JpaPlatformProvider.java @@ -31,8 +31,6 @@ import org.eclipse.jpt.core.internal.context.java.JavaMappedSuperclassDefinition import org.eclipse.jpt.core.internal.context.java.JavaTransientMappingDefinition; import org.eclipse.jpt.core.internal.context.java.JavaVersionMappingDefinition; import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmXmlDefinition; -import org.eclipse.jpt.core.internal.jpa2.Orm2_0ResourceModelProvider; -import org.eclipse.jpt.core.internal.jpa2.Persistence2_0ResourceModelProvider; import org.eclipse.jpt.core.internal.jpa2.context.orm.GenericOrmXml2_0Definition; import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkOrmResourceModelProvider; import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaEclipseLinkBasicCollectionMappingDefinition; @@ -56,14 +54,14 @@ public class EclipseLink2_0JpaPlatformProvider extends AbstractJpaPlatformProvider { public static final String ID = "eclipselink2_0"; //$NON-NLS-1$ - + // singleton private static final JpaPlatformProvider INSTANCE = new EclipseLink2_0JpaPlatformProvider(); /** - * Return the singleton. + * Return the singleton */ public static JpaPlatformProvider instance() { return INSTANCE; @@ -76,8 +74,8 @@ public class EclipseLink2_0JpaPlatformProvider private EclipseLink2_0JpaPlatformProvider() { super(); } - - + + // ********** resource models ********** @Override @@ -87,9 +85,7 @@ public class EclipseLink2_0JpaPlatformProvider JavaResourceModelProvider.instance(), JarResourceModelProvider.instance(), PersistenceResourceModelProvider.instance(), - Persistence2_0ResourceModelProvider.instance(), OrmResourceModelProvider.instance(), - Orm2_0ResourceModelProvider.instance(), EclipseLinkOrmResourceModelProvider.instance(), EclipseLink1_1OrmResourceModelProvider.instance(), EclipseLink2_0OrmResourceModelProvider.instance()}; diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java index c32e4747cb..c0d6c29c59 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java @@ -23,16 +23,13 @@ import org.eclipse.jpt.core.internal.jpa2.context.orm.GenericOrmAssociationOverr import org.eclipse.jpt.core.internal.jpa2.context.orm.GenericOrmSequenceGenerator2_0; import org.eclipse.jpt.core.internal.jpa2.context.orm.VirtualXmlAssociationOverride2_0; import org.eclipse.jpt.core.jpa2.context.orm.OrmEmbeddedMapping2_0; -import org.eclipse.jpt.core.jpa2.resource.orm.XmlAssociationOverride; -import org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator; +import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride; import org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideContainer; import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmXmlContextNodeFactory; import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded; - public class EclipseLinkOrmXml2_0ContextNodeFactory extends EclipseLinkOrmXmlContextNodeFactory { - @Override public OrmAssociationOverrideContainer buildOrmAssociationOverrideContainer(OrmEmbeddedMapping2_0 parent, Owner owner, XmlAssociationOverrideContainer resourceAssociationOverrideContainer) { return new GenericOrmAssociationOverrideContainer(parent, owner, resourceAssociationOverrideContainer); @@ -40,12 +37,12 @@ public class EclipseLinkOrmXml2_0ContextNodeFactory extends EclipseLinkOrmXmlCon @Override public OrmAssociationOverrideRelationshipReference buildOrmAssociationOverrideRelationshipReference(OrmAssociationOverride parent, org.eclipse.jpt.core.resource.orm.XmlAssociationOverride associationOverride) { - return new GenericOrmAssociationOverrideRelationshipReference2_0(parent, (XmlAssociationOverride) associationOverride); + return new GenericOrmAssociationOverrideRelationshipReference2_0(parent, associationOverride); } @Override public OrmSequenceGenerator buildOrmSequenceGenerator(XmlContextNode parent, org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator resourceSequenceGenerator) { - return new GenericOrmSequenceGenerator2_0(parent, (XmlSequenceGenerator) resourceSequenceGenerator); + return new GenericOrmSequenceGenerator2_0(parent, resourceSequenceGenerator); } //TODO support derived ids in eclipselink orm 2.0 @@ -53,7 +50,7 @@ public class EclipseLinkOrmXml2_0ContextNodeFactory extends EclipseLinkOrmXmlCon // public OrmDerivedId2_0 buildOrmDerivedId(OrmSingleRelationshipMapping2_0 parent, XmlDerivedId resource) { // return new GenericOrmDerivedId2_0(parent, resource); // } - + // ********** ORM Virtual Resource Model ********** @@ -61,10 +58,9 @@ public class EclipseLinkOrmXml2_0ContextNodeFactory extends EclipseLinkOrmXmlCon public XmlEmbedded buildVirtualXmlEmbedded(OrmTypeMapping ormTypeMapping, JavaEmbeddedMapping javaEmbeddedMapping) { return new VirtualEclipseLinkXmlEmbedded2_0(ormTypeMapping, javaEmbeddedMapping); } - + @Override public XmlAssociationOverride buildVirtualXmlAssociationOverride(String name, OrmTypeMapping parent, JoiningStrategy joiningStrategy) { return new VirtualXmlAssociationOverride2_0(name, parent, joiningStrategy); } - } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0Definition.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0Definition.java index 7009449512..ab0688965a 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0Definition.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0Definition.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.jpt.eclipselink.core.internal.v2_0.context.orm; -import org.eclipse.core.runtime.content.IContentType; import org.eclipse.emf.ecore.EFactory; +import org.eclipse.jpt.core.JpaResourceType; import org.eclipse.jpt.core.context.orm.NullOrmAttributeMappingDefinition; import org.eclipse.jpt.core.context.orm.OrmAttributeMappingDefinition; import org.eclipse.jpt.core.context.orm.OrmTypeMappingDefinition; @@ -71,8 +71,8 @@ public class EclipseLinkOrmXml2_0Definition return new EclipseLinkOrmXml2_0ContextNodeFactory(); } - public IContentType getContentType() { - return JptEclipseLinkCorePlugin.ECLIPSELINK2_0_ORM_XML_CONTENT_TYPE; + public JpaResourceType getResourceType() { + return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_2_0_RESOURCE_TYPE; } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLink2_0PersistenceXmlDefinition.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLink2_0PersistenceXmlDefinition.java index 52a908f83f..0bf5bad4bf 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLink2_0PersistenceXmlDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLink2_0PersistenceXmlDefinition.java @@ -9,13 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.eclipselink.core.internal.v2_0.context.persistence; -import org.eclipse.core.runtime.content.IContentType; import org.eclipse.emf.ecore.EFactory; +import org.eclipse.jpt.core.JpaResourceType; import org.eclipse.jpt.core.JptCorePlugin; import org.eclipse.jpt.core.context.persistence.PersistenceXmlContextNodeFactory; import org.eclipse.jpt.core.context.persistence.PersistenceXmlDefinition; import org.eclipse.jpt.core.internal.context.persistence.AbstractPersistenceXmlDefinition; -import org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Factory; +import org.eclipse.jpt.core.resource.persistence.v2_0.PersistenceV2_0Factory; public class EclipseLink2_0PersistenceXmlDefinition extends AbstractPersistenceXmlDefinition @@ -42,7 +42,7 @@ public class EclipseLink2_0PersistenceXmlDefinition public EFactory getResourceNodeFactory() { - return Persistence2_0Factory.eINSTANCE; + return PersistenceV2_0Factory.eINSTANCE; } @Override @@ -50,8 +50,7 @@ public class EclipseLink2_0PersistenceXmlDefinition return new EclipseLink2_0PersistenceXmlContextNodeFactory(); } - public IContentType getContentType() { - return JptCorePlugin.PERSISTENCE2_0_XML_CONTENT_TYPE; + public JpaResourceType getResourceType() { + return JptCorePlugin.PERSISTENCE_XML_2_0_RESOURCE_TYPE; } - } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLinkPersistenceUnit2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLinkPersistenceUnit2_0.java index 7f4f7f293c..83bcbc463c 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLinkPersistenceUnit2_0.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLinkPersistenceUnit2_0.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.eclipselink.core.internal.v2_0.context.persistence; import java.util.Iterator; - import org.eclipse.jpt.core.context.persistence.ClassRef; import org.eclipse.jpt.core.context.persistence.JarFileRef; import org.eclipse.jpt.core.context.persistence.MappingFileRef; @@ -20,7 +19,7 @@ import org.eclipse.jpt.core.jpa2.context.persistence.JarFileRef2_0; import org.eclipse.jpt.core.jpa2.context.persistence.MappingFileRef2_0; import org.eclipse.jpt.core.jpa2.context.persistence.PersistenceUnit2_0; import org.eclipse.jpt.core.jpa2.context.persistence.options.ValidationMode; -import org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnit; +import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit; import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnit; import org.eclipse.jpt.eclipselink.core.internal.v2_0.context.persistence.options.EclipseLinkOptions2_0; import org.eclipse.jpt.eclipselink.core.v2_0.context.persistence.connection.Connection2_0; diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/resource/orm/EclipseLink2_0OrmXmlResourceProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/resource/orm/EclipseLink2_0OrmXmlResourceProvider.java index bb296c3936..6972dd98f9 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/resource/orm/EclipseLink2_0OrmXmlResourceProvider.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/resource/orm/EclipseLink2_0OrmXmlResourceProvider.java @@ -15,14 +15,20 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.jpt.core.JptCorePlugin; +import org.eclipse.jpt.core.internal.operations.OrmFileCreationDataModelProperties; import org.eclipse.jpt.core.resource.AbstractXmlResourceProvider; +import org.eclipse.jpt.core.resource.orm.AccessType; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.jpt.core.resource.orm.XmlEntityMappings; +import org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults; +import org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata; import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin; -import org.eclipse.jpt.eclipselink.core.v2_0.resource.orm.EclipseLink2_0; import org.eclipse.jpt.eclipselink.core.v2_0.resource.orm.EclipseLink2_0OrmFactory; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; public class EclipseLink2_0OrmXmlResourceProvider extends AbstractXmlResourceProvider + implements OrmFileCreationDataModelProperties { /** * (Convenience method) Returns an EclipseLink ORM resource model provider for @@ -67,10 +73,19 @@ public class EclipseLink2_0OrmXmlResourceProvider @Override - protected void populateRoot() { - XmlEntityMappings entityMappings = - EclipseLink2_0OrmFactory.eINSTANCE.createXmlEntityMappings(); - entityMappings.setVersion(EclipseLink2_0.SCHEMA_VERSION); + protected void populateRoot(Object config) { + IDataModel dataModel = (IDataModel) config; + XmlEntityMappings entityMappings = EclipseLink2_0OrmFactory.eINSTANCE.createXmlEntityMappings(); + entityMappings.setVersion(dataModel.getStringProperty(VERSION)); getResourceContents().add(entityMappings); + + AccessType defaultAccess = (AccessType) dataModel.getProperty(DEFAULT_ACCESS); + if (defaultAccess != null) { + XmlPersistenceUnitMetadata puMetadata = EclipseLink2_0OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata(); + entityMappings.setPersistenceUnitMetadata(puMetadata); + XmlPersistenceUnitDefaults puDefaults = OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults(); + puMetadata.setPersistenceUnitDefaults(puDefaults); + puDefaults.setAccess(defaultAccess); + } } } |