Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2016-02-25 15:31:55 +0000
committerGerrit Code Review @ Eclipse.org2016-02-26 22:04:35 +0000
commit387d1f9462ab95dd485b80197a7fdf32c0bf051b (patch)
tree3dfdb183eecfd2f88b8232856e88b5b7335f7e69
parenteebdd17c762211ebcf417844cd21432d4ba3df34 (diff)
downloadorg.eclipse.papyrus-387d1f9462ab95dd485b80197a7fdf32c0bf051b.tar.gz
org.eclipse.papyrus-387d1f9462ab95dd485b80197a7fdf32c0bf051b.tar.xz
org.eclipse.papyrus-387d1f9462ab95dd485b80197a7fdf32c0bf051b.zip
Bug 443315: Papyrus should contribute to help.eclipse.org infocenter
Remove extraneous dependencies from doc bundles so that they may be deployed in the Eclipse Infocenter. The welcome page content in the infra.doc bundle is moved to the uml.diagram.wizards bundle in which the referenced actions (launching the New Model Wizard) actually reside. Change-Id: Ic31dccbea5ed9676733aaefe04aac405aa62d908
-rw-r--r--plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF5
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF4
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.doc/build.properties1
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.doc/plugin.xml35
-rw-r--r--plugins/doc/org.eclipse.papyrus.req.reqif.doc/META-INF/MANIFEST.MF4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/build.properties37
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/intro/css/firststeps.css (renamed from plugins/doc/org.eclipse.papyrus.infra.doc/intro/css/firststeps.css)0
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/intro/css/graphics/newproject.png (renamed from plugins/doc/org.eclipse.papyrus.infra.doc/intro/css/graphics/newproject.png)bin3348 -> 3348 bytes
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/intro/css/graphics/newproject_hov.png (renamed from plugins/doc/org.eclipse.papyrus.infra.doc/intro/css/graphics/newproject_hov.png)bin3348 -> 3348 bytes
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/intro/css/overview.css (renamed from plugins/doc/org.eclipse.papyrus.infra.doc/intro/css/overview.css)0
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/intro/firststeps.xml (renamed from plugins/doc/org.eclipse.papyrus.infra.doc/intro/firststeps.xml)0
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/intro/overview.xml (renamed from plugins/doc/org.eclipse.papyrus.infra.doc/intro/overview.xml)0
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.xml134
13 files changed, 111 insertions, 109 deletions
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 3a582ffdd47..8586762e356 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
@@ -1,8 +1,5 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.common.doc;bundle-version="[1.2.0,2.0.0)",
+Require-Bundle: org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)",
org.eclipse.help;bundle-version="[3.7.0,4.0.0)"
Bundle-Vendor: %vendorName
Bundle-ActivationPolicy: lazy
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 fe3bbb58da9..12c093c602d 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
@@ -1,7 +1,5 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.ui.intro;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.pde.ui;bundle-version="[3.9.0,4.0.0)"
+Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-Version: 1.2.0.qualifier
Bundle-Name: %Bundle-Name
diff --git a/plugins/doc/org.eclipse.papyrus.infra.doc/build.properties b/plugins/doc/org.eclipse.papyrus.infra.doc/build.properties
index dcb5ebc16cd..7243208e2c4 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/build.properties
@@ -1,7 +1,6 @@
bin.includes = META-INF/,\
plugin.xml,\
OSGI-INF/,\
- intro/,\
toc.xml,\
about.html,\
resource/
diff --git a/plugins/doc/org.eclipse.papyrus.infra.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.infra.doc/plugin.xml
index fb0251c8839..c3d81ff54f4 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.doc/plugin.xml
@@ -1,23 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.ui.intro.configExtension">
- <configExtension
- configId="org.eclipse.ui.intro.universalConfig"
- content="intro/firststeps.xml">
- </configExtension>
- <configExtension
- configId="org.eclipse.ui.intro.universalConfig"
- content="intro/overview.xml">
- </configExtension>
- </extension>
- <extension
- point="org.eclipse.help.toc">
- <toc
- category="org.eclipse.papyrus"
- file="toc.xml"
- primary="true">
- </toc>
- </extension>
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.help.toc">
+ <toc
+ category="org.eclipse.papyrus"
+ file="toc.xml"
+ primary="true">
+ </toc>
+ </extension>
+</plugin>
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 d3cae19b204..2aca4a40292 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
@@ -1,7 +1,5 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.help;bundle-version="[3.7.0,4.0.0)",
+Require-Bundle: org.eclipse.help;bundle-version="[3.7.0,4.0.0)",
org.eclipse.papyrus.infra.doc;bundle-version="[1.2.0,2.0.0)"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/build.properties
index fad366a81c0..e748a44ebb9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/build.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/build.properties
@@ -1,14 +1,23 @@
-#
-#Mon Sep 12 09:30:25 CEST 2011
-bin.includes = META-INF/,\
- .,\
- icons/,\
- plugin.xml,\
- schema/,\
- plugin.properties,\
- about.html,\
- src/org/eclipse/papyrus/uml/diagram/wizards/messages/messages.properties
-output..=bin/
-src.includes = about.html
-source..=src/
-bin..=bin/
+#
+# Copyright (c) 2009, 2016 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
+#
+# Contributors:
+# CEA LIST - Initial API and implementation
+# Christian W. Damus - bug 485220
+#
+bin.includes = META-INF/,\
+ .,\
+ icons/,\
+ intro/,\
+ plugin.xml,\
+ schema/,\
+ plugin.properties,\
+ about.html
+src.includes = about.html
+source..=src/
+output..=bin/
diff --git a/plugins/doc/org.eclipse.papyrus.infra.doc/intro/css/firststeps.css b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/intro/css/firststeps.css
index 74f9c98b8e7..74f9c98b8e7 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.doc/intro/css/firststeps.css
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/intro/css/firststeps.css
diff --git a/plugins/doc/org.eclipse.papyrus.infra.doc/intro/css/graphics/newproject.png b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/intro/css/graphics/newproject.png
index 1a6ee9b632f..1a6ee9b632f 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.doc/intro/css/graphics/newproject.png
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/intro/css/graphics/newproject.png
Binary files differ
diff --git a/plugins/doc/org.eclipse.papyrus.infra.doc/intro/css/graphics/newproject_hov.png b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/intro/css/graphics/newproject_hov.png
index 1a6ee9b632f..1a6ee9b632f 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.doc/intro/css/graphics/newproject_hov.png
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/intro/css/graphics/newproject_hov.png
Binary files differ
diff --git a/plugins/doc/org.eclipse.papyrus.infra.doc/intro/css/overview.css b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/intro/css/overview.css
index 74f9c98b8e7..74f9c98b8e7 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.doc/intro/css/overview.css
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/intro/css/overview.css
diff --git a/plugins/doc/org.eclipse.papyrus.infra.doc/intro/firststeps.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/intro/firststeps.xml
index 9d84d6b5484..9d84d6b5484 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.doc/intro/firststeps.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/intro/firststeps.xml
diff --git a/plugins/doc/org.eclipse.papyrus.infra.doc/intro/overview.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/intro/overview.xml
index 6d8ef3b5184..6d8ef3b5184 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.doc/intro/overview.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/intro/overview.xml
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.xml
index b928c2269ef..f15f64a13c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/plugin.xml
@@ -1,61 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin>
-
-<extension-point id="templates" name="UML2 Model Templates" schema="schema/templates.exsd"/>
-<extension-point id="newModelStorageProviders" name="New Model Storage Providers" schema="schema/newModelStorageProviders.exsd"/>
-
-<extension point="org.eclipse.ui.newWizards">
- <category
- id="org.eclipse.papyrus.wizards.category"
- name="Papyrus">
- </category>
- <category
- id="org.eclipse.papyrus.examples"
- parentCategory="org.eclipse.ui.Examples"
- name="Papyrus examples">
- </category>
- <wizard
- category="org.eclipse.papyrus.wizards.category"
- class="org.eclipse.papyrus.uml.diagram.wizards.wizards.NewPapyrusProjectWizard"
- finalPerspective="org.eclipse.papyrus.infra.core.perspective"
- icon="icons/papyrus/new_papyrus_project.gif"
- id="org.eclipse.papyrus.uml.diagram.wizards.createproject"
- name="Papyrus Project"
- project="true">
- <description>
- %NewWizards.project.description
- </description>
- </wizard>
- <wizard
- category="org.eclipse.papyrus.wizards.category"
- class="org.eclipse.papyrus.uml.diagram.wizards.wizards.InitModelWizard"
- finalPerspective="org.eclipse.papyrus.infra.core.perspective"
- icon="icons/papyrus/new_papyrus_model.gif"
- id="org.eclipse.papyrus.uml.diagram.wizards.createmodel"
- name="Papyrus Model">
- </wizard>
-</extension>
-
-<extension
- point="org.eclipse.papyrus.uml.diagram.wizards.newModelStorageProviders">
- <provider
- class="org.eclipse.papyrus.uml.diagram.wizards.providers.WorkspaceNewModelStorageProvider"
- name="In the workspace">
- <enablement>
- <iterate>
- <adapt
- type="org.eclipse.core.resources.IResource">
- </adapt>
- </iterate>
- </enablement>
- </provider>
-</extension>
-<extension
- point="org.eclipse.help.contexts">
- <contexts
- file="help/helpContext.xml"
- plugin="org.eclipse.papyrus.uml.diagram.wizards">
- </contexts>
-</extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin>
+
+<extension-point id="templates" name="UML2 Model Templates" schema="schema/templates.exsd"/>
+<extension-point id="newModelStorageProviders" name="New Model Storage Providers" schema="schema/newModelStorageProviders.exsd"/>
+
+<extension point="org.eclipse.ui.newWizards">
+ <category
+ id="org.eclipse.papyrus.wizards.category"
+ name="Papyrus">
+ </category>
+ <category
+ id="org.eclipse.papyrus.examples"
+ parentCategory="org.eclipse.ui.Examples"
+ name="Papyrus examples">
+ </category>
+ <wizard
+ category="org.eclipse.papyrus.wizards.category"
+ class="org.eclipse.papyrus.uml.diagram.wizards.wizards.NewPapyrusProjectWizard"
+ finalPerspective="org.eclipse.papyrus.infra.core.perspective"
+ icon="icons/papyrus/new_papyrus_project.gif"
+ id="org.eclipse.papyrus.uml.diagram.wizards.createproject"
+ name="Papyrus Project"
+ project="true">
+ <description>
+ %NewWizards.project.description
+ </description>
+ </wizard>
+ <wizard
+ category="org.eclipse.papyrus.wizards.category"
+ class="org.eclipse.papyrus.uml.diagram.wizards.wizards.InitModelWizard"
+ finalPerspective="org.eclipse.papyrus.infra.core.perspective"
+ icon="icons/papyrus/new_papyrus_model.gif"
+ id="org.eclipse.papyrus.uml.diagram.wizards.createmodel"
+ name="Papyrus Model">
+ </wizard>
+</extension>
+
+<extension
+ point="org.eclipse.papyrus.uml.diagram.wizards.newModelStorageProviders">
+ <provider
+ class="org.eclipse.papyrus.uml.diagram.wizards.providers.WorkspaceNewModelStorageProvider"
+ name="In the workspace">
+ <enablement>
+ <iterate>
+ <adapt
+ type="org.eclipse.core.resources.IResource">
+ </adapt>
+ </iterate>
+ </enablement>
+ </provider>
+</extension>
+<extension
+ point="org.eclipse.help.contexts">
+ <contexts
+ file="help/helpContext.xml"
+ plugin="org.eclipse.papyrus.uml.diagram.wizards">
+ </contexts>
+</extension>
+
+ <extension
+ point="org.eclipse.ui.intro.configExtension">
+ <configExtension
+ configId="org.eclipse.ui.intro.universalConfig"
+ content="intro/firststeps.xml">
+ </configExtension>
+ <configExtension
+ configId="org.eclipse.ui.intro.universalConfig"
+ content="intro/overview.xml">
+ </configExtension>
+ </extension>
+
+</plugin>

Back to the top