This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch ARIES-2177-limit-application-only-to-subsystem-necessary-parts-in-single-artifact in repository https://gitbox.apache.org/repos/asf/aries.git
commit c5124de661e9b6ac61cad024869f71d7d1d9ed8f Author: Dominik Przybysz <[email protected]> AuthorDate: Mon Apr 28 22:59:21 2025 +0200 ARIES-2177: Build modeller inside subsystem --- .github/workflows/application.yml | 69 ------- .github/workflows/subsystem.yml | 3 - application/LICENSE | 203 --------------------- application/NOTICE | 8 - .../apache/aries/application/impl/ContentImpl.java | 31 ---- .../aries/application/utils/AppConstants.java | 27 +-- .../resources/OSGI-INF/blueprint/app-utils.xml | 28 --- application/pom.xml | 45 ----- pom.xml | 1 - subsystem/pom.xml | 2 + .../aries/subsystem/itests/SubsystemTest.java | 2 +- 11 files changed, 4 insertions(+), 415 deletions(-) diff --git a/.github/workflows/application.yml b/.github/workflows/application.yml deleted file mode 100644 index 4365f0163..000000000 --- a/.github/workflows/application.yml +++ /dev/null @@ -1,69 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -name: Appliaction - CI Build - -on: - pull_request: - paths: - - parent/** - - testsupport/** - - versioning/** - - util/** - - application/** - - .github/workflows/application.yml - push: - branches: - - 'trunk' - -env: - LC_ALL: en_US.UTF-8 - -jobs: - JDKxx_Matrix: - timeout-minutes: 10 - strategy: - fail-fast: false - matrix: - java: [ 8, 11, 17, 21 ] - os: [ ubuntu-latest ] - name: JDK${{ matrix.java }} ${{ matrix.os }} - runs-on: ${{ matrix.os }} - steps: - - name: Git Checkout - uses: actions/checkout@v4 - - name: Set up Java 8 - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: 8 - - name: Build parent - shell: bash - run: mvn -U -e -B -ntp clean install -f parent - - name: Build testsupport - shell: bash - run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f testsupport - - name: Build versioning - shell: bash - run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning - - name: Build util - shell: bash - run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f util - - name: Set up Java ${{ matrix.java }} - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: ${{ matrix.java }} - if: ${{ 8 != matrix.java }} - - name: Build application - shell: bash - run: mvn -U -e -B -ntp clean install -f application diff --git a/.github/workflows/subsystem.yml b/.github/workflows/subsystem.yml index 3cf6fa3fd..d087695da 100644 --- a/.github/workflows/subsystem.yml +++ b/.github/workflows/subsystem.yml @@ -59,9 +59,6 @@ jobs: - name: Build util shell: bash run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f util - - name: Build application - shell: bash - run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f application - name: Build subsystem shell: bash run: mvn -U -e -B -ntp clean install -f subsystem diff --git a/application/LICENSE b/application/LICENSE deleted file mode 100644 index 6b0b1270f..000000000 --- a/application/LICENSE +++ /dev/null @@ -1,203 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - diff --git a/application/NOTICE b/application/NOTICE deleted file mode 100644 index a15bc51da..000000000 --- a/application/NOTICE +++ /dev/null @@ -1,8 +0,0 @@ - -Apache Aries -Copyright 2009-2010 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - - diff --git a/application/application-modeller/src/main/java/org/apache/aries/application/impl/ContentImpl.java b/application/application-modeller/src/main/java/org/apache/aries/application/impl/ContentImpl.java index 606960175..078b827f7 100644 --- a/application/application-modeller/src/main/java/org/apache/aries/application/impl/ContentImpl.java +++ b/application/application-modeller/src/main/java/org/apache/aries/application/impl/ContentImpl.java @@ -57,19 +57,6 @@ public final class ContentImpl implements Content } } - public ContentImpl (String bundleSymbolicName, Version version) { - this.contentName = bundleSymbolicName; - this.nameValueMap = new HashMap<String, String>(); - nameValueMap.put("version", version.toString()); - setup(); - } - - public ContentImpl (String bundleSymbolicName, VersionRange version) { - this.contentName = bundleSymbolicName; - this.nameValueMap = new HashMap<String, String>(); - nameValueMap.put("version", version.toString()); - setup(); - } /** * * @param contentName @@ -98,15 +85,6 @@ public final class ContentImpl implements Content return toReturn; } - /** - * add key value to the attributes map - * @param key - * @param value - */ - public void addAttribute(String key, String value) { - this.attributes.put(key, value); - } - public String getDirective(String key) { String toReturn = this.directives.get(key); return toReturn; @@ -120,15 +98,6 @@ public final class ContentImpl implements Content return nvm; } - /** - * add key value to the directives map - * @param key - * @param value - */ - public void addDirective(String key, String value) { - this.directives.put(key, value); - } - public VersionRange getVersion() { VersionRange vi = null; if (this.attributes.get(Constants.VERSION_ATTRIBUTE) != null diff --git a/application/application-modeller/src/main/java/org/apache/aries/application/utils/AppConstants.java b/application/application-modeller/src/main/java/org/apache/aries/application/utils/AppConstants.java index c3dcb63ba..64acd55b2 100644 --- a/application/application-modeller/src/main/java/org/apache/aries/application/utils/AppConstants.java +++ b/application/application-modeller/src/main/java/org/apache/aries/application/utils/AppConstants.java @@ -22,15 +22,9 @@ package org.apache.aries.application.utils; * Widely used constants in parsing Aries applications */ public interface AppConstants { - /** Trace group for this bundle */ - String TRACE_GROUP = "Aries.app.utils"; - - /** The Manifest version */ String APPLICATION_MANIFEST_VERSION="Manifest-Version"; - /** The application scope (used to find the applications bundle repository */ - String APPLICATION_SCOPE = "Application-Scope"; /** The application content directive for the application manifest */ String APPLICATION_CONTENT = "Application-Content"; /** The application version directive for the application manifest */ @@ -39,25 +33,9 @@ public interface AppConstants { String APPLICATION_NAME = "Application-Name"; /** The application symbolic name directive for the application manifest */ String APPLICATION_SYMBOLIC_NAME = "Application-SymbolicName"; - /** The default version for applications that do not have one */ - String DEFAULT_VERSION = "0.0.0"; - /** The name of the application manifest in the application */ - String APPLICATION_MF = "META-INF/APPLICATION.MF"; - /** The name of the deployment manifest in the application */ - String DEPLOYMENT_MF = "META-INF/DEPLOYMENT.MF"; - /** The name of the META-INF directory */ - String META_INF = "META-INF"; - /** The name of an application.xml file which will be used in processing legacy .war files */ - String APPLICATION_XML = "META-INF/application.xml"; - /** The expected lower case suffix of a jar file */ - String LOWER_CASE_JAR_SUFFIX = ".jar"; - /** The expected lower case suffix of a war file */ - String LOWER_CASE_WAR_SUFFIX = ".war"; /** The attribute used to record the deployed version of a bundle */ String DEPLOYMENT_BUNDLE_VERSION = "deployed-version"; - /** The name of the bundle manifest */ - String MANIFEST_MF = "META-INF/MANIFEST.MF"; - + String MANIFEST_VERSION="1.0"; /** The application import service directive for the application manifest */ String APPLICATION_IMPORT_SERVICE = "Application-ImportService"; @@ -77,7 +55,4 @@ public interface AppConstants { String DEPLOYMENT_PROVISION_BUNDLE = "Provision-Bundle"; /** Blueprint managed services imported by the isolated bundles */ String DEPLOYMENTSERVICE_IMPORT = "DeployedService-Import"; - - String PROVISON_EXCLUDE_LOCAL_REPO_SYSPROP="provision.exclude.local.repository"; - String LOG_EXCEPTION = "Caught exception"; } diff --git a/application/application-modeller/src/main/resources/OSGI-INF/blueprint/app-utils.xml b/application/application-modeller/src/main/resources/OSGI-INF/blueprint/app-utils.xml deleted file mode 100644 index f97f2d95b..000000000 --- a/application/application-modeller/src/main/resources/OSGI-INF/blueprint/app-utils.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0";> - - <bean id="applicationMf-factory" class="org.apache.aries.application.impl.ApplicationMetadataFactoryImpl" /> - <service interface="org.apache.aries.application.ApplicationMetadataFactory" ref="applicationMf-factory" /> - - <bean id="deploymentMf-factory" class="org.apache.aries.application.impl.DeploymentMetadataFactoryImpl" /> - <service interface="org.apache.aries.application.DeploymentMetadataFactory" ref="deploymentMf-factory" /> - -</blueprint> diff --git a/application/pom.xml b/application/pom.xml deleted file mode 100644 index f8a28c343..000000000 --- a/application/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.aries</groupId> - <artifactId>parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - - <groupId>org.apache.aries.application</groupId> - <artifactId>application</artifactId> - <name>Apache Aries Application</name> - <packaging>pom</packaging> - <version>1.0.0-SNAPSHOT</version> - <description> - Reactor pom for the Aries Application module - </description> - - <modules> - <module>application-api</module> - <module>application-modeller</module> - </modules> - -</project> diff --git a/pom.xml b/pom.xml index aeb30f81f..adf171d6b 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,6 @@ <packaging>pom</packaging> <modules> - <module>application</module> <module>async</module> <module>blueprint</module> <module>blueprint-maven-plugin</module> diff --git a/subsystem/pom.xml b/subsystem/pom.xml index 045f5f732..7888dcd0e 100644 --- a/subsystem/pom.xml +++ b/subsystem/pom.xml @@ -42,6 +42,8 @@ </scm> <modules> + <module>../application/application-api</module> + <module>../application/application-modeller</module> <module>subsystem-api</module> <module>subsystem-core</module> <module>subsystem-obr</module> diff --git a/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java b/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java index 06e63e07c..007bcddc4 100644 --- a/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java +++ b/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java @@ -134,7 +134,6 @@ public abstract class SubsystemTest extends AbstractIntegrationTest { systemProperty("org.osgi.framework.storage.clean").value("onFirstInit"), // Bundles mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(), - mavenBundle("org.apache.aries.application", "org.apache.aries.application.api").versionAsInProject(), when(installModeler).useOptions(modelerBundles()), when(installConfigAdmin).useOptions( mavenBundle("org.apache.felix", "org.apache.felix.configadmin").versionAsInProject()), @@ -168,6 +167,7 @@ public abstract class SubsystemTest extends AbstractIntegrationTest { private Option modelerBundles() { return CoreOptions.composite( + mavenBundle("org.apache.aries.application", "org.apache.aries.application.api").versionAsInProject(), mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller").versionAsInProject(), mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.core").versionAsInProject(), mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject());
