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/07/31 16:15:47 UTC
svn commit: r799617 - 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/b001/
src/org/apache/felix/framework/test/fragment/b002/ src/org/ap...
Author: rickhall
Date: Fri Jul 31 14:15:46 2009
New Revision: 799617
URL: http://svn.apache.org/viewvc?rev=799617&view=rev
Log:
Rename packages for future extension.
Added:
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b001.bnd
- copied, changed from r799312, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b1.bnd
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b002.bnd
- copied, changed from r799312, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b2.bnd
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b003.bnd
- copied, changed from r799312, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b3.bnd
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b004.bnd
- copied, changed from r799312, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b4.bnd
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b005.bnd
- copied, changed from r799312, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b5.bnd
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b006.bnd
- copied, changed from r799312, 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.b007.bnd
- copied, changed from r799312, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b7.bnd
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b008.bnd
- copied, changed from r799312, 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/b001/
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b001/Host.java
- copied, changed from r799309, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b1/Host.java
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b002/
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b002/FragmentClass.java
- copied, changed from r799309, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b2/FragmentClass.java
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b003/
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b003/FragmentClass.java
- copied, changed from r799309, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b3/FragmentClass.java
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b004/
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b005/
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b005/Activator.java
- copied, changed from r799309, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b5/Activator.java
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b006/
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b006/Service.java
- copied, changed from r799309, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b6/Service.java
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b007/
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b007/ServiceImpl.java
- copied, changed from r799309, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b7/ServiceImpl.java
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b008/
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b008/Activator.java
- copied, changed from r799309, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b8/Activator.java
Removed:
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b1.bnd
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b2.bnd
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b3.bnd
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b4.bnd
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b5.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/recipes/fragment.b8.bnd
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b1/Host.java
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b2/FragmentClass.java
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b3/FragmentClass.java
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b5/Activator.java
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b6/Service.java
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b7/ServiceImpl.java
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b8/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/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=799617&r1=799616&r2=799617&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 Fri Jul 31 14:15:46 2009
@@ -5,9 +5,9 @@
resolver.b001.jar, resolver.b002.jar, resolver.b003.jar, resolver.b004.jar, \
resolver.b005.jar, resolver.b006.jar, resolver.b007.jar, resolver.b008.jar, \
resolver.b009.jar, resolver.b010.jar, \
- fragment.b1.jar, fragment.b2.jar, fragment.b3.jar, \
- fragment.b4.jar, fragment.b5.jar, \
- fragment.b6.jar, fragment.b7.jar, fragment.b8.jar, \
+ fragment.b001.jar, fragment.b002.jar, fragment.b003.jar, \
+ fragment.b004.jar, fragment.b005.jar, \
+ fragment.b006.jar, fragment.b007.jar, fragment.b008.jar, \
activationpolicy.b1.jar, activationpolicy.b2.jar, activationpolicy.b3.jar, \
activationpolicy.b4a.jar, activationpolicy.b4b.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
Copied: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b001.bnd (from r799312, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b1.bnd)
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b001.bnd?p2=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b001.bnd&p1=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b1.bnd&r1=799312&r2=799617&rev=799617&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b1.bnd (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b001.bnd Fri Jul 31 14:15:46 2009
@@ -1,4 +1,4 @@
-Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b1
-Bundle-Activator: org.apache.felix.framework.test.fragment.b1.Host
-Private-Package: org.apache.felix.framework.test.fragment.b1
-Include-Resource: org/apache/felix/framework/test/fragment/b1/Message.properties=src/resource/Message.properties
+Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b001
+Bundle-Activator: org.apache.felix.framework.test.fragment.b001.Host
+Private-Package: org.apache.felix.framework.test.fragment.b001
+Include-Resource: org/apache/felix/framework/test/fragment/b001/Message.properties=src/resource/Message.properties
Copied: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b002.bnd (from r799312, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b2.bnd)
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b002.bnd?p2=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b002.bnd&p1=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b2.bnd&r1=799312&r2=799617&rev=799617&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b2.bnd (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b002.bnd Fri Jul 31 14:15:46 2009
@@ -1,4 +1,4 @@
-Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b2
-Fragment-Host: org.apache.felix.framework.test.fragment.b1
-Export-Package: org.apache.felix.framework.test.fragment.b2,org.apache.felix.framework.test.fragment.resources;version=1;-noimport:="true"
-Include-Resource: org/apache/felix/framework/test/fragment/b1/Message_fr.properties=src/resource/Message_fr.properties, org/apache/felix/framework/test/fragment/resources/fragment.resource1.txt=src/resource/fragment.resource1.v1.txt
+Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b002
+Fragment-Host: org.apache.felix.framework.test.fragment.b001
+Export-Package: org.apache.felix.framework.test.fragment.b002,org.apache.felix.framework.test.fragment.resources;version=1;-noimport:="true"
+Include-Resource: org/apache/felix/framework/test/fragment/b001/Message_fr.properties=src/resource/Message_fr.properties, org/apache/felix/framework/test/fragment/resources/fragment.resource1.txt=src/resource/fragment.resource1.v1.txt
Copied: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b003.bnd (from r799312, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b3.bnd)
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b003.bnd?p2=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b003.bnd&p1=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b3.bnd&r1=799312&r2=799617&rev=799617&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b3.bnd (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b003.bnd Fri Jul 31 14:15:46 2009
@@ -1,5 +1,5 @@
-Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b3
-Fragment-Host: org.apache.felix.framework.test.fragment.b1
-Private-Package: org.apache.felix.framework.test.fragment.b3
-Export-Package: org.apache.felix.framework.test.fragment.b3,org.apache.felix.framework.test.fragment.resources;version=2;-noimport:="true"
+Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b003
+Fragment-Host: org.apache.felix.framework.test.fragment.b001
+Private-Package: org.apache.felix.framework.test.fragment.b003
+Export-Package: org.apache.felix.framework.test.fragment.b003,org.apache.felix.framework.test.fragment.resources;version=2;-noimport:="true"
Include-Resource: org/apache/felix/framework/test/fragment/resources/fragment.resource1.txt=src/resource/fragment.resource1.v2.txt, org/apache/felix/framework/test/fragment/resources/fragment.resource2.txt=src/resource/fragment.resource2.v2.txt
Copied: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b004.bnd (from r799312, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b4.bnd)
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b004.bnd?p2=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b004.bnd&p1=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b4.bnd&r1=799312&r2=799617&rev=799617&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b4.bnd (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b004.bnd Fri Jul 31 14:15:46 2009
@@ -1,3 +1,3 @@
-Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b4
+Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b004
-failok : true
-Require-Bundle: org.apache.felix.framework.test.fragment.b1
+Require-Bundle: org.apache.felix.framework.test.fragment.b001
Copied: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b005.bnd (from r799312, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b5.bnd)
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b005.bnd?p2=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b005.bnd&p1=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b5.bnd&r1=799312&r2=799617&rev=799617&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b5.bnd (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b005.bnd Fri Jul 31 14:15:46 2009
@@ -1,4 +1,4 @@
-Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b5
-Private-Package: org.apache.felix.framework.test.fragment.b5
-Bundle-Activator: org.apache.felix.framework.test.fragment.b5.Activator
+Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b005
+Private-Package: org.apache.felix.framework.test.fragment.b005
+Bundle-Activator: org.apache.felix.framework.test.fragment.b005.Activator
Import-Package: org.apache.felix.framework.test.fragment.resources;version=2,*
Copied: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b006.bnd (from r799312, 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.b006.bnd?p2=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b006.bnd&p1=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b6.bnd&r1=799312&r2=799617&rev=799617&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.b006.bnd Fri Jul 31 14:15:46 2009
@@ -1,5 +1,5 @@
-Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b6
+Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b006
-failok : true
-Bundle-Activator: org.apache.felix.framework.test.fragment.b8.Activator
-Export-Package: org.apache.felix.framework.test.fragment.b6
+Bundle-Activator: org.apache.felix.framework.test.fragment.b008.Activator
+Export-Package: org.apache.felix.framework.test.fragment.b006
Import-Package: org.osgi.framework
Copied: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b007.bnd (from r799312, 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.b007.bnd?p2=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b007.bnd&p1=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b7.bnd&r1=799312&r2=799617&rev=799617&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.b007.bnd Fri Jul 31 14:15:46 2009
@@ -1,5 +1,5 @@
-Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b7
+Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b007
-failok : true
-Private-Package: org.apache.felix.framework.test.fragment.b7
-Fragment-Host: org.apache.felix.framework.test.fragment.b6
+Private-Package: org.apache.felix.framework.test.fragment.b007
+Fragment-Host: org.apache.felix.framework.test.fragment.b006
Import-Package: org.osgi.framework,javax.swing
Copied: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b008.bnd (from r799312, 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.b008.bnd?p2=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b008.bnd&p1=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b8.bnd&r1=799312&r2=799617&rev=799617&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b8.bnd (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b008.bnd Fri Jul 31 14:15:46 2009
@@ -1,5 +1,5 @@
-Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b8
+Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b008
-failok : true
-Private-Package: org.apache.felix.framework.test.fragment.b8
-Fragment-Host: org.apache.felix.framework.test.fragment.b6
+Private-Package: org.apache.felix.framework.test.fragment.b008
+Fragment-Host: org.apache.felix.framework.test.fragment.b006
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=799617&r1=799616&r2=799617&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 Fri Jul 31 14:15:46 2009
@@ -54,8 +54,8 @@
// a resource bundle for english by default.
try
{
- is = this.getClass().getClassLoader().getResourceAsStream("fragment.b1.jar");
- m_bundleA = getBundleContext().installBundle("fragment.b1.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b001.jar");
+ m_bundleA = getBundleContext().installBundle("fragment.b001.jar", is);
m_bundleA.start();
hostRB = (ResourceBundle) getBundleContext().getService(
getBundleContext().getServiceReference(ResourceBundle.class.getName()));
@@ -82,10 +82,10 @@
// attached to the host.
try
{
- is = this.getClass().getClassLoader().getResourceAsStream("fragment.b1.jar");
- m_bundleA = getBundleContext().installBundle("fragment.b1.jar", is);
- is = this.getClass().getClassLoader().getResourceAsStream("fragment.b2.jar");
- m_bundleB = getBundleContext().installBundle("fragment.b2.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b001.jar");
+ m_bundleA = getBundleContext().installBundle("fragment.b001.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b002.jar");
+ m_bundleB = getBundleContext().installBundle("fragment.b002.jar", is);
m_bundleA.start();
hostRB = (ResourceBundle) getBundleContext().getService(
getBundleContext().getServiceReference(ResourceBundle.class.getName()));
@@ -112,10 +112,10 @@
// still attach to the host.
try
{
- is = this.getClass().getClassLoader().getResourceAsStream("fragment.b1.jar");
- m_bundleA = getBundleContext().installBundle("fragment.b1.jar", is);
- is = this.getClass().getClassLoader().getResourceAsStream("fragment.b2.jar");
- m_bundleB = getBundleContext().installBundle("fragment.b2.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b001.jar");
+ m_bundleA = getBundleContext().installBundle("fragment.b001.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b002.jar");
+ m_bundleB = getBundleContext().installBundle("fragment.b002.jar", is);
getPackageAdmin().resolveBundles(new Bundle[] { m_bundleB });
m_bundleA.start();
hostRB = (ResourceBundle) getBundleContext().getService(
@@ -144,12 +144,12 @@
// the host was indirectly resolved.
try
{
- is = this.getClass().getClassLoader().getResourceAsStream("fragment.b1.jar");
- m_bundleA = getBundleContext().installBundle("fragment.b1.jar", is);
- is = this.getClass().getClassLoader().getResourceAsStream("fragment.b2.jar");
- m_bundleB = getBundleContext().installBundle("fragment.b2.jar", is);
- is = this.getClass().getClassLoader().getResourceAsStream("fragment.b4.jar");
- m_bundleC = getBundleContext().installBundle("fragment.b4.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b001.jar");
+ m_bundleA = getBundleContext().installBundle("fragment.b001.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b002.jar");
+ m_bundleB = getBundleContext().installBundle("fragment.b002.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b004.jar");
+ m_bundleC = getBundleContext().installBundle("fragment.b004.jar", is);
getPackageAdmin().resolveBundles(new Bundle[] { m_bundleC });
m_bundleA.start();
hostRB = (ResourceBundle) getBundleContext().getService(
@@ -182,12 +182,12 @@
// host bundle, not the fragment bundle.
try
{
- is = this.getClass().getClassLoader().getResourceAsStream("fragment.b1.jar");
- m_bundleA = getBundleContext().installBundle("fragment.b1.jar", is);
- is = this.getClass().getClassLoader().getResourceAsStream("fragment.b3.jar");
- m_bundleB = getBundleContext().installBundle("fragment.b3.jar", is);
- is = this.getClass().getClassLoader().getResourceAsStream("fragment.b5.jar");
- m_bundleC = getBundleContext().installBundle("fragment.b5.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b001.jar");
+ m_bundleA = getBundleContext().installBundle("fragment.b001.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b003.jar");
+ m_bundleB = getBundleContext().installBundle("fragment.b003.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b005.jar");
+ m_bundleC = getBundleContext().installBundle("fragment.b005.jar", is);
m_bundleC.start();
// Verify that importer has no wires to the fragment.
@@ -238,14 +238,14 @@
// bundle and verify it has access.
try
{
- is = this.getClass().getClassLoader().getResourceAsStream("fragment.b1.jar");
- m_bundleA = getBundleContext().installBundle("fragment.b1.jar", is);
- is = this.getClass().getClassLoader().getResourceAsStream("fragment.b2.jar");
- m_bundleB = getBundleContext().installBundle("fragment.b2.jar", is);
- is = this.getClass().getClassLoader().getResourceAsStream("fragment.b3.jar");
- m_bundleC = getBundleContext().installBundle("fragment.b3.jar", is);
- is = this.getClass().getClassLoader().getResourceAsStream("fragment.b5.jar");
- m_bundleD = getBundleContext().installBundle("fragment.b5.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b001.jar");
+ m_bundleA = getBundleContext().installBundle("fragment.b001.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b002.jar");
+ m_bundleB = getBundleContext().installBundle("fragment.b002.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b003.jar");
+ m_bundleC = getBundleContext().installBundle("fragment.b003.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b005.jar");
+ m_bundleD = getBundleContext().installBundle("fragment.b005.jar", is);
m_bundleD.start();
URL r1 = m_bundleD.getResource("org/apache/felix/framework/test/fragment/resources/fragment.resource1.txt");
assertNotNull("Resource should be visible", r1);
@@ -273,8 +273,8 @@
// Install host, then try to load PackageAdmin class, which should fail.
try
{
- is = this.getClass().getClassLoader().getResourceAsStream("fragment.b1.jar");
- m_bundleA = getBundleContext().installBundle("fragment.b1.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b001.jar");
+ m_bundleA = getBundleContext().installBundle("fragment.b001.jar", is);
try
{
@@ -297,10 +297,10 @@
// try to load PackageAdmin class, which should fail.
try
{
- is = this.getClass().getClassLoader().getResourceAsStream("fragment.b1.jar");
- m_bundleA = getBundleContext().installBundle("fragment.b1.jar", is);
- is = this.getClass().getClassLoader().getResourceAsStream("fragment.b3.jar");
- m_bundleB = getBundleContext().installBundle("fragment.b3.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b001.jar");
+ m_bundleA = getBundleContext().installBundle("fragment.b001.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b003.jar");
+ m_bundleB = getBundleContext().installBundle("fragment.b003.jar", is);
try
{
@@ -327,16 +327,16 @@
{
try
{
- is = this.getClass().getClassLoader().getResourceAsStream("fragment.b6.jar");
- 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);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b006.jar");
+ m_bundleA = getBundleContext().installBundle("fragment.b006.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b007.jar");
+ m_bundleB = getBundleContext().installBundle("fragment.b007.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b008.jar");
+ m_bundleC = getBundleContext().installBundle("fragment.b008.jar", is);
m_bundleA.start();
ServiceReference ref = getBundleContext().getServiceReference(
- "org.apache.felix.framework.test.fragment.b6.Service");
+ "org.apache.felix.framework.test.fragment.b006.Service");
Object svc = getBundleContext().getService(ref);
Method method = svc.getClass().getMethod("getFreeMemory", null);
Object result = method.invoke(svc, null);
Copied: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b001/Host.java (from r799309, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b1/Host.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b001/Host.java?p2=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b001/Host.java&p1=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b1/Host.java&r1=799309&r2=799617&rev=799617&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b1/Host.java (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b001/Host.java Fri Jul 31 14:15:46 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.framework.test.fragment.b1;
+package org.apache.felix.framework.test.fragment.b001;
import java.util.*;
import org.osgi.framework.*;
@@ -29,7 +29,7 @@
{
ResourceBundle rb;
rb = ResourceBundle.getBundle(
- "org.apache.felix.framework.test.fragment.b1.Message", Locale.FRENCH);
+ "org.apache.felix.framework.test.fragment.b001.Message", Locale.FRENCH);
context.registerService(ResourceBundle.class.getName(), rb, null);
}
catch (Exception ex)
Copied: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b002/FragmentClass.java (from r799309, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b2/FragmentClass.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b002/FragmentClass.java?p2=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b002/FragmentClass.java&p1=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b2/FragmentClass.java&r1=799309&r2=799617&rev=799617&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b2/FragmentClass.java (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b002/FragmentClass.java Fri Jul 31 14:15:46 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.framework.test.fragment.b2;
+package org.apache.felix.framework.test.fragment.b002;
public class FragmentClass
{
Copied: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b003/FragmentClass.java (from r799309, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b3/FragmentClass.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b003/FragmentClass.java?p2=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b003/FragmentClass.java&p1=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b3/FragmentClass.java&r1=799309&r2=799617&rev=799617&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b3/FragmentClass.java (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b003/FragmentClass.java Fri Jul 31 14:15:46 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.framework.test.fragment.b3;
+package org.apache.felix.framework.test.fragment.b003;
import org.osgi.service.packageadmin.PackageAdmin;
Copied: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b005/Activator.java (from r799309, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b5/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/b005/Activator.java?p2=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b005/Activator.java&p1=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b5/Activator.java&r1=799309&r2=799617&rev=799617&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b5/Activator.java (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b005/Activator.java Fri Jul 31 14:15:46 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.framework.test.fragment.b5;
+package org.apache.felix.framework.test.fragment.b005;
-import org.apache.felix.framework.test.fragment.b3.FragmentClass;
+import org.apache.felix.framework.test.fragment.b003.FragmentClass;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
Copied: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b006/Service.java (from r799309, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b6/Service.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b006/Service.java?p2=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b006/Service.java&p1=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b6/Service.java&r1=799309&r2=799617&rev=799617&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b6/Service.java (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b006/Service.java Fri Jul 31 14:15:46 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.framework.test.fragment.b6;
+package org.apache.felix.framework.test.fragment.b006;
public interface Service
{
Copied: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b007/ServiceImpl.java (from r799309, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b7/ServiceImpl.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b007/ServiceImpl.java?p2=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b007/ServiceImpl.java&p1=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b7/ServiceImpl.java&r1=799309&r2=799617&rev=799617&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b7/ServiceImpl.java (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b007/ServiceImpl.java Fri Jul 31 14:15:46 2009
@@ -16,9 +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.b007;
-import org.apache.felix.framework.test.fragment.b6.Service;
+import org.apache.felix.framework.test.fragment.b006.Service;
public class ServiceImpl implements Service
{
Copied: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b008/Activator.java (from r799309, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b8/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/b008/Activator.java?p2=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b008/Activator.java&p1=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b8/Activator.java&r1=799309&r2=799617&rev=799617&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b8/Activator.java (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b008/Activator.java Fri Jul 31 14:15:46 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.framework.test.fragment.b8;
+package org.apache.felix.framework.test.fragment.b008;
-import org.apache.felix.framework.test.fragment.b7.ServiceImpl;
+import org.apache.felix.framework.test.fragment.b007.ServiceImpl;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
@@ -27,7 +27,7 @@
public void start(BundleContext context) throws Exception
{
context.registerService(
- "org.apache.felix.framework.test.fragment.b6.Service",
+ "org.apache.felix.framework.test.fragment.b006.Service",
new ServiceImpl(),
null);
}