X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Ffeatures%2Forg.argeo.eclipse.dep.rap%2Fpom.xml;h=fcd6a56a3453e4fc2c648b889b4b88bb4885b92c;hb=ae696952b94054d3b9ec8ab05c02fc82d11607bf;hp=24b5e5321eaff7ae83e4f29e1ac7e25a0da0e921;hpb=2e73e0037ec05e883d23e776495ffbe01c3db465;p=lgpl%2Fargeo-commons.git

diff --git a/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml b/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
index 24b5e5321..fcd6a56a3 100644
--- a/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
+++ b/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
@@ -1,15 +1,14 @@
 <?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.commons.eclipse</groupId>
 		<artifactId>features</artifactId>
-		<version>0.2.2-SNAPSHOT</version>
+		<version>0.3.4-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.eclipse.dep.rap</artifactId>
-	<name>Argeo Commons RAP Dependencies</name>
+	<name>Commons Eclipse RAP Dependencies</name>
 	<build>
 		<plugins>
 			<plugin>
@@ -23,8 +22,21 @@
 		<dependency>
 			<groupId>org.argeo.commons.eclipse</groupId>
 			<artifactId>org.argeo.eclipse.dep.common</artifactId>
-			<version>0.2.2-SNAPSHOT</version>
+			<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>org.eclipse.rap</groupId>
@@ -34,10 +46,6 @@
 			<groupId>javax.servlet</groupId>
 			<artifactId>com.springsource.javax.servlet</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.equinox</groupId>
-			<artifactId>org.eclipse.equinox.http.jetty</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.equinox</groupId>
 			<artifactId>org.eclipse.equinox.http.registry</artifactId>
@@ -46,18 +54,25 @@
 			<groupId>org.eclipse.equinox</groupId>
 			<artifactId>org.eclipse.equinox.http.servlet</artifactId>
 		</dependency>
-		<!-- <dependency> <groupId>org.eclipse.rap</groupId> <artifactId>org.eclipse.rap.demo.databinding</artifactId> 
-			</dependency> <dependency> <groupId>org.eclipse.rap</groupId> <artifactId>org.eclipse.rap.demo</artifactId> 
-			</dependency> <dependency> <groupId>org.eclipse.rap</groupId> <artifactId>org.eclipse.rap.design.example</artifactId> 
-			</dependency> -->
+
+		<!-- RAP -->
+		<!-- Order is important -->
 		<dependency>
 			<groupId>org.eclipse.rap</groupId>
-			<artifactId>org.eclipse.rap.jface.databinding</artifactId>
+			<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>
@@ -70,6 +85,20 @@
 			<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>
+		<dependency>
+			<groupId>org.eclipse.rap</groupId>
+			<artifactId>org.eclipse.rap.ui</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>
@@ -78,6 +107,9 @@
 			<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>