Rename features into dep

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

diff --git a/eclipse/dep/org.argeo.eclipse.dep.common/p2.inf b/eclipse/dep/org.argeo.eclipse.dep.common/p2.inf
new file mode 100644 (file)
index 0000000..0423aa5
--- /dev/null
+++ b/eclipse/dep/org.argeo.eclipse.dep.common/p2.inf
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file

diff --git a/eclipse/dep/org.argeo.eclipse.dep.common/pom.xml b/eclipse/dep/org.argeo.eclipse.dep.common/pom.xml
new file mode 100644 (file)
index 0000000..31fb1e4
--- /dev/null
+++ b/eclipse/dep/org.argeo.eclipse.dep.common/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.commons.eclipse</groupId>
+               <artifactId>dep</artifactId>
+               <version>0.3.4-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.eclipse.dep.common</artifactId>
+       <name>Commons Eclipse Shared Dependencies</name>
+       <dependencies>
+               <!-- Eclipse -->
+               <dependency>
+                       <groupId>org.eclipse.core</groupId>
+                       <artifactId>org.eclipse.core.runtime</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.core</groupId>
+                       <artifactId>org.eclipse.core.commands</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>com.ibm.icu</groupId>
+                       <artifactId>com.ibm.icu</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.preferences</artifactId>
+                       <version>3.3.0</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.launcher</artifactId>
+               </dependency>
+
+               <!-- Security -->
+               <dependency>
+                       <groupId>org.eclipse.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.security</artifactId>
+               </dependency>
+
+               
+       </dependencies>
+</project>

diff --git a/eclipse/dep/org.argeo.eclipse.dep.rap/p2.inf b/eclipse/dep/org.argeo.eclipse.dep.rap/p2.inf
new file mode 100644 (file)
index 0000000..0423aa5
--- /dev/null
+++ b/eclipse/dep/org.argeo.eclipse.dep.rap/p2.inf
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file

diff --git a/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml b/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml
new file mode 100644 (file)
index 0000000..eee5ec8
--- /dev/null
+++ b/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.commons.eclipse</groupId>
+               <artifactId>dep</artifactId>
+               <version>0.3.4-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.eclipse.dep.rap</artifactId>
+       <name>Commons Eclipse RAP Dependencies</name>
+       <properties>
+               <version.rap>1.3.2</version.rap>
+       </properties>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.argeo.maven.plugins</groupId>
+                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                       </plugin>
+               </plugins>
+       </build>
+       <dependencies>
+               <!-- common dependencies for both RCP and RAP -->
+               <dependency>
+                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <artifactId>org.argeo.eclipse.dep.common</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+
+               <!-- Dependency to enable file upload. Should be included directly in coming 
+                       rap distribution -->
+               <dependency>
+                       <groupId>org.argeo.dep.rap</groupId>
+                       <artifactId>org.eclipse.rwt.widgets.upload</artifactId>
+               </dependency>
+               <!-- Needed by the bundle above -->
+               <dependency>
+                       <groupId>org.apache.commons</groupId>
+                       <artifactId>com.springsource.org.apache.commons.io</artifactId>
+               </dependency>
+
+               <!-- RAP Specific Dependencies -->
+               <dependency>
+                       <groupId>javax.servlet</groupId>
+                       <artifactId>com.springsource.javax.servlet</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.http.registry</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.http.servlet</artifactId>
+               </dependency>
+
+               <!-- RAP -->
+               <!-- order IS important -->
+               <dependency>
+                       <groupId>org.eclipse.rap</groupId>
+                       <artifactId>org.eclipse.rap.ui</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.rap</groupId>
+                       <artifactId>org.eclipse.rap.rwt</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.rap</groupId>
+                       <artifactId>org.eclipse.rap.rwt.q07</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.rap</groupId>
+                       <artifactId>org.eclipse.rap.jface</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.rap</groupId>
+                       <artifactId>org.eclipse.rap.jface.databinding</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.rap</groupId>
+                       <artifactId>org.eclipse.rap.ui.cheatsheets</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.rap</groupId>
+                       <artifactId>org.eclipse.rap.ui.forms</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.rap</groupId>
+                       <artifactId>org.eclipse.rap.ui.views</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.rap</groupId>
+                       <artifactId>org.eclipse.rap.ui.workbench</artifactId>
+               </dependency>
+
+               <!-- Jetty (TO BE REMOVED and replaced by Tomcat
+               <dependency>
+                       <groupId>org.eclipse.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.http.jetty</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.mortbay.jetty</groupId>
+                       <artifactId>org.mortbay.jetty.server</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.mortbay.jetty</groupId>
+                       <artifactId>org.mortbay.jetty.util</artifactId>
+               </dependency>
+                -->
+                
+               <!-- Eclipse -->
+               <dependency>
+                       <groupId>org.eclipse.core</groupId>
+                       <artifactId>org.eclipse.core.databinding</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.core</groupId>
+                       <artifactId>org.eclipse.core.databinding.beans</artifactId>
+               </dependency>
+       </dependencies>
+       <profiles>
+               <profile>
+                       <id>rpmbuild-tp</id>
+                       <build>
+                               <plugins>
+<!--                                   <plugin> -->
+<!--                                           <groupId>org.apache.maven.plugins</groupId> -->
+<!--                                           <artifactId>maven-dependency-plugin</artifactId> -->
+<!--                                           <executions> -->
+<!--                                                   <execution> -->
+<!--                                                           <id>copy-rap</id> -->
+<!--                                                           <phase>package</phase> -->
+<!--                                                           <goals> -->
+<!--                                                                   <goal>copy-dependencies</goal> -->
+<!--                                                           </goals> -->
+<!--                                                           <configuration> -->
+<!--                                                                   <includeTypes>jar</includeTypes> -->
+<!--                                                                   <includeGroupIds>org.eclipse.core,org.eclipse.equinox,org.eclipse.rap,org.eclipse.help,org.argeo.dep.rap,org.eclipse.osgi,com.ibm.icu</includeGroupIds> -->
+<!--                                                                   <outputDirectory>${project.build.directory}/eclipse-rap</outputDirectory> -->
+<!--                                                           </configuration> -->
+<!--                                                   </execution> -->
+<!--                                           </executions> -->
+<!--                                   </plugin> -->
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-rap</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>eclipse-rap</name>
+                                                                       <projversion>${version.rap}</projversion>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/eclipse-rap</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <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>

diff --git a/eclipse/dep/org.argeo.eclipse.dep.rcp/p2.inf b/eclipse/dep/org.argeo.eclipse.dep.rcp/p2.inf
new file mode 100644 (file)
index 0000000..0423aa5
--- /dev/null
+++ b/eclipse/dep/org.argeo.eclipse.dep.rcp/p2.inf
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file

diff --git a/eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml b/eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml
new file mode 100644 (file)
index 0000000..2b8fdd9
--- /dev/null
+++ b/eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.commons.eclipse</groupId>
+               <artifactId>dep</artifactId>
+               <version>0.3.4-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
+       <name>Commons Eclipse RCP Dependencies</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.argeo.maven.plugins</groupId>
+                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                       </plugin>
+               </plugins>
+       </build>
+       <dependencies>
+               <!-- common dependencies for both RCP and RAP -->
+               <dependency>
+                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <artifactId>org.argeo.eclipse.dep.common</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.eclipse.ui</groupId>
+                       <artifactId>org.eclipse.ui</artifactId>
+               </dependency>
+
+               <!-- forms -->
+               <dependency>
+                       <groupId>org.eclipse.ui</groupId>
+                       <artifactId>org.eclipse.ui.forms</artifactId>
+               </dependency>
+
+               <!-- SWT -->
+               <dependency>
+                       <groupId>org.eclipse.swt</groupId>
+                       <artifactId>org.eclipse.swt</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.swt</groupId>
+                       <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.swt</groupId>
+                       <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.swt</groupId>
+                       <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
+               </dependency>
+       </dependencies>
+</project>

diff --git a/eclipse/dep/pom.xml b/eclipse/dep/pom.xml
new file mode 100644 (file)
index 0000000..c2039c8
--- /dev/null
+++ b/eclipse/dep/pom.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.commons.eclipse</groupId>
+               <artifactId>eclipse</artifactId>
+               <version>0.3.4-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>dep</artifactId>
+       <name>Commons Eclipse Dependencies</name>
+       <packaging>pom</packaging>
+       <modules>
+               <module>org.argeo.eclipse.dep.common</module>
+               <module>org.argeo.eclipse.dep.rap</module>
+               <module>org.argeo.eclipse.dep.rcp</module>
+       </modules>
+       <build>
+               <resources>
+                       <resource>
+                               <directory>.</directory>
+                               <includes>
+                                       <include>*.inf</include>
+                               </includes>
+                       </resource>
+               </resources>
+               <plugins>
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>buildnumber-maven-plugin</artifactId>
+                               <configuration>
+                                       <useLastCommittedRevision>false</useLastCommittedRevision>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-jar-plugin</artifactId>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                       </plugin>
+               </plugins>
+               <pluginManagement>
+                       <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>
+                                               <execution>
+                                                       <id>generate-descriptors</id>
+                                                       <goals>
+                                                               <goal>descriptors</goal>
+                                                       </goals>
+                                                       <phase>generate-resources</phase>
+                                               </execution>
+                                               <execution>
+                                                       <id>check-osgi</id>
+                                                       <phase>test</phase>
+                                                       <goals>
+                                                               <goal>equinox</goal>
+                                                       </goals>
+                                                       <configuration>
+                                                               <onlyCheck>true</onlyCheck>
+                                                               <argsToAppend>
+                                                                       <arg>-clean</arg>
+                                                               </argsToAppend>
+                                                       </configuration>
+                                               </execution>
+                                       </executions>
+                               </plugin>
+                       </plugins>
+               </pluginManagement>
+       </build>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.commons.osgi</groupId>
+                       <artifactId>org.argeo.osgi.boot</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+                       <scope>test</scope>
+               </dependency>
+       </dependencies>
+</project>
\ No newline at end of file

diff --git a/eclipse/features/org.argeo.eclipse.dep.common/p2.inf b/eclipse/features/org.argeo.eclipse.dep.common/p2.inf
deleted file mode 100644 (file)
index 0423aa5..0000000
--- a/eclipse/features/org.argeo.eclipse.dep.common/p2.inf
+++ /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/eclipse/features/org.argeo.eclipse.dep.common/pom.xml b/eclipse/features/org.argeo.eclipse.dep.common/pom.xml
deleted file mode 100644 (file)
index e1b343e..0000000
--- a/eclipse/features/org.argeo.eclipse.dep.common/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.commons.eclipse</groupId>
-               <artifactId>features</artifactId>
-               <version>0.3.4-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.eclipse.dep.common</artifactId>
-       <name>Commons Eclipse Shared Dependencies</name>
-       <dependencies>
-               <!-- Eclipse -->
-               <dependency>
-                       <groupId>org.eclipse.core</groupId>
-                       <artifactId>org.eclipse.core.runtime</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.core</groupId>
-                       <artifactId>org.eclipse.core.commands</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>com.ibm.icu</groupId>
-                       <artifactId>com.ibm.icu</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.preferences</artifactId>
-                       <version>3.3.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.launcher</artifactId>
-               </dependency>
-
-               <!-- Security -->
-               <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.security</artifactId>
-               </dependency>
-
-               
-       </dependencies>
-</project>

diff --git a/eclipse/features/org.argeo.eclipse.dep.rap/p2.inf b/eclipse/features/org.argeo.eclipse.dep.rap/p2.inf
deleted file mode 100644 (file)
index 0423aa5..0000000
--- a/eclipse/features/org.argeo.eclipse.dep.rap/p2.inf
+++ /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/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml b/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
deleted file mode 100644 (file)
index 41ef4a0..0000000
--- a/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.commons.eclipse</groupId>
-               <artifactId>features</artifactId>
-               <version>0.3.4-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.eclipse.dep.rap</artifactId>
-       <name>Commons Eclipse RAP Dependencies</name>
-       <properties>
-               <version.rap>1.3.2</version.rap>
-       </properties>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.argeo.maven.plugins</groupId>
-                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <!-- common dependencies for both RCP and RAP -->
-               <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
-                       <artifactId>org.argeo.eclipse.dep.common</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-
-               <!-- Dependency to enable file upload. Should be included directly in coming 
-                       rap distribution -->
-               <dependency>
-                       <groupId>org.argeo.dep.rap</groupId>
-                       <artifactId>org.eclipse.rwt.widgets.upload</artifactId>
-               </dependency>
-               <!-- Needed by the bundle above -->
-               <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.io</artifactId>
-               </dependency>
-
-               <!-- RAP Specific Dependencies -->
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.http.registry</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.http.servlet</artifactId>
-               </dependency>
-
-               <!-- RAP -->
-               <!-- order IS important -->
-               <dependency>
-                       <groupId>org.eclipse.rap</groupId>
-                       <artifactId>org.eclipse.rap.ui</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.rap</groupId>
-                       <artifactId>org.eclipse.rap.rwt</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.rap</groupId>
-                       <artifactId>org.eclipse.rap.rwt.q07</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.rap</groupId>
-                       <artifactId>org.eclipse.rap.jface</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.rap</groupId>
-                       <artifactId>org.eclipse.rap.jface.databinding</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.rap</groupId>
-                       <artifactId>org.eclipse.rap.ui.cheatsheets</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.rap</groupId>
-                       <artifactId>org.eclipse.rap.ui.forms</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.rap</groupId>
-                       <artifactId>org.eclipse.rap.ui.views</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.rap</groupId>
-                       <artifactId>org.eclipse.rap.ui.workbench</artifactId>
-               </dependency>
-
-               <!-- Jetty (TO BE REMOVED and replaced by Tomcat
-               <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.http.jetty</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.mortbay.jetty</groupId>
-                       <artifactId>org.mortbay.jetty.server</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.mortbay.jetty</groupId>
-                       <artifactId>org.mortbay.jetty.util</artifactId>
-               </dependency>
-                -->
-                
-               <!-- Eclipse -->
-               <dependency>
-                       <groupId>org.eclipse.core</groupId>
-                       <artifactId>org.eclipse.core.databinding</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.core</groupId>
-                       <artifactId>org.eclipse.core.databinding.beans</artifactId>
-               </dependency>
-       </dependencies>
-       <profiles>
-               <profile>
-                       <id>rpmbuild-tp</id>
-                       <build>
-                               <plugins>
-<!--                                   <plugin> -->
-<!--                                           <groupId>org.apache.maven.plugins</groupId> -->
-<!--                                           <artifactId>maven-dependency-plugin</artifactId> -->
-<!--                                           <executions> -->
-<!--                                                   <execution> -->
-<!--                                                           <id>copy-rap</id> -->
-<!--                                                           <phase>package</phase> -->
-<!--                                                           <goals> -->
-<!--                                                                   <goal>copy-dependencies</goal> -->
-<!--                                                           </goals> -->
-<!--                                                           <configuration> -->
-<!--                                                                   <includeTypes>jar</includeTypes> -->
-<!--                                                                   <includeGroupIds>org.eclipse.core,org.eclipse.equinox,org.eclipse.rap,org.eclipse.help,org.argeo.dep.rap,org.eclipse.osgi,com.ibm.icu</includeGroupIds> -->
-<!--                                                                   <outputDirectory>${project.build.directory}/eclipse-rap</outputDirectory> -->
-<!--                                                           </configuration> -->
-<!--                                                   </execution> -->
-<!--                                           </executions> -->
-<!--                                   </plugin> -->
-                                       <plugin>
-                                               <groupId>org.codehaus.mojo</groupId>
-                                               <artifactId>rpm-maven-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>rpm-rap</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>rpm</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <name>eclipse-rap</name>
-                                                                       <projversion>${version.rap}</projversion>
-                                                                       <mappings>
-                                                                               <mapping>
-                                                                                       <directory>/usr/share/eclipse-rap</directory>
-                                                                                       <username>root</username>
-                                                                                       <groupname>root</groupname>
-                                                                                       <filemode>644</filemode>
-                                                                                       <directoryIncluded>false</directoryIncluded>
-                                                                                       <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>

diff --git a/eclipse/features/org.argeo.eclipse.dep.rcp/p2.inf b/eclipse/features/org.argeo.eclipse.dep.rcp/p2.inf
deleted file mode 100644 (file)
index 0423aa5..0000000
--- a/eclipse/features/org.argeo.eclipse.dep.rcp/p2.inf
+++ /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/eclipse/features/org.argeo.eclipse.dep.rcp/pom.xml b/eclipse/features/org.argeo.eclipse.dep.rcp/pom.xml
deleted file mode 100644 (file)
index 6ac8934..0000000
--- a/eclipse/features/org.argeo.eclipse.dep.rcp/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.commons.eclipse</groupId>
-               <artifactId>features</artifactId>
-               <version>0.3.4-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
-       <name>Commons Eclipse RCP Dependencies</name>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.argeo.maven.plugins</groupId>
-                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <!-- common dependencies for both RCP and RAP -->
-               <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
-                       <artifactId>org.argeo.eclipse.dep.common</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.eclipse.ui</groupId>
-                       <artifactId>org.eclipse.ui</artifactId>
-               </dependency>
-
-               <!-- forms -->
-               <dependency>
-                       <groupId>org.eclipse.ui</groupId>
-                       <artifactId>org.eclipse.ui.forms</artifactId>
-               </dependency>
-
-               <!-- SWT -->
-               <dependency>
-                       <groupId>org.eclipse.swt</groupId>
-                       <artifactId>org.eclipse.swt</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.swt</groupId>
-                       <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.swt</groupId>
-                       <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.swt</groupId>
-                       <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
-               </dependency>
-       </dependencies>
-</project>

diff --git a/eclipse/features/pom.xml b/eclipse/features/pom.xml
deleted file mode 100644 (file)
index cfacd08..0000000
--- a/eclipse/features/pom.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.commons.eclipse</groupId>
-               <artifactId>eclipse</artifactId>
-               <version>0.3.4-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>features</artifactId>
-       <name>Commons Eclipse Dependencies</name>
-       <packaging>pom</packaging>
-       <modules>
-               <module>org.argeo.eclipse.dep.common</module>
-               <module>org.argeo.eclipse.dep.rap</module>
-               <module>org.argeo.eclipse.dep.rcp</module>
-       </modules>
-       <build>
-               <resources>
-                       <resource>
-                               <directory>.</directory>
-                               <includes>
-                                       <include>*.inf</include>
-                               </includes>
-                       </resource>
-               </resources>
-               <plugins>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>buildnumber-maven-plugin</artifactId>
-                               <configuration>
-                                       <useLastCommittedRevision>false</useLastCommittedRevision>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                       </plugin>
-               </plugins>
-               <pluginManagement>
-                       <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>
-                                               <execution>
-                                                       <id>generate-descriptors</id>
-                                                       <goals>
-                                                               <goal>descriptors</goal>
-                                                       </goals>
-                                                       <phase>generate-resources</phase>
-                                               </execution>
-                                               <execution>
-                                                       <id>check-osgi</id>
-                                                       <phase>test</phase>
-                                                       <goals>
-                                                               <goal>equinox</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <onlyCheck>true</onlyCheck>
-                                                               <argsToAppend>
-                                                                       <arg>-clean</arg>
-                                                               </argsToAppend>
-                                                       </configuration>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-                       </plugins>
-               </pluginManagement>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.commons.osgi</groupId>
-                       <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
-</project>
\ No newline at end of file

diff --git a/eclipse/pom.xml b/eclipse/pom.xml
index 5b77739c012680ddf80b66817e4becc2ede3fab9..973a4653f427792b11c812c5ab5ad2a6b640f2c0 100644 (file)
--- a/eclipse/pom.xml
+++ b/eclipse/pom.xml
@@ -12,7 +12,7 @@
        <name>Commons Eclipse</name>
        <packaging>pom</packaging>
        <modules>
-               <module>features</module>
+               <module>dep</module>
                <module>runtime</module>
        </modules>
 </project>
\ No newline at end of file