Fix build.properties for extra-plugins

10 files changed, 10 insertions, 14 deletions

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/build.properties b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/build.properties
index a6d090939f8..cf960aa3a5c 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/build.properties
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/build.properties
@@ -3,4 +3,5 @@ bin.includes = META-INF/,\
                *.xml,\

                resources/,\

                OSGI-INF/,\

-               build.properties

+               about.html

+src.includes = about.html

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/build.properties b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/build.properties
index 1ab1c499322..890b147293b 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/build.properties
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/build.properties
@@ -9,8 +9,7 @@ bin.includes = .,\
                META-INF/,\

                plugin.xml,\

                plugin.properties,\

-               about.html,\

-               build.properties

+               about.html

 jars.compile.order = .

 source.. = src/

 output.. = bin/

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/plugin.xml b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/plugin.xml
index 203ae6e7411..f1557059760 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/plugin.xml
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/plugin.xml
@@ -14,7 +14,7 @@
       <wizard

             category="org.eclipse.papyrus.wizards.category"

             class="org.eclipse.papyrus.diagramtemplate.editor.DiagramTemplateModelWizard"

-            finalPerspective="org.eclipse.papyrus.core.perspective"

+            finalPerspective="org.eclipse.papyrus.infra.core.perspective"

             icon="icons/full/obj16/DiagramTemplateModelFile.gif"

             id="org.eclipse.papyrus.diagramtemplate.presentation.DiagramTemplateModelWizardID"

             name="%_UI_DiagramTemplateModelWizard_label">

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate/build.properties b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate/build.properties
index b3a7ddf8928..90dc876dc50 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate/build.properties
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate/build.properties
@@ -9,8 +9,7 @@ bin.includes = .,\
                META-INF/,\

                plugin.xml,\

                plugin.properties,\

-               about.html,\

-               build.properties

+               about.html

 jars.compile.order = .

 source.. = src/

 output.. = bin/

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/plugin.properties b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/plugin.properties
index d617d814b7e..48685a1dbfc 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/plugin.properties
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/plugin.properties
@@ -9,4 +9,4 @@
 #     Chokri MRAIDHA  chokri.mraidha@cea.fr - Initial API and implementation

 ##################################################################################

 pluginName = UML profile and library for MARTE (Incubation)

-providerName = Papyrus Project

+providerName = Eclipse Modeling Project

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.vsl/.classpath b/extraplugins/marte/org.eclipse.papyrus.marte.vsl/.classpath
index 48aa7f6e91a..e5fbd3dd27a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.vsl/.classpath
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.vsl/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="xtend-gen"/>

 	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.vsl/META-INF/MANIFEST.MF b/extraplugins/marte/org.eclipse.papyrus.marte.vsl/META-INF/MANIFEST.MF
index 56b249aa805..545b1e41cab 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.vsl/META-INF/MANIFEST.MF
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.vsl/META-INF/MANIFEST.MF
@@ -24,14 +24,14 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.emf.common,

  org.antlr.runtime,

  org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0"

+ org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",

+ org.apache.log4j;bundle-version="1.2.15"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

 Bundle-Version: 0.9.0.qualifier

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

-Import-Package: org.apache.log4j

 Bundle-SymbolicName: org.eclipse.papyrus.marte.vsl;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 Bundle-Localization: plugin

diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.vsl/build.properties b/extraplugins/marte/org.eclipse.papyrus.marte.vsl/build.properties
index 0ed753dd924..0d0fcd49ce9 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.vsl/build.properties
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.vsl/build.properties
@@ -7,6 +7,4 @@ bin.includes = META-INF/,\
                plugin.properties,\
                model/,\
                build.properties
-source.. = src/,\
-           src-gen/
 src.includes = about.html
diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.compare.report.ui/build.properties b/extraplugins/uml/compare/org.eclipse.papyrus.compare.report.ui/build.properties
index 2ee7fcec546..d9ef6898f30 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.compare.report.ui/build.properties
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.compare.report.ui/build.properties
@@ -5,6 +5,6 @@ bin.includes = META-INF/,\
                plugin.xml,\

                icons/,\

                about.html,\

-               OSGI-INF/l10n/bundle.properties

+               OSGI-INF/

 src.includes = about.html

 

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.compare.report/build.properties b/extraplugins/uml/compare/org.eclipse.papyrus.compare.report/build.properties
index f7bcc5674f5..ed077d52ad5 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.compare.report/build.properties
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.compare.report/build.properties
@@ -3,6 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\

                .,\

                about.html,\

-               OSGI-INF/l10n/bundle.properties

+               OSGI-INF/

 customBuildCallbacks = build.acceleo

 src.includes = about.html