Merge branch 'refs/heads/master' into bugs/402525-widgets

Conflicts:
	tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF

1 files changed, 140 insertions, 52 deletions

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml
index d4fc616082c..d5a812e9c16 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml
@@ -1,52 +1,140 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.feature" label="%featureName" provider-name="%providerName" version="1.0.0.qualifier">

-

-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      Copyright (c) 2012 CEA LIST.

-All rights reserved.   This program and the accompanying materials

-are 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

-   </copyright>

-

-   <license url="%licenseURL">

-      %license

-   </license>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.commands" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.controlmode.profile" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.extensionpoints" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.icons" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.import" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.pastemanager" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.perspective" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.profile" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.resourceloading.profile" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.service.types" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.templaterepository" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.documentation.profile" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.appearance" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.oclconstraintevaluation" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.navigation" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.service.validation" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.services.decoration" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.modelrepair" install-size="0" unpack="false" version="0.0.0"/>

-

-</feature>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.uml.feature"
+      label="%featureName"
+      version="1.0.0.qualifier"
+      provider-name="%providerName">
+
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+      Copyright (c) 2012 CEA LIST.
+All rights reserved.   This program and the accompanying materials
+are 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
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.commands"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.controlmode.profile"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.extensionpoints"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.icons"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.import"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.perspective"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.profile"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.resourceloading.profile"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.service.types"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.templaterepository"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.documentation.profile"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.appearance"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.oclconstraintevaluation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.navigation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.service.validation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.services.decoration"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.uml.modelrepair"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>