This is an automated email from the ASF dual-hosted git repository. andysch pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-kickstart.git
commit 634d4297949c4df8e49da88632add522d37eddba Author: Andreas Schaefer <[email protected]> AuthorDate: Fri Jun 19 19:48:03 2020 -0700 Added an option to run w/o Sling FAR, took version / classifier from default Sling FAR, adjusted Composite Nodestore Scripts Prepared from release 0.04 of kickstart --- Readme.md | 41 +++--- bin/create_seed_fm.sh | 4 +- bin/create_updated_seed_fm.sh | 4 +- bin/run_composite_fm.sh | 4 +- bin/run_updated_composite_fm.sh | 4 +- pom.xml | 6 +- .../sling/kickstart/app/KickstartStarter.java | 49 +++---- ...ing12far.far => org.apache.sling.kickstart.far} | Bin 89413982 -> 89413982 bytes .../resources/standalone/fm/feature-sling12.json | 157 +++++++++++++-------- 9 files changed, 150 insertions(+), 119 deletions(-) diff --git a/Readme.md b/Readme.md index 4bad007..8cf64cc 100644 --- a/Readme.md +++ b/Readme.md @@ -4,6 +4,8 @@ This project is the Feature Model based version of the **sling-org-apache-sling- module and creates an executable JAR file (for now). It is also a test case for the Sling Kickstart Maven Plugin as it uses it to launch a Launchpad Ready Rule and Smoke tests. +The Kickstart is using an embedded Sling Feature Archive to launch Sling and so the +Kicstart can be started w/o having access to the internet. ## Build @@ -26,11 +28,14 @@ That said this project contains the means to update that file if you need to do 1. Checkout the **Sling Starter Project** (sling-org-apache-sling-starter 2. Run the **sling-fm-pom.xml** build with the sling starter path as property ``` -mvn -f sling-fm-pom.xml clean package -Dsling.starter.folder=<path to the sling starter folder> +mvn -f sling-fm-pom.xml clean package -Dsling.starter.folder=<path to the sling starter folder> -P create-far ``` 3. Copy the Sling12 Feature File: **target/slingfeature-tmp/feature-sling12.json** into the -**src/main/resources** folder replacing the old one -4. Build the Kickstart project (see above in **Build**) and then run it (see below in **Usage**) +**src/main/resources/standalone/fm** folder replacing the old one +4. Copy the Sling12 Feature File: **target/org.apache.sling.kickstart-\*.far** into the +**src/main/resources/standalone/far** folder replacing the old one by renaming it to +**org.apache.sling.kickstart.far**. +5. Build the Kickstart project (see above in **Build**) and then run it (see below in **Usage**) ## Usage @@ -65,16 +70,16 @@ the for the Sling Starater. To checkout the usage of the parameters you can use the **help** parameter when starting the kickstarter JAR file: ``` -java -jar org.apache.sling.kickstart-0.0.1-SNAPSHOT.jar -h -Usage: java -jar <Sling Kickstarter JAR File> [-hnv] [-a=<address>] - [-c=<slingHome>] [-f=<logFile>] - [-i=<launcherHome>] - [-j=<controlAddress>] - [-l=<logLevel>] [-p=<port>] - [-r=<contextPath>] - [-s=<mainFeatureFile>] - [-af=<additionalFeatureFile>]... - [-D=<String=String>]... [COMMAND] +java -jar org.apache.sling.kickstart-0.0.4.jar -h +Usage: java -jar <Sling Kickstart JAR File> [-hmnv] [-a=<address>] + [-c=<slingHome>] [-f=<logFile>] + [-j=<controlAddress>] + [-l=<logLevel>] [-p=<port>] + [-r=<contextPath>] + [-s=<mainFeatureFile>] + [-af=<additionalFeatureFile>]... + [-D=<String=String>]... + [-O=<overrides>]... [COMMAND] Apache Sling Kickstart [COMMAND] Optional Command for Server Instance Interaction, can be one of: 'start', 'stop', 'status' or 'threads' @@ -82,20 +87,20 @@ Apache Sling Kickstart -af, --additionalFeature=<additionalFeatureFile> additional feature files -c, --slingHome=<slingHome> - the sling context directory (default sling) + the sling context directory (default launcher) -D, --define=<String=String> sets property n to value v. Make sure to use this option *after* the jar filename. The JVM also has a -D option which has a different meaning -f, --logFile=<logFile> the log file, "-" for stdout (default logs/error.log) -h, --help Display the usage message. - -i, --launcherHome=<launcherHome> - the launcher home directory (default launcher) -j, --control=<controlAddress> host and port to use for control connection in the format '[host:]port' (default 127.0.0.1:0) -l, --logLevel=<logLevel> the initial loglevel (0..4, FATAL, ERROR, WARN, INFO, DEBUG) + -m, --nofar Do not use Sling FAR (if no Main Feature was provided) + and use FM instead -n, --noShutdownHook don't install the shutdown hook -O, --overrides=<overrides> Overrides in format <type>=<value>, type: C = artifact, @@ -121,6 +126,10 @@ which may or may not contain your own project FMs. added to the provided Sling FM (or its override). To add multiple FMs just use multiple *-af* parameter lines. +**-m/--nofar**: do not use the embedded Sling Feature Archive and use the +plain Sling Feature Model. This will greatly increase the launch performance +if most of the dependencies are already in the local Maven repository. + ### Composite Node Store The Kickstart project also comes with the Feature Models and the scripts to run diff --git a/bin/create_seed_fm.sh b/bin/create_seed_fm.sh index 79d25ee..b3eba75 100755 --- a/bin/create_seed_fm.sh +++ b/bin/create_seed_fm.sh @@ -25,7 +25,7 @@ done java -jar \ target/org.apache.sling.kickstart-0.0.3-SNAPSHOT.jar \ - -s src/main/resources/feature-sling12-two-headed.json \ - -af src/main/resources/feature-two-headed-seed.json \ + -s src/main/resources/composite-nodes/feature-sling12-two-headed.json \ + -af src/main/resources/composite-nodes/feature-two-headed-seed.json \ ${additionalFeatures} \ -c sling/sling-composite diff --git a/bin/create_updated_seed_fm.sh b/bin/create_updated_seed_fm.sh index 60ce699..0a9d3c5 100755 --- a/bin/create_updated_seed_fm.sh +++ b/bin/create_updated_seed_fm.sh @@ -30,7 +30,7 @@ fi java -jar \ target/org.apache.sling.kickstart-0.0.3-SNAPSHOT.jar \ - -s src/main/resources/feature-sling12-two-headed.json \ - -af src/main/resources/feature-two-headed-seed.json \ + -s src/main/resources/composite-nodes/feature-sling12-two-headed.json \ + -af src/main/resources/composite-nodes/feature-two-headed-seed.json \ ${additionalFeatures} \ -c sling/sling-composite diff --git a/bin/run_composite_fm.sh b/bin/run_composite_fm.sh index 89cc626..34ed2a4 100755 --- a/bin/run_composite_fm.sh +++ b/bin/run_composite_fm.sh @@ -22,8 +22,8 @@ done java -jar \ target/org.apache.sling.kickstart-0.0.3-SNAPSHOT.jar \ - -s src/main/resources/feature-sling12-two-headed.json \ - -af src/main/resources/feature-two-headed-runtime.json \ + -s src/main/resources/composite-nodes/feature-sling12-two-headed.json \ + -af src/main/resources/composite-nodes/feature-two-headed-runtime.json \ ${additionalFeatures} \ -c sling/sling-composite diff --git a/bin/run_updated_composite_fm.sh b/bin/run_updated_composite_fm.sh index 87c0880..cb8f7bd 100755 --- a/bin/run_updated_composite_fm.sh +++ b/bin/run_updated_composite_fm.sh @@ -27,8 +27,8 @@ fi java -jar \ target/org.apache.sling.kickstart-0.0.3-SNAPSHOT.jar \ - -s src/main/resources/feature-sling12-two-headed.json \ - -af src/main/resources/feature-two-headed-runtime.json \ + -s src/main/resources/composite-nodes/feature-sling12-two-headed.json \ + -af src/main/resources/composite-nodes/feature-two-headed-runtime.json \ ${additionalFeatures} \ -c sling/sling-composite diff --git a/pom.xml b/pom.xml index 797852d..4d9cee8 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.apache.sling</groupId> <artifactId>sling</artifactId> - <version>35</version> + <version>39</version> <relativePath /> </parent> @@ -39,11 +39,11 @@ <properties> <sling.java.version>8</sling.java.version> - <sling-kickstart-maven-plugin.version>0.0.2</sling-kickstart-maven-plugin.version> + <sling-kickstart-maven-plugin.version>0.0.4</sling-kickstart-maven-plugin.version> <slingfeature-maven-plugin.version>1.3.4</slingfeature-maven-plugin.version> <picocli.version>3.9.6</picocli.version> - <org.apache.sling.feature.launcher.version>1.1.3-SNAPSHOT</org.apache.sling.feature.launcher.version> + <org.apache.sling.feature.launcher.version>1.1.4</org.apache.sling.feature.launcher.version> <org.apache.sling.feature.extension.content.version>1.0.6</org.apache.sling.feature.extension.content.version> <org.apache.felix.framework.version>6.0.3</org.apache.felix.framework.version> <commons-io.version>2.6</commons-io.version> diff --git a/src/main/java/org/apache/sling/kickstart/app/KickstartStarter.java b/src/main/java/org/apache/sling/kickstart/app/KickstartStarter.java index 53b76c7..5182aae 100644 --- a/src/main/java/org/apache/sling/kickstart/app/KickstartStarter.java +++ b/src/main/java/org/apache/sling/kickstart/app/KickstartStarter.java @@ -58,6 +58,9 @@ public class KickstartStarter implements Runnable, ControlTarget { @Option(names = { "-s", "--mainFeature" }, description = "main feature file (file path or URL) replacing the provided Sling Feature File", required = false) private String mainFeatureFile; + @Option(names = { "-m", "--nofar" }, description = "Do not use Sling FAR (if no Main Feature was provided) and use FM instead") + private boolean nofar; + @Option(names = { "-af", "--additionalFeature" }, description = "additional feature files", required = false) private List<String> additionalFeatureFile; @@ -73,13 +76,9 @@ public class KickstartStarter implements Runnable, ControlTarget { @Option(names = { "-f", "--logFile" }, description = "the log file, \"-\" for stdout (default logs/error.log)", required = false) private String logFile; - @Option(names = { "-c", "--slingHome" }, description = "the sling context directory (default sling)", required = false) + @Option(names = { "-c", "--slingHome" }, description = "the sling context directory (default launcher)", required = false) private String slingHome; - //AS TODO: does this still apply here - @Option(names = { "-i", "--launcherHome" }, description = "the launcher home directory (default launcher)", required = false) - private String launcherHome; - @Option(names = { "-a", "--address" }, description = "the interface to bind to (use 0.0.0.0 for any)", required = false) private String address; @@ -105,18 +104,6 @@ public class KickstartStarter implements Runnable, ControlTarget { @Parameters(paramLabel = "COMMAND", description = "Optional Command for Server Instance Interaction, can be one of: 'start', 'stop', 'status' or 'threads'", arity = "0..1") private String command; - // The name of the environment variable to consult to find out - // about sling.home - private static final String ENV_SLING_HOME = "SLING_HOME"; - - /** - * The name of the configuration property indicating the socket to use for - * the control connection. The value of this property is either just a port - * number (in which case the host is assumed to be <code>localhost</code>) - * or a host name (or IP address) and port number separated by a colon. - */ - protected static final String PROP_CONTROL_SOCKET = "sling.control.socket"; - /** * The configuration property setting the port on which the HTTP service * listens @@ -134,19 +121,11 @@ public class KickstartStarter implements Runnable, ControlTarget { */ private static final String PROP_HOST = "org.apache.felix.http.host"; - /** - * Name of the configuration property (or system property) indicating - * whether the shutdown hook should be installed or not. If this property is - * not set or set to {@code true} (case insensitive), the shutdown hook - * properly shutting down the framework is installed on startup. Otherwise, - * if this property is set to any value other than {@code true} (case - * insensitive) the shutdown hook is not installed. - * <p> - * The respective command line option is {@code -n}. - */ - private static final String PROP_SHUTDOWN_HOOK = "sling.shutdown.hook"; + /** Path to default Sling Feature Model file **/ + private static final String DEFAULT_SLING_FEATURE_MODEL_FILE_PATH = "/standalone/fm/feature-sling12.json"; - private static final String FEATURE_ARCHIVE_EXTENSION = "far"; + /** Path to default Sling Feature Model feature archive **/ + private static final String DEFAULT_SLING_FEATURE_ARCHIVE_PATH = "/standalone/far/org.apache.sling.kickstart.far"; private boolean started = false; @@ -155,7 +134,11 @@ public class KickstartStarter implements Runnable, ControlTarget { try { URL mainFeatureURL = checkFeatureFile(mainFeatureFile); if(mainFeatureURL == null) { - mainFeatureURL = getClass().getResource("/standalone/far/org.apache.sling.kickstart-0.0.3-SNAPSHOT-sling12far.far"); + if(nofar) { + mainFeatureURL = getClass().getResource(DEFAULT_SLING_FEATURE_MODEL_FILE_PATH); + } else { + mainFeatureURL = getClass().getResource(DEFAULT_SLING_FEATURE_ARCHIVE_PATH); + } } List<String> argumentList = new ArrayList<>(); argumentList.add("-f"); @@ -216,6 +199,12 @@ public class KickstartStarter implements Runnable, ControlTarget { if(StringUtils.isNotEmpty(contextPath)) { addArgument(argumentList, PROP_CONTEXT_PATH, contextPath); } + if(StringUtils.isNotEmpty(slingHome)) { + argumentList.add("-p"); + argumentList.add(slingHome); + argumentList.add("-c"); + argumentList.add(slingHome + "/cache"); + } if(verbose) { argumentList.add("-v"); } diff --git a/src/main/resources/standalone/far/org.apache.sling.kickstart-0.0.3-SNAPSHOT-sling12far.far b/src/main/resources/standalone/far/org.apache.sling.kickstart.far similarity index 99% rename from src/main/resources/standalone/far/org.apache.sling.kickstart-0.0.3-SNAPSHOT-sling12far.far rename to src/main/resources/standalone/far/org.apache.sling.kickstart.far index 8d1e2ce..a0a3508 100644 Binary files a/src/main/resources/standalone/far/org.apache.sling.kickstart-0.0.3-SNAPSHOT-sling12far.far and b/src/main/resources/standalone/far/org.apache.sling.kickstart.far differ diff --git a/src/main/resources/standalone/fm/feature-sling12.json b/src/main/resources/standalone/fm/feature-sling12.json index d31827c..37f386a 100644 --- a/src/main/resources/standalone/fm/feature-sling12.json +++ b/src/main/resources/standalone/fm/feature-sling12.json @@ -1,9 +1,6 @@ { "id":"org.apache.sling:org.apache.sling.kickstart:slingosgifeature:sling12:0.0.3-SNAPSHOT", "title":"Sling 12 Feature Model", - "description":"Complete Sling 12 Feature Model", - "vendor":"The Apache Software Foundation", - "license":"Apache License, Version 2.0", "variables":{ "composum.nodes.version":"1.11.5", "oak.version":"1.26.0", @@ -14,143 +11,178 @@ "bundles":[ { "id":"org.apache.aries:org.apache.aries.util:1.1.3", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.apache.commons:commons-lang3:3.9", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.apache.felix:org.apache.felix.configadmin:1.9.16", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.apache.felix:org.apache.felix.converter:1.0.14", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.apache.felix:org.apache.felix.eventadmin:1.5.0", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.apache.geronimo.specs:geronimo-annotation_1.3_spec:1.1", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.apache.geronimo.specs:geronimo-atinject_1.0_spec:1.1", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:1.1.3", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl:2.2.11_1", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.saaj-impl:1.3.23_2", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.2:2.9.0", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.2:2.9.0", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.apache.servicemix.specs:org.apache.servicemix.specs.saaj-api-1.3:2.8.0", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.apache.sling:org.apache.sling.commons.johnzon:1.2.2", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.apache.sling:org.apache.sling.commons.log:5.1.10", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.apache.sling:org.apache.sling.commons.logservice:1.1.0", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.apache.sling:org.apache.sling.commons.osgi:2.4.0", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.apache.sling:org.apache.sling.installer.core:3.11.2", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { - "id":"org.apache.sling:org.apache.sling.installer.factory.configuration:1.3.0", - "start-order":"1" + "id":"org.apache.sling:org.apache.sling.installer.factory.configuration:1.3.2", + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.apache.sling:org.apache.sling.installer.provider.file:1.2.2", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.apache.sling:org.apache.sling.javax.activation:0.1.0", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.apache.sling:org.apache.sling.settings:1.3.10", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.jvnet.staxex:stax-ex:1.7.6", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.osgi:org.osgi.service.log:1.4.0", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.osgi:org.osgi.util.function:1.1.0", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.osgi:org.osgi.util.promise:1.1.1", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.osgi:org.osgi.util.pushstream:1.0.1", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.slf4j:jcl-over-slf4j:1.7.25", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.slf4j:log4j-over-slf4j:1.7.25", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"org.slf4j:slf4j-api:1.7.25", - "start-order":"1" + "start-order":"1", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT" }, { "id":"com.composum.sling.core:composum-sling-core-commons:1.11.5", - "start-order":"20" + "start-order":"20", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:composum_composum-nodes:0.0.3-SNAPSHOT" }, { "id":"com.composum.sling.core:composum-sling-core-console:1.11.5", - "start-order":"20" + "start-order":"20", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:composum_composum-nodes:0.0.3-SNAPSHOT" }, { "id":"com.composum.sling.core:composum-sling-core-jslibs:1.11.5", - "start-order":"20" + "start-order":"20", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:composum_composum-nodes:0.0.3-SNAPSHOT" }, { "id":"com.composum.sling.core:composum-sling-package-manager:1.11.5", - "start-order":"20" + "start-order":"20", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:composum_composum-nodes:0.0.3-SNAPSHOT" }, { "id":"com.composum.sling.core:composum-sling-user-management:1.11.5", - "start-order":"20" + "start-order":"20", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:composum_composum-nodes:0.0.3-SNAPSHOT" }, { "id":"org.apache.felix:org.apache.felix.healthcheck.api:2.0.2", @@ -439,6 +471,11 @@ "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:sling-models-jacksonexporter_models-jacksonexporter:0.0.3-SNAPSHOT" }, { + "id":"org.apache.sling:org.apache.sling.models.validation-impl:1.0.0", + "start-order":"20", + "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:sling-validation:0.0.3-SNAPSHOT" + }, + { "id":"org.apache.sling:org.apache.sling.validation.api:1.0.0", "start-order":"20", "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:sling-validation:0.0.3-SNAPSHOT" @@ -499,7 +536,7 @@ "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:sling:0.0.3-SNAPSHOT" }, { - "id":"org.apache.sling:org.apache.sling.auth.form:1.0.16", + "id":"org.apache.sling:org.apache.sling.auth.form:1.0.20", "start-order":"20", "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:sling:0.0.3-SNAPSHOT" }, @@ -559,7 +596,7 @@ "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:sling:0.0.3-SNAPSHOT" }, { - "id":"org.apache.sling:org.apache.sling.installer.factory.packages:1.0.2", + "id":"org.apache.sling:org.apache.sling.installer.factory.packages:1.0.4", "start-order":"20", "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:sling:0.0.3-SNAPSHOT" }, @@ -889,10 +926,6 @@ "run-modes":":standalone", "feature-origins":"org.apache.sling:org.apache.sling.kickstart:slingfeature:standalone:0.0.3-SNAPSHOT", "start-order":"5" - }, - { - "id":"org.apache.sling:org.apache.sling.jcr.packageinit:1.0.0", - "start-order":"20" } ], "configurations": { @@ -1164,7 +1197,7 @@ }, "framework-properties":{ "sling.run.mode.install.options":"oak_tar,oak_mongo", - "sling.jre.java.xml":",javax.xml;version=\"2.1.0\",javax.xml.datatype;uses:=\"javax.xml.namespace\";version=\"2.1.0\",javax.xml.namespace;version=\"2.1.0\",javax.xml.parsers;uses:=\"javax.xml.validation,org.w3c.dom,org.xml.sax,org.xml.sax.helpers\";version=\"2.1.0\",javax.xml.stream;uses:=\"javax.xml.namespace,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform\";version=\"1.0.0\",javax.xml.stream.events;uses:=\"javax.xml.namespace,javax.xml.stream\";version=\"1.0.0\",j [...] + "sling.jre.java.xml":",javax.xml;version=\"2.1.0\",javax.xml.datatype;uses:=\"javax.xml.namespace\";version=\"2.1.0\",javax.xml.namespace;version=\"2.1.0\",javax.xml.parsers;uses:=\"javax.xml.validation,org.w3c.dom,org.xml.sax,org.xml.sax.helpers\";version=\"2.1.0\",javax.xml.stream;uses:=\"javax.xml.namespace,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform\";version=\"1.0.0\",javax.xml.stream.events;uses:=\"javax.xml.namespace,javax.xml.stream\";version=\"1.0.0\",j [...] "felix.systempackages.calculate.uses":"true", "localIndexDir":"${sling.home}/repository/index", "org.osgi.framework.system.packages":"org.osgi.framework;version=\"1.9\",org.osgi.framework.dto;version=\"1.8\";uses:=\"org.osgi.dto\",org.osgi.framework.hooks.bundle;version=\"1.1\";uses:=\"org.osgi.framework\",org.osgi.framework.hooks.resolver;version=\"1.0\";uses:=\"org.osgi.framework.wiring\",org.osgi.framework.hooks.service;version=\"1.1\";uses:=\"org.osgi.framework\",org.osgi.framework.hooks.weaving;version=\"1.1\";uses:=\"org.osgi.framework.wiring\",org.osgi.framework.launch;v [...] @@ -1175,22 +1208,22 @@ "sling.jre-1.8":",java.applet;version=\"{dollar}{felix.detect.java.version}\",java.awt;version=\"{dollar}{felix.detect.java.version}\",java.awt.color;version=\"{dollar}{felix.detect.java.version}\",java.awt.datatransfer;version=\"{dollar}{felix.detect.java.version}\",java.awt.dnd;version=\"{dollar}{felix.detect.java.version}\",java.awt.event;version=\"{dollar}{felix.detect.java.version}\",java.awt.font;version=\"{dollar}{felix.detect.java.version}\",java.awt.geom;version=\"{dollar}{f [...] }, "assembled-features:ARTIFACTS|TRANSIENT":[ - "org.apache.sling:org.apache.sling.kickstart:slingosgifeature:sling12:0.0.3-SNAPSHOT", - "org.apache.sling:org.apache.sling.kickstart:slingosgifeature:composum_composum-nodes:0.0.3-SNAPSHOT", - "org.apache.sling:org.apache.sling.kickstart:slingosgifeature:healthcheck:0.0.3-SNAPSHOT", - "org.apache.sling:org.apache.sling.kickstart:slingosgifeature:launchpad:0.0.3-SNAPSHOT", - "org.apache.sling:org.apache.sling.kickstart:slingosgifeature:oak:0.0.3-SNAPSHOT", - "org.apache.sling:org.apache.sling.kickstart:slingosgifeature:repoinit:0.0.3-SNAPSHOT", - "org.apache.sling:org.apache.sling.kickstart:slingosgifeature:scripting_sling:0.0.3-SNAPSHOT", - "org.apache.sling:org.apache.sling.kickstart:slingosgifeature:sling-caconfig:0.0.3-SNAPSHOT", - "org.apache.sling:org.apache.sling.kickstart:slingosgifeature:sling-discovery:0.0.3-SNAPSHOT", - "org.apache.sling:org.apache.sling.kickstart:slingosgifeature:sling-event:0.0.3-SNAPSHOT", - "org.apache.sling:org.apache.sling.kickstart:slingosgifeature:sling-models-jacksonexporter_models-jacksonexporter:0.0.3-SNAPSHOT", - "org.apache.sling:org.apache.sling.kickstart:slingosgifeature:sling-validation:0.0.3-SNAPSHOT", - "org.apache.sling:org.apache.sling.kickstart:slingosgifeature:sling:0.0.3-SNAPSHOT", - "org.apache.sling:org.apache.sling.kickstart:slingosgifeature:sling_slingshot:0.0.3-SNAPSHOT", - "org.apache.sling:org.apache.sling.kickstart:slingosgifeature:standalone:0.0.3-SNAPSHOT", - "org.apache.sling:org.apache.sling.kickstart:slingosgifeature:webapp:0.0.3-SNAPSHOT" + "org.apache.sling:org.apache.sling.kickstart:slingfeature:boot:0.0.3-SNAPSHOT", + "org.apache.sling:org.apache.sling.kickstart:slingfeature:composum_composum-nodes:0.0.3-SNAPSHOT", + "org.apache.sling:org.apache.sling.kickstart:slingfeature:healthcheck:0.0.3-SNAPSHOT", + "org.apache.sling:org.apache.sling.kickstart:slingfeature:launchpad:0.0.3-SNAPSHOT", + "org.apache.sling:org.apache.sling.kickstart:slingfeature:oak:0.0.3-SNAPSHOT", + "org.apache.sling:org.apache.sling.kickstart:slingfeature:repoinit:0.0.3-SNAPSHOT", + "org.apache.sling:org.apache.sling.kickstart:slingfeature:scripting_sling:0.0.3-SNAPSHOT", + "org.apache.sling:org.apache.sling.kickstart:slingfeature:sling-caconfig:0.0.3-SNAPSHOT", + "org.apache.sling:org.apache.sling.kickstart:slingfeature:sling-discovery:0.0.3-SNAPSHOT", + "org.apache.sling:org.apache.sling.kickstart:slingfeature:sling-event:0.0.3-SNAPSHOT", + "org.apache.sling:org.apache.sling.kickstart:slingfeature:sling-models-jacksonexporter_models-jacksonexporter:0.0.3-SNAPSHOT", + "org.apache.sling:org.apache.sling.kickstart:slingfeature:sling-validation:0.0.3-SNAPSHOT", + "org.apache.sling:org.apache.sling.kickstart:slingfeature:sling:0.0.3-SNAPSHOT", + "org.apache.sling:org.apache.sling.kickstart:slingfeature:sling_slingshot:0.0.3-SNAPSHOT", + "org.apache.sling:org.apache.sling.kickstart:slingfeature:standalone:0.0.3-SNAPSHOT", + "org.apache.sling:org.apache.sling.kickstart:slingfeature:webapp:0.0.3-SNAPSHOT" ], "repoinit:TEXT|true":[ "# general",
