diff options
| author | Christian W. Damus | 2016-01-06 15:34:59 +0000 |
|---|---|---|
| committer | Christian W. Damus | 2016-01-06 15:36:08 +0000 |
| commit | 56154899c1e496f757568c78a0de320bb6278632 (patch) | |
| tree | 6d133f23ee365f88dde2065f9f1f4020570aa221 /plugins | |
| parent | 1dbd408ab7427b161e0ee1e02ab9413a646bd178 (diff) | |
| download | org.eclipse.papyrus-56154899c1e496f757568c78a0de320bb6278632.tar.gz org.eclipse.papyrus-56154899c1e496f757568c78a0de320bb6278632.tar.xz org.eclipse.papyrus-56154899c1e496f757568c78a0de320bb6278632.zip | |
Bug 485236: [Releng] org.eclipse.papyrus.infra.ui is not an Eclipse-ish project
https://bugs.eclipse.org/bugs/show_bug.cgi?id=485236
Restructure the bundle layout and metadata to match the Papyrus norm.
Diffstat (limited to 'plugins')
15 files changed, 4 insertions, 294 deletions
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/.classpath b/plugins/infra/org.eclipse.papyrus.infra.ui/.classpath index a95e0906ca0..098194ca4b7 100644 --- a/plugins/infra/org.eclipse.papyrus.infra.ui/.classpath +++ b/plugins/infra/org.eclipse.papyrus.infra.ui/.classpath @@ -2,6 +2,6 @@ <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/build.properties b/plugins/infra/org.eclipse.papyrus.infra.ui/build.properties index 488c00bbd17..d1e73b0471a 100644 --- a/plugins/infra/org.eclipse.papyrus.infra.ui/build.properties +++ b/plugins/infra/org.eclipse.papyrus.infra.ui/build.properties @@ -1,5 +1,5 @@ -source.. = src/main/java/
-output.. = target/classes/
+source.. = src/
+output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
.,\
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.ui/pom.xml index bdcb512cca0..392c6db7ab2 100644 --- a/plugins/infra/org.eclipse.papyrus.infra.ui/pom.xml +++ b/plugins/infra/org.eclipse.papyrus.infra.ui/pom.xml @@ -12,116 +12,4 @@ <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <description>Plugin dedicated to manage generic menus and actions, linked to EMF but not to UML nor GMF technologies.</description> - - <issueManagement> - <url>https://bugs.eclipse.org/bugs</url> - <system>Eclipse Bugzilla Issues</system> - </issueManagement> - - <licenses> - <license> - <name>Eclipse Public License</name> - <url>https://www.eclipse.org/legal/epl-v10.html</url> - <distribution>repo</distribution> - </license> - </licenses> - - <scm> - <url>https://git.eclipse.org/c/papyrus/org.eclipse.papyrus.git</url> - <connection>scm:git:git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus.git</connection> - <developerConnection>scm:git:git@github.com:kevinsawicki/github-maven-example.gitssh://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus.git</developerConnection> - </scm> - - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <phase>pre-site</phase> - <goals> - <goal>create</goal> - </goals> - <configuration> - <doCheck>false</doCheck> - <doUpdate>false</doUpdate> - <format>{0,date,yyyy-MM-dd_HH-mm}</format> - <items> - <item>timestamp</item> - </items> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>3.3</version> - <configuration> - <skipDeploy>false</skipDeploy> - <!-- stagingSiteURL>file://${siteMainDirectory}</stagingSiteURL --> - </configuration> - <dependencies> - <dependency> - <groupId>lt.velykis.maven.skins</groupId> - <artifactId>reflow-velocity-tools</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - <version>1.7</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pdf-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>pdf</id> - <phase>site</phase> - <goals> - <goal>pdf</goal> - </goals> - <configuration> - <outputDirectory>${project.reporting.outputDirectory}</outputDirectory> - <includeReports>false</includeReports> - <docDescriptor>src/site/pdf/main.pdf.xml</docDescriptor> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.2</version> - <configuration> - <show>private</show> - <!-- nohelp>true</nohelp --> - </configuration> - </plugin> - </plugins> - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.8</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.2</version> - <configuration> - <!-- stylesheetfile>${basedir}/src/main/javadoc/stylesheet.css</stylesheetfile --> - <!-- show>public</show --> - </configuration> - </plugin> - </plugins> - </reporting> </project>
\ No newline at end of file diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/Activator.java b/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/Activator.java index 27101698e64..27101698e64 100644 --- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/Activator.java +++ b/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/Activator.java diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/AbstractCommonCommandHandler.java b/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/AbstractCommonCommandHandler.java index 0dde1df49b9..0dde1df49b9 100644 --- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/AbstractCommonCommandHandler.java +++ b/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/AbstractCommonCommandHandler.java diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/AbstractEMFParametricOnSelectedElementsAction.java b/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/AbstractEMFParametricOnSelectedElementsAction.java index 857d4373055..857d4373055 100644 --- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/AbstractEMFParametricOnSelectedElementsAction.java +++ b/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/AbstractEMFParametricOnSelectedElementsAction.java diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/AbstractParametricOnSelectedElementsAction.java b/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/AbstractParametricOnSelectedElementsAction.java index ef2255fc632..ef2255fc632 100644 --- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/AbstractParametricOnSelectedElementsAction.java +++ b/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/AbstractParametricOnSelectedElementsAction.java diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/NameNormalization.java b/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/NameNormalization.java index 44d3711682d..44d3711682d 100644 --- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/NameNormalization.java +++ b/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/NameNormalization.java diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/NameNormalizationCommand.java b/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/NameNormalizationCommand.java index 563cb346a83..563cb346a83 100644 --- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/NameNormalizationCommand.java +++ b/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/NameNormalizationCommand.java diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/NamePropertyTester.java b/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/NamePropertyTester.java index d8d10a71890..d8d10a71890 100644 --- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/main/java/org/eclipse/papyrus/infra/ui/menu/NamePropertyTester.java +++ b/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/NamePropertyTester.java diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/pdf/main.pdf.xml b/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/pdf/main.pdf.xml deleted file mode 100644 index 77c0f61bafa..00000000000 --- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/pdf/main.pdf.xml +++ /dev/null @@ -1,24 +0,0 @@ -<document xmlns="http://maven.apache.org/DOCUMENT/1.0.1" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DOCUMENT/1.0.1 http://maven.apache.org/xsd/document-1.0.1.xsd" - outputName="org.eclipse.papyrus.infra.ui.doc"> - - <meta> - <title>org.eclipse.papyrus.infra.ui</title> - <author>CEA LISE</author> - </meta> - - <toc name="Table of Contents"> - <item name="Home" ref="home.html"/> - </toc> - - <cover> - <coverTitle>${project.name}</coverTitle> - <coverSubTitle>v. ${project.version} build ${buildNumber}</coverSubTitle> - <coverType>Developer Documentation</coverType> - <projectName>${project.name}</projectName> - <projectLogo>./images/papyrus.png</projectLogo> - <companyName>Eclipse</companyName> - <companyLogo>./images/eclipse-800x188.png</companyLogo> - </cover> -</document>
\ No newline at end of file diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/resources/images/eclipse-800x188.png b/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/resources/images/eclipse-800x188.png Binary files differdeleted file mode 100644 index 0c469529da5..00000000000 --- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/resources/images/eclipse-800x188.png +++ /dev/null diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/resources/images/papyrus.png b/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/resources/images/papyrus.png Binary files differdeleted file mode 100644 index edf2a1c9a32..00000000000 --- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/resources/images/papyrus.png +++ /dev/null diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/site.xml b/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/site.xml deleted file mode 100644 index 421f048ddb9..00000000000 --- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/site.xml +++ /dev/null @@ -1,125 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="Reflow Maven Skin" - xmlns="http://maven.apache.org/DECORATION/1.3.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd"> - - <bannerLeft> - <name><![CDATA[ - Eclipse <span class="color-highlight">Papyrus</span> project - ]]> - </name> - <href>https://www.eclipse.org/papyrus/</href> - </bannerLeft> - - <publishDate position="bottom" format="yyyy-MM-dd" /> - <version position="bottom" /> - <googleAnalyticsAccountId>UA-XXXXXX</googleAnalyticsAccountId> - - <skin> - <groupId>lt.velykis.maven.skins</groupId> - <artifactId>reflow-maven-skin</artifactId> - <version>1.1.1</version> - </skin> - <custom> - <reflowSkin> - <!-- Make this to 'false' for local development, i.e. file:// URLs --> - <protocolRelativeURLs>false</protocolRelativeURLs> - <smoothScroll>true</smoothScroll> - <theme>bootswatch-cosmo</theme> - <highlightJs>true</highlightJs> - <highlightJsTheme>github</highlightJsTheme> - <!-- absoluteResourceURL>http://flefevre.github.io/testpapy/</absoluteResourceURL--> - <brand> - <!-- Brand text in top-left part of the site --> - <name> - <![CDATA[ - Eclipse <span class="color-highlight">Papyrus</span> Project - ]]> - </name> - <href>https://www.eclipse.org/papyrus/</href> - </brand> - <slogan>an integrated and user-consumable environment for editing any kind of EMF model (UML, SysML, MARTE...)</slogan> - <titleTemplate>%2$s | %1$s</titleTemplate> - <!-- Use Table of Contents at the top of the page (max 6 elements) --> - <toc>top</toc> - <tocTopMax>6</tocTopMax> - <!-- Include the documentation and tools in the top navigation (in addition to links) --> - <topNav>Main|reports|modules|parent</topNav> - <!-- Split menus in the bottom navigation --> - <bottomNav maxSpan="9" > - <column>Main</column> - <column>Download</column> - <column>reports|modules|parent</column> - </bottomNav> - <bottomDescription> - <![CDATA[ - Eclipse <span class="color-highlight">Papyrus</span> project is aiming at providing an ntegrated and user-consumable environment for editing any kind of EMF model and particularly supporting UML and related modeling languages such as SysML and MARTE. - ]]> - </bottomDescription> - <pages> - <index project="infra.ui"> - <!-- Override the title --> - <titleTemplate>Papyrus</titleTemplate> - <!-- no breadcrumbs on the main index page --> - <breadcrumbs>false</breadcrumbs> - <!-- no ToC on the main index page --> - <toc>false</toc> - <markPageHeader>false</markPageHeader> - <sections> - <!-- carousel /--> - <columns>2</columns> - <body /> - <sidebar /> - </sections> - </index> - <contribute> - <breadcrumbs>false</breadcrumbs> - </contribute> - <!-- Disable source highlighting for Maven reports --> - <source-repository> - <highlightJs>false</highlightJs> - </source-repository> - <issue-tracking> - <highlightJs>false</highlightJs> - <toc>false</toc> - </issue-tracking> - <license> - <highlightJs>false</highlightJs> - <toc>false</toc> - </license> - <!-- Disable ToC for some Maven reports --> - <project-info> - <toc>false</toc> - </project-info> - <!-- github-report> - <toc>false</toc> - </github-report--> - <dependencies> - <tocTopMax>4</tocTopMax> - </dependencies> - </pages> - </reflowSkin> - </custom> - - <body> - - <links> - <item name="Online" href="http://www.eclipse.org/papyrus" /> - <item name="Nexus repository" href="https://repo.eclipse.org/index.html#welcome" /> - <item name="Pdf" href="org.eclipse.papyrus.infra.ui.doc.pdf" /> - </links> - - <breadcrumbs> - <item name="nf-doc" href="/" /> - </breadcrumbs> - - <menu name="Main" inherit="top"> - <item name="Home" href="home.html" /> - <item name="Index" href="index.html" /> - </menu> - <menu name="Maven documentation" ref="reports" inherit="bottom"/> - <menu ref="modules" inherit="top" /> - <menu ref="parent" inherit="top" /> - </body> -</project> diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/xdoc/home.xml b/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/xdoc/home.xml deleted file mode 100644 index 09934bebfa2..00000000000 --- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/site/xdoc/home.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"> - - <properties> - <title>org.eclipse.papyrus.infra.ui</title> - </properties> - - <body> - <section name="org.eclipse.papyrus.uinfra.ui for developers"> - <p>section dedicated for developers</p> - <subsection name="Context"> - <p>This plugin is dedicated to hold any generic menu or actions, linked eventually to EMF, but not to GMF nor UML. - </p> - </subsection> - </section> - <section name="Documentation generation"> - <subsection name="Javadoc generation defined in plugin section"> - <source>mvn javadoc:javadoc</source> - </subsection> - <subsection name="Web site generation with javadoc defined in report section"> - <source>mvn site:site</source> - </subsection> - <subsection name="Pdf generation"> - <source>mvn pdf:pdf</source> - </subsection> - </section> - </body> -</document>
\ No newline at end of file |
