aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwr...@apache.org
Subject svn commit: r1417521 - /aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/DependencyCalculator.java
Date Wed, 05 Dec 2012 16:52:36 GMT
Author: jwross
Date: Wed Dec  5 16:52:35 2012
New Revision: 1417521

URL: http://svn.apache.org/viewvc?rev=1417521&view=rev
Log:
Allow for ~, <, and > operators in requirement filter syntax.

Modified:
    aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/DependencyCalculator.java

Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/DependencyCalculator.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/DependencyCalculator.java?rev=1417521&r1=1417520&r2=1417521&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/DependencyCalculator.java
(original)
+++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/DependencyCalculator.java
Wed Dec  5 16:52:35 2012
@@ -135,7 +135,7 @@ public class DependencyCalculator {
 			String filter = requirement.getDirectives().get(Constants.FILTER_DIRECTIVE);
 			if (filter == null)
 				return;
-			Pattern pattern = Pattern.compile("\\(([^(=]+)=([^)]+)\\)");
+			Pattern pattern = Pattern.compile("\\(([^<>~(=]+)(?:=|<=|>=|~=)([^)]+)\\)");
 			Matcher matcher = pattern.matcher(filter);
 			while (matcher.find())
 				attributes.put(matcher.group(1), matcher.group(2));



Mime
View raw message