Improve RPM packaging

git-svn-id: https://svn.argeo.org/slc/trunk@9186 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index d11661355483637f0c945e44dbd3247748d2516a..1c69af5c20efa1b14c87db625ba1ba2c736d44f7 100644 (file)
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>
@@ -113,65 +114,6 @@
                        <version>2.1.5-SNAPSHOT</version>
                        <scope>test</scope>
                </dependency>
-
-               <!-- Third parties (extras) -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.misc</groupId> -->
-<!--                   <artifactId>biz.aQute.bnd</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.misc</groupId> -->
-<!--                   <artifactId>org.junit</artifactId> -->
-<!--           </dependency> -->
-
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.extras</groupId> -->
-<!--                   <artifactId>net.sf.jxl</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.extras</groupId> -->
-<!--                   <artifactId>org.postgresql.postgresql</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.extras</groupId> -->
-<!--                   <artifactId>org.dbunit</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.extras.eclipse</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.api</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.extras.eclipse</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.spi</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.extras.eclipse</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.util</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.extras.eclipse</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.impl</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.extras.eclipse</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.connector.basic</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.extras.eclipse</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.transport.classpath</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.extras.eclipse</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.transport.file</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.extras</groupId> -->
-<!--                   <artifactId>org.redline-rpm</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.extras</groupId> -->
-<!--                   <artifactId>org.tmatesoft.svnkit</artifactId> -->
-<!--           </dependency> -->
        </dependencies>
        <profiles>
                <profile>
@@ -195,23 +137,28 @@
                                                                        <excludeTransitive>true</excludeTransitive>
                                                                        <includeTypes>jar</includeTypes>
                                                                        <includeScope>runtime</includeScope>
+                                                                       <useRepositoryLayout>true</useRepositoryLayout>
                                                                </configuration>
                                                        </execution>
-                                                       <execution>
-                                                               <id>copy-tp</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>copy-dependencies</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <outputDirectory>${project.build.directory}/lib-tp</outputDirectory>
-                                                                       <excludeGroupIds>org.argeo.slc</excludeGroupIds>
-                                                                       <excludeTransitive>true</excludeTransitive>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <includeScope>runtime</includeScope>
-                                                               </configuration>
-                                                       </execution>
+<!--                                                   <execution> -->
+<!--                                                           <id>copy-argeo-self</id> -->
+<!--                                                           <phase>package</phase> -->
+<!--                                                           <goals> -->
+<!--                                                                   <goal>copy</goal> -->
+<!--                                                           </goals> -->
+<!--                                                           <configuration> -->
+<!--                                                                   <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
+<!--                                                                   <useRepositoryLayout>true</useRepositoryLayout> -->
+<!--                                                                   <artifactItems> -->
+<!--                                                                           <artifactItem> -->
+<!--                                                                                   <groupId>${project.groupId}</groupId> -->
+<!--                                                                                   <artifactId>${project.artifactId}</artifactId> -->
+<!--                                                                                   <version>${project.version}</version> -->
+<!--                                                                                   <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
+<!--                                                                           </artifactItem> -->
+<!--                                                                   </artifactItems> -->
+<!--                                                           </configuration> -->
+<!--                                                   </execution> -->
                                                </executions>
                                        </plugin>
                                        <plugin>
@@ -237,11 +184,18 @@
                                                                                                <source>
                                                                                                        <location>${project.build.directory}/lib-argeo</location>
                                                                                                        <includes>
-                                                                                                               <include>*.jar</include>
+                                                                                                               <include>**/*.jar</include>
                                                                                                        </includes>
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
+                                                                               <!-- <mapping> -->
+                                                                               <!-- <directory>/usr/share/osgi</directory> -->
+                                                                               <!-- <username>root</username> -->
+                                                                               <!-- <groupname>root</groupname> -->
+                                                                               <!-- <filemode>644</filemode> -->
+                                                                               <!-- <artifact /> -->
+                                                                               <!-- </mapping> -->
                                                                        </mappings>
                                                                        <requires>
                                                                                <require>argeo-cms-platform</require>
@@ -255,49 +209,5 @@
                                </plugins>
                        </build>
                </profile>
-               <profile>
-                       <id>rpmbuild-tp</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <groupId>org.codehaus.mojo</groupId>
-                                               <artifactId>rpm-maven-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>rpm-tp</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>rpm</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <name>slc-platform-tp</name>
-                                                                       <projversion>${version.argeo-distribution}</projversion>
-                                                                       <mappings>
-                                                                               <mapping>
-                                                                                       <directory>/usr/share/osgi</directory>
-                                                                                       <username>root</username>
-                                                                                       <groupname>root</groupname>
-                                                                                       <filemode>644</filemode>
-                                                                                       <directoryIncluded>false</directoryIncluded>
-                                                                                       <sources>
-                                                                                               <source>
-                                                                                                       <location>${project.build.directory}/lib-tp</location>
-                                                                                                       <includes>
-                                                                                                               <include>*.jar</include>
-                                                                                                       </includes>
-                                                                                               </source>
-                                                                                       </sources>
-                                                                               </mapping>
-                                                                       </mappings>
-                                                                       <requires>
-                                                                               <require>argeo-cms-sdk-tp</require>
-                                                                       </requires>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
        </profiles>
 </project>
\ 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 819cdd9fb0dd2aa6203bfdd79e1c1cd7f6d21e5a..923726b84859d72721e3c81ff2c4cb8f127a57b8 100644 (file)
--- a/dep/org.argeo.slc.dep.minimal/pom.xml
+++ b/dep/org.argeo.slc.dep.minimal/pom.xml
@@ -109,6 +109,7 @@
                                                                        <excludeTransitive>true</excludeTransitive>
                                                                        <includeTypes>jar</includeTypes>
                                                                        <includeScope>runtime</includeScope>
+                                                                       <useRepositoryLayout>true</useRepositoryLayout>
                                                                </configuration>
                                                        </execution>
                                                </executions>
@@ -136,7 +137,7 @@
                                                                                                <source>
                                                                                                        <location>${project.build.directory}/lib-argeo</location>
                                                                                                        <includes>
-                                                                                                               <include>*.jar</include>
+                                                                                                               <include>**/*.jar</include>
                                                                                                        </includes>
                                                                                                </source>
                                                                                        </sources>

diff --git a/dist/slc/src/main/rpm/etc/slc-cl/config.ini b/dist/slc/src/main/rpm/etc/slc-cl/config.ini
index 8da7f7d8d0c3b64f3fcad8b9a6f8bb903b47d954..46da9b6666d4e87c344d6cbcb75b5d7d2ccea1a7 100644 (file)
--- a/dist/slc/src/main/rpm/etc/slc-cl/config.ini
+++ b/dist/slc/src/main/rpm/etc/slc-cl/config.ini
@@ -12,4 +12,5 @@ org.argeo.slc.agent.jcr
 argeo.osgi.bundles=\
 ${user.home}/.slc/modules;in=**;ex=**/.git/**;ex=**/.svn/**,\
 /etc/slc-cl/modules;in=**;ex=**/.git/**;ex=**/.svn/**,\
-/usr/share/osgi;in=*.jar
+/usr/local/share/osgi;in=**/*.jar,\
+/usr/share/osgi;in=**/*.jar

diff --git a/dist/slc/src/main/rpm/etc/slc/config.ini b/dist/slc/src/main/rpm/etc/slc/config.ini
index 7a4c3ea791d8f1d87902acdc25466b33a3a256c0..2f8e1fa9d7c5fe8a754876cef05cf96892de24ed 100644 (file)
--- a/dist/slc/src/main/rpm/etc/slc/config.ini
+++ b/dist/slc/src/main/rpm/etc/slc/config.ini
@@ -35,10 +35,12 @@ osgi.console=2323
 
 # DO NOT CHANGE BELOW UNLESS YOU KNOW WHAT YOU ARE DOING
 osgi.bundles=org.argeo.osgi.boot.jar@start
+argeo.osgi.baseUrl=file:///usr/share/osgi/
+argeo.osgi.distributionUrl=org/argeo/slc/org.argeo.slc.dep.backend/2.1.*/org.argeo.slc.dep.backend-2.1.*.jar
 argeo.osgi.bundles=\
 /etc/slc/modules;in=*,\
-/usr/local/share/slc;in=*.jar,\
-/usr/share/osgi;in=*.jar,\
+/usr/local/share/osgi;in=**/*.jar
+#/usr/share/osgi;in=**/*.jar,\
 
 org.osgi.framework.bootdelegation=com.sun.jndi.ldap