slc: improve maven, new RPM structure
authorMathieu Baudier <mbaudier@argeo.org>
Thu, 8 Dec 2011 23:07:22 +0000 (23:07 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Thu, 8 Dec 2011 23:07:22 +0000 (23:07 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@4916 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

33 files changed:
dep/org.argeo.slc.dep.backend/pom.xml
dep/org.argeo.slc.dep.eclipse/pom.xml
dep/org.argeo.slc.dep.sdk.rap/pom.xml
dep/org.argeo.slc.dep.sdk.rcp/pom.xml
dep/pom.xml
dist/slc/pom.xml
dist/slc/src/main/rpm/etc/slc/config.ini
runtime/org.argeo.slc.core/pom.xml
runtime/org.argeo.slc.detached.launcher/pom.xml
runtime/org.argeo.slc.detached/pom.xml
runtime/org.argeo.slc.launcher/pom.xml
runtime/org.argeo.slc.lib.detached/pom.xml
runtime/org.argeo.slc.repo/pom.xml
runtime/org.argeo.slc.server/pom.xml
runtime/org.argeo.slc.specs/pom.xml
runtime/org.argeo.slc.support.activemq/pom.xml
runtime/org.argeo.slc.support.aether/pom.xml
runtime/org.argeo.slc.support.ant/pom.xml
runtime/org.argeo.slc.support.castor/pom.xml
runtime/org.argeo.slc.support.equinox/pom.xml
runtime/org.argeo.slc.support.hibernate/pom.xml
runtime/org.argeo.slc.support.jcr/pom.xml
runtime/org.argeo.slc.support.jemmy/pom.xml
runtime/org.argeo.slc.support.maven/pom.xml
runtime/org.argeo.slc.support.osgi/pom.xml
runtime/org.argeo.slc.support.simple/pom.xml
runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/AbstractJschTask.java
runtime/org.argeo.slc.support.ws.client/pom.xml
runtime/org.argeo.slc.unit/pom.xml
sandbox/argeo.slc.activemq.selector/pom.xml
sandbox/argeo.slc.executionflow/pom.xml
sandbox/argeo.slc.jemmytest/pom.xml
server/org.argeo.slc.ria/pom.xml

index 671f1d2b5b4b624b31582344611ce185691c476c..64490a13dcac990cbaf634bac4a4397ddf2fdf6a 100644 (file)
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.simple</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.ant</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.jcr</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.activemq</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.server</artifactId>
+                       <version>0.13.1-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.equinox</artifactId>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <!-- SLC Agent Modules -->
                        <version>${version.slc}</version>
                </dependency>
 
-               <!-- Node -->
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.dep.node</artifactId>
-                       <version>${version.argeo-commons}</version>
-                       <type>pom</type>
-               </dependency>
-
-               <!-- SLC -->
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.server</artifactId>
-                       <version>0.13.1-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.equinox</artifactId>
-                       <version>0.13.1-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.jcr</artifactId>
-                       <version>0.13.1-SNAPSHOT</version>
-               </dependency>
-
                <!-- SLC Repo -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <version>${version.slc}</version>
                </dependency>
 
-               <!-- Modules (see profiles below) -->
-
                <!-- Launcher -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <classifier>base</classifier>
                </dependency>
 
-               <!-- Felix -->
-               <!-- <dependency> -->
-               <!-- <groupId>org.apache.felix</groupId> -->
-               <!-- <artifactId>org.osgi.service.obr</artifactId> -->
-               <!-- </dependency> -->
-               <!-- <dependency> -->
-               <!-- <groupId>org.apache.felix</groupId> -->
-               <!-- <artifactId>org.apache.felix.bundlerepository</artifactId> -->
-               <!-- </dependency> -->
-
+               <!-- Node -->
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.dep.node</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <type>pom</type>
+               </dependency>
        </dependencies>
+       <profiles>
+               <profile>
+                       <id>rpmbuild</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.apache.maven.plugins</groupId>
+                                               <artifactId>maven-dependency-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>copy-dependencies</id>
+                                                               <phase>process-resources</phase>
+                                                               <goals>
+                                                                       <goal>copy-dependencies</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <includeTypes>jar</includeTypes>
+                                                                       <includeGroupIds>org.argeo.slc.modules,org.argeo.slc.runtime</includeGroupIds>
+                                                                       <outputDirectory>${project.build.directory}/slc</outputDirectory>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-slc</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>slc-libs</name>
+                                                                       <copyright>2011 Argeo</copyright>
+                                                                       <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}/slc</location>
+                                                                                               </source>
+                                                                                       </sources>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                                       <requires>
+                                                                               <require>slc-tp</require>
+                                                                               <require>argeo-node</require>
+                                                                       </requires>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </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-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>
+                                                                                       <dependency>
+                                                                                               <includes>
+                                                                                                       <!-- Core -->
+                                                                                                       <include>org.aspectj:com.springsource.org.aspectj.runtime</include>
+                                                                                                       <include>org.aspectj:com.springsource.org.aspectj.weaver</include>
+                                                                                                       <!-- Simple -->
+                                                                                                       <include>com.jcraft.jsch:com.springsource.com.jcraft.jsch</include>
+                                                                                                       <include>com.opensymphony.quartz:com.springsource.org.quartz</include>
+                                                                                                       <include>org.springframework:org.springframework.context.support</include>
+                                                                                                       <include>javax.mail:com.springsource.javax.mail</include>
+                                                                                                       <include>com.svnkit:com.springsource.org.tmatesoft.svn</include>
+                                                                                                       <include>javax.mail:com.springsource.javax.mail</include>
+                                                                                                       <include>org.argeo.dep.osgi:org.redline_rpm</include>
+                                                                                                       <!-- Ant -->
+                                                                                                       <include>org.apache.ant:com.springsource.org.apache.tools.ant</include>
+                                                                                                       <include>org.apache.ant:com.springsource.org.apache.tools.ant.launch</include>
+                                                                                                       <include>org.apache.oro:com.springsource.org.apache.oro</include>
+                                                                                                       <include>org.apache.bsf:com.springsource.org.apache.bsf</include>
+                                                                                                       <!-- Maven -->
+                                                                                                       <include>org.argeo.dep.osgi:org.argeo.dep.osgi.aether</include>
+                                                                                                       <!-- Misc -->
+                                                                                                       <include>net.sourceforge.jexcelapi:com.springsource.jxl</include>
+                                                                                               </includes>
+                                                                                       </dependency>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <artifactId>maven-antrun-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <phase>install</phase>
+                                                               <goals>
+                                                                       <goal>run</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <target>
+                                                                               <copy todir="${rpm.stagingRepository}" verbose="true">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
+                                                                                       <flattenmapper />
+                                                                               </copy>
+                                                                       </target>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
 </project>
\ No newline at end of file
index 0f3154fbc87e900581003e03bbf7c0c039276d54..d576c8dcf1086b0cba42a6f6d02c322088e263e2 100644 (file)
@@ -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>
        <dependencies>
                <dependency>
                        <groupId>org.argeo.slc.eclipse</groupId>
-                       <artifactId>org.argeo.slc.client.rcp</artifactId>
-                       <version>${version.slc}</version>
+                       <artifactId>org.argeo.slc.client.ui</artifactId>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.eclipse</groupId>
-                       <artifactId>org.argeo.slc.client.ui</artifactId>
-                       <version>${version.slc}</version>
+                       <artifactId>org.argeo.slc.client.ui.dist</artifactId>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
+       <profiles>
+               <profile>
+                       <id>rpmbuild</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.apache.maven.plugins</groupId>
+                                               <artifactId>maven-dependency-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>copy-dependencies</id>
+                                                               <phase>process-resources</phase>
+                                                               <goals>
+                                                                       <goal>copy-dependencies</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <includeTypes>jar</includeTypes>
+                                                                       <excludeTransitive>true</excludeTransitive>
+                                                                       <outputDirectory>${project.build.directory}/slc-eclipse</outputDirectory>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-slc-eclipse</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>slc-eclipse</name>
+                                                                       <copyright>2011 Argeo</copyright>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi/eclipse</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <sources>
+                                                                                               <source>
+                                                                                                       <location>${project.build.directory}/slc-eclipse</location>
+                                                                                               </source>
+                                                                                       </sources>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <artifactId>maven-antrun-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <phase>install</phase>
+                                                               <goals>
+                                                                       <goal>run</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <target>
+                                                                               <copy todir="${rpm.stagingRepository}" verbose="true">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
+                                                                                       <flattenmapper />
+                                                                               </copy>
+                                                                       </target>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
 </project>
\ No newline at end of file
index 58af03f0a23e0d00f344298cc7cd1daf7a7d6f79..563ad457a7705bef732d0e5024b27bed0afc5494 100644 (file)
                </plugins>
        </build>
        <dependencies>
-               <!-- Perspectives -->
                <dependency>
-                       <groupId>org.argeo.slc.eclipse</groupId>
-                       <artifactId>org.argeo.slc.client.ui</artifactId>
-                       <version>${version.slc}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.eclipse</groupId>
-                       <artifactId>org.argeo.slc.client.ui.dist</artifactId>
-                       <version>${version.slc}</version>
-               </dependency>
-               <!-- Secure Application -->
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.dep.node.rap</artifactId>
-                       <version>${version.argeo-commons}</version>
-                       <exclusions>
-<!--                           <exclusion> -->
-<!--                                   <groupId>org.argeo.commons.security</groupId> -->
-<!--                                   <artifactId>org.argeo.security.ui.admin</artifactId> -->
-<!--                           </exclusion> -->
-
-                               <exclusion>
-                                       <groupId>org.mortbay.jetty</groupId>
-                                       <artifactId>org.mortbay.jetty.server</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.mortbay.jetty</groupId>
-                                       <artifactId>org.mortbay.jetty.server.util</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.eclipse.equinox</groupId>
-                                       <artifactId>org.eclipse.equinox.http.jetty</artifactId>
-                               </exclusion>
-
-                               <exclusion>
-                                       <groupId>org.argeo.slc.runtime</groupId>
-                                       <artifactId>org.argeo.slc.support.castor</artifactId>
-                               </exclusion>
-
-                       </exclusions>
+                       <groupId>org.argeo.slc.dep</groupId>
+                       <artifactId>org.argeo.slc.dep.eclipse</artifactId>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.eclipse</groupId>
                        <artifactId>org.argeo.slc.client.rap</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
+
                <!-- Back-end Dependencies -->
                <dependency>
                        <groupId>org.argeo.slc.dep</groupId>
                        <artifactId>org.argeo.slc.dep.backend</artifactId>
-                       <version>${version.slc}</version>
-               </dependency>
-
-               <!-- TEST and target platform generation -->
-               <!-- Default Tomcat conf (for development) -->
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.tomcat</artifactId>
-                       <version>${version.argeo-commons}</version>
-                       <scope>test</scope>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
-               <!-- Apache Directory -->
+               <!-- Secure Application -->
                <dependency>
                        <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.dep.ads</artifactId>
-                       <type>pom</type>
+                       <artifactId>org.argeo.security.dep.node.rap</artifactId>
                        <version>${version.argeo-commons}</version>
-                       <scope>test</scope>
+                       <!-- <exclusions> -->
+                       <!-- <exclusion> -->
+                       <!-- <groupId>org.mortbay.jetty</groupId> -->
+                       <!-- <artifactId>org.mortbay.jetty.server</artifactId> -->
+                       <!-- </exclusion> -->
+                       <!-- <exclusion> -->
+                       <!-- <groupId>org.mortbay.jetty</groupId> -->
+                       <!-- <artifactId>org.mortbay.jetty.server.util</artifactId> -->
+                       <!-- </exclusion> -->
+                       <!-- <exclusion> -->
+                       <!-- <groupId>org.eclipse.equinox</groupId> -->
+                       <!-- <artifactId>org.eclipse.equinox.http.jetty</artifactId> -->
+                       <!-- </exclusion> -->
+
+                       <!-- <exclusion> -->
+                       <!-- <groupId>org.argeo.slc.runtime</groupId> -->
+                       <!-- <artifactId>org.argeo.slc.support.castor</artifactId> -->
+                       <!-- </exclusion> -->
+
+                       <!-- </exclusions> -->
                </dependency>
 
                <!-- For target platform generation -->
                        <scope>test</scope>
                </dependency>
        </dependencies>
+       <profiles>
+               <profile>
+                       <id>rpmbuild</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-slc-rap</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>slc-rap</name>
+                                                                       <copyright>2011 Argeo</copyright>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi/rap</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <dependency>
+                                                                                               <includes>
+                                                                                                       <include>org.argeo.slc.eclipse:org.argeo.slc.client.rap</include>
+                                                                                               </includes>
+                                                                                       </dependency>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                                       <requires>
+                                                                               <require>slc-eclipse</require>
+                                                                               <require>slc-libs</require>
+                                                                               <require>argeo-node-rap</require>
+                                                                       </requires>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <artifactId>maven-antrun-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <phase>install</phase>
+                                                               <goals>
+                                                                       <goal>run</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <target>
+                                                                               <copy todir="${rpm.stagingRepository}" verbose="true">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
+                                                                                       <flattenmapper />
+                                                                               </copy>
+                                                                       </target>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
 </project>
\ No newline at end of file
index fe5cb072345dc98c7e485650683ab944feddcc71..e19e4bb8414f6a3b3c90e9275b7e33042b711c94 100644 (file)
        <dependencies>
                <!-- Perspectives -->
                <dependency>
-                       <groupId>org.argeo.slc.eclipse</groupId>
-                       <artifactId>org.argeo.slc.client.ui</artifactId>
+                       <groupId>org.argeo.slc.dep</groupId>
+                       <artifactId>org.argeo.slc.dep.eclipse</artifactId>
                        <version>0.13.1-SNAPSHOT</version>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.eclipse</groupId>
-                       <artifactId>org.argeo.slc.client.ui.dist</artifactId>
-                       <version>0.13.1-SNAPSHOT</version>
-               </dependency>
-               <!-- Secure Application -->
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.dep.node.rcp</artifactId>
-                       <version>${version.argeo-commons}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.argeo.commons.security</groupId>
-                                       <artifactId>org.argeo.security.ui.admin</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.slc.eclipse</groupId>
                        <artifactId>org.argeo.slc.client.rcp</artifactId>
                        <version>0.13.1-SNAPSHOT</version>
                </dependency>
+               
                <!-- Back-end Dependencies -->
                <dependency>
                        <groupId>org.argeo.slc.dep</groupId>
                        <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
+               <!-- Secure Application -->
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.dep.node.rcp</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+
                <!-- For target platform generation -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <scope>test</scope>
                </dependency>
        </dependencies>
+       <profiles>
+               <profile>
+                       <id>rpmbuild</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-slc-rcp</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>slc-rcp</name>
+                                                                       <copyright>2011 Argeo</copyright>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi/rcp</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <dependency>
+                                                                                               <includes>
+                                                                                                       <include>org.argeo.slc.eclipse:org.argeo.slc.client.rcp</include>
+                                                                                               </includes>
+                                                                                       </dependency>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                                       <requires>
+                                                                               <require>slc-eclipse</require>
+                                                                               <require>slc-libs</require>
+                                                                               <require>argeo-node-rcp</require>
+                                                                       </requires>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <artifactId>maven-antrun-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <phase>install</phase>
+                                                               <goals>
+                                                                       <goal>run</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <target>
+                                                                               <copy todir="${rpm.stagingRepository}" verbose="true">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
+                                                                                       <flattenmapper />
+                                                                               </copy>
+                                                                       </target>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
 </project>
\ No newline at end of file
index f82527b54cb33a6df20d55aef22e5f734eeb4252..37bfebeecea18904b7cd12047c0c8fbbdf7a6784 100644 (file)
@@ -15,6 +15,7 @@
                <module>org.argeo.slc.dep.server</module>
                <module>org.argeo.slc.dep.detached</module>
                <module>org.argeo.slc.dep.backend</module>
+               <module>org.argeo.slc.dep.eclipse</module>
                <module>org.argeo.slc.dep.sdk.rcp</module>
                <module>org.argeo.slc.dep.sdk.rap</module>
        </modules>
index 5fbb2caa9775c10c06e5d86936b380d0db6f41ea..afd9dadfa46f89b1ea4edc868f049d59d0700f0c 100644 (file)
@@ -9,26 +9,9 @@
        <groupId>org.argeo.slc.dist</groupId>
        <artifactId>slc</artifactId>
        <packaging>pom</packaging>
-       <name>SLC Node (zip, rpm)</name>
+       <name>SLC Node (RPM)</name>
        <build>
                <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>copy-dependencies</id>
-                                               <phase>process-resources</phase>
-                                               <goals>
-                                                       <goal>copy-dependencies</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <includeTypes>jar</includeTypes>
-                                                       <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
                        <plugin>
                                <artifactId>maven-resources-plugin</artifactId>
                                <executions>
                                        <groupId>org.argeo.commons.osgi</groupId>
                                        <artifactId>org.argeo.osgi.boot</artifactId>
                                </exclusion>
+                               <!-- Node -->
+                               <exclusion>
+                                       <groupId>org.argeo.commons.security</groupId>
+                                       <artifactId>org.argeo.security.dep.node.rap</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.tomcat</artifactId>
-                       <version>${version.argeo-commons}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.dep.ads</artifactId>
-                       <type>pom</type>
-                       <version>${version.argeo-commons}</version>
-               </dependency>
        </dependencies>
        <profiles>
                <profile>
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
-                                               <version>2.1-alpha-1</version>
-                                               <extensions>true</extensions>
-                                               <configuration>
-                                                       <version>${project.version}</version>
-                                                       <release>r${buildNumber}.argeo</release>
-                                                       <copyright>2011 Argeo</copyright>
-                                                       <distribution>argeo</distribution>
-                                                       <packager>mbaudier@argeo.org</packager>
-                                                       <group>Applications/System</group>
-                                                       <prefix>/usr</prefix>
-                                               </configuration>
                                                <executions>
                                                        <execution>
-                                                               <id>rpm-sdk</id>
+                                                               <id>rpm-slc</id>
                                                                <phase>package</phase>
                                                                <goals>
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
+                                                                       <name>slc</name>
+                                                                       <copyright>2011 Argeo</copyright>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/bin</directory>
                                                                                        <sources>
                                                                                                <source>
                                                                                                        <location>src/main/rpm/usr/bin</location>
-                                                                                                       <includes>
-                                                                                                               <include>*</include>
-                                                                                                       </includes>
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
                                                                                        <sources>
                                                                                                <source>
                                                                                                        <location>src/main/rpm/etc/init.d</location>
-                                                                                                       <includes>
-                                                                                                               <include>*</include>
-                                                                                                       </includes>
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
                                                                                <mapping>
-                                                                                       <directory>/etc/${project.artifactId}</directory>
+                                                                                       <directory>/etc/slc</directory>
                                                                                        <username>root</username>
-                                                                                       <groupname>${project.artifactId}</groupname>
+                                                                                       <groupname>slc</groupname>
                                                                                        <filemode>640</filemode>
                                                                                        <configuration>noreplace</configuration>
                                                                                        <directoryIncluded>false</directoryIncluded>
                                                                                        <sources>
                                                                                                <source>
-                                                                                                       <location>src/main/rpm/etc/${project.artifactId}</location>
-                                                                                                       <includes>
-                                                                                                               <include>*</include>
-                                                                                                       </includes>
-                                                                                               </source>
-                                                                                       </sources>
-                                                                               </mapping>
-                                                                               <mapping>
-                                                                                       <directory>/usr/share/${project.artifactId}/lib</directory>
-                                                                                       <username>root</username>
-                                                                                       <groupname>root</groupname>
-                                                                                       <filemode>644</filemode>
-                                                                                       <directoryIncluded>false</directoryIncluded>
-                                                                                       <sources>
-                                                                                               <source>
-                                                                                                       <location>target/lib</location>
-                                                                                                       <includes>
-                                                                                                               <include>*.jar</include>
-                                                                                                       </includes>
+                                                                                                       <location>src/main/rpm/etc/slc</location>
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
                                                                                <scriptFile>src/main/scripts/preremove</scriptFile>
                                                                        </preremoveScriptlet>
                                                                        <requires>
+                                                                               <require>slc-libs</require>
                                                                                <require>osgi-boot</require>
+                                                                               <require>java-1.6.0-openjdk</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
                                                </executions>
                                        </plugin>
+                                       <plugin>
+                                               <artifactId>maven-antrun-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <phase>install</phase>
+                                                               <goals>
+                                                                       <goal>run</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <target>
+                                                                               <copy todir="${rpm.stagingRepository}" verbose="true">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
+                                                                                       <flattenmapper />
+                                                                               </copy>
+                                                                       </target>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
                                </plugins>
                        </build>
                </profile>
index 71d861e114f4d18ad19662518292b5f1825ffb25..fddf2669f2602f2a6d88b9e7ed144f577767a39e 100644 (file)
@@ -41,3 +41,13 @@ osgi.console=3030
 # RAP SPECIFIC
 eclipse.ignoreApp=true
 osgi.noShutdown=true
+
+# DO NOT CHANGE BELOW UNLESS YOU KNOW WHAT YOU ARE DOING
+osgi.bundles=org.argeo.osgi.boot.jar@start
+argeo.osgi.bundles=\
+/etc/slc/modules;in=*,\
+/usr/share/slc/lib;in=*.jar,\
+/usr/share/osgi;in=*.jar,\
+/usr/share/eclipse-rap;in=*.jar,\
+/usr/share/osgi/eclipse;in=*.jar,\
+/usr/share/osgi/rap;in=*.jar,\
index 7284f7c6f81a2b1af713f586a2ca3b971226c606..d77f8bc3eae307a5cad675982ad0f30116e3a381 100644 (file)
@@ -17,7 +17,6 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>
                                                <Export-Package>
@@ -41,7 +40,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.specs</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <dependency>
index 8aca0bb5551b56248ebf71deb1a4c753cb3fb887..ad89ac51b92b7a27251a7305f991b23cc303fbe1 100644 (file)
@@ -36,7 +36,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
index cb24dd1df1d0c39675eee3589e12eabe728691f9..4dc6a6172b824ee67bcd019741869af279016cfd 100644 (file)
@@ -23,7 +23,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
index d2d8cadc6a251f560b1b6d0cd290e7ff78a5b3c8..9942c92690195bd37c50be2f5baffc74c84c88a8 100644 (file)
@@ -33,7 +33,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>
index 82797f97008dfa35a8b94349e1221efa7f67f3f3..dcbe1c460a8cf061599bd1fe2742882cde6f910e 100644 (file)
@@ -15,7 +15,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>
index bc4f88e3544a766153656c0ab28fc292cc3f7f9c..286ade7d93ca885a815f492ffca6eb149d226341 100644 (file)
@@ -15,7 +15,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>
index d83de4513dac72da3b57154c830802b0ce549aee..ec6f263954169868ab3a4ad48cfb03fb1358f225 100644 (file)
@@ -16,7 +16,6 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>
                                                <Export-Package>
@@ -50,7 +49,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Spring -->
index ca7380d8200edb55a09cb060da3f44de26de9e71..cf49d99d76fb705ad9f5b8187a018ed17dd906d3 100644 (file)
@@ -14,7 +14,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>
index 61575c335af70e3e040c615197fe3190ec59d73e..6708d4df402549433d7cea3439328180dfad9f42 100644 (file)
@@ -15,7 +15,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>
index 0a7b2e265c6229cedb3d4b76970bfcc6f50e3ddd..db91744963d18d5bdb5befc1866951a620e6bb2e 100644 (file)
@@ -15,7 +15,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>
index 00122c3bf3ea29d9fc347b447c8d6838cebcf138..43dfef6285c50f8113f4e0de7e752cd6cd4233a0 100644 (file)
@@ -16,7 +16,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>
index f820067a7d98cec1ba33f61f6efc4037651c044e..4ea5a34f29be26661c4412fc714137c2381438eb 100644 (file)
@@ -16,7 +16,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>
index a7510dc9599cbdec5a8bc97fc00fc5304101387b..aa0927259d914d0749f704f56c2cb4ef9fc8ea77 100644 (file)
@@ -24,7 +24,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>
index ef9e5f0baa7df5a20bf476bc93dfb3452d08dcb5..9508df5324c53fe16b877e3c2211c49c360dcd49 100644 (file)
@@ -15,7 +15,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Fragment-Host>org.argeo.slc.core</Fragment-Host>
index 772ec6b14ad487ac4e325a04d7334c7e6cf2760f..f946f1fef413ee26b07dfa1654968b1aaf3f0728 100644 (file)
@@ -15,7 +15,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>
index 8a88ba81cc40204df307c8178e3a9f431ae6ec05..8c2536e810c41c9dd4d6ddc3445d27533291009e 100644 (file)
@@ -23,7 +23,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
index 011481a0557d18406b771dff905efc4eb225ffab..e7cdc3b91b33e8e38df3e548c0fcd38722421ba6 100644 (file)
@@ -21,7 +21,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>
index 4e400c8e638c307774ccc4fd2f3bb906ae5cb9df..9f77a8e89b94785c96e33617489be9974a19ad27 100644 (file)
@@ -17,7 +17,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>
index 36e8403e6d53bcf96f15ff0ee81d7e0baf4a9b05..70b53d28a36ff04101b190d9e037b39f2c0dcee6 100644 (file)
@@ -16,7 +16,6 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>
                                                <Export-Package>
                                        </instructions>
                                </configuration>
                        </plugin>
-
                </plugins>
        </build>
        <dependencies>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${version.slc}</version>
+                       <version>0.13.1-SNAPSHOT</version>
                </dependency>
 
                <!-- SSH -->
index 0300232958dc043be8188f1346cbfe2b70b07a85..43b158626ae06ec6c95aad3fe3fb155618e53b20 100644 (file)
@@ -53,6 +53,7 @@ public abstract class AbstractJschTask implements Runnable {
                                        getSshTarget().getHost(), getSshTarget().getPort());
 
                        session.setUserInfo(getSshTarget().getUserInfo());
+                       session.setServerAliveInterval(1000);
                        session.connect();
                        if (log.isDebugEnabled())
                                log.debug("Connected to " + getSshTarget() + " via SSH");
index 9a5939e00e045d18717ebb2795df2a01db37cfd9..92ad80290497b183a21650de911a8fa726c5f51d 100644 (file)
@@ -16,7 +16,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>
index 8e609a0fd40c3b54500c77ac22a6fe900761d831..5e4377b7b4fd1f0b37824e3688643179d74ebfaa 100644 (file)
@@ -15,7 +15,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>
index 9e93d56b36fc87caf49459d2938209db17cd15fa..4ea5476e662b57567ddd02b48c642e97eb9919e5 100644 (file)
@@ -31,7 +31,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                        </plugin>
                        <plugin>
                                <groupId>org.argeo.slc.maven</groupId>
index 1bce405c4487bbfb2bbe0bd70575b1508d71c02a..4cdb6dd8989bf0abba914bb495dcff1ebcbbc6bd 100644 (file)
@@ -20,7 +20,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>
index c36efd09c7fd258d1a7cd0645e293deb412457c8..92aed903eeade5f9b98b5d33f142922e2af43767 100644 (file)
@@ -27,7 +27,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Export-Package>
index c8ca584a552b3e079b373e5ec3457241fee99b64..232244babea8d1dd7aad5a4bbca425c08ee9fd98 100644 (file)
@@ -72,7 +72,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
+
                                <configuration>
                                        <instructions>
                                                <Import-Package>