X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Ffeatures%2Forg.argeo.eclipse.dep.rap%2Fpom.xml;h=8c345c41f69679459825ecabc4beb9858160c2d1;hb=3473336e71e4c77de4667c575528eedff620a927;hp=2a27b523b8c6fdd06c5421095f0a3bc4ce0a7928;hpb=5e812929b5f0309b66c0acd87cc9f4ab85f305d4;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 2a27b523b..8c345c41f 100644
--- a/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
+++ b/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
@@ -1,10 +1,11 @@
 <?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.3-SNAPSHOT</version>
+		<version>0.3.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.eclipse.dep.rap</artifactId>
@@ -22,8 +23,21 @@
 		<dependency>
 			<groupId>org.argeo.commons.eclipse</groupId>
 			<artifactId>org.argeo.eclipse.dep.common</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
+			<version>0.3.3-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>
@@ -33,10 +47,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>
@@ -45,18 +55,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>
@@ -69,6 +86,32 @@
 			<groupId>org.eclipse.rap</groupId>
 			<artifactId>org.eclipse.rap.ui.views</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.ui.workbench</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.rap</groupId>
+			<artifactId>org.eclipse.rap.ui</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.rap</groupId>
+			<artifactId>org.eclipse.rap.design.example</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.rap</groupId>
+			<artifactId>org.eclipse.rap.demo</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>
@@ -77,6 +120,7 @@
 			<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>