X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Fruntime%2Forg.argeo.eclipse.ui.rap%2Fpom.xml;h=7dcb9622b1fd2c52979cfbd90deb22bc1a3efa00;hb=0aa1c816931dfce599fb6855eb216d743c1583b2;hp=a852e57d13a9cb20084ec480ceb7f01f7cc06297;hpb=f93298706f9e5fd657e260ae0f42cebf74d21a34;p=lgpl%2Fargeo-commons.git

diff --git a/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml b/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml
index a852e57d1..7dcb9622b 100644
--- a/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml
+++ b/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml
@@ -32,13 +32,17 @@
 					<instructions>
 						<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
 						<Bundle-Activator>org.argeo.eclipse.ui.ArgeoUiPlugin</Bundle-Activator>
-						<Require-Bundle>org.eclipse.rap.ui,org.eclipse.core.runtime</Require-Bundle>
+						<Require-Bundle>org.eclipse.rap.ui,org.eclipse.rwt.widgets.upload,org.eclipse.core.runtime</Require-Bundle>
+						<!-- IMPORTANT : Note that we must exclude certain packages that are 
+							provided by dependencies to be sure that packages used in the current workspace 
+							are those provided by the require-bundles. Especially rwt.widgets.upload 
+							by instance. -->
 						<Import-Package>
-							org.springframework.beans.factory,
-							org.springframework.core.io.support,
 							org.apache.commons.io,
 							org.argeo,
-							org.argeo.eclipse.ui.dialogs,
+							org.springframework.beans.factory,
+							org.springframework.core.io.support,
+							!org.eclipse.rwt.widgets,
 							!org.eclipse.core.runtime,
 							!org.eclipse.core.commands,
 							!org.eclipse.ui.plugin,
@@ -49,6 +53,9 @@
 			</plugin>
 		</plugins>
 	</build>
+
+	<!-- deleted from import package : javax.servlet, javax.servlet.http,org.argeo.eclipse.ui.dialogs, 
+		org.eclipse.jface.dialogs, -->
 	<dependencies>
 		<!-- Argeo Commons for Eclipse (not specific) -->
 		<dependency>
@@ -56,10 +63,23 @@
 			<artifactId>org.argeo.eclipse.ui</artifactId>
 			<version>0.2.3-SNAPSHOT</version>
 		</dependency>
+
+		<!-- Argeo common distribution for RAP projects -->
+		<dependency>
+			<groupId>org.argeo.commons.eclipse</groupId>
+			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+
 		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.io</artifactId>
+			<groupId>org.argeo.dep.rap</groupId>
+			<artifactId>org.eclipse.rwt.widgets.upload</artifactId>
 		</dependency>
 
+		<!-- Logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+		</dependency>
 	</dependencies>
 </project>