refs bug 366714 - extracted separate fileupload feature
diff --git a/features/org.eclipse.rap.incubator.feature/feature.xml b/features/org.eclipse.rap.incubator.feature/feature.xml
index 24a7823..2035cfa 100644
--- a/features/org.eclipse.rap.incubator.feature/feature.xml
+++ b/features/org.eclipse.rap.incubator.feature/feature.xml
@@ -21,46 +21,8 @@
          id="org.eclipse.rap.incubator.ports.gef.feature"
          version="0.0.0"/>
 
-   <plugin
-         id="org.eclipse.rap.rwt.supplemental.filedialog"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rap.rwt.supplemental.fileupload"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.fileupload"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.io"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rap.rwt.supplemental.fileupload.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rap.rwt.supplemental.filedialog.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+   <includes
+         id="org.eclipse.rap.incubator.supplemental.fileupload.feature"
+         version="0.0.0"/>
 
 </feature>
diff --git a/releng/org.eclipse.rap.incubator.releng/pom.xml b/releng/org.eclipse.rap.incubator.releng/pom.xml
index bfd83cc..03d29ce 100644
--- a/releng/org.eclipse.rap.incubator.releng/pom.xml
+++ b/releng/org.eclipse.rap.incubator.releng/pom.xml
@@ -37,10 +37,17 @@
   <modules>
     <module>incubator-repository</module>
     <module>../org.eclipse.rap.incubator.feature</module>
-    <module>../org.eclipse.rap.incubator.ports.gef.feature</module>
+    <module>../org.eclipse.rap.incubator.supplemental.fileupload.feature</module>
     <module>../../supplemental/fileupload/org.eclipse.rap.rwt.supplemental.filedialog</module>
     <module>../../supplemental/fileupload/org.eclipse.rap.rwt.supplemental.fileupload</module>
     <module>../../supplemental/fileupload/org.eclipse.rap.rwt.supplemental.fileupload.test</module>
+    <module>../org.eclipse.rap.incubator.ports.gef.feature</module>    
+    <module>../../ports/gef/org.eclipse.draw2d</module>
+    <module>../../ports/gef/org.eclipse.draw2d.rap</module>
+    <module>../../ports/gef/org.eclipse.gef</module>
+    <module>../../ports/gef/org.eclipse.rap.gef.demo</module>
+    <module>../../ports/gef/org.eclipse.zest.core</module>
+    <module>../../ports/gef/org.eclipse.zest.layouts</module>
   </modules>
 
   <repositories>