Bug 482683 - [RobotML][web] make a prototype for the web site
- adding a name for each artifact
- adding a profile for web staging
Change-Id: I44c2f8b156d044c9cda7e3411013ecfa22a12dc2
Signed-off-by: Francois Le Fevre - CEA <francois.le-fevre@cea.fr>
diff --git a/generators/org.eclipse.papyrus.robotml.generators.common/pom.xml b/generators/org.eclipse.papyrus.robotml.generators.common/pom.xml
index cfaefaa..4335a05 100644
--- a/generators/org.eclipse.papyrus.robotml.generators.common/pom.xml
+++ b/generators/org.eclipse.papyrus.robotml.generators.common/pom.xml
@@ -8,4 +8,5 @@
</parent>
<artifactId>org.eclipse.papyrus.robotml.generators.common</artifactId>
<packaging>eclipse-plugin</packaging>
+ <name>org.eclipse.papyrus.robotml.generators.common</name>
</project>
\ No newline at end of file
diff --git a/generators/pom.xml b/generators/pom.xml
index 21530a9..142c32b 100644
--- a/generators/pom.xml
+++ b/generators/pom.xml
@@ -8,6 +8,7 @@
</parent>
<artifactId>org.eclipse.papyrus.robotml.generators</artifactId>
<packaging>pom</packaging>
+ <name>RobotML Generators</name>
<modules>
<module>org.eclipse.papyrus.robotml.generators.common</module>
<module>rtmaps</module>
diff --git a/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui/pom.xml b/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui/pom.xml
index 0500691..afd28e0 100644
--- a/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui/pom.xml
+++ b/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui/pom.xml
@@ -8,4 +8,5 @@
</parent>
<artifactId>org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui</artifactId>
<packaging>eclipse-plugin</packaging>
+ <name>org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui</name>
</project>
\ No newline at end of file
diff --git a/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps/pom.xml b/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps/pom.xml
index 36d51d3..233e3d5 100644
--- a/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps/pom.xml
+++ b/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps/pom.xml
@@ -8,4 +8,5 @@
</parent>
<artifactId>org.eclipse.papyrus.robotml.generators.intempora.rtmaps</artifactId>
<packaging>eclipse-plugin</packaging>
+ <name>org.eclipse.papyrus.robotml.generators.intempora.rtmaps</name>
</project>
\ No newline at end of file
diff --git a/generators/rtmaps/pom.xml b/generators/rtmaps/pom.xml
index 9246ec4..79e838c 100644
--- a/generators/rtmaps/pom.xml
+++ b/generators/rtmaps/pom.xml
@@ -8,6 +8,7 @@
</parent>
<artifactId>org.eclipse.papyrus.robotml.generators.rtmaps</artifactId>
<packaging>pom</packaging>
+ <name>RobotML Rtmaps</name>
<modules>
<module>org.eclipse.papyrus.robotml.generators.intempora.rtmaps</module>
<module>org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui</module>
diff --git a/org.eclipse.papyrus.robotml.deployment/pom.xml b/org.eclipse.papyrus.robotml.deployment/pom.xml
index eb9b185..c659e33 100644
--- a/org.eclipse.papyrus.robotml.deployment/pom.xml
+++ b/org.eclipse.papyrus.robotml.deployment/pom.xml
@@ -8,4 +8,5 @@
</parent>
<artifactId>org.eclipse.papyrus.robotml.deployment</artifactId>
<packaging>eclipse-plugin</packaging>
+ <name>org.eclipse.papyrus.robotml.deployment</name>
</project>
\ No newline at end of file
diff --git a/org.eclipse.papyrus.robotml.diagram.common/pom.xml b/org.eclipse.papyrus.robotml.diagram.common/pom.xml
index 802ed6b..56f51af 100644
--- a/org.eclipse.papyrus.robotml.diagram.common/pom.xml
+++ b/org.eclipse.papyrus.robotml.diagram.common/pom.xml
@@ -8,4 +8,5 @@
</parent>
<artifactId>org.eclipse.papyrus.robotml.diagram.common</artifactId>
<packaging>eclipse-plugin</packaging>
+ <name>org.eclipse.papyrus.robotml.diagram.common</name>
</project>
\ No newline at end of file
diff --git a/org.eclipse.papyrus.robotml.diagram.ui/pom.xml b/org.eclipse.papyrus.robotml.diagram.ui/pom.xml
index f5db394..e5ba8da 100644
--- a/org.eclipse.papyrus.robotml.diagram.ui/pom.xml
+++ b/org.eclipse.papyrus.robotml.diagram.ui/pom.xml
@@ -8,4 +8,5 @@
</parent>
<artifactId>org.eclipse.papyrus.robotml.diagram.ui</artifactId>
<packaging>eclipse-plugin</packaging>
+ <name>org.eclipse.papyrus.robotml.diagram.ui</name>
</project>
\ No newline at end of file
diff --git a/org.eclipse.papyrus.robotml.doc/pom.xml b/org.eclipse.papyrus.robotml.doc/pom.xml
index 9213322..68a293e 100644
--- a/org.eclipse.papyrus.robotml.doc/pom.xml
+++ b/org.eclipse.papyrus.robotml.doc/pom.xml
@@ -8,4 +8,5 @@
</parent>
<artifactId>org.eclipse.papyrus.robotml.doc</artifactId>
<packaging>eclipse-plugin</packaging>
+ <name>org.eclipse.papyrus.robotml.doc</name>
</project>
\ No newline at end of file
diff --git a/org.eclipse.papyrus.robotml.modelexplorer/pom.xml b/org.eclipse.papyrus.robotml.modelexplorer/pom.xml
index 845e63b..fe108db 100644
--- a/org.eclipse.papyrus.robotml.modelexplorer/pom.xml
+++ b/org.eclipse.papyrus.robotml.modelexplorer/pom.xml
@@ -8,4 +8,5 @@
</parent>
<artifactId>org.eclipse.papyrus.robotml.modelexplorer</artifactId>
<packaging>eclipse-plugin</packaging>
+ <name>org.eclipse.papyrus.robotml.modelexplorer</name>
</project>
\ No newline at end of file
diff --git a/org.eclipse.papyrus.robotml.perspective/pom.xml b/org.eclipse.papyrus.robotml.perspective/pom.xml
index 4090500..b5aeec2 100644
--- a/org.eclipse.papyrus.robotml.perspective/pom.xml
+++ b/org.eclipse.papyrus.robotml.perspective/pom.xml
@@ -8,4 +8,5 @@
</parent>
<artifactId>org.eclipse.papyrus.robotml.perspective</artifactId>
<packaging>eclipse-plugin</packaging>
+ <name>org.eclipse.papyrus.robotml.perspective</name>
</project>
\ No newline at end of file
diff --git a/org.eclipse.papyrus.robotml.templaterepository/pom.xml b/org.eclipse.papyrus.robotml.templaterepository/pom.xml
index 8c21b06..ec8ea57 100644
--- a/org.eclipse.papyrus.robotml.templaterepository/pom.xml
+++ b/org.eclipse.papyrus.robotml.templaterepository/pom.xml
@@ -8,4 +8,5 @@
</parent>
<artifactId>org.eclipse.papyrus.robotml.templaterepository</artifactId>
<packaging>eclipse-plugin</packaging>
+ <name>org.eclipse.papyrus.robotml.templaterepository</name>
</project>
\ No newline at end of file
diff --git a/org.eclipse.papyrus.robotml.validation/pom.xml b/org.eclipse.papyrus.robotml.validation/pom.xml
index 78c73bf..5d95f3a 100644
--- a/org.eclipse.papyrus.robotml.validation/pom.xml
+++ b/org.eclipse.papyrus.robotml.validation/pom.xml
@@ -8,4 +8,5 @@
</parent>
<artifactId>org.eclipse.papyrus.robotml.validation</artifactId>
<packaging>eclipse-plugin</packaging>
+ <name>org.eclipse.papyrus.robotml.validation</name>
</project>
\ No newline at end of file
diff --git a/org.eclipse.papyrus.robotml/pom.xml b/org.eclipse.papyrus.robotml/pom.xml
index 02a467b..e60696f 100644
--- a/org.eclipse.papyrus.robotml/pom.xml
+++ b/org.eclipse.papyrus.robotml/pom.xml
@@ -8,4 +8,5 @@
</parent>
<artifactId>org.eclipse.papyrus.robotml</artifactId>
<packaging>eclipse-plugin</packaging>
+ <name>org.eclipse.papyrus.robotml</name>
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4c775a0..9b905d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<artifactId>org.eclipse.papyrus.robotml.parent</artifactId>
<version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>robotml</name>
+ <name>RobotML</name>
<description>Papyrus RobotML platform</description>
<modules>
@@ -47,7 +47,7 @@
<maven-pmd-version>3.1</maven-pmd-version>
<maven-jxr-version>2.3</maven-jxr-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
+
<siteMainDirectory>${user.home}/staging</siteMainDirectory>
<!-- Eclipse properties -->
@@ -101,7 +101,7 @@
<name>Saadia DHOUIB</name>
<organization>CEA Tech LIST</organization>
<organizationUrl>http://www-list.cea.fr/</organizationUrl>
- <id>bmaggi</id>
+ <id>sdhouib</id>
</developer>
<developer>
<name>Francois LE FEVRE</name>
@@ -112,7 +112,9 @@
</developers>
<contributors>
<contributor>
- <name>Klass GADEYNE</name>
+ <name>Benoit MAGGI</name>
+ <organization>CEA Tech LIST</organization>
+ <organizationUrl>http://www-list.cea.fr/</organizationUrl>
</contributor>
</contributors>
@@ -378,7 +380,7 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <!-- plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<inherited>false</inherited>
@@ -400,7 +402,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
@@ -409,7 +411,8 @@
<inputEncoding>UTF-8</inputEncoding>
<outputEncoding>UTF-8</outputEncoding>
<skipDeploy>false</skipDeploy>
- <stagingSiteURL>file://${siteMainDirectory}</stagingSiteURL>
+ <stagingSiteURL>file://${siteMainDirectory}/${project.version}</stagingSiteURL>
+ <!--topSiteURL>http://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml-website/ws/site-staging/</topSiteURL -->
</configuration>
<dependencies>
<dependency>
@@ -429,11 +432,11 @@
<artifactId>maven-scm-publish-plugin</artifactId>
<version>1.1</version>
<configuration>
- <!-- checkoutDirectory>${scmPubCheckoutDirectory}</checkoutDirectory -->
+ <!-- checkoutDirectory>${siteMainDirectory}</checkoutDirectory -->
<content>${siteMainDirectory}</content>
<tryUpdate>true</tryUpdate>
- <scmBranch>gh-pages</scmBranch>
- <pubScmUrl>scm:git:git@github.com:flefevre/testpapy.git</pubScmUrl>
+ <scmBranch>master</scmBranch>
+ <pubScmUrl>scm:git:https://git.eclipse.org/gitroot/www.eclipse.org/papyrus-robotml</pubScmUrl>
</configuration>
<executions>
<execution>
@@ -519,6 +522,11 @@
</reportSet>
</reportSets>
</plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco-version}</version>
+ </plugin>
</plugins>
</reporting>
@@ -567,6 +575,18 @@
</dependencies>
<executions>
<execution>
+ <id>userguidepdf</id>
+ <phase>site</phase>
+ <goals>
+ <goal>pdf</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.reporting.outputDirectory}/pdf</outputDirectory>
+ <includeReports>false</includeReports>
+ <docDescriptor>src/site/pdf/user-guide.pdf.xml</docDescriptor>
+ </configuration>
+ </execution>
+ <execution>
<id>developerguidepdf</id>
<phase>site</phase>
<goals>
@@ -732,5 +752,21 @@
<ui.test.vmargs>${env.ui.test}</ui.test.vmargs>
</properties>
</profile>
+
+ <!-- Profile for web publication -->
+ <profile>
+ <id>web.staging</id>
+ <properties>
+ <web.absoluteResourceURL>https://hudson.eclipse.org/papyrus/view/RobotML/job/papyrus-robotml-website/ws/site-staging/${project.version}/</web.absoluteResourceURL>
+ <web.href>https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-RobotML-website/ws/site-staging/${project.version}/index.html</web.href>
+ </properties>
+ </profile>
+ <profile>
+ <id>web.release</id>
+ <properties>
+ <web.absoluteResourceURL>https://www.eclipse.org/papyrus-robotml/${project.version}/</web.absoluteResourceURL>
+ <web.href>https://www.eclipse.org/papyrus-robotml/${project.version}/index.html</web.href>
+ </properties>
+ </profile>
</profiles>
</project>
\ No newline at end of file
diff --git a/releng/org.eclipse.papyrus.robotml.p2/pom.xml b/releng/org.eclipse.papyrus.robotml.p2/pom.xml
index b68e0a6..1ff1343 100644
--- a/releng/org.eclipse.papyrus.robotml.p2/pom.xml
+++ b/releng/org.eclipse.papyrus.robotml.p2/pom.xml
@@ -9,6 +9,7 @@
</parent>
<artifactId>org.eclipse.papyrus.robotml.p2</artifactId>
<packaging>eclipse-repository</packaging>
+ <name>org.eclipse.papyrus.robotml.p2</name>
<pluginRepositories>
<pluginRepository>
<id>jboss-public-repository-group</id>
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index 19175b7..f49e5be 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -1,22 +1,22 @@
-#### [QUDV][equdv]
+#### [RobotML][erobotml]
-[][equdv]
+[][equdv]
-Use [QUDV][equdv] to define systems of units and quantities for use in system models.
+Use [RobotML][erobotml] to xxxxxxxxxxxx.
#### [Element-types][eelementtypes]
[][eelementtypes]
-Papyrus RobotML 1.4 uses the Element types framework to manage the whole life cycle of objects.
+Papyrus RobotML uses the Element types framework to manage the whole life cycle of objects.
#### [RobotML profile][eprofile]
[][eprofile]
-Papyrus RobotML 1.4 is based upon the OMG RobotML 1.4 standard.
+Papyrus RobotML is based upon the xxxxxxxxxxxx.
#### [RobotML Requirements][ereq]
@@ -26,7 +26,7 @@
You can define your requirements directly with table format.
-[equdv]: http://www.omgwiki.org/OMGSysML/doku.php?id=sysml-qudv:quantities_units_dimensions_values_qudv
+[erobotml]: http://wiki.eclipse.org/Papyrus_User_Guide
[eelementtypes]: http://wiki.eclipse.org/Papyrus_User_Guide
[eprofile]: http://www.omg.org/spec/SysML/1.4/
[ereq]: http://www.omg.org/spec/SysML/1.4/
@@ -37,29 +37,23 @@
## Get it now
-Have a look at the RobotML project by downloading the [RCP][ercp] or by using the [update site][esite].
-
-## Documentation
-
-Have a look at the online developer documentation of [developer][devhome] or download it as pdf [developer-guide.pdf][developer-guide.pdf].
-
A large number of robotic software have been developed but cannot or can hardly interoperate with each other because of their dependencies
on specific hardware or software platform is hard-wired into the code. Consequently, robotic software is hard and expensive to develop
because there is little opportunity of reuse and because low-level details must be taken into account in early phases. Moreover, robotic experts
can hardly develop their application without programming knowledge or the help of programming experts and robotic software is difficult to
adapt to hardware or target-platform changes. In this paper we report on the development of RobotML, a Robotic Modeling Language that eases
-the design of robotic applications, their simulation and their deployment to multiple target execution platforms..
+the design of robotic applications, their simulation and their deployment to multiple target execution platforms.
+Have a look at the RobotML project by downloading the [RCP][ercp] or by using the [update site][esite].
+[ercp]: https://hudson.eclipse.org/papyrus/view/RobotML/job/papyrus-robotml-nightly-build/ws/releng/org.eclipse.papyrus.robotml.product/target/products/
+[esite]: https://hudson.eclipse.org/papyrus/view/RobotML/job/papyrus-robotml-nightly-build/ws/releng/org.eclipse.papyrus.robotml.p2/target/repository/
-## Additional elements
+## Documentation
-
-
+Have a look at the online developer documentation of [developer][devhome] or download it as pdf [developer-guide.pdf][developer-guide.pdf].
[devhome]: ./developer/home.html
[developer-guide.pdf]: ./pdf/developer-guide.pdf
-[ercp]: https://hudson.eclipse.org/papyrus/view/RobotML/job/papyrus-robotml-nightly-build/ws/releng/org.eclipse.papyrus.robotml.product/target/products/
-[esite]: https://hudson.eclipse.org/papyrus/view/RobotML/job/papyrus-robotml-nightly-build/ws/releng/org.eclipse.papyrus.robotml.p2/target/repository/
---
diff --git a/targetplatform/org.eclipse.papyrus.robotml.targetplatform.neon/pom.xml b/targetplatform/org.eclipse.papyrus.robotml.targetplatform.neon/pom.xml
index 7025679..61443d0 100644
--- a/targetplatform/org.eclipse.papyrus.robotml.targetplatform.neon/pom.xml
+++ b/targetplatform/org.eclipse.papyrus.robotml.targetplatform.neon/pom.xml
@@ -8,6 +8,6 @@
</parent>
<artifactId>org.eclipse.papyrus.robotml.targetplatform.neon</artifactId>
<packaging>eclipse-target-definition</packaging>
- <name>Robotml Neon Target Definition</name>
+ <name>org.eclipse.papyrus.robotml.targetplatform.neon</name>
<description>This plug-in contains the target definition for Papyrus robotml in Neon</description>
</project>
\ No newline at end of file
