felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r1575671 [8/9] - in /felix/trunk/ipojo/runtime/core-it: ./ ipojo-api-test/src/main/java/org/apache/felix/ipojo/runtime/core/api/components/ ipojo-api-test/src/main/java/org/apache/felix/ipojo/runtime/core/api/services/ ipojo-api-test/src/te...
Date Sun, 09 Mar 2014 08:03:59 GMT
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestSimpleDependencies.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestSimpleDependencies.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestSimpleDependencies.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestSimpleDependencies.java Sun Mar  9 08:03:56 2014
@@ -110,37 +110,37 @@ public class TestSimpleDependencies exte
     @Test public void testSimple() {
         ServiceReference arch_ref = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), instance1.getInstanceName());
         assertNotNull("Check architecture availability", arch_ref);
-        InstanceDescription id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        InstanceDescription id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance invalidity - 1", id.getState() == ComponentInstance.INVALID);
 
         fooProvider.start();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
 
         ServiceReference cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance1.getInstanceName());
         assertNotNull("Check CheckService availability", cs_ref);
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
         assertTrue("check CheckService invocation", cs.check());
 
         fooProvider.stop();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance invalidity - 2", id.getState() == ComponentInstance.INVALID);
 
         fooProvider.start();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance validity - 2", id.getState() == ComponentInstance.VALID);
 
         cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance1.getInstanceName());
         assertNotNull("Check CheckService availability", cs_ref);
-        cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+        cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
         assertTrue("check CheckService invocation", cs.check());
 
         fooProvider.stop();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance invalidity - 2", id.getState() == ComponentInstance.INVALID);
 
         id = null;
@@ -152,17 +152,17 @@ public class TestSimpleDependencies exte
     @Test public void testVoid() {
         ServiceReference arch_ref = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), instance2.getInstanceName());
         assertNotNull("Check architecture availability", arch_ref);
-        InstanceDescription id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        InstanceDescription id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance invalidity - 1", id.getState() == ComponentInstance.INVALID);
 
         fooProvider.start();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance validity", id.getState() == ComponentInstance.VALID);
 
         ServiceReference cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.getInstanceName());
         assertNotNull("Check CheckService availability", cs_ref);
-        Object o = osgiHelper.getServiceObject(cs_ref);
+        Object o = osgiHelper.getRawServiceObject(cs_ref);
         CheckService cs = (CheckService) o;
         Properties props = cs.getProps();
         //Check properties
@@ -178,7 +178,7 @@ public class TestSimpleDependencies exte
 
         fooProvider.stop();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance invalidity - 2", id.getState() == ComponentInstance.INVALID);
 
         id = null;
@@ -190,17 +190,17 @@ public class TestSimpleDependencies exte
     @Test public void testObject() {
         ServiceReference arch_ref = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), instance3.getInstanceName());
         assertNotNull("Check architecture availability", arch_ref);
-        InstanceDescription id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        InstanceDescription id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance invalidity - 1", id.getState() == ComponentInstance.INVALID);
 
         fooProvider.start();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance validity", id.getState() == ComponentInstance.VALID);
 
         ServiceReference cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance3.getInstanceName());
         assertNotNull("Check CheckService availability", cs_ref);
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
         Properties props = cs.getProps();
         //Check properties
         assertTrue("check CheckService invocation -1", ((Boolean) props.get("result")).booleanValue());
@@ -215,7 +215,7 @@ public class TestSimpleDependencies exte
 
         fooProvider.stop();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance invalidity - 2", id.getState() == ComponentInstance.INVALID);
 
         id = null;
@@ -227,17 +227,17 @@ public class TestSimpleDependencies exte
     @Test public void testRef() {
         ServiceReference arch_ref = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), instance4.getInstanceName());
         assertNotNull("Check architecture availability", arch_ref);
-        InstanceDescription id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        InstanceDescription id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance invalidity - 1", id.getState() == ComponentInstance.INVALID);
 
         fooProvider.start();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance validity", id.getState() == ComponentInstance.VALID);
 
         ServiceReference cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance4.getInstanceName());
         assertNotNull("Check CheckService availability", cs_ref);
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
         Properties props = cs.getProps();
         //Check properties
         assertTrue("check CheckService invocation -1", ((Boolean) props.get("result")).booleanValue());
@@ -252,7 +252,7 @@ public class TestSimpleDependencies exte
 
         fooProvider.stop();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance invalidity - 2", id.getState() == ComponentInstance.INVALID);
 
         id = null;
@@ -264,17 +264,17 @@ public class TestSimpleDependencies exte
     @Test public void testBoth() {
         ServiceReference arch_ref = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), instance5.getInstanceName());
         assertNotNull("Check architecture availability", arch_ref);
-        InstanceDescription id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        InstanceDescription id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance invalidity - 1", id.getState() == ComponentInstance.INVALID);
 
         fooProvider.start();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance validity", id.getState() == ComponentInstance.VALID);
 
         ServiceReference cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance5.getInstanceName());
         assertNotNull("Check CheckService availability", cs_ref);
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
         Properties props = cs.getProps();
         //Check properties
         assertTrue("check CheckService invocation -1", ((Boolean) props.get("result")).booleanValue());
@@ -289,7 +289,7 @@ public class TestSimpleDependencies exte
 
         fooProvider.stop();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance invalidity - 2", id.getState() == ComponentInstance.INVALID);
 
         id = null;
@@ -301,17 +301,17 @@ public class TestSimpleDependencies exte
     @Test public void testDouble() {
         ServiceReference arch_ref = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), instance6.getInstanceName());
         assertNotNull("Check architecture availability", arch_ref);
-        InstanceDescription id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        InstanceDescription id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance invalidity - 1", id.getState() == ComponentInstance.INVALID);
 
         fooProvider.start();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance validity", id.getState() == ComponentInstance.VALID);
 
         ServiceReference cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance6.getInstanceName());
         assertNotNull("Check CheckService availability", cs_ref);
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
         assertNotNull("Check cs", cs);
         cs.check();
         Properties props = cs.getProps();
@@ -328,7 +328,7 @@ public class TestSimpleDependencies exte
 
         fooProvider.stop();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance invalidity - 2", id.getState() == ComponentInstance.INVALID);
 
         id = null;
@@ -340,17 +340,17 @@ public class TestSimpleDependencies exte
     @Test public void testMap() {
         ServiceReference arch_ref = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), instance7.getInstanceName());
         assertNotNull("Check architecture availability", arch_ref);
-        InstanceDescription id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        InstanceDescription id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance invalidity - 1", id.getState() == ComponentInstance.INVALID);
 
         fooProvider.start();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance validity", id.getState() == ComponentInstance.VALID);
 
         ServiceReference cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance7.getInstanceName());
         assertNotNull("Check CheckService availability", cs_ref);
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
         Properties props = cs.getProps();
         //Check properties
         assertTrue("check CheckService invocation -1", ((Boolean) props.get("result")).booleanValue());
@@ -369,7 +369,7 @@ public class TestSimpleDependencies exte
 
         fooProvider.stop();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance invalidity - 2", id.getState() == ComponentInstance.INVALID);
 
         id = null;
@@ -381,17 +381,17 @@ public class TestSimpleDependencies exte
     @Test public void testDict() {
         ServiceReference arch_ref = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), instance8.getInstanceName());
         assertNotNull("Check architecture availability", arch_ref);
-        InstanceDescription id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        InstanceDescription id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance invalidity - 1", id.getState() == ComponentInstance.INVALID);
 
         fooProvider.start();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance validity", id.getState() == ComponentInstance.VALID);
 
         ServiceReference cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance8.getInstanceName());
         assertNotNull("Check CheckService availability", cs_ref);
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
         Properties props = cs.getProps();
         //Check properties
         assertTrue("check CheckService invocation -1", ((Boolean) props.get("result")).booleanValue());
@@ -410,7 +410,7 @@ public class TestSimpleDependencies exte
 
         fooProvider.stop();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance invalidity - 2", id.getState() == ComponentInstance.INVALID);
 
         id = null;

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestVectorMultipleDependencies.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestVectorMultipleDependencies.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestVectorMultipleDependencies.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/src/test/java/org/apache/felix/ipojo/runtime/core/test/dependencies/TestVectorMultipleDependencies.java Sun Mar  9 08:03:56 2014
@@ -77,17 +77,17 @@ public class TestVectorMultipleDependenc
     @Test public void testSimple() {
         ServiceReference arch_ref = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), instance1.getInstanceName());
         assertNotNull("Check architecture availability", arch_ref);
-        InstanceDescription id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        InstanceDescription id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance invalidity - 1", id.getState() == ComponentInstance.INVALID);
 
         fooProvider1.start();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance validity - 2", id.getState() == ComponentInstance.VALID);
 
         ServiceReference cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance1.getInstanceName());
         assertNotNull("Check CheckService availability", cs_ref);
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
         Properties props = cs.getProps();
         //Check properties
         assertTrue("check CheckService invocation - 1", ((Boolean) props.get("result")).booleanValue()); // True, a provider is here
@@ -102,10 +102,10 @@ public class TestVectorMultipleDependenc
         assertEquals("Check FS invocation (double) - 1", ((Double) props.get("double")).doubleValue(), 1.0, 0);
 
         fooProvider2.start();
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance validity - 3", id.getState() == ComponentInstance.VALID);
 
-        cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+        cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
         props = cs.getProps();
         //Check properties
         assertTrue("check CheckService invocation - 2", ((Boolean) props.get("result")).booleanValue()); // True, two providers are here
@@ -121,10 +121,10 @@ public class TestVectorMultipleDependenc
 
         fooProvider1.stop();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance validity - 4", id.getState() == ComponentInstance.VALID);
 
-        cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+        cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
         props = cs.getProps();
         //Check properties
         assertTrue("check CheckService invocation - 3", ((Boolean) props.get("result")).booleanValue()); // True, two providers are here
@@ -139,7 +139,7 @@ public class TestVectorMultipleDependenc
         assertEquals("Check FS invocation (double) - 3", ((Double) props.get("double")).doubleValue(), 1.0, 0);
 
         fooProvider2.stop();
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance validity - 5", id.getState() == ComponentInstance.INVALID);
 
         id = null;
@@ -151,12 +151,12 @@ public class TestVectorMultipleDependenc
     @Test public void testOptional() {
         ServiceReference arch_ref = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), instance2.getInstanceName());
         assertNotNull("Check architecture availability", arch_ref);
-        InstanceDescription id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        InstanceDescription id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance validity - 1", id.getState() == ComponentInstance.VALID);
 
         ServiceReference cs_ref = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), instance2.getInstanceName());
         assertNotNull("Check CheckService availability", cs_ref);
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
         Properties props = cs.getProps();
         //Check properties
         assertFalse("check CheckService invocation - 0", ((Boolean) props.get("result")).booleanValue()); // False : no provider
@@ -172,10 +172,10 @@ public class TestVectorMultipleDependenc
 
         fooProvider1.start();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance validity - 2", id.getState() == ComponentInstance.VALID);
 
-        cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+        cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
         props = cs.getProps();
         //Check properties
         assertTrue("check CheckService invocation - 1", ((Boolean) props.get("result")).booleanValue()); // True, a provider is here
@@ -191,10 +191,10 @@ public class TestVectorMultipleDependenc
 
         fooProvider2.start();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance validity - 3", id.getState() == ComponentInstance.VALID);
 
-        cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+        cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
         props = cs.getProps();
         //Check properties
         assertTrue("check CheckService invocation - 2", ((Boolean) props.get("result")).booleanValue()); // True, two providers are here
@@ -210,10 +210,10 @@ public class TestVectorMultipleDependenc
 
         fooProvider1.stop();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance validity - 4", id.getState() == ComponentInstance.VALID);
 
-        cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+        cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
         props = cs.getProps();
         //Check properties
         assertTrue("check CheckService invocation - 3", ((Boolean) props.get("result")).booleanValue()); // True, it still one provider.
@@ -229,10 +229,10 @@ public class TestVectorMultipleDependenc
 
         fooProvider2.stop();
 
-        id = ((Architecture) osgiHelper.getServiceObject(arch_ref)).getInstanceDescription();
+        id = ((Architecture) osgiHelper.getRawServiceObject(arch_ref)).getInstanceDescription();
         assertTrue("Check instance validity - 5", id.getState() == ComponentInstance.VALID);
 
-        cs = (CheckService) osgiHelper.getServiceObject(cs_ref);
+        cs = (CheckService) osgiHelper.getRawServiceObject(cs_ref);
         props = cs.getProps();
         //Check properties
         assertFalse("check CheckService invocation - 4", ((Boolean) props.get("result")).booleanValue()); // False, no more provider.

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/DefaultImplementationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/DefaultImplementationTest.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/DefaultImplementationTest.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/DefaultImplementationTest.java Sun Mar  9 08:03:56 2014
@@ -41,14 +41,14 @@ public class DefaultImplementationTest e
         ServiceReference ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability", ref_cs);
 
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation", cs.check());
 
         // Stop the provider.
         provider.stop();
         ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability - 2", ref_cs);
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         boolean res = false;
         try {
             res = cs.check();
@@ -76,7 +76,7 @@ public class DefaultImplementationTest e
         ServiceReference ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability", ref_cs);
 
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation", cs.check());
 
         // Stop the provider.
@@ -86,7 +86,7 @@ public class DefaultImplementationTest e
         long begin = System.currentTimeMillis();
         DelayedProvider dp = new DelayedProvider(provider, 200);
         dp.start();
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation - 2", cs.check());
         long end = System.currentTimeMillis();
 
@@ -94,7 +94,7 @@ public class DefaultImplementationTest e
 
         ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability - 3", ref_cs);
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation - 3", cs.check());
 
         provider.stop();

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/DelayTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/DelayTest.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/DelayTest.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/DelayTest.java Sun Mar  9 08:03:56 2014
@@ -44,7 +44,7 @@ public class DelayTest extends Common {
         ServiceReference ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability", ref_cs);
 
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation", cs.check());
 
         // Stop the provider.
@@ -54,7 +54,7 @@ public class DelayTest extends Common {
         long begin = System.currentTimeMillis();
         DelayedProvider dp = new DelayedProvider(provider, 200);
         dp.start();
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation - 2", cs.check());
         long end = System.currentTimeMillis();
 
@@ -62,7 +62,7 @@ public class DelayTest extends Common {
 
         ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability - 3", ref_cs);
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation - 3", cs.check());
 
         provider.stop();
@@ -86,7 +86,7 @@ public class DelayTest extends Common {
         ServiceReference ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability", ref_cs);
 
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation", cs.check());
 
         // Stop the provider.
@@ -95,7 +95,7 @@ public class DelayTest extends Common {
         assertNotNull("Check cs availability - 2", ref_cs);
         DelayedProvider dp = new DelayedProvider(provider, 400);
         dp.start();
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         try {
             cs.check();
         } catch (RuntimeException e) {
@@ -127,7 +127,7 @@ public class DelayTest extends Common {
         ServiceReference ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability", ref_cs);
 
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation", cs.check());
 
         // Stop the providers.
@@ -140,7 +140,7 @@ public class DelayTest extends Common {
         DelayedProvider dp2 = new DelayedProvider(provider2, 100);
         dp.start();
         dp2.start();
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation - 2", cs.check());
         long end = System.currentTimeMillis();
         System.out.println("delay = " + (end - begin));
@@ -151,7 +151,7 @@ public class DelayTest extends Common {
 
         ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability - 3", ref_cs);
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation - 3", cs.check());
 
         provider1.stop();
@@ -177,7 +177,7 @@ public class DelayTest extends Common {
         ServiceReference ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability", ref_cs);
 
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation", cs.check());
 
         // Stop the providers.
@@ -190,7 +190,7 @@ public class DelayTest extends Common {
         DelayedProvider dp2 = new DelayedProvider(provider2, 100);
         dp.start();
         dp2.start();
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation - 2", cs.check());
         long end = System.currentTimeMillis();
         System.out.println("delay = " + (end - begin));
@@ -201,7 +201,7 @@ public class DelayTest extends Common {
 
         ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability - 3", ref_cs);
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation - 3", cs.check());
 
         provider1.stop();

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/EmptyTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/EmptyTest.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/EmptyTest.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/EmptyTest.java Sun Mar  9 08:03:56 2014
@@ -45,7 +45,7 @@ public class EmptyTest extends Common {
         ServiceReference ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability", ref_cs);
 
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation", cs.check());
 
         // Stop the provider.
@@ -54,7 +54,7 @@ public class EmptyTest extends Common {
         assertNotNull("Check cs availability - 2", ref_cs);
         DelayedProvider dp = new DelayedProvider(provider, 400);
         dp.start();
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         boolean res = false;
         try {
             res = cs.check();
@@ -84,7 +84,7 @@ public class EmptyTest extends Common {
         ServiceReference ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability", ref_cs);
 
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation", cs.check());
 
         // Stop the provider.
@@ -93,7 +93,7 @@ public class EmptyTest extends Common {
         assertNotNull("Check cs availability - 2", ref_cs);
         DelayedProvider dp = new DelayedProvider(provider, 400);
         dp.start();
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         boolean res = false;
         try {
             res = cs.check();
@@ -124,7 +124,7 @@ public class EmptyTest extends Common {
         ServiceReference ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability", ref_cs);
 
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation", cs.check());
 
         // Stop the providers.
@@ -137,7 +137,7 @@ public class EmptyTest extends Common {
         DelayedProvider dp2 = new DelayedProvider(provider2, 100);
         dp.start();
         dp2.start();
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation - 2", cs.check());
         long end = System.currentTimeMillis();
         System.out.println("delay = " + (end - begin));
@@ -151,7 +151,7 @@ public class EmptyTest extends Common {
 
         ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability - 3", ref_cs);
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
 
         assertTrue("Check invocation - 3", cs.check());
 
@@ -176,7 +176,7 @@ public class EmptyTest extends Common {
         ServiceReference ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability", ref_cs);
 
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation", cs.check());
 
         // Stop the providers.
@@ -189,7 +189,7 @@ public class EmptyTest extends Common {
         DelayedProvider dp2 = new DelayedProvider(provider2, 100);
         dp.start();
         dp2.start();
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation - 2", cs.check());
         long end = System.currentTimeMillis();
         System.out.println("delay = " + (end - begin));
@@ -203,7 +203,7 @@ public class EmptyTest extends Common {
 
         ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability - 3", ref_cs);
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
 
         assertTrue("Check invocation - 3", cs.check());
 

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/NullTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/NullTest.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/NullTest.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/NullTest.java Sun Mar  9 08:03:56 2014
@@ -42,7 +42,7 @@ public class NullTest extends Common {
         ServiceReference ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability", ref_cs);
 
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation", cs.check());
 
         // Stop the provider.
@@ -52,7 +52,7 @@ public class NullTest extends Common {
         long begin = System.currentTimeMillis();
         DelayedProvider dp = new DelayedProvider(provider, 200);
         dp.start();
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation - 2", cs.check());
         long end = System.currentTimeMillis();
 
@@ -60,7 +60,7 @@ public class NullTest extends Common {
 
         ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability - 3", ref_cs);
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation - 3", cs.check());
 
         provider.stop();

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/NullableTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/NullableTest.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/NullableTest.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/NullableTest.java Sun Mar  9 08:03:56 2014
@@ -45,14 +45,14 @@ public class NullableTest extends Common
         ServiceReference ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability", ref_cs);
 
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation", cs.check());
 
         // Stop the provider.
         provider.stop();
         ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability - 2", ref_cs);
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         boolean res = false;
         try {
             res = cs.check();
@@ -81,7 +81,7 @@ public class NullableTest extends Common
         ServiceReference ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability", ref_cs);
 
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation", cs.check());
 
         // Stop the provider.
@@ -91,7 +91,7 @@ public class NullableTest extends Common
         long begin = System.currentTimeMillis();
         DelayedProvider dp = new DelayedProvider(provider, 200);
         dp.start();
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation - 2", cs.check());
         long end = System.currentTimeMillis();
 
@@ -99,7 +99,7 @@ public class NullableTest extends Common
 
         ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability - 3", ref_cs);
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation - 3", cs.check());
 
         provider.stop();

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/TimeoutTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/TimeoutTest.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/TimeoutTest.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-timeout-test/src/test/java/org/apache/felix/ipojo/runtime/test/dependencies/timeout/TimeoutTest.java Sun Mar  9 08:03:56 2014
@@ -42,7 +42,7 @@ public class TimeoutTest extends Common 
         ServiceReference ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability", ref_cs);
 
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation", cs.check());
 
         // Stop the provider.
@@ -53,7 +53,7 @@ public class TimeoutTest extends Common 
         long begin = System.currentTimeMillis();
         DelayedProvider dp = new DelayedProvider(provider, 200);
         dp.start();
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
 
         assertTrue("Check invocation - 2", cs.check());
         long end = System.currentTimeMillis();
@@ -62,7 +62,7 @@ public class TimeoutTest extends Common 
 
         ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability - 3", ref_cs);
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation - 3", cs.check());
 
         provider.stop();
@@ -85,7 +85,7 @@ public class TimeoutTest extends Common 
         ServiceReference ref_cs = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), un);
         assertNotNull("Check cs availability", ref_cs);
 
-        CheckService cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        CheckService cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         assertTrue("Check invocation", cs.check());
 
         // Stop the provider.
@@ -94,7 +94,7 @@ public class TimeoutTest extends Common 
         assertNotNull("Check cs availability - 2", ref_cs);
         DelayedProvider dp = new DelayedProvider(provider, 400);
         dp.start();
-        cs = (CheckService) osgiHelper.getServiceObject(ref_cs);
+        cs = (CheckService) osgiHelper.getRawServiceObject(ref_cs);
         try {
             cs.check();
         } catch (RuntimeException e) {

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestClass.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestClass.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestClass.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestClass.java Sun Mar  9 08:03:56 2014
@@ -46,7 +46,7 @@ public class TestClass extends Common {
         ServiceReference ref1 = ipojoHelper.getServiceReferenceByName("org.apache.felix.ipojo.runtime.core.components.inherited.ProcessParentImplementation", "ci");
         assertNotNull("Check itself", ref1);
 
-        ProcessParentImplementation itself = (ProcessParentImplementation) osgiHelper.getServiceObject(ref1);
+        ProcessParentImplementation itself = (ProcessParentImplementation) osgiHelper.getRawServiceObject(ref1);
 
         itself.processChild();
     }
@@ -58,7 +58,7 @@ public class TestClass extends Common {
         ServiceReference ref1 = ipojoHelper.getServiceReferenceByName("org.apache.felix.ipojo.runtime.core.components.inherited.ProcessParentImplementation", "ci");
         assertNotNull("Check parent", ref1);
 
-        ProcessParentImplementation itself = (ProcessParentImplementation) osgiHelper.getServiceObject(ref1);
+        ProcessParentImplementation itself = (ProcessParentImplementation) osgiHelper.getRawServiceObject(ref1);
 
         itself.processChild();
 
@@ -71,7 +71,7 @@ public class TestClass extends Common {
         ServiceReference ref1 = ipojoHelper.getServiceReferenceByName("org.apache.felix.ipojo.runtime.core.components.inherited.ProcessParentImplementation", "ci");
         assertNotNull("Check parent-parent", ref1);
 
-        ProcessParentImplementation itself = (ProcessParentImplementation) osgiHelper.getServiceObject(ref1);
+        ProcessParentImplementation itself = (ProcessParentImplementation) osgiHelper.getRawServiceObject(ref1);
 
         itself.processChild();
     }
@@ -83,7 +83,7 @@ public class TestClass extends Common {
         ServiceReference ref1 = ipojoHelper.getServiceReferenceByName("org.apache.felix.ipojo.runtime.core.components.inherited.ProcessParentImplementation", "ci");
         assertNotNull("Check parent-parent", ref1);
 
-        ProcessParentImplementation itself = (ProcessParentImplementation) osgiHelper.getServiceObject(ref1);
+        ProcessParentImplementation itself = (ProcessParentImplementation) osgiHelper.getRawServiceObject(ref1);
 
         itself.processChild();
 

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestDynamicProps.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestDynamicProps.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestDynamicProps.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestDynamicProps.java Sun Mar  9 08:03:56 2014
@@ -91,7 +91,7 @@ public class TestDynamicProps extends Co
         }
 
         // Invoke
-        FooService fs = (FooService) osgiHelper.getServiceObject(sr);
+        FooService fs = (FooService) osgiHelper.getRawServiceObject(sr);
         assertTrue("invoke fs", fs.foo());
 
         // Re-check the property (change)
@@ -153,7 +153,7 @@ public class TestDynamicProps extends Co
         }
 
         // Invoke
-        FooService fs = (FooService) osgiHelper.getServiceObject(sr);
+        FooService fs = (FooService) osgiHelper.getRawServiceObject(sr);
         assertTrue("invoke fs", fs.foo());
 
         // Re-check the property (change)
@@ -215,7 +215,7 @@ public class TestDynamicProps extends Co
         }
 
         // Invoke
-        FooService fs = (FooService) osgiHelper.getServiceObject(sr);
+        FooService fs = (FooService) osgiHelper.getRawServiceObject(sr);
         assertTrue("invoke fs", fs.foo());
 
         // Re-check the property (change)
@@ -266,7 +266,7 @@ public class TestDynamicProps extends Co
         }
 
         // Invoke
-        FooService fs = (FooService) osgiHelper.getServiceObject(sr);
+        FooService fs = (FooService) osgiHelper.getRawServiceObject(sr);
         assertTrue("invoke fs", fs.foo());
 
         // Re-check the property (change)

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestDynamicPropsReconfiguration.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestDynamicPropsReconfiguration.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestDynamicPropsReconfiguration.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestDynamicPropsReconfiguration.java Sun Mar  9 08:03:56 2014
@@ -90,7 +90,7 @@ public class TestDynamicPropsReconfigura
 
         // Reconfiguration
         ServiceReference fact_ref = ipojoHelper.getServiceReferenceByName(Factory.class.getName(), "PS-FooProviderType-Dyn2");
-        Factory fact = (Factory) osgiHelper.getServiceObject(fact_ref);
+        Factory fact = (Factory) osgiHelper.getRawServiceObject(fact_ref);
         Properties p3 = new Properties();
         p3.put("instance.name", "FooProvider-3");
         p3.put("int", 1);
@@ -133,7 +133,7 @@ public class TestDynamicPropsReconfigura
         }
 
         // Invoke
-        FooService fs = (FooService) osgiHelper.getServiceObject(sr);
+        FooService fs = (FooService) osgiHelper.getRawServiceObject(sr);
         assertTrue("invoke fs", fs.foo());
 
         // Re-check the property (change)
@@ -157,7 +157,7 @@ public class TestDynamicPropsReconfigura
 
         //	Reconfiguration
         fact_ref = ipojoHelper.getServiceReferenceByName(Factory.class.getName(), "PS-FooProviderType-Dyn2");
-        fact = (Factory) osgiHelper.getServiceObject(fact_ref);
+        fact = (Factory) osgiHelper.getRawServiceObject(fact_ref);
         p3 = new Properties();
         p3.put("instance.name", "FooProvider-3");
         p3.put("int", 1);
@@ -232,7 +232,7 @@ public class TestDynamicPropsReconfigura
 
         // Reconfiguration
         ServiceReference fact_ref = ipojoHelper.getServiceReferenceByName(Factory.class.getName(), "PS-FooProviderType-Dyn2");
-        Factory fact = (Factory) osgiHelper.getServiceObject(fact_ref);
+        Factory fact = (Factory) osgiHelper.getRawServiceObject(fact_ref);
         Properties p3 = new Properties();
         p3.put("instance.name", "FooProvider-3");
         p3.put("int", "1");
@@ -275,7 +275,7 @@ public class TestDynamicPropsReconfigura
         }
 
         // Invoke
-        FooService fs = (FooService) osgiHelper.getServiceObject(sr);
+        FooService fs = (FooService) osgiHelper.getRawServiceObject(sr);
         assertTrue("invoke fs", fs.foo());
 
         // Re-check the property (change)
@@ -299,7 +299,7 @@ public class TestDynamicPropsReconfigura
 
         //	Reconfiguration
         fact_ref = ipojoHelper.getServiceReferenceByName(Factory.class.getName(), "PS-FooProviderType-Dyn2");
-        fact = (Factory) osgiHelper.getServiceObject(fact_ref);
+        fact = (Factory) osgiHelper.getRawServiceObject(fact_ref);
         p3 = new Properties();
         p3.put("instance.name", "FooProvider-3");
         p3.put("int", "1");
@@ -415,7 +415,7 @@ public class TestDynamicPropsReconfigura
         }
 
         // Invoke
-        FooService fs = (FooService) osgiHelper.getServiceObject(sr);
+        FooService fs = (FooService) osgiHelper.getRawServiceObject(sr);
         assertTrue("invoke fs", fs.foo());
 
         // Re-check the property (change)
@@ -552,7 +552,7 @@ public class TestDynamicPropsReconfigura
         }
 
         // Invoke
-        FooService fs = (FooService) osgiHelper.getServiceObject(sr);
+        FooService fs = (FooService) osgiHelper.getRawServiceObject(sr);
         assertTrue("invoke fs", fs.foo());
 
         // Re-check the property (change)
@@ -642,7 +642,7 @@ public class TestDynamicPropsReconfigura
 
         // Reconfiguration
         ServiceReference fact_ref = ipojoHelper.getServiceReferenceByName(Factory.class.getName(), "PS-FooProviderType-Dyn2");
-        Factory fact = (Factory) osgiHelper.getServiceObject(fact_ref);
+        Factory fact = (Factory) osgiHelper.getRawServiceObject(fact_ref);
         Properties p3 = new Properties();
         p3.put("instance.name", "FooProvider-4");
         p3.put("int", new Integer(1));
@@ -685,7 +685,7 @@ public class TestDynamicPropsReconfigura
         }
 
         // Invoke
-        FooService fs = (FooService) osgiHelper.getServiceObject(sr);
+        FooService fs = (FooService) osgiHelper.getRawServiceObject(sr);
         assertTrue("invoke fs", fs.foo());
 
         // Re-check the property (change)
@@ -709,7 +709,7 @@ public class TestDynamicPropsReconfigura
 
         //	Reconfiguration
         fact_ref = ipojoHelper.getServiceReferenceByName(Factory.class.getName(), "PS-FooProviderType-Dyn2");
-        fact = (Factory) osgiHelper.getServiceObject(fact_ref);
+        fact = (Factory) osgiHelper.getRawServiceObject(fact_ref);
         p3 = new Properties();
         p3.put("instance.name", "FooProvider-3");
         p3.put("int", new Integer(1));

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestExposition.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestExposition.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestExposition.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestExposition.java Sun Mar  9 08:03:56 2014
@@ -60,26 +60,23 @@ public class TestExposition extends Comm
     public void testSimpleExposition() {
         ServiceReference ref = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), fooProviderSimple.getInstanceName());
         assertNotNull("Check the availability of the FS from " + fooProviderSimple.getInstanceName(), ref);
-        FooService fs = (FooService) osgiHelper.getServiceObject(ref);
+        FooService fs = (FooService) osgiHelper.getRawServiceObject(ref);
         assertTrue("Check fs invocation", fs.foo());
-        fs = null;
         fooProviderSimple.stop();
-        ref = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), fooProviderSimple.getInstanceName());
-        assertNull("Check the absence of the FS from " + fooProviderSimple.getInstanceName(), ref);
-
+        assertFalse("Check the absence of the FS from " + fooProviderSimple.getInstanceName(),
+                ipojoHelper.isServiceAvailableByName(FooService.class.getName(), fooProviderSimple.getInstanceName()));
     }
 
     @Test
     public void testItfExposition() {
         ServiceReference ref = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), fooProviderItf.getInstanceName());
         assertNotNull("Check the availability of the FS from " + fooProviderItf.getInstanceName(), ref);
-        FooService fs = (FooService) osgiHelper.getServiceObject(ref);
+        FooService fs = (FooService) osgiHelper.getRawServiceObject(ref);
         assertTrue("Check fs invocation", fs.foo());
-        fs = null;
         fooProviderItf.stop();
 
-        ref = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), fooProviderItf.getInstanceName());
-        assertNull("Check the absence of the FS from " + fooProviderItf.getInstanceName(), ref);
+        assertFalse("Check the absence of the FS from " + fooProviderSimple.getInstanceName(),
+                ipojoHelper.isServiceAvailableByName(FooService.class.getName(), fooProviderItf.getInstanceName()));
     }
 
     @Test
@@ -91,20 +88,18 @@ public class TestExposition extends Comm
 
         assertSame("Check service reference equality", refFoo, refBar);
 
-        FooService fs = (FooService) osgiHelper.getServiceObject(refFoo);
+        FooService fs = (FooService) osgiHelper.getRawServiceObject(refFoo);
         assertTrue("Check fs invocation", fs.foo());
-        fs = null;
 
-        BarService bs = (BarService) osgiHelper.getServiceObject(refBar);
+        BarService bs = (BarService) osgiHelper.getRawServiceObject(refBar);
         assertTrue("Check bs invocation", bs.bar());
-        bs = null;
 
         fooBarProvider.stop();
 
-        refFoo = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), fooBarProvider.getInstanceName());
-        refBar = ipojoHelper.getServiceReferenceByName(BarService.class.getName(), fooBarProvider.getInstanceName());
-        assertNull("Check the absence of the FS from " + fooBarProvider.getInstanceName(), refFoo);
-        assertNull("Check the absence of the BS from " + fooBarProvider.getInstanceName(), refBar);
+        assertFalse("Check the absence of the FS from " + fooBarProvider.getInstanceName(),
+                ipojoHelper.isServiceAvailableByName(FooService.class.getName(), fooBarProvider.getInstanceName()));
+        assertFalse("Check the absence of the BS from " + fooBarProvider.getInstanceName(),
+                ipojoHelper.isServiceAvailableByName(BarService.class.getName(), fooBarProvider.getInstanceName()));
     }
 
     @Test
@@ -116,20 +111,18 @@ public class TestExposition extends Comm
 
         assertSame("Check service reference equality", refFoo, refBar);
 
-        FooService fs = (FooService) osgiHelper.getServiceObject(refFoo);
+        FooService fs = (FooService) osgiHelper.getRawServiceObject(refFoo);
         assertTrue("Check fs invocation", fs.foo());
-        fs = null;
 
-        BarService bs = (BarService) osgiHelper.getServiceObject(refBar);
+        BarService bs = (BarService) osgiHelper.getRawServiceObject(refBar);
         assertTrue("Check bs invocation", bs.bar());
-        bs = null;
 
         fooBarProvider2.stop();
 
-        refFoo = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), fooBarProvider2.getInstanceName());
-        refBar = ipojoHelper.getServiceReferenceByName(BarService.class.getName(), fooBarProvider2.getInstanceName());
-        assertNull("Check the absence of the FS from " + fooBarProvider.getInstanceName(), refFoo);
-        assertNull("Check the absence of the BS from " + fooBarProvider.getInstanceName(), refBar);
+        assertFalse("Check the absence of the FS from " + fooBarProvider2.getInstanceName(),
+                ipojoHelper.isServiceAvailableByName(FooService.class.getName(), fooBarProvider2.getInstanceName()));
+        assertFalse("Check the absence of the BS from " + fooBarProvider2.getInstanceName(),
+                ipojoHelper.isServiceAvailableByName(BarService.class.getName(), fooBarProvider2.getInstanceName()));
     }
 
     @Test
@@ -141,13 +134,11 @@ public class TestExposition extends Comm
 
         assertNotSame("Check service reference inequality", refFoo, refBar);
 
-        FooService fs = (FooService) osgiHelper.getServiceObject(refFoo);
+        FooService fs = (FooService) osgiHelper.getRawServiceObject(refFoo);
         assertTrue("Check fs invocation", fs.foo());
-        fs = null;
 
-        BarService bs = (BarService) osgiHelper.getServiceObject(refBar);
+        BarService bs = (BarService) osgiHelper.getRawServiceObject(refBar);
         assertTrue("Check bs invocation", bs.bar());
-        bs = null;
 
         // Check properties
         String baz1 = (String) refFoo.getProperty("baz");
@@ -158,10 +149,10 @@ public class TestExposition extends Comm
 
         fooBarProvider3.stop();
 
-        refFoo = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), fooBarProvider3.getInstanceName());
-        refBar = ipojoHelper.getServiceReferenceByName(BarService.class.getName(), fooBarProvider3.getInstanceName());
-        assertNull("Check the absence of the FS from " + fooBarProvider.getInstanceName(), refFoo);
-        assertNull("Check the absence of the BS from " + fooBarProvider.getInstanceName(), refBar);
+        assertFalse("Check the absence of the FS from " + fooBarProvider3.getInstanceName(),
+                ipojoHelper.isServiceAvailableByName(FooService.class.getName(), fooBarProvider3.getInstanceName()));
+        assertFalse("Check the absence of the BS from " + fooBarProvider3.getInstanceName(),
+                ipojoHelper.isServiceAvailableByName(BarService.class.getName(), fooBarProvider3.getInstanceName()));
     }
 
 

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNullCheck.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNullCheck.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNullCheck.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNullCheck.java Sun Mar  9 08:03:56 2014
@@ -57,7 +57,7 @@ public class TestNullCheck extends Commo
         assertNotNull(ref.getProperty("prop2"));
 
         // Test foo invocation
-        FooService fs = (FooService) osgiHelper.getServiceObject(ref);
+        FooService fs = (FooService) osgiHelper.getRawServiceObject(ref);
         assertTrue("FooService invocation failed", fs.foo());
 
         ref = osgiHelper.getServiceReference(FooService.class.getName(), "(" + "instance.name" + "=" + compName + ")");

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestOSGiProperties.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestOSGiProperties.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestOSGiProperties.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestOSGiProperties.java Sun Mar  9 08:03:56 2014
@@ -68,7 +68,7 @@ public class TestOSGiProperties extends 
 
 
         // Test foo invocation
-        FooService fs = (FooService) osgiHelper.getServiceObject(ref);
+        FooService fs = (FooService) osgiHelper.getRawServiceObject(ref);
         assertTrue("FooService invocation failed", fs.foo());
 
         ipojoHelper.dispose();

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPropertiesInAnonymousClass.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPropertiesInAnonymousClass.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPropertiesInAnonymousClass.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestPropertiesInAnonymousClass.java Sun Mar  9 08:03:56 2014
@@ -68,7 +68,7 @@ public class TestPropertiesInAnonymousCl
         }
 
         // Invoke
-        FooService fs = (FooService) osgiHelper.getServiceObject(sr);
+        FooService fs = (FooService) osgiHelper.getRawServiceObject(sr);
         assertTrue("invoke fs", fs.foo());
 
         sr = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), "FooProviderAno-1");
@@ -131,7 +131,7 @@ public class TestPropertiesInAnonymousCl
         }
 
         // Invoke
-        FooService fs = (FooService) osgiHelper.getServiceObject(sr);
+        FooService fs = (FooService) osgiHelper.getRawServiceObject(sr);
         assertTrue("invoke fs", fs.getBoolean());
 
         sr = ipojoHelper.getServiceReferenceByName(FooService.class.getName(), "FooProviderAno-1");

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestProvidedServiceArchitecture.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestProvidedServiceArchitecture.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestProvidedServiceArchitecture.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestProvidedServiceArchitecture.java Sun Mar  9 08:03:56 2014
@@ -50,7 +50,7 @@ public class TestProvidedServiceArchitec
         ServiceReference arch_ref = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), compName);
         assertNotNull("Architecture not available", arch_ref);
 
-        Architecture arch = (Architecture) osgiHelper.getServiceObject(arch_ref);
+        Architecture arch = (Architecture) osgiHelper.getRawServiceObject(arch_ref);
         InstanceDescription id = arch.getInstanceDescription();
 
         assertEquals("Check component instance name (" + id.getName() + ")", id.getName(), compName);
@@ -102,7 +102,7 @@ public class TestProvidedServiceArchitec
         ServiceReference arch_ref = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), compName);
         assertNotNull("Architecture not available", arch_ref);
 
-        Architecture arch = (Architecture) osgiHelper.getServiceObject(arch_ref);
+        Architecture arch = (Architecture) osgiHelper.getRawServiceObject(arch_ref);
         InstanceDescription id = arch.getInstanceDescription();
 
         assertEquals("Check component instance name (" + id.getName() + ")", id.getName(), compName);
@@ -149,7 +149,7 @@ public class TestProvidedServiceArchitec
         ServiceReference arch_ref = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), compName);
         assertNotNull("Architecture not available", arch_ref);
 
-        Architecture arch = (Architecture) osgiHelper.getServiceObject(arch_ref);
+        Architecture arch = (Architecture) osgiHelper.getRawServiceObject(arch_ref);
         InstanceDescription id = arch.getInstanceDescription();
 
         assertEquals("Check component instance name (" + id.getName() + ")", id.getName(), compName);
@@ -193,7 +193,7 @@ public class TestProvidedServiceArchitec
         ServiceReference arch_ref = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), compName);
         assertNotNull("Architecture not available", arch_ref);
 
-        Architecture arch = (Architecture) osgiHelper.getServiceObject(arch_ref);
+        Architecture arch = (Architecture) osgiHelper.getRawServiceObject(arch_ref);
         InstanceDescription id = arch.getInstanceDescription();
 
         assertEquals("Check component instance name (" + id.getName() + ")", id.getName(), compName);

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestSimplePS.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestSimplePS.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestSimplePS.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestSimplePS.java Sun Mar  9 08:03:56 2014
@@ -54,7 +54,7 @@ public class TestSimplePS extends Common
         assertNotNull("FS not available", ref);
 
         // Test foo invocation
-        FooService fs = (FooService) osgiHelper.getServiceObject(ref);
+        FooService fs = (FooService) osgiHelper.getRawServiceObject(ref);
         assertTrue("FooService invocation failed", fs.foo());
 
         ipojoHelper.dispose();

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestStaticPropsReconfiguration.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestStaticPropsReconfiguration.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestStaticPropsReconfiguration.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestStaticPropsReconfiguration.java Sun Mar  9 08:03:56 2014
@@ -91,7 +91,7 @@ public class TestStaticPropsReconfigurat
         reconf.put("string", new String("toto"));
         reconf.put("strAProp", new String[]{"foo", "baz"});
         reconf.put("intAProp", new int[]{3, 2, 1});
-        Factory fact = (Factory) osgiHelper.getServiceObject(fact_ref);
+        Factory fact = (Factory) osgiHelper.getRawServiceObject(fact_ref);
         try {
             fact.reconfigure(reconf);
         } catch (Exception e) {
@@ -168,7 +168,7 @@ public class TestStaticPropsReconfigurat
         reconf.put("string", "toto");
         reconf.put("strAProp", new String[]{"foo", "baz"});
         reconf.put("intAProp", new int[]{3, 2, 1});
-        Factory fact = (Factory) osgiHelper.getServiceObject(fact_ref);
+        Factory fact = (Factory) osgiHelper.getRawServiceObject(fact_ref);
         try {
             fact.reconfigure(reconf);
         } catch (Exception e) {

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/inheritence/InheritanceTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/inheritence/InheritanceTest.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/inheritence/InheritanceTest.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/inheritence/InheritanceTest.java Sun Mar  9 08:03:56 2014
@@ -141,7 +141,7 @@ public class InheritanceTest extends Com
         ServiceReference ref = ipojoHelper.getServiceReferenceByName(Architecture.class.getName(), "d");
         Assert.assertNotNull(ref);
 
-        Architecture arch = (Architecture) osgiHelper.getServiceObject(ref);
+        Architecture arch = (Architecture) osgiHelper.getRawServiceObject(ref);
 
         System.out.println(arch.getInstanceDescription().getDescription());
 

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/strategies/CustomStrategy2Test.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/strategies/CustomStrategy2Test.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/strategies/CustomStrategy2Test.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/strategies/CustomStrategy2Test.java Sun Mar  9 08:03:56 2014
@@ -87,7 +87,7 @@ public class CustomStrategy2Test extends
         ServiceReference refcons1 = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), cons1.getInstanceName());
         assertNotNull("Cons1 Service available", refcons1);
 
-        CheckService cs_cons1 = (CheckService) osgiHelper.getServiceObject(refcons1);
+        CheckService cs_cons1 = (CheckService) osgiHelper.getRawServiceObject(refcons1);
         Properties props = cs_cons1.getProps();
         Long id = (Long) props.get("id");
         FooService fscons1 = (FooService) props.get("object");
@@ -100,7 +100,7 @@ public class CustomStrategy2Test extends
         ServiceReference refcons2 = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), cons2.getInstanceName());
         assertNotNull("Cons2 Service available", refcons2);
 
-        CheckService cs_cons2 = (CheckService) osgiHelper.getServiceObject(refcons2);
+        CheckService cs_cons2 = (CheckService) osgiHelper.getRawServiceObject(refcons2);
         Properties props2 = cs_cons2.getProps();
         Long id2 = (Long) props2.get("id");
         FooService fscons2 = (FooService) props2.get("object");
@@ -127,13 +127,13 @@ public class CustomStrategy2Test extends
         // The two consumers are started and use their own objects.
         ServiceReference refcons1 = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), cons1.getInstanceName());
         assertNotNull("Cons1 Service available", refcons1);
-        CheckService cs_cons1 = (CheckService) osgiHelper.getServiceObject(refcons1);
+        CheckService cs_cons1 = (CheckService) osgiHelper.getRawServiceObject(refcons1);
         Properties props = cs_cons1.getProps();
         FooService fscons1 = (FooService) props.get("object");
 
         ServiceReference refcons2 = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), cons2.getInstanceName());
         assertNotNull("Cons2 Service available", refcons2);
-        CheckService cs_cons2 = (CheckService) osgiHelper.getServiceObject(refcons2);
+        CheckService cs_cons2 = (CheckService) osgiHelper.getRawServiceObject(refcons2);
         Properties props2 = cs_cons2.getProps();
         FooService fscons2 = (FooService) props2.get("object");
 
@@ -159,13 +159,13 @@ public class CustomStrategy2Test extends
         // Check objects
         refcons1 = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), cons1.getInstanceName());
         assertNotNull("Cons1 Service available", refcons1);
-        cs_cons1 = (CheckService) osgiHelper.getServiceObject(refcons1);
+        cs_cons1 = (CheckService) osgiHelper.getRawServiceObject(refcons1);
         props = cs_cons1.getProps();
         Object fscons3 = (FooService) props.get("object");
 
         refcons2 = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), cons2.getInstanceName());
         assertNotNull("Cons2 Service available", refcons2);
-        cs_cons2 = (CheckService) osgiHelper.getServiceObject(refcons2);
+        cs_cons2 = (CheckService) osgiHelper.getRawServiceObject(refcons2);
         props2 = cs_cons2.getProps();
         Object fscons4 = (FooService) props2.get("object");
 
@@ -193,7 +193,7 @@ public class CustomStrategy2Test extends
         ServiceReference refcons1 = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), cons1.getInstanceName());
         assertNotNull("Cons1 Service available", refcons1);
 
-        CheckService cs_cons1 = (CheckService) osgiHelper.getServiceObject(refcons1);
+        CheckService cs_cons1 = (CheckService) osgiHelper.getRawServiceObject(refcons1);
         Properties props = cs_cons1.getProps();
         Long id = (Long) props.get("id");
         FooService fscons1 = (FooService) props.get("object");
@@ -206,7 +206,7 @@ public class CustomStrategy2Test extends
         ServiceReference refcons2 = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), cons3.getInstanceName());
         assertNotNull("Cons2 Service available", refcons2);
 
-        CheckService cs_cons2 = (CheckService) osgiHelper.getServiceObject(refcons2);
+        CheckService cs_cons2 = (CheckService) osgiHelper.getRawServiceObject(refcons2);
         Properties props2 = cs_cons2.getProps();
         Long id2 = (Long) props2.get("id");
         FooService fscons2 = (FooService) props2.get("object");

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/strategies/CustomStrategyTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/strategies/CustomStrategyTest.java?rev=1575671&r1=1575670&r2=1575671&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/strategies/CustomStrategyTest.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/src/test/java/org/apache/felix/ipojo/runtime/core/strategies/CustomStrategyTest.java Sun Mar  9 08:03:56 2014
@@ -87,7 +87,7 @@ public class CustomStrategyTest extends 
         ServiceReference refcons1 = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), cons1.getInstanceName());
         assertNotNull("Cons1 Service available", refcons1);
 
-        CheckService cs_cons1 = (CheckService) osgiHelper.getServiceObject(refcons1);
+        CheckService cs_cons1 = (CheckService) osgiHelper.getRawServiceObject(refcons1);
         Properties props = cs_cons1.getProps();
         Long id = (Long) props.get("id");
         FooService fscons1 = (FooService) props.get("object");
@@ -100,7 +100,7 @@ public class CustomStrategyTest extends 
         ServiceReference refcons2 = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), cons2.getInstanceName());
         assertNotNull("Cons2 Service available", refcons2);
 
-        CheckService cs_cons2 = (CheckService) osgiHelper.getServiceObject(refcons2);
+        CheckService cs_cons2 = (CheckService) osgiHelper.getRawServiceObject(refcons2);
         Properties props2 = cs_cons2.getProps();
         Long id2 = (Long) props2.get("id");
         FooService fscons2 = (FooService) props2.get("object");
@@ -127,13 +127,13 @@ public class CustomStrategyTest extends 
         // The two consumers are started and use their own objects.
         ServiceReference refcons1 = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), cons1.getInstanceName());
         assertNotNull("Cons1 Service available", refcons1);
-        CheckService cs_cons1 = (CheckService) osgiHelper.getServiceObject(refcons1);
+        CheckService cs_cons1 = (CheckService) osgiHelper.getRawServiceObject(refcons1);
         Properties props = cs_cons1.getProps();
         FooService fscons1 = (FooService) props.get("object");
 
         ServiceReference refcons2 = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), cons2.getInstanceName());
         assertNotNull("Cons2 Service available", refcons2);
-        CheckService cs_cons2 = (CheckService) osgiHelper.getServiceObject(refcons2);
+        CheckService cs_cons2 = (CheckService) osgiHelper.getRawServiceObject(refcons2);
         Properties props2 = cs_cons2.getProps();
         FooService fscons2 = (FooService) props2.get("object");
 
@@ -159,13 +159,13 @@ public class CustomStrategyTest extends 
         // Check objects
         refcons1 = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), cons1.getInstanceName());
         assertNotNull("Cons1 Service available", refcons1);
-        cs_cons1 = (CheckService) osgiHelper.getServiceObject(refcons1);
+        cs_cons1 = (CheckService) osgiHelper.getRawServiceObject(refcons1);
         props = cs_cons1.getProps();
         Object fscons3 = (FooService) props.get("object");
 
         refcons2 = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), cons2.getInstanceName());
         assertNotNull("Cons2 Service available", refcons2);
-        cs_cons2 = (CheckService) osgiHelper.getServiceObject(refcons2);
+        cs_cons2 = (CheckService) osgiHelper.getRawServiceObject(refcons2);
         props2 = cs_cons2.getProps();
         Object fscons4 = (FooService) props2.get("object");
 
@@ -194,7 +194,7 @@ public class CustomStrategyTest extends 
         ServiceReference refcons1 = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), cons1.getInstanceName());
         assertNotNull("Cons1 Service available", refcons1);
 
-        CheckService cs_cons1 = (CheckService) osgiHelper.getServiceObject(refcons1);
+        CheckService cs_cons1 = (CheckService) osgiHelper.getRawServiceObject(refcons1);
         Properties props = cs_cons1.getProps();
         Long id = (Long) props.get("id");
         FooService fscons1 = (FooService) props.get("object");
@@ -207,7 +207,7 @@ public class CustomStrategyTest extends 
         ServiceReference refcons2 = ipojoHelper.getServiceReferenceByName(CheckService.class.getName(), cons3.getInstanceName());
         assertNotNull("Cons2 Service available", refcons2);
 
-        CheckService cs_cons2 = (CheckService) osgiHelper.getServiceObject(refcons2);
+        CheckService cs_cons2 = (CheckService) osgiHelper.getRawServiceObject(refcons2);
         Properties props2 = cs_cons2.getProps();
         Long id2 = (Long) props2.get("id");
         FooService fscons2 = (FooService) props2.get("object");



Mime
View raw message