This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
from 6edac30ad Bump org.fusesource.jansi:jansi from 2.4.1 to 2.4.2
add c5124de66 ARIES-2177: Build modeller inside subsystem
add 203e162f3 ARIES-2177: Merge application api with modeller
add fa66494e8 ARIES-2177: Remove unnecessary classes
add cd6241fe0 ARIES-2177: Stop using application.api artifact
new 3a83b7820 Merge pull request #652 from
apache/ARIES-2177-limit-application-only-to-subsystem-necessary-parts-in-single-artifact
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/application.yml | 69 ----
.github/workflows/subsystem.yml | 3 -
application/LICENSE | 203 ------------
application/NOTICE | 8 -
application/application-api/LICENSE | 203 ------------
application/application-api/NOTICE | 8 -
application/application-api/pom.xml | 96 ------
.../aries/application/ApplicationMetadata.java | 96 ------
.../application/ApplicationMetadataFactory.java | 52 ---
.../java/org/apache/aries/application/Content.java | 74 -----
.../aries/application/DeploymentContent.java | 36 ---
.../aries/application/DeploymentMetadata.java | 108 -------
.../application/DeploymentMetadataFactory.java | 97 ------
.../aries/application/ServiceDeclaration.java | 40 ---
.../application/management/AriesApplication.java | 80 -----
.../management/AriesApplicationContext.java | 69 ----
.../management/AriesApplicationListener.java | 30 --
.../management/AriesApplicationManager.java | 115 -------
.../aries/application/management/BundleInfo.java | 69 ----
.../management/ManagementException.java | 41 ---
.../application/management/ResolveConstraint.java | 41 ---
.../application/management/UpdateException.java | 41 ---
.../management/spi/convert/BundleConversion.java | 42 ---
.../management/spi/convert/BundleConverter.java | 41 ---
.../spi/convert/ConversionException.java | 36 ---
.../application/management/spi/convert/packageinfo | 19 --
.../management/spi/framework/BundleFramework.java | 100 ------
.../framework/BundleFrameworkConfiguration.java | 30 --
.../BundleFrameworkConfigurationFactory.java | 44 ---
.../spi/framework/BundleFrameworkFactory.java | 35 --
.../spi/framework/BundleFrameworkManager.java | 116 -------
.../management/spi/framework/packageinfo | 19 --
.../spi/repository/BundleRepository.java | 103 ------
.../spi/repository/BundleRepositoryManager.java | 81 -----
.../spi/repository/ContextException.java | 41 ---
.../spi/repository/PlatformRepository.java | 37 ---
.../spi/repository/RepositoryGenerator.java | 46 ---
.../management/spi/repository/packageinfo | 19 --
.../spi/resolve/AriesApplicationResolver.java | 108 -------
.../spi/resolve/DeploymentManifestManager.java | 71 -----
.../spi/resolve/PostResolveTransformer.java | 35 --
.../management/spi/resolve/PreResolveHook.java | 45 ---
.../application/management/spi/resolve/packageinfo | 19 --
.../runtime/AriesApplicationContextManager.java | 66 ----
.../management/spi/runtime/LocalPlatform.java | 44 ---
.../application/management/spi/runtime/packageinfo | 19 --
.../management/spi/update/UpdateStrategy.java | 101 ------
.../application/management/spi/update/packageinfo | 19 --
.../apache/aries/application/modelling/packageinfo | 19 --
.../aries/application/modelling/utils/packageinfo | 19 --
.../java/org/apache/aries/application/packageinfo | 19 --
application/application-modeller/pom.xml | 18 +-
.../impl/ApplicationMetadataFactoryImpl.java | 45 ---
.../application/impl/ApplicationMetadataImpl.java | 237 --------------
.../apache/aries/application/impl/ContentImpl.java | 218 -------------
.../application/impl/DeploymentContentImpl.java | 116 -------
.../impl/DeploymentMetadataFactoryImpl.java | 81 -----
.../application/impl/DeploymentMetadataImpl.java | 354 ---------------------
.../application/impl/ServiceDeclarationImpl.java | 97 ------
.../aries/application/modelling/Consumer.java | 0
.../application/modelling/DeployedBundles.java | 2 -
.../application/modelling/DeploymentMFElement.java | 0
.../application/modelling/ExportedBundle.java | 0
.../application/modelling/ExportedPackage.java | 0
.../application/modelling/ExportedService.java | 0
.../application/modelling/ImportedBundle.java | 0
.../application/modelling/ImportedPackage.java | 0
.../application/modelling/ImportedService.java | 0
.../modelling}/InvalidAttributeException.java | 2 +-
.../application/modelling/ModelledResource.java | 0
.../modelling/ModelledResourceManager.java | 0
.../application/modelling/ModellerException.java | 0
.../application/modelling/ModellingConstants.java | 0
.../application/modelling}/ModellingHelper.java | 9 +-
.../application/modelling/ModellingManager.java | 36 ---
.../modelling/ParsedServiceElements.java | 0
.../aries/application/modelling/ParserProxy.java | 0
.../aries/application/modelling/Provider.java | 0
.../application/modelling}/ResolverException.java | 4 +-
.../aries/application/modelling/ResourceType.java | 0
.../application/modelling/ServiceModeller.java | 0
.../modelling/WrappedReferenceMetadata.java | 0
.../modelling/WrappedServiceMetadata.java | 0
.../modelling/impl/AbstractExportedBundle.java | 1 -
.../modelling/impl/AbstractParserProxy.java | 2 +-
.../application/modelling/impl/AppConstants.java} | 27 +-
.../{internal => impl}/BundleBlueprintParser.java | 2 +-
.../modelling/impl/DeployedBundlesImpl.java | 5 +-
.../modelling/impl/ExportedBundleImpl.java | 4 +-
.../impl}/ExportedServiceHelper.java | 2 +-
.../modelling/impl/ExportedServiceImpl.java | 1 -
.../{utils => modelling/impl}/FilterUtils.java | 2 +-
.../modelling/impl/ImportedBundleImpl.java | 4 +-
.../modelling/impl/ImportedPackageImpl.java | 4 +-
.../modelling/impl/ImportedServiceImpl.java | 4 +-
.../modelling/{internal => impl}/MessageUtil.java | 2 +-
.../modelling/impl/ModelledResourceImpl.java | 35 +-
.../impl/ModelledResourceManagerImpl.java | 95 +-----
.../{utils => }/impl/ModellingHelperImpl.java | 10 +-
.../modelling/impl/ModellingManagerImpl.java | 103 +-----
.../PackageRequirementMerger.java | 3 +-
.../aries/application/modelling}/packageinfo | 0
.../aries/application/utils/AppConstants.java | 83 -----
.../resources/OSGI-INF/blueprint/app-modeller.xml | 4 +-
.../resources/OSGI-INF/blueprint/app-utils.xml | 28 --
.../impl/ApplicationMetadataImplTest.java | 72 -----
.../impl/DeploymentContentImplTest.java | 65 ----
.../utils/AbstractBundleResourceTest.java | 2 +-
.../modelling/utils/BundleResourceTest.java | 4 +-
.../modelling/utils/DeployedBundlesTest.java | 6 +-
.../modelling/utils/ImportedPackageTest.java | 2 +-
.../utils/PackageRequirementMergerTest.java | 4 +-
application/pom.xml | 45 ---
pom.xml | 1 -
subsystem/pom.xml | 1 +
subsystem/readme.txt | 1 -
subsystem/subsystem-bundle/pom.xml | 6 -
subsystem/subsystem-core/pom.xml | 6 +-
subsystem/subsystem-itests/pom.xml | 17 -
.../aries/subsystem/itests/SubsystemTest.java | 3 +-
.../subsystem/itests/util/BundleInfoImpl.java | 147 ---------
.../aries/subsystem/itests/util/ContentImpl.java | 194 -----------
.../subsystem/itests/util/Manve2Repository.java | 126 --------
.../itests/util/RepositoryDescriptorGenerator.java | 196 ------------
.../subsystem/itests/util/RepositoryGenerator.java | 249 ---------------
125 files changed, 70 insertions(+), 5689 deletions(-)
delete mode 100644 .github/workflows/application.yml
delete mode 100644 application/LICENSE
delete mode 100644 application/NOTICE
delete mode 100644 application/application-api/LICENSE
delete mode 100644 application/application-api/NOTICE
delete mode 100644 application/application-api/pom.xml
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/ApplicationMetadata.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/ApplicationMetadataFactory.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/Content.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/DeploymentContent.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadata.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadataFactory.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/ServiceDeclaration.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/AriesApplication.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationManager.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/BundleInfo.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/ManagementException.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/ResolveConstraint.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/UpdateException.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConversion.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConverter.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/ConversionException.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/packageinfo
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFramework.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkConfiguration.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkConfigurationFactory.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkFactory.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkManager.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/packageinfo
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepository.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepositoryManager.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/ContextException.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/PlatformRepository.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/RepositoryGenerator.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/packageinfo
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/AriesApplicationResolver.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/DeploymentManifestManager.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PostResolveTransformer.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PreResolveHook.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/packageinfo
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/LocalPlatform.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/packageinfo
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/update/UpdateStrategy.java
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/management/spi/update/packageinfo
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/modelling/packageinfo
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/modelling/utils/packageinfo
delete mode 100644
application/application-api/src/main/java/org/apache/aries/application/packageinfo
delete mode 100644
application/application-modeller/src/main/java/org/apache/aries/application/impl/ApplicationMetadataFactoryImpl.java
delete mode 100644
application/application-modeller/src/main/java/org/apache/aries/application/impl/ApplicationMetadataImpl.java
delete mode 100644
application/application-modeller/src/main/java/org/apache/aries/application/impl/ContentImpl.java
delete mode 100644
application/application-modeller/src/main/java/org/apache/aries/application/impl/DeploymentContentImpl.java
delete mode 100644
application/application-modeller/src/main/java/org/apache/aries/application/impl/DeploymentMetadataFactoryImpl.java
delete mode 100644
application/application-modeller/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.java
delete mode 100644
application/application-modeller/src/main/java/org/apache/aries/application/impl/ServiceDeclarationImpl.java
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/Consumer.java
(100%)
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/DeployedBundles.java
(95%)
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/DeploymentMFElement.java
(100%)
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/ExportedBundle.java
(100%)
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/ExportedPackage.java
(100%)
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/ExportedService.java
(100%)
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/ImportedBundle.java
(100%)
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/ImportedPackage.java
(100%)
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/ImportedService.java
(100%)
rename application/{application-api/src/main/java/org/apache/aries/application
=>
application-modeller/src/main/java/org/apache/aries/application/modelling}/InvalidAttributeException.java
(96%)
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/ModelledResource.java
(100%)
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/ModelledResourceManager.java
(100%)
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/ModellerException.java
(100%)
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/ModellingConstants.java
(100%)
rename
application/{application-api/src/main/java/org/apache/aries/application/modelling/utils
=>
application-modeller/src/main/java/org/apache/aries/application/modelling}/ModellingHelper.java
(81%)
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/ModellingManager.java
(52%)
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/ParsedServiceElements.java
(100%)
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/ParserProxy.java
(100%)
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/Provider.java
(100%)
rename
application/{application-api/src/main/java/org/apache/aries/application/management
=>
application-modeller/src/main/java/org/apache/aries/application/modelling}/ResolverException.java
(94%)
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/ResourceType.java
(100%)
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/ServiceModeller.java
(100%)
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/WrappedReferenceMetadata.java
(100%)
rename application/{application-api =>
application-modeller}/src/main/java/org/apache/aries/application/modelling/WrappedServiceMetadata.java
(100%)
rename
application/{application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java
=>
application-modeller/src/main/java/org/apache/aries/application/modelling/impl/AppConstants.java}
(55%)
rename
application/application-modeller/src/main/java/org/apache/aries/application/modelling/{internal
=> impl}/BundleBlueprintParser.java (99%)
rename
application/application-modeller/src/main/java/org/apache/aries/application/{utils
=> modelling/impl}/ExportedServiceHelper.java (95%)
rename
application/application-modeller/src/main/java/org/apache/aries/application/{utils
=> modelling/impl}/FilterUtils.java (97%)
rename
application/application-modeller/src/main/java/org/apache/aries/application/modelling/{internal
=> impl}/MessageUtil.java (96%)
rename
application/application-modeller/src/main/java/org/apache/aries/application/modelling/{utils
=> }/impl/ModellingHelperImpl.java (94%)
rename
application/application-modeller/src/main/java/org/apache/aries/application/modelling/{internal
=> impl}/PackageRequirementMerger.java (97%)
rename
application/{application-api/src/main/java/org/apache/aries/application/management
=>
application-modeller/src/main/java/org/apache/aries/application/modelling}/packageinfo
(100%)
delete mode 100644
application/application-modeller/src/main/java/org/apache/aries/application/utils/AppConstants.java
delete mode 100644
application/application-modeller/src/main/resources/OSGI-INF/blueprint/app-utils.xml
delete mode 100644
application/application-modeller/src/test/java/org/apache/aries/application/impl/ApplicationMetadataImplTest.java
delete mode 100644
application/application-modeller/src/test/java/org/apache/aries/application/impl/DeploymentContentImplTest.java
delete mode 100644 application/pom.xml
delete mode 100644
subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/BundleInfoImpl.java
delete mode 100644
subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/ContentImpl.java
delete mode 100644
subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/Manve2Repository.java
delete mode 100644
subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/RepositoryDescriptorGenerator.java
delete mode 100644
subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/RepositoryGenerator.java
