fixed branding plugin inclusion in product build and fixed a few product IDs

This commit is contained in:
Martin Lippert
2016-12-06 17:29:07 +01:00
parent 678f126028
commit 5f9dcf20d6
9 changed files with 43 additions and 13 deletions

View File

@@ -0,0 +1 @@
bin.includes = feature.xml

View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.springframework.boot.ide.branding.feature"
label="Spring Boot IDE Branding Feature"
version="4.0.0.qualifier"
provider-name="Pivotal, Inc.">
<plugin
id="org.springframework.boot.ide.branding"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false">
</plugin>
</feature>

View File

@@ -0,0 +1,15 @@
<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide</artifactId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.springframework.boot.ide.branding.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>

View File

@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.equinox.p2.ui,
org.eclipse.equinox.p2.ui.sdk,
org.springsource.ide.eclipse.commons.core
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.core.runtime,

View File

@@ -4,7 +4,7 @@
# fill-ins are supplied by about.mappings
# This file should be translated.
title=Spring Tool Suite \n\
title=Spring Boot IDE \n\
\n\
Version: @QUALIFIER@\n\
Build Id: @BUILD_ID@\n\

View File

@@ -1,8 +1,8 @@
pluginName=Spring Tool Suite
pluginName=Spring Boot IDE
providerName=Pivotal Software, Inc.
productName=Spring Tool Suite
productBlurb=Spring Tool Suite \n\
productName=Spring Boot IDE
productBlurb=Spring Boot IDE \n\
\n\
Version: @QUALIFIER@\n\
Build Id: @BUILD_ID@\n\
@@ -14,5 +14,5 @@ All rights reserved. Visit http://spring.io/tools/sts\n\
This product includes software developed by the\n\
Apache Software Foundation http://www.apache.org
productIntroTitle = Welcome to Spring Tool Suite @QUALIFIER@
productIntroBrandingText = Spring Tool Suite
productIntroTitle = Welcome to Spring Boot IDE @QUALIFIER@
productIntroBrandingText = Spring Boot IDE

View File

@@ -13,7 +13,7 @@
# Property "org.eclipse.ui/defaultPerspectiveId" controls the
# perspective that the workbench opens initially
org.eclipse.ui/defaultPerspectiveId=com.springsource.sts.ide.perspective
org.eclipse.ui/defaultPerspectiveId=org.eclipse.jdt.ui.JavaPerspective
# new-style tabs by default
org.eclipse.ui/SHOW_TRADITIONAL_STYLE_TABS=false

View File

@@ -43,10 +43,6 @@ openFile</programArgs>
<vm>
</vm>
<plugins>
<plugin id="org.springframework.boot.ide.branding"/>
</plugins>
<features>
<feature id="org.eclipse.platform" installMode="root"/>
@@ -85,6 +81,7 @@ openFile</programArgs>
<feature id="org.springframework.ide.eclipse.boot.feature" installMode="root"/>
<feature id="org.springframework.ide.eclipse.boot.dash.feature" installMode="root"/>
<feature id="org.springframework.boot.ide.branding.feature" installMode="root"/>
<feature id="org.springframework.boot.ide.properties.servers.feature" installMode="root"/>
<feature id="org.springframework.boot.ide.cloudfoundry.server.feature" installMode="root"/>
@@ -92,7 +89,7 @@ openFile</programArgs>
<configurations>
<property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}"/>
<property name="osgi.instance.area.default" value="@user.home/Documents/workspace-sts-${unqualifiedVersion}.${p2.qualifier}"/>
<property name="osgi.instance.area.default" value="@user.home/Documents/workspace-spring-boot-ide-${unqualifiedVersion}.${p2.qualifier}"/>
<property name="osgi.splashPath" value="platform:/base/plugins/org.springframework.boot.ide.branding"/>
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />

View File

@@ -28,6 +28,7 @@
<modules>
<module>org.springframework.boot.ide.branding</module>
<module>org.springframework.boot.ide.branding.feature</module>
</modules>
<properties>