Fix jar branches

diff --git a/bin/argeo b/bin/argeo
index f3a6d5a2c67e57729c9715e2532189b8939f3e91..3079a0d75e0be54694441ac8b5be8e048f288512 100755 (executable)
--- a/bin/argeo
+++ b/bin/argeo
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Dorg.argeo.api.cli.rootCommand=$0 -jar /usr/local/share/a2/org.argeo.cms/org.argeo.cms.cli.2.3.jar "$@"
\ No newline at end of file
+java -Dorg.argeo.api.cli.rootCommand=$0 -jar /usr/local/share/a2/org.argeo.cms/org.argeo.cms.cli.2.1.jar "$@"
\ No newline at end of file

diff --git a/bin/jshc b/bin/jshc
index 0060646b07ced86b872d5232e5113bab06d3b0c4..57c13a8fae60fa44edc0677c3902e1b4111db3a4 100755 (executable)
--- a/bin/jshc
+++ b/bin/jshc
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Xms32m -Xmx64m -jar /usr/local/share/a2/org.argeo.cms/org.argeo.cms.jshell.2.3.jar "$@"
\ No newline at end of file
+java -Xms32m -Xmx64m -jar /usr/local/share/a2/org.argeo.cms/org.argeo.cms.jshell.2.1.jar "$@"
\ No newline at end of file

diff --git a/lib/systemd/system/argeo@.service b/lib/systemd/system/argeo@.service
index c70ea587ce6cc2249da77d1dd67f48f2d5da38ca..e0acc068a38e01612328a13fe1053972f06c815f 100644 (file)
--- a/lib/systemd/system/argeo@.service
+++ b/lib/systemd/system/argeo@.service
@@ -31,7 +31,7 @@ ExecStart=java \
 @/usr/local/etc/argeo/jvm.args \
 @${CONFIGURATION_DIRECTORY}/../jvm.args \
 @${CONFIGURATION_DIRECTORY}/jvm.args \
--cp "/usr/local/share/a2/osgi/equinox/org.argeo.tp.osgi/org.eclipse.osgi.3.18.jar:/usr/local/share/a2/org.argeo.cms/org.argeo.init.2.3.jar" \
+-cp "/usr/local/share/a2/osgi/equinox/org.argeo.tp.osgi/org.eclipse.osgi.3.18.jar:/usr/local/share/a2/org.argeo.cms/org.argeo.init.2.1.jar" \
 org.argeo.init.ServiceMain
  
 # Exit codes of the JVM when SIGTERM or SIGINT have been caught:

diff --git a/lib/systemd/user/argeo.service b/lib/systemd/user/argeo.service
index f6783f04b0ff91cf9cb4ec1298855c71052ef443..9bfde9e43adb6f1f6bdcd2f34e9460ab580097a2 100644 (file)
--- a/lib/systemd/user/argeo.service
+++ b/lib/systemd/user/argeo.service
@@ -20,7 +20,7 @@ ExecStart=java \
 @/usr/local/etc/argeo/jvm.args \
 @/usr/local/etc/argeo/user/jvm.args \
 @${CONFIGURATION_DIRECTORY}/jvm.args \
--cp "/usr/local/share/a2/osgi/equinox/org.argeo.tp.osgi/org.eclipse.osgi.3.18.jar:/usr/local/share/a2/org.argeo.cms/org.argeo.init.2.3.jar:/usr/local/lib/a2/org.argeo.slc/*:/usr/local/lib/a2/org.argeo.tp.sys/*:/usr/local/lib/a2/swt/rcp/org.argeo.tp.swt/*" \
+-cp "/usr/local/share/a2/osgi/equinox/org.argeo.tp.osgi/org.eclipse.osgi.3.18.jar:/usr/local/share/a2/org.argeo.cms/org.argeo.init.2.1.jar:/usr/local/lib/a2/org.argeo.slc/*:/usr/local/lib/a2/org.argeo.tp.sys/*:/usr/local/lib/a2/swt/rcp/org.argeo.tp.swt/*" \
 org.argeo.init.RuntimeManagerMain \
 etc/argeo/user/slc