This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git
The following commit(s) were added to refs/heads/master by this push:
new 08343e4 cli: adapt to latest feature model
08343e4 is described below
commit 08343e460dcf336c3620ca509aad9751974e9ef0
Author: Robert Munteanu <[email protected]>
AuthorDate: Sat Sep 8 20:22:09 2018 +0200
cli: adapt to latest feature model
---
cli/dist/.gitignore | 1 +
cli/dist/assemble-app.sh | 13 ++++++++++++-
cli/dist/features/clisync.json | 24 ++++++++++--------------
cli/dist/run-app.sh | 11 +++++++++--
4 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/cli/dist/.gitignore b/cli/dist/.gitignore
index 36ca32b..fdc8813 100644
--- a/cli/dist/.gitignore
+++ b/cli/dist/.gitignore
@@ -2,3 +2,4 @@
/launcher/
/sling.json
/cfg/*.cfg
+/bin/
diff --git a/cli/dist/assemble-app.sh b/cli/dist/assemble-app.sh
index b596c29..ab090ea 100755
--- a/cli/dist/assemble-app.sh
+++ b/cli/dist/assemble-app.sh
@@ -2,4 +2,15 @@
rm -rf felix-cache launcher
-java -cp
../../../whiteboard/featuremodel/feature-applicationbuilder/target/org.apache.sling.feature.applicationbuilder-0.0.1-SNAPSHOT.jar:${HOME}/.m2/repository/org/apache/felix/org.apache.felix.framework/5.6.8/org.apache.felix.framework-5.6.8.jar
org.apache.sling.feature.applicationbuilder.impl.Main -d features/ -u
file://${HOME}/.m2/repository,https://repo1.maven.org/maven2/ -o sling.json
+appbuilder_jar=bin/appbuilder.jar
+
+# download application builder, if needed
+if [ ! -f ${appbuilder_jar} ]; then
+ wget
https://repository.apache.org/content/groups/snapshots/org/apache/sling/org.apache.sling.feature.applicationbuilder/0.1.0-SNAPSHOT/org.apache.sling.feature.applicationbuilder-0.1.0-20180906.104203-63.jar
-O ${appbuilder_jar}
+fi
+
+# assemble application
+java -jar ${appbuilder_jar} \
+ -u
file://$HOME/.m2/repository,https://repo.maven.apache.org/maven2,https://repository.apache.org/content/groups/snapshots
\
+ -f features/clisync.json \
+ -o bin/app.json
diff --git a/cli/dist/features/clisync.json b/cli/dist/features/clisync.json
index 27b5b86..bb2f6f8 100644
--- a/cli/dist/features/clisync.json
+++ b/cli/dist/features/clisync.json
@@ -1,9 +1,5 @@
{
- "id": "org.apache.sling.ide/org.apache.sling.ide.cli-dist/1.0.0",
- "variables": {
- "ide.version": "1.2.3-SNAPSHOT",
- "slf4j.version": "1.7.25"
- },
+ "id":
"org.apache.sling.ide/org.apache.sling.ide.cli-dist/1.0.0-SNAPSHOT",
"framework-properties": {
"felix.fileinstall.dir": "cfg"
},
@@ -11,15 +7,15 @@
"org.apache.felix/org.apache.felix.eventadmin/1.4.10",
"org.apache.felix/org.apache.felix.fileinstall/3.6.4",
"org.apache.felix/org.apache.felix.configadmin/1.8.16/",
- "org.slf4j/slf4j-api/${slf4j.version}",
- "org.slf4j/slf4j-simple/${slf4j.version}",
- "org.slf4j/jcl-over-slf4j/${slf4j.version}",
+ "org.slf4j/slf4j-api/1.7.25",
+ "org.slf4j/slf4j-simple/1.7.25",
+ "org.slf4j/jcl-over-slf4j/1.7.25",
"org.apache.felix/org.apache.felix.scr/2.0.14",
- "org.apache.sling.ide/org.apache.sling.ide.api/${ide.version}",
-
"org.apache.sling.ide/org.apache.sling.ide.impl-vlt/${ide.version}",
-
"org.apache.sling.ide/org.apache.sling.ide.sync-fs/${ide.version}",
- "org.apache.sling.ide/org.apache.sling.ide.cli/${ide.version}",
-
"org.apache.sling.ide/org.apache.sling.ide.vlt-wrapper/${ide.version}",
+ "org.apache.sling.ide/org.apache.sling.ide.api/1.2.3-SNAPSHOT",
+
"org.apache.sling.ide/org.apache.sling.ide.impl-vlt/1.2.3-SNAPSHOT",
+
"org.apache.sling.ide/org.apache.sling.ide.sync-fs/1.2.3-SNAPSHOT",
+ "org.apache.sling.ide/org.apache.sling.ide.cli/1.2.3-SNAPSHOT",
+
"org.apache.sling.ide/org.apache.sling.ide.vlt-wrapper/1.2.3-SNAPSHOT",
"javax.servlet/javax.servlet-api/3.1.0",
"commons-collections/commons-collections/3.2.2",
"org.apache.sling/org.apache.sling.fragment.xml/1.0.2",
@@ -34,4 +30,4 @@
"org.jline/jline/3.7.0",
"org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0"
]
-}
\ No newline at end of file
+}
diff --git a/cli/dist/run-app.sh b/cli/dist/run-app.sh
index 4571e12..41a59ce 100755
--- a/cli/dist/run-app.sh
+++ b/cli/dist/run-app.sh
@@ -1,5 +1,12 @@
#!/bin/sh
-rm -rf felix-cache launcher
+launcher_jar=bin/featurelauncher.jar
-java -jar
../../../whiteboard/featuremodel/feature-launcher/target/org.apache.sling.feature.launcher-0.0.1-SNAPSHOT.jar
-a sling.json
+if [ ! -f ${launcher_jar} ]; then
+ wget
https://repository.apache.org/content/groups/snapshots/org/apache/sling/org.apache.sling.feature.launcher/0.1.0-SNAPSHOT/org.apache.sling.feature.launcher-0.1.0-20180906.104202-54.jar
-O ${launcher_jar}
+fi
+
+java -jar ${launcher_jar} \
+ -c $HOME/.m2/repository \
+ -u
file://$HOME/.m2/repository,https://repo.maven.apache.org/maven2,https://repository.apache.org/content/groups/snapshots
\
+ -f bin/app.json
