You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2011/12/01 22:49:53 UTC
svn commit: r1209266 - in /karaf/cellar/branches/cellar-2.2.x: ./ core/
core/src/main/java/org/apache/karaf/cellar/core/ core/src/test/java/
core/src/test/java/org/ core/src/test/java/org/apache/
core/src/test/java/org/apache/karaf/ core/src/test/java/...
Author: iocanel
Date: Thu Dec 1 21:49:51 2011
New Revision: 1209266
URL: http://svn.apache.org/viewvc?rev=1209266&view=rev
Log:
Merged from trunk
[KARAF-1076] Fixed issue with group configurations and whitespaces. Added unit tests that checks this case. [from revision 1209264]
Added:
karaf/cellar/branches/cellar-2.2.x/core/src/test/java/
- copied from r1209264, karaf/cellar/trunk/core/src/test/java/
karaf/cellar/branches/cellar-2.2.x/core/src/test/java/org/
- copied from r1209264, karaf/cellar/trunk/core/src/test/java/org/
karaf/cellar/branches/cellar-2.2.x/core/src/test/java/org/apache/
- copied from r1209264, karaf/cellar/trunk/core/src/test/java/org/apache/
karaf/cellar/branches/cellar-2.2.x/core/src/test/java/org/apache/karaf/
- copied from r1209264, karaf/cellar/trunk/core/src/test/java/org/apache/karaf/
karaf/cellar/branches/cellar-2.2.x/core/src/test/java/org/apache/karaf/cellar/
- copied from r1209264, karaf/cellar/trunk/core/src/test/java/org/apache/karaf/cellar/
karaf/cellar/branches/cellar-2.2.x/core/src/test/java/org/apache/karaf/cellar/core/
- copied from r1209264, karaf/cellar/trunk/core/src/test/java/org/apache/karaf/cellar/core/
karaf/cellar/branches/cellar-2.2.x/core/src/test/java/org/apache/karaf/cellar/core/CellarSupportTest.java
- copied unchanged from r1209264, karaf/cellar/trunk/core/src/test/java/org/apache/karaf/cellar/core/CellarSupportTest.java
karaf/cellar/branches/cellar-2.2.x/core/src/test/resources/
- copied from r1209264, karaf/cellar/trunk/core/src/test/resources/
karaf/cellar/branches/cellar-2.2.x/core/src/test/resources/org/
- copied from r1209264, karaf/cellar/trunk/core/src/test/resources/org/
karaf/cellar/branches/cellar-2.2.x/core/src/test/resources/org/apache/
- copied from r1209264, karaf/cellar/trunk/core/src/test/resources/org/apache/
karaf/cellar/branches/cellar-2.2.x/core/src/test/resources/org/apache/karaf/
- copied from r1209264, karaf/cellar/trunk/core/src/test/resources/org/apache/karaf/
karaf/cellar/branches/cellar-2.2.x/core/src/test/resources/org/apache/karaf/cellar/
- copied from r1209264, karaf/cellar/trunk/core/src/test/resources/org/apache/karaf/cellar/
karaf/cellar/branches/cellar-2.2.x/core/src/test/resources/org/apache/karaf/cellar/core/
- copied from r1209264, karaf/cellar/trunk/core/src/test/resources/org/apache/karaf/cellar/core/
karaf/cellar/branches/cellar-2.2.x/core/src/test/resources/org/apache/karaf/cellar/core/groups.properties
- copied unchanged from r1209264, karaf/cellar/trunk/core/src/test/resources/org/apache/karaf/cellar/core/groups.properties
Modified:
karaf/cellar/branches/cellar-2.2.x/ (props changed)
karaf/cellar/branches/cellar-2.2.x/core/pom.xml
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java
Propchange: karaf/cellar/branches/cellar-2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 1 21:49:51 2011
@@ -1 +1 @@
-/karaf/cellar/trunk:1101991,1102000,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494,1161515,1161766,1162249,1162252,1162321,1162327,1162356-1162357,1162390,1162397,1162399,1164077,1164523,1164989,1164994,1166403,1166434,1181287,1186085,1202090,1202105,1202108,1202111,1203975,1204173,1204184,1204209,1205187
+/karaf/cellar/trunk:1101991,1102000,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494,1161515,1161766,1162249,1162252,1162321,1162327,1162356-1162357,1162390,1162397,1162399,1164077,1164523,1164989,1164994,1166403,1166434,1181287,1186085,1202090,1202105,1202108,1202111,1203975,1204173,1204184,1204209,1205187,1209264
Modified: karaf/cellar/branches/cellar-2.2.x/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/core/pom.xml?rev=1209266&r1=1209265&r2=1209266&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/core/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/core/pom.xml Thu Dec 1 21:49:51 2011
@@ -45,6 +45,17 @@
</osgi.export>
</properties>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources/</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </testResource>
+ </testResources>
+ </build>
+
<dependencies>
<!-- OSGi dependencies -->
<dependency>
@@ -81,8 +92,15 @@
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java?rev=1209266&r1=1209265&r2=1209266&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java Thu Dec 1 21:49:51 2011
@@ -58,14 +58,18 @@ public class CellarSupport {
String propertyName = group + Configurations.SEPARATOR + category + Configurations.SEPARATOR + listType + Configurations.SEPARATOR + type.name().toLowerCase();
String propertyValue = dictionary.get(propertyName);
if (propertyValue != null) {
+ propertyValue = propertyValue.replaceAll("\n","");
String[] itemList = propertyValue.split(Configurations.DELIMETER);
if (itemList != null && itemList.length > 0) {
if (result == null) {
result = new HashSet<String>();
}
- for (String item : itemList)
- result.add(item);
+ for (String item : itemList) {
+ if (item != null) {
+ result.add(item.trim());
+ }
+ }
}
}
}
@@ -146,11 +150,12 @@ public class CellarSupport {
}
}
- //If any blackList item matcheds, then false is returned.
+ //If any blackList item matched, then false is returned.
if (blackList != null && !blackList.isEmpty()) {
for (String blackListItem : blackList) {
- if (wildCardMatch(event, blackListItem))
+ if (wildCardMatch(event, blackListItem)) {
result = false;
+ }
}
}