This is an automated email from the git hooks/post-receive script. xhaakon-guest pushed a commit to branch master in repository eclipse-wtp.
commit 8e7c4b897ef10f04c87aeeea4954d2f1bebf1e99 Merge: b2175ac 663e32b Author: Jakub Adam <[email protected]> Date: Fri Jun 28 08:47:28 2013 +0200 Merge tag 'upstream/3.5.0' Upstream version 3.5.0 .../internal/emf/resource/EMF2DOMAdapterImpl.java | 4 + .../common/internal/emf/resource/Translator.java | 10 + .../internal/WrappedRuntimeException.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../componentcore/internal/flat/FlatFolder.java | 4 +- .../internal/flat/GlobalHeirarchyParticipant.java | 82 + .../flat/GlobalHeirarchyParticipantProvider.java | 41 + org.eclipse.wst.common.modulecore/plugin.xml | 7 + .../schema/heirarchyFlattenParticipant.exsd | 131 ++ .../META-INF/MANIFEST.MF | 2 +- .../eclipse/wst/common/uriresolver/URIHelper.java | 5 +- org.eclipse.wst.common_core.feature/feature.xml | 2 +- org.eclipse.wst.common_ui.feature/feature.xml | 2 +- org.eclipse.wst.css.core/META-INF/MANIFEST.MF | 2 +- .../css/core/internal/contenttype/IntStack.java | 14 +- .../document/CSSDeclarationItemParser.java | 29 +- .../internal/document/CSSStyleDeclItemImpl.java | 54 +- .../formatter/AbstractCSSSourceFormatter.java | 5 +- .../internal/formatter/StyleDeclItemFormatter.java | 8 +- org.eclipse.wst.css.ui/META-INF/MANIFEST.MF | 4 +- .../ui/internal/CSSUIPluginResources.properties | 2 +- .../autoedit/StructuredAutoEditStrategyCSS.java | 48 +- .../ui/internal/wizard/FacetModuleCoreSupport.java | 5 +- .../wizard/FacetModuleCoreSupportDelegate.java | 66 +- .../wst/css/ui/internal/wizard/NewCSSWizard.java | 54 +- org.eclipse.wst.dtd.core/META-INF/MANIFEST.MF | 2 +- .../dtd/core/internal/emf/DTDBasicTypeKind.java | 179 ++- .../wst/dtd/core/internal/emf/DTDDefaultKind.java | 109 +- .../dtd/core/internal/emf/DTDEnumGroupKind.java | 65 +- .../wst/dtd/core/internal/emf/DTDFactory.java | 2 +- .../wst/dtd/core/internal/emf/DTDGroupKind.java | 80 +- .../dtd/core/internal/emf/DTDOccurrenceType.java | 94 +- .../wst/dtd/core/internal/emf/DTDPackage.java | 1598 +++++++++++++------- .../core/internal/emf/XMLSchemaDefinedType.java | 242 +-- .../core/internal/emf/impl/DTDAnyContentImpl.java | 136 +- .../core/internal/emf/impl/DTDAttributeImpl.java | 505 ++----- .../core/internal/emf/impl/DTDBasicTypeImpl.java | 290 +--- .../dtd/core/internal/emf/impl/DTDContentImpl.java | 147 +- .../internal/emf/impl/DTDElementContentImpl.java | 210 ++- .../dtd/core/internal/emf/impl/DTDElementImpl.java | 450 ++---- .../emf/impl/DTDElementReferenceContentImpl.java | 163 +- .../internal/emf/impl/DTDEmptyContentImpl.java | 135 +- .../internal/emf/impl/DTDEntityContentImpl.java | 148 +- .../dtd/core/internal/emf/impl/DTDEntityImpl.java | 367 ++--- .../emf/impl/DTDEntityReferenceContentImpl.java | 191 +-- .../internal/emf/impl/DTDEnumerationTypeImpl.java | 270 ++-- .../internal/emf/impl/DTDExternalEntityImpl.java | 234 ++- .../dtd/core/internal/emf/impl/DTDFactoryImpl.java | 274 +++- .../dtd/core/internal/emf/impl/DTDFileImpl.java | 189 ++- .../internal/emf/impl/DTDGroupContentImpl.java | 190 +-- .../internal/emf/impl/DTDInternalEntityImpl.java | 134 +- .../core/internal/emf/impl/DTDNotationImpl.java | 227 ++- .../internal/emf/impl/DTDPCDataContentImpl.java | 135 +- .../dtd/core/internal/emf/impl/DTDPackageImpl.java | 386 ++--- .../emf/impl/DTDParameterEntityReferenceImpl.java | 169 +-- .../emf/impl/DTDRepeatableContentImpl.java | 154 +- .../core/internal/emf/util/DTDAdapterFactory.java | 215 ++- .../wst/dtd/core/internal/emf/util/DTDSwitch.java | 374 ++--- org.eclipse.wst.dtd.core/emfmodel/rose/DTD.cat | 2 +- org.eclipse.wst.dtd.core/emfmodel/rose/dtd.ecore | 177 +++ .../emfmodel/rose/dtdmodel.genmodel | 138 ++ .../emfmodel/rose/dtdmodel.mdl | 18 +- org.eclipse.wst.dtd.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.wst.dtd.ui/plugin.xml | 4 + .../dtd/ui/internal/dnd/DTDDragAndDropManager.java | 58 +- .../ui/internal/dnd/DragContentModelCommand.java | 21 +- .../style/LineStyleProviderForDTDSubSet.java | 4 + .../wst/dtd/ui/internal/wizard/NewDTDWizard.java | 53 +- org.eclipse.wst.html.core/META-INF/MANIFEST.MF | 2 +- .../internal/HTMLCorePluginResources.properties | 6 +- .../html/core/internal/contentmodel/HedSOURCE.java | 4 +- .../core/internal/contenttype/EncodingGuesser.java | 20 +- .../html/core/internal/contenttype/IntStack.java | 12 +- .../html/core/internal/format/HTMLFormatter.java | 21 +- .../core/internal/format/HTMLTextFormatter.java | 38 +- .../html/core/internal/format/SpaceConverter.java | 10 +- .../modelquery/CMNamedNodeMapForBuddySystem.java | 30 +- .../text/StructuredTextPartitionerForHTML.java | 59 +- .../internal/validate/HTMLAttributeValidator.java | 15 +- org.eclipse.wst.html.ui/META-INF/MANIFEST.MF | 4 +- .../autoedit/StructuredAutoEditStrategyHTML.java | 40 +- .../internal/edit/ui/CleanupDocumentHandler.java | 14 +- .../preferences/HTMLUIPreferenceInitializer.java | 6 +- .../ui/internal/wizard/FacetModuleCoreSupport.java | 5 +- .../wizard/FacetModuleCoreSupportDelegate.java | 66 +- .../wst/html/ui/internal/wizard/NewHTMLWizard.java | 53 +- .../.settings/org.eclipse.pde.prefs | 32 + .../META-INF/MANIFEST.MF | 2 +- org.eclipse.wst.jsdt.debug.crossfire/.project | 2 +- .../.settings/org.eclipse.pde.prefs | 32 + .../META-INF/MANIFEST.MF | 2 +- .../.settings/org.eclipse.pde.prefs | 32 + .../META-INF/MANIFEST.MF | 2 +- .../debug/internal/rhino/debugger/StackFrame.java | 29 +- .../debug/internal/rhino/transport/JSONUtil.java | 10 +- .../.settings/org.eclipse.pde.prefs | 32 + .../META-INF/MANIFEST.MF | 2 +- .../.settings/org.eclipse.pde.prefs | 32 + .../META-INF/MANIFEST.MF | 2 +- .../.settings/org.eclipse.pde.prefs | 32 + .../META-INF/MANIFEST.MF | 2 +- .../.settings/org.eclipse.pde.prefs | 32 + org.eclipse.wst.jsdt.debug.ui/META-INF/MANIFEST.MF | 2 +- .../BreakpointPropertiesRulerAction.java | 17 +- .../ToggleBreakpointEnablementRulerAction.java | 10 +- org.eclipse.wst.jsdt.feature/feature.xml | 5 +- org.eclipse.wst.jsdt.web.core/META-INF/MANIFEST.MF | 2 +- org.eclipse.wst.jsdt.web.ui/META-INF/MANIFEST.MF | 5 +- .../ui/internal/format/FormattingStrategyJSDT.java | 16 +- org.eclipse.wst.server.core/META-INF/MANIFEST.MF | 2 +- .../org/eclipse/wst/server/core/IModule2.java | 45 + .../org/eclipse/wst/server/core/ServerUtil.java | 18 +- .../eclipse/wst/server/core/internal/Module.java | 35 +- .../server/core/model/ModuleFactoryDelegate.java | 22 +- .../META-INF/MANIFEST.MF | 2 +- .../core/PreviewLaunchConfigurationDelegate.java | 4 +- org.eclipse.wst.server.ui/META-INF/MANIFEST.MF | 2 +- .../wst/server/ui/internal/Messages.properties | 2 +- .../server/ui/internal/ServerLabelProvider.java | 5 +- .../wst/server/ui/internal/ServerToolTip.java | 10 +- .../actions/RunOnServerActionDelegate.java | 6 +- .../RunOnServerLaunchConfigurationDelegate.java | 15 +- .../ui/internal/cnf/ServerLabelProvider.java | 6 +- .../ui/internal/view/servers/ModuleServer.java | 17 +- .../internal/view/servers/RemoveModuleAction.java | 4 +- .../internal/view/servers/ShowInDebugAction.java | 3 +- .../wizard/page/ModifyModulesComposite.java | 4 +- org.eclipse.wst.server_core.feature/feature.xml | 72 +- org.eclipse.wst.server_ui.feature/feature.xml | 2 +- org.eclipse.wst.sse.core/META-INF/MANIFEST.MF | 3 +- org.eclipse.wst.sse.core/build.properties | 3 +- org.eclipse.wst.sse.core/plugin.properties | 1 + org.eclipse.wst.sse.core/plugin.xml | 3 + .../schema/formattingDelegate.exsd | 102 ++ .../sse/core/internal/tasks/TaskScanningJob.java | 98 +- .../core/internal/tasks/TaskScanningScheduler.java | 11 +- .../sse/core/internal/FileBufferModelManager.java | 269 +++- .../AbstractStructuredCleanupProcessor.java | 44 +- .../core/internal/format/IFormattingDelegate.java | 29 + .../sse/core/internal/model/ModelManagerImpl.java | 6 +- .../core/internal/model/ModelResourceFactory.java | 11 + .../core/internal/provisional/IModelManager.java | 28 +- org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF | 4 +- org.eclipse.wst.sse.ui/plugin.xml | 54 +- .../eclipse/wst/sse/ui/StructuredTextEditor.java | 23 +- .../StructuredContentAssistProcessor.java | 12 +- .../wst/sse/ui/internal/StructuredTextViewer.java | 8 + .../sse/ui/internal/actions/ActionContributor.java | 2 +- ...onProposoalCatigoriesConfigurationRegistry.java | 13 +- .../sse/ui/internal/format/FormattingDelegate.java | 37 + .../propertytester/CustomFilterPropertyTester.java | 11 +- .../internal/reconcile/DirtyRegionProcessor.java | 24 +- .../internal/text/StructuredAutoEditStrategy.java | 78 + .../META-INF/MANIFEST.MF | 2 +- org.eclipse.wst.standard.schemas/plugin.xml | 6 + .../xsd/ws-securitypolicy-1.2.xsd | 1234 +++++++++++++++ .../xsd/ws-securitypolicy.xsd | 103 ++ org.eclipse.wst.validation/META-INF/MANIFEST.MF | 2 +- .../internal/plugin/ValidationPlugin.java | 4 +- .../wst/validation/ValidationFramework.java | 9 + .../internal/DisabledResourceManager.java | 44 +- .../wst/validation/internal/ValBuilderJob.java | 2 +- .../wst/validation/internal/model/FilterRule.java | 9 +- .../validation/internal/model/ValidatorHelper.java | 4 +- org.eclipse.wst.web/META-INF/MANIFEST.MF | 2 +- .../wst/project/facet/IProductConstants.java | 1 + org.eclipse.wst.web_core.feature/feature.xml | 2 +- org.eclipse.wst.web_ui.feature/feature.xml | 2 +- org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF | 2 +- .../wsexplorer-properties/uddi.properties | 1 - .../wsexplorer-properties/wsil.properties | 2 - org.eclipse.wst.ws_core.feature/feature.xml | 2 +- org.eclipse.wst.ws_ui.feature/feature.xml | 2 +- org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF | 2 +- .../wst/wsdl/ui/internal/messages.properties | 1 + org.eclipse.wst.xml.core/META-INF/MANIFEST.MF | 2 +- .../validation/XMLValidationConfiguration.java | 3 +- .../xml/core/internal/contenttype/IntStack.java | 12 +- .../core/internal/document/DOMMessages.properties | 2 +- .../xml/core/internal/document/ElementImpl.java | 37 +- .../core/internal/document/ReadOnlyController.java | 4 +- .../document/StructuredDocumentRegionUtil.java | 4 +- .../formatter/DefaultXMLPartitionFormatter.java | 4 +- .../wst/xml/core/internal/parser/IntStack.java | 13 +- org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF | 5 +- .../SourceEditorActionBarContributor.java | 5 +- .../wst/xml/ui/internal/wizards/NewXMLWizard.java | 52 +- .../eclipse/wst/xml/ui/internal/XMLUIMessages.java | 3 +- .../ui/internal/XMLUIPluginResources.properties | 7 +- .../actions/AbstractNodeActionManager.java | 10 +- .../autoedit/StructuredAutoEditStrategyXML.java | 39 +- ...actXMLModelQueryCompletionProposalComputer.java | 17 +- .../editor/DOMSelectionConvertorFactory.java | 40 +- .../preferences/XMLValidatorPreferencePage.java | 15 +- .../views/contentmodel/CMListWorkbenchAdapter.java | 23 +- .../XMLContentOutlineConfiguration.java | 19 +- .../feature.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.wst.xml.xpath2.processor/build.xml | 8 +- .../grammars/xpath.cup | 38 +- .../grammars/xpath.lex | 6 +- .../wst/xml/xpath2/processor/DefaultEvaluator.java | 45 +- .../wst/xml/xpath2/processor/JFlexCupParser.java | 51 +- .../xml/xpath2/processor/StaticNameResolver.java | 24 +- .../wst/xml/xpath2/processor/ast/XPath.java | 7 +- .../InternalXPathParser.java} | 47 +- .../xml/xpath2/processor/internal/Normalizer.java | 37 + .../xml/xpath2/processor/internal/ast/ForExpr.java | 10 +- .../internal/ast/{ForExpr.java => LetExpr.java} | 12 +- .../processor/internal/ast/QuantifiedExpr.java | 10 +- .../processor/internal/ast/XPathVisitor.java | 5 + .../xpath2/processor/internal/types/XSDecimal.java | 2 +- .../xpath2/processor/internal/types/XSInteger.java | 5 + .../internal/types/XSNonNegativeInteger.java | 4 - .../internal/types/XSNonPositiveInteger.java | 4 - .../internal/types/XSPositiveInteger.java | 4 - .../xpath2/processor/internal/types/XSShort.java | 2 +- .../processor/internal/types/XSUnsignedByte.java | 2 +- .../processor/internal/types/XSUnsignedInt.java | 4 +- .../processor/internal/types/XSUnsignedLong.java | 4 - .../processor/internal/types/XSUnsignedShort.java | 2 +- .../META-INF/MANIFEST.MF | 4 +- org.eclipse.wst.xml.xpath2/pom.xml | 16 + org.eclipse.wst.xml_core.feature/feature.xml | 2 +- org.eclipse.wst.xml_ui.feature/feature.properties | 4 +- org.eclipse.wst.xml_ui.feature/feature.xml | 5 +- org.eclipse.wst.xsd.core/META-INF/MANIFEST.MF | 2 +- .../wst/xsd/contentmodel/internal/XSDTypeUtil.java | 4 +- org.eclipse.wst.xsl.core/META-INF/MANIFEST.MF | 2 +- org.eclipse.wst.xsl.core/META-INF/eclipse.inf | 1 + .../xsl/core/internal/validation/XSLValidator.java | 14 +- .../wst/xsl/core/model/StylesheetModel.java | 60 +- org.eclipse.wst.xsl.debug.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.wst.xsl.debug.ui/plugin.properties | 2 + org.eclipse.wst.xsl.debug.ui/plugin.xml | 47 + .../wst/xsl/internal/debug/ui/Messages.java | 4 +- .../debug/ui/XMLProcessingInstructionSniffer.java | 179 +++ .../xsl/internal/debug/ui/XSLLaunchShortcut.java | 149 +- .../internal/debug/ui/XslOutputMethodSniffer.java | 160 ++ .../wst/xsl/internal/debug/ui/messages.properties | 17 +- .../internal/debug/ui/tabs/main/XSLMainTab.java | 11 +- .../debug/ui/tabs/output/OutputFileBlock.java | 10 +- org.eclipse.wst.xsl.feature/feature.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../invoker/internal/JAXPSAXProcessorInvoker.java | 20 +- .../META-INF/MANIFEST.MF | 2 +- .../launching/internal/PluginProcessorJar.java | 7 +- org.eclipse.wst.xsl.launching/META-INF/MANIFEST.MF | 2 +- .../launching/XSLLaunchConfigurationConstants.java | 10 +- .../org/eclipse/wst/xsl/launching/XSLTRuntime.java | 21 +- .../wst/xsl/launching/config/BaseLaunchHelper.java | 9 +- org.eclipse.wst.xsl.ui/META-INF/MANIFEST.MF | 2 +- .../SelectAttributeContentAssist.java | 4 +- .../wst/xsl/ui/internal/messages.properties | 2 +- 254 files changed, 8277 insertions(+), 5607 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-wtp.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
