From 7b6d1a733ed32676edb3d56dae8f19c682a93c44 Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Sat, 1 May 2021 13:00:42 +0300 Subject: [PATCH 1/9] Bug 573296 - [Passage] rework EMF migration facilities, part 3 Move LIC EMF Meta inside LIC EMF Signed-off-by: Alexander Fedorov --- .../.classpath | 7 - .../org.eclipse.passage.lic.emf.meta/.project | 34 ----- .../.settings/org.eclipse.jdt.core.prefs | 115 ----------------- .../.settings/org.eclipse.jdt.ui.prefs | 122 ------------------ .../org.eclipse.pde.ds.annotations.prefs | 8 -- .../.settings/org.eclipse.pde.prefs | 34 ----- .../META-INF/MANIFEST.MF | 11 -- .../OSGI-INF/l10n/bundle.properties | 23 ---- .../about.html | 36 ------ .../build.properties | 19 --- .../passage/lic/emf/meta/ClassMetadata.java | 4 +- .../lic/emf/meta/ComposableClassMetadata.java | 4 +- .../lic/emf/meta/ComposedClassMetadata.java | 14 +- .../passage/lic/emf/meta/EntityMetadata.java | 4 +- .../lic/emf/meta/PlainEntityMetadata.java | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 3 +- .../lic/emf/resource/ExtractEObjectTest.java | 49 +++++++ .../lic/emf/resource/ExtractResourceTest.java | 49 +++++++ 25 files changed, 127 insertions(+), 429 deletions(-) delete mode 100644 bundles/org.eclipse.passage.lic.emf.meta/.classpath delete mode 100644 bundles/org.eclipse.passage.lic.emf.meta/.project delete mode 100644 bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.jdt.core.prefs delete mode 100644 bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.pde.ds.annotations.prefs delete mode 100644 bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.pde.prefs delete mode 100644 bundles/org.eclipse.passage.lic.emf.meta/META-INF/MANIFEST.MF delete mode 100644 bundles/org.eclipse.passage.lic.emf.meta/OSGI-INF/l10n/bundle.properties delete mode 100644 bundles/org.eclipse.passage.lic.emf.meta/about.html delete mode 100644 bundles/org.eclipse.passage.lic.emf.meta/build.properties rename bundles/{org.eclipse.passage.lic.emf.meta => org.eclipse.passage.lic.emf}/src/org/eclipse/passage/lic/emf/meta/ClassMetadata.java (93%) rename bundles/{org.eclipse.passage.lic.emf.meta => org.eclipse.passage.lic.emf}/src/org/eclipse/passage/lic/emf/meta/ComposableClassMetadata.java (95%) rename bundles/{org.eclipse.passage.lic.emf.meta => org.eclipse.passage.lic.emf}/src/org/eclipse/passage/lic/emf/meta/ComposedClassMetadata.java (63%) rename bundles/{org.eclipse.passage.lic.emf.meta => org.eclipse.passage.lic.emf}/src/org/eclipse/passage/lic/emf/meta/EntityMetadata.java (95%) rename bundles/{org.eclipse.passage.lic.emf.meta => org.eclipse.passage.lic.emf}/src/org/eclipse/passage/lic/emf/meta/PlainEntityMetadata.java (97%) create mode 100644 tests/org.eclipse.passage.lic.emf.tests/src/org/eclipse/passage/lic/emf/resource/ExtractEObjectTest.java create mode 100644 tests/org.eclipse.passage.lic.emf.tests/src/org/eclipse/passage/lic/emf/resource/ExtractResourceTest.java diff --git a/bundles/org.eclipse.passage.lic.emf.meta/.classpath b/bundles/org.eclipse.passage.lic.emf.meta/.classpath deleted file mode 100644 index eca7bdba8..000000000 --- a/bundles/org.eclipse.passage.lic.emf.meta/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/org.eclipse.passage.lic.emf.meta/.project b/bundles/org.eclipse.passage.lic.emf.meta/.project deleted file mode 100644 index b00b382b2..000000000 --- a/bundles/org.eclipse.passage.lic.emf.meta/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.eclipse.passage.lic.emf.meta - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.pde.api.tools.apiAnalysisBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.pde.api.tools.apiAnalysisNature - - diff --git a/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c0a6a56ce..000000000 --- a/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,115 +0,0 @@ -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.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.APILeak=warning -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -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.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -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.reportPreviewFeatures=warning -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 -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 906381876..000000000 --- a/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,122 +0,0 @@ -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.lic.emf.meta/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.pde.ds.annotations.prefs deleted file mode 100644 index 73a356b6d..000000000 --- a/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.pde.ds.annotations.prefs +++ /dev/null @@ -1,8 +0,0 @@ -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.lic.emf.meta/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.pde.prefs deleted file mode 100644 index 47bd5bdfc..000000000 --- a/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,34 +0,0 @@ -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.lic.emf.meta/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.emf.meta/META-INF/MANIFEST.MF deleted file mode 100644 index ea053b43b..000000000 --- a/bundles/org.eclipse.passage.lic.emf.meta/META-INF/MANIFEST.MF +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0 -Automatic-Module-Name: org.eclipse.passage.lic.emf.meta -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.passage.lic.emf.meta -Bundle-Version: 0.6.300.qualifier -Bundle-Name: %Bundle-Name -Bundle-Vendor: %Bundle-Vendor -Bundle-Copyright: %Bundle-Copyright -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.emf.ecore;bundle-version="0.0.0";visibility:=reexport -Export-Package: org.eclipse.passage.lic.emf.meta diff --git a/bundles/org.eclipse.passage.lic.emf.meta/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.emf.meta/OSGI-INF/l10n/bundle.properties deleted file mode 100644 index f472a32df..000000000 --- a/bundles/org.eclipse.passage.lic.emf.meta/OSGI-INF/l10n/bundle.properties +++ /dev/null @@ -1,23 +0,0 @@ -#Properties file for org.eclipse.passage.lic.emf.meta -############################################################################### -# Copyright (c) 2020, 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 LIC EMF Meta -Bundle-Vendor = Eclipse Passage -Bundle-Copyright = Copyright (c) 2020, 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.lic.emf.meta/about.html b/bundles/org.eclipse.passage.lic.emf.meta/about.html deleted file mode 100644 index 164f781a8..000000000 --- a/bundles/org.eclipse.passage.lic.emf.meta/about.html +++ /dev/null @@ -1,36 +0,0 @@ - - - - -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.lic.emf.meta/build.properties b/bundles/org.eclipse.passage.lic.emf.meta/build.properties deleted file mode 100644 index 9eb249799..000000000 --- a/bundles/org.eclipse.passage.lic.emf.meta/build.properties +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################### -# 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 -# 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/,\ - about.html diff --git a/bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/ClassMetadata.java b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/ClassMetadata.java similarity index 93% rename from bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/ClassMetadata.java rename to bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/ClassMetadata.java index 2a282b42c..fffd4af75 100644 --- a/bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/ClassMetadata.java +++ b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/ClassMetadata.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 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 @@ -18,7 +18,7 @@ * * Searches for EMF metadata for a given java type * - * @since 0.6 + * @since 2.0 * */ @FunctionalInterface diff --git a/bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/ComposableClassMetadata.java b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/ComposableClassMetadata.java similarity index 95% rename from bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/ComposableClassMetadata.java rename to bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/ComposableClassMetadata.java index 95d0e4a63..030ede5d5 100644 --- a/bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/ComposableClassMetadata.java +++ b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/ComposableClassMetadata.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 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 @@ -15,7 +15,7 @@ /** * Allows to compose class metadata for different domains * - * @since 0.6 + * @since 2.0 */ public interface ComposableClassMetadata extends ClassMetadata { diff --git a/bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/ComposedClassMetadata.java b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/ComposedClassMetadata.java similarity index 63% rename from bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/ComposedClassMetadata.java rename to bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/ComposedClassMetadata.java index 59c12e2a1..010dfdafd 100644 --- a/bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/ComposedClassMetadata.java +++ b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/ComposedClassMetadata.java @@ -1,3 +1,15 @@ +/******************************************************************************* + * Copyright (c) 2020, 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 + * https://www.eclipse.org/legal/epl-2.0/. + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * ArSysOp - initial API and implementation + *******************************************************************************/ package org.eclipse.passage.lic.emf.meta; import java.util.LinkedHashSet; @@ -8,7 +20,7 @@ /** * Creates composed class metadata to suitable for dynamic environment * - * @since 0.6 + * @since 2.0 */ public final class ComposedClassMetadata implements ComposableClassMetadata { diff --git a/bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/EntityMetadata.java b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/EntityMetadata.java similarity index 95% rename from bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/EntityMetadata.java rename to bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/EntityMetadata.java index d46e7c848..f7c6e4eb8 100644 --- a/bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/EntityMetadata.java +++ b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/EntityMetadata.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 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 @@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EStructuralFeature; /** - * @since 0.6 + * @since 2.0 */ public interface EntityMetadata { diff --git a/bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/PlainEntityMetadata.java b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/PlainEntityMetadata.java similarity index 97% rename from bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/PlainEntityMetadata.java rename to bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/PlainEntityMetadata.java index 8e8403925..981e23b1c 100644 --- a/bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/PlainEntityMetadata.java +++ b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/PlainEntityMetadata.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 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 @@ -21,7 +21,7 @@ * Encapsulates the ECore metadata for the object to reduce the number of * arguments in methods * - * @since 0.6 + * @since 2.0 * */ public final class PlainEntityMetadata implements EntityMetadata { diff --git a/bundles/org.eclipse.passage.lic.features.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.features.model/META-INF/MANIFEST.MF index 0f3220ee2..69eb4cd3d 100644 --- a/bundles/org.eclipse.passage.lic.features.model/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.features.model/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";resolution:=optional;x-installation:=greedy, org.eclipse.emf.ecore;bundle-version="0.0.0";visibility:=reexport, org.eclipse.passage.lic.features;bundle-version="1.0.0";visibility:=reexport, - org.eclipse.passage.lic.emf.meta;bundle-version="0.6.0" + org.eclipse.passage.lic.emf;bundle-version="2.0.0" Export-Package: org.eclipse.passage.lic.features.model.api, org.eclipse.passage.lic.features.model.impl, org.eclipse.passage.lic.features.model.meta, diff --git a/bundles/org.eclipse.passage.lic.keys.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.keys.model/META-INF/MANIFEST.MF index 2d8e0c0ce..f33076e13 100644 --- a/bundles/org.eclipse.passage.lic.keys.model/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.keys.model/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";x-installation:=greedy;resolution:=optional, org.eclipse.emf.ecore;bundle-version="0.0.0";visibility:=reexport, - org.eclipse.passage.lic.emf.meta;bundle-version="0.0.0", + org.eclipse.passage.lic.emf;bundle-version="2.0.0", org.eclipse.passage.lic.keys;bundle-version="0.0.0";visibility:=reexport Export-Package: org.eclipse.passage.lic.keys.model.api, org.eclipse.passage.lic.keys.model.impl, diff --git a/bundles/org.eclipse.passage.lic.licenses.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.licenses.model/META-INF/MANIFEST.MF index c12d28fd3..a9bc8edde 100644 --- a/bundles/org.eclipse.passage.lic.licenses.model/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.licenses.model/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";x-installation:=greedy;resolution:=optional, org.eclipse.emf.ecore;bundle-version="0.0.0";visibility:=reexport, - org.eclipse.passage.lic.emf.meta;bundle-version="0.0.0", + org.eclipse.passage.lic.emf;bundle-version="2.0.0", org.eclipse.passage.lic.licenses;bundle-version="0.0.0";visibility:=reexport, org.eclipse.passage.lic.base;bundle-version="0.0.0" Export-Package: org.eclipse.passage.lic.internal.licenses.convert; diff --git a/bundles/org.eclipse.passage.lic.products.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.products.model/META-INF/MANIFEST.MF index 9b2923606..e24368f14 100644 --- a/bundles/org.eclipse.passage.lic.products.model/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.products.model/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";resolution:=optional;x-installation:=greedy, org.eclipse.emf.ecore;bundle-version="0.0.0";visibility:=reexport, - org.eclipse.passage.lic.emf.meta;bundle-version="0.6.0", + org.eclipse.passage.lic.emf;bundle-version="2.0.0", org.eclipse.passage.lic.products;bundle-version="1.0.0";visibility:=reexport Export-Package: org.eclipse.passage.lic.internal.products.model;x-friends:="org.eclipse.passage.loc.dashboard.ui", org.eclipse.passage.lic.products.model.api, diff --git a/bundles/org.eclipse.passage.lic.users.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.users.model/META-INF/MANIFEST.MF index 784490b07..d97d9611f 100644 --- a/bundles/org.eclipse.passage.lic.users.model/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.users.model/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";resolution:=optional;x-installation:=greedy, org.eclipse.emf.ecore;bundle-version="0.0.0";visibility:=reexport, - org.eclipse.passage.lic.emf.meta;bundle-version="0.6.0", + org.eclipse.passage.lic.emf;bundle-version="2.0.0", org.eclipse.passage.lic.users;bundle-version="1.0.0";visibility:=reexport Export-Package: org.eclipse.passage.lic.internal.users.model;x-friends:="org.eclipse.passage.loc.dashboard.ui", org.eclipse.passage.lic.users.model.api, diff --git a/bundles/org.eclipse.passage.loc.dashboard.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.dashboard.ui/META-INF/MANIFEST.MF index 454f72d55..a5e30b001 100644 --- a/bundles/org.eclipse.passage.loc.dashboard.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.loc.dashboard.ui/META-INF/MANIFEST.MF @@ -13,8 +13,7 @@ Require-Bundle: org.eclipse.e4.core.di.annotations;bundle-version="0.0.0", org.eclipse.e4.ui.di;bundle-version="0.0.0", org.eclipse.e4.ui.services;bundle-version="0.0.0", org.eclipse.emf.ecp.ui.view.swt;bundle-version="0.0.0", - org.eclipse.passage.lic.emf;bundle-version="0.0.0", - org.eclipse.passage.lic.emf.meta;bundle-version="0.0.0", + org.eclipse.passage.lic.emf;bundle-version="2.0.0", org.eclipse.passage.lic.e4.core;bundle-version="0.0.0", org.eclipse.passage.lic.email;bundle-version="0.0.0", org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0", diff --git a/bundles/org.eclipse.passage.loc.workbench/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.workbench/META-INF/MANIFEST.MF index de2aad891..3620888a4 100644 --- a/bundles/org.eclipse.passage.loc.workbench/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.loc.workbench/META-INF/MANIFEST.MF @@ -22,8 +22,7 @@ Require-Bundle: org.eclipse.osgi.services;bundle-version="0.0.0", org.eclipse.e4.ui.model.workbench;bundle-version="0.0.0", org.eclipse.e4.ui.services;bundle-version="0.0.0", org.eclipse.e4.ui.di;bundle-version="0.0.0", - org.eclipse.passage.lic.emf;bundle-version="0.0.0", - org.eclipse.passage.lic.emf.meta;bundle-version="0.0.0", + org.eclipse.passage.lic.emf;bundle-version="2.0.0", org.eclipse.passage.lic.equinox;bundle-version="0.0.0";visibility:=reexport, org.eclipse.passage.lic.jface;bundle-version="0.0.0";visibility:=reexport, org.eclipse.passage.lic.products.model;bundle-version="1.0.0";visibility:=reexport, diff --git a/tests/org.eclipse.passage.lic.emf.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.passage.lic.emf.tests/META-INF/MANIFEST.MF index cdfd9f76b..4c73c8ca5 100644 --- a/tests/org.eclipse.passage.lic.emf.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.passage.lic.emf.tests/META-INF/MANIFEST.MF @@ -8,6 +8,5 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Copyright: %Bundle-Copyright Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Fragment-Host: org.eclipse.passage.lic.emf -Require-Bundle: org.junit;bundle-version="0.0.0", - org.eclipse.passage.lic.emf.meta;bundle-version="0.6.0" +Require-Bundle: org.junit;bundle-version="0.0.0" Export-Package: org.eclipse.passage.lic.emf.meta diff --git a/tests/org.eclipse.passage.lic.emf.tests/src/org/eclipse/passage/lic/emf/resource/ExtractEObjectTest.java b/tests/org.eclipse.passage.lic.emf.tests/src/org/eclipse/passage/lic/emf/resource/ExtractEObjectTest.java new file mode 100644 index 000000000..e0a9c5454 --- /dev/null +++ b/tests/org.eclipse.passage.lic.emf.tests/src/org/eclipse/passage/lic/emf/resource/ExtractEObjectTest.java @@ -0,0 +1,49 @@ +/******************************************************************************* + * 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 + * https://www.eclipse.org/legal/epl-2.0/. + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * ArSysOp - initial API and implementation + *******************************************************************************/ +package org.eclipse.passage.lic.emf.resource; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EcoreFactory; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.impl.ResourceImpl; +import org.junit.Test; + +public class ExtractEObjectTest { + + private final ExtractEObject cut = new ExtractEObject(); + + @Test + public void resource() { + Resource resource = new ResourceImpl(); + assertFalse(cut.apply(resource).isPresent()); + EObject eo = EcoreFactory.eINSTANCE.createEObject(); + resource.getContents().add(eo); + assertEquals(eo, cut.apply(resource).get()); + } + + @Test + public void eobject() { + EObject eo = EcoreFactory.eINSTANCE.createEObject(); + assertEquals(eo, cut.apply(eo).get()); + } + + @Test + public void invalid() { + assertFalse(cut.apply(null).isPresent()); + assertFalse(cut.apply(this).isPresent()); + } + +} diff --git a/tests/org.eclipse.passage.lic.emf.tests/src/org/eclipse/passage/lic/emf/resource/ExtractResourceTest.java b/tests/org.eclipse.passage.lic.emf.tests/src/org/eclipse/passage/lic/emf/resource/ExtractResourceTest.java new file mode 100644 index 000000000..fa66c9e28 --- /dev/null +++ b/tests/org.eclipse.passage.lic.emf.tests/src/org/eclipse/passage/lic/emf/resource/ExtractResourceTest.java @@ -0,0 +1,49 @@ +/******************************************************************************* + * 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 + * https://www.eclipse.org/legal/epl-2.0/. + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * ArSysOp - initial API and implementation + *******************************************************************************/ +package org.eclipse.passage.lic.emf.resource; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EcoreFactory; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.impl.ResourceImpl; +import org.junit.Test; + +public class ExtractResourceTest { + + private final ExtractResource cut = new ExtractResource(); + + @Test + public void resource() { + Resource resource = new ResourceImpl(); + assertEquals(resource, cut.apply(resource).get()); + } + + @Test + public void eobject() { + EObject eo = EcoreFactory.eINSTANCE.createEObject(); + assertFalse(cut.apply(eo).isPresent()); + Resource resource = new ResourceImpl(); + resource.getContents().add(eo); + assertEquals(resource, cut.apply(eo).get()); + } + + @Test + public void invalid() { + assertFalse(cut.apply(null).isPresent()); + assertFalse(cut.apply(this).isPresent()); + } + +} From dd13eb22e01bd99d1e2143ae62b01b2d0145a290 Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Sat, 1 May 2021 13:09:47 +0300 Subject: [PATCH 2/9] Bug 573296 - [Passage] rework EMF migration facilities, part 3 Remove LIC EMF Meta from build Signed-off-by: Alexander Fedorov --- releng/org.eclipse.passage.lic.aggregator/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/releng/org.eclipse.passage.lic.aggregator/pom.xml b/releng/org.eclipse.passage.lic.aggregator/pom.xml index f88feb87d..ead5298ce 100644 --- a/releng/org.eclipse.passage.lic.aggregator/pom.xml +++ b/releng/org.eclipse.passage.lic.aggregator/pom.xml @@ -68,7 +68,6 @@ ../../tests/org.eclipse.passage.lic.oshi.tests ../../bundles/org.eclipse.passage.lic.emf - ../../bundles/org.eclipse.passage.lic.emf.meta ../../features/org.eclipse.passage.lic.emf.feature ../../tests/org.eclipse.passage.lic.emf.tests From 84cd4e996534b42620843eb3c276533109612cfe Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Sat, 1 May 2021 13:11:52 +0300 Subject: [PATCH 3/9] Bug 573296 - [Passage] rework EMF migration facilities, part 3 Remove LIC EMF Meta from feature Signed-off-by: Alexander Fedorov --- features/org.eclipse.passage.lic.emf.feature/feature.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/features/org.eclipse.passage.lic.emf.feature/feature.xml b/features/org.eclipse.passage.lic.emf.feature/feature.xml index 496501b08..d90d800d3 100644 --- a/features/org.eclipse.passage.lic.emf.feature/feature.xml +++ b/features/org.eclipse.passage.lic.emf.feature/feature.xml @@ -43,11 +43,4 @@ version="0.0.0" unpack="false"/> - - From ae8c270162193e73fce09f7ffc34c0a113043414 Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Sat, 1 May 2021 13:19:55 +0300 Subject: [PATCH 4/9] Bug 573296 - [Passage] rework EMF migration facilities, part 3 Export LIC EMF Meta package Signed-off-by: Alexander Fedorov --- bundles/org.eclipse.passage.lic.emf/META-INF/MANIFEST.MF | 1 + 1 file changed, 1 insertion(+) diff --git a/bundles/org.eclipse.passage.lic.emf/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.emf/META-INF/MANIFEST.MF index 8d0e20998..f32e8ba70 100644 --- a/bundles/org.eclipse.passage.lic.emf/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.emf/META-INF/MANIFEST.MF @@ -26,6 +26,7 @@ Export-Package: org.eclipse.passage.lic.emf.ecore; org.eclipse.passage.lic.products.migration.tests, org.eclipse.passage.lic.users.migration, org.eclipse.passage.lic.users.migration.tests", + org.eclipse.passage.lic.emf.meta, org.eclipse.passage.lic.emf.resource, org.eclipse.passage.lic.internal.emf; x-friends:="org.eclipse.passage.lic.hc, From ea755dac359e41fdbd61e3d8fe9030f4b1f3369b Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Sat, 1 May 2021 13:27:35 +0300 Subject: [PATCH 5/9] Bug 573296 - [Passage] rework EMF migration facilities, part 3 Bump version for org.eclipse.passage.lic.features.model Signed-off-by: Alexander Fedorov --- .../org.eclipse.passage.lic.features.model/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.passage.lic.features.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.features.model/META-INF/MANIFEST.MF index 69eb4cd3d..321cea927 100644 --- a/bundles/org.eclipse.passage.lic.features.model/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.features.model/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.eclipse.passage.lic.features.model Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.passage.lic.features.model;singleton:=true -Bundle-Version: 1.0.200.qualifier +Bundle-Version: 1.0.300.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Copyright: %Bundle-Copyright From 94a838beea1665b6694517c08d8aaf922a9be882 Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Sat, 1 May 2021 13:34:41 +0300 Subject: [PATCH 6/9] Bug 573296 - [Passage] rework EMF migration facilities, part 3 Bump version for org.eclipse.passage.lic.products.model Signed-off-by: Alexander Fedorov --- .../org.eclipse.passage.lic.products.model/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.passage.lic.products.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.products.model/META-INF/MANIFEST.MF index e24368f14..daf974eda 100644 --- a/bundles/org.eclipse.passage.lic.products.model/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.products.model/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.eclipse.passage.lic.products.model Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.passage.lic.products.model;singleton:=true -Bundle-Version: 1.0.200.qualifier +Bundle-Version: 1.0.300.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Copyright: %Bundle-Copyright From ce31532003e46db121a93e42700aa079460f54df Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Sat, 1 May 2021 13:35:04 +0300 Subject: [PATCH 7/9] Bug 573296 - [Passage] rework EMF migration facilities, part 3 Bump version for org.eclipse.passage.lic.users.model Signed-off-by: Alexander Fedorov --- .../org.eclipse.passage.lic.users.model/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.passage.lic.users.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.users.model/META-INF/MANIFEST.MF index d97d9611f..a26a63e71 100644 --- a/bundles/org.eclipse.passage.lic.users.model/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.users.model/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.eclipse.passage.lic.users.model Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.passage.lic.users.model;singleton:=true -Bundle-Version: 1.0.200.qualifier +Bundle-Version: 1.0.300.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Copyright: %Bundle-Copyright From 23f766b9472ab31251f86032ac1bfb149ee9e0f8 Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Sat, 1 May 2021 13:45:46 +0300 Subject: [PATCH 8/9] Bug 573296 - [Passage] rework EMF migration facilities, part 3 Bump version for org.eclipse.passage.lic.products.feature Signed-off-by: Alexander Fedorov --- features/org.eclipse.passage.lic.products.feature/feature.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/org.eclipse.passage.lic.products.feature/feature.xml b/features/org.eclipse.passage.lic.products.feature/feature.xml index 3c1b0697d..d4c0873b9 100644 --- a/features/org.eclipse.passage.lic.products.feature/feature.xml +++ b/features/org.eclipse.passage.lic.products.feature/feature.xml @@ -14,7 +14,7 @@ Date: Sat, 1 May 2021 13:46:06 +0300 Subject: [PATCH 9/9] Bug 573296 - [Passage] rework EMF migration facilities, part 3 Bump version for org.eclipse.passage.lic.users.feature Signed-off-by: Alexander Fedorov --- features/org.eclipse.passage.lic.users.feature/feature.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/org.eclipse.passage.lic.users.feature/feature.xml b/features/org.eclipse.passage.lic.users.feature/feature.xml index 9ae58a1fe..e230b2a3b 100644 --- a/features/org.eclipse.passage.lic.users.feature/feature.xml +++ b/features/org.eclipse.passage.lic.users.feature/feature.xml @@ -14,7 +14,7 @@