X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Ffeatures%2Forg.argeo.eclipse.dep.rap%2Fpom.xml;h=fcd6a56a3453e4fc2c648b889b4b88bb4885b92c;hb=21a7775f246e442c5fa73f16c8e108d81aa0ffd8;hp=d8c92b52157c349096b5e34fc0bdcb79ae1dadea;hpb=5129cb0d08494ceee4e04d051aa32398a1758828;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 d8c92b521..fcd6a56a3 100644
--- a/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
+++ b/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.commons.eclipse</groupId>
 		<artifactId>features</artifactId>
-		<version>0.2.3-SNAPSHOT</version>
+		<version>0.3.4-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.eclipse.dep.rap</artifactId>
@@ -22,8 +22,21 @@
 		<dependency>
 			<groupId>org.argeo.commons.eclipse</groupId>
 			<artifactId>org.argeo.eclipse.dep.common</artifactId>
-			<version>0.2.3-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>
@@ -33,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>
@@ -45,14 +54,25 @@
 			<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.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>
@@ -65,14 +85,31 @@
 			<groupId>org.eclipse.rap</groupId>
 			<artifactId>org.eclipse.rap.ui.views</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>-->
+		<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>
+		</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>