You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ma...@apache.org on 2011/03/02 20:29:14 UTC
svn commit: r1076345 - in /aries/trunk/application/application-utils/src:
main/java/org/apache/aries/application/utils/manifest/ManifestHeaderProcessor.java
test/java/org/apache/aries/application/utils/manifest/ManifestHeaderProcessorTest.java
Author: mahrwald
Date: Wed Mar 2 19:29:14 2011
New Revision: 1076345
URL: http://svn.apache.org/viewvc?rev=1076345&view=rev
Log:
ARIES-593: Fix up processing of directives
Modified:
aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/ManifestHeaderProcessor.java
aries/trunk/application/application-utils/src/test/java/org/apache/aries/application/utils/manifest/ManifestHeaderProcessorTest.java
Modified: aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/ManifestHeaderProcessor.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/ManifestHeaderProcessor.java?rev=1076345&r1=1076344&r2=1076345&view=diff
==============================================================================
--- aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/ManifestHeaderProcessor.java (original)
+++ aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/ManifestHeaderProcessor.java Wed Mar 2 19:29:14 2011
@@ -32,7 +32,6 @@ import org.apache.aries.application.Cont
import org.apache.aries.application.VersionRange;
import org.apache.aries.application.impl.ContentImpl;
import org.apache.aries.application.impl.VersionRangeImpl;
-import org.apache.aries.application.utils.internal.MessageUtil;
import org.apache.aries.util.ManifestHeaderUtils;
import org.osgi.framework.Constants;
@@ -283,7 +282,15 @@ public class ManifestHeaderProcessor
String second = parts.get(1).trim();
if (second.startsWith("\"") && second.endsWith("\""))
second = second.substring(1,second.length()-1);
- params.put(parts.get(0).trim(), second);
+
+ String first = parts.get(0).trim();
+
+ // make sure for directives we clear out any space as in "directive :=value"
+ if (first.endsWith(":")) {
+ first = first.substring(0, first.length()-1).trim()+":";
+ }
+
+ params.put(first, second);
}
}
Modified: aries/trunk/application/application-utils/src/test/java/org/apache/aries/application/utils/manifest/ManifestHeaderProcessorTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-utils/src/test/java/org/apache/aries/application/utils/manifest/ManifestHeaderProcessorTest.java?rev=1076345&r1=1076344&r2=1076345&view=diff
==============================================================================
--- aries/trunk/application/application-utils/src/test/java/org/apache/aries/application/utils/manifest/ManifestHeaderProcessorTest.java (original)
+++ aries/trunk/application/application-utils/src/test/java/org/apache/aries/application/utils/manifest/ManifestHeaderProcessorTest.java Wed Mar 2 19:29:14 2011
@@ -31,7 +31,6 @@ import java.util.List;
import java.util.Map;
import org.apache.aries.application.VersionRange;
-import org.apache.aries.application.utils.internal.MessageUtil;
import org.apache.aries.application.utils.manifest.ManifestHeaderProcessor.NameValueMap;
import org.apache.aries.application.utils.manifest.ManifestHeaderProcessor.NameValuePair;
import org.junit.Test;
@@ -209,9 +208,9 @@ public class ManifestHeaderProcessorTest
}
assertEquals("The names of the packages are wrong.", 2, k);
-
-
- }
+ exportPackageReturn = ManifestHeaderProcessor.parseExportString("some.export.with.space.in;directive := spacey");
+ assertEquals(exportPackageReturn.toString(), "spacey", exportPackageReturn.get(0).getValue().get("directive:"));
+ }
@Test
public void testExportMandatoryAttributes() {