svn commit: r989682 - in /incubator/aries/trunk/application/application-modeller/src/test: java/org/apache/aries/application/modelling/utils/AbstractBundleResourceTest.java resources/bundles/test.bundle1.jar/META-INF/MANIFEST.MF

[mn...@apache.org]

Author: mnuttall
Date: Thu Aug 26 13:38:39 2010
New Revision: 989682

URL: http://svn.apache.org/viewvc?rev=989682&view=rev
Log:
ARIES-361: Provisioning changes required to support application isolation. Fix unit test problem - need to run with java 5 to reproduce. 

Modified:
    incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/AbstractBundleResourceTest.java
    incubator/aries/trunk/application/application-modeller/src/test/resources/bundles/test.bundle1.jar/META-INF/MANIFEST.MF

Modified: incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/AbstractBundleResourceTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/AbstractBundleResourceTest.java?rev=989682&r1=989681&r2=989682&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/AbstractBundleResourceTest.java (original)
+++ incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/AbstractBundleResourceTest.java Thu Aug 26 13:38:39 2010
@@ -165,7 +165,7 @@ public abstract class AbstractBundleReso
     for(ImportedService svc : bundleResource.getImportedServices()) {
       if (svc.getInterface().equals("aries.ws.eba.import")) {
         count++;
-        assertEquals("The filter is wrong.", "(&(service=service)(objectClass=aries.ws.eba.import)(mandatory:<*service))",
+        assertEquals("The filter is wrong.", "(&(objectClass=aries.ws.eba.import)(service=service)(mandatory:<*service))",
           svc.getAttributeFilter());
       } 
     }

Modified: incubator/aries/trunk/application/application-modeller/src/test/resources/bundles/test.bundle1.jar/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-modeller/src/test/resources/bundles/test.bundle1.jar/META-INF/MANIFEST.MF?rev=989682&r1=989681&r2=989682&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-modeller/src/test/resources/bundles/test.bundle1.jar/META-INF/MANIFEST.MF (original)
+++ incubator/aries/trunk/application/application-modeller/src/test/resources/bundles/test.bundle1.jar/META-INF/MANIFEST.MF Thu Aug 26 13:38:39 2010
@@ -25,30 +25,3 @@ Require-Bundle: com.acme.facade;bundle-v
 Import-Service: aries.ws.eba.import
 Export-Service: aries.ws.eba.export
 Fragment-Host: eba.framework;bundle-version="[3.0,4.0]"
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Test Bundle
-Bundle-SymbolicName: test.bundle1;fragment-attachment:=always;singleton:=true
-Bundle-Version: 2.0.0.build-121
-Bundle-Vendor: Aries
-Import-Package: aries.ejs.ras,
- aries.ws.app.framework.plugin;version="[1,2)",
- aries.ws.event;version="1.0.0",
- aries.ws.ffdc;resolution:=optional,
- aries.ws.kernel.file;resolution:=mandatory,
- aries.wsspi.app.container.aries;bundle-symbolic-name=B;bundle-version="[1.2.0,2.2.0)",
- aries.wsspi.application.aries;company=yang;security:=haha,
- org.osgi.framework;version="1.3.0",
- aries.ws.eba.bundle4;aries.ws.eba.bundle5;version=3,
- aries.ws.eba.bundle6;aries.ws.eba.bundle7
-DynamicImport-Package: *;vendor=acmen, *,aries.ws.eba.bla,aries.ws.eba.launcher;
- version="[1,2]"
-Export-Package: aries.ws.eba.bundle1; version=2.2.0,
- aries.ws.eba.bundle2;aries.ws.eba.bundle3;version=3 
-Require-Bundle: com.acme.facade;bundle-version=3;visibility:=reexport,
- com.acme.bar; visibility:=reexport;resolution:=optional,
- com.ab.de; visibility:=private,
- com.de.ba; resolution:=mandatory,
-Import-Service: aries.ws.eba.import
-Export-Service: aries.ws.eba.export
-Fragment-Host: eba.framework;bundle-version="[3.0,4.0]"