felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r1156631 - in /felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test: ./ recipes/ src/org/apache/felix/framework/test/ src/org/apache/felix/framework/test/classloading/b008/ src/org/apache/felix/framework/test/classloading/b009/
Date Thu, 11 Aug 2011 14:32:31 GMT
Author: rickhall
Date: Thu Aug 11 14:32:30 2011
New Revision: 1156631

URL: http://svn.apache.org/viewvc?rev=1156631&view=rev
Log:
Adding a reexport text case.

Added:
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/classloading.b009.bnd
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/classloading/b009/
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/classloading/b009/Placeholder.java
      - copied, changed from r1153991, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/classloading/b008/Placeholder.java
Removed:
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/classloading/b008/
Modified:
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/bnd.bnd
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/classloading.b006.bnd
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/classloading.b007.bnd
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/classloading.b008.bnd
    felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/TestClassLoading.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=1156631&r1=1156630&r2=1156631&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 Thu Aug 11 14:32:30
2011
@@ -4,7 +4,7 @@ Private-Package: ${p}
 Include-Resource: \
  classloading.b001.jar, classloading.b002.jar, classloading.b003.jar, \
  classloading.b004.jar, classloading.b005.jar, classloading.b006.jar, \
- classloading.b007.jar, classloading.b008.jar, \
+ classloading.b007.jar, classloading.b008.jar, classloading.b009.jar, \
  concurrency.b1.jar, \
  resolver.b001.jar, resolver.b002.jar, resolver.b003.jar, resolver.b004.jar, \
  resolver.b005.jar, resolver.b006.jar, resolver.b007.jar, resolver.b008.jar, \

Modified: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/classloading.b006.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/classloading.b006.bnd?rev=1156631&r1=1156630&r2=1156631&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/classloading.b006.bnd
(original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/classloading.b006.bnd
Thu Aug 11 14:32:30 2011
@@ -1,3 +1,5 @@
-Bundle-SymbolicName: org.apache.felix.framework.test.classloading.b006
-Export-Package: org.apache.felix.framework.test.classloading.b006; version=1.0.0
+Bundle-SymbolicName: org.apache.felix.framework.test.classloading.b005
+Private-Package: org.apache.felix.framework.test.classloading.b005
+Require-Bundle: org.apache.felix.framework.test.classloading.b003; visibility:="reexport"
+Import-Package: !*
 

Modified: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/classloading.b007.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/classloading.b007.bnd?rev=1156631&r1=1156630&r2=1156631&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/classloading.b007.bnd
(original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/classloading.b007.bnd
Thu Aug 11 14:32:30 2011
@@ -1,4 +1,3 @@
 Bundle-SymbolicName: org.apache.felix.framework.test.classloading.b007
-Private-Package: org.apache.felix.framework.test.classloading.b007
-Require-Bundle: org.apache.felix.framework.test.classloading.b006
+Export-Package: org.apache.felix.framework.test.classloading.b007; version=1.0.0
 

Modified: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/classloading.b008.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/classloading.b008.bnd?rev=1156631&r1=1156630&r2=1156631&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/classloading.b008.bnd
(original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/classloading.b008.bnd
Thu Aug 11 14:32:30 2011
@@ -1,4 +1,4 @@
 Bundle-SymbolicName: org.apache.felix.framework.test.classloading.b008
 Private-Package: org.apache.felix.framework.test.classloading.b008
-Export-Package: org.apache.felix.framework.test.classloading.b006; version=2.0.0
+Require-Bundle: org.apache.felix.framework.test.classloading.b007
 

Added: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/classloading.b009.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/classloading.b009.bnd?rev=1156631&view=auto
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/classloading.b009.bnd
(added)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/classloading.b009.bnd
Thu Aug 11 14:32:30 2011
@@ -0,0 +1,4 @@
+Bundle-SymbolicName: org.apache.felix.framework.test.classloading.b009
+Private-Package: org.apache.felix.framework.test.classloading.b009
+Export-Package: org.apache.felix.framework.test.classloading.b007; version=2.0.0
+

Modified: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/TestClassLoading.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/TestClassLoading.java?rev=1156631&r1=1156630&r2=1156631&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/TestClassLoading.java
(original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/TestClassLoading.java
Thu Aug 11 14:32:30 2011
@@ -212,18 +212,18 @@ public class TestClassLoading extends Fe
         try
         {
             // Load bundle that imports its own export.
-            InputStream is = this.getClass().getClassLoader().getResourceAsStream("classloading.b006.jar");
-            m_bundleA = getBundleContext().installBundle("classloading.b006.jar", is);
+            InputStream is = this.getClass().getClassLoader().getResourceAsStream("classloading.b007.jar");
+            m_bundleA = getBundleContext().installBundle("classloading.b007.jar", is);
             // Load a bundle that requires previous bundle.
-            is = this.getClass().getClassLoader().getResourceAsStream("classloading.b007.jar");
-            m_bundleB = getBundleContext().installBundle("classloading.b007.jar", is);
+            is = this.getClass().getClassLoader().getResourceAsStream("classloading.b008.jar");
+            m_bundleB = getBundleContext().installBundle("classloading.b008.jar", is);
 
             // Try to load a required class from A via B.
             Class clazz;
             try
             {
                 clazz = m_bundleB.loadClass(
-                    "org.apache.felix.framework.test.classloading.b006.Hello");
+                    "org.apache.felix.framework.test.classloading.b007.Hello");
                 assertNotNull("Class should not be null.", clazz);
             }
             catch (Exception ex)
@@ -239,15 +239,15 @@ public class TestClassLoading extends Fe
         try
         {
             // Load bundle that imports its own export.
-            InputStream is = this.getClass().getClassLoader().getResourceAsStream("classloading.b006.jar");
-            m_bundleA = getBundleContext().installBundle("classloading.b006.jar", is);
+            InputStream is = this.getClass().getClassLoader().getResourceAsStream("classloading.b007.jar");
+            m_bundleA = getBundleContext().installBundle("classloading.b007.jar", is);
             // Load a bundle that requires previous bundle.
-            is = this.getClass().getClassLoader().getResourceAsStream("classloading.b007.jar");
-            m_bundleB = getBundleContext().installBundle("classloading.b007.jar", is);
+            is = this.getClass().getClassLoader().getResourceAsStream("classloading.b008.jar");
+            m_bundleB = getBundleContext().installBundle("classloading.b008.jar", is);
             // Load bundle that exports a higher version of A's package, so A
             // will wire to C instead of using its own package.
-            is = this.getClass().getClassLoader().getResourceAsStream("classloading.b008.jar");
-            m_bundleC = getBundleContext().installBundle("classloading.b008.jar", is);
+            is = this.getClass().getClassLoader().getResourceAsStream("classloading.b009.jar");
+            m_bundleC = getBundleContext().installBundle("classloading.b009.jar", is);
 
             // Try to load a required class from A via B which will ultimately come
             // from C.
@@ -255,7 +255,7 @@ public class TestClassLoading extends Fe
             try
             {
                 clazz = m_bundleB.loadClass(
-                    "org.apache.felix.framework.test.classloading.b006.Hello");
+                    "org.apache.felix.framework.test.classloading.b007.Hello");
                 assertNotNull("Class should not be null.", clazz);
             }
             catch (Exception ex)

Copied: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/classloading/b009/Placeholder.java
(from r1153991, felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/classloading/b008/Placeholder.java)
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/classloading/b009/Placeholder.java?p2=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/classloading/b009/Placeholder.java&p1=felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/classloading/b008/Placeholder.java&r1=1153991&r2=1156631&rev=1156631&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/classloading/b008/Placeholder.java
(original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/classloading/b009/Placeholder.java
Thu Aug 11 14:32:30 2011
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.framework.test.classloading.b008;
+package org.apache.felix.framework.test.classloading.b009;
 
 public class Placeholder
 {



Mime
View raw message