From fac898eed45d0f30dfec89c19272509ad0f6b265 Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Fri, 9 Apr 2021 19:09:19 +0300 Subject: [PATCH 1/3] Bug 559883 - [Passage] PDE Integration : complete licensing scenario Add core bundle Signed-off-by: Alexander Fedorov --- .../.classpath | 7 + .../.project | 28 ++++ .../.settings/org.eclipse.jdt.core.prefs | 101 +++++++++++++++ .../.settings/org.eclipse.jdt.ui.prefs | 122 ++++++++++++++++++ .../org.eclipse.pde.ds.annotations.prefs | 8 ++ .../.settings/org.eclipse.pde.prefs | 34 +++++ .../META-INF/MANIFEST.MF | 10 ++ .../OSGI-INF/l10n/bundle.properties | 23 ++++ .../about.html | 36 ++++++ .../build.properties | 18 +++ .../templates/DefaultProductRequirement.java | 6 +- .../META-INF/MANIFEST.MF | 1 + .../BaseLicensedTemplateSection.java | 1 + .../feature.properties | 4 +- .../feature.xml | 7 + .../pom.xml | 1 + 16 files changed, 402 insertions(+), 5 deletions(-) create mode 100644 bundles/org.eclipse.passage.ldc.pde.core.templates/.classpath create mode 100644 bundles/org.eclipse.passage.ldc.pde.core.templates/.project create mode 100644 bundles/org.eclipse.passage.ldc.pde.core.templates/.settings/org.eclipse.jdt.core.prefs create mode 100644 bundles/org.eclipse.passage.ldc.pde.core.templates/.settings/org.eclipse.jdt.ui.prefs create mode 100644 bundles/org.eclipse.passage.ldc.pde.core.templates/.settings/org.eclipse.pde.ds.annotations.prefs create mode 100644 bundles/org.eclipse.passage.ldc.pde.core.templates/.settings/org.eclipse.pde.prefs create mode 100644 bundles/org.eclipse.passage.ldc.pde.core.templates/META-INF/MANIFEST.MF create mode 100644 bundles/org.eclipse.passage.ldc.pde.core.templates/OSGI-INF/l10n/bundle.properties create mode 100644 bundles/org.eclipse.passage.ldc.pde.core.templates/about.html create mode 100644 bundles/org.eclipse.passage.ldc.pde.core.templates/build.properties rename bundles/{org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui => org.eclipse.passage.ldc.pde.core.templates/src/org/eclipse/passage/ldc/internal/pde/core}/templates/DefaultProductRequirement.java (84%) diff --git a/bundles/org.eclipse.passage.ldc.pde.core.templates/.classpath b/bundles/org.eclipse.passage.ldc.pde.core.templates/.classpath new file mode 100644 index 000000000..e801ebfb4 --- /dev/null +++ b/bundles/org.eclipse.passage.ldc.pde.core.templates/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/bundles/org.eclipse.passage.ldc.pde.core.templates/.project b/bundles/org.eclipse.passage.ldc.pde.core.templates/.project new file mode 100644 index 000000000..0a5fd8eee --- /dev/null +++ b/bundles/org.eclipse.passage.ldc.pde.core.templates/.project @@ -0,0 +1,28 @@ + + + org.eclipse.passage.ldc.pde.core.templates + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/bundles/org.eclipse.passage.ldc.pde.core.templates/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.passage.ldc.pde.core.templates/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..8f9ec5cde --- /dev/null +++ b/bundles/org.eclipse.passage.ldc.pde.core.templates/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,101 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullable.secondary= +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled +org.eclipse.jdt.core.compiler.problem.APILeak=warning +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=warning +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=warning +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning +org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=warning +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning diff --git a/bundles/org.eclipse.passage.ldc.pde.core.templates/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.passage.ldc.pde.core.templates/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 000000000..906381876 --- /dev/null +++ b/bundles/org.eclipse.passage.ldc.pde.core.templates/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,122 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_functional_interfaces=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=false +cleanup.format_source_code_changes_only=false +cleanup.insert_inferred_type_arguments=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=false +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_redundant_modifiers=false +cleanup.remove_redundant_semicolons=false +cleanup.remove_redundant_type_arguments=false +cleanup.remove_trailing_whitespaces=false +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_anonymous_class_creation=false +cleanup.use_blocks=false +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_lambda=true +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile +cleanup_settings_version=2 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +org.eclipse.jdt.ui.text.custom_code_templates= +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=true +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_functional_interfaces=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.insert_inferred_type_arguments=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=true +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_redundant_modifiers=false +sp_cleanup.remove_redundant_semicolons=false +sp_cleanup.remove_redundant_type_arguments=false +sp_cleanup.remove_trailing_whitespaces=false +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_anonymous_class_creation=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_lambda=true +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/bundles/org.eclipse.passage.ldc.pde.core.templates/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.passage.ldc.pde.core.templates/.settings/org.eclipse.pde.ds.annotations.prefs new file mode 100644 index 000000000..73a356b6d --- /dev/null +++ b/bundles/org.eclipse.passage.ldc.pde.core.templates/.settings/org.eclipse.pde.ds.annotations.prefs @@ -0,0 +1,8 @@ +classpath=true +dsVersion=V1_3 +eclipse.preferences.version=1 +enabled=true +generateBundleActivationPolicyLazy=true +path=OSGI-INF +validationErrorLevel=error +validationErrorLevel.missingImplicitUnbindMethod=error diff --git a/bundles/org.eclipse.passage.ldc.pde.core.templates/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.passage.ldc.pde.core.templates/.settings/org.eclipse.pde.prefs new file mode 100644 index 000000000..47bd5bdfc --- /dev/null +++ b/bundles/org.eclipse.passage.ldc.pde.core.templates/.settings/org.eclipse.pde.prefs @@ -0,0 +1,34 @@ +compilers.f.unresolved-features=1 +compilers.f.unresolved-plugins=1 +compilers.incompatible-environment=1 +compilers.p.build=1 +compilers.p.build.bin.includes=1 +compilers.p.build.encodings=2 +compilers.p.build.java.compiler=2 +compilers.p.build.java.compliance=1 +compilers.p.build.missing.output=2 +compilers.p.build.output.library=1 +compilers.p.build.source.library=1 +compilers.p.build.src.includes=1 +compilers.p.deprecated=1 +compilers.p.discouraged-class=1 +compilers.p.internal=1 +compilers.p.missing-packages=2 +compilers.p.missing-version-export-package=2 +compilers.p.missing-version-import-package=2 +compilers.p.missing-version-require-bundle=1 +compilers.p.no-required-att=0 +compilers.p.no.automatic.module=1 +compilers.p.not-externalized-att=0 +compilers.p.service.component.without.lazyactivation=1 +compilers.p.unknown-attribute=1 +compilers.p.unknown-class=1 +compilers.p.unknown-element=1 +compilers.p.unknown-identifier=1 +compilers.p.unknown-resource=1 +compilers.p.unresolved-ex-points=0 +compilers.p.unresolved-import=0 +compilers.s.create-docs=false +compilers.s.doc-folder=doc +compilers.s.open-tags=1 +eclipse.preferences.version=1 diff --git a/bundles/org.eclipse.passage.ldc.pde.core.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.ldc.pde.core.templates/META-INF/MANIFEST.MF new file mode 100644 index 000000000..546a8eae7 --- /dev/null +++ b/bundles/org.eclipse.passage.ldc.pde.core.templates/META-INF/MANIFEST.MF @@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Automatic-Module-Name: org.eclipse.passage.ldc.pde.core.templates +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.passage.ldc.pde.core.templates +Bundle-Version: 0.1.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Vendor: %Bundle-Vendor +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Bundle: org.eclipse.passage.lic.base;bundle-version="0.0.0" +Export-Package: org.eclipse.passage.ldc.internal.pde.core.templates;x-friends:="org.eclipse.passage.ldc.pde.ui.templates" diff --git a/bundles/org.eclipse.passage.ldc.pde.core.templates/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.ldc.pde.core.templates/OSGI-INF/l10n/bundle.properties new file mode 100644 index 000000000..272719531 --- /dev/null +++ b/bundles/org.eclipse.passage.ldc.pde.core.templates/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,23 @@ +#Properties file for org.eclipse.passage.ldc.pde.core.templates +############################################################################### +# Copyright (c) 2019, 2021 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 +# https://www.eclipse.org/legal/epl-2.0/. +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# ArSysOp - initial API and implementation +############################################################################### + +Bundle-Name = Passage LDC PDE Core Templates +Bundle-Vendor = Eclipse Passage +Bundle-Copyright = Copyright (c) 2021 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\ diff --git a/bundles/org.eclipse.passage.ldc.pde.core.templates/about.html b/bundles/org.eclipse.passage.ldc.pde.core.templates/about.html new file mode 100644 index 000000000..164f781a8 --- /dev/null +++ b/bundles/org.eclipse.passage.ldc.pde.core.templates/about.html @@ -0,0 +1,36 @@ + + + + +About + + +

About This Content

+ +

November 30, 2017

+

License

+ +

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

+ +

+ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") 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 http://www.eclipse.org. +

+ + + \ No newline at end of file diff --git a/bundles/org.eclipse.passage.ldc.pde.core.templates/build.properties b/bundles/org.eclipse.passage.ldc.pde.core.templates/build.properties new file mode 100644 index 000000000..bec5b8cb8 --- /dev/null +++ b/bundles/org.eclipse.passage.ldc.pde.core.templates/build.properties @@ -0,0 +1,18 @@ +############################################################################### +# Copyright (c) 2021 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 +# https://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/ diff --git a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/DefaultProductRequirement.java b/bundles/org.eclipse.passage.ldc.pde.core.templates/src/org/eclipse/passage/ldc/internal/pde/core/templates/DefaultProductRequirement.java similarity index 84% rename from bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/DefaultProductRequirement.java rename to bundles/org.eclipse.passage.ldc.pde.core.templates/src/org/eclipse/passage/ldc/internal/pde/core/templates/DefaultProductRequirement.java index 29d6f8f46..5060acd20 100644 --- a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/DefaultProductRequirement.java +++ b/bundles/org.eclipse.passage.ldc.pde.core.templates/src/org/eclipse/passage/ldc/internal/pde/core/templates/DefaultProductRequirement.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.ldc.internal.pde.ui.templates; +package org.eclipse.passage.ldc.internal.pde.core.templates; import java.util.function.Supplier; @@ -20,14 +20,14 @@ import org.eclipse.passage.lic.internal.base.requirements.BaseRequirement; @SuppressWarnings("restriction") -final class DefaultProductRequirement implements Supplier { +public final class DefaultProductRequirement implements Supplier { private final Supplier product; private final Supplier version; private final Supplier name; private final Supplier provider; - DefaultProductRequirement(Supplier product, Supplier name, Supplier version, + public DefaultProductRequirement(Supplier product, Supplier name, Supplier version, Supplier provider) { this.product = product; this.version = version; diff --git a/bundles/org.eclipse.passage.ldc.pde.ui.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.ldc.pde.ui.templates/META-INF/MANIFEST.MF index 8b8832267..a9ca62219 100644 --- a/bundles/org.eclipse.passage.ldc.pde.ui.templates/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.ldc.pde.ui.templates/META-INF/MANIFEST.MF @@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0", org.eclipse.jface;bundle-version="0.0.0", org.eclipse.pde.ui;bundle-version="0.0.0", org.eclipse.pde.ui.templates;bundle-version="0.0.0", + org.eclipse.passage.ldc.pde.core.templates;bundle-version="0.0.0", org.eclipse.passage.lic.equinox;bundle-version="0.0.0", org.eclipse.e4.core.contexts;bundle-version="0.0.0", org.eclipse.e4.core.di;bundle-version="0.0.0" diff --git a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/BaseLicensedTemplateSection.java b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/BaseLicensedTemplateSection.java index f13cecf53..0d14a6d04 100644 --- a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/BaseLicensedTemplateSection.java +++ b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/BaseLicensedTemplateSection.java @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Platform; +import org.eclipse.passage.ldc.internal.pde.core.templates.DefaultProductRequirement; import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.equinox.requirements.RequirementsToBundle; import org.eclipse.pde.core.plugin.IMatchRules; diff --git a/features/org.eclipse.passage.ldc.feature/feature.properties b/features/org.eclipse.passage.ldc.feature/feature.properties index 387438b1b..c254cff90 100644 --- a/features/org.eclipse.passage.ldc.feature/feature.properties +++ b/features/org.eclipse.passage.ldc.feature/feature.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2019, 2020 ArSysOp and others +# Copyright (c) 2019, 2021 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 @@ -13,7 +13,7 @@ featureName=Passage LDC providerName=Eclipse Passage description=Passage Licensing Definition Components: Eclipse PDE integration. -copyright=Copyright (c) 2019, 2020 ArSysOp and others.\n\ +copyright=Copyright (c) 2019, 2021 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\ diff --git a/features/org.eclipse.passage.ldc.feature/feature.xml b/features/org.eclipse.passage.ldc.feature/feature.xml index a793915f8..463160bd2 100644 --- a/features/org.eclipse.passage.ldc.feature/feature.xml +++ b/features/org.eclipse.passage.ldc.feature/feature.xml @@ -44,6 +44,13 @@ version="0.0.0" unpack="false"/> + + ../../releng/org.eclipse.passage.parent + ../../bundles/org.eclipse.passage.ldc.pde.core.templates ../../bundles/org.eclipse.passage.ldc.pde.ui.templates ../../bundles/org.eclipse.passage.ldc ../../features/org.eclipse.passage.ldc.feature From 8fcccb57c378a634f46cdee426da9e741648b2fd Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Fri, 9 Apr 2021 19:11:38 +0300 Subject: [PATCH 2/3] Bug 559883 - [Passage] PDE Integration : complete licensing scenario include about.html Signed-off-by: Alexander Fedorov --- .../build.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bundles/org.eclipse.passage.ldc.pde.core.templates/build.properties b/bundles/org.eclipse.passage.ldc.pde.core.templates/build.properties index bec5b8cb8..6f36dd4c0 100644 --- a/bundles/org.eclipse.passage.ldc.pde.core.templates/build.properties +++ b/bundles/org.eclipse.passage.ldc.pde.core.templates/build.properties @@ -15,4 +15,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ - OSGI-INF/ + OSGI-INF/,\ + about.html From b27d8318ab08adb0214ce9e6078c90ed9b043838 Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Fri, 9 Apr 2021 19:46:29 +0300 Subject: [PATCH 3/3] Bug 559883 - [Passage] PDE Integration : complete licensing scenario no others Signed-off-by: Alexander Fedorov --- .../OSGI-INF/l10n/bundle.properties | 4 ++-- .../build.properties | 2 +- .../OSGI-INF/l10n/bundle.properties | 4 ++-- .../org.eclipse.passage.ldc.pde.ui.templates/build.properties | 2 +- .../pde/ui/templates/i18n/PdeUiTemplatesMessages.properties | 2 +- features/org.eclipse.passage.ldc.feature/feature.properties | 4 ++-- features/org.eclipse.passage.ldc.feature/feature.xml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bundles/org.eclipse.passage.ldc.pde.core.templates/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.ldc.pde.core.templates/OSGI-INF/l10n/bundle.properties index 272719531..01f2327f8 100644 --- a/bundles/org.eclipse.passage.ldc.pde.core.templates/OSGI-INF/l10n/bundle.properties +++ b/bundles/org.eclipse.passage.ldc.pde.core.templates/OSGI-INF/l10n/bundle.properties @@ -1,6 +1,6 @@ #Properties file for org.eclipse.passage.ldc.pde.core.templates ############################################################################### -# Copyright (c) 2019, 2021 ArSysOp and others +# Copyright (c) 2021 ArSysOp # # This program and the accompanying materials are made available under the # terms of the Eclipse Public License 2.0 which is available at @@ -14,7 +14,7 @@ Bundle-Name = Passage LDC PDE Core Templates Bundle-Vendor = Eclipse Passage -Bundle-Copyright = Copyright (c) 2021 ArSysOp and others.\n\ +Bundle-Copyright = Copyright (c) 2021 ArSysOp.\n\ \n\ This program and the accompanying materials are made\n\ available under the terms of the Eclipse Public License 2.0\n\ diff --git a/bundles/org.eclipse.passage.ldc.pde.core.templates/build.properties b/bundles/org.eclipse.passage.ldc.pde.core.templates/build.properties index 6f36dd4c0..7a7a6a3c4 100644 --- a/bundles/org.eclipse.passage.ldc.pde.core.templates/build.properties +++ b/bundles/org.eclipse.passage.ldc.pde.core.templates/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2021 ArSysOp and others +# Copyright (c) 2021 ArSysOp # # This program and the accompanying materials are made available under the # terms of the Eclipse Public License 2.0 which is available at diff --git a/bundles/org.eclipse.passage.ldc.pde.ui.templates/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.ldc.pde.ui.templates/OSGI-INF/l10n/bundle.properties index b8bdb73c4..e78ee7678 100644 --- a/bundles/org.eclipse.passage.ldc.pde.ui.templates/OSGI-INF/l10n/bundle.properties +++ b/bundles/org.eclipse.passage.ldc.pde.ui.templates/OSGI-INF/l10n/bundle.properties @@ -1,6 +1,6 @@ #Properties file for org.eclipse.passage.ldc.pde.ui.templates ############################################################################### -# Copyright (c) 2019, 2021 ArSysOp and others +# Copyright (c) 2019, 2021 ArSysOp # # This program and the accompanying materials are made available under the # terms of the Eclipse Public License 2.0 which is available at @@ -14,7 +14,7 @@ Bundle-Name = Passage LDC PDE UI Templates Bundle-Vendor = Eclipse Passage -Bundle-Copyright = Copyright (c) 2019, 2021 ArSysOp and others.\n\ +Bundle-Copyright = Copyright (c) 2019, 2021 ArSysOp.\n\ \n\ This program and the accompanying materials are made\n\ available under the terms of the Eclipse Public License 2.0\n\ diff --git a/bundles/org.eclipse.passage.ldc.pde.ui.templates/build.properties b/bundles/org.eclipse.passage.ldc.pde.ui.templates/build.properties index 006748596..999e54251 100644 --- a/bundles/org.eclipse.passage.ldc.pde.ui.templates/build.properties +++ b/bundles/org.eclipse.passage.ldc.pde.ui.templates/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2019, 2021 ArSysOp and others +# Copyright (c) 2019, 2021 ArSysOp # # This program and the accompanying materials are made available under the # terms of the Eclipse Public License 2.0 which is available at diff --git a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/i18n/PdeUiTemplatesMessages.properties b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/i18n/PdeUiTemplatesMessages.properties index 660dfdab8..db35a90dc 100644 --- a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/i18n/PdeUiTemplatesMessages.properties +++ b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/i18n/PdeUiTemplatesMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2019, 2020 ArSysOp and others +# Copyright (c) 2019, 2020 ArSysOp # # This program and the accompanying materials are made available under the # terms of the Eclipse Public License 2.0 which is available at diff --git a/features/org.eclipse.passage.ldc.feature/feature.properties b/features/org.eclipse.passage.ldc.feature/feature.properties index c254cff90..654e3aaa5 100644 --- a/features/org.eclipse.passage.ldc.feature/feature.properties +++ b/features/org.eclipse.passage.ldc.feature/feature.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2019, 2021 ArSysOp and others +# Copyright (c) 2019, 2021 ArSysOp # # This program and the accompanying materials are made available under the # terms of the Eclipse Public License 2.0 which is available at @@ -13,7 +13,7 @@ featureName=Passage LDC providerName=Eclipse Passage description=Passage Licensing Definition Components: Eclipse PDE integration. -copyright=Copyright (c) 2019, 2021 ArSysOp and others.\n\ +copyright=Copyright (c) 2019, 2021 ArSysOp.\n\ \n\ This program and the accompanying materials are made\n\ available under the terms of the Eclipse Public License 2.0\n\ diff --git a/features/org.eclipse.passage.ldc.feature/feature.xml b/features/org.eclipse.passage.ldc.feature/feature.xml index 463160bd2..d4751f859 100644 --- a/features/org.eclipse.passage.ldc.feature/feature.xml +++ b/features/org.eclipse.passage.ldc.feature/feature.xml @@ -1,6 +1,6 @@