Improve RPM deployment
authorMathieu Baudier <mbaudier@argeo.org>
Tue, 20 Feb 2018 14:32:17 +0000 (15:32 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Tue, 20 Feb 2018 14:32:17 +0000 (15:32 +0100)
15 files changed:
dep/org.argeo.slc.dep.backend/pom.xml
dep/org.argeo.slc.dep.eclipse/bnd.bnd [deleted file]
dep/org.argeo.slc.dep.eclipse/pom.xml [deleted file]
dep/org.argeo.slc.dep.minimal/pom.xml
dep/org.argeo.slc.dep.rap/bnd.bnd [deleted file]
dep/org.argeo.slc.dep.rap/p2.inf [deleted file]
dep/org.argeo.slc.dep.rap/pom.xml [deleted file]
dep/org.argeo.slc.dep.rcp/bnd.bnd [deleted file]
dep/org.argeo.slc.dep.rcp/p2.inf [deleted file]
dep/org.argeo.slc.dep.rcp/pom.xml [deleted file]
dep/org.argeo.slc.dep.rcp/src/main/rpm/etc/slc-rcp/config.ini [deleted file]
dep/org.argeo.slc.dep.rcp/src/main/rpm/etc/slc-rcp/log4j.properties [deleted file]
dep/org.argeo.slc.dep.rcp/src/main/rpm/usr/bin/slc-rcp [deleted file]
dep/org.argeo.slc.dep.rcp/src/main/scripts/postinstall [deleted file]
dep/pom.xml

index e6feed93b4e96546c795edca8ce929a650289ff2..c12f2fb4a182f8ccc6993e6b942178b7d7321688 100644 (file)
                </plugins>
        </build>
        <dependencies>
+               <!-- Parent dependencies -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.dep.cms.sdk</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.dep.minimal</artifactId>
                        <version>2.1.12-SNAPSHOT</version>
-                       <type>pom</type>
                </dependency>
 
                <!-- SLC Libs -->
                <!-- <version>2.1.1-SNAPSHOT</version> -->
                <!-- </dependency> -->
 
-               <!-- Node -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.dep.cms.sdk</artifactId>
-                       <version>${version.argeo-commons}</version>
-               </dependency>
-
                <!-- UI -->
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                                                                        <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>
diff --git a/dep/org.argeo.slc.dep.eclipse/bnd.bnd b/dep/org.argeo.slc.dep.eclipse/bnd.bnd
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/dep/org.argeo.slc.dep.eclipse/pom.xml b/dep/org.argeo.slc.dep.eclipse/pom.xml
deleted file mode 100644 (file)
index 1943888..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-<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>
-               <artifactId>dep</artifactId>
-               <version>2.1.1-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.slc.dep.eclipse</artifactId>
-       <name>SLC Eclipse</name>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.argeo.maven.plugins</groupId>
-                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>generate-descriptors</id>
-                                               <goals>
-                                                       <goal>descriptors</goal>
-                                               </goals>
-                                               <phase>generate-resources</phase>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.client.ui</artifactId>
-                       <version>2.1.1-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.client.ui.dist</artifactId>
-                       <version>2.1.1-SNAPSHOT</version>
-               </dependency>
-
-               <!-- Back-end Dependencies -->
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.dep.backend</artifactId>
-                       <version>2.1.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>
-                                                                       <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>
-                                                                       <requires>
-                                                                               <require>slc-libs</require>
-                                                                       </requires>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
-       </profiles>
-</project>
\ No newline at end of file
index ee0d77e7dd62970309009862530a1036e474609c..af9bbdcf52732e60616ad026c7517cfa3ced67be 100644 (file)
                </plugins>
        </build>
        <dependencies>
+               <!-- Parent dependencies -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.dep.cms.node</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               
                <!-- Absolutely minimal SLC Agent -->
                <dependency>
                        <groupId>org.argeo.slc</groupId>
 <!--                   <version>2.1.5-SNAPSHOT</version> -->
 <!--           </dependency> -->
 
-               <!-- Node -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.dep.cms.node</artifactId>
-                       <version>${version.argeo-commons}</version>
-               </dependency>
        </dependencies>
        <profiles>
                <profile>
                                                                        <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>
diff --git a/dep/org.argeo.slc.dep.rap/bnd.bnd b/dep/org.argeo.slc.dep.rap/bnd.bnd
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/dep/org.argeo.slc.dep.rap/p2.inf b/dep/org.argeo.slc.dep.rap/p2.inf
deleted file mode 100644 (file)
index 0423aa5..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-properties.1.name=org.eclipse.equinox.p2.type.category
-properties.1.value=true
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.rap/pom.xml b/dep/org.argeo.slc.dep.rap/pom.xml
deleted file mode 100644 (file)
index a532ea6..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-<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>
-               <artifactId>dep</artifactId>
-               <version>2.1.1-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.slc.dep.rap</artifactId>
-       <name>SLC Eclipse RAP</name>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <instructions>
-                                               <SLC-ModularDistribution>default</SLC-ModularDistribution>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.argeo.maven.plugins</groupId>
-                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>generate-descriptors</id>
-                                               <goals>
-                                                       <goal>descriptors</goal>
-                                               </goals>
-                                               <phase>generate-resources</phase>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.dep.eclipse</artifactId>
-                       <version>2.1.1-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.client.rap</artifactId>
-                       <version>2.1.1-SNAPSHOT</version>
-               </dependency>
-
-               <!-- For target platform generation -->
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.unit</artifactId>
-                       <version>2.1.1-SNAPSHOT</version>
-                       <scope>test</scope>
-               </dependency>
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.slc</groupId> -->
-               <!-- <artifactId>org.argeo.slc.support.maven</artifactId> -->
-               <!-- <version>2.1.1-SNAPSHOT</version> -->
-               <!-- <scope>test</scope> -->
-               <!-- </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>
-                               <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>
-                                                                       <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:org.argeo.slc.client.rap</include>
-                                                                                               </includes>
-                                                                                       </dependency>
-                                                                               </mapping>
-                                                                       </mappings>
-                                                                       <requires>
-                                                                               <require>slc-eclipse</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>
-               <profile>
-                       <id>pdeSources</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <groupId>org.argeo.maven.plugins</groupId>
-                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>resolve-pde-sources</id>
-                                                               <goals>
-                                                                       <goal>pde-sources</goal>
-                                                               </goals>
-                                                               <phase>generate-resources</phase>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
-       </profiles>
-</project>
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.rcp/bnd.bnd b/dep/org.argeo.slc.dep.rcp/bnd.bnd
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/dep/org.argeo.slc.dep.rcp/p2.inf b/dep/org.argeo.slc.dep.rcp/p2.inf
deleted file mode 100644 (file)
index 0423aa5..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-properties.1.name=org.eclipse.equinox.p2.type.category
-properties.1.value=true
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.rcp/pom.xml b/dep/org.argeo.slc.dep.rcp/pom.xml
deleted file mode 100644 (file)
index beef1ea..0000000
+++ /dev/null
@@ -1,201 +0,0 @@
-<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>
-               <artifactId>dep</artifactId>
-               <version>2.1.1-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.slc.dep.rcp</artifactId>
-       <name>SLC Eclipse RCP Dependencies</name>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <instructions>
-                                               <SLC-ModularDistribution>default</SLC-ModularDistribution>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.argeo.maven.plugins</groupId>
-                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>generate-descriptors</id>
-                                               <goals>
-                                                       <goal>descriptors</goal>
-                                               </goals>
-                                               <phase>generate-resources</phase>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <!-- Perspectives -->
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.dep.eclipse</artifactId>
-                       <version>2.1.1-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.client.rcp</artifactId>
-                       <version>2.1.1-SNAPSHOT</version>
-               </dependency>
-
-               <!-- Secure Application -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.security.dep.node.rcp</artifactId>
-                       <version>${version.argeo-commons}</version>
-               </dependency>
-
-               <!-- For target platform generation -->
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.unit</artifactId>
-                       <version>2.1.1-SNAPSHOT</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.support.maven</artifactId>
-                       <version>2.1.1-SNAPSHOT</version>
-                       <scope>test</scope>
-               </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>
-                               <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>
-                                                                       <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:org.argeo.slc.client.rcp</include>
-                                                                                               </includes>
-                                                                                       </dependency>
-                                                                               </mapping>
-                                                                               <mapping>
-                                                                                       <directory>/usr/bin</directory>
-                                                                                       <username>root</username>
-                                                                                       <groupname>root</groupname>
-                                                                                       <filemode>755</filemode>
-                                                                                       <directoryIncluded>false</directoryIncluded>
-                                                                                       <sources>
-                                                                                               <source>
-                                                                                                       <location>src/main/rpm/usr/bin</location>
-                                                                                               </source>
-                                                                                       </sources>
-                                                                               </mapping>
-                                                                               <mapping>
-                                                                                       <directory>/etc/slc-rcp</directory>
-                                                                                       <username>root</username>
-                                                                                       <groupname>root</groupname>
-                                                                                       <filemode>644</filemode>
-                                                                                       <directoryIncluded>false</directoryIncluded>
-                                                                                       <sources>
-                                                                                               <source>
-                                                                                                       <location>src/main/rpm/etc/slc-rcp</location>
-                                                                                               </source>
-                                                                                       </sources>
-                                                                               </mapping>
-                                                                       </mappings>
-                                                                       <requires>
-                                                                               <require>slc-eclipse</require>
-                                                                               <require>argeo-node-rcp</require>
-                                                                               <require>osgi-boot</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>
-               <profile>
-                       <id>pdeSources</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <groupId>org.argeo.maven.plugins</groupId>
-                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>resolve-pde-sources</id>
-                                                               <goals>
-                                                                       <goal>pde-sources</goal>
-                                                               </goals>
-                                                               <phase>generate-resources</phase>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
-       </profiles>
-</project>
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.rcp/src/main/rpm/etc/slc-rcp/config.ini b/dep/org.argeo.slc.dep.rcp/src/main/rpm/etc/slc-rcp/config.ini
deleted file mode 100644 (file)
index 616d504..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-argeo.osgi.start=\
-org.springframework.osgi.extender,\
-org.argeo.node.repo.jackrabbit,\
-org.argeo.security.dao.os,\
-org.argeo.slc.node.jackrabbit,\
-org.argeo.slc.agent,\
-org.argeo.slc.agent.jcr,\
-
-org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.slcExecutionPerspective
-
-## LOGGING
-log4j.configuration=file:/etc/slc-rcp/log4j.properties
-
-# TOMCAT PORTS
-argeo.server.port.http=17080
-argeo.server.port.https=17083
-argeo.server.port.ajp=17089
-
-org.argeo.slc.ui.inTray=true
-
-# DO NOT CHANGE BELOW UNLESS YOU KNOW WHAT YOU ARE DOING
-eclipse.application=org.argeo.slc.client.rcp.application
-
-osgi.bundles=/usr/share/osgi/boot/org.argeo.osgi.boot.jar@start,\
-org.eclipse.core.runtime@start,\
-org.eclipse.equinox.common@start,\
-com.ibm.icu,\
-org.eclipse.core.commands,\
-org.eclipse.core.contenttype,\
-org.eclipse.core.databinding,\
-org.eclipse.core.databinding.observable,\
-org.eclipse.core.databinding.property,\
-org.eclipse.core.expressions,\
-org.eclipse.core.jobs,\
-org.eclipse.equinox.app,\
-org.eclipse.equinox.launcher,\
-org.eclipse.equinox.preferences,\
-org.eclipse.equinox.registry,\
-org.eclipse.equinox.security,\
-org.eclipse.help,\
-org.eclipse.jface,\
-org.eclipse.jface.databinding,\
-org.eclipse.swt,\
-org.eclipse.swt.gtk.linux.x86_64,\
-org.eclipse.swt.gtk.linux.x86,\
-org.eclipse.ui,\
-org.eclipse.ui.forms,\
-org.eclipse.ui.workbench
-
-argeo.osgi.bundles=\
-${user.home}/.slc/modules;in=**,\
-/etc/slc-rcp/modules;in=**,\
-/usr/share/slc/lib;in=*.jar,\
-/usr/share/osgi;in=*.jar,\
-/usr/share/osgi/eclipse;in=*.jar,\
-/usr/share/osgi/rcp;in=*.jar,\
diff --git a/dep/org.argeo.slc.dep.rcp/src/main/rpm/etc/slc-rcp/log4j.properties b/dep/org.argeo.slc.dep.rcp/src/main/rpm/etc/slc-rcp/log4j.properties
deleted file mode 100644 (file)
index 676776b..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#log4j.rootLogger=WARN, file
-log4j.rootLogger=WARN, console
-
-## Levels
-log4j.logger.org.argeo=INFO
-#log4j.logger.org.springframework=DEBUG
-#log4j.logger.org.hibernate=DEBUG
-#log4j.logger.org.apache.activemq=DEBUG
-
-log4j.logger.org.springframework.web.servlet.PageNotFound=ERROR
-log4j.logger.org.apache.directory.server.core.schema.SchemaService=ERROR
-log4j.logger.org.springframework.security.SpringSecurityMessageSource=ERROR
-
-log4j.logger.org.apache.directory.server.core.partition=ERROR
-log4j.logger.org.apache.directory.server.core.schema.bootstrap.BootstrapAttributeTypeRegistry=ERROR
-
-## Appenders
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} [%15.15t] %m - %c%n
-
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.File=/var/log/slc/slc.log
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern= %-5p %d{ISO8601} [%15.15t] %m - %c%n
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.rcp/src/main/rpm/usr/bin/slc-rcp b/dep/org.argeo.slc.dep.rcp/src/main/rpm/usr/bin/slc-rcp
deleted file mode 100644 (file)
index 928d37f..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-JAVA_CMD=/usr/lib/jvm/jre-1.6.0/bin/java
-JAVA_OPTS="-client -Xmx256m"
-
-SLC_HOME_DIR=${HOME}/.slc/
-if [ -f $SLC_HOME_DIR/settings.sh ];then
-       . $SLC_HOME_DIR/settings.sh
-fi
-
-if [ -d /usr/lib64 ]; 
-then
-       LIB_BASE=/usr/lib64
-else
-       LIB_BASE=/usr/lib
-fi
-OSGI_FRAMEWORK=$LIB_BASE/eclipse/plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.jar
-ECLIPSE_LAUNCHER=$LIB_BASE/eclipse/plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar
-INSTALL_DIR=/usr/share/osgi/rcp
-
-SLC_HOME_DIR=~/.slc
-DATA_DIR=$SLC_HOME_DIR/data
-CONF_DIR=$SLC_HOME_DIR/conf
-
-mkdir -p $SLC_HOME_DIR/modules
-
-if [ ! -f $CONF_DIR/config.ini ];
-then
-       mkdir -p $CONF_DIR
-    cp /etc/slc-rcp/config.ini $CONF_DIR
-fi
-
-java -Dosgi.framework=$OSGI_FRAMEWORK \
- -jar $ECLIPSE_LAUNCHER \
- -install $INSTALL_DIR \
- -configuration $CONF_DIR \
- -data $DATA_DIR \
- -clean
diff --git a/dep/org.argeo.slc.dep.rcp/src/main/scripts/postinstall b/dep/org.argeo.slc.dep.rcp/src/main/scripts/postinstall
deleted file mode 100644 (file)
index b9afdae..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-if [ $1 = "1" ];then
-       APP=%{name}
-
-cd /usr/lib64/eclipse/plugins
-SOURCE=/usr/lib64/eclipse/plugins
-TARGET=/usr/lib64/eclipse-rcp
-
-org.eclipse.core.commands
-org.eclipse.core.contenttype
-org.eclipse.core.databinding
-org.eclipse.core.databinding.observable
-org.eclipse.core.databinding.property
-org.eclipse.core.expressions
-org.eclipse.core.jobs
-org.eclipse.core.runtime
-org.eclipse.equinox.app
-org.eclipse.equinox.common
-org.eclipse.equinox.launcher
-org.eclipse.equinox.preferences
-org.eclipse.equinox.registry
-org.eclipse.equinox.security
-org.eclipse.help
-org.eclipse.jface
-org.eclipse.jface.databinding
-org.eclipse.osgi
-org.eclipse.swt
-org.eclipse.swt.gtk.linux.x86_64
-org.eclipse.ui
-org.eclipse.ui.forms
-org.eclipse.ui.workbench
-
-fi
\ No newline at end of file
index 99963afec1e79a2e90b53ad240411780b05af49b..890f99ffd84d2c9d9fb8a0321b42e8d905fab1d7 100644 (file)
@@ -12,9 +12,6 @@
        <modules>
                <module>org.argeo.slc.dep.minimal</module>
                <module>org.argeo.slc.dep.backend</module>
-<!--           <module>org.argeo.slc.dep.eclipse</module> -->
-<!--           <module>org.argeo.slc.dep.rap</module> -->
-               <!-- <module>org.argeo.slc.dep.rcp</module> -->
        </modules>
        <build>
                <plugins>