[jbosstools-commits] JBoss Tools SVN: r21124 - in branches/hibernatetools-multiversion/hibernatetools/plugins: org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors and 8 other directories.

Author: vyemialyanchyk Date: 2010-03-29 13:43:11 -0400 (Mon, 29 Mar 2010) New Revision: 21124 Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/META-INF/MANIFEST.MF branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/ConsoleConfigNamePart.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TypeMappingView.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/ColumnNameHandler.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/JavaTypeHandler.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/PackageHandler.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/TableNameHandler.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/DOMModelUtil.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaProject.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/JPAPostInstallFasetListener.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaColumnImpl.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaDiscriminatorColumnImpl.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColumnImpl.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinTableImpl.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaSecondaryTableImpl.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaTableImpl.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasicMapping.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmColumnImpl.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntityImpl.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMappingImpl.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumnImpl.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinTableImpl.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmTableImpl.java Log: https://jira.jboss.org/jira/browse/JBIDE-6070 - update Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/META-INF/MANIFEST.MF =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/META-INF/MANIFEST.MF 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/META-INF/MANIFEST.MF 2010-03-29 17:43:11 UTC (rev 21124) @@ -31,6 +31,7 @@ org.eclipse.wst.xml.ui, org.eclipse.wst.sse.ui, org.eclipse.ui.views, + org.hibernate.mediator, org.hibernate.eclipse, org.eclipse.ui.forms, org.eclipse.ui.workbench.texteditor, Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -36,13 +36,8 @@ import org.eclipse.wst.sse.ui.StructuredTextEditor; import org.eclipse.wst.xml.core.internal.provisional.IXMLPreferenceNames; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; -import org.hibernate.cfg.reveng.DefaultReverseEngineeringStrategy; -import org.hibernate.cfg.reveng.OverrideRepository; -import org.hibernate.cfg.reveng.TableFilter; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; -import org.hibernate.console.stubs.SettingsStub; -import org.hibernate.console.stubs.util.StringHelper; import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.hibernate.eclipse.console.model.IReverseEngineeringDefinition; import org.hibernate.eclipse.console.model.ITableFilter; @@ -57,6 +52,11 @@ import org.hibernate.eclipse.mapper.editors.xpl.XMLFormEditorPart; import org.hibernate.eclipse.mapper.model.DOMReverseEngineeringDefinition; import org.hibernate.eclipse.nature.HibernateNature; +import org.hibernate.mediator.stubs.DefaultReverseEngineeringStrategyStub; +import org.hibernate.mediator.stubs.OverrideRepositoryStub; +import org.hibernate.mediator.stubs.SettingsStub; +import org.hibernate.mediator.stubs.TableFilterStub; +import org.hibernate.mediator.stubs.util.StringHelper; import org.w3c.dom.Document; public class ReverseEngineeringEditor extends XMLFormEditorPart { @@ -198,11 +198,11 @@ ITableFilter[] tableFilters = getReverseEngineeringDefinition().getTableFilters(); SettingsStub settings = configuration.getSettings2(); - OverrideRepository repository = new OverrideRepository();///*settings.getDefaultCatalogName(),settings.getDefaultSchemaName()*/); + OverrideRepositoryStub repository = new OverrideRepositoryStub();///*settings.getDefaultCatalogName(),settings.getDefaultSchemaName()*/); boolean hasIncludes = false; for (int i = 0; i < tableFilters.length; i++) { ITableFilter filter = tableFilters[i]; - TableFilter tf = new TableFilter(); + TableFilterStub tf = new TableFilterStub(); tf.setExclude(filter.getExclude()); if(filter.getExclude()!=null && !filter.getExclude().booleanValue()) { hasIncludes = true; @@ -212,7 +212,7 @@ tf.setMatchSchema(filter.getMatchSchema()); repository.addTableFilter(tf); } - TableFilter tf = new TableFilter(); + TableFilterStub tf = new TableFilterStub(); tf.setExclude(Boolean.FALSE); tf.setMatchCatalog(".*"); //$NON-NLS-1$ tf.setMatchSchema(".*"); //$NON-NLS-1$ @@ -231,7 +231,7 @@ //} //} - LazyDatabaseSchema lazyDatabaseSchema = new LazyDatabaseSchema(configuration, repository.getReverseEngineeringStrategy(new DefaultReverseEngineeringStrategy())); + LazyDatabaseSchema lazyDatabaseSchema = new LazyDatabaseSchema(configuration, repository.getReverseEngineeringStrategy(DefaultReverseEngineeringStrategyStub.newInstance())); return lazyDatabaseSchema; } catch(RuntimeException he) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/ConsoleConfigNamePart.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/ConsoleConfigNamePart.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/ConsoleConfigNamePart.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -30,12 +30,12 @@ import org.eclipse.ui.forms.IManagedForm; import org.eclipse.ui.forms.widgets.FormToolkit; import org.hibernate.console.ConsoleConfiguration; -import org.hibernate.console.stubs.util.StringHelper; import org.hibernate.eclipse.console.model.IReverseEngineeringDefinition; import org.hibernate.eclipse.console.utils.LaunchHelper; import org.hibernate.eclipse.mapper.MapperMessages; import org.hibernate.eclipse.mapper.MapperPlugin; import org.hibernate.eclipse.mapper.editors.ReverseEngineeringEditor; +import org.hibernate.mediator.stubs.util.StringHelper; public class ConsoleConfigNamePart extends RevEngSectionPart { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -56,10 +56,6 @@ import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.ScrolledForm; import org.eclipse.ui.forms.widgets.Section; -import org.hibernate.console.stubs.ColumnStub; -import org.hibernate.console.stubs.PrimaryKeyStub; -import org.hibernate.console.stubs.TableIdentifierStub; -import org.hibernate.console.stubs.TableStub; import org.hibernate.eclipse.console.model.IRevEngColumn; import org.hibernate.eclipse.console.model.IRevEngTable; import org.hibernate.eclipse.console.model.IReverseEngineeringDefinition; @@ -73,6 +69,10 @@ import org.hibernate.eclipse.mapper.model.RevEngParamAdapter; import org.hibernate.eclipse.mapper.model.RevEngPrimaryKeyAdapter; import org.hibernate.eclipse.mapper.model.RevEngTableAdapter; +import org.hibernate.mediator.stubs.ColumnStub; +import org.hibernate.mediator.stubs.PrimaryKeyStub; +import org.hibernate.mediator.stubs.TableIdentifierStub; +import org.hibernate.mediator.stubs.TableStub; public class TablePropertiesBlock extends MasterDetailsBlock { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TypeMappingView.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TypeMappingView.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TypeMappingView.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -34,11 +34,8 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; -import org.hibernate.cfg.reveng.JDBCToHibernateTypeHelper; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; -import org.hibernate.console.stubs.ColumnStub; -import org.hibernate.console.stubs.PrimaryKeyStub; import org.hibernate.eclipse.console.model.IReverseEngineeringDefinition; import org.hibernate.eclipse.console.model.ITypeMapping; import org.hibernate.eclipse.console.wizards.TreeToTableComposite; @@ -49,6 +46,9 @@ import org.hibernate.eclipse.console.workbench.LazyDatabaseSchema; import org.hibernate.eclipse.console.workbench.xpl.AnyAdaptableLabelProvider; import org.hibernate.eclipse.mapper.MapperMessages; +import org.hibernate.mediator.stubs.ColumnStub; +import org.hibernate.mediator.stubs.JDBCToHibernateTypeHelperStub; +import org.hibernate.mediator.stubs.PrimaryKeyStub; public abstract class TypeMappingView extends TreeToTableComposite { @@ -148,18 +148,18 @@ if(sqlTypeCode!=null) { ITypeMapping typeMapping = revEngDef.createTypeMapping(); - typeMapping.setJDBCType(JDBCToHibernateTypeHelper.getJDBCTypeName(sqlTypeCode.intValue())); + typeMapping.setJDBCType(JDBCToHibernateTypeHelperStub.getJDBCTypeName(sqlTypeCode.intValue())); int length = col.getLength(); int precision = col.getPrecision(); int scale = col.getScale(); boolean nullability = col.isNullable(); - typeMapping.setHibernateType(JDBCToHibernateTypeHelper.getPreferredHibernateType(sqlTypeCode.intValue(), length, precision, scale, nullability, false)); - if(JDBCToHibernateTypeHelper.typeHasLength(sqlTypeCode.intValue())) { + typeMapping.setHibernateType(JDBCToHibernateTypeHelperStub.getPreferredHibernateType(sqlTypeCode.intValue(), length, precision, scale, nullability, false)); + if(JDBCToHibernateTypeHelperStub.typeHasLength(sqlTypeCode.intValue())) { if(length!=0 && ColumnStub.DEFAULT_LENGTH!=length) { typeMapping.setLength(new Integer(length)); } } - if(JDBCToHibernateTypeHelper.typeHasScaleAndPrecision(sqlTypeCode.intValue())) { + if(JDBCToHibernateTypeHelperStub.typeHasScaleAndPrecision(sqlTypeCode.intValue())) { if(precision!=0 && ColumnStub.DEFAULT_PRECISION!=precision) { typeMapping.setPrecision(new Integer(precision)); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/ColumnNameHandler.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/ColumnNameHandler.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/ColumnNameHandler.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -29,10 +29,10 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jface.text.contentassist.CompletionProposal; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.hibernate.console.stubs.ColumnStub; -import org.hibernate.console.stubs.TableIdentifierStub; -import org.hibernate.console.stubs.TableStub; import org.hibernate.eclipse.nature.HibernateNature; +import org.hibernate.mediator.stubs.ColumnStub; +import org.hibernate.mediator.stubs.TableIdentifierStub; +import org.hibernate.mediator.stubs.TableStub; import org.w3c.dom.Attr; import org.w3c.dom.Node; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -37,10 +37,10 @@ import org.eclipse.jdt.core.Signature; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; import org.eclipse.wst.xml.ui.internal.contentassist.XMLRelevanceConstants; -import org.hibernate.console.stubs.EnvironmentStub; -import org.hibernate.console.stubs.TableIdentifierStub; -import org.hibernate.console.stubs.util.StringHelper; import org.hibernate.eclipse.mapper.MapperMessages; +import org.hibernate.mediator.stubs.EnvironmentStub; +import org.hibernate.mediator.stubs.TableIdentifierStub; +import org.hibernate.mediator.stubs.util.StringHelper; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/JavaTypeHandler.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/JavaTypeHandler.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/JavaTypeHandler.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -26,9 +26,9 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.hibernate.console.stubs.util.StringHelper; import org.hibernate.eclipse.hqleditor.CompletionHelper; import org.hibernate.eclipse.hqleditor.HibernateResultCollector.Settings; +import org.hibernate.mediator.stubs.util.StringHelper; import org.w3c.dom.Attr; import org.w3c.dom.Node; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/PackageHandler.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/PackageHandler.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/PackageHandler.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -23,9 +23,9 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.hibernate.console.stubs.util.StringHelper; import org.hibernate.eclipse.hqleditor.CompletionHelper; import org.hibernate.eclipse.hqleditor.HibernateResultCollector.Settings; +import org.hibernate.mediator.stubs.util.StringHelper; import org.w3c.dom.Node; public class PackageHandler extends JavaTypeHandler { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/TableNameHandler.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/TableNameHandler.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/TableNameHandler.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -29,8 +29,8 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jface.text.contentassist.CompletionProposal; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.hibernate.console.stubs.TableStub; import org.hibernate.eclipse.nature.HibernateNature; +import org.hibernate.mediator.stubs.TableStub; import org.w3c.dom.Attr; import org.w3c.dom.Node; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/DOMModelUtil.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/DOMModelUtil.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/DOMModelUtil.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -27,7 +27,6 @@ import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory; import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; import org.eclipse.wst.xml.core.internal.provisional.format.ElementNodeFormatter; -import org.jboss.deployment.DeploymentException; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -127,7 +126,6 @@ * @return either the named child or the supplied default */ public static Element getOptionalChild(Element element, String tagName) - throws DeploymentException { List goodChildren = getChildrenByTagName(element, tagName); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2010-03-29 17:43:11 UTC (rev 21124) @@ -6,6 +6,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.wst.validation, + org.hibernate.mediator, org.hibernate.eclipse.console, org.hibernate.eclipse, org.eclipse.jdt.launching, Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaProject.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaProject.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaProject.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -18,9 +18,9 @@ import org.eclipse.jpt.core.internal.AbstractJpaProject; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; -import org.hibernate.console.stubs.ConfigurationStub; -import org.hibernate.console.stubs.NamingStrategyStub; import org.hibernate.eclipse.console.properties.HibernatePropertiesConstants; +import org.hibernate.mediator.stubs.ConfigurationStub; +import org.hibernate.mediator.stubs.NamingStrategyStub; import org.osgi.service.prefs.Preferences; /** Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/JPAPostInstallFasetListener.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/JPAPostInstallFasetListener.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/JPAPostInstallFasetListener.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -31,10 +31,10 @@ import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener; import org.eclipse.wst.common.project.facet.core.events.IProjectFacetActionEvent; import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent.Type; -import org.hibernate.console.preferences.ConsoleConfigurationPreferences.ConfigurationMode; import org.hibernate.eclipse.console.utils.LaunchHelper; import org.hibernate.eclipse.console.utils.ProjectUtils; import org.hibernate.eclipse.launch.IConsoleConfigurationLaunchConstants; +import org.hibernate.mediator.preferences.ConsoleConfigurationPreferences.ConfigurationMode; /** * @author Dmitry Geraskov Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -21,7 +21,7 @@ import org.eclipse.jpt.db.Table; import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.hibernate.console.stubs.NamingStrategyStub; +import org.hibernate.mediator.stubs.NamingStrategyStub; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersistenceUnit.LocalMessage; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaColumnImpl.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaColumnImpl.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaColumnImpl.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -18,7 +18,7 @@ import org.eclipse.jpt.db.Table; import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.hibernate.console.stubs.NamingStrategyStub; +import org.hibernate.mediator.stubs.NamingStrategyStub; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaDiscriminatorColumnImpl.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaDiscriminatorColumnImpl.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaDiscriminatorColumnImpl.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -24,7 +24,7 @@ import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; -import org.hibernate.console.stubs.NamingStrategyStub; +import org.hibernate.mediator.stubs.NamingStrategyStub; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColumnImpl.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColumnImpl.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColumnImpl.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -27,7 +27,7 @@ import org.eclipse.jpt.db.Table; import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.hibernate.console.stubs.NamingStrategyStub; +import org.hibernate.mediator.stubs.NamingStrategyStub; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinTableImpl.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinTableImpl.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinTableImpl.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -21,7 +21,7 @@ import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; -import org.hibernate.console.stubs.NamingStrategyStub; +import org.hibernate.mediator.stubs.NamingStrategyStub; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaSecondaryTableImpl.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaSecondaryTableImpl.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaSecondaryTableImpl.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -21,7 +21,7 @@ import org.eclipse.jpt.db.Table; import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.hibernate.console.stubs.NamingStrategyStub; +import org.hibernate.mediator.stubs.NamingStrategyStub; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaTableImpl.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaTableImpl.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaTableImpl.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -21,7 +21,7 @@ import org.eclipse.jpt.db.Schema; import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.hibernate.console.stubs.NamingStrategyStub; +import org.hibernate.mediator.stubs.NamingStrategyStub; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasicMapping.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasicMapping.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasicMapping.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -16,7 +16,7 @@ import org.eclipse.jpt.core.resource.orm.XmlBasic; import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.hibernate.console.stubs.NamingStrategyStub; +import org.hibernate.mediator.stubs.NamingStrategyStub; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmColumnImpl.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmColumnImpl.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmColumnImpl.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -18,7 +18,7 @@ import org.eclipse.jpt.db.Table; import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.hibernate.console.stubs.NamingStrategyStub; +import org.hibernate.mediator.stubs.NamingStrategyStub; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntityImpl.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntityImpl.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntityImpl.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -27,7 +27,7 @@ import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.hibernate.console.stubs.NamingStrategyStub; +import org.hibernate.mediator.stubs.NamingStrategyStub; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerator; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMappingImpl.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMappingImpl.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMappingImpl.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -20,7 +20,7 @@ import org.eclipse.jpt.core.resource.orm.XmlId; import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.hibernate.console.stubs.NamingStrategyStub; +import org.hibernate.mediator.stubs.NamingStrategyStub; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumnImpl.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumnImpl.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumnImpl.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -24,7 +24,7 @@ import org.eclipse.jpt.db.Table; import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.hibernate.console.stubs.NamingStrategyStub; +import org.hibernate.mediator.stubs.NamingStrategyStub; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinTableImpl.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinTableImpl.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinTableImpl.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -23,7 +23,7 @@ import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; -import org.hibernate.console.stubs.NamingStrategyStub; +import org.hibernate.mediator.stubs.NamingStrategyStub; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmTableImpl.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmTableImpl.java 2010-03-29 17:42:03 UTC (rev 21123) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmTableImpl.java 2010-03-29 17:43:11 UTC (rev 21124) @@ -24,7 +24,7 @@ import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.hibernate.console.stubs.NamingStrategyStub; +import org.hibernate.mediator.stubs.NamingStrategyStub; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateTable;