[jboss-osgi-commits] JBoss-OSGI SVN: r96469 - projects/jboss-osgi/trunk/reactor/framework/src/test/resources/META-INF.

[jboss-osgi-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-11-17 16:36:08 -0500 (Tue, 17 Nov 2009)
New Revision: 96469

Modified:
   projects/jboss-osgi/trunk/reactor/framework/src/test/resources/META-INF/resolver-rules.drl
Log:
Retract WireCandidate to unresolved exporte

Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/resources/META-INF/resolver-rules.drl
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/resources/META-INF/resolver-rules.drl	2009-11-17 20:16:38 UTC (rev 96468)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/META-INF/resolver-rules.drl	2009-11-17 21:36:08 UTC (rev 96469)
@@ -156,6 +156,26 @@
 end
 
 /**************************************************************************************************
+* A rule that retracts a WireCandidate if there is another 
+* associated with an already resolved exporter.
+*/
+rule "Retract WireCandidate to unresolved exporter"
+salience 100
+when
+    $owner : Resolvable( resolved == false )
+    $import : ImportPackage( owner == $owner, exporter == null )
+    $reskeep : Resolvable( resolved == true )
+    $expkeep : ExportPackage( owner  == $reskeep )
+    $wckeep : WireCandidate( importPackage == $import, exportPackage == $expkeep )
+    $resdel : Resolvable( resolved == false )
+    $expdel : ExportPackage( this != $expkeep, owner  == $resdel )
+    $wcdel : WireCandidate( importPackage == $import, exportPackage == $expdel )
+then
+    log("Restract unresolved exporter " + $wcdel);
+    retract ( $wcdel );
+end
+
+/**************************************************************************************************
 * A rule that sets the provider for a RequiredBundle if there is a match
 */
 rule "RequiredBundle match on bundle-symbolic-name only"
@@ -200,23 +220,6 @@
 end
 
 /**************************************************************************************************
-* A rule that applies the WireCandidate if there is an already 
-* resolved exporter.
-*/
-rule "Use WireCandidate to resolved exporter"
-when
-    $importer : Resolvable( resolved == false )
-    $import : ImportPackage( owner == $importer, exporter == null )
-    $exporter : Resolvable( resolved == true )
-    $export : ExportPackage( owner  == $exporter )
-    $wc : WireCandidate( importPackage == $import, exportPackage == $export )
-then
-    log("Use resolved exporter " + $wc);
-    modify ( $wc.getImportPackage() ) { setExporter( $wc.getExportPackage() ) };
-    retract ( $wc );
-end
-
-/**************************************************************************************************
 * A rule that marks the Resolvable as resolved if there 
 * is no more ImportPackage that is not wired to an ExportPackage.
 */