Cleaned all optional dependencies. Build and tests are working.

org.eclipse.riena.client.ridgets/META-INF/MANIFEST.MF

@@ -6,17 +6,14 @@ Bundle-Version: 6.2.0.qualifier
 Require-Bundle: org.eclipse.core.databinding;visibility:=reexport,
  org.eclipse.core.databinding.beans;visibility:=reexport,
  org.eclipse.core.databinding.property;visibility:=reexport,
- org.eclipse.jface.databinding;resolution:=optional;visibility:=reexport,
- org.eclipse.rap.jface.databinding;resolution:=optional;visibility:=reexport,
+ org.eclipse.jface.databinding;visibility:=reexport,
  org.eclipse.riena.beans.common;visibility:=reexport,
  org.eclipse.riena.core;visibility:=reexport,
  org.eclipse.riena.ui.common;visibility:=reexport,
  org.eclipse.riena.ui.core;visibility:=reexport,
  org.eclipse.riena.ui.ridgets;visibility:=reexport,
  org.eclipse.riena.ui.ridgets.swt;visibility:=reexport,
  org.eclipse.riena.ui.swt;visibility:=reexport,
- org.eclipse.riena.ui.swt.rap;resolution:=optional;visibility:=reexport,
- org.eclipse.riena.ui.swt.rcp;resolution:=optional;visibility:=reexport,
- org.eclipse.ui;resolution:=optional;visibility:=reexport,
- org.eclipse.rap.ui;resolution:=optional;visibility:=reexport
+ org.eclipse.riena.ui.swt.rcp;visibility:=reexport,
+ org.eclipse.ui;visibility:=reexport
 Bundle-Vendor: Eclipse.org - Riena

org.eclipse.riena.client/META-INF/MANIFEST.MF

@@ -7,10 +7,8 @@ Require-Bundle: com.caucho.hessian;visibility:=reexport,
  org.eclipse.core.databinding;visibility:=reexport,
  org.eclipse.core.databinding.beans;visibility:=reexport,
  org.eclipse.core.databinding.property;visibility:=reexport,
- org.eclipse.jface.databinding;resolution:=optional;visibility:=reexport,
- org.eclipse.rap.jface.databinding;resolution:=optional;visibility:=reexport,
+ org.eclipse.jface.databinding;visibility:=reexport,
  org.eclipse.riena.beans.common;visibility:=reexport,
- org.eclipse.riena.communication.console;resolution:=optional;visibility:=reexport,
  org.eclipse.riena.communication.core;visibility:=reexport,
  org.eclipse.riena.communication.factory.hessian;visibility:=reexport,
  org.eclipse.riena.core;visibility:=reexport,
@@ -19,22 +17,16 @@ Require-Bundle: com.caucho.hessian;visibility:=reexport,
  org.eclipse.riena.ui.filter;visibility:=reexport,
  org.eclipse.riena.ui.ridgets;visibility:=reexport,
  org.eclipse.riena.ui.ridgets.swt;visibility:=reexport,
- org.eclipse.riena.ui.ridgets.swt.optional;resolution:=optional;visibility:=reexport,
  org.eclipse.riena.ui.swt;visibility:=reexport,
- org.eclipse.riena.ui.swt.3x;resolution:=optional,
- org.eclipse.riena.ui.swt.rap;resolution:=optional;visibility:=reexport,
- org.eclipse.riena.ui.swt.rcp;resolution:=optional;visibility:=reexport,
+ org.eclipse.riena.ui.swt.3x,
+ org.eclipse.riena.ui.swt.rcp;visibility:=reexport,
  org.eclipse.riena.ui.workarea;visibility:=reexport,
  org.eclipse.riena.navigation;visibility:=reexport,
  org.eclipse.riena.navigation.ui;visibility:=reexport,
  org.eclipse.riena.navigation.ui.swt;visibility:=reexport,
- org.eclipse.riena.navigation.ui.swt.rap;resolution:=optional,
- org.eclipse.riena.navigation.ui.swt.3x;resolution:=optional,
- org.eclipse.riena.navigation.ui.swt.e4;resolution:=optional,
- org.eclipse.ui;resolution:=optional;visibility:=reexport,
- org.eclipse.rap.ui;resolution:=optional;visibility:=reexport,
- org.apache.oro;bundle-version="2.0.8",
- org.eclipse.riena.communication.client.ui;resolution:=optional;visibility:=reexport
+ org.eclipse.riena.navigation.ui.swt.3x,
+ org.eclipse.ui;visibility:=reexport,
+ org.apache.oro;bundle-version="2.0.8"
 Eclipse-RegisterBuddy: org.eclipse.riena.communication.core
 Eclipse-BuddyPolicy: registered
 Bundle-Vendor: Eclipse.org - Riena

org.eclipse.riena.communication.client.ui/META-INF/MANIFEST.MF

@@ -8,8 +8,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.riena.communication.core,
  org.eclipse.riena.core,
  org.eclipse.osgi.services,
- org.eclipse.swt;resolution:=optional;visibility:=reexport,
- org.eclipse.rap.rwt;resolution:=optional;visibility:=reexport
+ org.eclipse.swt;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.riena.communication.client.ui.hooks

org.eclipse.riena.example.client.optional/META-INF/MANIFEST.MF

@@ -5,8 +5,9 @@ Bundle-SymbolicName: org.eclipse.riena.example.client.optional;singleton:=true
 Bundle-Version: 6.2.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.nebula.widgets.compositetable,
+ org.eclipse.nebula.widgets.grid;bundle-version="1.0.0",
  org.eclipse.riena.client,
- org.eclipse.nebula.widgets.grid;bundle-version="1.0.0"
+ org.eclipse.riena.ui.ridgets.swt.optional
 Export-Package: org.eclipse.riena.example.client.optional.controllers,
  org.eclipse.riena.example.client.optional.views
 Bundle-Vendor: Eclipse.org - Riena

org.eclipse.riena.navigation.ui.swt.presentation/META-INF/MANIFEST.MF

@@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Riena Navigation Model UI Plug-in (Presentation)
 Bundle-SymbolicName: org.eclipse.riena.navigation.ui.swt.presentation
 Bundle-Version: 6.2.0.qualifier
-Require-Bundle: org.eclipse.ui;resolution:=optional,
- org.eclipse.rap.ui;resolution:=optional,
+Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.riena.navigation.ui,
  org.eclipse.riena.navigation.ui.swt,

org.eclipse.riena.navigation.ui.swt/META-INF/MANIFEST.MF

@@ -10,8 +10,8 @@ Require-Bundle: org.eclipse.osgi.services,
  org.eclipse.riena.navigation.ui;visibility:=reexport,
  org.eclipse.riena.ui.ridgets.swt,
  org.eclipse.riena.ui.workarea,
- org.eclipse.ui;resolution:=optional,
- org.eclipse.rap.ui;resolution:=optional
+ org.eclipse.ui,
+ org.easymock;resolution:=optional
 Bundle-ActivationPolicy: lazy 
 Export-Package: org.eclipse.riena.internal.navigation.ui.swt;x-friends:="org.eclipse.riena.tests",
  org.eclipse.riena.internal.navigation.ui.swt.handlers;x-friends:="org.eclipse.riena.tests",

org.eclipse.riena.navigation.ui/META-INF/MANIFEST.MF

@@ -10,8 +10,7 @@ Require-Bundle: org.eclipse.core.databinding,
  org.eclipse.riena.ui.core,
  org.eclipse.riena.ui.ridgets,
  org.eclipse.riena.ui.workarea;bundle-version="6.1.0",
- org.eclipse.ui;bundle-version="3.6.0";resolution:=optional,
- org.eclipse.rap.ui;bundle-version="1.4.0";resolution:=optional
+ org.eclipse.ui;bundle-version="3.6.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.riena.internal.navigation.ui;x-friends:="org.eclipse.riena.tests",
  org.eclipse.riena.internal.navigation.ui.filter;x-friends:="org.eclipse.riena.tests",