[sling-whiteboard] branch master updated: [cp2fm] updated READMEs

[si...@apache.org]

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 ec981c0  [cp2fm] updated READMEs
ec981c0 is described below

commit ec981c0205561717be81df933c55e7ef368fb168
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Thu Mar 21 10:09:01 2019 +0100

    [cp2fm] updated READMEs
---
 content-package-2-feature-model/README.md          |  5 +++-
 .../src/main/assembly/README.md                    | 28 ++++++++++++++++------
 ...ntentPackage2FeatureModelConverterLauncher.java |  2 +-
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/content-package-2-feature-model/README.md b/content-package-2-feature-model/README.md
index eda5318..a697d98 100644
--- a/content-package-2-feature-model/README.md
+++ b/content-package-2-feature-model/README.md
@@ -339,12 +339,15 @@ once the package is decompressed, open the shell and type:
 ```
 $ ./bin/cp2sf -h
 Usage: cp2fm [-hmqsvX] [-b=<bundlesStartOrder>] -c=<contentPackage>
-             -o=<outputDirectory>
+             -o=<outputDirectory> [-f=<filteringPatterns>]...
 Apache Sling Content Package to Sling Feature converter
   -b, --bundles-start-order=<bundlesStartOrder>
                             The order to start detected bundles.
   -c, --content-package=<contentPackage>
                             The content-package input file.
+  -f, --filtering-patterns=<filteringPatterns>
+                            Regex based pattern(s) to reject content-package archive
+                              entries.
   -h, --help                Display the usage message.
   -m, --merge-configurations
                             Flag to mark OSGi configurations with same PID will be
diff --git a/content-package-2-feature-model/src/main/assembly/README.md b/content-package-2-feature-model/src/main/assembly/README.md
index 2b6f6b3..d5d4cfa 100644
--- a/content-package-2-feature-model/src/main/assembly/README.md
+++ b/content-package-2-feature-model/src/main/assembly/README.md
@@ -99,13 +99,27 @@ The subdirectory `${project.build.finalName}` will be created from the archive.
 
 ```
 $ ./cp2sf -h
-Usage: cp2fm [-hqvX] -cp=<contentPackage>
+Usage: cp2fm [-hmqsvX] [-b=<bundlesStartOrder>] -c=<contentPackage>
+             -o=<outputDirectory> [-f=<filteringPatterns>]...
 Apache Sling Content Package to Sling Feature converter
-      -cp, --content-package=<contentPackage>
-                  The content-package input file.
-  -h, --help      Display the usage message.
-  -q, --quiet     Log errors only.
-  -v, --version   Display version information.
-  -X, --verbose   Produce execution debug output.
+  -b, --bundles-start-order=<bundlesStartOrder>
+                            The order to start detected bundles.
+  -c, --content-package=<contentPackage>
+                            The content-package input file.
+  -f, --filtering-patterns=<filteringPatterns>
+                            Regex based pattern(s) to reject content-package archive
+                              entries.
+  -h, --help                Display the usage message.
+  -m, --merge-configurations
+                            Flag to mark OSGi configurations with same PID will be
+                              merged, the tool will fail otherwise.
+  -o, --output-directory=<outputDirectory>
+                            The output directory where the Feature File and the
+                              bundles will be deployed.
+  -q, --quiet               Log errors only.
+  -s, --strict-validation   Flag to mark the content-package input file being strict
+                              validated.
+  -v, --version             Display version information.
+  -X, --verbose             Produce execution debug output.
 Copyright(c) 2019 The Apache Software Foundation.
 ```
diff --git a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/ContentPackage2FeatureModelConverterLauncher.java b/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/ContentPackage2FeatureModelConverterLauncher.java
index ba6b42e..e4224e1 100644
--- a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/ContentPackage2FeatureModelConverterLauncher.java
+++ b/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/ContentPackage2FeatureModelConverterLauncher.java
@@ -57,7 +57,7 @@ public final class ContentPackage2FeatureModelConverterLauncher implements Runna
     @Option(names = { "-b", "--bundles-start-order" }, description = "The order to start detected bundles.", required = false)
     private int bundlesStartOrder = 0;
 
-    @Option(names = { "-f", "--filtering-patterns" }, description = "Regex based pattern(s) to reject content-package archive entries.", required = false, defaultValue = "")
+    @Option(names = { "-f", "--filtering-patterns" }, description = "Regex based pattern(s) to reject content-package archive entries.", required = false)
     private String[] filteringPatterns;
 
     @Option(names = { "-o", "--output-directory" }, description = "The output directory where the Feature File and the bundles will be deployed.", required = true)