Working SLC RPMs

git-svn-id: https://svn.argeo.org/slc/trunk@8729 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 942f94539642493c9390639c6fcc480915d42286..17b682ca44832b04771f233b09507ab2147af467 100644 (file)
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -36,47 +36,11 @@
                </plugins>
        </build>
        <dependencies>
-               <!-- Absolutely minimal SLC Agent -->
                <dependency>
                        <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.core</artifactId>
+                       <artifactId>org.argeo.slc.dep.minimal</artifactId>
                        <version>2.1.1-SNAPSHOT</version>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.agent</artifactId>
-                       <version>2.1.1-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>${version.argeo-commons}</version>
-               </dependency>
-
-               <!-- CLI Agent -->
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.slc</groupId> -->
-               <!-- <artifactId>org.argeo.slc.launcher</artifactId> -->
-               <!-- <version>1.1.12-SNAPSHOT</version> -->
-               <!-- </dependency> -->
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.slc</groupId> -->
-               <!-- <artifactId>org.argeo.slc.agent.cli</artifactId> -->
-               <!-- <version>2.1.1-SNAPSHOT</version> -->
-               <!-- </dependency> -->
-
-               <!-- JCR Agent -->
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.agent.jcr</artifactId>
-                       <version>2.1.1-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.node.jackrabbit</artifactId>
-                       <version>2.1.1-SNAPSHOT</version>
-               </dependency>
-
 
                <!-- SLC Libs -->
                <!-- <dependency> -->
@@ -202,29 +166,6 @@
                </dependency>
        </dependencies>
        <profiles>
-               <profile>
-                       <id>check-osgi</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <groupId>org.argeo.maven.plugins</groupId>
-                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>check-osgi</id>
-                                                               <phase>test</phase>
-                                                               <goals>
-                                                                       <goal>equinox</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <onlyCheck>true</onlyCheck>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
                <profile>
                        <id>rpmbuild</id>
                        <build>
@@ -295,6 +236,7 @@
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
+                                                                               <require>argeo-cms-platform</require>
                                                                                <require>slc-agent</require>
                                                                                <require>slc-platform-tp</require>
                                                                        </requires>

diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml
index 637a12851328935ec497eca6415f636940b02c3f..cbc7378303fbdeabe1e6a4ac8aa5edbbfc95dd14 100644 (file)
--- a/dep/org.argeo.slc.dep.minimal/pom.xml
+++ b/dep/org.argeo.slc.dep.minimal/pom.xml
@@ -43,18 +43,18 @@
                <!-- Absolutely minimal SLC Agent -->
                <dependency>
                        <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.core</artifactId>
+                       <artifactId>org.argeo.slc.api</artifactId>
                        <version>2.1.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.agent</artifactId>
+                       <artifactId>org.argeo.slc.core</artifactId>
                        <version>2.1.1-SNAPSHOT</version>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>${version.argeo-commons}</version>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.agent</artifactId>
+                       <version>2.1.1-SNAPSHOT</version>
                </dependency>
 
                <!-- CLI Agent -->
@@ -89,29 +89,6 @@
                </dependency>
        </dependencies>
        <profiles>
-               <profile>
-                       <id>check-osgi</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <groupId>org.argeo.maven.plugins</groupId>
-                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>check-osgi</id>
-                                                               <phase>test</phase>
-                                                               <goals>
-                                                                       <goal>equinox</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <onlyCheck>true</onlyCheck>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
                <profile>
                        <id>rpmbuild</id>
                        <build>

diff --git a/dep/pom.xml b/dep/pom.xml
index be1aa597a5ee71efc22d1aff776295a12d008139..c7ca147953df5908dd5022ffc5a9f5943ffa819b 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -25,6 +25,39 @@
                        </plugin>
                </plugins>
        </build>
+       <profiles>
+               <profile>
+                       <id>check-osgi</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.argeo.maven.plugins</groupId>
+                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>check-osgi</id>
+                                                               <phase>test</phase>
+                                                               <goals>
+                                                                       <goal>equinox</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <onlyCheck>true</onlyCheck>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+                       <dependencies>
+                               <dependency>
+                                       <groupId>org.argeo.commons</groupId>
+                                       <artifactId>org.argeo.osgi.boot</artifactId>
+                                       <version>${version.argeo-commons}</version>
+                                       <scope>test</scope>
+                               </dependency>
+                       </dependencies>
+               </profile>
+       </profiles>
 <!--   <profiles> -->
 <!--           <profile> -->
 <!--                   <id>rpmbuild</id> -->

diff --git a/dist/slc/src/main/rpm/etc/slc/config.ini b/dist/slc/src/main/rpm/etc/slc/config.ini
index 36113e65383d054a990aad66c2bd990898ef9123..afa399159c13f61cafe6ac358ba72947aed1110c 100644 (file)
--- a/dist/slc/src/main/rpm/etc/slc/config.ini
+++ b/dist/slc/src/main/rpm/etc/slc/config.ini
@@ -17,26 +17,16 @@ org.argeo.slc.node.jackrabbit,\
 org.argeo.slc.agent,\
 org.argeo.slc.agent.jcr,\
 org.argeo.slc.server.repo,\
-
-org.osgi.framework.security=osgi
-java.security.policy=file:../../all.policy
  
-org.osgi.service.http.port=7070
+org.osgi.service.http.port=7080
 org.eclipse.equinox.http.jetty.log.stderr.threshold=info
 
-log4j.configuration=file:../../log4j.properties
-org.eclipse.rap.workbenchAutostart=false
-
 slc.executionModules=org.argeo.slc.demo.ant,\
 org.argeo.slc.demo.basic,\
 org.argeo.slc.demo.minimal,\
 
 org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.dist.distributionPerspective
 
-# override ports to run the demo as a server
-argeo.server.port.http=7080
-#argeo.server.port.https=9073
-
 # OSGi MANAGEMENT
 osgi.console=7082
 
@@ -46,7 +36,7 @@ argeo.osgi.bundles=\
 /etc/slc/modules;in=*,\
 /usr/share/osgi;in=*.jar,\
 
+#eclipse.ignoreApp=true
+#osgi.noShutdown=true
 org.eclipse.equinox.http.jetty.autostart=false
-eclipse.ignoreApp=true
-osgi.noShutdown=true
 org.eclipse.rap.workbenchAutostart=false