From: Mathieu Baudier Date: Tue, 20 Feb 2018 14:32:17 +0000 (+0100) Subject: Improve RPM deployment X-Git-Tag: argeo-slc-2.1.12~4 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=127db6c714c7a5af2d0c84f096ad50356c2c8389;p=gpl%2Fargeo-slc.git Improve RPM deployment --- diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml index e6feed93b..c12f2fb4a 100644 --- a/dep/org.argeo.slc.dep.backend/pom.xml +++ b/dep/org.argeo.slc.dep.backend/pom.xml @@ -35,11 +35,16 @@ + + + org.argeo.commons + org.argeo.dep.cms.sdk + ${version.argeo-commons} + org.argeo.slc org.argeo.slc.dep.minimal 2.1.12-SNAPSHOT - pom @@ -83,13 +88,6 @@ - - - org.argeo.commons - org.argeo.dep.cms.sdk - ${version.argeo-commons} - - org.argeo.slc @@ -135,6 +133,7 @@ ${project.build.directory}/lib-argeo org.argeo.slc true + org.argeo.slc.dep.minimal jar runtime true diff --git a/dep/org.argeo.slc.dep.eclipse/bnd.bnd b/dep/org.argeo.slc.dep.eclipse/bnd.bnd deleted file mode 100644 index e69de29bb..000000000 diff --git a/dep/org.argeo.slc.dep.eclipse/pom.xml b/dep/org.argeo.slc.dep.eclipse/pom.xml deleted file mode 100644 index 19438887f..000000000 --- a/dep/org.argeo.slc.dep.eclipse/pom.xml +++ /dev/null @@ -1,108 +0,0 @@ - - 4.0.0 - - org.argeo.slc - dep - 2.1.1-SNAPSHOT - .. - - org.argeo.slc.dep.eclipse - SLC Eclipse - - - - org.argeo.maven.plugins - maven-argeo-osgi-plugin - - - generate-descriptors - - descriptors - - generate-resources - - - - - - - - org.argeo.slc - org.argeo.slc.client.ui - 2.1.1-SNAPSHOT - - - org.argeo.slc - org.argeo.slc.client.ui.dist - 2.1.1-SNAPSHOT - - - - - org.argeo.slc - org.argeo.slc.dep.backend - 2.1.1-SNAPSHOT - - - - - rpmbuild - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - process-resources - - copy-dependencies - - - jar - true - ${project.build.directory}/slc-eclipse - - - - - - org.codehaus.mojo - rpm-maven-plugin - - - rpm-slc-eclipse - package - - rpm - - - slc-eclipse - - - /usr/share/osgi/eclipse - root - root - 644 - false - - - ${project.build.directory}/slc-eclipse - - - - - - slc-libs - - - - - - - - - - \ No newline at end of file diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml index ee0d77e7d..af9bbdcf5 100644 --- a/dep/org.argeo.slc.dep.minimal/pom.xml +++ b/dep/org.argeo.slc.dep.minimal/pom.xml @@ -39,6 +39,13 @@ + + + org.argeo.commons + org.argeo.dep.cms.node + ${version.argeo-commons} + + org.argeo.slc @@ -80,12 +87,6 @@ - - - org.argeo.commons - org.argeo.dep.cms.node - ${version.argeo-commons} - @@ -107,6 +108,7 @@ ${project.build.directory}/lib-argeo org.argeo.slc true + org.argeo.dep.cms.node jar runtime true diff --git a/dep/org.argeo.slc.dep.rap/bnd.bnd b/dep/org.argeo.slc.dep.rap/bnd.bnd deleted file mode 100644 index e69de29bb..000000000 diff --git a/dep/org.argeo.slc.dep.rap/p2.inf b/dep/org.argeo.slc.dep.rap/p2.inf deleted file mode 100644 index 0423aa509..000000000 --- a/dep/org.argeo.slc.dep.rap/p2.inf +++ /dev/null @@ -1,2 +0,0 @@ -properties.1.name=org.eclipse.equinox.p2.type.category -properties.1.value=true \ No newline at end of file diff --git a/dep/org.argeo.slc.dep.rap/pom.xml b/dep/org.argeo.slc.dep.rap/pom.xml deleted file mode 100644 index a532ea6a4..000000000 --- a/dep/org.argeo.slc.dep.rap/pom.xml +++ /dev/null @@ -1,170 +0,0 @@ - - 4.0.0 - - org.argeo.slc - dep - 2.1.1-SNAPSHOT - .. - - org.argeo.slc.dep.rap - SLC Eclipse RAP - - - - org.apache.felix - maven-bundle-plugin - - - default - - - - - org.argeo.maven.plugins - maven-argeo-osgi-plugin - - - generate-descriptors - - descriptors - - generate-resources - - - - - - - - org.argeo.slc - org.argeo.slc.dep.eclipse - 2.1.1-SNAPSHOT - - - org.argeo.slc - org.argeo.slc.client.rap - 2.1.1-SNAPSHOT - - - - - org.argeo.slc - org.argeo.slc.unit - 2.1.1-SNAPSHOT - test - - - - - - - - - - - check-osgi - - - - org.argeo.maven.plugins - maven-argeo-osgi-plugin - - - check-osgi - test - - equinox - - - true - - - - - - - - - rpmbuild - - - - org.codehaus.mojo - rpm-maven-plugin - - - rpm-slc-rap - package - - rpm - - - slc-rap - - - /usr/share/osgi/rap - root - root - 644 - false - - - org.argeo.slc:org.argeo.slc.client.rap - - - - - - slc-eclipse - argeo-node-rap - - - - - - - maven-antrun-plugin - - - install - - run - - - - - - - - - - - - - - - - - pdeSources - - - - org.argeo.maven.plugins - maven-argeo-osgi-plugin - - - resolve-pde-sources - - pde-sources - - generate-resources - - - - - - - - \ No newline at end of file diff --git a/dep/org.argeo.slc.dep.rcp/bnd.bnd b/dep/org.argeo.slc.dep.rcp/bnd.bnd deleted file mode 100644 index e69de29bb..000000000 diff --git a/dep/org.argeo.slc.dep.rcp/p2.inf b/dep/org.argeo.slc.dep.rcp/p2.inf deleted file mode 100644 index 0423aa509..000000000 --- a/dep/org.argeo.slc.dep.rcp/p2.inf +++ /dev/null @@ -1,2 +0,0 @@ -properties.1.name=org.eclipse.equinox.p2.type.category -properties.1.value=true \ No newline at end of file diff --git a/dep/org.argeo.slc.dep.rcp/pom.xml b/dep/org.argeo.slc.dep.rcp/pom.xml deleted file mode 100644 index beef1ea53..000000000 --- a/dep/org.argeo.slc.dep.rcp/pom.xml +++ /dev/null @@ -1,201 +0,0 @@ - - 4.0.0 - - org.argeo.slc - dep - 2.1.1-SNAPSHOT - .. - - org.argeo.slc.dep.rcp - SLC Eclipse RCP Dependencies - - - - org.apache.felix - maven-bundle-plugin - - - default - - - - - org.argeo.maven.plugins - maven-argeo-osgi-plugin - - - generate-descriptors - - descriptors - - generate-resources - - - - - - - - - org.argeo.slc - org.argeo.slc.dep.eclipse - 2.1.1-SNAPSHOT - - - org.argeo.slc - org.argeo.slc.client.rcp - 2.1.1-SNAPSHOT - - - - - org.argeo.commons - org.argeo.security.dep.node.rcp - ${version.argeo-commons} - - - - - org.argeo.slc - org.argeo.slc.unit - 2.1.1-SNAPSHOT - test - - - org.argeo.slc - org.argeo.slc.support.maven - 2.1.1-SNAPSHOT - test - - - - - check-osgi - - - - org.argeo.maven.plugins - maven-argeo-osgi-plugin - - - check-osgi - test - - equinox - - - true - - - - - - - - - rpmbuild - - - - org.codehaus.mojo - rpm-maven-plugin - - - rpm-slc-rcp - package - - rpm - - - slc-rcp - - - /usr/share/osgi/rcp - root - root - 644 - false - - - org.argeo.slc:org.argeo.slc.client.rcp - - - - - /usr/bin - root - root - 755 - false - - - src/main/rpm/usr/bin - - - - - /etc/slc-rcp - root - root - 644 - false - - - src/main/rpm/etc/slc-rcp - - - - - - slc-eclipse - argeo-node-rcp - osgi-boot - - - - - - - maven-antrun-plugin - - - install - - run - - - - - - - - - - - - - - - - - pdeSources - - - - org.argeo.maven.plugins - maven-argeo-osgi-plugin - - - resolve-pde-sources - - pde-sources - - generate-resources - - - - - - - - \ No newline at end of file diff --git a/dep/org.argeo.slc.dep.rcp/src/main/rpm/etc/slc-rcp/config.ini b/dep/org.argeo.slc.dep.rcp/src/main/rpm/etc/slc-rcp/config.ini deleted file mode 100644 index 616d504d9..000000000 --- a/dep/org.argeo.slc.dep.rcp/src/main/rpm/etc/slc-rcp/config.ini +++ /dev/null @@ -1,56 +0,0 @@ -argeo.osgi.start=\ -org.springframework.osgi.extender,\ -org.argeo.node.repo.jackrabbit,\ -org.argeo.security.dao.os,\ -org.argeo.slc.node.jackrabbit,\ -org.argeo.slc.agent,\ -org.argeo.slc.agent.jcr,\ - -org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.slcExecutionPerspective - -## LOGGING -log4j.configuration=file:/etc/slc-rcp/log4j.properties - -# TOMCAT PORTS -argeo.server.port.http=17080 -argeo.server.port.https=17083 -argeo.server.port.ajp=17089 - -org.argeo.slc.ui.inTray=true - -# DO NOT CHANGE BELOW UNLESS YOU KNOW WHAT YOU ARE DOING -eclipse.application=org.argeo.slc.client.rcp.application - -osgi.bundles=/usr/share/osgi/boot/org.argeo.osgi.boot.jar@start,\ -org.eclipse.core.runtime@start,\ -org.eclipse.equinox.common@start,\ -com.ibm.icu,\ -org.eclipse.core.commands,\ -org.eclipse.core.contenttype,\ -org.eclipse.core.databinding,\ -org.eclipse.core.databinding.observable,\ -org.eclipse.core.databinding.property,\ -org.eclipse.core.expressions,\ -org.eclipse.core.jobs,\ -org.eclipse.equinox.app,\ -org.eclipse.equinox.launcher,\ -org.eclipse.equinox.preferences,\ -org.eclipse.equinox.registry,\ -org.eclipse.equinox.security,\ -org.eclipse.help,\ -org.eclipse.jface,\ -org.eclipse.jface.databinding,\ -org.eclipse.swt,\ -org.eclipse.swt.gtk.linux.x86_64,\ -org.eclipse.swt.gtk.linux.x86,\ -org.eclipse.ui,\ -org.eclipse.ui.forms,\ -org.eclipse.ui.workbench - -argeo.osgi.bundles=\ -${user.home}/.slc/modules;in=**,\ -/etc/slc-rcp/modules;in=**,\ -/usr/share/slc/lib;in=*.jar,\ -/usr/share/osgi;in=*.jar,\ -/usr/share/osgi/eclipse;in=*.jar,\ -/usr/share/osgi/rcp;in=*.jar,\ diff --git a/dep/org.argeo.slc.dep.rcp/src/main/rpm/etc/slc-rcp/log4j.properties b/dep/org.argeo.slc.dep.rcp/src/main/rpm/etc/slc-rcp/log4j.properties deleted file mode 100644 index 676776b34..000000000 --- a/dep/org.argeo.slc.dep.rcp/src/main/rpm/etc/slc-rcp/log4j.properties +++ /dev/null @@ -1,25 +0,0 @@ -#log4j.rootLogger=WARN, file -log4j.rootLogger=WARN, console - -## Levels -log4j.logger.org.argeo=INFO -#log4j.logger.org.springframework=DEBUG -#log4j.logger.org.hibernate=DEBUG -#log4j.logger.org.apache.activemq=DEBUG - -log4j.logger.org.springframework.web.servlet.PageNotFound=ERROR -log4j.logger.org.apache.directory.server.core.schema.SchemaService=ERROR -log4j.logger.org.springframework.security.SpringSecurityMessageSource=ERROR - -log4j.logger.org.apache.directory.server.core.partition=ERROR -log4j.logger.org.apache.directory.server.core.schema.bootstrap.BootstrapAttributeTypeRegistry=ERROR - -## Appenders -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} [%15.15t] %m - %c%n - -log4j.appender.file=org.apache.log4j.RollingFileAppender -log4j.appender.file.File=/var/log/slc/slc.log -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern= %-5p %d{ISO8601} [%15.15t] %m - %c%n \ No newline at end of file diff --git a/dep/org.argeo.slc.dep.rcp/src/main/rpm/usr/bin/slc-rcp b/dep/org.argeo.slc.dep.rcp/src/main/rpm/usr/bin/slc-rcp deleted file mode 100644 index 928d37fb6..000000000 --- a/dep/org.argeo.slc.dep.rcp/src/main/rpm/usr/bin/slc-rcp +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -JAVA_CMD=/usr/lib/jvm/jre-1.6.0/bin/java -JAVA_OPTS="-client -Xmx256m" - -SLC_HOME_DIR=${HOME}/.slc/ -if [ -f $SLC_HOME_DIR/settings.sh ];then - . $SLC_HOME_DIR/settings.sh -fi - -if [ -d /usr/lib64 ]; -then - LIB_BASE=/usr/lib64 -else - LIB_BASE=/usr/lib -fi -OSGI_FRAMEWORK=$LIB_BASE/eclipse/plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -ECLIPSE_LAUNCHER=$LIB_BASE/eclipse/plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar -INSTALL_DIR=/usr/share/osgi/rcp - -SLC_HOME_DIR=~/.slc -DATA_DIR=$SLC_HOME_DIR/data -CONF_DIR=$SLC_HOME_DIR/conf - -mkdir -p $SLC_HOME_DIR/modules - -if [ ! -f $CONF_DIR/config.ini ]; -then - mkdir -p $CONF_DIR - cp /etc/slc-rcp/config.ini $CONF_DIR -fi - -java -Dosgi.framework=$OSGI_FRAMEWORK \ - -jar $ECLIPSE_LAUNCHER \ - -install $INSTALL_DIR \ - -configuration $CONF_DIR \ - -data $DATA_DIR \ - -clean diff --git a/dep/org.argeo.slc.dep.rcp/src/main/scripts/postinstall b/dep/org.argeo.slc.dep.rcp/src/main/scripts/postinstall deleted file mode 100644 index b9afdaef1..000000000 --- a/dep/org.argeo.slc.dep.rcp/src/main/scripts/postinstall +++ /dev/null @@ -1,32 +0,0 @@ -if [ $1 = "1" ];then - APP=%{name} - -cd /usr/lib64/eclipse/plugins -SOURCE=/usr/lib64/eclipse/plugins -TARGET=/usr/lib64/eclipse-rcp - -org.eclipse.core.commands -org.eclipse.core.contenttype -org.eclipse.core.databinding -org.eclipse.core.databinding.observable -org.eclipse.core.databinding.property -org.eclipse.core.expressions -org.eclipse.core.jobs -org.eclipse.core.runtime -org.eclipse.equinox.app -org.eclipse.equinox.common -org.eclipse.equinox.launcher -org.eclipse.equinox.preferences -org.eclipse.equinox.registry -org.eclipse.equinox.security -org.eclipse.help -org.eclipse.jface -org.eclipse.jface.databinding -org.eclipse.osgi -org.eclipse.swt -org.eclipse.swt.gtk.linux.x86_64 -org.eclipse.ui -org.eclipse.ui.forms -org.eclipse.ui.workbench - -fi \ No newline at end of file diff --git a/dep/pom.xml b/dep/pom.xml index 99963afec..890f99ffd 100644 --- a/dep/pom.xml +++ b/dep/pom.xml @@ -12,9 +12,6 @@ org.argeo.slc.dep.minimal org.argeo.slc.dep.backend - - -