You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2009/06/10 17:58:36 UTC
svn commit: r783406 - in /felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test: ./ recipes/ src/org/apache/felix/framework/test/ src/org/apache/felix/framework/test/fragment/b7/ src/org/apache/felix/framework/test/fragment/b8/

Author: rickhall
Date: Wed Jun 10 15:58:32 2009
New Revision: 783406

URL: http://svn.apache.org/viewvc?rev=783406&view=rev
Log:
Add a test case with multiple fragments for one host with merged
imported packages.

Added:
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b8.bnd
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b8/
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b8/Activator.java
      - copied, changed from r774012, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b7/Activator.java
Removed:
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b7/Activator.java
Modified:
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/bnd.bnd
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b6.bnd
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b7.bnd
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/TestFragment.java

Modified: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/bnd.bnd?rev=783406&r1=783405&r2=783406&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/bnd.bnd (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/bnd.bnd Wed Jun 10 15:58:32 2009
@@ -6,7 +6,7 @@
  resolver.b5.jar, resolver.b6.jar, resolver.b7.jar, \
  fragment.b1.jar, fragment.b2.jar, fragment.b3.jar, \
  fragment.b4.jar, fragment.b5.jar, \
- fragment.b6.jar, fragment.b7.jar, \
+ fragment.b6.jar, fragment.b7.jar, fragment.b8.jar, \
  org/apache/felix/framework/test/fragment/Message.properties=src/resource/Message.properties,org/apache/felix/framework/test/fragment/Message_fr.properties=src/resource/Message_fr.properties
 
 -buildpath: \

Modified: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b6.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b6.bnd?rev=783406&r1=783405&r2=783406&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b6.bnd (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b6.bnd Wed Jun 10 15:58:32 2009
@@ -1,5 +1,5 @@
 Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b6
 -failok : true
-Bundle-Activator: org.apache.felix.framework.test.fragment.b7.Activator
+Bundle-Activator: org.apache.felix.framework.test.fragment.b8.Activator
 Export-Package: org.apache.felix.framework.test.fragment.b6
-Import-Package:
+Import-Package: org.osgi.framework

Modified: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b7.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b7.bnd?rev=783406&r1=783405&r2=783406&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b7.bnd (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b7.bnd Wed Jun 10 15:58:32 2009
@@ -1,3 +1,5 @@
 Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b7
+-failok : true
 Private-Package: org.apache.felix.framework.test.fragment.b7
 Fragment-Host: org.apache.felix.framework.test.fragment.b6
+Import-Package: org.osgi.framework,javax.swing

Added: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b8.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b8.bnd?rev=783406&view=auto
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b8.bnd (added)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b8.bnd Wed Jun 10 15:58:32 2009
@@ -0,0 +1,5 @@
+Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b8
+-failok : true
+Private-Package: org.apache.felix.framework.test.fragment.b8
+Fragment-Host: org.apache.felix.framework.test.fragment.b6
+Import-Package: org.osgi.framework,javax.swing

Modified: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/TestFragment.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/TestFragment.java?rev=783406&r1=783405&r2=783406&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/TestFragment.java (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/TestFragment.java Wed Jun 10 15:58:32 2009
@@ -328,6 +328,8 @@
             m_bundleA = getBundleContext().installBundle("fragment.b6.jar", is);
             is = this.getClass().getClassLoader().getResourceAsStream("fragment.b7.jar");
             m_bundleB = getBundleContext().installBundle("fragment.b7.jar", is);
+            is = this.getClass().getClassLoader().getResourceAsStream("fragment.b8.jar");
+            m_bundleC = getBundleContext().installBundle("fragment.b8.jar", is);
 
             m_bundleA.start();
             ServiceReference ref = getBundleContext().getServiceReference(

Copied: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b8/Activator.java (from r774012, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b7/Activator.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b8/Activator.java?p2=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b8/Activator.java&p1=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b7/Activator.java&r1=774012&r2=783406&rev=783406&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b7/Activator.java (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b8/Activator.java Wed Jun 10 15:58:32 2009
@@ -16,8 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.framework.test.fragment.b7;
+package org.apache.felix.framework.test.fragment.b8;
 
+import org.apache.felix.framework.test.fragment.b7.ServiceImpl;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;