Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 558835 LIC Execute feature must have it's own branding plug-in #99

Merged
merged 2 commits into from
Jan 7, 2020
Merged

Bug 558835 LIC Execute feature must have it's own branding plug-in #99

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9daf1ce
Bug 558835 LIC Execute feature must have it's own branding plug-in
eparovyshnaya Jan 6, 2020
fc25aef
Bug 558835 LIC Execute feature must have it's own branding plug-in
eparovyshnaya Jan 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions bundles/org.eclipse.passage.lic.execute.branding/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="target/classes/"/>
</classpath>
34 changes: 34 additions & 0 deletions bundles/org.eclipse.passage.lic.execute.branding/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.passage.lic.execute.branding</name>
<comment></comment>
<projects>
</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.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
8 changes: 8 additions & 0 deletions bundles/org.eclipse.passage.lic.execute.branding/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Manifest-Version: 1.0
Automatic-Module-Name: org.eclipse.passage.lic.execute.branding
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.passage.execute.branding
Bundle-Version: 0.1.0.qualifier
Bundle-Name: %pluginName
ruspl-afed marked this conversation as resolved.
Show resolved Hide resolved
Bundle-Vendor: %providerName
Bundle-Copyright: %Bundle-Copyright
36 changes: 36 additions & 0 deletions bundles/org.eclipse.passage.lic.execute.branding/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
<title>About</title>
</head>
<body lang="EN-US">
<h2>About This Content</h2>

<p>November 30, 2017</p>
<h3>License</h3>

<p>
The Eclipse Foundation makes available all content in this plug-in
(&quot;Content&quot;). Unless otherwise indicated below, the Content
is provided to you under the terms and conditions of the Eclipse
Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.
</p>

<p>
If you did not receive this Content directly from the Eclipse
Foundation, the Content is being redistributed by another party
(&quot;Redistributor&quot;) and different terms and conditions may
apply to your use of any object code in the Content. Check the
Redistributor's license that was provided with the Content. If no such
license exists, contact the Redistributor. Unless otherwise indicated
below, the terms and conditions of the EPL still apply to any source
code in the Content and such source code may be obtained at <a
href="http://www.eclipse.org/">http://www.eclipse.org</a>.
</p>

</body>
</html>
23 changes: 23 additions & 0 deletions bundles/org.eclipse.passage.lic.execute.branding/about.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
###############################################################################
# Copyright (c) 2020 ArSysOp and others
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
# http://www.eclipse.org/legal/epl-2.0.
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# ArSysOp - initial API and implementation
###############################################################################
# about.ini
# contains information about a feature
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# "%key" are externalized strings defined in about.properties
# This file does not need to be translated.

# Property "aboutText" contains blurb for "About" dialog (translated)
aboutText=%blurb

# Property "featureImage" contains path to feature image (32x32)
featureImage=passage32.png
18 changes: 18 additions & 0 deletions bundles/org.eclipse.passage.lic.execute.branding/about.mappings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
###############################################################################
# Copyright (c) 2020 ArSysOp and others
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
# http://www.eclipse.org/legal/epl-2.0.
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# ArSysOp - initial API and implementation
###############################################################################
# about.mappings
# contains fill-ins for about.properties
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file does not need to be translated.

0=${buildId}
24 changes: 24 additions & 0 deletions bundles/org.eclipse.passage.lic.execute.branding/about.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
###############################################################################
# Copyright (c) 2020 ArSysOp and others
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
# http://www.eclipse.org/legal/epl-2.0.
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# ArSysOp - initial API and implementation
###############################################################################
# about.properties
# contains externalized strings for about.ini
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# fill-ins are supplied by about.mappings
# This file should be translated.

blurb=Passage Licensing Integration Components: Execute - licensing constraints evaluation dependencies \n\
\n\
Version: {featureVersion}\n\
\n\
Copyright (c) 2018-2020 ArSysOp and others. All rights reserved.\n\
Visit http://www.eclipse.org/passage
23 changes: 23 additions & 0 deletions bundles/org.eclipse.passage.lic.execute.branding/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
###############################################################################
# Copyright (c) 2020 ArSysOp and others
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
# http://www.eclipse.org/legal/epl-2.0.
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# ArSysOp - initial API and implementation
###############################################################################

source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
OSGI-INF/,\
about.html,\
about.ini,\
about.mappings,\
about.properties,\
passage32.png
Binary file added bundles/org.eclipse.passage.lic.execute.branding/passage32.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions bundles/org.eclipse.passage.lic.execute.branding/plugin.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#Properties file for org.eclipse.passage.lic.execute.branding
###############################################################################
# Copyright (c) 2020 ArSysOp and others
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
# http://www.eclipse.org/legal/epl-2.0.
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# ArSysOp - initial API and implementation
###############################################################################

pluginName = Passage LIC Execute Feature Branding
providerName=Eclipse Passage
Bundle-Copyright = Copyright (c) 2020 ArSysOp and others.\n\
\n\
This program and the accompanying materials are made\n\
available under the terms of the Eclipse Public License 2.0\n\
which is available at https://www.eclipse.org/legal/epl-2.0/\n\
\n\
SPDX-License-Identifier: EPL-2.0\n\

Empty file added bundles/org.eclipse.passage.lic.execute.branding/src/.gitkeep
View file
Open in desktop
Empty file.
4 changes: 2 additions & 2 deletions features/org.eclipse.passage.lic.execute.feature/feature.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Properties file for org.eclipse.passage.lic.execute.feature
###############################################################################
# Copyright (c) 2018-2019 ArSysOp and others
# Copyright (c) 2018-2020 ArSysOp and others
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -15,7 +15,7 @@
featureName=Passage LIC Execute
providerName=Eclipse Passage
description=Passage Licensing Integration Components Execute feature contains dependencies required for products that evaluates the licensing constraints.
copyright=Copyright (c) 2018-2019 ArSysOp and others.\n\
copyright=Copyright (c) 2018-2020 ArSysOp and others.\n\
\n\
This program and the accompanying materials are made\n\
available under the terms of the Eclipse Public License 2.0\n\
Expand Down
8 changes: 8 additions & 0 deletions features/org.eclipse.passage.lic.execute.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
label="%featureName"
version="0.8.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.passage.execute.branding"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update year in the header

license-feature="org.eclipse.license"
license-feature-version="0.0.0">

Expand Down Expand Up @@ -55,4 +56,11 @@
id="org.eclipse.passage.lic.licenses.feature"
version="0.0.0"/>

<plugin
id="org.eclipse.passage.execute.branding"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
5 changes: 5 additions & 0 deletions releng/org.eclipse.passage.lic.aggregator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,13 @@
<module>../../bundles/org.eclipse.passage.lic.licenses.e4.ui</module>
<module>../../features/org.eclipse.passage.lic.licenses.feature</module>

<!--module>../../bundles/org.eclipse.passage.lic.compile.branding</module-->
<module>../../features/org.eclipse.passage.lic.compile.feature</module>

<module>../../bundles/org.eclipse.passage.lic.execute.branding</module>
<module>../../features/org.eclipse.passage.lic.execute.feature</module>

<!--module>../../bundles/org.eclipse.passage.lic.define.branding</module-->
<module>../../features/org.eclipse.passage.lic.define.feature</module>

<module>../../tests/org.eclipse.passage.lic.base.tests</module>
Expand Down