diff options
| author | Patrick Tessier | 2016-11-17 09:54:20 -0500 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2016-11-17 10:16:20 -0500 |
| commit | 2d2ecafb4ec68cf736cebff5706cae012e65daf9 (patch) | |
| tree | 234d990ff511295f1267d12b8f44c4268f74b19c /plugins | |
| parent | 5f62e7c6b9c1e92791afab32444ce573315415ec (diff) | |
| download | org.eclipse.papyrus-2d2ecafb4ec68cf736cebff5706cae012e65daf9.tar.gz org.eclipse.papyrus-2d2ecafb4ec68cf736cebff5706cae012e65daf9.tar.xz org.eclipse.papyrus-2d2ecafb4ec68cf736cebff5706cae012e65daf9.zip | |
Revert "Bug 506989 - [Toolsmith] remove the initial customization plugins from the initial Papyrus sdk and create a basic toolsmiths environment"
This reverts commit 4cca0d88fe8bff062b402cf10f25fe463ac1cbab.
the test does not compile
Change-Id: Iaad06df3fd3ca17d4249450e6285c0451ca08b9e
Diffstat (limited to 'plugins')
11 files changed, 75 insertions, 92 deletions
diff --git a/plugins/customization/org.eclipse.papyrus.customization.nattableconfiguration/pom.xml b/plugins/customization/org.eclipse.papyrus.customization.nattableconfiguration/pom.xml index a4337d7f51b..e760a7eecc5 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.nattableconfiguration/pom.xml +++ b/plugins/customization/org.eclipse.papyrus.customization.nattableconfiguration/pom.xml @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.toolsmiths</artifactId> + <artifactId>org.eclipse.papyrus.customization</artifactId> <version>0.0.1-SNAPSHOT</version> - <relativePath>../../toolsmiths/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>org.eclipse.papyrus.customization.nattableconfiguration</artifactId> <groupId>org.eclipse.papyrus</groupId> diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/pom.xml b/plugins/customization/org.eclipse.papyrus.customization.palette/pom.xml index b14c35d4468..f8b06ae6bc6 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.palette/pom.xml +++ b/plugins/customization/org.eclipse.papyrus.customization.palette/pom.xml @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.toolsmiths</artifactId> - <version>0.0.1-SNAPSHOT</version> - <relativePath>../../toolsmiths/pom.xml</relativePath> - </parent> - <artifactId>org.eclipse.papyrus.customization.palette</artifactId> - <version>3.0.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> +<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.customization</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.customization.palette</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/pom.xml b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/pom.xml index be2e0085512..b7bab72f0a1 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/pom.xml +++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/pom.xml @@ -1,12 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.toolsmiths</artifactId> - <version>0.0.1-SNAPSHOT</version> - <relativePath>../../toolsmiths/pom.xml</relativePath> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.customization</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.customization.paletteconfiguration</artifactId> <version>1.2.0-SNAPSHOT</version> diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/pom.xml b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/pom.xml index 44ddafaaea8..870296a4c75 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/pom.xml +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/pom.xml @@ -1,12 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.toolsmiths</artifactId> - <version>0.0.1-SNAPSHOT</version> - <relativePath>../../toolsmiths/pom.xml</relativePath> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.customization</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.customization.properties.generation</artifactId> <version>2.0.0-SNAPSHOT</version> diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/pom.xml b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/pom.xml index 7a12c408faf..585dcfd55e8 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/pom.xml +++ b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/pom.xml @@ -1,12 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.toolsmiths</artifactId> - <version>0.0.1-SNAPSHOT</version> - <relativePath>../../toolsmiths/pom.xml</relativePath> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.customization</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.customization.properties.model.xwt</artifactId> <version>1.2.0-SNAPSHOT</version> diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/pom.xml b/plugins/customization/org.eclipse.papyrus.customization.properties/pom.xml index 5b0f1fe4dd2..dcfa20fcb35 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/pom.xml +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/pom.xml @@ -1,12 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.toolsmiths</artifactId> - <version>0.0.1-SNAPSHOT</version> - <relativePath>../../toolsmiths/pom.xml</relativePath> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.customization</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.customization.properties</artifactId> <version>2.0.0-SNAPSHOT</version> diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/pom.xml b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/pom.xml index b3308ea79e0..6694f5f66de 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/pom.xml +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/pom.xml @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.toolsmiths</artifactId> - <version>0.0.1-SNAPSHOT</version> - <relativePath>../../toolsmiths/pom.xml</relativePath> - </parent> - <artifactId>org.eclipse.papyrus.infra.gmfdiag.expansion.edit</artifactId> - <version>2.0.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> +<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.customization</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.infra.gmfdiag.expansion.edit</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/pom.xml b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/pom.xml index 37f8e5e4005..786e2a7ece6 100644 --- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/pom.xml +++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/pom.xml @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.toolsmiths</artifactId> - <version>0.0.1-SNAPSHOT</version> - <relativePath>../../toolsmiths/pom.xml</relativePath> - </parent> - <artifactId>org.eclipse.papyrus.infra.gmfdiag.expansion.editor</artifactId> - <version>2.0.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> +<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.customization</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.infra.gmfdiag.expansion.editor</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file diff --git a/plugins/customization/pom.xml b/plugins/customization/pom.xml new file mode 100644 index 00000000000..a8036fd1388 --- /dev/null +++ b/plugins/customization/pom.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<project> + <modelVersion>4.0.0</modelVersion> + <artifactId>org.eclipse.papyrus.customization</artifactId> + <packaging>pom</packaging> + <parent> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.plugins</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <name>Papyrus Customization</name> + <description>Tools for Papyrus DSML toolsmiths, including UI customization model editors.</description> + + <modules> + <!-- org.eclipse.papyrus.customization is in the Extras Build (?!) --> + <module>org.eclipse.papyrus.customization.nattableconfiguration</module> + <module>org.eclipse.papyrus.customization.palette</module> + <module>org.eclipse.papyrus.customization.paletteconfiguration</module> + <module>org.eclipse.papyrus.customization.properties</module> + <module>org.eclipse.papyrus.customization.properties.generation</module> + <module>org.eclipse.papyrus.customization.properties.model.xwt</module> + <module>org.eclipse.papyrus.infra.gmfdiag.expansion.edit</module> + <module>org.eclipse.papyrus.infra.gmfdiag.expansion.editor</module> + </modules> +</project> diff --git a/plugins/pom.xml b/plugins/pom.xml index 3e60bd0d448..5ac7bb6a62e 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -19,6 +19,7 @@ <module>views</module> <module>editor</module> <module>uml</module> + <module>customization</module> <module>doc</module> <module>team</module> <module>sdk</module> diff --git a/plugins/toolsmiths/pom.xml b/plugins/toolsmiths/pom.xml deleted file mode 100644 index c5bd82c5298..00000000000 --- a/plugins/toolsmiths/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <packaging>pom</packaging> - <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.toolsmiths.releng</artifactId> - <version>0.0.1-SNAPSHOT</version> - <relativePath>../../releng/toolsmiths/pom.xml</relativePath> - </parent> - - <artifactId>org.eclipse.papyrus.toolsmiths</artifactId> - <name>Papyrus Toolsmiths Plugins</name> - <description>Tools for Papyrus DSML ToolSmiths, including UI customization model editors.</description> - - <modules> - <module>../customization/org.eclipse.papyrus.customization.nattableconfiguration</module> - <module>../customization/org.eclipse.papyrus.customization.palette</module> - <module>../customization/org.eclipse.papyrus.customization.paletteconfiguration</module> - <module>../customization/org.eclipse.papyrus.customization.properties</module> - <module>../customization/org.eclipse.papyrus.customization.properties.generation</module> - <module>../customization/org.eclipse.papyrus.customization.properties.model.xwt</module> - <module>../customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit</module> - <module>../customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor</module> - </modules> -</project> |