diff options
| author | Tony McCrary | 2015-09-09 10:39:05 +0000 |
|---|---|---|
| committer | Markus Keller | 2015-09-09 12:01:18 +0000 |
| commit | fbcf26553bf5db3d163806c8f73b9724eb950747 (patch) | |
| tree | ba2536250c8c40af4ddc3af12948dd3938b3b4f2 | |
| parent | c02e89fd4aeae6ba0fd25b4e19ba91703351d937 (diff) | |
| download | eclipse.platform.images-fbcf26553bf5db3d163806c8f73b9724eb950747.tar.gz eclipse.platform.images-fbcf26553bf5db3d163806c8f73b9724eb950747.tar.xz eclipse.platform.images-fbcf26553bf5db3d163806c8f73b9724eb950747.zip | |
Bug 422139: [Graphics] Move "org.eclipse.ui.images" to eclipse.platform.images git repo and rename to "org.eclipse.images"
comment 47
Change-Id: I5563fe58cf5813bc78c85c50a6fe6626518a22da
Signed-off-by: Tony McCrary <tmccrary@l33tlabs.com>
13 files changed, 248 insertions, 145 deletions
diff --git a/org.eclipse.images.renderer/README.md b/org.eclipse.images.renderer/README.md index 0c15d0f4..ca1f7781 100644 --- a/org.eclipse.images.renderer/README.md +++ b/org.eclipse.images.renderer/README.md @@ -1,25 +1,25 @@ -org.eclipse.ui.images.renderer +org.eclipse.images.renderer ============================== -org.eclipse.ui.images provides the a Maven generator of svg images located in the org.eclipse.ui.images plug-in. +org.eclipse.images provides the a Maven generator of svg images located in the org.eclipse.images plug-in. -org.eclipse.ui.images.renderer plug-in usage +org.eclipse.images.renderer plug-in usage -------------------------------------------- -Install the org.eclipse.ui.images.renderer plug-in: +Install the org.eclipse.images.renderer plug-in: -cd org.eclipse.ui.images.renderer +cd org.eclipse.images.renderer mvn clean install After the renderer plugin is installed, change into the root of the images project: -cd org.eclipse.ui.images +cd org.eclipse.images Finally, execute the icon render mojo with: -mvn org.eclipse.ui:org.eclipse.ui.images.renderer:render-icons +mvn org.eclipse.images:org.eclipse.images.renderer:render-icons -This renders all of the svg icons in "eclipse-svg" into the "eclipse-png" folder of the org.eclipse.ui.images project, maintaining the directory structure (i.e. eclipse-svg/icondir will be rendered into org.eclipse.ui.images/eclipse-png/icondir). +This renders all of the svg icons in "eclipse-svg" into the "eclipse-png" folder of the org.eclipse.images project, maintaining the directory structure (i.e. eclipse-svg/icondir will be rendered into org.eclipse.images/eclipse-png/icondir). Supported runtime arguments (e.g mvn -Declipse.svg.scale=2 ...): @@ -30,7 +30,7 @@ eclipse.svg.targetdirectory - a string that specifies the directory name where t Once the icon sets have been rendered, you can create galleries for evaluation and feedback with the gallery mojo: -mvn org.eclipse.ui:org.eclipse.ui.images.renderer:render-galleries +mvn org.eclipse.images:org.eclipse.images.renderer:render-galleries This will create a set of galleries and gif comparisons comprised of the newly rendered icons, located in the target/ output directory. diff --git a/org.eclipse.images.renderer/pom.xml b/org.eclipse.images.renderer/pom.xml index 2d95d0dd..6e7b3876 100644 --- a/org.eclipse.images.renderer/pom.xml +++ b/org.eclipse.images.renderer/pom.xml @@ -11,124 +11,124 @@ --> <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> - <groupId>org.eclipse.ui</groupId> - <artifactId>org.eclipse.ui.images.renderer</artifactId> - <version>1.0.100-SNAPSHOT</version> - <name>Eclipse Platform SVG Renderer Plugin</name> + <modelVersion>4.0.0</modelVersion> + <groupId>org.eclipse.images</groupId> + <artifactId>org.eclipse.images.renderer</artifactId> + <version>1.0.100-SNAPSHOT</version> + <name>Eclipse Images SVG Renderer Plugin</name> - <packaging>maven-plugin</packaging> + <packaging>maven-plugin</packaging> - <dependencies> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>3.0</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>3.0-alpha-2</version> - </dependency> - <dependency> - <groupId>org.twdata.maven</groupId> - <artifactId>mojo-executor</artifactId> - <version>2.0</version> - </dependency> - <!-- - Image Filtering Library - License: Apache License, Version 2.0 - http://www.jhlabs.com/ip/filters/ - --> - <dependency> - <groupId>com.jhlabs</groupId> - <artifactId>filters</artifactId> - <version>2.0.235-1</version> - </dependency> - <!-- - Advanced Image Scaling Library - License: New BSD License - https://code.google.com/p/java-image-scaling/ - --> - <dependency> - <groupId>com.mortennobel</groupId> - <artifactId>java-image-scaling</artifactId> - <version>0.8.5</version> - </dependency> - <!-- - Batik SVG Rendering Library - License: Apache License, Version 2.0 - http://xmlgraphics.apache.org/batik/ - --> - <dependency> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>batik-rasterizer</artifactId> - <version>1.7</version> - </dependency> - <dependency> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>batik-codec</artifactId> - <version>1.7</version> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>3.0-alpha-2</version> + </dependency> + <dependency> + <groupId>org.twdata.maven</groupId> + <artifactId>mojo-executor</artifactId> + <version>2.0</version> + </dependency> + <!-- + Image Filtering Library + License: Apache License, Version 2.0 + http://www.jhlabs.com/ip/filters/ + --> + <dependency> + <groupId>com.jhlabs</groupId> + <artifactId>filters</artifactId> + <version>2.0.235-1</version> + </dependency> + <!-- + Advanced Image Scaling Library + License: New BSD License + https://code.google.com/p/java-image-scaling/ + --> + <dependency> + <groupId>com.mortennobel</groupId> + <artifactId>java-image-scaling</artifactId> + <version>0.8.5</version> + </dependency> + <!-- + Batik SVG Rendering Library + License: Apache License, Version 2.0 + http://xmlgraphics.apache.org/batik/ + --> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-rasterizer</artifactId> + <version>1.7</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-codec</artifactId> + <version>1.7</version> + </dependency> + </dependencies> - <build> - <plugins> - <!-- - Setup Java 1.7 output - --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <version>2.3</version> - <configuration> - <goalPrefix>eclipse-images-renderer</goalPrefix> - </configuration> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.apache.maven.plugins - </groupId> - <artifactId> - maven-plugin-plugin - </artifactId> - <versionRange> - [2.3,) - </versionRange> - <goals> - <goal>descriptor</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore></ignore> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> + <build> + <plugins> + <!-- + Setup Java 1.7 output + --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3.2</version> + <configuration> + <source>1.7</source> + <target>1.7</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <version>2.3</version> + <configuration> + <goalPrefix>eclipse-images-renderer</goalPrefix> + </configuration> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId> + org.apache.maven.plugins + </groupId> + <artifactId> + maven-plugin-plugin + </artifactId> + <versionRange> + [2.3,) + </versionRange> + <goals> + <goal>descriptor</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> </project> diff --git a/org.eclipse.images.renderer/src/main/java/org/eclipse/ui/images/renderer/GalleryMojo.java b/org.eclipse.images.renderer/src/main/java/org/eclipse/images/renderer/GalleryMojo.java index cd0e0ec4..5e11854f 100644 --- a/org.eclipse.images.renderer/src/main/java/org/eclipse/ui/images/renderer/GalleryMojo.java +++ b/org.eclipse.images.renderer/src/main/java/org/eclipse/images/renderer/GalleryMojo.java @@ -9,7 +9,7 @@ * l33t labs LLC and others - initial contribution *******************************************************************************/ -package org.eclipse.ui.images.renderer; +package org.eclipse.images.renderer; import java.awt.Color; import java.awt.Graphics2D; diff --git a/org.eclipse.images.renderer/src/main/java/org/eclipse/ui/images/renderer/IconEntry.java b/org.eclipse.images.renderer/src/main/java/org/eclipse/images/renderer/IconEntry.java index 05d72d39..4674d795 100644 --- a/org.eclipse.images.renderer/src/main/java/org/eclipse/ui/images/renderer/IconEntry.java +++ b/org.eclipse.images.renderer/src/main/java/org/eclipse/images/renderer/IconEntry.java @@ -9,7 +9,7 @@ * l33t labs LLC and others - initial contribution *******************************************************************************/ -package org.eclipse.ui.images.renderer; +package org.eclipse.images.renderer; import java.io.File; diff --git a/org.eclipse.images.renderer/src/main/java/org/eclipse/ui/images/renderer/IconGatherer.java b/org.eclipse.images.renderer/src/main/java/org/eclipse/images/renderer/IconGatherer.java index 7f559a25..13947caf 100644 --- a/org.eclipse.images.renderer/src/main/java/org/eclipse/ui/images/renderer/IconGatherer.java +++ b/org.eclipse.images.renderer/src/main/java/org/eclipse/images/renderer/IconGatherer.java @@ -9,7 +9,7 @@ * l33t labs LLC and others - initial contribution *******************************************************************************/ -package org.eclipse.ui.images.renderer; +package org.eclipse.images.renderer; import java.io.File; import java.net.URI; diff --git a/org.eclipse.images.renderer/src/main/java/org/eclipse/ui/images/renderer/RenderMojo.java b/org.eclipse.images.renderer/src/main/java/org/eclipse/images/renderer/RenderMojo.java index 66b6d961..ea3b6f54 100644 --- a/org.eclipse.images.renderer/src/main/java/org/eclipse/ui/images/renderer/RenderMojo.java +++ b/org.eclipse.images.renderer/src/main/java/org/eclipse/images/renderer/RenderMojo.java @@ -9,7 +9,7 @@ * l33t labs LLC and others - initial contribution *******************************************************************************/ -package org.eclipse.ui.images.renderer; +package org.eclipse.images.renderer; import java.awt.RenderingHints; import java.awt.image.BufferedImage; diff --git a/org.eclipse.images/.gitignore b/org.eclipse.images/.gitignore new file mode 100644 index 00000000..76f0ee28 --- /dev/null +++ b/org.eclipse.images/.gitignore @@ -0,0 +1,2 @@ +/bin/ +target/
\ No newline at end of file diff --git a/org.eclipse.images/.project b/org.eclipse.images/.project index 8c0cb775..187e87dd 100644 --- a/org.eclipse.images/.project +++ b/org.eclipse.images/.project @@ -6,12 +6,24 @@ </projects> <buildSpec> <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> <name>org.eclipse.pde.ManifestBuilder</name> <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.pde.PluginNature</nature> </natures> </projectDescription> diff --git a/org.eclipse.images/META-INF/MANIFEST.MF b/org.eclipse.images/META-INF/MANIFEST.MF index dc0ba9e6..d4a21831 100644 --- a/org.eclipse.images/META-INF/MANIFEST.MF +++ b/org.eclipse.images/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name -Bundle-SymbolicName: org.eclipse.ui.images +Bundle-SymbolicName: org.eclipse.images Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %Plugin.providerName diff --git a/org.eclipse.images/README.md b/org.eclipse.images/README.md index d69a6370..f0167ebb 100644 --- a/org.eclipse.images/README.md +++ b/org.eclipse.images/README.md @@ -1,11 +1,11 @@ -org.eclipse.ui.images +org.eclipse.images ===================== -org.eclipse.ui.images provides svg versions of the Eclipse SDK images. The "eclipse-svg" folder contains svg version of the icons, while the "eclipse-png" folder contain generated png files. These icons can be used in custom Eclipse plug-ins or in arbitrary rich client applications. +org.eclipse.images provides svg versions of the Eclipse SDK images. The "eclipse-svg" folder contains svg version of the icons, while the "eclipse-png" folder contain generated png files. These icons can be used in custom Eclipse plug-ins or in arbitrary rich client applications. Generate png files ------------------ -To generate the png files based on the svg files, see the README.md file in the org.eclipse.ui.images.renderer plug-in. +To generate the png files based on the svg files, see the README.md file in the org.eclipse.images.renderer plug-in. License ------- diff --git a/org.eclipse.images/plugin.properties b/org.eclipse.images/plugin.properties index 4233f901..a6f88000 100644 --- a/org.eclipse.images/plugin.properties +++ b/org.eclipse.images/plugin.properties @@ -8,6 +8,6 @@ # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -Plugin.name = Eclipse UI Image Resources +Plugin.name = Eclipse Image Resources Plugin.providerName = Eclipse.org diff --git a/org.eclipse.images/pom.xml b/org.eclipse.images/pom.xml index 635009b1..7908f366 100644 --- a/org.eclipse.images/pom.xml +++ b/org.eclipse.images/pom.xml @@ -8,17 +8,19 @@ Contributors: Lars Vogel - initial implementation + Tony McCrary - move to eclipse.images --> <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> - <artifactId>eclipse.platform.ui</artifactId> - <groupId>eclipse.platform.ui</groupId> - <version>4.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> - </parent> - <groupId>org.eclipse.ui</groupId> - <artifactId>org.eclipse.ui.images</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>org.eclipse.images.parent</artifactId> + <groupId>eclipse.images</groupId> + <version>4.6.0-SNAPSHOT</version> + <relativePath>../</relativePath> + </parent> + <groupId>org.eclipse.images</groupId> + <artifactId>org.eclipse.images</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Eclipse Images SVG Repository</name> </project> diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..6684193b --- /dev/null +++ b/pom.xml @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2015 l33t labs LLC. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Distribution License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/org/documents/edl-v10.php + + Contributors: + Tony McCrary - initial implementation +--> +<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</groupId> + <artifactId>eclipse-platform-parent</artifactId> + <version>4.6.0-SNAPSHOT</version> + <relativePath>../eclipse-platform-parent</relativePath> + </parent> + + <groupId>eclipse.images</groupId> + <artifactId>org.eclipse.images.parent</artifactId> + <packaging>pom</packaging> + <name>Eclipse Images</name> + + <properties> + <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/platform/eclipse.platform.images.git</tycho.scmUrl> + </properties> + + <repositories> + <repository> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + <id>eclipse-hosted</id> + <url>https://repo.eclipse.org/content/repositories/eclipse/</url> + </repository> + </repositories> + + <modules> + <module>org.eclipse.images</module> + <module>org.eclipse.images.renderer</module> + </modules> + <build> + <pluginManagement> + <plugins> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId> + org.eclipse.cbi.maven.plugins + </groupId> + <artifactId> + eclipse-cbi-plugin + </artifactId> + <versionRange> + [1.0.5,) + </versionRange> + <goals> + <goal> + generate-api-build-xml + </goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> |
