This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch SLING-8913-multiple-instance-types
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
The following commit(s) were added to
refs/heads/SLING-8913-multiple-instance-types by this push:
new edad9c8 Revising the module name and updating to embed feature
launcher to enable launching the standalone JAR
edad9c8 is described below
commit edad9c824105aa2a87513d60d32a66854bf7be54
Author: Dan Klco <[email protected]>
AuthorDate: Sat Jul 25 22:39:41 2020 -0400
Revising the module name and updating to embed feature launcher to enable
launching the standalone JAR
---
feature/pom.xml | 3 +--
feature/src/main/assembly/standalone.xml | 9 ++++++---
feature/src/main/features/boot_boot.json | 2 +-
feature/src/main/features/cms_cms.json | 2 +-
feature/src/main/features/composum_composum-nodes.json | 2 +-
feature/src/main/features/healthcheck_healthcheck.json | 2 +-
feature/src/main/features/launchpad_launchpad.json | 2 +-
feature/src/main/features/oak_oak.json | 2 +-
feature/src/main/features/repoinit_repoinit.json | 2 +-
feature/src/main/features/scripting_sling.json | 2 +-
feature/src/main/features/sling-caconfig_sling-caconfig.json | 2 +-
feature/src/main/features/sling-discovery_sling-discovery.json | 2 +-
feature/src/main/features/sling-event_sling-event.json | 2 +-
.../sling-models-jacksonexporter_models-jacksonexporter.json | 2 +-
feature/src/main/features/sling-validation_sling-validation.json | 2 +-
feature/src/main/features/sling_sling.json | 2 +-
feature/src/main/features/standalone_standalone.json | 2 +-
feature/src/main/features/webapp_webapp.json | 2 +-
feature/src/main/java/org/apache/sling/cms/feature/Main.java | 7 +++----
19 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/feature/pom.xml b/feature/pom.xml
index 4644378..60f0191 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -19,7 +19,7 @@
<version>0.16.3-SNAPSHOT</version>
</parent>
- <artifactId>org.apache.sling.cms.fmconverter</artifactId>
+ <artifactId>org.apache.sling.cms.feature</artifactId>
<name>Apache Sling - CMS Feature Model</name>
<properties>
@@ -174,7 +174,6 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.launcher</artifactId>
<version>1.1.4</version>
- <scope>compile</scope>
</dependency>
</dependencies>
</project>
diff --git a/feature/src/main/assembly/standalone.xml
b/feature/src/main/assembly/standalone.xml
index 127c20c..7656c49 100644
--- a/feature/src/main/assembly/standalone.xml
+++ b/feature/src/main/assembly/standalone.xml
@@ -11,21 +11,24 @@
and limitations under the License.
-->
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0
http://maven.apache.org/xsd/assembly-2.1.0.xsd";>
+
<id>standalone</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>jar</format>
</formats>
+
<dependencySets>
<dependencySet>
<includes>
<include>org.apache.sling:org.apache.sling.feature.launcher</include>
</includes>
- <outputDirectory>lib</outputDirectory>
+ <outputDirectory>/</outputDirectory>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>true</unpack>
</dependencySet>
</dependencySets>
-
<fileSets>
<fileSet>
<directory>${basedir}/target</directory>
@@ -38,7 +41,7 @@
<files>
<file>
-
<source>/target/classes/org/apache/sling/cms/feature/Main.class</source>
+
<source>target/classes/org/apache/sling/cms/feature/Main.class</source>
<outputDirectory>org/apache/sling/cms/feature</outputDirectory>
</file>
<file>
diff --git a/feature/src/main/features/boot_boot.json
b/feature/src/main/features/boot_boot.json
index bf25bdf..9b2a86f 100644
--- a/feature/src/main/features/boot_boot.json
+++ b/feature/src/main/features/boot_boot.json
@@ -1,6 +1,6 @@
{
-
"id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:boot:${cms.version}",
+
"id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:boot:${cms.version}",
"bundles":[
{
"id":"org.apache.aries:org.apache.aries.util:1.1.3",
diff --git a/feature/src/main/features/cms_cms.json
b/feature/src/main/features/cms_cms.json
index 25697c2..27884b7 100644
--- a/feature/src/main/features/cms_cms.json
+++ b/feature/src/main/features/cms_cms.json
@@ -1,6 +1,6 @@
{
-
"id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:cms:${cms.version}",
+
"id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:cms:${cms.version}",
"bundles":[
{
"id":"com.github.livesense:org.liveSense.fragment.sun.misc:1.0.5",
diff --git a/feature/src/main/features/composum_composum-nodes.json
b/feature/src/main/features/composum_composum-nodes.json
index e299f16..0d54fdf 100644
--- a/feature/src/main/features/composum_composum-nodes.json
+++ b/feature/src/main/features/composum_composum-nodes.json
@@ -1,6 +1,6 @@
{
-
"id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:composum_composum-nodes:${cms.version}",
+
"id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:composum_composum-nodes:${cms.version}",
"bundles":[
{
"id":"com.composum.sling.core:composum-sling-core-commons:${composum.version}",
diff --git a/feature/src/main/features/healthcheck_healthcheck.json
b/feature/src/main/features/healthcheck_healthcheck.json
index d60a075..4a67929 100644
--- a/feature/src/main/features/healthcheck_healthcheck.json
+++ b/feature/src/main/features/healthcheck_healthcheck.json
@@ -1,6 +1,6 @@
{
-
"id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:healthcheck:${cms.version}",
+
"id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:healthcheck:${cms.version}",
"bundles":[
{
"id":"org.apache.felix:org.apache.felix.healthcheck.api:2.0.4",
diff --git a/feature/src/main/features/launchpad_launchpad.json
b/feature/src/main/features/launchpad_launchpad.json
index 2d06b41..91aa19b 100644
--- a/feature/src/main/features/launchpad_launchpad.json
+++ b/feature/src/main/features/launchpad_launchpad.json
@@ -1,6 +1,6 @@
{
-
"id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:launchpad:${cms.version}",
+
"id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:launchpad:${cms.version}",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.launchpad.base:6.0.2-2.6.36",
diff --git a/feature/src/main/features/oak_oak.json
b/feature/src/main/features/oak_oak.json
index 6bc504b..b3842d5 100644
--- a/feature/src/main/features/oak_oak.json
+++ b/feature/src/main/features/oak_oak.json
@@ -1,6 +1,6 @@
{
-
"id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:oak:${cms.version}",
+
"id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:oak:${cms.version}",
"bundles":[
{
"id":"org.apache.felix:org.apache.felix.jaas:1.0.2",
diff --git a/feature/src/main/features/repoinit_repoinit.json
b/feature/src/main/features/repoinit_repoinit.json
index 1b74940..86781de 100644
--- a/feature/src/main/features/repoinit_repoinit.json
+++ b/feature/src/main/features/repoinit_repoinit.json
@@ -1,6 +1,6 @@
{
-
"id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:repoinit:${cms.version}",
+
"id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:repoinit:${cms.version}",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.24",
diff --git a/feature/src/main/features/scripting_sling.json
b/feature/src/main/features/scripting_sling.json
index 3510ab0..f882473 100644
--- a/feature/src/main/features/scripting_sling.json
+++ b/feature/src/main/features/scripting_sling.json
@@ -1,6 +1,6 @@
{
-
"id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:scripting_sling:${cms.version}",
+
"id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:scripting_sling:${cms.version}",
"bundles":[
{
"id":"org.antlr:antlr4-runtime:4.7.2",
diff --git a/feature/src/main/features/sling-caconfig_sling-caconfig.json
b/feature/src/main/features/sling-caconfig_sling-caconfig.json
index 739f8cc..1aa5d6b 100644
--- a/feature/src/main/features/sling-caconfig_sling-caconfig.json
+++ b/feature/src/main/features/sling-caconfig_sling-caconfig.json
@@ -1,6 +1,6 @@
{
-
"id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:sling-caconfig:${cms.version}",
+
"id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:sling-caconfig:${cms.version}",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.caconfig.api:1.2.0",
diff --git a/feature/src/main/features/sling-discovery_sling-discovery.json
b/feature/src/main/features/sling-discovery_sling-discovery.json
index 0388d5f..e6c522e 100644
--- a/feature/src/main/features/sling-discovery_sling-discovery.json
+++ b/feature/src/main/features/sling-discovery_sling-discovery.json
@@ -1,6 +1,6 @@
{
-
"id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:sling-discovery:${cms.version}",
+
"id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:sling-discovery:${cms.version}",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.discovery.api:1.0.4",
diff --git a/feature/src/main/features/sling-event_sling-event.json
b/feature/src/main/features/sling-event_sling-event.json
index 3b6990e..c1927a3 100644
--- a/feature/src/main/features/sling-event_sling-event.json
+++ b/feature/src/main/features/sling-event_sling-event.json
@@ -1,6 +1,6 @@
{
-
"id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:sling-event:${cms.version}",
+
"id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:sling-event:${cms.version}",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.event.dea:1.1.4",
diff --git
a/feature/src/main/features/sling-models-jacksonexporter_models-jacksonexporter.json
b/feature/src/main/features/sling-models-jacksonexporter_models-jacksonexporter.json
index e72f722..00bcbf0 100644
---
a/feature/src/main/features/sling-models-jacksonexporter_models-jacksonexporter.json
+++
b/feature/src/main/features/sling-models-jacksonexporter_models-jacksonexporter.json
@@ -1,6 +1,6 @@
{
-
"id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:sling-models-jacksonexporter_models-jacksonexporter:${cms.version}",
+
"id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:sling-models-jacksonexporter_models-jacksonexporter:${cms.version}",
"bundles":[
{
"id":"com.fasterxml.jackson.core:jackson-annotations:${jackson.version}",
diff --git a/feature/src/main/features/sling-validation_sling-validation.json
b/feature/src/main/features/sling-validation_sling-validation.json
index 0c0eca3..df53e3c 100644
--- a/feature/src/main/features/sling-validation_sling-validation.json
+++ b/feature/src/main/features/sling-validation_sling-validation.json
@@ -1,6 +1,6 @@
{
-
"id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:sling-validation:${cms.version}",
+
"id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:sling-validation:${cms.version}",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.models.validation-impl:1.0.0",
diff --git a/feature/src/main/features/sling_sling.json
b/feature/src/main/features/sling_sling.json
index 844fa5b..9c2a3d8 100644
--- a/feature/src/main/features/sling_sling.json
+++ b/feature/src/main/features/sling_sling.json
@@ -1,6 +1,6 @@
{
-
"id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:sling:${cms.version}",
+
"id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:sling:${cms.version}",
"bundles":[
{
"id":"commons-codec:commons-codec:1.14",
diff --git a/feature/src/main/features/standalone_standalone.json
b/feature/src/main/features/standalone_standalone.json
index d40be0a..e3eaae6 100644
--- a/feature/src/main/features/standalone_standalone.json
+++ b/feature/src/main/features/standalone_standalone.json
@@ -1,6 +1,6 @@
{
-
"id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:standalone:${cms.version}",
+
"id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:standalone:${cms.version}",
"bundles":[
{
"id":"org.apache.felix:org.apache.felix.http.jetty:4.0.18",
diff --git a/feature/src/main/features/webapp_webapp.json
b/feature/src/main/features/webapp_webapp.json
index 191ea0b..524d3af 100644
--- a/feature/src/main/features/webapp_webapp.json
+++ b/feature/src/main/features/webapp_webapp.json
@@ -1,4 +1,4 @@
{
-
"id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:webapp:${cms.version}"
+
"id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:webapp:${cms.version}"
}
\ No newline at end of file
diff --git a/feature/src/main/java/org/apache/sling/cms/feature/Main.java
b/feature/src/main/java/org/apache/sling/cms/feature/Main.java
index 4d07560..390c6f3 100644
--- a/feature/src/main/java/org/apache/sling/cms/feature/Main.java
+++ b/feature/src/main/java/org/apache/sling/cms/feature/Main.java
@@ -22,8 +22,6 @@ import java.util.Arrays;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
public class Main {
public static void main(String[] args) throws IOException {
@@ -35,13 +33,14 @@ public class Main {
String version = properties.getProperty("version");
System.out.println("Version "+version);
- URL farUrl =
Main.class.getClassLoader().getResource("lib/org.apache.sling.cms.fmconverter-"+version+"-slingcms_far.far");
- List<String> arguments = new ArrayList();
+ URL farUrl =
Main.class.getClassLoader().getResource("lib/org.apache.sling.cms.feature-"+version+"-slingcms_far.far");
+ List<String> arguments = new ArrayList<>();
arguments.addAll(Arrays.asList(args));
if(!arguments.contains("-f")){
arguments.add("-f");
arguments.add(farUrl.toString());
}
+
org.apache.sling.feature.launcher.impl.Main.main(arguments.toArray(new
String[arguments.size()]));
}
}
\ No newline at end of file
