Introduce plain RWT RAP dependencies.

diff --git a/dep/org.argeo.suite.dep.e4.rap/pom.xml b/dep/org.argeo.suite.dep.e4.rap/pom.xml
index ebf2530c92403e45f5bb4f095b89a3e9b277ed2b..3dbc788332540f78b5489e72512c562a20168a73 100644 (file)
--- a/dep/org.argeo.suite.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rap/pom.xml
@@ -10,42 +10,17 @@
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.dep.e4.rap</artifactId>
-       <name>Suite E4 Platform RAP</name>
+       <name>Suite Platform E4 RAP</name>
        <packaging>jar</packaging>
        <dependencies>
-               <!-- Entity Framework -->
+               <!-- Argeo Suite UI -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
-                       <artifactId>org.argeo.entity.api</artifactId>
-                       <version>2.1.16-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.suite</groupId>
-                       <artifactId>org.argeo.entity.core</artifactId>
-                       <version>2.1.16-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.suite</groupId>
-                       <artifactId>org.argeo.entity.ui</artifactId>
+                       <artifactId>org.argeo.suite.dep.ui.rap</artifactId>
                        <version>2.1.16-SNAPSHOT</version>
+                       <type>pom</type>
                </dependency>
 
-               <!-- Argeo Suite -->
-               <dependency>
-                       <groupId>org.argeo.suite</groupId>
-                       <artifactId>org.argeo.suite.core</artifactId>
-                       <version>2.1.16-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.suite</groupId>
-                       <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.1.16-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.suite</groupId>
-                       <artifactId>org.argeo.suite.ui.rap</artifactId>
-                       <version>2.1.16-SNAPSHOT</version>
-               </dependency>
 
                <!-- Base CMS distribution -->
                <dependency>
@@ -56,72 +31,10 @@
                </dependency>
 
                <!-- Argeo TP Extras -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.payment</groupId> -->
-<!--                   <artifactId>com.stripe</artifactId> -->
-<!--           </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp.payment</groupId> -->
+               <!-- <artifactId>com.stripe</artifactId> -->
+               <!-- </dependency> -->
 
        </dependencies>
-       <profiles>
-               <profile>
-                       <id>rpmbuild</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <artifactId>maven-assembly-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>prepare-source</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>single</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <descriptorRefs>
-                                                                               <descriptorRef>a2-source</descriptorRef>
-                                                                       </descriptorRefs>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                                       <plugin>
-                                               <groupId>org.codehaus.mojo</groupId>
-                                               <artifactId>rpm-maven-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>rpm-argeo</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>rpm</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <name>argeo-suite-e4-rap</name>
-                                                                       <mappings>
-                                                                               <mapping>
-                                                                                       <directory>/usr/share/osgi</directory>
-                                                                                       <username>root</username>
-                                                                                       <groupname>root</groupname>
-                                                                                       <filemode>644</filemode>
-                                                                                       <directoryIncluded>true</directoryIncluded>
-                                                                                       <sources>
-                                                                                               <source>
-                                                                                                       <location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source</location>
-                                                                                                       <includes>
-                                                                                                               <include>**/*.jar</include>
-                                                                                                       </includes>
-                                                                                               </source>
-                                                                                       </sources>
-                                                                               </mapping>
-                                                                       </mappings>
-                                                                       <requires>
-                                                                               <require>argeo-connect-e4-rap</require>
-                                                                       </requires>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
-       </profiles>
 </project>

diff --git a/dep/org.argeo.suite.dep.ui.rap/.gitignore b/dep/org.argeo.suite.dep.ui.rap/.gitignore
new file mode 100644 (file)
index 0000000..76df179
--- /dev/null
+++ b/dep/org.argeo.suite.dep.ui.rap/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/*.target

diff --git a/dep/org.argeo.suite.dep.ui.rap/META-INF/.gitignore b/dep/org.argeo.suite.dep.ui.rap/META-INF/.gitignore
new file mode 100644 (file)
index 0000000..4854a41
--- /dev/null
+++ b/dep/org.argeo.suite.dep.ui.rap/META-INF/.gitignore
@@ -0,0 +1 @@
+/MANIFEST.MF

diff --git a/dep/org.argeo.suite.dep.ui.rap/bnd.bnd b/dep/org.argeo.suite.dep.ui.rap/bnd.bnd
new file mode 100644 (file)
index 0000000..991aa1a
--- /dev/null
+++ b/dep/org.argeo.suite.dep.ui.rap/bnd.bnd
@@ -0,0 +1 @@
+    
\ No newline at end of file

diff --git a/dep/org.argeo.suite.dep.ui.rap/p2.inf b/dep/org.argeo.suite.dep.ui.rap/p2.inf
new file mode 100644 (file)
index 0000000..0423aa5
--- /dev/null
+++ b/dep/org.argeo.suite.dep.ui.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/dep/org.argeo.suite.dep.ui.rap/pom.xml b/dep/org.argeo.suite.dep.ui.rap/pom.xml
new file mode 100644 (file)
index 0000000..bac0d06
--- /dev/null
+++ b/dep/org.argeo.suite.dep.ui.rap/pom.xml
@@ -0,0 +1,132 @@
+<?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.suite</groupId>
+               <artifactId>dep</artifactId>
+               <version>2.1.16-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.suite.dep.ui.rap</artifactId>
+       <name>Suite Platform UI RAP</name>
+       <packaging>jar</packaging>
+       <dependencies>
+               <!-- Entity Framework -->
+               <dependency>
+                       <groupId>org.argeo.suite</groupId>
+                       <artifactId>org.argeo.entity.api</artifactId>
+                       <version>2.1.16-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.suite</groupId>
+                       <artifactId>org.argeo.entity.core</artifactId>
+                       <version>2.1.16-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.suite</groupId>
+                       <artifactId>org.argeo.entity.ui</artifactId>
+                       <version>2.1.16-SNAPSHOT</version>
+               </dependency>
+
+               <!-- Argeo Suite -->
+               <dependency>
+                       <groupId>org.argeo.suite</groupId>
+                       <artifactId>org.argeo.suite.core</artifactId>
+                       <version>2.1.16-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.suite</groupId>
+                       <artifactId>org.argeo.suite.ui</artifactId>
+                       <version>2.1.16-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.suite</groupId>
+                       <artifactId>org.argeo.suite.theme.default</artifactId>
+                       <version>2.1.16-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.suite</groupId>
+                       <artifactId>org.argeo.suite.ui.rap</artifactId>
+                       <version>2.1.16-SNAPSHOT</version>
+               </dependency>
+
+               <!-- Base CMS distribution -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.dep.cms.ui.rap</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <type>pom</type>
+               </dependency>
+
+               <!-- Argeo TP Extras -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.payment</groupId> -->
+<!--                   <artifactId>com.stripe</artifactId> -->
+<!--           </dependency> -->
+
+       </dependencies>
+       <profiles>
+               <profile>
+                       <id>rpmbuild</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <artifactId>maven-assembly-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>prepare-source</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>single</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <descriptorRefs>
+                                                                               <descriptorRef>a2-source</descriptorRef>
+                                                                       </descriptorRefs>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-argeo</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>argeo-suite-ui-rap</name>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>true</directoryIncluded>
+                                                                                       <sources>
+                                                                                               <source>
+                                                                                                       <location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source</location>
+                                                                                                       <includes>
+                                                                                                               <include>**/*.jar</include>
+                                                                                                       </includes>
+                                                                                               </source>
+                                                                                       </sources>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                                       <requires>
+                                                                               <require>argeo-cms-ui-rap</require>
+                                                                       </requires>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
+</project>

diff --git a/dep/pom.xml b/dep/pom.xml
index 9a359076d84063eba99f85d04bcc4ae847a99b93..3fce969f2bc22acdbe60739efcf3cffaa72a8c80 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -1,5 +1,7 @@
 <?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">
+<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.suite</groupId>
@@ -11,8 +13,9 @@
        <name>Argeo Suite Dependencies</name>
        <packaging>pom</packaging>
        <modules>
+               <module>org.argeo.suite.dep.ui.rap</module>
                <module>org.argeo.suite.dep.e4.rap</module>
-               <module>org.argeo.suite.dep.e4.rcp</module>
+               <!-- <module>org.argeo.suite.dep.e4.rcp</module> -->
        </modules>
        <build>
                <plugins>
@@ -48,6 +51,11 @@
        </build>
        <dependencies>
                <!-- SDK -->
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.osgi</artifactId>
+                       <scope>test</scope>
+               </dependency>
                <dependency>
                        <groupId>org.argeo.tp.sdk</groupId>
                        <artifactId>org.junit</artifactId>