Improve RPM build

diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index d71273942c2b9448e9f7c48650563a168f0777d9..810327ce2672b35574132ec4ca61cc2bccb1b753 100644 (file)
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -119,47 +119,45 @@
                        <build>
                                <plugins>
                                        <plugin>
-                                               <groupId>org.apache.maven.plugins</groupId>
-                                               <artifactId>maven-dependency-plugin</artifactId>
+                                               <artifactId>maven-assembly-plugin</artifactId>
                                                <executions>
                                                        <execution>
-                                                               <id>copy-argeo</id>
+                                                               <id>prepare-source</id>
                                                                <phase>package</phase>
                                                                <goals>
-                                                                       <goal>copy-dependencies</goal>
+                                                                       <goal>single</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
-                                                                       <includeGroupIds>org.argeo.slc</includeGroupIds>
-                                                                       <excludeTransitive>true</excludeTransitive>
-                                                                       <excludeArtifactIds>org.argeo.slc.dep.minimal</excludeArtifactIds>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <includeScope>runtime</includeScope>
-                                                                       <useRepositoryLayout>true</useRepositoryLayout>
+                                                                       <descriptorRefs>
+                                                                               <descriptorRef>a2-source</descriptorRef>
+                                                                       </descriptorRefs>
                                                                </configuration>
                                                        </execution>
+                                               </executions>
+                                       </plugin>
+<!--                                   <plugin> -->
+<!--                                           <groupId>org.apache.maven.plugins</groupId> -->
+<!--                                           <artifactId>maven-dependency-plugin</artifactId> -->
+<!--                                           <executions> -->
 <!--                                                   <execution> -->
-<!--                                                           <id>copy-argeo-self</id> -->
+<!--                                                           <id>copy-argeo</id> -->
 <!--                                                           <phase>package</phase> -->
 <!--                                                           <goals> -->
-<!--                                                                   <goal>copy</goal> -->
+<!--                                                                   <goal>copy-dependencies</goal> -->
 <!--                                                           </goals> -->
 <!--                                                           <configuration> -->
+<!--                                                                   <includeTypes>jar</includeTypes> -->
 <!--                                                                   <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
+<!--                                                                   <includeGroupIds>org.argeo.slc</includeGroupIds> -->
+<!--                                                                   <excludeTransitive>true</excludeTransitive> -->
+<!--                                                                   <excludeArtifactIds>org.argeo.slc.dep.minimal</excludeArtifactIds> -->
+<!--                                                                   <includeTypes>jar</includeTypes> -->
+<!--                                                                   <includeScope>runtime</includeScope> -->
 <!--                                                                   <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>
+<!--                                           </executions> -->
+<!--                                   </plugin> -->
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
@@ -181,7 +179,7 @@
                                                                                        <directoryIncluded>true</directoryIncluded>
                                                                                        <sources>
                                                                                                <source>
-                                                                                                       <location>${project.build.directory}/lib-argeo</location>
+                                                                                                       <location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source</location>
                                                                                                        <includes>
                                                                                                                <include>**/*.jar</include>
                                                                                                        </includes>

diff --git a/dep/org.argeo.slc.dep.e4.rap/pom.xml b/dep/org.argeo.slc.dep.e4.rap/pom.xml
index 38b494331c901abef3d37ff5ef1af136f4d6f6d2..f72236391a1717378bcdebdb927b01efe06c545a 100644 (file)
--- a/dep/org.argeo.slc.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.e4.rap/pom.xml
@@ -83,47 +83,45 @@
                        <build>
                                <plugins>
                                        <plugin>
-                                               <groupId>org.apache.maven.plugins</groupId>
-                                               <artifactId>maven-dependency-plugin</artifactId>
+                                               <artifactId>maven-assembly-plugin</artifactId>
                                                <executions>
                                                        <execution>
-                                                               <id>copy-argeo</id>
+                                                               <id>prepare-source</id>
                                                                <phase>package</phase>
                                                                <goals>
-                                                                       <goal>copy-dependencies</goal>
+                                                                       <goal>single</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
-                                                                       <includeGroupIds>org.argeo.slc</includeGroupIds>
-                                                                       <excludeTransitive>true</excludeTransitive>
-                                                                       <excludeArtifactIds>org.argeo.slc.dep.minimal</excludeArtifactIds>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <includeScope>runtime</includeScope>
-                                                                       <useRepositoryLayout>true</useRepositoryLayout>
+                                                                       <descriptorRefs>
+                                                                               <descriptorRef>a2-source</descriptorRef>
+                                                                       </descriptorRefs>
                                                                </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> -->
+<!--                                           <groupId>org.apache.maven.plugins</groupId> -->
+<!--                                           <artifactId>maven-dependency-plugin</artifactId> -->
+<!--                                           <executions> -->
+<!--                                                   <execution> -->
+<!--                                                           <id>copy-argeo</id> -->
+<!--                                                           <phase>package</phase> -->
+<!--                                                           <goals> -->
+<!--                                                                   <goal>copy-dependencies</goal> -->
+<!--                                                           </goals> -->
+<!--                                                           <configuration> -->
+<!--                                                                   <includeTypes>jar</includeTypes> -->
+<!--                                                                   <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
+<!--                                                                   <includeGroupIds>org.argeo.slc</includeGroupIds> -->
+<!--                                                                   <excludeTransitive>true</excludeTransitive> -->
+<!--                                                                   <excludeArtifactIds>org.argeo.slc.dep.minimal</excludeArtifactIds> -->
+<!--                                                                   <includeTypes>jar</includeTypes> -->
+<!--                                                                   <includeScope>runtime</includeScope> -->
+<!--                                                                   <useRepositoryLayout>true</useRepositoryLayout> -->
+<!--                                                           </configuration> -->
+<!--                                                   </execution> -->
+<!--                                           </executions> -->
+<!--                                   </plugin> -->
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
@@ -145,7 +143,7 @@
                                                                                        <directoryIncluded>true</directoryIncluded>
                                                                                        <sources>
                                                                                                <source>
-                                                                                                       <location>${project.build.directory}/lib-argeo</location>
+                                                                                                       <location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source</location>
                                                                                                        <includes>
                                                                                                                <include>**/*.jar</include>
                                                                                                        </includes>

diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml
index 05ddaa1855b87c5e12ecf4356097d3649f9c5cfc..dfe7575d9932830a26614e04e2861906533a6515 100644 (file)
--- a/dep/org.argeo.slc.dep.minimal/pom.xml
+++ b/dep/org.argeo.slc.dep.minimal/pom.xml
@@ -103,28 +103,45 @@
                        <build>
                                <plugins>
                                        <plugin>
-                                               <groupId>org.apache.maven.plugins</groupId>
-                                               <artifactId>maven-dependency-plugin</artifactId>
+                                               <artifactId>maven-assembly-plugin</artifactId>
                                                <executions>
                                                        <execution>
-                                                               <id>copy-argeo</id>
+                                                               <id>prepare-source</id>
                                                                <phase>package</phase>
                                                                <goals>
-                                                                       <goal>copy-dependencies</goal>
+                                                                       <goal>single</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
-                                                                       <includeGroupIds>org.argeo.slc</includeGroupIds>
-                                                                       <excludeTransitive>true</excludeTransitive>
-                                                                       <excludeArtifactIds>org.argeo.dep.cms.node</excludeArtifactIds>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <includeScope>runtime</includeScope>
-                                                                       <useRepositoryLayout>true</useRepositoryLayout>
+                                                                       <descriptorRefs>
+                                                                               <descriptorRef>a2-source</descriptorRef>
+                                                                       </descriptorRefs>
                                                                </configuration>
                                                        </execution>
                                                </executions>
                                        </plugin>
+<!--                                   <plugin> -->
+<!--                                           <groupId>org.apache.maven.plugins</groupId> -->
+<!--                                           <artifactId>maven-dependency-plugin</artifactId> -->
+<!--                                           <executions> -->
+<!--                                                   <execution> -->
+<!--                                                           <id>copy-argeo</id> -->
+<!--                                                           <phase>package</phase> -->
+<!--                                                           <goals> -->
+<!--                                                                   <goal>copy-dependencies</goal> -->
+<!--                                                           </goals> -->
+<!--                                                           <configuration> -->
+<!--                                                                   <includeTypes>jar</includeTypes> -->
+<!--                                                                   <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
+<!--                                                                   <includeGroupIds>org.argeo.slc</includeGroupIds> -->
+<!--                                                                   <excludeTransitive>true</excludeTransitive> -->
+<!--                                                                   <excludeArtifactIds>org.argeo.dep.cms.node</excludeArtifactIds> -->
+<!--                                                                   <includeTypes>jar</includeTypes> -->
+<!--                                                                   <includeScope>runtime</includeScope> -->
+<!--                                                                   <useRepositoryLayout>true</useRepositoryLayout> -->
+<!--                                                           </configuration> -->
+<!--                                                   </execution> -->
+<!--                                           </executions> -->
+<!--                                   </plugin> -->
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
@@ -146,7 +163,7 @@
                                                                                        <directoryIncluded>true</directoryIncluded>
                                                                                        <sources>
                                                                                                <source>
-                                                                                                       <location>${project.build.directory}/lib-argeo</location>
+                                                                                                       <location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source</location>
                                                                                                        <includes>
                                                                                                                <include>**/*.jar</include>
                                                                                                        </includes>

diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml
index 899266cdd8d238a1b0740e4fde493dc8fb48192a..89a25e573f4a8a340955778140a28c6e7cef5735 100644 (file)
--- a/dist/slc/pom.xml
+++ b/dist/slc/pom.xml
@@ -89,31 +89,31 @@
                        <id>rpmbuild</id>
                        <build>
                                <plugins>
-                                       <plugin>
-                                               <groupId>org.apache.maven.plugins</groupId>
-                                               <artifactId>maven-dependency-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>copy-dependencies-rpm</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>copy</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <stripVersion>true</stripVersion>
-                                                                       <outputDirectory>${project.build.directory}/boot</outputDirectory>
-                                                                       <artifactItems>
-                                                                               <artifactItem>
-                                                                                       <groupId>org.argeo.slc</groupId>
-                                                                                       <artifactId>org.argeo.slc.launcher</artifactId>
-                                                                                       <version>${project.version}</version>
-                                                                               </artifactItem>
-                                                                       </artifactItems>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
+<!--                                   <plugin> -->
+<!--                                           <groupId>org.apache.maven.plugins</groupId> -->
+<!--                                           <artifactId>maven-dependency-plugin</artifactId> -->
+<!--                                           <executions> -->
+<!--                                                   <execution> -->
+<!--                                                           <id>copy-dependencies-rpm</id> -->
+<!--                                                           <phase>package</phase> -->
+<!--                                                           <goals> -->
+<!--                                                                   <goal>copy</goal> -->
+<!--                                                           </goals> -->
+<!--                                                           <configuration> -->
+<!--                                                                   <includeTypes>jar</includeTypes> -->
+<!--                                                                   <stripVersion>true</stripVersion> -->
+<!--                                                                   <outputDirectory>${project.build.directory}/boot</outputDirectory> -->
+<!--                                                                   <artifactItems> -->
+<!--                                                                           <artifactItem> -->
+<!--                                                                                   <groupId>org.argeo.slc</groupId> -->
+<!--                                                                                   <artifactId>org.argeo.slc.launcher</artifactId> -->
+<!--                                                                                   <version>${project.version}</version> -->
+<!--                                                                           </artifactItem> -->
+<!--                                                                   </artifactItems> -->
+<!--                                                           </configuration> -->
+<!--                                                   </execution> -->
+<!--                                           </executions> -->
+<!--                                   </plugin> -->
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
@@ -128,7 +128,7 @@
                                                                        <name>slc-repo</name>
                                                                        <mappings>
                                                                                <mapping>
-                                                                                       <directory>/etc/node/conf.d</directory>
+                                                                                       <directory>/etc/argeo/conf.d</directory>
                                                                                        <username>root</username>
                                                                                        <groupname>argeo</groupname>
                                                                                        <filemode>640</filemode>
@@ -136,7 +136,7 @@
                                                                                        <directoryIncluded>false</directoryIncluded>
                                                                                        <sources>
                                                                                                <source>
-                                                                                                       <location>rpm/etc/node/conf.d</location>
+                                                                                                       <location>rpm/etc/argeo/conf.d</location>
                                                                                                        <includes>
                                                                                                                <include>*.ini</include>
                                                                                                                <include>*.txt</include>

diff --git a/dist/slc/rpm/etc/argeo/conf.d/slc-repo.ini b/dist/slc/rpm/etc/argeo/conf.d/slc-repo.ini
new file mode 100644 (file)
index 0000000..db332ea
--- /dev/null
+++ b/dist/slc/rpm/etc/argeo/conf.d/slc-repo.ini
@@ -0,0 +1,6 @@
+argeo.osgi.start.5.slc=\
+org.argeo.slc.agent,\
+org.argeo.slc.agent.jcr,\
+org.argeo.slc.server.repo,\
+
+org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.dist.distributionPerspective

diff --git a/dist/slc/rpm/etc/node/conf.d/slc-repo.ini b/dist/slc/rpm/etc/node/conf.d/slc-repo.ini
deleted file mode 100644 (file)
index 83eecb7..0000000
--- a/dist/slc/rpm/etc/node/conf.d/slc-repo.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-argeo.osgi.start.5.slc=\
-org.argeo.slc.agent,\
-org.argeo.slc.agent.jcr,\
-org.argeo.slc.server.repo,\