Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Le Fevre - CEA2015-03-19 14:18:44 +0000
committerFrancois Le Fevre2015-03-23 08:00:16 +0000
commit1c5f1a88f33a1624f844e67fb369f6ae76e862b4 (patch)
tree7089d672cbba6ae331a1c20a58f3faa6598a1150 /plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc
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>
Diffstat (limited to 'plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc')
-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
4 files changed, 24 insertions, 1 deletions
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

Back to the top