Improve RPM packaging.

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index 10b0eb97f08d051c2b8fea4ccfa0d958fdcfef89..c2fcd54a3e922adfdb537965519d32c3e88ca46b 100644 (file)
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -292,7 +292,7 @@
                                                                        </mappings>
                                                                        <requires>
                                                                                <require>argeo-cms-client-tp</require>
-                                                                               <require>osgi-boot</require>
+                                                                               <require>argeo-osgi-boot</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>

diff --git a/dist/argeo-node/base/share/argeo/selinux/README.txt b/dist/argeo-node/base/share/argeo/selinux/README.txt
deleted file mode 100644 (file)
index de246fa..0000000
--- a/dist/argeo-node/base/share/argeo/selinux/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# In order to use the argeo@<iinstance> systemd services, first execute:
-semodule -i /usr/share/argeo/selinux/argeoctl.pp
\ No newline at end of file

diff --git a/dist/argeo-node/base/share/argeo/selinux/argeoctl.pp b/dist/argeo-node/base/share/argeo/selinux/argeoctl.pp
deleted file mode 100644 (file)
index 2dd583e..0000000
Binary files a/dist/argeo-node/base/share/argeo/selinux/argeoctl.pp and /dev/null differ

diff --git a/dist/argeo-node/base/share/argeo/selinux/argeoctl.te b/dist/argeo-node/base/share/argeo/selinux/argeoctl.te
deleted file mode 100644 (file)
index 5c8007b..0000000
--- a/dist/argeo-node/base/share/argeo/selinux/argeoctl.te
+++ /dev/null
@@ -1,11 +0,0 @@
-
-module argeoctl 1.0;
-
-require {
-       type var_lib_t;
-       type init_t;
-       class lnk_file { getattr read };
-}
-
-#============= init_t ==============
-allow init_t var_lib_t:lnk_file { getattr read };

diff --git a/dist/argeo-node/pom.xml b/dist/argeo-node/pom.xml
index b44fece2de13cf6f2eb3d65d938f563ceb5f8073..53660d9997216ae8e1b0dad68162889a925a6d77 100644 (file)
--- a/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@ -188,7 +188,7 @@
                                                                        </mappings>
                                                                        <requires>
                                                                                <require>argeo-cms-node</require>
-                                                                               <require>osgi-boot</require>
+                                                                               <require>argeo-osgi-boot</require>
                                                                                <!-- do not explicitely require java -->
                                                                        </requires>
                                                                </configuration>

diff --git a/dist/argeo-node/rpm/usr/lib/systemd/system/argeo@.service b/dist/argeo-node/rpm/usr/lib/systemd/system/argeo@.service
index c2fc366ca69419b364e440b64bd8382a5e9dd30a..b310048e15517e234c21b960bf20378ebc944238 100644 (file)
--- a/dist/argeo-node/rpm/usr/lib/systemd/system/argeo@.service
+++ b/dist/argeo-node/rpm/usr/lib/systemd/system/argeo@.service
@@ -12,17 +12,21 @@ CacheDirectory=argeo.d/%I
 WorkingDirectory=/var/lib/argeo.d/%I
 
 ExecStart=/usr/lib/jvm/jre-11/bin/java \
-  -Dlog4j.configuration="file:/etc/argeo.d/log4j.properties" \
-  -Dosgi.configuration.cascaded=true \
-  -Dosgi.sharedConfiguration.area=/usr/share/argeo \
-  -Dosgi.sharedConfiguration.area.readOnly=true \
-  -Dargeo.node.repo.indexesBase=/var/cache/argeo.d/%I/indexes \
-  @/usr/share/osgi/boot/framework.args \
-  @/etc/argeo.d/jvm.args \
-  @/etc/argeo.d/%I/jvm.args \
-  -configuration /var/lib/argeo.d/%I/state \
-  -data /var/lib/argeo.d/%I/data
-#ExecReload=/usr/sbin/argeoctl reload %I
+-Dosgi.configuration.cascaded=true \
+-Dosgi.sharedConfiguration.area=/etc/argeo.d/%I \
+-Dosgi.sharedConfiguration.area.readOnly=true \
+-Dargeo.node.repo.indexesBase=/var/cache/argeo.d/%I/indexes \
+-Dorg.osgi.framework.bootdelegation=com.sun.jndi.ldap,com.sun.jndi.ldap.sasl,com.sun.security.jgss,com.sun.jndi.dns,com.sun.nio.file,com.sun.nio.sctp \
+-Declipse.ignoreApp=true \
+-Dosgi.noShutdown=true \
+-Dorg.eclipse.equinox.http.jetty.autostart=false \
+-Dosgi.bundles=org.argeo.osgi.boot@start \
+@/usr/share/osgi/boot/framework.args \
+@/usr/share/argeo/jvm.args \
+@/etc/argeo.d/jvm.args \
+@/etc/argeo.d/%I/jvm.args \
+-configuration /var/lib/argeo.d/%I/state \
+-data /var/lib/argeo.d/%I/data
 # Exit codes of the JVM when SIGTERM or SIGINT have been caught:
 SuccessExitStatus=143 130
 

diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index a2ad00a6b303f463622690c1d14922251cb2b1d4..713f302eddada72bb9ab39f6a9f307eec51bd39b 100644 (file)
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -69,7 +69,7 @@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>osgi-boot</name>
+                                                                       <name>argeo-osgi-boot</name>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/bin</directory>
@@ -117,7 +117,7 @@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>osgi-boot-equinox</require>
+                                                                               <require>argeo-osgi-boot-equinox</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
@@ -141,7 +141,7 @@
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>osgi-boot-equinox</name>
+                                                                       <name>argeo-osgi-boot-equinox</name>
                                                                        <projversion>${version.argeo-tp}</projversion>
                                                                        <release>${maven.build.timestamp}</release>
                                                                        <mappings>

diff --git a/org.argeo.core/bnd.bnd b/org.argeo.core/bnd.bnd
index 469d8e28610bc6cf388c557347ae724a2a6c99e9..f096e4f29aff6627162d4a30b8e1152cd987f094 100644 (file)
--- a/org.argeo.core/bnd.bnd
+++ b/org.argeo.core/bnd.bnd
@@ -5,4 +5,5 @@ org.apache.jackrabbit.spi,\
 org.apache.jackrabbit.spi2dav,\
 org.apache.jackrabbit.spi2davex,\
 org.apache.jackrabbit.webdav,\
+junit.*;resolution:=optional,\
 *
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index fbc2d287fe77e81f427b5ca009c0208641b2d725..f140e208a59a8765bf2d430ca38f7716f7b656a8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
                <version.argeo-tp>2.1.27</version.argeo-tp>
                <!-- RPM -->
                <argeo.rpm.release>7</argeo.rpm.release>
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
+               <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
                <project.scm.id>code.argeo.org</project.scm.id>
        </properties>
        <modules>