Merge branch 'master' into fix-eclipse-warnings

Conflicts:
	plugins/org.mockito/build.properties
	plugins/org.powermock/build.properties
	plugins/org.teiid.designer.core/src/org/teiid/designer/core/util/FlatRegistry.java
	plugins/org.teiid.designer.core/src/org/teiid/designer/core/workspace/ModelWorkspaceImpl.java
	plugins/org.teiid.designer.metamodels.relationship/build.properties
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/FileReference.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/RelationshipMetamodelPlugin.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/UriReference.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/aspects/relationship/RelationAspect.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/aspects/relationship/RelationRoleAspect.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/aspects/relationship/RelationTypeAspect.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/aspects/relationship/RelationshipAspectFactoryImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/aspects/validation/RelationshipValidationAspectFactoryImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/aspects/validation/rules/RelationshipEntityValidationRule.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/compare/AbstractRelationshipEntityMatcher.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/compare/RelationshipMatcher.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/compare/RelationshipMatcherFactory.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/FileReferenceImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/PlaceholderReferenceContainerImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/PlaceholderReferenceImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/RelationshipEntityImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/RelationshipFactoryImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/RelationshipFolderImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/RelationshipImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/RelationshipPackageImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/RelationshipRoleImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/RelationshipTypeImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/impl/UriReferenceImpl.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/provider/PlaceholderReferenceContainerItemProvider.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/provider/PlaceholderReferenceItemProvider.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/provider/RelationshipAssociationProvider.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/provider/RelationshipEntityItemProvider.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/provider/RelationshipItemProviderAdapterFactory.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/util/RelationshipEntityFinder.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/util/RelationshipFinder.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/util/RelationshipRoleFinder.java
	plugins/org.teiid.designer.metamodels.relationship/src/org/teiid/designer/metamodels/relationship/util/RelationshipTypeFinder.java
	plugins/org.teiid.designer.metamodels.uml2/build.properties
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/Uml2Plugin.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/AbstractUml2DependencyUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/AbstractUml2ElementUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/AbstractUml2NamedElementUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/AbstractUml2UmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2AbstractionUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2AssociationUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2ClassUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2CommentUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2EnumerationLiteralUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2EnumerationUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2GeneralizationUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2InterfaceUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2OperationUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2PackageUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2PropertyUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2RealizationUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2SubstitutionUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2UmlAspectFactoryImpl.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/uml/Uml2UsageUmlAspect.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/validation/Uml2ValidationAspectFactoryImpl.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/aspects/validation/rules/Uml2StringNameRule.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/compare/UmlElementImportMatcher.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/compare/UmlNamedElementCaseInsensitiveMatcher.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/compare/UmlNamedElementMatcher.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/compare/UmlObjectMatcherFactory.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/compare/UmlPackageImportMatcher.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/compare/UmlUnNamedAssociationMatcher.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/compare/UmlUnNamedClassifierMatcher.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/compare/UmlUnNamedGeneralizationMatcher.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/compare/UmlUnNamedPropertyMatcher.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/compare/UmlValueSpecificationMatcher.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/provider/Uml2AssociationProvider.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/provider/Uml2DependencyProvider.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/provider/Uml2GeneralizationProvider.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/proxy/UmlInvocationFactoryHelper.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/util/AssociationFinder.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/util/ClassFinder.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/util/DependencyFinder.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/util/Uml2ResourceLoadOptionContributor.java
	plugins/org.teiid.designer.metamodels.uml2/src/org/teiid/designer/metamodels/uml2/util/UmlEntityFinder.java
	plugins/org.teiid.designer.metamodels.xmlservice/build.properties
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/XmlInput.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/XmlOutput.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/XmlServiceMetamodelPlugin.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/sql/XmlInputAspect.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/sql/XmlOperationAspect.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/sql/XmlOutputAspect.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/sql/XmlResultAspect.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/sql/XmlServiceComponentAspect.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/sql/XmlServiceSqlAspectFactoryImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/uml/XmlInputAspect.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/uml/XmlOperationAspect.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/uml/XmlOutputAspect.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/uml/XmlResultAspect.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/uml/XmlServiceComponentAspect.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/uml/XmlServiceUmlAspectFactoryImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/validation/XmlServiceValidationAspectFactoryImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/validation/rules/GlobalSchemaReferenceRule.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/aspects/validation/rules/MissingSchemaReferenceRule.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/impl/XmlInputImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/impl/XmlMessageImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/impl/XmlOperationImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/impl/XmlOutputImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/impl/XmlResultImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/impl/XmlServiceComponentImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/impl/XmlServiceFactoryImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/impl/XmlServicePackageImpl.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/provider/XmlResultItemProvider.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/provider/XmlServiceComponentItemProvider.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/provider/XmlServiceItemProviderAdapterFactory.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/util/ReferencedXSDSchemaFinder.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/util/XmlInputFinder.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/util/XmlOperationFinder.java
	plugins/org.teiid.designer.metamodels.xmlservice/src/org/teiid/designer/metamodels/xmlservice/util/XmlServiceComponentFinder.java
	plugins/org.teiid.designer.modelgenerator.uml2/build.properties
	plugins/org.teiid.designer.modelgenerator.uml2/src/org/teiid/designer/modelgenerator/uml2/processor/RelationalFragmentGeneratorImpl.java
	plugins/org.teiid.designer.modelgenerator.uml2/src/org/teiid/designer/modelgenerator/uml2/processor/Uml2RelationalGeneratorImpl.java
	plugins/org.teiid.designer.modelgenerator.uml2/src/org/teiid/designer/modelgenerator/uml2/processor/Uml2RelationalOptions.java
	plugins/org.teiid.designer.modelgenerator.uml2/src/org/teiid/designer/modelgenerator/uml2/processor/Uml2RelationalProcessor.java
	plugins/org.teiid.designer.modelgenerator.uml2/src/org/teiid/designer/modelgenerator/uml2/util/NullRelationalObjectNamingStrategy.java
	plugins/org.teiid.designer.modelgenerator.uml2/src/org/teiid/designer/modelgenerator/uml2/util/RelationalObjectGeneratorImpl.java
	plugins/org.teiid.designer.modelgenerator.uml2/src/org/teiid/designer/modelgenerator/uml2/util/RelationalObjectNamingStrategyImpl.java
	plugins/org.teiid.designer.modelgenerator.uml2/src/org/teiid/designer/modelgenerator/uml2/util/ValidatingRelationalObjectNameStrategy.java
	plugins/org.teiid.designer.relationship.ui/build.properties
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/RelationshipPerspectiveContributor.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/actions/RelationshipDiagramPermanentActionContributor.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/connection/RelationshipAnchorManager.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/custom/CustomDiagramContentProvider.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/custom/CustomDiagramHelper.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/custom/CustomDiagramLabelProvider.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/custom/CustomDiagramType.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/custom/actions/CustomDiagramPermanentActionContributor.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/diagram/RelationshipDiagramContentProvider.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/diagram/RelationshipDiagramLabelProvider.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/diagram/RelationshipDiagramProvider.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/diagram/RelationshipDiagramType.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/NewRelationshipTypeWizard.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/NewRelationshipWizard.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/RelationshipLocationSelectionValidator.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/RelationshipModelSelectorDialog.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/RelationshipObjectEditorPage.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/RelationshipPanel.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/RelationshipTypeObjectEditorPage.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/RelationshipTypePanel.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/RelationshipTypeSelectionValidator.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/RelationshipTypeWizardPage.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/editor/RelationshipWizardPage.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/figure/RelationshipFolderFigure.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/figure/RelationshipNodeFigure.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/figure/RelationshipTypeFigure.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/model/RelationshipDiagramModelFactory.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/NavigationEditor.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/NavigationFocusComboBox.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/NavigationStatusBarUpdater.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/NavigationView.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/actions/BackDropDownAction.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/actions/EditWrapperAction.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/actions/ForwardDropDownAction.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/actions/NavigateToAction.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/actions/OpenInNavigatorAction.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/actions/OpenWrapperAction.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/actions/PropertiesAction.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/actions/RefreshAction.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/actions/SetFocusAction.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/figure/AbstractNavigationNodeFigure.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/model/AbstractNavigationModelNode.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/model/FreeNavigationModelNode.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/part/AbstractNavigationEditPart.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/part/LabelEditPart.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/part/NavigationDiagramPartFactory.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/part/NavigationEditPart.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/part/NavigationNodeEditPart.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/navigation/selection/NavigationSelectionHandler.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/part/FocusNodeEditPart.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/part/RelationshipDiagramPartFactory.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/part/RelationshipFolderEditPart.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/part/RelationshipNodeEditPart.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/part/RelationshipTypeNodeEditPart.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/properties/RelationshipPropertyEditorFactory.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/properties/RelationshipRoleAccumulatorSelectionValidator.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/properties/RelationshipRoleSelectionValidator.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/properties/RelationshipTypeSelectionValidator.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/search/RelationshipSearchPage.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/textimport/RelationshipTextImportModelSelectorDialog.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/textimport/RelationshipsLocationSelectionValidator.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/wizards/GenerateSqlRelationshipsMainPage.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/wizards/GenerateSqlRelationshipsWizard.java
	plugins/org.teiid.designer.relationship.ui/src/org/teiid/designer/relationship/ui/wizards/ImportRelationshipsMainPage.java
	plugins/org.teiid.designer.relationship/build.properties
	plugins/org.teiid.designer.relationship/src/org/teiid/designer/relationship/NavigationContextBuilderImpl.java
	plugins/org.teiid.designer.relationship/src/org/teiid/designer/relationship/NavigationContextImpl.java
	plugins/org.teiid.designer.relationship/src/org/teiid/designer/relationship/NavigationHistoryImpl.java
	plugins/org.teiid.designer.relationship/src/org/teiid/designer/relationship/NavigationLinkImpl.java
	plugins/org.teiid.designer.relationship/src/org/teiid/designer/relationship/NavigationNodeImpl.java
	plugins/org.teiid.designer.relationship/src/org/teiid/designer/relationship/RelationshipEditorImpl.java
	plugins/org.teiid.designer.relationship/src/org/teiid/designer/relationship/RelationshipSearchImpl.java
	plugins/org.teiid.designer.relationship/src/org/teiid/designer/relationship/RelationshipTypeEditorImpl.java
	plugins/org.teiid.designer.ui.common/src/org/teiid/designer/ui/common/actions/AbstractActionService.java
	plugins/org.teiid.designer.webservice/src/org/teiid/designer/webservice/WebServiceXsdResource.java
	tests/org.teiid.designer.metamodels.relationship.test/build.properties
	tests/org.teiid.designer.metamodels.uml2.test/build.properties
	tests/org.teiid.designer.modelgenerator.uml2.test/build.properties
	tests/org.teiid.designer.modelgenerator.uml2.test/src/org/teiid/designer/modelgenerator/uml2/processor/TrivialRelationalFragmentGenerator.java
	tests/org.teiid.designer.modelgenerator.uml2.test/src/org/teiid/designer/modelgenerator/uml2/util/FakeDatatypeFinder.java
	tests/org.teiid.designer.modelgenerator.uml2.test/src/org/teiid/designer/modelgenerator/uml2/util/FakeEObjectUtil.java
	tests/org.teiid.designer.modelgenerator.uml2.test/src/org/teiid/designer/modelgenerator/uml2/util/FakeTreeSelection.java
	tests/org.teiid.designer.relationship.test/src/org/teiid/designer/relationship/FakeIndexSelectorFactory.java
	tests/org.teiid.designer.relationship.test/src/org/teiid/designer/relationship/FakeNavigationContextBuilder.java
	tests/org.teiid.designer.relationship.test/src/org/teiid/designer/relationship/FakeNavigationContextImpl.java
	tests/org.teiid.designer.test/build.properties

features/org.teiid.designer.feature/feature.xml

@@ -223,41 +223,13 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.teiid.designer.metamodels.relationship"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.teiid.designer.relationship"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.teiid.designer.relationship.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.teiid.designer.xsd.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.teiid.designer.metamodels.uml2"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.teiid.designer.modelgenerator"
          download-size="0"
@@ -340,13 +312,6 @@
          install-size="0"
          version="0.0.0"/>
 
-   <plugin
-         id="org.teiid.designer.metamodels.xmlservice"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.teiid.designer.metamodels.builder"
          download-size="0"

features/org.teiid.designer.test.feature/feature.xml

@@ -21,7 +21,6 @@
 
    <requires>
       <import plugin="org.mockito"/>
-      <import plugin="org.powermock"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.teiid.core.designer"/>
@@ -109,7 +108,6 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         fragment="true"
          unpack="false"/>
 
    <plugin
@@ -303,4 +301,67 @@
          fragment="true"
          unpack="false"/>
 
+   <plugin
+         id="org.teiid.designer.core.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.teiid.designer.ddl.importer.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.teiid.designer.dqp.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.teiid.designer.jdbc.relational.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.teiid.designer.jdbc.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.teiid.designer.modelgenerator.uml2.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.teiid.designer.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.teiid.designer.vdb.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
 </feature>

plugins/org.mockito/.classpath

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="mockito-all-1.8.4.jar" sourcepath="mockito-all-1.8.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="com.springsource.org.objenesis-1.0.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="mockito-core-1.9.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

plugins/org.mockito/META-INF/MANIFEST.MF

@@ -2,15 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.mockito
-Bundle-Version: 1.8.4
-Bundle-ClassPath: mockito-all-1.8.4.jar
+Bundle-Version: 1.9.0
+Bundle-ClassPath: com.springsource.org.objenesis-1.0.0.jar,
+ mockito-core-1.9.0.jar
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.hamcrest,
- org.hamcrest.core,
- org.hamcrest.internal,
- org.mockito,
+Export-Package: org.mockito,
  org.mockito.asm,
  org.mockito.asm.signature,
  org.mockito.asm.tree,
@@ -31,13 +29,17 @@ Export-Package: org.hamcrest,
  org.mockito.exceptions.verification.junit,
  org.mockito.internal,
  org.mockito.internal.configuration,
+ org.mockito.internal.configuration.injection,
+ org.mockito.internal.configuration.injection.filter,
  org.mockito.internal.creation,
  org.mockito.internal.creation.cglib,
  org.mockito.internal.creation.jmock,
  org.mockito.internal.debugging,
  org.mockito.internal.exceptions,
  org.mockito.internal.exceptions.base,
+ org.mockito.internal.exceptions.util,
  org.mockito.internal.invocation,
+ org.mockito.internal.invocation.finder,
  org.mockito.internal.invocation.realmethod,
  org.mockito.internal.listeners,
  org.mockito.internal.matchers,
@@ -57,6 +59,7 @@ Export-Package: org.hamcrest,
  org.mockito.internal.verification.argumentmatching,
  org.mockito.internal.verification.checkers,
  org.mockito.invocation,
+ org.mockito.listeners,
  org.mockito.runners,
  org.mockito.stubbing,
  org.mockito.stubbing.answers,
@@ -68,3 +71,8 @@ Export-Package: org.hamcrest,
  org.objenesis.instantiator.jrockit,
  org.objenesis.instantiator.sun,
  org.objenesis.strategy
+Require-Bundle: org.hamcrest,
+ org.hamcrest.core,
+ org.hamcrest.integration,
+ org.hamcrest.library,
+ org.hamcrest.text

plugins/org.mockito/build.properties

@@ -2,5 +2,8 @@ bin.includes = plugin.properties,\
                META-INF/,\
                LICENSE,\
                NOTICE,\
-               mockito-all-1.8.4.jar
+               com.springsource.org.objenesis-1.0.0.jar,\
+               mockito-core-1.9.0.jar
+output.. = bin/
+source.. = src/
 src.includes = *

plugins/org.mockito/pom.xml

@@ -8,6 +8,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>org.mockito</artifactId> 
-	<version>1.8.4</version>
+	<version>1.9.0</version>
 	<packaging>eclipse-plugin</packaging>
 </project>