Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Le Fevre - CEA2015-03-19 10:18:44 -0400
committerFrancois Le Fevre2015-03-23 04:00:16 -0400
commit1c5f1a88f33a1624f844e67fb369f6ae76e862b4 (patch)
tree7089d672cbba6ae331a1c20a58f3faa6598a1150
parent38e37d9d4315d096bf633d7aea77d4927f6a1daa (diff)
downloadorg.eclipse.papyrus-1c5f1a88f33a1624f844e67fb369f6ae76e862b4.tar.gz
org.eclipse.papyrus-1c5f1a88f33a1624f844e67fb369f6ae76e862b4.tar.xz
org.eclipse.papyrus-1c5f1a88f33a1624f844e67fb369f6ae76e862b4.zip
Bug 462528: [doc]: mediawiki generation for reqif and guides
- resolving error in copy paste doc, reqif - homogenization of java library version - adding maven nature: regrouping plugin usage in the top main pom Change-Id: I5c4da63afe8527f0580e086be7a524db3b4d0cfe Signed-off-by: Francois Le Fevre - CEA <francois.le-fevre@cea.fr>
-rw-r--r--features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml226
-rw-r--r--plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.project12
-rw-r--r--plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF2
-rw-r--r--plugins/doc/org.eclipse.papyrus.cdo.ui.doc/pom.xml2
-rw-r--r--plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.project12
-rw-r--r--plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF5
-rw-r--r--plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/plugin.xml8
-rw-r--r--plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste-main-toc.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste.mediawiki6
-rw-r--r--plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.project12
-rw-r--r--plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF2
-rw-r--r--plugins/doc/org.eclipse.papyrus.dsml.validation.doc/build.properties5
-rw-r--r--plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation-main-toc.xml2
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.doc/.project12
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.doc/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF1
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.project6
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.project10
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/META-INF/MANIFEST.MF1
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.project12
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF1
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.classpath11
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.project12
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.jdt.core.prefs5
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF1
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.classpath12
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.project6
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF2
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project12
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF2
-rw-r--r--plugins/doc/org.eclipse.papyrus.layers.documentation/.project12
-rw-r--r--plugins/doc/org.eclipse.papyrus.layers.documentation/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--plugins/doc/org.eclipse.papyrus.layers.documentation/META-INF/MANIFEST.MF1
-rw-r--r--plugins/doc/org.eclipse.papyrus.layers.documentation/plugin.xml14
-rwxr-xr-xplugins/doc/org.eclipse.papyrus.moka.doc/.classpath14
-rwxr-xr-xplugins/doc/org.eclipse.papyrus.moka.doc/.project6
-rw-r--r--plugins/doc/org.eclipse.papyrus.moka.doc/.settings/org.eclipse.m2e.core.prefs4
-rwxr-xr-xplugins/doc/org.eclipse.papyrus.moka.doc/META-INF/MANIFEST.MF2
-rwxr-xr-xplugins/doc/org.eclipse.papyrus.moka.doc/build.properties4
-rw-r--r--plugins/doc/org.eclipse.papyrus.req.reqif.doc/.classpath14
-rw-r--r--plugins/doc/org.eclipse.papyrus.req.reqif.doc/.project6
-rw-r--r--plugins/doc/org.eclipse.papyrus.req.reqif.doc/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--plugins/doc/org.eclipse.papyrus.req.reqif.doc/META-INF/MANIFEST.MF2
-rw-r--r--plugins/doc/org.eclipse.papyrus.req.reqif.doc/build.properties6
-rw-r--r--plugins/doc/org.eclipse.papyrus.req.reqif.doc/plugin.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/DeveloperDoc-main-toc.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/DeveloperDoc.mediawiki104
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.project12
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/META-INF/MANIFEST.MF2
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.project12
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/META-INF/MANIFEST.MF1
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/plugin.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation-toc.xml12
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.project12
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/META-INF/MANIFEST.MF1
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.doc/.project12
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.doc/META-INF/MANIFEST.MF1
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.project12
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/META-INF/MANIFEST.MF2
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.project12
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/META-INF/MANIFEST.MF2
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/resource/profile-assistants.html0
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.project12
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/META-INF/MANIFEST.MF2
-rw-r--r--plugins/doc/org.eclipse.papyrus.views.properties.doc/.project12
-rw-r--r--plugins/doc/org.eclipse.papyrus.views.properties.doc/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--plugins/doc/org.eclipse.papyrus.views.properties.doc/META-INF/MANIFEST.MF1
-rw-r--r--releng/top-pom-main.xml36
89 files changed, 666 insertions, 213 deletions
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml
index 7f7d68ef90f..f198c631fad 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml
@@ -1,72 +1,154 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<feature id="org.eclipse.papyrus.doc.feature" label="Papyrus Documentation Feature"
- provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">
-
- <copyright url="http://www.eclipse.org/legal/epl-v10.html">
- Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
- 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.cdo.ui.doc"
- install-size="0" unpack="false" version="0.0.0" />
-
- <plugin download-size="0" id="org.eclipse.papyrus.copypaste.ui.doc"
- install-size="0" version="0.0.0" />
-
- <plugin download-size="0" id="org.eclipse.papyrus.dsml.validation.doc"
- install-size="0" unpack="false" version="0.0.0" />
- <plugin download-size="0"
- id="org.eclipse.papyrus.infra.gmfdiag.common.doc" install-size="0"
- version="0.0.0" />
- <plugin download-size="0"
- id="org.eclipse.papyrus.infra.gmfdiag.css.doc" install-size="0"
- version="0.0.0" />
- <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable.doc"
- install-size="0" unpack="false" version="0.0.0" />
- <plugin download-size="0" id="org.eclipse.papyrus.infra.newchild.doc"
- install-size="0" version="0.0.0" />
- <plugin download-size="0"
- id="org.eclipse.papyrus.infra.services.controlmode.doc" install-size="0"
- unpack="false" version="0.0.0" />
- <plugin download-size="0" id="org.eclipse.papyrus.infra.viewpoints.doc"
- install-size="0" unpack="false" version="0.0.0" />
- <plugin download-size="0" id="org.eclipse.papyrus.layers.documentation"
- install-size="0" version="0.0.0" />
- <plugin download-size="0" id="org.eclipse.papyrus.moka.doc"
- install-size="0" unpack="false" version="0.0.0" />
- <plugin download-size="0" id="org.eclipse.papyrus.req.reqif.doc"
- install-size="0" version="0.0.0" />
- <plugin download-size="0"
- id="org.eclipse.papyrus.uml.decoratormodel.doc" install-size="0"
- version="0.0.0" />
- <plugin download-size="0"
- id="org.eclipse.papyrus.uml.diagram.common.doc" install-size="0"
- version="0.0.0" />
- <plugin download-size="0"
- id="org.eclipse.papyrus.uml.diagram.profile.doc" install-size="0"
- version="0.0.0" />
- <plugin download-size="0" id="org.eclipse.papyrus.uml.doc"
- install-size="0" version="0.0.0" />
-
-
- <plugin download-size="0" id="org.eclipse.papyrus.uml.modelrepair.doc"
- install-size="0" version="0.0.0" />
-
- <plugin download-size="0"
- id="org.eclipse.papyrus.uml.profile.assistants.doc" install-size="0"
- version="0.0.0" />
-
- <plugin download-size="0" id="org.eclipse.papyrus.uml.search.ui.doc"
- install-size="0" unpack="false" version="0.0.0" />
-
- <plugin download-size="0" id="org.eclipse.papyrus.views.properties.doc"
- install-size="0" version="0.0.0" />
-
-</feature> \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.papyrus.doc.feature"
+ label="Papyrus Documentation Feature"
+ version="1.1.0.qualifier"
+ provider-name="Eclipse Modeling Project">
+
+ <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+ Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
+ 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.cdo.ui.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.copypaste.ui.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.papyrus.dsml.validation.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.infra.gmfdiag.common.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.papyrus.infra.gmfdiag.css.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.papyrus.infra.nattable.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.infra.newchild.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.papyrus.infra.services.controlmode.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.infra.viewpoints.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.layers.documentation"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.papyrus.moka.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.req.reqif.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.papyrus.uml.decoratormodel.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.papyrus.uml.diagram.common.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.papyrus.uml.diagram.profile.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.papyrus.uml.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.papyrus.uml.modelrepair.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.papyrus.uml.profile.assistants.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.papyrus.uml.search.ui.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.views.properties.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.papyrus.infra.doc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.project b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.project
index bf9c58543ff..b9e4bc91f00 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..c537b63063c
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
index ae8ed85c6a2..20b61efd1df 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
@@ -7,5 +7,5 @@ Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.cdo.ui.doc;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Description: %pluginDescription
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/pom.xml
index b6471916635..809bf593963 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/pom.xml
@@ -25,7 +25,7 @@
<formatOutput>true</formatOutput>
<htmlFilenameFormat>$1.html</htmlFilenameFormat>
<xmlFilenameFormat>$1-toc.xml</xmlFilenameFormat>
- <helpPrefix>target/generated-eclipse-help</helpPrefix>
+ <helpPrefix>generated-eclipse-help</helpPrefix>
<!-- stylesheetUrls> <param>styles/main.css</param> </stylesheetUrls -->
</configuration>
<executions>
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.project b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.project
index 9bccafb869e..6312f67d350 100644
--- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF
index 3e1c251418e..4e666e1ee2d 100644
--- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF
@@ -6,6 +6,5 @@ Bundle-Version: 1.1.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.copypaste.ui.doc;singleton:=t
- rue
-
+Bundle-SymbolicName: org.eclipse.papyrus.copypaste.ui.doc;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/plugin.xml
index f157befd554..33b271d6e9a 100644
--- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/plugin.xml
@@ -4,12 +4,12 @@
<extension
point="org.eclipse.help.toc">
<toc
- file="target/generated-eclipse-help/copypaste-toc.xml"
+ file="target/generated-eclipse-help/copypaste-main-toc.xml"
primary="false">
- </toc>
+ </toc>
<toc
- file="target/generated-eclipse-help/copypaste-main-toc.xml"
+ file="target/generated-eclipse-help/copypaste-toc.xml"
primary="false">
- </toc>
+ </toc>
</extension>
</plugin>
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste-main-toc.xml b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste-main-toc.xml
index df6fceb8ba4..96b29f23bd4 100644
--- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste-main-toc.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
-<toc label="Copy/Paste" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
- <topic href="target/generated-eclipse-help/copypaste.html" label="Using Copy/paste">
+<toc label="Copy Paste" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
+ <topic href="target/generated-eclipse-help/copypaste.html" label="Using Copy paste">
<link toc="target/generated-eclipse-help/copypaste-toc.xml"/>
<anchor id="copypaste"/>
</topic>
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste.mediawiki b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste.mediawiki
index 410a11bf974..30e66dda570 100644
--- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/resource/copypaste.mediawiki
@@ -9,7 +9,7 @@
Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial Documentation
-->
-=Copying/Cutting/Pasting in Papyrus=
+=Copying Cutting Pasting in Papyrus=
==Introduction==
Papyrus's policy is to ensure consistency between models and diagrams, so by default the cut/copy/paste functionalities act both on diagram and model elements.
@@ -80,8 +80,8 @@ The strategy reapply profiles and stereotypes on the newly copied elements.
* Only the duplications of the '''roots elements''' will be renamed
* An element is renamed only if there is already an element with the '''same name''' on the paste selection
-* The element will be renamed in CopyOf_%NameOfTheElement%_%id%. The id will be incremented for each ''same'' copy/paste. Example: a Class1 will become CopyOf_Class1_1 then CopyOf_Class1_2…
-<!-- Featured : It will have two preferences, one for the prefix “copy_of” and one checkbox to disable the increment. -->
+* The element will be renamed in CopyOf_NameOfTheElement_id. The id will be incremented for each '''same''' copy/paste. Example: a Class1 will become CopyOf_Class1_1 then CopyOf_Class1_2
+<!-- Featured : It will have two preferences, one for the prefix copy_of and one checkbox to disable the increment. -->
[[Image:images/RenameExample.png]]
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.project b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.project
index 2da4a15d5ff..3116242303c 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF
index eb76d24b9c8..fc319912973 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@ Bundle-ActivationPolicy: lazy
Bundle-Version: 1.1.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.dsml.validation.doc.Activator
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.dsml.validation.doc;singleton
:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/build.properties b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/build.properties
index 08c955df26a..bcada499747 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/build.properties
@@ -1,10 +1,7 @@
-source.. = src/
-output.. = bin/
bin.includes = META-INF/,\
- .,\
plugin.xml,\
about.html,\
- plugin.properties
+ plugin.properties,\
target/generated-eclipse-help/**
src.includes = about.html,\
resource/
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation-main-toc.xml b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation-main-toc.xml
index f8bd1b976e3..fc4356fb58b 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/resource/dsml-validation-main-toc.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<toc label="Write and validate (OCL) constraints of a profile" link_to="../org.eclipse.papyrus.uml.diagram.common.doc/target/generatedeclipse-help/constraints-toc.xml#Constraints">
+<toc label="Write and validate (OCL) constraints of a profile" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
<topic href="target/generated-eclipse-help/dsml-validation.html" label="Validate (OCL) constraints of a profile">
<link toc="target/generated-eclipse-help/dsml-validation-toc.xml"/>
<anchor id="ValidateConstraints"/>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.doc/.project
index a304ab2be14..af8565ff60e 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF
index 1b7a2d3259f..0e93775928f 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF
@@ -7,4 +7,5 @@ Bundle-Version: 1.1.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.infra.doc;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.project
index 474137c05b7..5f9c861f90a 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.project
@@ -15,8 +15,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
</natures>
</projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.project
index 4c819662588..9b2f21dda0c 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.project
@@ -6,7 +6,7 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+ <name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
@@ -20,9 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/META-INF/MANIFEST.MF
index fbad4194184..813e502a330 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/META-INF/MANIFEST.MF
@@ -7,4 +7,5 @@ Bundle-Name: CSS Documentation
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.doc;singlet
on:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.project
index d38510b07bd..30d8f853e0e 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF
index c6adca5fd3e..de42a025059 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF
@@ -7,3 +7,4 @@ Bundle-Name: Papyrus Table Documentation
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.doc;singleton:=true
Bundle-Description: %pluginDescription
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.classpath b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.classpath
index e9bcd511f17..a9f4be78775 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.classpath
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.classpath
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.project
index df56d80c041..687350b13e3 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.jdt.core.prefs
index 980b98c1d5f..e13cc4ebe6a 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF
index a24482bb7bf..4f41886c691 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF
@@ -7,4 +7,5 @@ Bundle-Name: New Child Documentation
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild.doc;singleton:
=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.classpath b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.classpath
index e2b0c940c74..a6008fa4abc 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.classpath
+++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.classpath
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.project
index 78adc84635e..5f14405dd5c 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.project
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF
index ca3a08f340b..eada040dc63 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF
@@ -7,5 +7,5 @@ Bundle-Name: %Bundle-Name
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode.do
c;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project
index 7299daed0e7..6423e76bc97 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..af0f20f97a5
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF
index 0409147eab9..d969de2d78f 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF
@@ -8,5 +8,5 @@ Bundle-Localization: plugin
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.doc;singleto
n:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/.project b/plugins/doc/org.eclipse.papyrus.layers.documentation/.project
index 99176fc7af7..5d11eab7f79 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/.project
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.layers.documentation/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.layers.documentation/META-INF/MANIFEST.MF
index 5fe0fe5ef32..baac6883f87 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/META-INF/MANIFEST.MF
@@ -8,4 +8,5 @@ Bundle-Localization: plugin
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.layers.documentation;singleto
n:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.layers.documentation/plugin.xml b/plugins/doc/org.eclipse.papyrus.layers.documentation/plugin.xml
index 001043a872d..e8d2facd160 100644
--- a/plugins/doc/org.eclipse.papyrus.layers.documentation/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.layers.documentation/plugin.xml
@@ -4,31 +4,31 @@
<extension
point="org.eclipse.help.toc">
<toc
- file="guides/users/index-toc.xml"
+ file="target/generated-eclipse-help/guides/users/index-toc.xml"
primary="false">
</toc>
<toc
- file="guides/tutorials/layers-toc.xml"
+ file="target/generated-eclipse-help/guides/tutorials/layers-toc.xml"
primary="false">
</toc>
<toc
- file="guides/tutorials/simpleTutorial-toc.xml"
+ file="target/generated-eclipse-help/guides/tutorials/simpleTutorial-toc.xml"
primary="false">
</toc>
<toc
- file="guides/tutorials/derivedLayerTutorial-toc.xml"
+ file="target/generated-eclipse-help/guides/tutorials/derivedLayerTutorial-toc.xml"
primary="false">
</toc>
<toc
- file="guides/developpers/layers-toc.xml"
+ file="target/generated-eclipse-help/guides/developpers/layers-toc.xml"
primary="false">
</toc>
<toc
- file="guides/developpers/layersDevs-toc.xml"
+ file="target/generated-eclipse-help/guides/developpers/layersDevs-toc.xml"
primary="false">
</toc>
<toc
- file="guides/index-toc.xml"
+ file="target/generated-eclipse-help/guides/index-toc.xml"
primary="false">
</toc>
</extension>
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/.classpath b/plugins/doc/org.eclipse.papyrus.moka.doc/.classpath
index 8a8f1668cdc..c93a9d1e930 100755
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/.classpath
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/.project b/plugins/doc/org.eclipse.papyrus.moka.doc/.project
index 8435e8d743b..015900e0122 100755
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/.project
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.moka.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.moka.doc/META-INF/MANIFEST.MF
index a4a1ddb6a2c..b260eed246e 100755
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/META-INF/MANIFEST.MF
@@ -9,5 +9,5 @@ Bundle-Name: Moka Documentation
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.moka.doc.Activator
Bundle-SymbolicName: org.eclipse.papyrus.moka.doc;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Description: %pluginDescription
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/build.properties b/plugins/doc/org.eclipse.papyrus.moka.doc/build.properties
index 81b22d20c08..fff5fe292bc 100755
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/build.properties
@@ -1,9 +1,7 @@
-source.. = src/
-output.. = bin/
bin.includes = META-INF/,\
- .,\
about.html,\
plugin.xml,\
target/generated-eclipse-help/**
src.includes = about.html,\
resource/
+jre.compilation.profile = JavaSE-1.7 \ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.classpath b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.classpath
index 8a8f1668cdc..c93a9d1e930 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.classpath
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.project b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.project
index f5b8a7b60c4..a778de96791 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.project
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/META-INF/MANIFEST.MF
index 2cad14fb5a1..fd0a28892e5 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.help;bundle-version="3.6.0",
org.eclipse.papyrus.infra.doc;bundle-version="1.1.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-Description: This is the plugin that present the user documentation of the ReqIF import
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/build.properties b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/build.properties
index 63720208652..0993594b855 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/build.properties
@@ -1,10 +1,8 @@
-source.. = src/
-output.. = bin/
bin.includes = META-INF/,\
- .,\
+ about.html,\
plugin.xml,\
target/generated-eclipse-help/**,\
- about.html,\
plugin.properties
src.includes = about.html,\
resource/
+jre.compilation.profile = JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/plugin.xml
index 2ae7a648b53..997ba14c0dd 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/plugin.xml
@@ -4,11 +4,11 @@
<extension
point="org.eclipse.help.toc">
<toc
- file="target/generated-eclipse-help/reqif-main-toc.xml"
+ file="target/generated-eclipse-help/DeveloperDoc-main-toc.xml"
primary="false">
</toc>
<toc
- file="target/generated-eclipse-help/reqif-toc.xml"
+ file="target/generated-eclipse-help/DeveloperDoc-toc.xml"
primary="false">
</toc>
</extension>
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/DeveloperDoc-main-toc.xml b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/DeveloperDoc-main-toc.xml
index 0c48a2cb376..a05843330f8 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/DeveloperDoc-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/DeveloperDoc-main-toc.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8' ?>
<toc label="ReqID Import Export" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
- <topic href="target/generated-eclipse-help/reqif.html" label="ReqIF Import Export">
+ <topic href="target/generated-eclipse-help/DeveloperDoc.html" label="ReqIF Import Export">
<anchor id="ReqIF Import Export"/>
- <link toc="target/generated-eclipse-help/reqif-toc.xml"/>
+ <link toc="target/generated-eclipse-help/DeveloperDoc-toc.xml"/>
</topic>
</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/DeveloperDoc.mediawiki b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/DeveloperDoc.mediawiki
index f4449603634..a9832aa51ff 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/DeveloperDoc.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/resource/DeveloperDoc.mediawiki
@@ -1,39 +1,39 @@
= Import Export of ReqIF elements into Papyrus =
-<span id="_joeEYLH0EeSvo7o7Iu6GQQ">This model explains the functionality in Papyrus Req in order to import or export ReqIF files into Papyrus (OMG Document Number: formal/2013-10-01 Standard document URL: http://www.omg.org/spec/ReqIF/1.1)
-</span>
-
-==<span id="_johHsbH0EeSvo7o7Iu6GQQ">Requirements</span>==
-<span id="_jokyELH0EeSvo7o7Iu6GQQ">- ReqIfImport (id=ReqIF_001):
- Darwin shall allow importation of Reqif elements to SysML Model</span>
-<span id="_jon1YLH0EeSvo7o7Iu6GQQ">- Import SpecObjects (id=ReqIF_001_001):
- The user shall be able to import spec object</span>
-<span id="_joq4sLH0EeSvo7o7Iu6GQQ">- Two Kind of Users (id=ReqIF_001_002):
- The simple User can only import SpecObject by choosing domain. The AdvancedUser can import Types and DataTypes. </span>
-<span id="_jotU8LH0EeSvo7o7Iu6GQQ">- Import DataType Enumeration (id=ReqIF_001_003):
- The advanced user shall be able to import DataType and enumeration</span>
-<span id="_jovxMLH0EeSvo7o7Iu6GQQ">- Import SpecObjectTypes (id=ReqIF_001_004):
- The advanced user shall be able to import specObjectType</span>
-<span id="_joxmYLH0EeSvo7o7Iu6GQQ">- Import SpecRelationType (id=ReqIF_001_005):
- The advanced user shall be able to import SpecRelationType</span>
-<span id="_jozbkLH0EeSvo7o7Iu6GQQ">- Import SpecRelation (id=ReqIF_001_006):
- Papyrus Req shall import SpecRelation</span>
-<span id="_jo130LH0EeSvo7o7Iu6GQQ">- ReqIFExport (id=ReqIF_002):
- Darwin shall enable export of SysML requirement to ReqIF Model</span>
-<span id="_jo3tALH0EeSvo7o7Iu6GQQ">- ControlMode (id=ReqIF_003):
- The managment with ReqIf must support Control Mode</span>
-<span id="_jo6JQLH0EeSvo7o7Iu6GQQ">- WihtoutUI (id=ReqIF_004):
- The export can be done programmatically, without GUI, in order to test it, or to be enable to pilot it programmatically</span>
-<span id="_jo8lgLH0EeSvo7o7Iu6GQQ">- Re-Export (id=ReqIF_005):
- Papyrus shall re-export requirements in existing reqIF file</span>
-<span id="_jo-asLH0EeSvo7o7Iu6GQQ">- Re-Import (id=ReqIF_006):
- Papyrus shall re-Import requirement from a ReqIF file</span>
-==<span id="_jo_o0bH0EeSvo7o7Iu6GQQ">Use Cases</span>==
-
-====<span id="_jryeIbH0EeSvo7o7Iu6GQQ">Import ReqIF file</span>====
-
-<span id="_jwVm8LH0EeSvo7o7Iu6GQQ">Before import requirement fro ReqIF file, the kinf of User has to be verified.
+This model explains the functionality in Papyrus Req in order to import or export ReqIF files into Papyrus (OMG Document Number: formal/2013-10-01 Standard document URL: http://www.omg.org/spec/ReqIF/1.1)
+
+
+==Requirements==
+- ReqIfImport (id=ReqIF_001):
+ Darwin shall allow importation of Reqif elements to SysML Model
+- Import SpecObjects (id=ReqIF_001_001):
+ The user shall be able to import spec object
+- Two Kind of Users (id=ReqIF_001_002):
+ The simple User can only import SpecObject by choosing domain. The AdvancedUser can import Types and DataTypes.
+- Import DataType Enumeration (id=ReqIF_001_003):
+ The advanced user shall be able to import DataType and enumeration
+- Import SpecObjectTypes (id=ReqIF_001_004):
+ The advanced user shall be able to import specObjectType
+- Import SpecRelationType (id=ReqIF_001_005):
+ The advanced user shall be able to import SpecRelationType
+- Import SpecRelation (id=ReqIF_001_006):
+ Papyrus Req shall import SpecRelation
+- ReqIFExport (id=ReqIF_002):
+ Darwin shall enable export of SysML requirement to ReqIF Model
+- ControlMode (id=ReqIF_003):
+ The managment with ReqIf must support Control Mode
+- WihtoutUI (id=ReqIF_004):
+ The export can be done programmatically, without GUI, in order to test it, or to be enable to pilot it programmatically
+- Re-Export (id=ReqIF_005):
+ Papyrus shall re-export requirements in existing reqIF file
+- Re-Import (id=ReqIF_006):
+ Papyrus shall re-Import requirement from a ReqIF file
+==Use Cases==
+
+====Import ReqIF file====
+
+Before import requirement fro ReqIF file, the kinf of User has to be verified.
There are two kind of users:
@@ -41,67 +41,67 @@ There are two kind of users:
- Advancerd User: he can importe new types of requirements and instance of requirement inside the Papyrus tool
-To verify it, go to window--> preferences--> Papyrus--> ReqIF Import</span>
+To verify it, go to window--> preferences--> Papyrus--> ReqIF Import
[[Image:./images/Userkind.png|Two kinds of user]]<br>
-<span id="_jwXcIbH0EeSvo7o7Iu6GQQ">First the User must have a SysML model. Select the package where ReqIF elements will be imported.
-</span>
+First the User must have a SysML model. Select the package where ReqIF elements will be imported.
+
[[Image:./images/import_1.png|Import SysMLModel]]<br>
-<span id="_jwZ4YbH0EeSvo7o7Iu6GQQ">Select the menu Import of Eclipse.</span>
+Select the menu Import of Eclipse.
[[Image:./images/import_2.png|Select import Menu of Eclipse]]<br>
-<span id="_jwcUobH0EeSvo7o7Iu6GQQ">Select the menu Import ReqIF from Papyrus Categories</span>
+Select the menu Import ReqIF from Papyrus Categories
[[Image:./images/import_3.png|Import ReqIF]]<br>
-<span id="_jwew4bH0EeSvo7o7Iu6GQQ">Select the ReqIF file to import</span>
+Select the ReqIF file to import
[[Image:./images/import_4.png|ReqIF file Selection]]<br>
-<span id="_jwhNILH0EeSvo7o7Iu6GQQ">Select Requirement types of ReqIF file that you want to import</span>
+Select Requirement types of ReqIF file that you want to import
[[Image:./images/import_5.png|SpecObject Type selection]]<br>
-<span id="_jwjCUbH0EeSvo7o7Iu6GQQ">When the current user is an "Advanced User", he can import Requirement types and all requirements from ReqIF , if needed he can select or create the profile that will contain imported types</span>
+When the current user is an "Advanced User", he can import Requirement types and all requirements from ReqIF , if needed he can select or create the profile that will contain imported types
[[Image:./images/import_6.png|Create or select Profile]]<br>
-<span id="_jwlekbH0EeSvo7o7Iu6GQQ">When the current user is a "Simple User", he can only import instances of requirements by choosen predefined types contained in the profile.
-If the profile does not contain all needed types, the import is not done and a message is displayed on the screen. </span>
+When the current user is a "Simple User", he can only import instances of requirements by choosen predefined types contained in the profile.
+If the profile does not contain all needed types, the import is not done and a message is displayed on the screen.
[[Image:./images/Choose_Predefined_Profile.png|Choose predefined type contained in profile]]<br>
[[Image:./images/CannotImport.png|The import cannot be done if the profile is not complete.]]<br>
-<span id="_jwpI8bH0EeSvo7o7Iu6GQQ">The model has now imported requirements with relations. Note that a comment explains the origin of the import.</span>
+The model has now imported requirements with relations. Note that a comment explains the origin of the import.
[[Image:./images/import7.png|Resulted model]]<br>
-====<span id="_jwyS4bH0EeSvo7o7Iu6GQQ">Export UML Model to ReqIF File</span>====
+====Export UML Model to ReqIF File====
+
+Select the SysML that you want to export
-<span id="_jznkcbH0EeSvo7o7Iu6GQQ">Select the SysML that you want to export
-</span>
[[Image:./images/export1.png|SysML Model]]<br>
-<span id="_jzqnwbH0EeSvo7o7Iu6GQQ">Select the export Menu from Eclipse menu.</span>
+Select the export Menu from Eclipse menu.
[[Image:./images/export2.png|Export Menu]]<br>
-<span id="_jztrELH0EeSvo7o7Iu6GQQ">Select the menu export ReqIF form the papyrus Category</span>
+Select the menu export ReqIF form the papyrus Category
[[Image:./images/export3.png|Import ReqIF file]]<br>
-<span id="_jzwHUbH0EeSvo7o7Iu6GQQ">Choose the name of the reqif file.</span>
+Choose the name of the reqif file.
[[Image:./images/export5.png|Choose ReqIF File name]]<br>
-<span id="_jzzKobH0EeSvo7o7Iu6GQQ">At the end, a reqFile is generated. The header has an information that explain that the result comes from UML file.
-</span>
+At the end, a reqFile is generated. The header has an information that explain that the result comes from UML file.
+
[[Image:./images/Export4.png|Result in the ReqIf file]]<br>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.project
index d9f1933bece..767eb789dcf 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..af0f20f97a5
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/META-INF/MANIFEST.MF
index 360c7b30eaf..9b99e16c1b7 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/META-INF/MANIFEST.MF
@@ -8,5 +8,5 @@ Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.doc;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Description: %pluginDescription
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.project
index 10b283473f1..9d896a5995b 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/META-INF/MANIFEST.MF
index 824358a12f5..478ac59d5a7 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/META-INF/MANIFEST.MF
@@ -7,4 +7,5 @@ Bundle-Name: %Bundle-Name
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.doc;single
ton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/plugin.xml
index afd829760f3..1c192db9263 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/plugin.xml
@@ -11,10 +11,6 @@
file="target/generated-eclipse-help/symbols-toc.xml"
primary="false">
</toc>
- <toc
- file="target/generated-eclipse-help/constraints-toc.xml"
- primary="false">
- </toc>
<toc
file="target/generated-eclipse-help/constraint-creation-toc.xml"
primary="false">
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation-toc.xml
index fdac3be9ea6..1c3035af614 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation-toc.xml
@@ -1,9 +1,7 @@
<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="resource/constraint-creation.html" label="Create constraints" link_to="constraints-toc.xml">
- <topic href="target/generated-eclipse-help/constraint-creation.html" label="Create and edit constraints">
- <topic href="target/generated-eclipse-help/constraint-creation.html#Specify_the_context" label="Specify the context">
- </topic>
- <topic href="target/generated-eclipse-help/constraint-creation.html#Define_specification" label="Define constraint specification">
- </topic>
- </topic>
+<toc topic="org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation.html" label="constraint-creation">
+ <topic href="org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation.html" label="Create and edit constraints">
+ <topic href="org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation.html#Define_a_constraint_and_its_context" label="Define a constraint and its context"></topic>
+ <topic href="org.eclipse.papyrus.uml.diagram.common.doc/resource/constraint-creation.html#Define_constraint_specification" label="Define constraint specification"></topic>
+ </topic>
</toc> \ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.project
index 17669199be7..b03d5dc5a29 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/META-INF/MANIFEST.MF
index 2799cfaa2c8..0fa8318c7bf 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/META-INF/MANIFEST.MF
@@ -7,4 +7,5 @@ Bundle-Name: Profile Documentation
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.profile.doc;singl
eton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.doc/.project
index 3d8c60578e2..bf12f5f0c00 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.doc/META-INF/MANIFEST.MF
index 917d26d4a3f..4b5a72da82d 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/META-INF/MANIFEST.MF
@@ -6,4 +6,5 @@ Bundle-Version: 1.1.0.qualifier
Bundle-Name: Papyrus UML User Guide
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.uml.doc;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.project
index 9b07ce3a166..6954c03addb 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..af0f20f97a5
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/META-INF/MANIFEST.MF
index 87902101332..9b2e0202764 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/META-INF/MANIFEST.MF
@@ -9,4 +9,4 @@ Bundle-Name: %pluginName
Bundle-Description: %pluginDescription
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.uml.modelrepair.doc;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.project
index b0c2b835733..51c5c0048c9 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..af0f20f97a5
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/META-INF/MANIFEST.MF
index 330c6940b4d..c78c6fd382a 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/META-INF/MANIFEST.MF
@@ -9,5 +9,5 @@ Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.assistants.doc;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/resource/profile-assistants.html b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/resource/profile-assistants.html
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/resource/profile-assistants.html
+++ /dev/null
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.project
index b8000ad7c51..01dd3d2eb5c 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..af0f20f97a5
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/META-INF/MANIFEST.MF
index f50fc8fb856..9ca66121471 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/META-INF/MANIFEST.MF
@@ -9,5 +9,5 @@ Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.uml.search.ui.doc;singleton:=
true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/.project b/plugins/doc/org.eclipse.papyrus.views.properties.doc/.project
index 2c7104fb1bd..655f09640a0 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/doc/org.eclipse.papyrus.views.properties.doc/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.views.properties.doc/META-INF/MANIFEST.MF
index 7002aa9138d..f59f3bb5377 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/META-INF/MANIFEST.MF
@@ -7,4 +7,5 @@ Bundle-Name: Properties view Documentation
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.views.properties.doc;singleto
n:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/releng/top-pom-main.xml b/releng/top-pom-main.xml
index c1eed206bd6..c0a3c0e71d4 100644
--- a/releng/top-pom-main.xml
+++ b/releng/top-pom-main.xml
@@ -485,6 +485,11 @@
<enabled>false</enabled>
</snapshots>
</pluginRepository>
+ <pluginRepository>
+ <id>eclipse.org-mylyn</id>
+ <!-- url>https://repo.eclipse.org/content/repositories/mylyn-releases/</url -->
+ <url>https://repo.eclipse.org/content/repositories/mylyn/</url>
+ </pluginRepository>
</pluginRepositories>
<build>
<pluginManagement>
@@ -562,6 +567,37 @@
<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
<version>${mylyn.wikitext.version}</version>
</plugin>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.eclipse.mylyn.docs
+ </groupId>
+ <artifactId>
+ org.eclipse.mylyn.wikitext.core.maven
+ </artifactId>
+ <versionRange>
+ [2.4.0-SNAPSHOT,)
+ </versionRange>
+ <goals>
+ <goal>eclipse-help</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute></execute>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>

Back to the top