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/04/28 21:42:39 UTC

svn commit: r769509 - 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/b4/ src/org/apache/felix/framework/test/fragment/b5/

Author: rickhall
Date: Tue Apr 28 19:42:36 2009
New Revision: 769509

URL: http://svn.apache.org/viewvc?rev=769509&view=rev
Log:
Test case reorganization.

Added:
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b5.bnd
      - copied, changed from r769507, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b4.bnd
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b5/
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b5/Activator.java
      - copied, changed from r769507, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b4/Activator.java
Removed:
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b4.bnd
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b4/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=769509&r1=769508&r2=769509&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 Tue Apr 28 19:42:36 2009
@@ -5,7 +5,7 @@
  resolver.b1.jar, resolver.b2.jar, resolver.b3.jar, resolver.b4.jar, \
  resolver.b5.jar, resolver.b6.jar, resolver.b7.jar, \
  fragment.b1.jar, fragment.b2.jar, fragment.b3.jar, \
- fragment.b4.jar, \
+ fragment.b5.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: \

Copied: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b5.bnd (from r769507, 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.b5.bnd?p2=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b5.bnd&p1=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b4.bnd&r1=769507&r2=769509&rev=769509&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.b5.bnd Tue Apr 28 19:42:36 2009
@@ -1,3 +1,3 @@
-Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b4
-Private-Package: org.apache.felix.framework.test.fragment.b4
-Bundle-Activator: org.apache.felix.framework.test.fragment.b4.Activator
+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

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=769509&r1=769508&r2=769509&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 Tue Apr 28 19:42:36 2009
@@ -180,8 +180,8 @@
             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.b5.jar");
+            m_bundleC = getBundleContext().installBundle("fragment.b5.jar", is);
             m_bundleC.start();
 
             // Verify that importer has no wires to the fragment.

Copied: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b5/Activator.java (from r769507, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b4/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/b5/Activator.java?p2=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b5/Activator.java&p1=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b4/Activator.java&r1=769507&r2=769509&rev=769509&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b4/Activator.java (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b5/Activator.java Tue Apr 28 19:42:36 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.framework.test.fragment.b4;
+package org.apache.felix.framework.test.fragment.b5;
 
 import org.apache.felix.framework.test.fragment.b2.FragmentClass;
 import org.osgi.framework.BundleActivator;