[jbosstools-commits] JBoss Tools SVN: r14789 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core: META-INF and 4 other directories.

Author: vyemialyanchyk Date: 2009-04-17 06:57:20 -0400 (Fri, 17 Apr 2009) New Revision: 14789 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationDefinitionProvider.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatform.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformFactory.java Removed: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateFactory.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationProvider.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernatePlatform.java Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/plugin.xml trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/JPAPostInstallFasetListener.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateJpaProperties.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnitProperties.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitProperties.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitPropertyListListener.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/HibernateBasic.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java Log: JBIDE-4141 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2009-04-17 10:33:53 UTC (rev 14788) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2009-04-17 10:57:20 UTC (rev 14789) @@ -6,12 +6,12 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.wst.validation, - org.hibernate.eclipse.console;bundle-version="3.2.0", - org.hibernate.eclipse;bundle-version="3.2.0", - org.eclipse.jdt.launching;bundle-version="3.4.0", - org.eclipse.debug.core;bundle-version="3.4.0", - org.eclipse.emf.ecore;bundle-version="2.4.0", - org.eclipse.jdt.core;bundle-version="3.4.0", + org.hibernate.eclipse.console, + org.hibernate.eclipse, + org.eclipse.jdt.launching, + org.eclipse.debug.core, + org.eclipse.emf.ecore, + org.eclipse.jdt.core, org.eclipse.wst.common.project.facet.core, org.eclipse.jpt.core, org.eclipse.jpt.utility, Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/plugin.xml =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/plugin.xml 2009-04-17 10:33:53 UTC (rev 14788) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/plugin.xml 2009-04-17 10:57:20 UTC (rev 14789) @@ -1,15 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.2"?> <plugin> - <extension - id="org.jboss.tools.hibernate.jpt.core" - point="org.eclipse.jpt.core.jpaPlatform"> - - <jpaPlatform - class="org.jboss.tools.hibernate.jpt.core.internal.HibernatePlatform" - default="false" - id="hibernate" - label="Hibernate"/> + <extension id="org.jboss.tools.hibernate.jpt.core" + point="org.eclipse.jpt.core.jpaPlatforms"> + <jpaPlatform + factoryClass="org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaPlatformFactory" + default="false" + id="hibernate" + label="Hibernate"> + </jpaPlatform> </extension> <extension point="org.eclipse.wst.common.project.facet.core.listeners"> Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateFactory.java 2009-04-17 10:33:53 UTC (rev 14788) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateFactory.java 2009-04-17 10:57:20 UTC (rev 14789) @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2008 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.hibernate.jpt.core.internal; - -import org.eclipse.jpt.core.context.persistence.Persistence; -import org.eclipse.jpt.core.context.persistence.PersistenceUnit; -import org.eclipse.jpt.core.internal.platform.GenericJpaFactory; -import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersistenceUnit; - - -/** - * @author Dmitry Geraskov - * - */ -public class HibernateFactory extends GenericJpaFactory { - - @Override - public PersistenceUnit buildPersistenceUnit(Persistence parent, XmlPersistenceUnit persistenceUnit) { - return new HibernatePersistenceUnit(parent, persistenceUnit); - } - -} Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationDefinitionProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationDefinitionProvider.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationDefinitionProvider.java 2009-04-17 10:57:20 UTC (rev 14789) @@ -0,0 +1,46 @@ +package org.jboss.tools.hibernate.jpt.core.internal; + +import java.util.List; + +import org.eclipse.jpt.core.JpaAnnotationDefinitionProvider; +import org.eclipse.jpt.core.internal.platform.AbstractJpaAnnotationDefintionProvider; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.GenericGeneratorAnnotationImpl.GenericGeneratorAnnotationDefinition; + +public class HibernateJpaAnnotationDefinitionProvider extends AbstractJpaAnnotationDefintionProvider +{ + // singleton + private static final JpaAnnotationDefinitionProvider INSTANCE = new HibernateJpaAnnotationDefinitionProvider(); + + /** + * Return the singleton. + */ + public static JpaAnnotationDefinitionProvider instance() { + return INSTANCE; + } + + /** + * Ensure single instance. + */ + private HibernateJpaAnnotationDefinitionProvider() { + super(); + } + + @Override + protected void addTypeMappingAnnotationDefinitionsTo(List<AnnotationDefinition> definitions) { + } + + @Override + protected void addTypeSupportingAnnotationDefinitionsTo(List<AnnotationDefinition> definitions) { + definitions.add(GenericGeneratorAnnotationDefinition.instance()); + } + + @Override + protected void addAttributeMappingAnnotationDefinitionsTo(List<AnnotationDefinition> definitions) { + } + + @Override + protected void addAttributeSupportingAnnotationDefinitionsTo(List<AnnotationDefinition> definitions) { + definitions.add(GenericGeneratorAnnotationDefinition.instance()); + } +} Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationProvider.java 2009-04-17 10:33:53 UTC (rev 14788) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationProvider.java 2009-04-17 10:57:20 UTC (rev 14789) @@ -1,123 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2008 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.hibernate.jpt.core.internal; - -import java.util.Collection; -import java.util.List; - -import org.eclipse.jpt.core.internal.platform.GenericJpaAnnotationProvider; -import org.eclipse.jpt.core.internal.resource.java.AssociationOverrideImpl.AssociationOverrideAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.AssociationOverridesImpl.AssociationOverridesAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.AttributeOverrideImpl.AttributeOverrideAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.AttributeOverridesImpl.AttributeOverridesAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.ColumnImpl.ColumnAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.DiscriminatorColumnImpl.DiscriminatorColumnAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.DiscriminatorValueImpl.DiscriminatorValueAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.EnumeratedImpl.EnumeratedAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.GeneratedValueImpl.GeneratedValueAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.IdClassImpl.IdClassAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.InheritanceImpl.InheritanceAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.JoinColumnImpl.JoinColumnAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.JoinColumnsImpl.JoinColumnsAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.JoinTableImpl.JoinTableAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.LobImpl.LobAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.MapKeyImpl.MapKeyAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.NamedNativeQueriesImpl.NamedNativeQueriesAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.NamedNativeQueryImpl.NamedNativeQueryAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.NamedQueriesImpl.NamedQueriesAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.NamedQueryImpl.NamedQueryAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.OrderByImpl.OrderByAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.PrimaryKeyJoinColumnImpl.PrimaryKeyJoinColumnAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.PrimaryKeyJoinColumnsImpl.PrimaryKeyJoinColumnsAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.SecondaryTableImpl.SecondaryTableAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.SecondaryTablesImpl.SecondaryTablesAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.SequenceGeneratorImpl.SequenceGeneratorAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.TableGeneratorImpl.TableGeneratorAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.TableImpl.TableAnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.TemporalImpl.TemporalAnnotationDefinition; -import org.eclipse.jpt.core.resource.java.AnnotationDefinition; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.GenericGeneratorAnnotationImpl.GenericGeneratorAnnotationDefinition; - -/** - * @author Dmitry Geraskov - * - */ -public class HibernateJpaAnnotationProvider extends GenericJpaAnnotationProvider { - - /** - * Method for Dali 2.1 instead of {@link #addTypeAnnotationDefinitionsTo(Collection)} - */ - protected void addTypeSupportingAnnotationDefinitionsTo(List<AnnotationDefinition> definitions){ - addTypeAnnotationDefinitionsTo(definitions); - } - - /** - * Method for Dali 2.0 - */ - protected void addTypeAnnotationDefinitionsTo(Collection<AnnotationDefinition> definitions) { - definitions.add(GenericGeneratorAnnotationDefinition.instance()); - //add Dali's annotation definitions - definitions.add(AssociationOverrideAnnotationDefinition.instance()); - definitions.add(AssociationOverridesAnnotationDefinition.instance()); - definitions.add(AttributeOverrideAnnotationDefinition.instance()); - definitions.add(AttributeOverrideAnnotationDefinition.instance()); - definitions.add(AttributeOverridesAnnotationDefinition.instance()); - definitions.add(DiscriminatorColumnAnnotationDefinition.instance()); - definitions.add(DiscriminatorValueAnnotationDefinition.instance()); - definitions.add(IdClassAnnotationDefinition.instance()); - definitions.add(InheritanceAnnotationDefinition.instance()); - definitions.add(NamedQueryAnnotationDefinition.instance()); - definitions.add(NamedQueriesAnnotationDefinition.instance()); - definitions.add(NamedNativeQueryAnnotationDefinition.instance()); - definitions.add(NamedNativeQueriesAnnotationDefinition.instance()); - definitions.add(PrimaryKeyJoinColumnAnnotationDefinition.instance()); - definitions.add(PrimaryKeyJoinColumnsAnnotationDefinition.instance()); - definitions.add(SecondaryTableAnnotationDefinition.instance()); - definitions.add(SecondaryTablesAnnotationDefinition.instance()); - definitions.add(SequenceGeneratorAnnotationDefinition.instance()); - definitions.add(TableAnnotationDefinition.instance()); - definitions.add(TableGeneratorAnnotationDefinition.instance()); - } - - /** - * Method for Dali 2.1 instead of {@link #addAttributeAnnotationDefinitionsTo(Collection)} - */ - protected void addAttributeSupportingAnnotationDefinitionsTo(List<AnnotationDefinition> definitions) { - addAttributeAnnotationDefinitionsTo(definitions); - } - - /** - * Method for Dali 2.0 - */ - protected void addAttributeAnnotationDefinitionsTo(Collection<AnnotationDefinition> definitions) { - definitions.add(GenericGeneratorAnnotationDefinition.instance()); - //add Dali's annotation definitions - definitions.add(AssociationOverrideAnnotationDefinition.instance()); - definitions.add(AssociationOverridesAnnotationDefinition.instance()); - definitions.add(AttributeOverrideAnnotationDefinition.instance()); - definitions.add(AttributeOverridesAnnotationDefinition.instance()); - definitions.add(ColumnAnnotationDefinition.instance()); - definitions.add(EnumeratedAnnotationDefinition.instance()); - definitions.add(GeneratedValueAnnotationDefinition.instance()); - definitions.add(JoinColumnAnnotationDefinition.instance()); - definitions.add(JoinColumnsAnnotationDefinition.instance()); - definitions.add(JoinTableAnnotationDefinition.instance()); - definitions.add(LobAnnotationDefinition.instance()); - definitions.add(MapKeyAnnotationDefinition.instance()); - definitions.add(OrderByAnnotationDefinition.instance()); - definitions.add(PrimaryKeyJoinColumnAnnotationDefinition.instance()); - definitions.add(PrimaryKeyJoinColumnsAnnotationDefinition.instance()); - definitions.add(SequenceGeneratorAnnotationDefinition.instance()); - definitions.add(TableGeneratorAnnotationDefinition.instance()); - definitions.add(TemporalAnnotationDefinition.instance()); - } - -} Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java (from rev 14606, trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateFactory.java) =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java 2009-04-17 10:57:20 UTC (rev 14789) @@ -0,0 +1,31 @@ +/******************************************************************************* + * Copyright (c) 2007-2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.jpt.core.internal; + +import org.eclipse.jpt.core.context.persistence.Persistence; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.core.internal.platform.GenericJpaFactory; +import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersistenceUnit; + + +/** + * @author Dmitry Geraskov + * + */ +public class HibernateJpaFactory extends GenericJpaFactory { + + @Override + public PersistenceUnit buildPersistenceUnit(Persistence parent, XmlPersistenceUnit persistenceUnit) { + return new HibernatePersistenceUnit(parent, persistenceUnit); + } + +} Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatform.java (from rev 14606, trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernatePlatform.java) =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatform.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatform.java 2009-04-17 10:57:20 UTC (rev 14789) @@ -0,0 +1,37 @@ +/******************************************************************************* + * Copyright (c) 2007-2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.jpt.core.internal; + +import org.eclipse.jpt.core.JpaAnnotationProvider; +import org.eclipse.jpt.core.JpaFactory; +import org.eclipse.jpt.core.JpaPlatformProvider; +import org.eclipse.jpt.core.JpaValidation; +import org.eclipse.jpt.core.internal.platform.GenericJpaPlatform; + +/** + * @author Dmitry Geraskov + * + */ + +public class HibernateJpaPlatform extends GenericJpaPlatform { + + public static final String ID = "hibernate"; //$NON-NLS-1$ + + public HibernateJpaPlatform(String id, JpaFactory jpaFactory, JpaAnnotationProvider jpaAnnotationProvider, JpaValidation jpaValidation, JpaPlatformProvider... platformProviders) { + super(id, jpaFactory, jpaAnnotationProvider, jpaValidation, platformProviders); + } + + @Override + public String getId() { + return ID; + } + +} Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformFactory.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformFactory.java 2009-04-17 10:57:20 UTC (rev 14789) @@ -0,0 +1,51 @@ +package org.jboss.tools.hibernate.jpt.core.internal; + +import org.eclipse.jpt.core.JpaAnnotationProvider; +import org.eclipse.jpt.core.JpaFactory; +import org.eclipse.jpt.core.JpaPlatform; +import org.eclipse.jpt.core.JpaPlatformFactory; +import org.eclipse.jpt.core.JpaValidation; +import org.eclipse.jpt.core.JpaValidation.Supported; +import org.eclipse.jpt.core.internal.platform.GenericJpaAnnotationDefinitionProvider; +import org.eclipse.jpt.core.internal.platform.GenericJpaAnnotationProvider; +import org.eclipse.jpt.core.internal.platform.GenericJpaFactory; +import org.eclipse.jpt.core.internal.platform.GenericJpaPlatform; +import org.eclipse.jpt.core.internal.platform.GenericJpaPlatformProvider; + +public class HibernateJpaPlatformFactory implements JpaPlatformFactory { + + /** + * zero-argument constructor + */ + public HibernateJpaPlatformFactory() { + super(); + } + + public JpaPlatform buildJpaPlatform(String id) { + return new HibernateJpaPlatform( + id, + buildJpaFactory(), + buildJpaAnnotationProvider(), + buildJpaValidation(), + GenericJpaPlatformProvider.instance()); + } + + protected JpaFactory buildJpaFactory() { + return new HibernateJpaFactory(); + } + + protected JpaAnnotationProvider buildJpaAnnotationProvider() { + return new GenericJpaAnnotationProvider( + GenericJpaAnnotationDefinitionProvider.instance(), + HibernateJpaAnnotationDefinitionProvider.instance()); + } + + protected JpaValidation buildJpaValidation() { + return new JpaValidation() { + public Supported getTablePerConcreteClassInheritanceIsSupported() { + return Supported.MAYBE; + } + }; + } + +} Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernatePlatform.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernatePlatform.java 2009-04-17 10:33:53 UTC (rev 14788) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernatePlatform.java 2009-04-17 10:57:20 UTC (rev 14789) @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2008 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.hibernate.jpt.core.internal; - -import org.eclipse.jpt.core.JpaAnnotationProvider; -import org.eclipse.jpt.core.JpaFactory; -import org.eclipse.jpt.core.internal.platform.GenericJpaPlatform; - -/** - * @author Dmitry Geraskov - * - */ - -public class HibernatePlatform extends GenericJpaPlatform { - - public static final String ID = "hibernate"; //$NON-NLS-1$ - - @Override - public String getId() { - return ID; - } - - @Override - protected JpaFactory buildJpaFactory() { - return new HibernateFactory(); - } - - @Override - protected JpaAnnotationProvider buildAnnotationProvider() { - return new HibernateJpaAnnotationProvider(); - } - -} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/JPAPostInstallFasetListener.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/JPAPostInstallFasetListener.java 2009-04-17 10:33:53 UTC (rev 14788) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/JPAPostInstallFasetListener.java 2009-04-17 10:57:20 UTC (rev 14789) @@ -29,7 +29,7 @@ IProject project = event.getProject().getProject(); IProjectFacetActionEvent pEvent = (IProjectFacetActionEvent)event; if (pEvent.getProjectFacet().getId().equals(JptCorePlugin.FACET_ID) - && HibernatePlatform.ID.equals(JptCorePlugin.getJpaPlatformId(project))){ + && HibernateJpaPlatform.ID.equals(JptCorePlugin.getJpaPlatformId(project))){ if (checkPreConditions(project)){ buildConsoleConfiguration(project); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateJpaProperties.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateJpaProperties.java 2009-04-17 10:33:53 UTC (rev 14788) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateJpaProperties.java 2009-04-17 10:57:20 UTC (rev 14789) @@ -14,7 +14,7 @@ import org.eclipse.jpt.core.JpaProject; import org.eclipse.jpt.core.context.persistence.PersistenceUnit; -import org.eclipse.jpt.core.context.persistence.Property; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit.Property; import org.eclipse.jpt.utility.internal.model.AbstractModel; import org.eclipse.jpt.utility.internal.model.value.ItemPropertyListValueModelAdapter; import org.eclipse.jpt.utility.internal.model.value.ListAspectAdapter; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2009-04-17 10:33:53 UTC (rev 14788) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2009-04-17 10:57:20 UTC (rev 14789) @@ -11,16 +11,8 @@ package org.jboss.tools.hibernate.jpt.core.internal.context; import java.io.File; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import java.util.Map; -import java.util.Set; -import java.util.Map.Entry; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; @@ -31,19 +23,19 @@ import org.eclipse.jpt.core.context.java.JavaPersistentType; import org.eclipse.jpt.core.context.persistence.ClassRef; import org.eclipse.jpt.core.context.persistence.Persistence; -import org.eclipse.jpt.core.context.persistence.Property; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit.Property; import org.eclipse.jpt.core.internal.context.persistence.GenericPersistenceUnit; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit; -import org.eclipse.jpt.core.resource.persistence.XmlProperties; -import org.eclipse.jpt.core.resource.persistence.XmlProperty; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneIterator; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; +import org.eclipse.wst.validation.internal.provisional.core.IReporter; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.BasicHibernateProperties; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; import org.jboss.tools.hibernate.jpt.core.internal.context.java.GenericGeneratorAnnotation; @@ -64,10 +56,6 @@ public HibernatePersistenceUnit(Persistence parent, XmlPersistenceUnit persistenceUnit) { super(parent, persistenceUnit); - } - - protected void initialize(XmlPersistenceUnit xmlPersistenceUnit) { - super.initialize(xmlPersistenceUnit); updateGenericGenerators(); this.hibernateProperties = new HibernateJpaProperties(this); } @@ -78,18 +66,13 @@ } // ********** Validation *********************************************** - public void validate(List<IMessage> messages) { - addToMessages(messages); + @Override + public void validate(List<IMessage> messages, IReporter reporter) { + super.validate(messages, reporter); + addFileNotExistsMessages(messages, reporter); } - public void addToMessages(List<IMessage> messages) { - invokeMethod(this, "addMappingFileMessages", "validateMappingFiles", //$NON-NLS-1$ //$NON-NLS-2$ - new Class[]{List.class}, messages); - invokeMethod(this, "addClassMessages", "validateClassRefs", new Class[]{List.class}, messages); //$NON-NLS-1$//$NON-NLS-2$ - addFileNotExistsMessages(messages); - } - - protected void addFileNotExistsMessages(List<IMessage> messages) { + protected void addFileNotExistsMessages(List<IMessage> messages, IReporter reporter) { String configFile = getBasicProperties().getConfigurationFile(); if (configFile != null && configFile.length() > 0){ IPath path = new Path(configFile); @@ -116,56 +99,6 @@ } } - - /** - * If persistence.xml contains 3 properties: dialect, driver, url and we delete - * driver-property, then parent's method changes current properties so: - * 1. replace 1-st model's property(dialect) with 1-st property from persistence.xml (dialect) - * 2. replace 2-nd model's property(driver) with 2-nd property from persistence.xml (url) - * 3. remove 3-rd model's property(url) - * Step 3 call property change event which set url=null and this is wrong. - * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=255149 - * TODO: remove after bug fixed. - */ - @Override - protected void updateProperties(XmlPersistenceUnit persistenceUnit) { - XmlProperties xmlProperties = persistenceUnit.getProperties(); - - Iterator<Property> stream = properties(); - Iterator<XmlProperty> stream2; - - if (xmlProperties == null) { - stream2 = EmptyIterator.instance(); - } - else { - stream2 = new CloneIterator<XmlProperty>(xmlProperties.getProperties());//avoid ConcurrentModificationException - } - - Map<String, XmlProperty> map = new HashMap<String, XmlProperty>(); - while (stream2.hasNext()){ - XmlProperty xmlProp = stream2.next(); - map.put(xmlProp.getName(), xmlProp); - } - Set<String> performedSet = new HashSet<String>(); - while (stream.hasNext()) { - Property property = stream.next(); - if (map.containsKey(property.getName())) { - XmlProperty xmlProp = map.get(property.getName()); - property.update(xmlProp); - performedSet.add(property.getName()); - } else { - removeProperty_(property); - } - } - - for (Entry<String, XmlProperty> entry : map.entrySet()) { - if (!performedSet.contains(entry.getKey())) { - addProperty_(buildProperty(entry.getValue())); - } - } - } - - /* (non-Javadoc) * @see org.eclipse.jpt.core.internal.context.persistence.GenericPersistenceUnit#update(org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit) */ @@ -173,6 +106,7 @@ public void update(XmlPersistenceUnit persistenceUnit) { super.update(persistenceUnit); updateGenericGenerators(); + this.fireListChanged(GENERATORS_LIST); } protected void updateGenericGenerators(){ @@ -181,22 +115,26 @@ for (ClassRef classRef : CollectionTools.iterable(classRefs())) { String annotClass = classRef.getClassName(); JavaPersistentType type = classRef.getJavaPersistentType(); - JavaResourcePersistentMember jrpt = null; - GenericGeneratorAnnotation annotation = null; - jrpt = (JavaResourcePersistentMember) invokeMethod(project, "getJavaPersistentTypeResource", //$NON-NLS-1$ - "getJavaResourcePersistentType", new Class[]{String.class}, annotClass); //$NON-NLS-1$ + JavaResourcePersistentType jrpt = project.getJavaResourcePersistentType(annotClass); if (jrpt != null){ - annotation = (GenericGeneratorAnnotation)invokeMethod(jrpt, "getAnnotation", //$NON-NLS-1$ - "getSupportingAnnotation", new Class[]{String.class}, GENERIC_GENERATOR); //$NON-NLS-1$ + GenericGeneratorAnnotation annotation = null; + JavaResourceNode jrn = jrpt.getSupportingAnnotation(GENERIC_GENERATOR); + if (jrn instanceof GenericGeneratorAnnotation) { + annotation = (GenericGeneratorAnnotation)jrn; + } if (annotation != null) { addGenerator(annotation.buildJavaGenericGenerator(type)); } ListIterator<JavaPersistentAttribute> typeAttrs = type.attributes(); for (JavaPersistentAttribute persAttr : CollectionTools.iterable(typeAttrs)) { + if (persAttr.getSpecifiedMapping() == null) { + continue; + } JavaResourcePersistentAttribute jrpa = persAttr.getResourcePersistentAttribute(); - annotation = (GenericGeneratorAnnotation)invokeMethod(jrpa, "getAnnotation", //$NON-NLS-1$ - "getSupportingAnnotation", new Class[]{String.class}, GENERIC_GENERATOR); //$NON-NLS-1$ - + jrn = jrpa.getSupportingAnnotation(GENERIC_GENERATOR); + if (jrn instanceof GenericGeneratorAnnotation) { + annotation = (GenericGeneratorAnnotation)jrn; + } if (annotation != null) { addGenerator(annotation.buildJavaGenericGenerator(persAttr.getSpecifiedMapping())); } @@ -204,67 +142,6 @@ } } } - - /** - * Hack method needed to make Hibernate Platform portable between Dali 2.0 and Dali 2.1 - * @param object - object on which method will be called - * @param dali20Name - method name in Dali 2.0 - * @param dali21Name - same method name in Dali 2.1 - * @param paramTypes - method arguments types. - * @param args - arguments of the method - * @return - */ - private Object invokeMethod(Object object, String dali20Name, String dali21Name, Class[] argsTypes, - Object... args){ - Method method = getMethod(object.getClass(), dali20Name, dali21Name, argsTypes); - if (method != null){ - try { - return method.invoke(object, args); - } catch (IllegalArgumentException e) { - HibernateJptPlugin.logException(e); - } catch (IllegalAccessException e) { - HibernateJptPlugin.logException(e); - } catch (InvocationTargetException e) { - HibernateJptPlugin.logException(e); - } - } else { - StringBuilder params = new StringBuilder(); - for (int i = 0; i < argsTypes.length; i++) { - params.append(argsTypes[i].getName() + ", "); //$NON-NLS-1$ - } - if (params.length() > 0) params.deleteCharAt(params.length() - 2); - HibernateJptPlugin.logError("Nor \"" + dali20Name + "\" nor \"" + dali21Name //$NON-NLS-1$//$NON-NLS-2$ - + "\" methods were found with parameter types: (" + params + ")"); //$NON-NLS-1$//$NON-NLS-2$ - } - return null; - } - - /** - * Hack method needed to make Hibernate Platform portable between Dali 2.0 and Dali 2.1 - * @param parent - * @param dali20Name - method name in Dali 2.0 - * @param dali21Name - same method name in Dali 2.1 - * @param parameterTypes - * @return - */ - private Method getMethod(Class parent, String dali20Name, String dali21Name, Class... parameterTypes){ - Class clazz = parent; - while (clazz != null){ - Method method = null; - try {//try to get method from Dali 2.0 - method = clazz.getDeclaredMethod(dali20Name, parameterTypes); - return method; - } catch (Exception e) { - try {//try to get method from Dali 2.1 - method = clazz.getDeclaredMethod(dali21Name, parameterTypes); - return method; - } catch (Exception e1) { - clazz = clazz.getSuperclass(); - } - } - } - return null; - } /** Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnitProperties.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnitProperties.java 2009-04-17 10:33:53 UTC (rev 14788) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnitProperties.java 2009-04-17 10:57:20 UTC (rev 14789) @@ -15,7 +15,7 @@ import org.eclipse.jpt.core.JpaProject; import org.eclipse.jpt.core.context.persistence.PersistenceUnit; -import org.eclipse.jpt.core.context.persistence.Property; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit.Property; import org.eclipse.jpt.utility.internal.model.AbstractModel; import org.eclipse.jpt.utility.model.value.ListValueModel; @@ -127,7 +127,7 @@ protected String getStringValue(String key, String keySuffix) { String elKey = (keySuffix == null) ? key : key + keySuffix; - if (this.persistenceUnit().containsProperty(elKey)) { + if (this.persistenceUnit().getProperty(elKey) != null) { // TOREVIEW - handle incorrect String in persistence.xml return this.persistenceUnit().getProperty(elKey).getValue(); } @@ -150,7 +150,7 @@ this.persistenceUnit().removeProperty(elKey); } else { - this.persistenceUnit().putProperty(elKey, newValue, allowDuplicate); + this.persistenceUnit().setProperty(elKey, newValue, allowDuplicate); } } @@ -173,14 +173,16 @@ } private void putProperty_(String key, Object value) { - this.persistenceUnit().putProperty(key, value.toString(), false); + this.persistenceUnit().setProperty(key, value.toString(), false); } /** * Removes a property with the given key. */ protected void removeProperty(String key) { - this.persistenceUnit().removeProperty(key); + if(this.persistenceUnit().getProperty(key) != null) { + this.persistenceUnit().removeProperty(key); + } } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitProperties.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitProperties.java 2009-04-17 10:33:53 UTC (rev 14788) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitProperties.java 2009-04-17 10:57:20 UTC (rev 14789) @@ -12,7 +12,7 @@ import org.eclipse.jpt.core.JpaProject; import org.eclipse.jpt.core.context.persistence.PersistenceUnit; -import org.eclipse.jpt.core.context.persistence.Property; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit.Property; import org.eclipse.jpt.utility.model.Model; import org.eclipse.jpt.utility.model.listener.PropertyChangeListener; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitPropertyListListener.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitPropertyListListener.java 2009-04-17 10:33:53 UTC (rev 14788) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitPropertyListListener.java 2009-04-17 10:57:20 UTC (rev 14789) @@ -12,7 +12,7 @@ import java.util.Iterator; -import org.eclipse.jpt.core.context.persistence.Property; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit.Property; import org.eclipse.jpt.utility.model.Model; import org.eclipse.jpt.utility.model.event.ListChangeEvent; import org.eclipse.jpt.utility.model.event.PropertyChangeEvent; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/HibernateBasic.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/HibernateBasic.java 2009-04-17 10:33:53 UTC (rev 14788) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/HibernateBasic.java 2009-04-17 10:57:20 UTC (rev 14789) @@ -13,7 +13,7 @@ import java.util.Map; import org.eclipse.jpt.core.context.persistence.PersistenceUnit; -import org.eclipse.jpt.core.context.persistence.Property; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit.Property; import org.eclipse.jpt.utility.model.event.PropertyChangeEvent; import org.eclipse.jpt.utility.model.value.ListValueModel; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersistenceUnitProperties; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java 2009-04-17 10:33:53 UTC (rev 14788) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java 2009-04-17 10:57:20 UTC (rev 14789) @@ -39,7 +39,7 @@ return (GenericGeneratorAnnotation) generatorResource; } - public Integer getDefaultInitialValue() { + public int getDefaultInitialValue() { return GenericGenerator.DEFAULT_INITIAL_VALUE; }