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 203e162f3bab942d118e4e36f2cd8b0be31b7540 Author: Dominik Przybysz <[email protected]> AuthorDate: Mon Apr 28 23:08:56 2025 +0200 ARIES-2177: Merge application api with modeller --- application/application-api/LICENSE | 203 --------------------- application/application-api/NOTICE | 8 - application/application-api/pom.xml | 96 ---------- .../management/spi/convert/BundleConversion.java | 42 ----- .../management/spi/convert/BundleConverter.java | 41 ----- .../spi/convert/ConversionException.java | 36 ---- .../framework/BundleFrameworkConfiguration.java | 30 --- .../BundleFrameworkConfigurationFactory.java | 44 ----- .../spi/framework/BundleFrameworkFactory.java | 35 ---- .../spi/framework/BundleFrameworkManager.java | 116 ------------ .../spi/repository/BundleRepositoryManager.java | 81 -------- .../spi/repository/ContextException.java | 41 ----- .../spi/repository/PlatformRepository.java | 37 ---- .../spi/repository/RepositoryGenerator.java | 46 ----- .../spi/resolve/DeploymentManifestManager.java | 71 ------- .../spi/resolve/PostResolveTransformer.java | 35 ---- .../management/spi/resolve/PreResolveHook.java | 45 ----- .../runtime/AriesApplicationContextManager.java | 66 ------- .../management/spi/runtime/LocalPlatform.java | 44 ----- .../management/spi/update/UpdateStrategy.java | 101 ---------- .../apache/aries/application/modelling/packageinfo | 19 -- .../aries/application/modelling/utils/packageinfo | 19 -- .../java/org/apache/aries/application/packageinfo | 19 -- application/application-modeller/pom.xml | 12 +- .../aries/application/ApplicationMetadata.java | 0 .../application/ApplicationMetadataFactory.java | 0 .../java/org/apache/aries/application/Content.java | 0 .../aries/application/DeploymentContent.java | 0 .../aries/application/DeploymentMetadata.java | 0 .../application/DeploymentMetadataFactory.java | 0 .../application/InvalidAttributeException.java | 0 .../aries/application/ServiceDeclaration.java | 0 .../application/management/AriesApplication.java | 0 .../management/AriesApplicationContext.java | 0 .../management/AriesApplicationEvent.java | 0 .../management/AriesApplicationListener.java | 0 .../management/AriesApplicationManager.java | 0 .../aries/application/management/BundleInfo.java | 0 .../management/ManagementException.java | 0 .../application/management/ResolveConstraint.java | 0 .../application/management/ResolverException.java | 0 .../application/management/UpdateException.java | 0 .../aries/application/management/packageinfo | 0 .../management/spi/framework/BundleFramework.java | 0 .../management/spi/framework}/packageinfo | 0 .../spi/repository/BundleRepository.java | 0 .../management/spi/repository}/packageinfo | 0 .../spi/resolve/AriesApplicationResolver.java | 0 .../management/spi/resolve}/packageinfo | 0 .../aries/application/modelling/Consumer.java | 0 .../application/modelling/DeployedBundles.java | 0 .../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 .../application/modelling/ModelledResource.java | 0 .../modelling/ModelledResourceManager.java | 0 .../application/modelling/ModellerException.java | 0 .../application/modelling/ModellingConstants.java | 0 .../application/modelling/ModellingManager.java | 0 .../modelling/ParsedServiceElements.java | 0 .../aries/application/modelling/ParserProxy.java | 0 .../aries/application/modelling/Provider.java | 0 .../aries/application/modelling/ResourceType.java | 0 .../application/modelling/ServiceModeller.java | 0 .../modelling/WrappedReferenceMetadata.java | 0 .../modelling/WrappedServiceMetadata.java | 0 .../aries/application/modelling}/packageinfo | 0 .../modelling/utils/ModellingHelper.java | 0 .../aries/application/modelling/utils}/packageinfo | 0 .../java/org/apache/aries/application}/packageinfo | 0 subsystem/pom.xml | 1 - subsystem/readme.txt | 1 - .../aries/subsystem/itests/SubsystemTest.java | 3 +- 77 files changed, 6 insertions(+), 1286 deletions(-) diff --git a/application/application-api/LICENSE b/application/application-api/LICENSE deleted file mode 100644 index 6b0b1270f..000000000 --- a/application/application-api/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/application-api/NOTICE b/application/application-api/NOTICE deleted file mode 100644 index 424644d05..000000000 --- a/application/application-api/NOTICE +++ /dev/null @@ -1,8 +0,0 @@ - -Apache Aries -Copyright 2009-2011 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - - diff --git a/application/application-api/pom.xml b/application/application-api/pom.xml deleted file mode 100644 index 51ff0c2bf..000000000 --- a/application/application-api/pom.xml +++ /dev/null @@ -1,96 +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.0</version> - <relativePath>../../parent/pom.xml</relativePath> - </parent> - - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.api</artifactId> - <packaging>bundle</packaging> - <name>Apache Aries Application API</name> - <version>1.0.1-SNAPSHOT</version> - <description> - Application API. - </description> - - <scm> - <connection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</connection> - <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</developerConnection> - <url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url> - </scm> - - <properties> - <!-- Export package versions are maintained in packageinfo files --> - <aries.osgi.export.pkg> - org.apache.aries.application; - org.apache.aries.application.filesystem; - org.apache.aries.application.management, - org.apache.aries.application.management.spi.*; - org.apache.aries.application.modelling; - org.apache.aries.application.modelling.utils, - </aries.osgi.export.pkg> - <aries.osgi.private.pkg/> - <lastReleaseVersion>1.0.0</lastReleaseVersion> - <org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version> - - <org.apache.aries.util.version>1.2.0-SNAPSHOT</org.apache.aries.util.version> - <osgi.core.version>4.3.1</osgi.core.version> - </properties> - - <dependencies> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>osgi.core</artifactId> - <version>${osgi.core.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.aries</groupId> - <artifactId>org.apache.aries.util</artifactId> - <version>${org.apache.aries.util.version}</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.aries.versioning</groupId> - <artifactId>org.apache.aries.versioning.plugin</artifactId> - <executions> - <execution> - <id>default-verify</id> - <phase>verify</phase> - <goals> - <goal>version-check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConversion.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConversion.java deleted file mode 100644 index b328ef69c..000000000 --- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConversion.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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 WARRANTIESOR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.aries.application.management.spi.convert; - -import java.io.IOException; -import java.io.InputStream; - -import org.apache.aries.application.management.BundleInfo; - -/** - * A BundleConversion represents a .JAR file which has been converted in to - * an well-formed OSGi bundle, or a .WAR file which has been converted into a .WAB - * file - */ -public interface BundleConversion { - - /** - * @return The InputStream to the converted bundle. - */ - InputStream getInputStream() throws IOException; - - /** - * @return The bundle information for the converted bundle. - */ - BundleInfo getBundleInfo() throws IOException; -} diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConverter.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConverter.java deleted file mode 100644 index 746039ec2..000000000 --- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConverter.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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 WARRANTIESOR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.aries.application.management.spi.convert; - -import org.apache.aries.util.filesystem.IDirectory; -import org.apache.aries.util.filesystem.IFile; - -/** - * A BundleConverter turns a .jar that is not an OSGi bundle into a well formed OSGi bundle, - * or a .war that is not a WAB into a WAB. The first converter to return a non-null result is - * taken as having fully converted the bundle. - */ -public interface BundleConverter { - /** - * @param parentEba The root of the eba containing the artifact being converted - - * a zip format file with .eba suffix, or an exploded directory. - * @param fileInEba The object within the eba to convert - * @throws ConversionException if conversion was attempted but failed - * @return valid input stream or null if this converter does not support conversion of - * this artifact type. - */ - BundleConversion convert (IDirectory parentEba, IFile fileInEba) throws ConversionException; - -} diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/ConversionException.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/ConversionException.java deleted file mode 100644 index c506349e5..000000000 --- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/ConversionException.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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 WARRANTIESOR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.aries.application.management.spi.convert; - -/** - * An Exception thrown by a BundleConverter - */ -public class ConversionException extends Exception { - - private static final long serialVersionUID = -5921912484821992252L; - - public ConversionException (Exception e) { - super(e); - } - - public ConversionException (String s) { - super(s); - } -} diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkConfiguration.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkConfiguration.java deleted file mode 100644 index ec8a43267..000000000 --- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkConfiguration.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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 WARRANTIESOR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.aries.application.management.spi.framework; - -import java.util.Properties; - -public interface BundleFrameworkConfiguration { - - String getFrameworkID(); - - Properties getFrameworkProperties(); - - Properties getFrameworkManifest(); -} diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkConfigurationFactory.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkConfigurationFactory.java deleted file mode 100644 index 7c4370d72..000000000 --- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkConfigurationFactory.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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 WARRANTIESOR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.aries.application.management.spi.framework; - -import org.apache.aries.application.management.AriesApplication; -import org.osgi.framework.BundleContext; - -public interface BundleFrameworkConfigurationFactory -{ - /** - * Create a BundleFrameworkConfiguration with basic config - * @param parentCtx - * @return the framework config - */ - BundleFrameworkConfiguration createBundleFrameworkConfig(String frameworkId, - BundleContext parentCtx); - - /** - * Create a BundleFrameworkConiguration for an application framework based - * on a given AriesApplication. - * @param parentCtx - * @param app - * @return the framework config - */ - BundleFrameworkConfiguration createBundleFrameworkConfig(String frameworkId, - BundleContext parentCtx, AriesApplication app); - -} diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkFactory.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkFactory.java deleted file mode 100644 index b19c05b4e..000000000 --- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkFactory.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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 WARRANTIESOR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.aries.application.management.spi.framework; - -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; - -public interface BundleFrameworkFactory -{ - /** - * Creates a new isolated bundle framework with the properties provided. - * @param bc The context in which to install the new framework - * @param config The BundleFrameworkConfiguration object used to configure the returned framework - * @return the bundle framework - * @throws BundleException - */ - BundleFramework createBundleFramework(BundleContext bc, BundleFrameworkConfiguration config) - throws BundleException; -} diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkManager.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkManager.java deleted file mode 100644 index f5dc3204d..000000000 --- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkManager.java +++ /dev/null @@ -1,116 +0,0 @@ -/* - * 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 WARRANTIESOR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.aries.application.management.spi.framework; - -import java.util.Collection; -import java.util.Map; -import java.util.Set; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleException; -import org.apache.aries.application.DeploymentContent; -import org.apache.aries.application.DeploymentMetadata; -import org.apache.aries.application.management.AriesApplication; -import org.apache.aries.application.management.UpdateException; -import org.apache.aries.application.management.spi.repository.BundleRepository.BundleSuggestion; - -public interface BundleFrameworkManager -{ - /** - * All additions/removals of frameworks and bundles from the shared bundle framework are - * performed under this object lock. Users bypassing this api and performing operations on - * the underlying OSGi frameworks should be sure to hold this lock. - */ - Object SHARED_FRAMEWORK_LOCK = new Object(); - - /** - * Gets the BundleFramework object associated with the given bundle - * @param frameworkBundle - The bundle representing the bundle framework - * @return the bundle framework - */ - BundleFramework getBundleFramework(Bundle frameworkBundle); - - /** - * Gets a reference to the single shared bundle framework. The Shared Bundle - * Framework contains bundle shared between applications - * @return the shared bundle framework - */ - BundleFramework getSharedBundleFramework(); - - /** - * Creates a new framework inside the shared bundle framework and installs a - * collection of bundles into the framework. - * @param bundlesToInstall The collection of bundles to be installed - * @param app The application associated with this install - * @return the bundle of the framework - * @throws BundleException - */ - Bundle installIsolatedBundles( - Collection<BundleSuggestion> bundlesToInstall, - AriesApplication app) - throws BundleException; - - /** - * Installs a collection of shared bundles to the shared bundle framework - * @param bundlesToInstall - * @param app - * @return the collection of installed bundles. - * @throws BundleException - */ - Collection<Bundle> installSharedBundles( - Collection<BundleSuggestion> bundlesToInstall, - AriesApplication app) - throws BundleException; - - boolean allowsUpdate(DeploymentMetadata newMetadata, DeploymentMetadata oldMetadata); - - interface BundleLocator { - Map<DeploymentContent, BundleSuggestion> suggestBundle(Collection<DeploymentContent> bundles) throws BundleException; - } - - void updateBundles( - DeploymentMetadata newMetadata, - DeploymentMetadata oldMetadata, - AriesApplication app, - BundleLocator locator, - Set<Bundle> bundles, - boolean startBundles) throws UpdateException; - - /** - * Starts a previously installed bundle - * @param b - * @throws BundleException - */ - void startBundle(Bundle b) throws BundleException; - - /** - * Stops a previously installed bundle - * @param b - * @throws BundleException - */ - void stopBundle(Bundle b) throws BundleException; - - /** - * Removes a bundle from the runtime - * @param b - * @throws BundleException - */ - void uninstallBundle(Bundle b) throws BundleException; - -} diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepositoryManager.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepositoryManager.java deleted file mode 100644 index 4da1cb686..000000000 --- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepositoryManager.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * 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 WARRANTIESOR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.aries.application.management.spi.repository; - -import java.util.Collection; -import java.util.Map; - -import org.apache.aries.application.DeploymentContent; -import org.apache.aries.application.management.spi.repository.BundleRepository.BundleSuggestion; - -public interface BundleRepositoryManager -{ - /** - * Gets a collection of all bundle repositories which can provide bundles to - * the given application scope. - * @param applicationName - * @param applicationVersion - * @return the collection of bundle repositories for an app. - */ - Collection<BundleRepository> getBundleRepositoryCollection( - String applicationName, String applicationVersion); - - /** - * Gets all known bundle repositories - * @return all known bundle repositories. - */ - Collection<BundleRepository> getAllBundleRepositories(); - - /** - * Get a collection of bundle installation suggestions from repositories - * suitable for the given application scope - * @param applicationName - * @param applicationVersion - * @param content - * @return the bundle suggestions - * @throws ContextException - */ - Map<DeploymentContent, BundleSuggestion> getBundleSuggestions( - String applicationName, - String applicationVersion, - Collection<DeploymentContent> content) throws ContextException; - - /** - * Get a collection of bundle installation suggestions from all - * known repositories - * @param content - * @return the bundle suggestions - * @throws ContextException - */ - Map<DeploymentContent, BundleSuggestion> getBundleSuggestions( - Collection<DeploymentContent> content) throws ContextException; - - /** - * Get a collection of bundle installation suggestions from the collection of - * given repositories - * @param brs - * @param content - * @return the bundle suggestions - * @throws ContextException - */ - Map<DeploymentContent, BundleSuggestion> getBundleSuggestions( - Collection<BundleRepository> brs, - Collection<DeploymentContent> content) throws ContextException; - -} diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/ContextException.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/ContextException.java deleted file mode 100644 index 0f3bb4be6..000000000 --- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/ContextException.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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 WARRANTIESOR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.aries.application.management.spi.repository; - -/** - * An exception thrown by various methods within this package. - */ -public class ContextException extends Exception { - - private static final long serialVersionUID = -6613842057223737125L; - - public ContextException (Exception e) { - super(e); - } - - public ContextException (String s) { - super(s); - } - - public ContextException(String s, Exception e) - { - super(s, e); - } -} diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/PlatformRepository.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/PlatformRepository.java deleted file mode 100644 index 7dc966ca2..000000000 --- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/PlatformRepository.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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 WARRANTIESOR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.aries.application.management.spi.repository; - -import java.net.URI; -import java.util.Collection; - -/** - * This interface allows one to find out information about configured bundle repositories - * - */ -public interface PlatformRepository { - - - /** - * Obtain a set of URIs to bundle repositories representing the local platform's capabilities. - * These repositories do not represent any bundles but only platform capabilities. - * @return URLs to bundle repositories representing the local platform - */ - Collection<URI> getPlatformRepositoryURLs(); -} diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/RepositoryGenerator.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/RepositoryGenerator.java deleted file mode 100644 index d80af9b6c..000000000 --- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/RepositoryGenerator.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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 WARRANTIESOR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.aries.application.management.spi.repository; - -import java.io.IOException; -import java.io.OutputStream; -import java.util.Collection; - -import org.apache.aries.application.management.ResolverException; -import org.apache.aries.application.modelling.ModelledResource; - -public interface RepositoryGenerator -{ - /** - * Generate repository and store the content in the output stream. - * @param repositoryName The repository name - * @param byValueBundles By value bundles - * @param os output stream - * @throws ResolverException - * @throws IOException - */ - void generateRepository(String repositoryName, Collection<? extends ModelledResource> byValueBundles, OutputStream os) throws ResolverException, IOException; - /** - * Generate a repository xml for the list of url and store the content in the output stream - * @param source the list of url to the bundle archive, for file: protocol, it can be simplified by using relative path or absolute path(e.g. \temp\aa.jar or ..\temp\jars\aa.jar) - * @param fout the output stream containing the repository xml - * @throws IOException - */ - void generateRepository(String[] source, OutputStream fout) throws IOException; -} diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/DeploymentManifestManager.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/DeploymentManifestManager.java deleted file mode 100644 index 0af8e96dc..000000000 --- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/DeploymentManifestManager.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * 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 WARRANTIESOR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.aries.application.management.spi.resolve; - -import java.util.Collection; -import java.util.jar.Manifest; - -import org.apache.aries.application.ApplicationMetadata; -import org.apache.aries.application.Content; -import org.apache.aries.application.management.AriesApplication; -import org.apache.aries.application.management.ResolveConstraint; -import org.apache.aries.application.management.ResolverException; -import org.apache.aries.application.modelling.DeployedBundles; -import org.apache.aries.application.modelling.ModelledResource; - -public interface DeploymentManifestManager -{ - /** - * Generate the deployment manifest map for the application. The method is designed to be used when installing an application. - * @param app The Aries application - * @param constraints the constraints, used to narrow down the deployment content - * @return the deployment manifest - * @throws ResolverException - */ - Manifest generateDeploymentManifest( AriesApplication app, ResolveConstraint... constraints ) throws ResolverException; - - - /** - * Generate the deployment manifest map. The method can be used for some advanced scenarios. - * @param appMetadata The Aries application metadata - * @param byValueBundles By value bundles - * @param otherBundles Other bundles to be used to narrow the resolved bundles - * @return DeployedBundles model of the deployed application - * @throws ResolverException - */ - DeployedBundles generateDeployedBundles( - ApplicationMetadata appMetadata, - Collection<ModelledResource> byValueBundles, - Collection<Content> otherBundles) throws ResolverException; - - /** - * Generate a Manifest representation of a DEPLOYMENT.MF, - * suitable for example to writing to disk - * @param appSymbolicName - * @param appVersion - * @param deployedBundles Such as obtained from generateDeployedBundles() - * @return the deployment manifest - * @throws ResolverException - */ - Manifest generateDeploymentManifest ( - String appSymbolicName, - String appVersion, - DeployedBundles deployedBundles) throws ResolverException; - -} diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PostResolveTransformer.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PostResolveTransformer.java deleted file mode 100644 index 2c51bd45f..000000000 --- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PostResolveTransformer.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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 WARRANTIESOR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.aries.application.management.spi.resolve; - -import org.apache.aries.application.ApplicationMetadata; -import org.apache.aries.application.management.ResolverException; -import org.apache.aries.application.modelling.DeployedBundles; - -public interface PostResolveTransformer { -/** - * This method is to perform any post process after the resolver returns back a collection of bundles. It returns the updated manifest map. - * @param appMetaData The application that was resolved - * @param deployedBundles A collection of bundles required by this application. - * @return Modified collection of bundles - * @throws ResolverException - */ - DeployedBundles postResolveProcess(ApplicationMetadata appMetaData, DeployedBundles deployedBundles) throws ResolverException; - -} diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PreResolveHook.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PreResolveHook.java deleted file mode 100644 index c60c54b4f..000000000 --- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PreResolveHook.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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 WARRANTIESOR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.aries.application.management.spi.resolve; - -import java.util.Collection; - -import org.apache.aries.application.modelling.ModelledResource; - -/** - * This interface allows a pre resolve hook to add customizats - * into the OBR resolve operation. - */ -public interface PreResolveHook -{ - /** - * Depending on the environment it may be necessary to add - * resources to the resolve operation which you do not wish - * to provision. These may be resources that already exist - * and are available, or are sourced in a different way. Any - * resources returned by this method are resolved against, but - * not placed in the deployment.mf. This may result in problems - * if a fake resource is provided, but the capabilities are not - * provided at runtime. - * - * @param resources A mutable collection of ModelledResources that can have - * more elements added or removed. - */ - void collectFakeResources(Collection<ModelledResource> resources); -} \ No newline at end of file diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java deleted file mode 100644 index c0006fe2a..000000000 --- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * 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 WARRANTIESOR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.aries.application.management.spi.runtime; - -import java.util.Set; - -import org.apache.aries.application.DeploymentMetadata; -import org.apache.aries.application.management.AriesApplication; -import org.apache.aries.application.management.AriesApplicationContext; -import org.apache.aries.application.management.ManagementException; -import org.apache.aries.application.management.UpdateException; -import org.osgi.framework.BundleException; - -/** - * An ApplicationContextManager is responsible for managing Aries applications in the - * server's OSGi runtime. We expect that many projects consuming this code will provide - * their own implementation of this service. - */ -public interface AriesApplicationContextManager { - - /** - * Obtain an ApplicationContext for an AriesApplication. Applications are stopped and - * started via an ApplicationContext. - * @param app The applicaton for which to obtain an ApplicationContext. - * @return AriesApplicationContext - * @throws BundleException - * @throws ManagementException - */ - AriesApplicationContext getApplicationContext(AriesApplication app) throws BundleException, ManagementException; - - /** - * @return The set of all AriesApplicationContexts. - */ - Set<AriesApplicationContext> getApplicationContexts(); - - /** - * Update the AriesApplication and return an updated application context. - * @throws UpdateException if the update failed - * @throws IllegalArgumentException if the app is not currently installed - */ - AriesApplicationContext update(AriesApplication app, DeploymentMetadata oldMetadata) throws UpdateException; - - /** - * Remove the provided AriesApplicationContext from the running system. - * - * @param app the application to remove. - */ - void remove(AriesApplicationContext app) throws BundleException; -} diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/LocalPlatform.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/LocalPlatform.java deleted file mode 100644 index 8c880cd8f..000000000 --- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/LocalPlatform.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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 WARRANTIESOR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.aries.application.management.spi.runtime; - -import java.io.File; -import java.io.IOException; - -/** - * This is a difficult interface to name properly. It holds methods that need to - * be implemented on a per-application server platform basis. - */ -public interface LocalPlatform { - - /** - * Obtain a temporary directory - * @return Temporary directory - * @throws IOException - */ - File getTemporaryDirectory() throws IOException; - - /** - * Obtain a temporary file - * @return Temporary directory - * @throws IOException - */ - File getTemporaryFile() throws IOException; -} diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/update/UpdateStrategy.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/update/UpdateStrategy.java deleted file mode 100644 index 8cad887b3..000000000 --- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/update/UpdateStrategy.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * 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. - */ -package org.apache.aries.application.management.spi.update; - -import java.util.Collection; -import java.util.Map; - -import org.apache.aries.application.DeploymentContent; -import org.apache.aries.application.DeploymentMetadata; -import org.apache.aries.application.management.AriesApplication; -import org.apache.aries.application.management.UpdateException; -import org.apache.aries.application.management.spi.framework.BundleFramework; -import org.apache.aries.application.management.spi.repository.BundleRepository; -import org.apache.aries.application.management.spi.repository.BundleRepository.BundleSuggestion; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleException; - -/** - * Plug point for update implementation - */ -public interface UpdateStrategy { - - /** - * Are the two deployments subject to update or do they require full reinstall - */ - boolean allowsUpdate(DeploymentMetadata newMetadata, DeploymentMetadata oldMetadata); - - /** - * Update an application - */ - void update(UpdateInfo paramUpdateInfo) throws UpdateException; - - /** - * Representation for an update request - */ - interface UpdateInfo - { - /** - * Find {@link BundleSuggestion} objects for new bundle requests - */ - Map<DeploymentContent, BundleRepository.BundleSuggestion> suggestBundle(Collection<DeploymentContent> bundles) - throws BundleException; - - /** - * Register a new bundle with the application (i.e. a new bundle was installed) - */ - void register(Bundle bundle); - - /** - * Unregister a bundle from the application (i.e. the bundle was uninstalled) - */ - void unregister(Bundle bundle); - - /** - * Get a {@link BundleFramework} object for the shared framework - */ - BundleFramework getSharedFramework(); - - /** - * Get a {@link BundleFramework} object for the isolated framework corresponding - * to the application to be updated - */ - BundleFramework getAppFramework(); - - /** - * Get the {@link DeploymentMetadata} that is currently active and to be phased out - */ - DeploymentMetadata getOldMetadata(); - - /** - * Get the {@link DeploymentMetadata} that is to be activated - */ - DeploymentMetadata getNewMetadata(); - - /** - * Get the {@link AriesApplication} object being updated - */ - AriesApplication getApplication(); - - /** - * Whether to start any newly installed bundles - */ - boolean startBundles(); - } -} diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/packageinfo b/application/application-api/src/main/java/org/apache/aries/application/modelling/packageinfo deleted file mode 100644 index c72722a25..000000000 --- a/application/application-api/src/main/java/org/apache/aries/application/modelling/packageinfo +++ /dev/null @@ -1,19 +0,0 @@ -# -# 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. -# -version 1.0.0 diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/utils/packageinfo b/application/application-api/src/main/java/org/apache/aries/application/modelling/utils/packageinfo deleted file mode 100644 index c72722a25..000000000 --- a/application/application-api/src/main/java/org/apache/aries/application/modelling/utils/packageinfo +++ /dev/null @@ -1,19 +0,0 @@ -# -# 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. -# -version 1.0.0 diff --git a/application/application-api/src/main/java/org/apache/aries/application/packageinfo b/application/application-api/src/main/java/org/apache/aries/application/packageinfo deleted file mode 100644 index c72722a25..000000000 --- a/application/application-api/src/main/java/org/apache/aries/application/packageinfo +++ /dev/null @@ -1,19 +0,0 @@ -# -# 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. -# -version 1.0.0 diff --git a/application/application-modeller/pom.xml b/application/application-modeller/pom.xml index f191c5c9d..a36ea1d2e 100644 --- a/application/application-modeller/pom.xml +++ b/application/application-modeller/pom.xml @@ -45,15 +45,13 @@ <properties> <aries.osgi.private.pkg> - org.apache.aries.application.impl, - org.apache.aries.application.modelling.impl; - org.apache.aries.application.modelling.internal; - org.apache.aries.application.modelling.utils.impl, - org.apache.aries.application.utils + org.apache.aries.application** </aries.osgi.private.pkg> - <aries.osgi.export.pkg/> + <aries.osgi.export.pkg> + org.apache.aries.application.modelling + </aries.osgi.export.pkg> <aries.osgi.import.pkg> - org.apache.aries.application*;provide:=true, + org.apache.aries.application.modelling*;provide:=true, * </aries.osgi.import.pkg> <lastReleaseVersion>1.0.0</lastReleaseVersion> diff --git a/application/application-api/src/main/java/org/apache/aries/application/ApplicationMetadata.java b/application/application-modeller/src/main/java/org/apache/aries/application/ApplicationMetadata.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/ApplicationMetadata.java rename to application/application-modeller/src/main/java/org/apache/aries/application/ApplicationMetadata.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/ApplicationMetadataFactory.java b/application/application-modeller/src/main/java/org/apache/aries/application/ApplicationMetadataFactory.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/ApplicationMetadataFactory.java rename to application/application-modeller/src/main/java/org/apache/aries/application/ApplicationMetadataFactory.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/Content.java b/application/application-modeller/src/main/java/org/apache/aries/application/Content.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/Content.java rename to application/application-modeller/src/main/java/org/apache/aries/application/Content.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/DeploymentContent.java b/application/application-modeller/src/main/java/org/apache/aries/application/DeploymentContent.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/DeploymentContent.java rename to application/application-modeller/src/main/java/org/apache/aries/application/DeploymentContent.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadata.java b/application/application-modeller/src/main/java/org/apache/aries/application/DeploymentMetadata.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadata.java rename to application/application-modeller/src/main/java/org/apache/aries/application/DeploymentMetadata.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadataFactory.java b/application/application-modeller/src/main/java/org/apache/aries/application/DeploymentMetadataFactory.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadataFactory.java rename to application/application-modeller/src/main/java/org/apache/aries/application/DeploymentMetadataFactory.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/InvalidAttributeException.java b/application/application-modeller/src/main/java/org/apache/aries/application/InvalidAttributeException.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/InvalidAttributeException.java rename to application/application-modeller/src/main/java/org/apache/aries/application/InvalidAttributeException.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/ServiceDeclaration.java b/application/application-modeller/src/main/java/org/apache/aries/application/ServiceDeclaration.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/ServiceDeclaration.java rename to application/application-modeller/src/main/java/org/apache/aries/application/ServiceDeclaration.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplication.java b/application/application-modeller/src/main/java/org/apache/aries/application/management/AriesApplication.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/management/AriesApplication.java rename to application/application-modeller/src/main/java/org/apache/aries/application/management/AriesApplication.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java b/application/application-modeller/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java rename to application/application-modeller/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java b/application/application-modeller/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java rename to application/application-modeller/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java b/application/application-modeller/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java rename to application/application-modeller/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationManager.java b/application/application-modeller/src/main/java/org/apache/aries/application/management/AriesApplicationManager.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationManager.java rename to application/application-modeller/src/main/java/org/apache/aries/application/management/AriesApplicationManager.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/BundleInfo.java b/application/application-modeller/src/main/java/org/apache/aries/application/management/BundleInfo.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/management/BundleInfo.java rename to application/application-modeller/src/main/java/org/apache/aries/application/management/BundleInfo.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/ManagementException.java b/application/application-modeller/src/main/java/org/apache/aries/application/management/ManagementException.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/management/ManagementException.java rename to application/application-modeller/src/main/java/org/apache/aries/application/management/ManagementException.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/ResolveConstraint.java b/application/application-modeller/src/main/java/org/apache/aries/application/management/ResolveConstraint.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/management/ResolveConstraint.java rename to application/application-modeller/src/main/java/org/apache/aries/application/management/ResolveConstraint.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/ResolverException.java b/application/application-modeller/src/main/java/org/apache/aries/application/management/ResolverException.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/management/ResolverException.java rename to application/application-modeller/src/main/java/org/apache/aries/application/management/ResolverException.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/UpdateException.java b/application/application-modeller/src/main/java/org/apache/aries/application/management/UpdateException.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/management/UpdateException.java rename to application/application-modeller/src/main/java/org/apache/aries/application/management/UpdateException.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/packageinfo b/application/application-modeller/src/main/java/org/apache/aries/application/management/packageinfo similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/management/packageinfo rename to application/application-modeller/src/main/java/org/apache/aries/application/management/packageinfo diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFramework.java b/application/application-modeller/src/main/java/org/apache/aries/application/management/spi/framework/BundleFramework.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFramework.java rename to application/application-modeller/src/main/java/org/apache/aries/application/management/spi/framework/BundleFramework.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/packageinfo b/application/application-modeller/src/main/java/org/apache/aries/application/management/spi/framework/packageinfo similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/packageinfo rename to application/application-modeller/src/main/java/org/apache/aries/application/management/spi/framework/packageinfo diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepository.java b/application/application-modeller/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepository.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepository.java rename to application/application-modeller/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepository.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/packageinfo b/application/application-modeller/src/main/java/org/apache/aries/application/management/spi/repository/packageinfo similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/packageinfo rename to application/application-modeller/src/main/java/org/apache/aries/application/management/spi/repository/packageinfo diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/AriesApplicationResolver.java b/application/application-modeller/src/main/java/org/apache/aries/application/management/spi/resolve/AriesApplicationResolver.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/AriesApplicationResolver.java rename to application/application-modeller/src/main/java/org/apache/aries/application/management/spi/resolve/AriesApplicationResolver.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/packageinfo b/application/application-modeller/src/main/java/org/apache/aries/application/management/spi/resolve/packageinfo similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/packageinfo rename to application/application-modeller/src/main/java/org/apache/aries/application/management/spi/resolve/packageinfo diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/Consumer.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/Consumer.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/Consumer.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/Consumer.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/DeployedBundles.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/DeployedBundles.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/DeployedBundles.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/DeployedBundles.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/DeploymentMFElement.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/DeploymentMFElement.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/DeploymentMFElement.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/DeploymentMFElement.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ExportedBundle.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ExportedBundle.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/ExportedBundle.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/ExportedBundle.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ExportedPackage.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ExportedPackage.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/ExportedPackage.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/ExportedPackage.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ExportedService.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ExportedService.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/ExportedService.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/ExportedService.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ImportedBundle.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ImportedBundle.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/ImportedBundle.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/ImportedBundle.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ImportedPackage.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ImportedPackage.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/ImportedPackage.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/ImportedPackage.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ImportedService.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ImportedService.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/ImportedService.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/ImportedService.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ModelledResource.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModelledResource.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/ModelledResource.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModelledResource.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ModelledResourceManager.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModelledResourceManager.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/ModelledResourceManager.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModelledResourceManager.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ModellerException.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModellerException.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/ModellerException.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModellerException.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ModellingConstants.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModellingConstants.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/ModellingConstants.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModellingConstants.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ModellingManager.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModellingManager.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/ModellingManager.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModellingManager.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ParsedServiceElements.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ParsedServiceElements.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/ParsedServiceElements.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/ParsedServiceElements.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ParserProxy.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ParserProxy.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/ParserProxy.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/ParserProxy.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/Provider.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/Provider.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/Provider.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/Provider.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ResourceType.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ResourceType.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/ResourceType.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/ResourceType.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ServiceModeller.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ServiceModeller.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/ServiceModeller.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/ServiceModeller.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/WrappedReferenceMetadata.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/WrappedReferenceMetadata.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/WrappedReferenceMetadata.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/WrappedReferenceMetadata.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/WrappedServiceMetadata.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/WrappedServiceMetadata.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/WrappedServiceMetadata.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/WrappedServiceMetadata.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/packageinfo b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/packageinfo similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/packageinfo rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/packageinfo diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/utils/ModellingHelper.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/ModellingHelper.java similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/modelling/utils/ModellingHelper.java rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/ModellingHelper.java diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/packageinfo b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/packageinfo similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/packageinfo rename to application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/packageinfo diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/update/packageinfo b/application/application-modeller/src/main/java/org/apache/aries/application/packageinfo similarity index 100% rename from application/application-api/src/main/java/org/apache/aries/application/management/spi/update/packageinfo rename to application/application-modeller/src/main/java/org/apache/aries/application/packageinfo diff --git a/subsystem/pom.xml b/subsystem/pom.xml index 7888dcd0e..243bbc434 100644 --- a/subsystem/pom.xml +++ b/subsystem/pom.xml @@ -42,7 +42,6 @@ </scm> <modules> - <module>../application/application-api</module> <module>../application/application-modeller</module> <module>subsystem-api</module> <module>subsystem-core</module> diff --git a/subsystem/readme.txt b/subsystem/readme.txt index a3914784d..8efbb4eed 100644 --- a/subsystem/readme.txt +++ b/subsystem/readme.txt @@ -10,7 +10,6 @@ RUNNING The following bundles are required to run subsystems. All are available in at least one of the repositories configured within the Aries parent POM. mavenBundle("org.apache.aries", "org.apache.aries.util").version("1.0.1-SNAPSHOT"), -mavenBundle("org.apache.aries.application", "org.apache.aries.application.api").version("1.0.0"), mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller").version("1.0.0"), mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").version("1.0.0"), mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").version("1.0.1-SNAPSHOT"), 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 007bcddc4..69e0e03ab 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 @@ -167,8 +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.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()); }
