[PAXCDI-193] fixed fragment manifest, use it for all tests

Author: hwellmann

itest/src/it/itest-standalone/src/test/java/org/ops4j/pax/cdi/test/SecurityTest.java

@@ -32,7 +32,6 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
-import org.ops4j.pax.cdi.api.Info;
 import org.ops4j.pax.cdi.sample8.service.SecuredClient;
 import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.Option;
@@ -62,7 +61,6 @@ public Option[] config() {
             // DeltaSpike bundles
             mavenBundle("org.apache.deltaspike.core", "deltaspike-core-api").versionAsInProject(),
             mavenBundle("org.apache.deltaspike.core", "deltaspike-core-impl").versionAsInProject(),
-            mavenBundle("org.ops4j.pax.cdi", "pax-cdi-weld-fragment", Info.getPaxCdiVersion()).noStart(),
 
             // Uncomment this section and delete the next after upgrading to DS 1.4.2
             // mavenBundle("org.apache.deltaspike.modules", "deltaspike-security-module-api").versionAsInProject(),

pax-cdi-test-support/src/main/java/org/ops4j/pax/cdi/test/support/TestConfiguration.java

@@ -268,6 +268,7 @@ public static Option openWebBeans15Bundles() {
     public static Option weld2Bundles() {
         return composite(
             workspaceBundle("org.ops4j.pax.cdi", "pax-cdi-weld"),
+            mavenBundle("org.ops4j.pax.cdi", "pax-cdi-weld-fragment", Info.getPaxCdiVersion()).noStart(),
             mavenBundle("org.apache.xbean", "xbean-bundleutils", "4.1"),
             mavenBundle("org.jboss.logging", "jboss-logging", "3.1.3.GA"),
             mavenBundle("org.jboss.classfilewriter", "jboss-classfilewriter", "1.1.1.Final"),

pax-cdi-weld-fragment/pom.xml

@@ -2,11 +2,11 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.ops4j.pax</groupId>
-        <artifactId>cdi</artifactId>
+        <groupId>org.ops4j.pax.cdi</groupId>
+        <artifactId>pax-cdi-parent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pax-cdi-parent</relativePath>
     </parent>
-    <groupId>org.ops4j.pax.cdi</groupId>
     <artifactId>pax-cdi-weld-fragment</artifactId>
     <packaging>bundle</packaging>
 
@@ -15,8 +15,7 @@
         <bundle.symbolicName>org.ops4j.pax.cdi.weld.fragment</bundle.symbolicName>
         <bundle.namespace>org.ops4j.pax.cdi.weld.fragment</bundle.namespace>
     </properties>
-
-
+    
     <build>
         <plugins>
             <plugin>
@@ -26,12 +25,10 @@
                     <instructions>
                         <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
                         <Fragment-Host>org.jboss.weld.osgi-bundle</Fragment-Host>
-                        <Import-Package>
-                            org.jboss.weld.*, *
-                        </Import-Package>
-                        <Export-Package>
-                            org.jboss.weld.*
-                        </Export-Package>
+                        <_exportcontents>
+                            org.jboss.weld.interceptor.proxy;version="2.2",
+                            org.jboss.weld.interceptor.util.proxy;version="2.2"
+                        </_exportcontents>
                     </instructions>
                 </configuration>
             </plugin>