You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by si...@apache.org on 2019/03/27 22:51:42 UTC
[sling-whiteboard] branch master updated: [cp2fm] code update
before moving to the proper repository
This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new 2e10d3c [cp2fm] code update before moving to the proper repository
2e10d3c is described below
commit 2e10d3c628d24d1abb3396ff86a8dc531995729b
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Wed Mar 27 23:51:34 2019 +0100
[cp2fm] code update before moving to the proper repository
---
content-package-2-feature-model/README.md | 132 ++++++++++-----------
content-package-2-feature-model/pom.xml | 6 +-
.../apache/sling/cp2fm/writers/package-info.java | 21 ----
.../ContentPackage2FeatureModelConverter.java | 12 +-
.../cpconverter}/DefaultBundlesDeployer.java | 6 +-
.../cpconverter}/RegexBasedResourceFilter.java | 2 +-
...ntentPackage2FeatureModelConverterLauncher.java | 4 +-
.../cpconverter}/cli/ShutDownHook.java | 2 +-
.../cpconverter}/cli/package-info.java | 2 +-
.../AbstractConfigurationEntryHandler.java | 4 +-
.../handlers/AbstractRegexEntryHandler.java | 4 +-
.../cpconverter}/handlers/BundleEntryHandler.java | 16 +--
.../handlers/ConfigurationEntryHandler.java | 2 +-
.../handlers/ContentPackageEntryHandler.java | 4 +-
.../handlers/JsonConfigurationEntryHandler.java | 2 +-
.../PropertiesConfigurationEntryHandler.java | 2 +-
.../handlers/XmlConfigurationEntryHandler.java | 2 +-
.../cpconverter}/handlers/package-info.java | 4 +-
.../cpconverter}/package-info.java | 2 +-
.../cpconverter}/spi/ArtifactWriter.java | 2 +-
.../cpconverter}/spi/BundlesDeployer.java | 2 +-
.../cpconverter}/spi/EntryHandler.java | 4 +-
.../cpconverter}/spi/package-info.java | 2 +-
.../cpconverter}/vltpkg/VaultPackageAssembler.java | 12 +-
.../cpconverter}/vltpkg/package-info.java | 2 +-
.../cpconverter}/writers/FileArtifactWriter.java | 4 +-
.../writers/InputStreamArtifactWriter.java | 4 +-
.../writers/MavenPomSupplierWriter.java | 4 +-
.../cpconverter/writers}/package-info.java | 4 +-
.../org.apache.sling.cp2fm.spi.EntryHandler | 6 -
...ache.sling.feature.cpconverter.spi.EntryHandler | 6 +
.../cpconverter}/vltpkg/config.xml | 0
.../cpconverter}/vltpkg/definition/.content.xml | 0
.../cpconverter}/vltpkg/settings.xml | 0
.../ContentPackage2FeatureModelConverterTest.java | 2 +-
.../cpconverter}/DefaultBundlesDeployerTest.java | 6 +-
.../cpconverter}/RegexBasedResourceFilterTest.java | 2 +-
.../handlers/BundleEntryHandlerTest.java | 8 +-
.../handlers/ConfigurationEntryHandlerTest.java | 4 +-
.../handlers/ContentPackageEntryHandlerTest.java | 4 +-
.../JsonConfigurationEntryHandlerTest.java | 4 +-
.../vltpkg/VaultPackageAssemblerTest.java | 3 +-
.../cpconverter}/handlers/jcr_root/.content.xml | 0
...ceusermapping.impl.ServiceUserMapperImpl.config | 0
...ceusermapping.impl.ServiceUserMapperImpl.config | 0
...ing.impl.ServiceUserMapperImpl.INVALID.cfg.json | 0
...rviceusermapping.impl.ServiceUserMapperImpl.cfg | 0
...usermapping.impl.ServiceUserMapperImpl.cfg.json | 0
...ceusermapping.impl.ServiceUserMapperImpl.config | 0
...sermapping.impl.ServiceUserMapperImpl.empty.cfg | 0
...pping.impl.ServiceUserMapperImpl.empty.cfg.json | 0
...mapping.impl.ServiceUserMapperImpl.empty.config | 0
...sermapping.impl.ServiceUserMapperImpl.empty.xml | 0
...apping.impl.ServiceUserMapperImpl.empty.xml.cfg | 0
...rviceusermapping.impl.ServiceUserMapperImpl.xml | 0
...eusermapping.impl.ServiceUserMapperImpl.xml.cfg | 0
.../apps/asd/install.author}/test-framework.jar | Bin
.../apps/asd/install.publish/test-framework.jar | Bin
.../apps/asd/install/test-framework-no-pom.jar | Bin
.../jcr_root/apps/asd/install}/test-framework.jar | Bin
.../handlers/jcr_root/asd/.content.xml | 0
.../handlers/jcr_root/asd/public/.content.xml | 0
.../handlers/jcr_root/asd/public/_rep_policy.xml | 0
.../handlers/jcr_root/asd/public/license.txt | 0
.../test-content-package-unacceptable.zip | Bin
.../cpconverter}/test-content-package.zip | Bin
66 files changed, 147 insertions(+), 167 deletions(-)
diff --git a/content-package-2-feature-model/README.md b/content-package-2-feature-model/README.md
index c399e95..1ac4bd0 100644
--- a/content-package-2-feature-model/README.md
+++ b/content-package-2-feature-model/README.md
@@ -40,9 +40,9 @@ Archive: content-package-2-feature-model/src/test/resources/org/apache/sling/cp
7235 03-12-2019 17:08 jcr_root/etc/packages/asd/test-configurations.zip
0 03-12-2019 15:28 META-INF/maven/
0 03-12-2019 15:29 META-INF/maven/org.apache.sling/
- 0 02-28-2019 14:27 META-INF/maven/org.apache.sling/org.apache.sling.cp2fm.all/
- 1231 03-12-2019 15:30 META-INF/maven/org.apache.sling/org.apache.sling.cp2fm.all/pom.xml
- 127 03-12-2019 15:30 META-INF/maven/org.apache.sling/org.apache.sling.cp2fm.all/pom.properties
+ 0 02-28-2019 14:27 META-INF/maven/org.apache.sling/org.apache.sling.feature.cpconverter.all/
+ 1231 03-12-2019 15:30 META-INF/maven/org.apache.sling/org.apache.sling.feature.cpconverter.all/pom.xml
+ 127 03-12-2019 15:30 META-INF/maven/org.apache.sling/org.apache.sling.feature.cpconverter.all/pom.properties
0 03-12-2019 17:06 META-INF/vault/
892 03-12-2019 15:32 META-INF/vault/settings.xml
840 03-12-2019 15:47 META-INF/vault/properties.xml
@@ -72,9 +72,9 @@ Archive: test-bundles.zip
7735 03-12-2019 17:17 jcr_root/apps/asd/install.author/test-api.jar
0 03-11-2019 23:42 META-INF/maven/
0 03-11-2019 23:43 META-INF/maven/org.apache.sling/
- 0 02-28-2019 14:26 META-INF/maven/org.apache.sling/org.apache.sling.cp2fm.bundles/
- 1229 03-12-2019 10:22 META-INF/maven/org.apache.sling/org.apache.sling.cp2fm.bundles/pom.xml
- 131 03-12-2019 00:26 META-INF/maven/org.apache.sling/org.apache.sling.cp2fm.bundles/pom.properties
+ 0 02-28-2019 14:26 META-INF/maven/org.apache.sling/org.apache.sling.feature.cpconverter.bundles/
+ 1229 03-12-2019 10:22 META-INF/maven/org.apache.sling/org.apache.sling.feature.cpconverter.bundles/pom.xml
+ 131 03-12-2019 00:26 META-INF/maven/org.apache.sling/org.apache.sling.feature.cpconverter.bundles/pom.properties
0 03-12-2019 12:41 META-INF/vault/
888 03-12-2019 00:28 META-INF/vault/settings.xml
954 03-12-2019 15:33 META-INF/vault/properties.xml
@@ -96,9 +96,9 @@ Archive: test-configurations.zip
69 03-12-2019 17:08 META-INF/MANIFEST.MF
0 03-12-2019 10:21 META-INF/maven/
0 03-12-2019 10:21 META-INF/maven/org.apache.sling/
- 0 02-28-2019 14:25 META-INF/maven/org.apache.sling/org.apache.sling.cp2fm.config/
- 1228 03-12-2019 10:24 META-INF/maven/org.apache.sling/org.apache.sling.cp2fm.config/pom.xml
- 129 03-12-2019 10:22 META-INF/maven/org.apache.sling/org.apache.sling.cp2fm.config/pom.properties
+ 0 02-28-2019 14:25 META-INF/maven/org.apache.sling/org.apache.sling.feature.cpconverter.config/
+ 1228 03-12-2019 10:24 META-INF/maven/org.apache.sling/org.apache.sling.feature.cpconverter.config/pom.xml
+ 129 03-12-2019 10:22 META-INF/maven/org.apache.sling/org.apache.sling.feature.cpconverter.config/pom.properties
0 03-12-2019 13:23 META-INF/vault/
94 02-28-2019 14:25 META-INF/vault/settings.xml
664 03-12-2019 15:13 META-INF/vault/properties.xml
@@ -127,9 +127,9 @@ Archive: test-content.zip
69 03-12-2019 17:09 META-INF/MANIFEST.MF
0 03-12-2019 11:31 META-INF/maven/
0 03-12-2019 11:31 META-INF/maven/org.apache.sling/
- 0 02-28-2019 14:26 META-INF/maven/org.apache.sling/org.apache.sling.cp2fm.content/
- 1229 03-12-2019 11:32 META-INF/maven/org.apache.sling/org.apache.sling.cp2fm.content/pom.xml
- 131 03-12-2019 11:32 META-INF/maven/org.apache.sling/org.apache.sling.cp2fm.content/pom.properties
+ 0 02-28-2019 14:26 META-INF/maven/org.apache.sling/org.apache.sling.feature.cpconverter.content/
+ 1229 03-12-2019 11:32 META-INF/maven/org.apache.sling/org.apache.sling.feature.cpconverter.content/pom.xml
+ 131 03-12-2019 11:32 META-INF/maven/org.apache.sling/org.apache.sling.feature.cpconverter.content/pom.properties
0 03-12-2019 12:40 META-INF/vault/
118 02-28-2019 14:26 META-INF/vault/settings.xml
859 03-12-2019 15:12 META-INF/vault/properties.xml
@@ -252,7 +252,7 @@ Multiple Run Modes are not supported yet.
## Sample APIs
```java
-import org.apache.sling.cp2fm.ContentPackage2FeatureModelConverter;
+import org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter;
...
@@ -271,13 +271,13 @@ new ContentPackage2FeatureModelConverter()
### Handler Services
-In order to make the tool extensible, the [org.apache.sling.cp2fm.spi.EntryHandler](./src/main/java/org/apache/sling/cp2fm/spi/EntryHandler.java) interface is declared to handle different kind of resources, have a look at the [org.apache.sling.cp2fm.handlers](src/main/java/org/apache/sling/cp2fm/handlers) package to see the default implementations.
+In order to make the tool extensible, the [org.apache.sling.feature.cpconverter.spi.EntryHandler](./src/main/java/org/apache/sling/feature/cpconverter/spi/EntryHandler.java) interface is declared to handle different kind of resources, have a look at the [org.apache.sling.feature.cpconverter.handlers](src/main/java/org/apache/sling/feature/cpconverter/handlers) package to see the default implementations.
-If users want to handle special resource type, all they have to do is providing their `org.apache.sling.cp2fm.spi.EntryHandler` service implementation and declaring them in the `META-INF/services/org.apache.sling.cp2fm.spi.EntryHandler` classpath resource file, on order to let the `ServiceLoader` including it in the `content-package` scan.
+If users want to handle special resource type, all they have to do is providing their `org.apache.sling.feature.cpconverter.spi.EntryHandler` service implementation and declaring them in the `META-INF/services/org.apache.sling.feature.cpconverter.spi.EntryHandler` classpath resource file, on order to let the `ServiceLoader` including it in the `content-package` scan.
### Bundles deployer
-The [org.apache.sling.cp2fm.spi.BundlesDeployer](./src/main/java/org/apache/sling/cp2fm/spi/BundlesDeployer) service is designed to let the conversion tool be integrated in external services, i.e. _Apache Maven_.
+The [org.apache.sling.feature.cpconverter.spi.BundlesDeployer](./src/main/java/org/apache/sling/cp2fm/spi/BundlesDeployer) service is designed to let the conversion tool be integrated in external services, i.e. _Apache Maven_.
The [default implementation](src/main/java/org/apache/sling/cp2fm/DefaultBundlesDeployer.java) just copies bundles in the target output directory, according to the _Apache Maven_ repository layout.
@@ -286,58 +286,58 @@ The [default implementation](src/main/java/org/apache/sling/cp2fm/DefaultBundles
The tool is distributed with a commodity package containing all is needed in order to launch the `ContentPackage2FeatureModelConverter` form the shell:
```
-$ unzip -l org.apache.sling.cp2fm-0.0.1-SNAPSHOT.zip
-Archive: org.apache.sling.cp2fm-0.0.1-SNAPSHOT.zip
+$ unzip -l org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT.zip
+Archive: org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT.zip
Length Date Time Name
--------- ---------- ----- ----
- 0 03-13-2019 15:58 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/
- 0 03-13-2019 15:58 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/bin/
- 0 03-13-2019 15:58 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/
- 4605 02-27-2019 16:30 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/README.md
- 801904 02-28-2019 14:55 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/jackrabbit-spi-commons-2.19.1.jar
- 14744 02-11-2019 15:44 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/osgi.annotation-6.0.1.jar
- 35919 02-11-2019 15:44 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/org.osgi.service.component.annotations-1.3.0.jar
- 23575 02-11-2019 15:44 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/org.osgi.service.metatype.annotations-1.3.0.jar
- 34518 02-27-2019 15:28 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/org.apache.felix.scr.annotations-1.11.0.jar
- 45199 03-13-2019 15:58 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/org.apache.sling.cp2fm-0.0.1-SNAPSHOT.jar
- 17489 03-13-2019 15:58 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/LICENSE
- 588337 02-11-2019 12:49 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/commons-collections-3.2.2.jar
- 108555 02-11-2019 15:45 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/xz-1.8.jar
- 52873 03-05-2019 17:31 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/plexus-classworlds-2.6.0.jar
- 165965 03-05-2019 18:02 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/maven-model-3.6.0.jar
- 178 02-27-2019 15:56 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/NOTICE
- 745712 02-28-2019 10:02 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/org.apache.jackrabbit.vault-3.2.6.jar
- 2374421 02-27-2019 15:28 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/biz.aQute.bndlib-3.2.0.jar
- 3263 03-13-2019 15:58 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/bin/cp2sf.bat
- 69246 02-11-2019 12:49 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/jcr-2.0.jar
- 113508 02-11-2019 12:36 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/org.apache.felix.converter-1.0.0.jar
- 12548 02-11-2019 12:36 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/org.osgi.util.function-1.0.0.jar
- 176142 02-11-2019 12:35 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/org.apache.felix.utils-1.11.0.jar
- 155618 03-04-2019 00:12 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/org.apache.felix.configadmin-1.9.12.jar
- 75443 03-05-2019 14:58 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/plexus-io-3.1.1.jar
- 57954 02-11-2019 12:39 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/snappy-0.4.jar
- 148098 02-11-2019 12:39 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/xbean-reflect-3.7.jar
- 3808 03-13-2019 15:58 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/bin/cp2sf
- 214788 02-11-2019 15:44 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/commons-io-2.6.jar
- 26081 02-11-2019 12:36 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/geronimo-json_1.0_spec-1.0-alpha-1.jar
- 90358 02-11-2019 12:35 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/johnzon-core-1.0.0.jar
- 14769 02-11-2019 12:35 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/org.osgi.annotation.versioning-1.0.0.jar
- 475256 02-11-2019 12:35 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/osgi.core-6.0.0.jar
- 28688 02-11-2019 12:48 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/slf4j-api-1.7.6.jar
- 28561 02-28-2019 14:55 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/jackrabbit-spi-2.19.1.jar
- 403186 02-28-2019 14:55 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/jackrabbit-jcr-commons-2.19.1.jar
- 49017 03-04-2019 15:12 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/jackrabbit-api-2.19.1.jar
- 260371 03-05-2019 14:58 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/plexus-utils-3.1.1.jar
- 639592 02-11-2019 12:39 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/google-collections-1.0.jar
- 10684 02-11-2019 12:48 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/slf4j-simple-1.7.6.jar
- 164159 02-11-2019 12:48 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/org.apache.sling.feature.io-1.0.0.jar
- 289040 02-11-2019 12:36 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/org.apache.felix.configurator-1.0.4.jar
- 591748 02-11-2019 15:45 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/commons-compress-1.18.jar
- 242435 02-27-2019 15:58 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/picocli-3.6.0.jar
- 115238 02-11-2019 12:48 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/org.apache.sling.feature-1.0.0.jar
- 18587 02-11-2019 15:46 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/annotations-16.0.3.jar
- 191914 03-05-2019 14:58 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/plexus-archiver-4.1.0.jar
- 229982 03-05-2019 17:31 org.apache.sling.cp2fm-0.0.1-SNAPSHOT/lib/plexus-container-default-2.0.0.jar
+ 0 03-13-2019 15:58 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/
+ 0 03-13-2019 15:58 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/bin/
+ 0 03-13-2019 15:58 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/
+ 4605 02-27-2019 16:30 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/README.md
+ 801904 02-28-2019 14:55 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/jackrabbit-spi-commons-2.19.1.jar
+ 14744 02-11-2019 15:44 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/osgi.annotation-6.0.1.jar
+ 35919 02-11-2019 15:44 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/org.osgi.service.component.annotations-1.3.0.jar
+ 23575 02-11-2019 15:44 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/org.osgi.service.metatype.annotations-1.3.0.jar
+ 34518 02-27-2019 15:28 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/org.apache.felix.scr.annotations-1.11.0.jar
+ 45199 03-13-2019 15:58 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT.jar
+ 17489 03-13-2019 15:58 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/LICENSE
+ 588337 02-11-2019 12:49 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/commons-collections-3.2.2.jar
+ 108555 02-11-2019 15:45 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/xz-1.8.jar
+ 52873 03-05-2019 17:31 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/plexus-classworlds-2.6.0.jar
+ 165965 03-05-2019 18:02 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/maven-model-3.6.0.jar
+ 178 02-27-2019 15:56 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/NOTICE
+ 745712 02-28-2019 10:02 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/org.apache.jackrabbit.vault-3.2.6.jar
+ 2374421 02-27-2019 15:28 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/biz.aQute.bndlib-3.2.0.jar
+ 3263 03-13-2019 15:58 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/bin/cp2sf.bat
+ 69246 02-11-2019 12:49 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/jcr-2.0.jar
+ 113508 02-11-2019 12:36 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/org.apache.felix.converter-1.0.0.jar
+ 12548 02-11-2019 12:36 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/org.osgi.util.function-1.0.0.jar
+ 176142 02-11-2019 12:35 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/org.apache.felix.utils-1.11.0.jar
+ 155618 03-04-2019 00:12 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/org.apache.felix.configadmin-1.9.12.jar
+ 75443 03-05-2019 14:58 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/plexus-io-3.1.1.jar
+ 57954 02-11-2019 12:39 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/snappy-0.4.jar
+ 148098 02-11-2019 12:39 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/xbean-reflect-3.7.jar
+ 3808 03-13-2019 15:58 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/bin/cp2sf
+ 214788 02-11-2019 15:44 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/commons-io-2.6.jar
+ 26081 02-11-2019 12:36 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/geronimo-json_1.0_spec-1.0-alpha-1.jar
+ 90358 02-11-2019 12:35 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/johnzon-core-1.0.0.jar
+ 14769 02-11-2019 12:35 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/org.osgi.annotation.versioning-1.0.0.jar
+ 475256 02-11-2019 12:35 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/osgi.core-6.0.0.jar
+ 28688 02-11-2019 12:48 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/slf4j-api-1.7.6.jar
+ 28561 02-28-2019 14:55 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/jackrabbit-spi-2.19.1.jar
+ 403186 02-28-2019 14:55 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/jackrabbit-jcr-commons-2.19.1.jar
+ 49017 03-04-2019 15:12 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/jackrabbit-api-2.19.1.jar
+ 260371 03-05-2019 14:58 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/plexus-utils-3.1.1.jar
+ 639592 02-11-2019 12:39 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/google-collections-1.0.jar
+ 10684 02-11-2019 12:48 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/slf4j-simple-1.7.6.jar
+ 164159 02-11-2019 12:48 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/org.apache.sling.feature.io-1.0.0.jar
+ 289040 02-11-2019 12:36 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/org.apache.felix.configurator-1.0.4.jar
+ 591748 02-11-2019 15:45 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/commons-compress-1.18.jar
+ 242435 02-27-2019 15:58 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/picocli-3.6.0.jar
+ 115238 02-11-2019 12:48 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/org.apache.sling.feature-1.0.0.jar
+ 18587 02-11-2019 15:46 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/annotations-16.0.3.jar
+ 191914 03-05-2019 14:58 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/plexus-archiver-4.1.0.jar
+ 229982 03-05-2019 17:31 org.apache.sling.feature.cpconverter-0.0.1-SNAPSHOT/lib/plexus-container-default-2.0.0.jar
--------- -------
9914076 48 files
```
diff --git a/content-package-2-feature-model/pom.xml b/content-package-2-feature-model/pom.xml
index a268f81..b7f697c 100644
--- a/content-package-2-feature-model/pom.xml
+++ b/content-package-2-feature-model/pom.xml
@@ -27,7 +27,7 @@
<relativePath />
</parent>
- <artifactId>org.apache.sling.cp2fm</artifactId>
+ <artifactId>org.apache.sling.feature.cpconverter</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>Apache Sling Content Package to Feature Model converter</name>
@@ -226,7 +226,7 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
- <exclude>src/main/resources/META-INF/services/org.apache.sling.cp2fm.spi.EntryHandler</exclude>
+ <exclude>src/main/resources/META-INF/services/org.apache.sling.feature.cpconverter.spi.EntryHandler</exclude>
<exclude>src/main/legal/NOTICE-with-deps</exclude>
</excludes>
</configuration>
@@ -287,7 +287,7 @@
<licenseHeaderFile>${basedir}/src/main/legal/license-header</licenseHeaderFile>
<programs>
<program>
- <mainClass>org.apache.sling.cp2fm.cli.ContentPackage2FeatureModelConverterLauncher</mainClass>
+ <mainClass>org.apache.sling.feature.cpconverter.cli.ContentPackage2FeatureModelConverterLauncher</mainClass>
<name>cp2sf</name>
</program>
</programs>
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/writers/package-info.java b/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/writers/package-info.java
deleted file mode 100644
index 8ba7ef7..0000000
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/writers/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-/**
- * Default implementations of the <i>org.apache.sling.cp2fm.spi.ArtifactWriter</i>.
- */
-package org.apache.sling.cp2fm.writers;
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/ContentPackage2FeatureModelConverter.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
similarity index 97%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/ContentPackage2FeatureModelConverter.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
index e77e44d..32c0197 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/ContentPackage2FeatureModelConverter.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm;
+package org.apache.sling.feature.cpconverter;
import java.io.File;
import java.io.FileWriter;
@@ -35,11 +35,6 @@ import org.apache.jackrabbit.vault.packaging.PackageManager;
import org.apache.jackrabbit.vault.packaging.PackageProperties;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
import org.apache.jackrabbit.vault.packaging.impl.PackageManagerImpl;
-import org.apache.sling.cp2fm.spi.BundlesDeployer;
-import org.apache.sling.cp2fm.spi.EntryHandler;
-import org.apache.sling.cp2fm.vltpkg.VaultPackageAssembler;
-import org.apache.sling.cp2fm.writers.FileArtifactWriter;
-import org.apache.sling.cp2fm.writers.MavenPomSupplierWriter;
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Configuration;
@@ -47,6 +42,11 @@ import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Extensions;
import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.cpconverter.spi.BundlesDeployer;
+import org.apache.sling.feature.cpconverter.spi.EntryHandler;
+import org.apache.sling.feature.cpconverter.vltpkg.VaultPackageAssembler;
+import org.apache.sling.feature.cpconverter.writers.FileArtifactWriter;
+import org.apache.sling.feature.cpconverter.writers.MavenPomSupplierWriter;
import org.apache.sling.feature.io.json.FeatureJSONWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/DefaultBundlesDeployer.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/DefaultBundlesDeployer.java
similarity index 95%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/DefaultBundlesDeployer.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/DefaultBundlesDeployer.java
index 62d94c7..780aed8 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/DefaultBundlesDeployer.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/DefaultBundlesDeployer.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm;
+package org.apache.sling.feature.cpconverter;
import java.io.File;
import java.io.FileOutputStream;
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.util.Objects;
import java.util.StringTokenizer;
-import org.apache.sling.cp2fm.spi.BundlesDeployer;
-import org.apache.sling.cp2fm.spi.ArtifactWriter;
+import org.apache.sling.feature.cpconverter.spi.ArtifactWriter;
+import org.apache.sling.feature.cpconverter.spi.BundlesDeployer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/RegexBasedResourceFilter.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/RegexBasedResourceFilter.java
similarity index 97%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/RegexBasedResourceFilter.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/RegexBasedResourceFilter.java
index 4bf36ac..9535acf 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/RegexBasedResourceFilter.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/RegexBasedResourceFilter.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm;
+package org.apache.sling.feature.cpconverter;
import java.util.LinkedList;
import java.util.List;
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/cli/ContentPackage2FeatureModelConverterLauncher.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncher.java
similarity index 98%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/cli/ContentPackage2FeatureModelConverterLauncher.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncher.java
index 317c91a..7aa7c50 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/cli/ContentPackage2FeatureModelConverterLauncher.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncher.java
@@ -14,12 +14,12 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.cli;
+package org.apache.sling.feature.cpconverter.cli;
import java.io.File;
import java.util.TimeZone;
-import org.apache.sling.cp2fm.ContentPackage2FeatureModelConverter;
+import org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/cli/ShutDownHook.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/cli/ShutDownHook.java
similarity index 98%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/cli/ShutDownHook.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/cli/ShutDownHook.java
index f42a356..0c5d2fc 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/cli/ShutDownHook.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/cli/ShutDownHook.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.cli;
+package org.apache.sling.feature.cpconverter.cli;
import java.util.Date;
import java.util.Formatter;
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/cli/package-info.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/cli/package-info.java
similarity index 94%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/cli/package-info.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/cli/package-info.java
index 3e71f62..63be681 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/cli/package-info.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/cli/package-info.java
@@ -18,4 +18,4 @@
/**
* CLI implementation for the converter.
*/
-package org.apache.sling.cp2fm.cli;
+package org.apache.sling.feature.cpconverter.cli;
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/AbstractConfigurationEntryHandler.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/AbstractConfigurationEntryHandler.java
similarity index 95%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/AbstractConfigurationEntryHandler.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/AbstractConfigurationEntryHandler.java
index 58f3b3e..99ea954 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/AbstractConfigurationEntryHandler.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/AbstractConfigurationEntryHandler.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.handlers;
+package org.apache.sling.feature.cpconverter.handlers;
import java.io.InputStream;
import java.util.Dictionary;
@@ -22,7 +22,7 @@ import java.util.regex.Matcher;
import org.apache.jackrabbit.vault.fs.io.Archive;
import org.apache.jackrabbit.vault.fs.io.Archive.Entry;
-import org.apache.sling.cp2fm.ContentPackage2FeatureModelConverter;
+import org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter;
abstract class AbstractConfigurationEntryHandler extends AbstractRegexEntryHandler {
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/AbstractRegexEntryHandler.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/AbstractRegexEntryHandler.java
similarity index 92%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/AbstractRegexEntryHandler.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/AbstractRegexEntryHandler.java
index f1af1fa..f34d866 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/AbstractRegexEntryHandler.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/AbstractRegexEntryHandler.java
@@ -14,11 +14,11 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.handlers;
+package org.apache.sling.feature.cpconverter.handlers;
import java.util.regex.Pattern;
-import org.apache.sling.cp2fm.spi.EntryHandler;
+import org.apache.sling.feature.cpconverter.spi.EntryHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/BundleEntryHandler.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandler.java
similarity index 89%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/BundleEntryHandler.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandler.java
index e5814b5..884bf06 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/BundleEntryHandler.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandler.java
@@ -14,12 +14,12 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.handlers;
+package org.apache.sling.feature.cpconverter.handlers;
import static org.apache.jackrabbit.vault.packaging.PackageProperties.NAME_VERSION;
-import static org.apache.sling.cp2fm.ContentPackage2FeatureModelConverter.NAME_ARTIFACT_ID;
-import static org.apache.sling.cp2fm.ContentPackage2FeatureModelConverter.NAME_GROUP_ID;
-import static org.apache.sling.cp2fm.ContentPackage2FeatureModelConverter.POM_TYPE;
+import static org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter.NAME_ARTIFACT_ID;
+import static org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter.NAME_GROUP_ID;
+import static org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter.POM_TYPE;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -34,10 +34,10 @@ import java.util.regex.Pattern;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.vault.fs.io.Archive;
import org.apache.jackrabbit.vault.fs.io.Archive.Entry;
-import org.apache.sling.cp2fm.ContentPackage2FeatureModelConverter;
-import org.apache.sling.cp2fm.spi.ArtifactWriter;
-import org.apache.sling.cp2fm.writers.InputStreamArtifactWriter;
-import org.apache.sling.cp2fm.writers.MavenPomSupplierWriter;
+import org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter;
+import org.apache.sling.feature.cpconverter.spi.ArtifactWriter;
+import org.apache.sling.feature.cpconverter.writers.InputStreamArtifactWriter;
+import org.apache.sling.feature.cpconverter.writers.MavenPomSupplierWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/ConfigurationEntryHandler.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/ConfigurationEntryHandler.java
similarity index 95%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/ConfigurationEntryHandler.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/ConfigurationEntryHandler.java
index 594cde2..64c8647 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/ConfigurationEntryHandler.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/ConfigurationEntryHandler.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.handlers;
+package org.apache.sling.feature.cpconverter.handlers;
import java.io.InputStream;
import java.util.Dictionary;
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/ContentPackageEntryHandler.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/ContentPackageEntryHandler.java
similarity index 93%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/ContentPackageEntryHandler.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/ContentPackageEntryHandler.java
index e2eb0a2..c385e05 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/ContentPackageEntryHandler.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/ContentPackageEntryHandler.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.handlers;
+package org.apache.sling.feature.cpconverter.handlers;
import java.io.File;
import java.io.FileOutputStream;
@@ -24,7 +24,7 @@ import java.io.OutputStream;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.vault.fs.io.Archive;
import org.apache.jackrabbit.vault.fs.io.Archive.Entry;
-import org.apache.sling.cp2fm.ContentPackage2FeatureModelConverter;
+import org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter;
public final class ContentPackageEntryHandler extends AbstractRegexEntryHandler {
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/JsonConfigurationEntryHandler.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/JsonConfigurationEntryHandler.java
similarity index 98%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/JsonConfigurationEntryHandler.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/JsonConfigurationEntryHandler.java
index f30d5bb..7ddaf4f 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/JsonConfigurationEntryHandler.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/JsonConfigurationEntryHandler.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.handlers;
+package org.apache.sling.feature.cpconverter.handlers;
import java.io.IOException;
import java.io.InputStream;
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/PropertiesConfigurationEntryHandler.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/PropertiesConfigurationEntryHandler.java
similarity index 97%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/PropertiesConfigurationEntryHandler.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/PropertiesConfigurationEntryHandler.java
index f784545..faa0dac 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/PropertiesConfigurationEntryHandler.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/PropertiesConfigurationEntryHandler.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.handlers;
+package org.apache.sling.feature.cpconverter.handlers;
import java.io.BufferedInputStream;
import java.io.InputStream;
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/XmlConfigurationEntryHandler.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/XmlConfigurationEntryHandler.java
similarity index 98%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/XmlConfigurationEntryHandler.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/XmlConfigurationEntryHandler.java
index 6505e80..ed6eabe 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/XmlConfigurationEntryHandler.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/XmlConfigurationEntryHandler.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.handlers;
+package org.apache.sling.feature.cpconverter.handlers;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/package-info.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/package-info.java
similarity index 85%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/package-info.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/package-info.java
index 97f1c8c..85df1d5 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/handlers/package-info.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/handlers/package-info.java
@@ -16,8 +16,8 @@
*/
/**
- * Default implementations of the <i>org.apache.sling.cp2fm.spi.EntryHandler</i> service
+ * Default implementations of the <i>org.apache.sling.feature.cpconverter.spi.EntryHandler</i> service
* to handle resources while scanning Apache Jackrabbit Vault packages,
* such as OSGi bundles & configurations and nested content packages.
*/
-package org.apache.sling.cp2fm.handlers;
+package org.apache.sling.feature.cpconverter.handlers;
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/package-info.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/package-info.java
similarity index 95%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/package-info.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/package-info.java
index 90e802d..1af70af 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/package-info.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/package-info.java
@@ -18,4 +18,4 @@
/**
* Content Package to Feature Model converter tool for Apache Sling.
*/
-package org.apache.sling.cp2fm;
+package org.apache.sling.feature.cpconverter;
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/spi/ArtifactWriter.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/spi/ArtifactWriter.java
similarity index 94%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/spi/ArtifactWriter.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/spi/ArtifactWriter.java
index 9d45678..6df9c20 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/spi/ArtifactWriter.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/spi/ArtifactWriter.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.spi;
+package org.apache.sling.feature.cpconverter.spi;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/spi/BundlesDeployer.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/spi/BundlesDeployer.java
similarity index 95%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/spi/BundlesDeployer.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/spi/BundlesDeployer.java
index e692f14..ca64299 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/spi/BundlesDeployer.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/spi/BundlesDeployer.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.spi;
+package org.apache.sling.feature.cpconverter.spi;
import java.io.File;
import java.io.IOException;
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/spi/EntryHandler.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/spi/EntryHandler.java
similarity index 89%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/spi/EntryHandler.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/spi/EntryHandler.java
index 88f7731..51e3835 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/spi/EntryHandler.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/spi/EntryHandler.java
@@ -14,11 +14,11 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.spi;
+package org.apache.sling.feature.cpconverter.spi;
import org.apache.jackrabbit.vault.fs.io.Archive;
import org.apache.jackrabbit.vault.fs.io.Archive.Entry;
-import org.apache.sling.cp2fm.ContentPackage2FeatureModelConverter;
+import org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter;
public interface EntryHandler {
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/spi/package-info.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/spi/package-info.java
similarity index 94%
copy from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/spi/package-info.java
copy to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/spi/package-info.java
index 8633959..4d66b84 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/spi/package-info.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/spi/package-info.java
@@ -18,4 +18,4 @@
/**
* Definition of services that can be plugged at runtime to extend the converter tool.
*/
-package org.apache.sling.cp2fm.spi;
+package org.apache.sling.feature.cpconverter.spi;
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/vltpkg/VaultPackageAssembler.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageAssembler.java
similarity index 92%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/vltpkg/VaultPackageAssembler.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageAssembler.java
index 170bd5d..d5ec573 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/vltpkg/VaultPackageAssembler.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageAssembler.java
@@ -14,11 +14,11 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.vltpkg;
+package org.apache.sling.feature.cpconverter.vltpkg;
-import static org.apache.sling.cp2fm.ContentPackage2FeatureModelConverter.FEATURE_CLASSIFIER;
-import static org.apache.sling.cp2fm.ContentPackage2FeatureModelConverter.NAME_ARTIFACT_ID;
-import static org.apache.sling.cp2fm.ContentPackage2FeatureModelConverter.NAME_GROUP_ID;
+import static org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter.FEATURE_CLASSIFIER;
+import static org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter.NAME_ARTIFACT_ID;
+import static org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter.NAME_GROUP_ID;
import java.io.File;
import java.io.FileInputStream;
@@ -33,8 +33,8 @@ import org.apache.jackrabbit.vault.fs.io.Archive;
import org.apache.jackrabbit.vault.fs.io.Archive.Entry;
import org.apache.jackrabbit.vault.packaging.PackageProperties;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
-import org.apache.sling.cp2fm.ContentPackage2FeatureModelConverter;
-import org.apache.sling.cp2fm.spi.EntryHandler;
+import org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter;
+import org.apache.sling.feature.cpconverter.spi.EntryHandler;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.util.DefaultFileSet;
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/vltpkg/package-info.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/package-info.java
similarity index 94%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/vltpkg/package-info.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/package-info.java
index 0df723f..eab6ead 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/vltpkg/package-info.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/package-info.java
@@ -18,4 +18,4 @@
/**
* Easy to use Apache Jackrabbit Vault packager.
*/
-package org.apache.sling.cp2fm.vltpkg;
+package org.apache.sling.feature.cpconverter.vltpkg;
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/writers/FileArtifactWriter.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/writers/FileArtifactWriter.java
similarity index 92%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/writers/FileArtifactWriter.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/writers/FileArtifactWriter.java
index f9d461d..c70bc8e 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/writers/FileArtifactWriter.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/writers/FileArtifactWriter.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.writers;
+package org.apache.sling.feature.cpconverter.writers;
import java.io.File;
import java.io.FileInputStream;
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.sling.cp2fm.spi.ArtifactWriter;
+import org.apache.sling.feature.cpconverter.spi.ArtifactWriter;
public final class FileArtifactWriter implements ArtifactWriter {
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/writers/InputStreamArtifactWriter.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/writers/InputStreamArtifactWriter.java
similarity index 91%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/writers/InputStreamArtifactWriter.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/writers/InputStreamArtifactWriter.java
index 4f94e92..3092c0f 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/writers/InputStreamArtifactWriter.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/writers/InputStreamArtifactWriter.java
@@ -14,14 +14,14 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.writers;
+package org.apache.sling.feature.cpconverter.writers;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import org.apache.commons.io.IOUtils;
-import org.apache.sling.cp2fm.spi.ArtifactWriter;
+import org.apache.sling.feature.cpconverter.spi.ArtifactWriter;
public class InputStreamArtifactWriter implements ArtifactWriter {
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/writers/MavenPomSupplierWriter.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/writers/MavenPomSupplierWriter.java
similarity index 93%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/writers/MavenPomSupplierWriter.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/writers/MavenPomSupplierWriter.java
index 9a7c3e4..69f8f9b 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/writers/MavenPomSupplierWriter.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/writers/MavenPomSupplierWriter.java
@@ -14,14 +14,14 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.writers;
+package org.apache.sling.feature.cpconverter.writers;
import java.io.IOException;
import java.io.OutputStream;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
-import org.apache.sling.cp2fm.spi.ArtifactWriter;
+import org.apache.sling.feature.cpconverter.spi.ArtifactWriter;
public final class MavenPomSupplierWriter implements ArtifactWriter {
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/spi/package-info.java b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/writers/package-info.java
similarity index 84%
rename from content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/spi/package-info.java
rename to content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/writers/package-info.java
index 8633959..103359d 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/spi/package-info.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/feature/cpconverter/writers/package-info.java
@@ -16,6 +16,6 @@
*/
/**
- * Definition of services that can be plugged at runtime to extend the converter tool.
+ * Default implementations of the <i>org.apache.sling.feature.cpconverter.spi.ArtifactWriter</i>.
*/
-package org.apache.sling.cp2fm.spi;
+package org.apache.sling.feature.cpconverter.writers;
diff --git a/content-package-2-feature-model/src/main/resources/META-INF/services/org.apache.sling.cp2fm.spi.EntryHandler b/content-package-2-feature-model/src/main/resources/META-INF/services/org.apache.sling.cp2fm.spi.EntryHandler
deleted file mode 100644
index 2e06d7b..0000000
--- a/content-package-2-feature-model/src/main/resources/META-INF/services/org.apache.sling.cp2fm.spi.EntryHandler
+++ /dev/null
@@ -1,6 +0,0 @@
-org.apache.sling.cp2fm.handlers.BundleEntryHandler
-org.apache.sling.cp2fm.handlers.ConfigurationEntryHandler
-org.apache.sling.cp2fm.handlers.ContentPackageEntryHandler
-org.apache.sling.cp2fm.handlers.JsonConfigurationEntryHandler
-org.apache.sling.cp2fm.handlers.PropertiesConfigurationEntryHandler
-org.apache.sling.cp2fm.handlers.XmlConfigurationEntryHandler
diff --git a/content-package-2-feature-model/src/main/resources/META-INF/services/org.apache.sling.feature.cpconverter.spi.EntryHandler b/content-package-2-feature-model/src/main/resources/META-INF/services/org.apache.sling.feature.cpconverter.spi.EntryHandler
new file mode 100644
index 0000000..dfa616c
--- /dev/null
+++ b/content-package-2-feature-model/src/main/resources/META-INF/services/org.apache.sling.feature.cpconverter.spi.EntryHandler
@@ -0,0 +1,6 @@
+org.apache.sling.feature.cpconverter.handlers.BundleEntryHandler
+org.apache.sling.feature.cpconverter.handlers.ConfigurationEntryHandler
+org.apache.sling.feature.cpconverter.handlers.ContentPackageEntryHandler
+org.apache.sling.feature.cpconverter.handlers.JsonConfigurationEntryHandler
+org.apache.sling.feature.cpconverter.handlers.PropertiesConfigurationEntryHandler
+org.apache.sling.feature.cpconverter.handlers.XmlConfigurationEntryHandler
diff --git a/content-package-2-feature-model/src/main/resources/org/apache/sling/cp2fm/vltpkg/config.xml b/content-package-2-feature-model/src/main/resources/org/apache/sling/feature/cpconverter/vltpkg/config.xml
similarity index 100%
rename from content-package-2-feature-model/src/main/resources/org/apache/sling/cp2fm/vltpkg/config.xml
rename to content-package-2-feature-model/src/main/resources/org/apache/sling/feature/cpconverter/vltpkg/config.xml
diff --git a/content-package-2-feature-model/src/main/resources/org/apache/sling/cp2fm/vltpkg/definition/.content.xml b/content-package-2-feature-model/src/main/resources/org/apache/sling/feature/cpconverter/vltpkg/definition/.content.xml
similarity index 100%
rename from content-package-2-feature-model/src/main/resources/org/apache/sling/cp2fm/vltpkg/definition/.content.xml
rename to content-package-2-feature-model/src/main/resources/org/apache/sling/feature/cpconverter/vltpkg/definition/.content.xml
diff --git a/content-package-2-feature-model/src/main/resources/org/apache/sling/cp2fm/vltpkg/settings.xml b/content-package-2-feature-model/src/main/resources/org/apache/sling/feature/cpconverter/vltpkg/settings.xml
similarity index 100%
rename from content-package-2-feature-model/src/main/resources/org/apache/sling/cp2fm/vltpkg/settings.xml
rename to content-package-2-feature-model/src/main/resources/org/apache/sling/feature/cpconverter/vltpkg/settings.xml
diff --git a/content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/ContentPackage2FeatureModelConverterTest.java b/content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverterTest.java
similarity index 99%
rename from content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/ContentPackage2FeatureModelConverterTest.java
rename to content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverterTest.java
index 153fae8..0514504 100644
--- a/content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/ContentPackage2FeatureModelConverterTest.java
+++ b/content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverterTest.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm;
+package org.apache.sling.feature.cpconverter;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
diff --git a/content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/DefaultBundlesDeployerTest.java b/content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/DefaultBundlesDeployerTest.java
similarity index 94%
rename from content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/DefaultBundlesDeployerTest.java
rename to content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/DefaultBundlesDeployerTest.java
index ae5cb2c..1fe0429 100644
--- a/content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/DefaultBundlesDeployerTest.java
+++ b/content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/DefaultBundlesDeployerTest.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm;
+package org.apache.sling.feature.cpconverter;
import static org.junit.Assert.*;
@@ -22,8 +22,8 @@ import static org.mockito.Mockito.mock;
import java.io.File;
-import org.apache.sling.cp2fm.spi.BundlesDeployer;
-import org.apache.sling.cp2fm.spi.ArtifactWriter;
+import org.apache.sling.feature.cpconverter.spi.ArtifactWriter;
+import org.apache.sling.feature.cpconverter.spi.BundlesDeployer;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/RegexBasedResourceFilterTest.java b/content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/RegexBasedResourceFilterTest.java
similarity index 98%
rename from content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/RegexBasedResourceFilterTest.java
rename to content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/RegexBasedResourceFilterTest.java
index 477079a..346d4f7 100644
--- a/content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/RegexBasedResourceFilterTest.java
+++ b/content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/RegexBasedResourceFilterTest.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm;
+package org.apache.sling.feature.cpconverter;
import static org.junit.Assert.*;
diff --git a/content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/handlers/BundleEntryHandlerTest.java b/content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandlerTest.java
similarity index 94%
rename from content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/handlers/BundleEntryHandlerTest.java
rename to content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandlerTest.java
index f86f4cc..8753d61 100644
--- a/content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/handlers/BundleEntryHandlerTest.java
+++ b/content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandlerTest.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.handlers;
+package org.apache.sling.feature.cpconverter.handlers;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -32,11 +32,11 @@ import java.util.Collection;
import org.apache.jackrabbit.vault.fs.io.Archive;
import org.apache.jackrabbit.vault.fs.io.Archive.Entry;
-import org.apache.sling.cp2fm.ContentPackage2FeatureModelConverter;
-import org.apache.sling.cp2fm.DefaultBundlesDeployer;
-import org.apache.sling.cp2fm.spi.EntryHandler;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter;
+import org.apache.sling.feature.cpconverter.DefaultBundlesDeployer;
+import org.apache.sling.feature.cpconverter.spi.EntryHandler;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/handlers/ConfigurationEntryHandlerTest.java b/content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/handlers/ConfigurationEntryHandlerTest.java
similarity index 97%
rename from content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/handlers/ConfigurationEntryHandlerTest.java
rename to content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/handlers/ConfigurationEntryHandlerTest.java
index 3c329d1..649a07f 100644
--- a/content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/handlers/ConfigurationEntryHandlerTest.java
+++ b/content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/handlers/ConfigurationEntryHandlerTest.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.handlers;
+package org.apache.sling.feature.cpconverter.handlers;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -31,11 +31,11 @@ import java.util.Collection;
import org.apache.jackrabbit.vault.fs.io.Archive;
import org.apache.jackrabbit.vault.fs.io.Archive.Entry;
-import org.apache.sling.cp2fm.ContentPackage2FeatureModelConverter;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Configuration;
import org.apache.sling.feature.Configurations;
import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/handlers/ContentPackageEntryHandlerTest.java b/content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/handlers/ContentPackageEntryHandlerTest.java
similarity index 93%
rename from content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/handlers/ContentPackageEntryHandlerTest.java
rename to content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/handlers/ContentPackageEntryHandlerTest.java
index 013cf53..185bce0 100644
--- a/content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/handlers/ContentPackageEntryHandlerTest.java
+++ b/content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/handlers/ContentPackageEntryHandlerTest.java
@@ -14,12 +14,12 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.handlers;
+package org.apache.sling.feature.cpconverter.handlers;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import org.apache.sling.cp2fm.spi.EntryHandler;
+import org.apache.sling.feature.cpconverter.spi.EntryHandler;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/handlers/JsonConfigurationEntryHandlerTest.java b/content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/handlers/JsonConfigurationEntryHandlerTest.java
similarity index 93%
rename from content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/handlers/JsonConfigurationEntryHandlerTest.java
rename to content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/handlers/JsonConfigurationEntryHandlerTest.java
index ffc2ea3..8289cd5 100644
--- a/content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/handlers/JsonConfigurationEntryHandlerTest.java
+++ b/content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/handlers/JsonConfigurationEntryHandlerTest.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.handlers;
+package org.apache.sling.feature.cpconverter.handlers;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -23,7 +23,7 @@ import java.io.IOException;
import org.apache.jackrabbit.vault.fs.io.Archive;
import org.apache.jackrabbit.vault.fs.io.Archive.Entry;
-import org.apache.sling.cp2fm.ContentPackage2FeatureModelConverter;
+import org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter;
import org.junit.Test;
public class JsonConfigurationEntryHandlerTest {
diff --git a/content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/vltpkg/VaultPackageAssemblerTest.java b/content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageAssemblerTest.java
similarity index 96%
rename from content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/vltpkg/VaultPackageAssemblerTest.java
rename to content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageAssemblerTest.java
index c3bc689..d2aa3cc 100644
--- a/content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/vltpkg/VaultPackageAssemblerTest.java
+++ b/content-package-2-feature-model/src/test/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageAssemblerTest.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.cp2fm.vltpkg;
+package org.apache.sling.feature.cpconverter.vltpkg;
import static org.junit.Assert.assertNotNull;
@@ -28,6 +28,7 @@ import java.util.zip.ZipFile;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
import org.apache.jackrabbit.vault.packaging.impl.PackageManagerImpl;
+import org.apache.sling.feature.cpconverter.vltpkg.VaultPackageAssembler;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/.content.xml b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/.content.xml
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/.content.xml
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/.content.xml
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.config b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config.author/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.config
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.config
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config.author/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.config
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config.publish/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.config b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config.publish/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.config
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config.publish/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.config
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config.publish/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.config
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.INVALID.cfg.json b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.INVALID.cfg.json
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.INVALID.cfg.json
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.INVALID.cfg.json
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.cfg b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.cfg
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.cfg
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.cfg
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.cfg.json b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.cfg.json
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.cfg.json
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.cfg.json
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config.author/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.config b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.config
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config.author/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.config
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.config
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.empty.cfg b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.empty.cfg
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.empty.cfg
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.empty.cfg
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.empty.cfg.json b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.empty.cfg.json
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.empty.cfg.json
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.empty.cfg.json
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.empty.config b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.empty.config
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.empty.config
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.empty.config
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.empty.xml b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.empty.xml
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.empty.xml
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.empty.xml
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.empty.xml.cfg b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.empty.xml.cfg
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.empty.xml.cfg
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.empty.xml.cfg
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.xml b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.xml
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.xml
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.xml
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.xml.cfg b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.xml.cfg
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.xml.cfg
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.xml.cfg
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/install/test-framework.jar b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/install.author/test-framework.jar
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/install/test-framework.jar
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/install.author/test-framework.jar
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/install.publish/test-framework.jar b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/install.publish/test-framework.jar
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/install.publish/test-framework.jar
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/install.publish/test-framework.jar
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/install/test-framework-no-pom.jar b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/install/test-framework-no-pom.jar
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/install/test-framework-no-pom.jar
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/install/test-framework-no-pom.jar
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/install.author/test-framework.jar b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/install/test-framework.jar
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/install.author/test-framework.jar
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/install/test-framework.jar
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/asd/.content.xml b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/asd/.content.xml
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/asd/.content.xml
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/asd/.content.xml
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/asd/public/.content.xml b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/asd/public/.content.xml
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/asd/public/.content.xml
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/asd/public/.content.xml
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/asd/public/_rep_policy.xml b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/asd/public/_rep_policy.xml
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/asd/public/_rep_policy.xml
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/asd/public/_rep_policy.xml
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/asd/public/license.txt b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/asd/public/license.txt
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/asd/public/license.txt
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/asd/public/license.txt
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/test-content-package-unacceptable.zip b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/test-content-package-unacceptable.zip
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/test-content-package-unacceptable.zip
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/test-content-package-unacceptable.zip
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/test-content-package.zip b/content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/test-content-package.zip
similarity index 100%
rename from content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/test-content-package.zip
rename to content-package-2-feature-model/src/test/resources/org/apache/sling/feature/cpconverter/test-content-package.zip