This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new b828b59f8 ARIES-2177: Move application modeller to subsystem
b828b59f8 is described below
commit b828b59f81e9ddc8bf3831e1188e6198c26b6ce4
Author: Dominik Przybysz <[email protected]>
AuthorDate: Thu May 1 19:28:41 2025 +0200
ARIES-2177: Move application modeller to subsystem
---
.github/labeler.yml | 3 ---
.../src/test/resources/META-INF/APPLICATION.MF | 10 ---------
.../src/test/resources/META-INF/APPLICATION2.MF | 13 -----------
.../src/test/resources/META-INF/APPLICATION3.MF | 3 ---
.../src/test/resources/META-INF/APPLICATION4.MF | 10 ---------
.../src/test/resources/META-INF/DEPLOYMENT.MF | 16 -------------
subsystem/pom.xml | 2 +-
subsystem/readme.txt | 3 ---
subsystem/subsystem-bundle/pom.xml | 10 ++++-----
subsystem/subsystem-core/pom.xml | 10 ++++-----
.../aries/subsystem/core/internal/Activator.java | 2 +-
.../core/internal/ApplicationServiceModeller.java | 10 ++++-----
subsystem/subsystem-itests/pom.xml | 8 +++----
.../itests/ModelledResourceManagerTest.java | 2 +-
.../aries/subsystem/itests/SubsystemTest.java | 2 +-
.../subsystem-modeller}/LICENSE | 0
.../subsystem-modeller}/NOTICE | 0
.../subsystem-modeller}/pom.xml | 20 ++++++++---------
.../aries/subsystem}/modelling/Consumer.java | 2 +-
.../subsystem}/modelling/DeployedBundles.java | 2 +-
.../subsystem}/modelling/DeploymentMFElement.java | 2 +-
.../aries/subsystem}/modelling/ExportedBundle.java | 2 +-
.../subsystem}/modelling/ExportedPackage.java | 2 +-
.../subsystem}/modelling/ExportedService.java | 2 +-
.../aries/subsystem}/modelling/ImportedBundle.java | 2 +-
.../subsystem}/modelling/ImportedPackage.java | 2 +-
.../subsystem}/modelling/ImportedService.java | 2 +-
.../modelling/InvalidAttributeException.java | 2 +-
.../subsystem}/modelling/ModelledResource.java | 2 +-
.../modelling/ModelledResourceManager.java | 2 +-
.../subsystem}/modelling/ModellerException.java | 2 +-
.../subsystem}/modelling/ModellingConstants.java | 2 +-
.../subsystem}/modelling/ModellingHelper.java | 2 +-
.../subsystem}/modelling/ModellingManager.java | 2 +-
.../modelling/ParsedServiceElements.java | 2 +-
.../aries/subsystem}/modelling/ParserProxy.java | 2 +-
.../aries/subsystem}/modelling/Provider.java | 2 +-
.../subsystem}/modelling/ResolverException.java | 2 +-
.../aries/subsystem}/modelling/ResourceType.java | 2 +-
.../subsystem}/modelling/ServiceModeller.java | 2 +-
.../modelling/WrappedReferenceMetadata.java | 2 +-
.../modelling/WrappedServiceMetadata.java | 2 +-
.../modelling/impl/AbstractExportedBundle.java | 10 ++++-----
.../modelling/impl/AbstractParserProxy.java | 16 ++++++-------
.../subsystem}/modelling/impl/AppConstants.java | 2 +-
.../modelling/impl/BundleBlueprintParser.java | 2 +-
.../modelling/impl/DeployedBundlesImpl.java | 22 +++++++++---------
.../modelling/impl/ExportedBundleImpl.java | 8 +++----
.../modelling/impl/ExportedPackageImpl.java | 10 ++++-----
.../modelling/impl/ExportedServiceHelper.java | 6 ++---
.../modelling/impl/ExportedServiceImpl.java | 10 ++++-----
.../subsystem}/modelling/impl/FilterUtils.java | 2 +-
.../modelling/impl/ImportedBundleImpl.java | 12 +++++-----
.../modelling/impl/ImportedPackageImpl.java | 14 ++++++------
.../modelling/impl/ImportedServiceImpl.java | 16 ++++++-------
.../subsystem}/modelling/impl/MessageUtil.java | 4 ++--
.../modelling/impl/ModelledResourceImpl.java | 22 +++++++++---------
.../impl/ModelledResourceManagerImpl.java | 22 +++++++++---------
.../modelling/impl/ModellingHelperImpl.java | 20 ++++++++---------
.../modelling/impl/ModellingManagerImpl.java | 14 ++++++------
.../modelling/impl/PackageRequirementMerger.java | 4 ++--
.../modelling/impl/ParsedServiceElementsImpl.java | 8 +++----
.../subsystem}/modelling/impl/ParserProxyImpl.java | 2 +-
.../apache/aries/subsystem}/modelling/packageinfo | 0
.../resources/OSGI-INF/blueprint/blueprint.xml | 18 +++++++--------
.../messages/APPModellingMessages.properties | 0
.../aries/subsystem}/modelling/ModellerTest.java | 13 ++++-------
.../subsystem}/modelling/impl/ParserProxyTest.java | 12 +++++-----
.../utils/AbstractBundleResourceTest.java | 18 +++++++--------
.../modelling/utils/BundleResourceTest.java | 12 +++++-----
.../modelling/utils/DeployedBundlesTest.java | 26 +++++++++++-----------
.../modelling/utils/ExportedPackageTest.java | 8 +++----
.../modelling/utils/ExportedServiceTest.java | 6 ++---
.../modelling/utils/ImportedPackageTest.java | 8 +++----
.../utils/PackageRequirementMergerTest.java | 10 ++++-----
.../appModeller/test1.eba/META-INF/APPLICATION.MF | 0
.../appModeller/test1.eba/META-INF/DEPLOYMENT.MF | 0
.../test1.eba/bundle1.jar/META-INF/MANIFEST.MF | 0
.../bundle1.jar/OSGI-INF/blueprint/bp.xml | 0
.../bundle1.jar/OSGI-INF/blueprint/bp2.xml | 0
.../OSGI-INF/blueprint/bpMultiValues.xml | 0
.../bundles/test.bundle1.jar/META-INF/MANIFEST.MF | 0
.../resources/test.bundle/META-INF/MANIFEST.MF | 0
.../test.bundle/OSGI-INF/blueprint/bp.xml | 0
84 files changed, 233 insertions(+), 296 deletions(-)
diff --git a/.github/labeler.yml b/.github/labeler.yml
index ceddb0108..fe57679cf 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,6 +1,3 @@
-application:
-- changed-files:
- - any-glob-to-any-file: 'application/**/*'
async:
- changed-files:
- any-glob-to-any-file: 'async/**/*'
diff --git
a/application/application-modeller/src/test/resources/META-INF/APPLICATION.MF
b/application/application-modeller/src/test/resources/META-INF/APPLICATION.MF
deleted file mode 100755
index f2d7207df..000000000
---
a/application/application-modeller/src/test/resources/META-INF/APPLICATION.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Application-ManifestVersion: 1.0
-Application-Name: Travel Reservation
-Application-SymbolicName: com.travel.reservation
-Application-Version: 1.2
-Application-Content: com.travel.reservation.web;version="[1.1.0,1.2.0)",
- com.travel.reservation.business
-Export-Package: com.travel.reservation.api;version=1.2
-Import-Package:
com.travel.flight.api;version="[2.1.1,3.0.0)",com.travel.rail.api;version="[1.0.0,2.0.0)"
-Application-Services: services.xml
diff --git
a/application/application-modeller/src/test/resources/META-INF/APPLICATION2.MF
b/application/application-modeller/src/test/resources/META-INF/APPLICATION2.MF
deleted file mode 100644
index 412296335..000000000
---
a/application/application-modeller/src/test/resources/META-INF/APPLICATION2.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Application-ManifestVersion: 1.0
-Application-Name: Travel Reservation
-Application-SymbolicName: com.travel.reservation
-Application-Version: 1.2
-Application-Content: com.travel.reservation.web;version="[1.1.0,1.2.0)",
- com.travel.reservation.business,
-Export-Package: com.travel.reservation.api;version=1.2
-Import-Package: com.travel.flight.api;version="[2.1.1,3.0.0)",
- com.travel.rail.api;version="[1.0.0,2.0.0)",
- com.travel.credit.api;version="[2.1.0,2.1.0]",
- com.travel.hotel.api;version="[1.5.0,2.0.0)"
-Application-Services: services.xml
diff --git
a/application/application-modeller/src/test/resources/META-INF/APPLICATION3.MF
b/application/application-modeller/src/test/resources/META-INF/APPLICATION3.MF
deleted file mode 100644
index c49a653f9..000000000
---
a/application/application-modeller/src/test/resources/META-INF/APPLICATION3.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Application-SymbolicName: org.apache.aries.applications.test.app
-Application-Version: 1.4.0
-Application-Content: org.apache.aries.applications.test.bundle
diff --git
a/application/application-modeller/src/test/resources/META-INF/APPLICATION4.MF
b/application/application-modeller/src/test/resources/META-INF/APPLICATION4.MF
deleted file mode 100644
index acee04d02..000000000
---
a/application/application-modeller/src/test/resources/META-INF/APPLICATION4.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Application-ManifestVersion: 1.0
-Application-Name: Travel Reservation
-Application-SymbolicName: com.travel.reservation
-Application-Version: 1.2
-Application-Content: com.travel.reservation.web;version="[1.1.0,1.2.0)",
- com.travel.reservation.business
-Use-Bundle: com.travel.reservation.api;version="[1.0.0,2.0.0)"
-Application-ImportService: com.travel.flight.api,com.travel.rail.api
-Application-ExportService: com.travel.reservation
diff --git
a/application/application-modeller/src/test/resources/META-INF/DEPLOYMENT.MF
b/application/application-modeller/src/test/resources/META-INF/DEPLOYMENT.MF
deleted file mode 100644
index 433c9fdc4..000000000
--- a/application/application-modeller/src/test/resources/META-INF/DEPLOYMENT.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Application-SymbolicName: com.travel.reservation
-Application-Version: 1.2
-Deployed-Content: com.travel.reservation.web;deployed-version="1.1.0",
- com.travel.reservation.business;deployed-version=2.0,
- com.travel.reservation.data;deployed-version=2.1.1
-Provision-Bundle: com.travel.meal;deployed-version=1.0.0,
com.ibm.travel.water;deployed-version=2.0.0
-Deployed-Use-Bundle: com.travel.insurance;deployed-version=1.0.0
-Import-Package:
com.travel.insurance;version="1.0.0";bundle-symbolic-name="com.travel.insurance";bundle-version="[1.0.0,1.0.0]",org.osgi.framework;vers
- ion="0.0.0",javax.naming;version="0.0.0",org.osgi.util.tracker;versio
- n="1.4.0",com.travel.meal;version="[1.0.0,2.0.0)",javax.servlet;
- version="2.5.0"
-DeployedService-Import: (&(objectClass=aries.test.filter.SimplePr
- oxyFilter)(com=aries)), (&(objectClass=aries.test.filter2)(com=apache))
-Custom-Entry: com.travel.thirdparty
-Custom-Entry2: com.travel.meal
diff --git a/subsystem/pom.xml b/subsystem/pom.xml
index 243bbc434..b1f428348 100644
--- a/subsystem/pom.xml
+++ b/subsystem/pom.xml
@@ -42,8 +42,8 @@
</scm>
<modules>
- <module>../application/application-modeller</module>
<module>subsystem-api</module>
+ <module>subsystem-modeller</module>
<module>subsystem-core</module>
<module>subsystem-obr</module>
<module>subsystem-itests</module>
diff --git a/subsystem/readme.txt b/subsystem/readme.txt
index 8efbb4eed..bd96a3c73 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.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"),
mavenBundle("org.apache.aries.subsystem",
"org.apache.aries.subsystem").version("1.0.0-SNAPSHOT"),
@@ -18,8 +17,6 @@ mavenBundle("org.apache.felix",
"org.apache.felix.resolver")version(
mavenBundle("org.eclipse.equinox",
"org.eclipse.equinox.coordinator").version("1.1.0.v20120522-1841"),
mavenBundle("org.eclipse.equinox",
"org.eclipse.equinox.region").version("1.1.0.v20120522-1841")
-Note that the various org.apache.aries.application.* bundles may be replaced
with the "org.apache.aries.application", version "1.0.0", uber bundle if
desired.
-
A framework implementing version R5 of the OSGi specification is also needed.
For example:
mavenBundle("org.eclipse", "org.eclipse.osgi").version("3.8.0.v20120529-1548")
diff --git a/subsystem/subsystem-bundle/pom.xml
b/subsystem/subsystem-bundle/pom.xml
index 6b1137869..6a503d82b 100644
--- a/subsystem/subsystem-bundle/pom.xml
+++ b/subsystem/subsystem-bundle/pom.xml
@@ -48,7 +48,7 @@
<aries.osgi.import>
org.osgi.service.repository;version="[1.0,1.1)",
org.osgi.service.subsystem;version="[1.1,1.2)",
- org.apache.aries.application.*;resolution:=optional,
+ org.apache.aries.subsystem.modelling*;resolution:=optional,
*
</aries.osgi.import>
<aries.osgi.export.pkg>
@@ -61,7 +61,7 @@
</aries.osgi.private.pkg>
<lastReleaseVersion>1.0.0</lastReleaseVersion>
-
<org.apache.aries.application.modeller.version>1.0.1-SNAPSHOT</org.apache.aries.application.modeller.version>
+
<org.apache.aries.subsystem.modeller.version>1.0.0-SNAPSHOT</org.apache.aries.subsystem.modeller.version>
<org.apache.aries.blueprint.version>1.2.0</org.apache.aries.blueprint.version>
<org.apache.aries.proxy.version>1.1.0</org.apache.aries.proxy.version>
<org.apache.aries.subsystem.api.version>2.0.10</org.apache.aries.subsystem.api.version>
@@ -90,9 +90,9 @@
<version>${org.apache.aries.util.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.application</groupId>
- <artifactId>org.apache.aries.application.modeller</artifactId>
- <version>${org.apache.aries.application.modeller.version}</version>
+ <groupId>org.apache.aries.subsystem</groupId>
+ <artifactId>org.apache.aries.subsystem.modeller</artifactId>
+ <version>${org.apache.aries.subsystem.modeller.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
diff --git a/subsystem/subsystem-core/pom.xml b/subsystem/subsystem-core/pom.xml
index 89d8e66c9..a5b64961a 100644
--- a/subsystem/subsystem-core/pom.xml
+++ b/subsystem/subsystem-core/pom.xml
@@ -48,7 +48,7 @@
<aries.osgi.import>
org.osgi.service.subsystem;version="[1.1,1.2)",
org.apache.aries.subsystem;version="[1.2,1.3)",
- org.apache.aries.application.*;resolution:=optional,
+ org.apache.aries.subsystem.modelling*;resolution:=optional,
*
</aries.osgi.import>
<aries.osgi.export.pkg/>
@@ -69,7 +69,7 @@
<org.apache.aries.subsystem.api.version>2.0.10</org.apache.aries.subsystem.api.version>
<org.apache.aries.util.version>1.2.0-SNAPSHOT</org.apache.aries.util.version>
-
<org.apache.aries.application.modeller.version>1.0.1-SNAPSHOT</org.apache.aries.application.modeller.version>
+
<org.apache.aries.subsystem.modeller.version>1.0.0-SNAPSHOT</org.apache.aries.subsystem.modeller.version>
<osgi.core.version>6.0.0</osgi.core.version>
<osgi.enterprise.version>5.0.0</osgi.enterprise.version>
<org.eclipse.equinox.coordinator.version>1.1.0.v20120522-1841</org.eclipse.equinox.coordinator.version>
@@ -90,9 +90,9 @@
<version>${org.apache.aries.util.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.application</groupId>
- <artifactId>org.apache.aries.application.modeller</artifactId>
- <version>${org.apache.aries.application.modeller.version}</version>
+ <groupId>org.apache.aries.subsystem</groupId>
+ <artifactId>org.apache.aries.subsystem.modeller</artifactId>
+ <version>${org.apache.aries.subsystem.modeller.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git
a/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Activator.java
b/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Activator.java
index e281743fb..c24b3b5b6 100644
---
a/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Activator.java
+++
b/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Activator.java
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
*/
public class Activator implements BundleActivator,
ServiceTrackerCustomizer<Object, Object> {
private static final Logger logger =
LoggerFactory.getLogger(Activator.class);
- public static final String MODELLED_RESOURCE_MANAGER =
"org.apache.aries.application.modelling.ModelledResourceManager";
+ public static final String MODELLED_RESOURCE_MANAGER =
"org.apache.aries.subsystem.modelling.ModelledResourceManager";
private static final String LOCK_TIMEOUT =
"org.apache.aries.subsystem.lock.timeout";
public static final String LOG_ENTRY = "Method entry: {}, args {}";
diff --git
a/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ApplicationServiceModeller.java
b/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ApplicationServiceModeller.java
index 674c40af3..129c00246 100644
---
a/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ApplicationServiceModeller.java
+++
b/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ApplicationServiceModeller.java
@@ -16,11 +16,11 @@ package org.apache.aries.subsystem.core.internal;
import java.util.ArrayList;
import java.util.List;
-import org.apache.aries.application.modelling.ExportedService;
-import org.apache.aries.application.modelling.ImportedService;
-import org.apache.aries.application.modelling.ModelledResourceManager;
-import org.apache.aries.application.modelling.ModellerException;
-import org.apache.aries.application.modelling.ParsedServiceElements;
+import org.apache.aries.subsystem.modelling.ExportedService;
+import org.apache.aries.subsystem.modelling.ImportedService;
+import org.apache.aries.subsystem.modelling.ModelledResourceManager;
+import org.apache.aries.subsystem.modelling.ModellerException;
+import org.apache.aries.subsystem.modelling.ParsedServiceElements;
import org.apache.aries.util.filesystem.IDirectory;
import org.osgi.namespace.service.ServiceNamespace;
import org.osgi.resource.Capability;
diff --git a/subsystem/subsystem-itests/pom.xml
b/subsystem/subsystem-itests/pom.xml
index eec36ea96..353837dd8 100644
--- a/subsystem/subsystem-itests/pom.xml
+++ b/subsystem/subsystem-itests/pom.xml
@@ -45,7 +45,7 @@
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
-
<org.apache.aries.application.modeller.version>1.0.1-SNAPSHOT</org.apache.aries.application.modeller.version>
+
<org.apache.aries.subsystem.modeller.version>1.0.0-SNAPSHOT</org.apache.aries.subsystem.modeller.version>
<org.apache.aries.blueprint.version>1.2.0</org.apache.aries.blueprint.version>
<org.apache.aries.proxy.version>1.1.0</org.apache.aries.proxy.version>
<org.apache.aries.subsystem.api.version>2.0.11-SNAPSHOT</org.apache.aries.subsystem.api.version>
@@ -111,9 +111,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.aries.application</groupId>
- <artifactId>org.apache.aries.application.modeller</artifactId>
- <version>${org.apache.aries.application.modeller.version}</version>
+ <groupId>org.apache.aries.subsystem</groupId>
+ <artifactId>org.apache.aries.subsystem.modeller</artifactId>
+ <version>${org.apache.aries.subsystem.modeller.version}</version>
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
diff --git
a/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ModelledResourceManagerTest.java
b/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ModelledResourceManagerTest.java
index 8776ae582..d0c0cf963 100644
---
a/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ModelledResourceManagerTest.java
+++
b/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ModelledResourceManagerTest.java
@@ -39,7 +39,7 @@ public class ModelledResourceManagerTest extends
SubsystemTest {
public void setUp() throws Exception {
super.setUp();
RichBundleContext rootContext = context(getRootSubsystem());
- assertNull("Modeller is installed",
rootContext.getBundleByName("org.apache.aries.application.modeller"));
+ assertNull("Modeller is installed",
rootContext.getBundleByName("org.apache.aries.subsystem.modeller"));
assertNull("Blueprint is installed",
rootContext.getBundleByName("org.apache.aries.blueprint.core"));
assertNull("Proxy is installed",
rootContext.getBundleByName("org.apache.aries.proxy"));
}
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 69e0e03ab..d70f15d73 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,7 +167,7 @@ public abstract class SubsystemTest extends
AbstractIntegrationTest {
private Option modelerBundles() {
return CoreOptions.composite(
- mavenBundle("org.apache.aries.application",
"org.apache.aries.application.modeller").versionAsInProject(),
+ mavenBundle("org.apache.aries.subsystem",
"org.apache.aries.subsystem.modeller").versionAsInProject(),
mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.core").versionAsInProject(),
mavenBundle("org.apache.aries.proxy",
"org.apache.aries.proxy").versionAsInProject());
}
diff --git a/application/application-modeller/LICENSE
b/subsystem/subsystem-modeller/LICENSE
similarity index 100%
rename from application/application-modeller/LICENSE
rename to subsystem/subsystem-modeller/LICENSE
diff --git a/application/application-modeller/NOTICE
b/subsystem/subsystem-modeller/NOTICE
similarity index 100%
rename from application/application-modeller/NOTICE
rename to subsystem/subsystem-modeller/NOTICE
diff --git a/application/application-modeller/pom.xml
b/subsystem/subsystem-modeller/pom.xml
similarity index 90%
rename from application/application-modeller/pom.xml
rename to subsystem/subsystem-modeller/pom.xml
index cd417bf26..05f7e442d 100644
--- a/application/application-modeller/pom.xml
+++ b/subsystem/subsystem-modeller/pom.xml
@@ -28,13 +28,13 @@
<relativePath>../../parent/pom.xml</relativePath>
</parent>
- <groupId>org.apache.aries.application</groupId>
- <artifactId>org.apache.aries.application.modeller</artifactId>
+ <groupId>org.apache.aries.subsystem</groupId>
+ <artifactId>org.apache.aries.subsystem.modeller</artifactId>
<packaging>bundle</packaging>
- <name>Apache Aries Application Modelling</name>
- <version>1.0.1-SNAPSHOT</version>
+ <name>Apache Aries Subsystem Modelling</name>
+ <version>1.0.0-SNAPSHOT</version>
<description>
- Modelling utilities for working with Aries Applications.
+ Modelling utilities for working with Subsystem.
</description>
<scm>
@@ -45,16 +45,16 @@
<properties>
<aries.osgi.private.pkg>
- org.apache.aries.application**
+ org.apache.aries.subsystem**
</aries.osgi.private.pkg>
<aries.osgi.export.pkg>
- org.apache.aries.application.modelling
+ org.apache.aries.subsystem.modelling
</aries.osgi.export.pkg>
<aries.osgi.import.pkg>
- org.apache.aries.application.modelling*;provide:=true,
+ org.apache.aries.subsystem.modelling*;provide:=true,
*
</aries.osgi.import.pkg>
- <lastReleaseVersion>1.0.0</lastReleaseVersion>
+<!-- <lastReleaseVersion>1.0.0</lastReleaseVersion>-->
<org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version>
<org.apache.aries.blueprint.core.version>1.2.0</org.apache.aries.blueprint.core.version>
@@ -124,7 +124,7 @@
<executions>
<execution>
<id>default-verify</id>
- <phase>verify</phase>
+ <phase>none</phase>
<goals>
<goal>version-check</goal>
</goals>
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/Consumer.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/Consumer.java
similarity index 97%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/Consumer.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/Consumer.java
index 3454af730..3b6fbae07 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/Consumer.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/Consumer.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
/* Base interface for a model of a requirement, or need for something, such as
a bundle,
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/DeployedBundles.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/DeployedBundles.java
similarity index 96%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/DeployedBundles.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/DeployedBundles.java
index de361804f..fcd5f5bc6 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/DeployedBundles.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/DeployedBundles.java
@@ -18,7 +18,7 @@
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
import java.util.Collection;
import java.util.Map;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/DeploymentMFElement.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/DeploymentMFElement.java
similarity index 95%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/DeploymentMFElement.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/DeploymentMFElement.java
index 64cfde653..b7ae82446 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/DeploymentMFElement.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/DeploymentMFElement.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
public interface DeploymentMFElement {
/**
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ExportedBundle.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ExportedBundle.java
similarity index 96%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/ExportedBundle.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ExportedBundle.java
index 9440338e8..8102742b0 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ExportedBundle.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ExportedBundle.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
/**
* Model a bundle, required by another bundle.
*
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ExportedPackage.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ExportedPackage.java
similarity index 96%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/ExportedPackage.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ExportedPackage.java
index 53a4b3fb1..15ce5d955 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ExportedPackage.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ExportedPackage.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
/**
* Model an exported package.
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ExportedService.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ExportedService.java
similarity index 95%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/ExportedService.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ExportedService.java
index 1295d45cc..066a8afae 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ExportedService.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ExportedService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
/**
* This interface models the exported service. It has no other methods apart
from the
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ImportedBundle.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ImportedBundle.java
similarity index 96%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/ImportedBundle.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ImportedBundle.java
index c808e7722..ef07318d2 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ImportedBundle.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ImportedBundle.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
/**
* Model a required bundle.
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ImportedPackage.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ImportedPackage.java
similarity index 96%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/ImportedPackage.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ImportedPackage.java
index c092b3026..615c8596d 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ImportedPackage.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ImportedPackage.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
import java.util.Map;
/**
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ImportedService.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ImportedService.java
similarity index 95%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/ImportedService.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ImportedService.java
index 6f0aec19c..889cf3870 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ImportedService.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ImportedService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
/**
* This interface represents the imported service. It has no other methods
apart from the
* two super interfaces Consumer, DeploymentMFElement and
WrappedReferenceMetadata.
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/InvalidAttributeException.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/InvalidAttributeException.java
similarity index 96%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/InvalidAttributeException.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/InvalidAttributeException.java
index 52d8024e0..b7301670f 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/InvalidAttributeException.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/InvalidAttributeException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModelledResource.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ModelledResource.java
similarity index 98%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModelledResource.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ModelledResource.java
index 0fee04164..41e6cc375 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModelledResource.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ModelledResource.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
import java.util.Collection;
/**
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModelledResourceManager.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ModelledResourceManager.java
similarity index 98%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModelledResourceManager.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ModelledResourceManager.java
index 76cab0512..6f7c3a07d 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModelledResourceManager.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ModelledResourceManager.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
import java.io.IOException;
import java.io.InputStream;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModellerException.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ModellerException.java
similarity index 95%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModellerException.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ModellerException.java
index 85698b0f9..ac3784db6 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModellerException.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ModellerException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModellingConstants.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ModellingConstants.java
similarity index 96%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModellingConstants.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ModellingConstants.java
index 3e600b5aa..2521f667c 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModellingConstants.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ModellingConstants.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
import org.osgi.framework.Constants;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModellingHelper.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ModellingHelper.java
similarity index 95%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModellingHelper.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ModellingHelper.java
index f8f113439..7a2fedc00 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModellingHelper.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ModellingHelper.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
import java.util.Collection;
import java.util.Map;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModellingManager.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ModellingManager.java
similarity index 94%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModellingManager.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ModellingManager.java
index 35e6a92e0..eaf40a0a6 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ModellingManager.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ModellingManager.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
import java.util.Collection;
import java.util.Map;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ParsedServiceElements.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ParsedServiceElements.java
similarity index 96%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/ParsedServiceElements.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ParsedServiceElements.java
index e24bd1eaa..fcf3a2c0f 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ParsedServiceElements.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ParsedServiceElements.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
import java.util.Collection;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ParserProxy.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ParserProxy.java
similarity index 98%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/ParserProxy.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ParserProxy.java
index 62bcd8143..db863e06c 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ParserProxy.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ParserProxy.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
import java.io.InputStream;
import java.net.URL;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/Provider.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/Provider.java
similarity index 96%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/Provider.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/Provider.java
index 538ce80c4..1b1fafbd9 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/Provider.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/Provider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ResolverException.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ResolverException.java
similarity index 97%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/ResolverException.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ResolverException.java
index 5adcc69f6..6d0e85e30 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ResolverException.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ResolverException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
import java.util.ArrayList;
import java.util.HashMap;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ResourceType.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ResourceType.java
similarity index 95%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/ResourceType.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ResourceType.java
index ab5975016..5611fc60e 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ResourceType.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ResourceType.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
public enum ResourceType {BUNDLE, PACKAGE, SERVICE, COMPOSITE, OTHER;
/**
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ServiceModeller.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ServiceModeller.java
similarity index 93%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/ServiceModeller.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ServiceModeller.java
index 1bec1c185..707b3e598 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/ServiceModeller.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/ServiceModeller.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
import org.apache.aries.util.filesystem.IDirectory;
import org.apache.aries.util.manifest.BundleManifest;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/WrappedReferenceMetadata.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/WrappedReferenceMetadata.java
similarity index 97%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/WrappedReferenceMetadata.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/WrappedReferenceMetadata.java
index 9ab17411a..5756912a2 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/WrappedReferenceMetadata.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/WrappedReferenceMetadata.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
/**
* Information about a parsed blueprint reference
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/WrappedServiceMetadata.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/WrappedServiceMetadata.java
similarity index 97%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/WrappedServiceMetadata.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/WrappedServiceMetadata.java
index 83a11bbea..b1318b94a 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/WrappedServiceMetadata.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/WrappedServiceMetadata.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
import java.util.Collection;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/AbstractExportedBundle.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/AbstractExportedBundle.java
similarity index 88%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/AbstractExportedBundle.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/AbstractExportedBundle.java
index 0ce842a03..f5e6fdad7 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/AbstractExportedBundle.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/AbstractExportedBundle.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
import java.util.Map;
-import org.apache.aries.application.modelling.ExportedBundle;
-import org.apache.aries.application.modelling.ImportedBundle;
-import org.apache.aries.application.modelling.ModellingConstants;
-import org.apache.aries.application.modelling.ResourceType;
+import org.apache.aries.subsystem.modelling.ExportedBundle;
+import org.apache.aries.subsystem.modelling.ImportedBundle;
+import org.apache.aries.subsystem.modelling.ModellingConstants;
+import org.apache.aries.subsystem.modelling.ResourceType;
import org.osgi.framework.Constants;
import org.osgi.framework.Version;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/AbstractParserProxy.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/AbstractParserProxy.java
similarity index 97%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/AbstractParserProxy.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/AbstractParserProxy.java
index 24b17030b..abdddf651 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/AbstractParserProxy.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/AbstractParserProxy.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
import java.io.InputStream;
import java.net.URL;
@@ -31,13 +31,13 @@ import java.util.Map;
import java.util.Queue;
import java.util.Set;
-import org.apache.aries.application.modelling.InvalidAttributeException;
-import org.apache.aries.application.modelling.ExportedService;
-import org.apache.aries.application.modelling.ImportedService;
-import org.apache.aries.application.modelling.ModellingManager;
-import org.apache.aries.application.modelling.ParsedServiceElements;
-import org.apache.aries.application.modelling.ParserProxy;
-import org.apache.aries.application.modelling.WrappedServiceMetadata;
+import org.apache.aries.subsystem.modelling.InvalidAttributeException;
+import org.apache.aries.subsystem.modelling.ExportedService;
+import org.apache.aries.subsystem.modelling.ImportedService;
+import org.apache.aries.subsystem.modelling.ModellingManager;
+import org.apache.aries.subsystem.modelling.ParsedServiceElements;
+import org.apache.aries.subsystem.modelling.ParserProxy;
+import org.apache.aries.subsystem.modelling.WrappedServiceMetadata;
import org.apache.aries.blueprint.ComponentDefinitionRegistry;
import org.apache.aries.util.manifest.ManifestHeaderProcessor;
import org.osgi.service.blueprint.reflect.BeanArgument;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/AppConstants.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/AppConstants.java
similarity index 96%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/AppConstants.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/AppConstants.java
index 0f62a7db2..12bf04c7b 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/AppConstants.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/AppConstants.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
/**
* Widely used constants in parsing Aries applications
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/BundleBlueprintParser.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/BundleBlueprintParser.java
similarity index 99%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/BundleBlueprintParser.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/BundleBlueprintParser.java
index 1deff42bd..0dd1f4147 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/BundleBlueprintParser.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/BundleBlueprintParser.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.LinkedList;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/DeployedBundlesImpl.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/DeployedBundlesImpl.java
similarity index 96%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/DeployedBundlesImpl.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/DeployedBundlesImpl.java
index 1fde641a8..e01d3a6e3 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/DeployedBundlesImpl.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/DeployedBundlesImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
import java.util.ArrayList;
import java.util.Arrays;
@@ -29,16 +29,16 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.aries.application.modelling.ResolverException;
-import org.apache.aries.application.modelling.DeployedBundles;
-import org.apache.aries.application.modelling.DeploymentMFElement;
-import org.apache.aries.application.modelling.ExportedBundle;
-import org.apache.aries.application.modelling.ExportedPackage;
-import org.apache.aries.application.modelling.ExportedService;
-import org.apache.aries.application.modelling.ImportedBundle;
-import org.apache.aries.application.modelling.ImportedPackage;
-import org.apache.aries.application.modelling.ImportedService;
-import org.apache.aries.application.modelling.ModelledResource;
+import org.apache.aries.subsystem.modelling.ResolverException;
+import org.apache.aries.subsystem.modelling.DeployedBundles;
+import org.apache.aries.subsystem.modelling.DeploymentMFElement;
+import org.apache.aries.subsystem.modelling.ExportedBundle;
+import org.apache.aries.subsystem.modelling.ExportedPackage;
+import org.apache.aries.subsystem.modelling.ExportedService;
+import org.apache.aries.subsystem.modelling.ImportedBundle;
+import org.apache.aries.subsystem.modelling.ImportedPackage;
+import org.apache.aries.subsystem.modelling.ImportedService;
+import org.apache.aries.subsystem.modelling.ModelledResource;
import org.osgi.framework.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ExportedBundleImpl.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ExportedBundleImpl.java
similarity index 95%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ExportedBundleImpl.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ExportedBundleImpl.java
index ec9f99070..6feedde37 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ExportedBundleImpl.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ExportedBundleImpl.java
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.jar.Attributes;
-import org.apache.aries.application.modelling.InvalidAttributeException;
-import org.apache.aries.application.modelling.ImportedBundle;
-import org.apache.aries.application.modelling.ModellingConstants;
+import org.apache.aries.subsystem.modelling.InvalidAttributeException;
+import org.apache.aries.subsystem.modelling.ImportedBundle;
+import org.apache.aries.subsystem.modelling.ModellingConstants;
import org.apache.aries.util.manifest.ManifestHeaderProcessor;
import org.osgi.framework.Constants;
import org.osgi.framework.Version;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ExportedPackageImpl.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ExportedPackageImpl.java
similarity index 95%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ExportedPackageImpl.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ExportedPackageImpl.java
index 6dcb0ac12..64fcc29b2 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ExportedPackageImpl.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ExportedPackageImpl.java
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.impl;
-import static org.apache.aries.application.modelling.ResourceType.PACKAGE;
+package org.apache.aries.subsystem.modelling.impl;
+import static org.apache.aries.subsystem.modelling.ResourceType.PACKAGE;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.aries.application.modelling.ExportedPackage;
-import org.apache.aries.application.modelling.ModelledResource;
-import org.apache.aries.application.modelling.ResourceType;
+import org.apache.aries.subsystem.modelling.ExportedPackage;
+import org.apache.aries.subsystem.modelling.ModelledResource;
+import org.apache.aries.subsystem.modelling.ResourceType;
import org.osgi.framework.Constants;
import org.osgi.framework.Version;
import org.slf4j.Logger;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ExportedServiceHelper.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ExportedServiceHelper.java
similarity index 92%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ExportedServiceHelper.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ExportedServiceHelper.java
index 3ecd9e7eb..7508bd9b0 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ExportedServiceHelper.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ExportedServiceHelper.java
@@ -1,4 +1,4 @@
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
import java.util.ArrayList;
import java.util.Collections;
@@ -7,8 +7,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.aries.application.modelling.ExportedService;
-import org.apache.aries.application.modelling.WrappedServiceMetadata;
+import org.apache.aries.subsystem.modelling.ExportedService;
+import org.apache.aries.subsystem.modelling.WrappedServiceMetadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ExportedServiceImpl.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ExportedServiceImpl.java
similarity index 95%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ExportedServiceImpl.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ExportedServiceImpl.java
index e4c76a10c..27ebd3fae 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ExportedServiceImpl.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ExportedServiceImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
import java.util.Arrays;
import java.util.Collection;
@@ -25,10 +25,10 @@ import java.util.HashMap;
import java.util.Map;
import java.util.TreeSet;
-import org.apache.aries.application.modelling.ExportedService;
-import org.apache.aries.application.modelling.ModellingConstants;
-import org.apache.aries.application.modelling.ResourceType;
-import org.apache.aries.application.modelling.WrappedServiceMetadata;
+import org.apache.aries.subsystem.modelling.ExportedService;
+import org.apache.aries.subsystem.modelling.ModellingConstants;
+import org.apache.aries.subsystem.modelling.ResourceType;
+import org.apache.aries.subsystem.modelling.WrappedServiceMetadata;
import org.osgi.framework.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/FilterUtils.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/FilterUtils.java
similarity index 97%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/FilterUtils.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/FilterUtils.java
index a4984a149..0f89abace 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/FilterUtils.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/FilterUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
import java.util.regex.Pattern;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedBundleImpl.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedBundleImpl.java
similarity index 95%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedBundleImpl.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedBundleImpl.java
index 01ba43dfa..7f643f815 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedBundleImpl.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedBundleImpl.java
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
import java.util.Dictionary;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Map;
-import org.apache.aries.application.modelling.InvalidAttributeException;
-import org.apache.aries.application.modelling.ImportedBundle;
-import org.apache.aries.application.modelling.ModellingConstants;
-import org.apache.aries.application.modelling.Provider;
-import org.apache.aries.application.modelling.ResourceType;
+import org.apache.aries.subsystem.modelling.InvalidAttributeException;
+import org.apache.aries.subsystem.modelling.ImportedBundle;
+import org.apache.aries.subsystem.modelling.ModellingConstants;
+import org.apache.aries.subsystem.modelling.Provider;
+import org.apache.aries.subsystem.modelling.ResourceType;
import org.apache.aries.util.manifest.ManifestHeaderProcessor;
import org.osgi.framework.Constants;
import org.osgi.framework.Filter;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedPackageImpl.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedPackageImpl.java
similarity index 95%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedPackageImpl.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedPackageImpl.java
index 609849621..ce5c12eb9 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedPackageImpl.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedPackageImpl.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
-import static
org.apache.aries.application.modelling.ModellingConstants.OPTIONAL_KEY;
-import static org.apache.aries.application.modelling.ResourceType.PACKAGE;
+import static
org.apache.aries.subsystem.modelling.ModellingConstants.OPTIONAL_KEY;
+import static org.apache.aries.subsystem.modelling.ResourceType.PACKAGE;
import java.util.Collections;
import java.util.Dictionary;
@@ -28,10 +28,10 @@ import java.util.Hashtable;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.aries.application.modelling.InvalidAttributeException;
-import org.apache.aries.application.modelling.ImportedPackage;
-import org.apache.aries.application.modelling.Provider;
-import org.apache.aries.application.modelling.ResourceType;
+import org.apache.aries.subsystem.modelling.InvalidAttributeException;
+import org.apache.aries.subsystem.modelling.ImportedPackage;
+import org.apache.aries.subsystem.modelling.Provider;
+import org.apache.aries.subsystem.modelling.ResourceType;
import org.apache.aries.util.manifest.ManifestHeaderProcessor;
import org.osgi.framework.Constants;
import org.osgi.framework.Filter;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedServiceImpl.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedServiceImpl.java
similarity index 95%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedServiceImpl.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedServiceImpl.java
index 5b0d11e8a..4cc48d544 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedServiceImpl.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedServiceImpl.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
-import static org.apache.aries.application.modelling.ResourceType.SERVICE;
+import static org.apache.aries.subsystem.modelling.ResourceType.SERVICE;
import java.util.Dictionary;
import java.util.HashMap;
@@ -26,12 +26,12 @@ import java.util.Hashtable;
import java.util.Map;
import java.util.regex.Pattern;
-import org.apache.aries.application.modelling.InvalidAttributeException;
-import org.apache.aries.application.modelling.ImportedService;
-import org.apache.aries.application.modelling.ModellingConstants;
-import org.apache.aries.application.modelling.Provider;
-import org.apache.aries.application.modelling.ResourceType;
-import org.apache.aries.application.modelling.WrappedReferenceMetadata;
+import org.apache.aries.subsystem.modelling.InvalidAttributeException;
+import org.apache.aries.subsystem.modelling.ImportedService;
+import org.apache.aries.subsystem.modelling.ModellingConstants;
+import org.apache.aries.subsystem.modelling.Provider;
+import org.apache.aries.subsystem.modelling.ResourceType;
+import org.apache.aries.subsystem.modelling.WrappedReferenceMetadata;
import org.apache.aries.util.manifest.ManifestHeaderProcessor;
import org.osgi.framework.Constants;
import org.osgi.framework.Filter;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/MessageUtil.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/MessageUtil.java
similarity index 91%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/MessageUtil.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/MessageUtil.java
index 224808fed..7a19e8242 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/MessageUtil.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/MessageUtil.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
import java.text.MessageFormat;
import java.util.ResourceBundle;
@@ -25,7 +25,7 @@ import java.util.ResourceBundle;
public class MessageUtil
{
/** The resource bundle for blueprint messages */
- private final static ResourceBundle messages =
ResourceBundle.getBundle("org.apache.aries.application.modelling.messages.APPModellingMessages");
+ private final static ResourceBundle messages =
ResourceBundle.getBundle("org.apache.aries.subsystem.modelling.messages.APPModellingMessages");
/**
* Resolve a message from the bundle, including any necessary formatting.
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceImpl.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModelledResourceImpl.java
similarity index 94%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceImpl.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModelledResourceImpl.java
index 472da5bd9..049cf2cb6 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceImpl.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModelledResourceImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
import static org.osgi.framework.Constants.BUNDLE_VERSION_ATTRIBUTE;
import static org.osgi.framework.Constants.DYNAMICIMPORT_PACKAGE;
@@ -37,16 +37,16 @@ import java.util.List;
import java.util.Map;
import java.util.jar.Attributes;
-import org.apache.aries.application.modelling.InvalidAttributeException;
-import org.apache.aries.application.modelling.ExportedBundle;
-import org.apache.aries.application.modelling.ExportedPackage;
-import org.apache.aries.application.modelling.ExportedService;
-import org.apache.aries.application.modelling.ImportedBundle;
-import org.apache.aries.application.modelling.ImportedPackage;
-import org.apache.aries.application.modelling.ImportedService;
-import org.apache.aries.application.modelling.ModelledResource;
-import org.apache.aries.application.modelling.ModellingConstants;
-import org.apache.aries.application.modelling.ResourceType;
+import org.apache.aries.subsystem.modelling.InvalidAttributeException;
+import org.apache.aries.subsystem.modelling.ExportedBundle;
+import org.apache.aries.subsystem.modelling.ExportedPackage;
+import org.apache.aries.subsystem.modelling.ExportedService;
+import org.apache.aries.subsystem.modelling.ImportedBundle;
+import org.apache.aries.subsystem.modelling.ImportedPackage;
+import org.apache.aries.subsystem.modelling.ImportedService;
+import org.apache.aries.subsystem.modelling.ModelledResource;
+import org.apache.aries.subsystem.modelling.ModellingConstants;
+import org.apache.aries.subsystem.modelling.ResourceType;
import org.apache.aries.util.manifest.ManifestHeaderProcessor;
import org.apache.aries.util.manifest.ManifestHeaderProcessor.NameValuePair;
import org.slf4j.Logger;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModelledResourceManagerImpl.java
similarity index 93%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModelledResourceManagerImpl.java
index 9e0349a65..13829bc8c 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModelledResourceManagerImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
* */
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
import java.io.IOException;
import java.io.InputStream;
@@ -30,16 +30,16 @@ import java.util.List;
import java.util.Set;
import java.util.jar.Attributes;
-import org.apache.aries.application.modelling.InvalidAttributeException;
-import org.apache.aries.application.modelling.ExportedService;
-import org.apache.aries.application.modelling.ImportedService;
-import org.apache.aries.application.modelling.ModelledResource;
-import org.apache.aries.application.modelling.ModelledResourceManager;
-import org.apache.aries.application.modelling.ModellerException;
-import org.apache.aries.application.modelling.ModellingManager;
-import org.apache.aries.application.modelling.ParsedServiceElements;
-import org.apache.aries.application.modelling.ParserProxy;
-import org.apache.aries.application.modelling.ServiceModeller;
+import org.apache.aries.subsystem.modelling.InvalidAttributeException;
+import org.apache.aries.subsystem.modelling.ExportedService;
+import org.apache.aries.subsystem.modelling.ImportedService;
+import org.apache.aries.subsystem.modelling.ModelledResource;
+import org.apache.aries.subsystem.modelling.ModelledResourceManager;
+import org.apache.aries.subsystem.modelling.ModellerException;
+import org.apache.aries.subsystem.modelling.ModellingManager;
+import org.apache.aries.subsystem.modelling.ParsedServiceElements;
+import org.apache.aries.subsystem.modelling.ParserProxy;
+import org.apache.aries.subsystem.modelling.ServiceModeller;
import org.apache.aries.util.filesystem.FileSystem;
import org.apache.aries.util.filesystem.ICloseableDirectory;
import org.apache.aries.util.filesystem.IDirectory;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModellingHelperImpl.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModellingHelperImpl.java
similarity index 92%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModellingHelperImpl.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModellingHelperImpl.java
index 821da4906..f6a9111c7 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModellingHelperImpl.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModellingHelperImpl.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
-import static
org.apache.aries.application.modelling.ModellingConstants.OPTIONAL_KEY;
+import static
org.apache.aries.subsystem.modelling.ModellingConstants.OPTIONAL_KEY;
import static org.osgi.framework.Constants.BUNDLE_VERSION_ATTRIBUTE;
import static org.osgi.framework.Constants.VERSION_ATTRIBUTE;
@@ -27,14 +27,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.aries.application.modelling.InvalidAttributeException;
-import org.apache.aries.application.modelling.DeployedBundles;
-import org.apache.aries.application.modelling.ImportedBundle;
-import org.apache.aries.application.modelling.ImportedPackage;
-import org.apache.aries.application.modelling.ModelledResource;
-import org.apache.aries.application.modelling.ModellingConstants;
-import org.apache.aries.application.modelling.Provider;
-import org.apache.aries.application.modelling.ModellingHelper;
+import org.apache.aries.subsystem.modelling.InvalidAttributeException;
+import org.apache.aries.subsystem.modelling.DeployedBundles;
+import org.apache.aries.subsystem.modelling.ImportedBundle;
+import org.apache.aries.subsystem.modelling.ImportedPackage;
+import org.apache.aries.subsystem.modelling.ModelledResource;
+import org.apache.aries.subsystem.modelling.ModellingConstants;
+import org.apache.aries.subsystem.modelling.Provider;
+import org.apache.aries.subsystem.modelling.ModellingHelper;
import org.apache.aries.util.VersionRange;
import org.apache.aries.util.manifest.ManifestHeaderProcessor;
import org.osgi.framework.Constants;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModellingManagerImpl.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModellingManagerImpl.java
similarity index 81%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModellingManagerImpl.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModellingManagerImpl.java
index d96b36eed..7b9183f37 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModellingManagerImpl.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModellingManagerImpl.java
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
import java.util.Collection;
import java.util.Map;
import java.util.jar.Attributes;
-import org.apache.aries.application.modelling.InvalidAttributeException;
-import org.apache.aries.application.modelling.ExportedService;
-import org.apache.aries.application.modelling.ImportedService;
-import org.apache.aries.application.modelling.ModelledResource;
-import org.apache.aries.application.modelling.ModellingManager;
-import org.apache.aries.application.modelling.ParsedServiceElements;
+import org.apache.aries.subsystem.modelling.InvalidAttributeException;
+import org.apache.aries.subsystem.modelling.ExportedService;
+import org.apache.aries.subsystem.modelling.ImportedService;
+import org.apache.aries.subsystem.modelling.ModelledResource;
+import org.apache.aries.subsystem.modelling.ModellingManager;
+import org.apache.aries.subsystem.modelling.ParsedServiceElements;
public class ModellingManagerImpl implements ModellingManager
{
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/PackageRequirementMerger.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/PackageRequirementMerger.java
similarity index 97%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/PackageRequirementMerger.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/PackageRequirementMerger.java
index 6e0fe5133..26f49c7d7 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/PackageRequirementMerger.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/PackageRequirementMerger.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
import java.util.Collection;
import java.util.Collections;
@@ -25,7 +25,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.aries.application.modelling.ImportedPackage;
+import org.apache.aries.subsystem.modelling.ImportedPackage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ParsedServiceElementsImpl.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ParsedServiceElementsImpl.java
similarity index 91%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ParsedServiceElementsImpl.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ParsedServiceElementsImpl.java
index 5649281df..d864166e6 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ParsedServiceElementsImpl.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ParsedServiceElementsImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
import java.util.Collection;
@@ -24,9 +24,9 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import org.apache.aries.application.modelling.ExportedService;
-import org.apache.aries.application.modelling.ImportedService;
-import org.apache.aries.application.modelling.ParsedServiceElements;
+import org.apache.aries.subsystem.modelling.ExportedService;
+import org.apache.aries.subsystem.modelling.ImportedService;
+import org.apache.aries.subsystem.modelling.ParsedServiceElements;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ParserProxyImpl.java
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ParserProxyImpl.java
similarity index 97%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ParserProxyImpl.java
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ParserProxyImpl.java
index 5f18cbc6d..82dee9cca 100644
---
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ParserProxyImpl.java
+++
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ParserProxyImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
import java.io.InputStream;
import java.net.URL;
import java.util.List;
diff --git
a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/packageinfo
b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/packageinfo
similarity index 100%
rename from
application/application-modeller/src/main/java/org/apache/aries/application/modelling/packageinfo
rename to
subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/packageinfo
diff --git
a/application/application-modeller/src/main/resources/OSGI-INF/blueprint/app-modeller.xml
b/subsystem/subsystem-modeller/src/main/resources/OSGI-INF/blueprint/blueprint.xml
similarity index 70%
rename from
application/application-modeller/src/main/resources/OSGI-INF/blueprint/app-modeller.xml
rename to
subsystem/subsystem-modeller/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index e44c7b9c2..b94fd7eb5 100644
---
a/application/application-modeller/src/main/resources/OSGI-INF/blueprint/app-modeller.xml
+++
b/subsystem/subsystem-modeller/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -18,26 +18,26 @@
<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="modelledResourceManager"
class="org.apache.aries.application.modelling.impl.ModelledResourceManagerImpl">
+ <bean id="modelledResourceManager"
class="org.apache.aries.subsystem.modelling.impl.ModelledResourceManagerImpl">
<property name="modellingManager" ref="modellingManager"/>
<property name="parserProxy" ref="parserProxy"/>
<property name="modellingPlugins" ref="modellingPlugins"/>
</bean>
- <service id = "modelledResourceManagerService" ref="modelledResourceManager"
interface="org.apache.aries.application.modelling.ModelledResourceManager"/>
+ <service id = "modelledResourceManagerService" ref="modelledResourceManager"
interface="org.apache.aries.subsystem.modelling.ModelledResourceManager"/>
<reference id="parser-service"
interface="org.apache.aries.blueprint.services.ParserService"/>
- <bean id="parserProxy"
class="org.apache.aries.application.modelling.impl.ParserProxyImpl">
+ <bean id="parserProxy"
class="org.apache.aries.subsystem.modelling.impl.ParserProxyImpl">
<property name="parserService" ref="parser-service"/>
<property name="bundleContext" ref="blueprintBundleContext"/>
<property name="modellingManager" ref="modellingManager"/>
</bean>
- <service id="parserProxyService" ref="parserProxy"
interface="org.apache.aries.application.modelling.ParserProxy"/>
+ <service id="parserProxyService" ref="parserProxy"
interface="org.apache.aries.subsystem.modelling.ParserProxy"/>
- <bean id="modellingManager"
class="org.apache.aries.application.modelling.impl.ModellingManagerImpl"/>
- <service id="modellingManagerService" ref="modellingManager"
interface="org.apache.aries.application.modelling.ModellingManager"/>
+ <bean id="modellingManager"
class="org.apache.aries.subsystem.modelling.impl.ModellingManagerImpl"/>
+ <service id="modellingManagerService" ref="modellingManager"
interface="org.apache.aries.subsystem.modelling.ModellingManager"/>
- <bean id="modellingHelper"
class="org.apache.aries.application.modelling.impl.ModellingHelperImpl"/>
- <service id="modellingHelperService" ref="modellingHelper"
interface="org.apache.aries.application.modelling.ModellingHelper"/>
+ <bean id="modellingHelper"
class="org.apache.aries.subsystem.modelling.impl.ModellingHelperImpl"/>
+ <service id="modellingHelperService" ref="modellingHelper"
interface="org.apache.aries.subsystem.modelling.ModellingHelper"/>
- <reference-list id="modellingPlugins"
interface="org.apache.aries.application.modelling.ServiceModeller"
availability="optional"/>
+ <reference-list id="modellingPlugins"
interface="org.apache.aries.subsystem.modelling.ServiceModeller"
availability="optional"/>
</blueprint>
\ No newline at end of file
diff --git
a/application/application-modeller/src/main/resources/org/apache/aries/application/modelling/messages/APPModellingMessages.properties
b/subsystem/subsystem-modeller/src/main/resources/org/apache/aries/subsystem/modelling/messages/APPModellingMessages.properties
similarity index 100%
rename from
application/application-modeller/src/main/resources/org/apache/aries/application/modelling/messages/APPModellingMessages.properties
rename to
subsystem/subsystem-modeller/src/main/resources/org/apache/aries/subsystem/modelling/messages/APPModellingMessages.properties
diff --git
a/application/application-modeller/src/test/java/org/apache/aries/application/modelling/ModellerTest.java
b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/ModellerTest.java
similarity index 90%
rename from
application/application-modeller/src/test/java/org/apache/aries/application/modelling/ModellerTest.java
rename to
subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/ModellerTest.java
index 2e6c5b4a4..28937990f 100644
---
a/application/application-modeller/src/test/java/org/apache/aries/application/modelling/ModellerTest.java
+++
b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/ModellerTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.aries.application.modelling;
+package org.apache.aries.subsystem.modelling;
import java.io.File;
import java.io.FileInputStream;
@@ -29,14 +29,9 @@ import java.util.Collections;
import java.util.List;
import java.util.jar.Manifest;
-import org.apache.aries.application.modelling.ExportedPackage;
-import org.apache.aries.application.modelling.ImportedPackage;
-import org.apache.aries.application.modelling.ImportedService;
-import org.apache.aries.application.modelling.ModelledResource;
-import org.apache.aries.application.modelling.ModelledResourceManager;
-import org.apache.aries.application.modelling.impl.ModelledResourceManagerImpl;
-import org.apache.aries.application.modelling.impl.ModellingManagerImpl;
-import org.apache.aries.application.modelling.impl.ParserProxyTest;
+import org.apache.aries.subsystem.modelling.impl.ModelledResourceManagerImpl;
+import org.apache.aries.subsystem.modelling.impl.ModellingManagerImpl;
+import org.apache.aries.subsystem.modelling.impl.ParserProxyTest;
import org.apache.aries.mocks.BundleContextMock;
import org.apache.aries.util.filesystem.FileSystem;
import org.apache.aries.util.io.IOUtils;
diff --git
a/application/application-modeller/src/test/java/org/apache/aries/application/modelling/impl/ParserProxyTest.java
b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/impl/ParserProxyTest.java
similarity index 94%
rename from
application/application-modeller/src/test/java/org/apache/aries/application/modelling/impl/ParserProxyTest.java
rename to
subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/impl/ParserProxyTest.java
index 83caea502..ad20ef390 100644
---
a/application/application-modeller/src/test/java/org/apache/aries/application/modelling/impl/ParserProxyTest.java
+++
b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/impl/ParserProxyTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.aries.application.modelling.impl;
+package org.apache.aries.subsystem.modelling.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -37,11 +37,11 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.aries.application.modelling.ModellingManager;
-import org.apache.aries.application.modelling.ParsedServiceElements;
-import org.apache.aries.application.modelling.ParserProxy;
-import org.apache.aries.application.modelling.WrappedReferenceMetadata;
-import org.apache.aries.application.modelling.WrappedServiceMetadata;
+import org.apache.aries.subsystem.modelling.ModellingManager;
+import org.apache.aries.subsystem.modelling.ParsedServiceElements;
+import org.apache.aries.subsystem.modelling.ParserProxy;
+import org.apache.aries.subsystem.modelling.WrappedReferenceMetadata;
+import org.apache.aries.subsystem.modelling.WrappedServiceMetadata;
import org.apache.aries.blueprint.container.NamespaceHandlerRegistry;
import org.apache.aries.blueprint.container.ParserServiceImpl;
import org.apache.aries.blueprint.namespace.NamespaceHandlerRegistryImpl;
diff --git
a/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/AbstractBundleResourceTest.java
b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/AbstractBundleResourceTest.java
similarity index 95%
rename from
application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/AbstractBundleResourceTest.java
rename to
subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/AbstractBundleResourceTest.java
index e97e7e635..7b7a7a989 100644
---
a/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/AbstractBundleResourceTest.java
+++
b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/AbstractBundleResourceTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.utils;
+package org.apache.aries.subsystem.modelling.utils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -25,14 +25,14 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Map;
-import org.apache.aries.application.modelling.ResolverException;
-import org.apache.aries.application.modelling.ExportedPackage;
-import org.apache.aries.application.modelling.ExportedService;
-import org.apache.aries.application.modelling.ImportedBundle;
-import org.apache.aries.application.modelling.ImportedPackage;
-import org.apache.aries.application.modelling.ImportedService;
-import org.apache.aries.application.modelling.ModelledResource;
-import org.apache.aries.application.modelling.ModellingConstants;
+import org.apache.aries.subsystem.modelling.ResolverException;
+import org.apache.aries.subsystem.modelling.ExportedPackage;
+import org.apache.aries.subsystem.modelling.ExportedService;
+import org.apache.aries.subsystem.modelling.ImportedBundle;
+import org.apache.aries.subsystem.modelling.ImportedPackage;
+import org.apache.aries.subsystem.modelling.ImportedService;
+import org.apache.aries.subsystem.modelling.ModelledResource;
+import org.apache.aries.subsystem.modelling.ModellingConstants;
import org.apache.aries.util.manifest.ManifestHeaderProcessor;
import org.junit.Before;
import org.junit.Ignore;
diff --git
a/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/BundleResourceTest.java
b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/BundleResourceTest.java
similarity index 85%
rename from
application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/BundleResourceTest.java
rename to
subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/BundleResourceTest.java
index df0dda9c9..510b32c1a 100644
---
a/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/BundleResourceTest.java
+++
b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/BundleResourceTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.utils;
+package org.apache.aries.subsystem.modelling.utils;
import static org.junit.Assert.assertEquals;
@@ -27,11 +27,11 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.jar.Manifest;
-import org.apache.aries.application.modelling.InvalidAttributeException;
-import org.apache.aries.application.modelling.ResolverException;
-import org.apache.aries.application.modelling.ModelledResource;
-import org.apache.aries.application.modelling.ResourceType;
-import org.apache.aries.application.modelling.impl.ModelledResourceImpl;
+import org.apache.aries.subsystem.modelling.InvalidAttributeException;
+import org.apache.aries.subsystem.modelling.ResolverException;
+import org.apache.aries.subsystem.modelling.ModelledResource;
+import org.apache.aries.subsystem.modelling.ResourceType;
+import org.apache.aries.subsystem.modelling.impl.ModelledResourceImpl;
import org.junit.Test;
import org.osgi.framework.Constants;
diff --git
a/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/DeployedBundlesTest.java
b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/DeployedBundlesTest.java
similarity index 96%
rename from
application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/DeployedBundlesTest.java
rename to
subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/DeployedBundlesTest.java
index 8c81e76f1..d49763d05 100644
---
a/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/DeployedBundlesTest.java
+++
b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/DeployedBundlesTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.utils;
+package org.apache.aries.subsystem.modelling.utils;
import static org.junit.Assert.assertEquals;
@@ -30,18 +30,18 @@ import java.util.List;
import java.util.Map;
import java.util.jar.Attributes;
-import org.apache.aries.application.modelling.InvalidAttributeException;
-import org.apache.aries.application.modelling.ResolverException;
-import org.apache.aries.application.modelling.DeployedBundles;
-import org.apache.aries.application.modelling.ExportedService;
-import org.apache.aries.application.modelling.ImportedBundle;
-import org.apache.aries.application.modelling.ImportedService;
-import org.apache.aries.application.modelling.ModelledResource;
-import org.apache.aries.application.modelling.impl.ExportedServiceImpl;
-import org.apache.aries.application.modelling.impl.ImportedBundleImpl;
-import org.apache.aries.application.modelling.impl.ImportedServiceImpl;
-import org.apache.aries.application.modelling.impl.ModelledResourceImpl;
-import org.apache.aries.application.modelling.impl.ModellingHelperImpl;
+import org.apache.aries.subsystem.modelling.InvalidAttributeException;
+import org.apache.aries.subsystem.modelling.ResolverException;
+import org.apache.aries.subsystem.modelling.DeployedBundles;
+import org.apache.aries.subsystem.modelling.ExportedService;
+import org.apache.aries.subsystem.modelling.ImportedBundle;
+import org.apache.aries.subsystem.modelling.ImportedService;
+import org.apache.aries.subsystem.modelling.ModelledResource;
+import org.apache.aries.subsystem.modelling.impl.ExportedServiceImpl;
+import org.apache.aries.subsystem.modelling.impl.ImportedBundleImpl;
+import org.apache.aries.subsystem.modelling.impl.ImportedServiceImpl;
+import org.apache.aries.subsystem.modelling.impl.ModelledResourceImpl;
+import org.apache.aries.subsystem.modelling.impl.ModellingHelperImpl;
import org.apache.aries.util.manifest.ManifestHeaderProcessor;
import org.apache.aries.util.manifest.ManifestHeaderProcessor.NameValuePair;
import org.junit.Assert;
diff --git
a/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/ExportedPackageTest.java
b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/ExportedPackageTest.java
similarity index 92%
rename from
application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/ExportedPackageTest.java
rename to
subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/ExportedPackageTest.java
index edc8944de..85eafa119 100644
---
a/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/ExportedPackageTest.java
+++
b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/ExportedPackageTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.aries.application.modelling.utils;
+package org.apache.aries.subsystem.modelling.utils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -25,9 +25,9 @@ import static org.junit.Assert.assertFalse;
import java.util.HashMap;
import java.util.Map;
-import org.apache.aries.application.modelling.ExportedPackage;
-import org.apache.aries.application.modelling.ModelledResource;
-import org.apache.aries.application.modelling.impl.ExportedPackageImpl;
+import org.apache.aries.subsystem.modelling.ExportedPackage;
+import org.apache.aries.subsystem.modelling.ModelledResource;
+import org.apache.aries.subsystem.modelling.impl.ExportedPackageImpl;
import org.apache.aries.unittest.mocks.Skeleton;
import org.junit.Test;
import org.osgi.framework.Constants;
diff --git
a/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/ExportedServiceTest.java
b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/ExportedServiceTest.java
similarity index 92%
rename from
application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/ExportedServiceTest.java
rename to
subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/ExportedServiceTest.java
index 456895420..f5551eaa9 100644
---
a/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/ExportedServiceTest.java
+++
b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/ExportedServiceTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.utils;
+package org.apache.aries.subsystem.modelling.utils;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -24,8 +24,8 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
-import org.apache.aries.application.modelling.WrappedServiceMetadata;
-import org.apache.aries.application.modelling.impl.ExportedServiceImpl;
+import org.apache.aries.subsystem.modelling.WrappedServiceMetadata;
+import org.apache.aries.subsystem.modelling.impl.ExportedServiceImpl;
import org.junit.Test;
public class ExportedServiceTest
{
diff --git
a/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/ImportedPackageTest.java
b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/ImportedPackageTest.java
similarity index 94%
rename from
application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/ImportedPackageTest.java
rename to
subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/ImportedPackageTest.java
index c5049af80..d100d5a9f 100644
---
a/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/ImportedPackageTest.java
+++
b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/ImportedPackageTest.java
@@ -1,4 +1,4 @@
-package org.apache.aries.application.modelling.utils;
+package org.apache.aries.subsystem.modelling.utils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -6,9 +6,9 @@ import static org.junit.Assert.assertFalse;
import java.util.HashMap;
import java.util.Map;
-import org.apache.aries.application.modelling.InvalidAttributeException;
-import org.apache.aries.application.modelling.ImportedPackage;
-import org.apache.aries.application.modelling.impl.ImportedPackageImpl;
+import org.apache.aries.subsystem.modelling.InvalidAttributeException;
+import org.apache.aries.subsystem.modelling.ImportedPackage;
+import org.apache.aries.subsystem.modelling.impl.ImportedPackageImpl;
import org.junit.Test;
import org.osgi.framework.Constants;
diff --git
a/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/PackageRequirementMergerTest.java
b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/PackageRequirementMergerTest.java
similarity index 96%
rename from
application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/PackageRequirementMergerTest.java
rename to
subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/PackageRequirementMergerTest.java
index 149729bf4..36402d117 100644
---
a/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/PackageRequirementMergerTest.java
+++
b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/PackageRequirementMergerTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application.modelling.utils;
+package org.apache.aries.subsystem.modelling.utils;
import java.util.ArrayList;
@@ -26,10 +26,10 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.aries.application.modelling.InvalidAttributeException;
-import org.apache.aries.application.modelling.ImportedPackage;
-import org.apache.aries.application.modelling.impl.ImportedPackageImpl;
-import org.apache.aries.application.modelling.impl.PackageRequirementMerger;
+import org.apache.aries.subsystem.modelling.InvalidAttributeException;
+import org.apache.aries.subsystem.modelling.ImportedPackage;
+import org.apache.aries.subsystem.modelling.impl.ImportedPackageImpl;
+import org.apache.aries.subsystem.modelling.impl.PackageRequirementMerger;
import org.apache.aries.util.VersionRange;
import org.apache.aries.util.manifest.ManifestHeaderProcessor;
import org.junit.Assert;
diff --git
a/application/application-modeller/src/test/resources/appModeller/test1.eba/META-INF/APPLICATION.MF
b/subsystem/subsystem-modeller/src/test/resources/appModeller/test1.eba/META-INF/APPLICATION.MF
similarity index 100%
rename from
application/application-modeller/src/test/resources/appModeller/test1.eba/META-INF/APPLICATION.MF
rename to
subsystem/subsystem-modeller/src/test/resources/appModeller/test1.eba/META-INF/APPLICATION.MF
diff --git
a/application/application-modeller/src/test/resources/appModeller/test1.eba/META-INF/DEPLOYMENT.MF
b/subsystem/subsystem-modeller/src/test/resources/appModeller/test1.eba/META-INF/DEPLOYMENT.MF
similarity index 100%
rename from
application/application-modeller/src/test/resources/appModeller/test1.eba/META-INF/DEPLOYMENT.MF
rename to
subsystem/subsystem-modeller/src/test/resources/appModeller/test1.eba/META-INF/DEPLOYMENT.MF
diff --git
a/application/application-modeller/src/test/resources/appModeller/test1.eba/bundle1.jar/META-INF/MANIFEST.MF
b/subsystem/subsystem-modeller/src/test/resources/appModeller/test1.eba/bundle1.jar/META-INF/MANIFEST.MF
similarity index 100%
rename from
application/application-modeller/src/test/resources/appModeller/test1.eba/bundle1.jar/META-INF/MANIFEST.MF
rename to
subsystem/subsystem-modeller/src/test/resources/appModeller/test1.eba/bundle1.jar/META-INF/MANIFEST.MF
diff --git
a/application/application-modeller/src/test/resources/appModeller/test1.eba/bundle1.jar/OSGI-INF/blueprint/bp.xml
b/subsystem/subsystem-modeller/src/test/resources/appModeller/test1.eba/bundle1.jar/OSGI-INF/blueprint/bp.xml
similarity index 100%
rename from
application/application-modeller/src/test/resources/appModeller/test1.eba/bundle1.jar/OSGI-INF/blueprint/bp.xml
rename to
subsystem/subsystem-modeller/src/test/resources/appModeller/test1.eba/bundle1.jar/OSGI-INF/blueprint/bp.xml
diff --git
a/application/application-modeller/src/test/resources/appModeller/test1.eba/bundle1.jar/OSGI-INF/blueprint/bp2.xml
b/subsystem/subsystem-modeller/src/test/resources/appModeller/test1.eba/bundle1.jar/OSGI-INF/blueprint/bp2.xml
similarity index 100%
rename from
application/application-modeller/src/test/resources/appModeller/test1.eba/bundle1.jar/OSGI-INF/blueprint/bp2.xml
rename to
subsystem/subsystem-modeller/src/test/resources/appModeller/test1.eba/bundle1.jar/OSGI-INF/blueprint/bp2.xml
diff --git
a/application/application-modeller/src/test/resources/appModeller/test1.eba/bundle1.jar/OSGI-INF/blueprint/bpMultiValues.xml
b/subsystem/subsystem-modeller/src/test/resources/appModeller/test1.eba/bundle1.jar/OSGI-INF/blueprint/bpMultiValues.xml
similarity index 100%
rename from
application/application-modeller/src/test/resources/appModeller/test1.eba/bundle1.jar/OSGI-INF/blueprint/bpMultiValues.xml
rename to
subsystem/subsystem-modeller/src/test/resources/appModeller/test1.eba/bundle1.jar/OSGI-INF/blueprint/bpMultiValues.xml
diff --git
a/application/application-modeller/src/test/resources/bundles/test.bundle1.jar/META-INF/MANIFEST.MF
b/subsystem/subsystem-modeller/src/test/resources/bundles/test.bundle1.jar/META-INF/MANIFEST.MF
similarity index 100%
rename from
application/application-modeller/src/test/resources/bundles/test.bundle1.jar/META-INF/MANIFEST.MF
rename to
subsystem/subsystem-modeller/src/test/resources/bundles/test.bundle1.jar/META-INF/MANIFEST.MF
diff --git
a/application/application-modeller/src/test/resources/test.bundle/META-INF/MANIFEST.MF
b/subsystem/subsystem-modeller/src/test/resources/test.bundle/META-INF/MANIFEST.MF
similarity index 100%
rename from
application/application-modeller/src/test/resources/test.bundle/META-INF/MANIFEST.MF
rename to
subsystem/subsystem-modeller/src/test/resources/test.bundle/META-INF/MANIFEST.MF
diff --git
a/application/application-modeller/src/test/resources/test.bundle/OSGI-INF/blueprint/bp.xml
b/subsystem/subsystem-modeller/src/test/resources/test.bundle/OSGI-INF/blueprint/bp.xml
similarity index 100%
rename from
application/application-modeller/src/test/resources/test.bundle/OSGI-INF/blueprint/bp.xml
rename to
subsystem/subsystem-modeller/src/test/resources/test.bundle/OSGI-INF/blueprint/bp.xml
