You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by da...@apache.org on 2014/02/10 18:00:56 UTC
svn commit: r1566682 - in /aries/trunk/spi-fly/spi-fly-static-tool/src:
main/java/org/apache/aries/spifly/statictool/Main.java
test/java/org/apache/aries/spifly/statictool/RequirementTest.java
Author: davidb
Date: Mon Feb 10 17:00:56 2014
New Revision: 1566682
URL: http://svn.apache.org/r1566682
Log:
[ARIES-1156] SPI Fly fix syntax errors with static tool Manifest generation
Modified:
aries/trunk/spi-fly/spi-fly-static-tool/src/main/java/org/apache/aries/spifly/statictool/Main.java
aries/trunk/spi-fly/spi-fly-static-tool/src/test/java/org/apache/aries/spifly/statictool/RequirementTest.java
Modified: aries/trunk/spi-fly/spi-fly-static-tool/src/main/java/org/apache/aries/spifly/statictool/Main.java
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-static-tool/src/main/java/org/apache/aries/spifly/statictool/Main.java?rev=1566682&r1=1566681&r2=1566682&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-static-tool/src/main/java/org/apache/aries/spifly/statictool/Main.java (original)
+++ aries/trunk/spi-fly/spi-fly-static-tool/src/main/java/org/apache/aries/spifly/statictool/Main.java Mon Feb 10 17:00:56 2014
@@ -103,6 +103,11 @@ public class Main {
// Take out the processor requirement, this probably needs to be improved a little bit
String newConsumerHeaderVal = consumerHeaderVal.replaceAll(
"osgi[.]extender;\\s*filter[:][=][\"]?[(]osgi[.]extender[=]osgi[.]serviceloader[.]processor[)][\"]?", "");
+ if (newConsumerHeaderVal.startsWith(","))
+ newConsumerHeaderVal = newConsumerHeaderVal.substring(1);
+
+ if (newConsumerHeaderVal.endsWith(","))
+ newConsumerHeaderVal = newConsumerHeaderVal.substring(0, newConsumerHeaderVal.length()-1);
manifest.getMainAttributes().putValue(SpiFlyConstants.REQUIRE_CAPABILITY, newConsumerHeaderVal);
}
manifest.getMainAttributes().putValue(SpiFlyConstants.PROCESSED_SPI_CONSUMER_HEADER, consumerHeaderVal);
Modified: aries/trunk/spi-fly/spi-fly-static-tool/src/test/java/org/apache/aries/spifly/statictool/RequirementTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-static-tool/src/test/java/org/apache/aries/spifly/statictool/RequirementTest.java?rev=1566682&r1=1566681&r2=1566682&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-static-tool/src/test/java/org/apache/aries/spifly/statictool/RequirementTest.java (original)
+++ aries/trunk/spi-fly/spi-fly-static-tool/src/test/java/org/apache/aries/spifly/statictool/RequirementTest.java Mon Feb 10 17:00:56 2014
@@ -81,7 +81,7 @@ public class RequirementTest {
Assert.assertEquals("2.0", expectedMF.getMainAttributes().getValue("Bundle-ManifestVersion"));
Assert.assertEquals("testbundle", expectedMF.getMainAttributes().getValue("Bundle-SymbolicName"));
Assert.assertEquals("Bar Bar", expectedMF.getMainAttributes().getValue("Foo"));
- Assert.assertEquals("osgi.serviceloader; filter:=\"(osgi.serviceloader=org.apache.aries.spifly.mysvc.SPIProvider)\";cardinality:=multiple,",
+ Assert.assertEquals("osgi.serviceloader; filter:=\"(osgi.serviceloader=org.apache.aries.spifly.mysvc.SPIProvider)\";cardinality:=multiple",
expectedMF.getMainAttributes().getValue(SpiFlyConstants.REQUIRE_CAPABILITY));
String importPackage = expectedMF.getMainAttributes().getValue("Import-Package");
Assert.assertTrue(