Refactor the package names to be consistent with other implementation types. We will split it into model and runtime later on.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@683413 13f79535-47bb-0310-9956-ffa450edef68

14 files changed, 41 insertions, 38 deletions

diff --git a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationInterface.java b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
index 73cae46324..7bcb0a1da5 100644
--- a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationInterface.java
+++ b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
@@ -30,7 +30,7 @@ import org.apache.tuscany.sca.assembly.Implementation;
  *
  * @version $Rev$ $Date$
  */
-public interface OSGiImplementationInterface extends Implementation, Extensible {
+public interface OSGiImplementation extends Implementation, Extensible {
 
     String getBundleSymbolicName();
 
diff --git a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
index 684816b756..fe3efd22cd 100644
--- a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java
+++ b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.implementation.osgi.xml;
+package org.apache.tuscany.sca.implementation.osgi.impl;
 
 
 import java.util.Hashtable;
@@ -25,7 +25,7 @@ import java.util.List;
 import org.apache.tuscany.sca.assembly.ComponentProperty;
 import org.apache.tuscany.sca.assembly.impl.ImplementationImpl;
 import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.implementation.osgi.OSGiImplementationInterface;
+import org.apache.tuscany.sca.implementation.osgi.OSGiImplementation;
 
 
 /**
@@ -35,7 +35,7 @@ import org.apache.tuscany.sca.implementation.osgi.OSGiImplementationInterface;
  *
  * @version $Rev$ $Date$
  */
-public class OSGiImplementation extends ImplementationImpl implements OSGiImplementationInterface {
+public class OSGiImplementationImpl extends ImplementationImpl implements OSGiImplementation {
     
     private String bundleSymbolicName;
     private String bundleVersion;
@@ -53,7 +53,7 @@ public class OSGiImplementation extends ImplementationImpl implements OSGiImplem
     
     private Object osgiBundle;
     
-    public OSGiImplementation(
+    public OSGiImplementationImpl(
             ModelFactoryExtensionPoint modelFactories,
             String bundleSymbolicName,
             String bundleVersion,
@@ -72,7 +72,7 @@ public class OSGiImplementation extends ImplementationImpl implements OSGiImplem
         this.modelFactories = modelFactories;
     }
 
-    protected void setCallbackProperties(Hashtable<String, List<ComponentProperty>> refCallbackProperties, 
+    public void setCallbackProperties(Hashtable<String, List<ComponentProperty>> refCallbackProperties, 
             Hashtable<String, List<ComponentProperty>> serviceCallbackProperties) {
         
         this.referenceCallbackProperties = refCallbackProperties;
@@ -145,9 +145,9 @@ public class OSGiImplementation extends ImplementationImpl implements OSGiImplem
     @Override
     public boolean equals(Object obj) {
         
-        if (!(obj instanceof OSGiImplementation))
+        if (!(obj instanceof OSGiImplementationImpl))
             return super.equals(obj);
-        OSGiImplementation impl = (OSGiImplementation)obj;
+        OSGiImplementationImpl impl = (OSGiImplementationImpl)obj;
         if (!areEqual(bundleSymbolicName, impl.bundleSymbolicName))
             return false;
         if (!areEqual(bundleVersion, impl.bundleVersion))
diff --git a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
index 3b08bbc7dc..5664c77618 100644
--- a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java
+++ b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.implementation.osgi.invocation;
+package org.apache.tuscany.sca.implementation.osgi.runtime;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -58,9 +58,9 @@ import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
 import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;
 import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
-import org.apache.tuscany.sca.implementation.osgi.OSGiImplementationInterface;
+import org.apache.tuscany.sca.implementation.osgi.OSGiImplementation;
 import org.apache.tuscany.sca.implementation.osgi.context.OSGiAnnotations;
-import org.apache.tuscany.sca.implementation.osgi.xml.OSGiImplementation;
+import org.apache.tuscany.sca.implementation.osgi.impl.OSGiImplementationImpl;
 import org.apache.tuscany.sca.interfacedef.Interface;
 import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
 import org.apache.tuscany.sca.interfacedef.Operation;
@@ -103,7 +103,7 @@ public class OSGiImplementationProvider  implements ScopedImplementationProvider
     // Maximum milliseconds to wait for services to be registered into OSGi service registry
     private static final long SERVICE_TIMEOUT_MILLIS = 300000; 
   
-    private OSGiImplementation implementation;
+    private OSGiImplementationImpl implementation;
     private OSGiAnnotations osgiAnnotations;
     private BundleContext bundleContext;
     
@@ -139,7 +139,7 @@ public class OSGiImplementationProvider  implements ScopedImplementationProvider
     
 
     public OSGiImplementationProvider(RuntimeComponent definition,
-            OSGiImplementationInterface impl,
+            OSGiImplementation impl,
             DataBindingExtensionPoint dataBindingRegistry,
             JavaPropertyValueObjectFactory propertyValueFactory,
             ProxyFactory proxyFactory,
@@ -149,7 +149,7 @@ public class OSGiImplementationProvider  implements ScopedImplementationProvider
             InterfaceContractMapper mapper) throws BundleException {
         
         
-        this.implementation = (OSGiImplementation)impl;
+        this.implementation = (OSGiImplementationImpl)impl;
         this.runtimeComponent = definition;
         this.dataBindingRegistry = dataBindingRegistry;
         this.propertyValueFactory = propertyValueFactory;
@@ -200,7 +200,7 @@ public class OSGiImplementationProvider  implements ScopedImplementationProvider
         return runtimeComponent;
     }
     
-    protected OSGiImplementation getImplementation() {
+    protected OSGiImplementationImpl getImplementation() {
         return implementation;
     }
     
diff --git a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProviderFactory.java b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java
index 5c9bfc94f0..814d37f203 100644
--- a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProviderFactory.java
+++ b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.implementation.osgi.invocation;
+package org.apache.tuscany.sca.implementation.osgi.runtime;
 
 
 import org.apache.tuscany.sca.context.ContextFactoryExtensionPoint;
@@ -32,7 +32,7 @@ import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
 import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
 import org.apache.tuscany.sca.databinding.impl.MediatorImpl;
 import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
-import org.apache.tuscany.sca.implementation.osgi.OSGiImplementationInterface;
+import org.apache.tuscany.sca.implementation.osgi.OSGiImplementation;
 import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
 import org.apache.tuscany.sca.invocation.MessageFactory;
 import org.apache.tuscany.sca.provider.ImplementationProvider;
@@ -46,7 +46,7 @@ import org.osgi.framework.BundleException;
  *
  * @version $Rev$ $Date$
  */
-public class OSGiImplementationProviderFactory implements ImplementationProviderFactory<OSGiImplementationInterface> {
+public class OSGiImplementationProviderFactory implements ImplementationProviderFactory<OSGiImplementation> {
     
     private DataBindingExtensionPoint dataBindings;
     private JavaPropertyValueObjectFactory propertyFactory;
@@ -83,7 +83,7 @@ public class OSGiImplementationProviderFactory implements ImplementationProvider
     }
 
     public ImplementationProvider createImplementationProvider(RuntimeComponent component,
-        OSGiImplementationInterface implementation) {
+        OSGiImplementation implementation) {
                 
         try {
                 
@@ -104,8 +104,8 @@ public class OSGiImplementationProviderFactory implements ImplementationProvider
         
     }
 
-    public Class<OSGiImplementationInterface> getModelType() {
-        return OSGiImplementationInterface.class;
+    public Class<OSGiImplementation> getModelType() {
+        return OSGiImplementation.class;
     }
 
 }
diff --git a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiInstanceWrapper.java b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java
index ab1c9fedba..e775041592 100644
--- a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiInstanceWrapper.java
+++ b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.sca.implementation.osgi.invocation;
+package org.apache.tuscany.sca.implementation.osgi.runtime;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java
index d8f19580eb..deb44d26fb 100644
--- a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java
+++ b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.implementation.osgi.invocation;
+package org.apache.tuscany.sca.implementation.osgi.runtime;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTargetInvoker.java b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java
index e464b3b15d..deb39a47cd 100644
--- a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTargetInvoker.java
+++ b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.implementation.osgi.invocation;
+package org.apache.tuscany.sca.implementation.osgi.runtime;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
index 62578bee33..7f246cb76c 100644
--- a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
+++ b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
@@ -53,6 +53,7 @@ import org.apache.tuscany.sca.contribution.service.ContributionReadException;
 import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
 import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
 import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;
+import org.apache.tuscany.sca.implementation.osgi.impl.OSGiImplementationImpl;
 import org.apache.tuscany.sca.interfacedef.Interface;
 import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
@@ -75,7 +76,7 @@ import org.w3c.dom.Node;
  *
  * @version $Rev$ $Date$
  */
-public class OSGiImplementationProcessor implements StAXArtifactProcessor<OSGiImplementation> {
+public class OSGiImplementationProcessor implements StAXArtifactProcessor<OSGiImplementationImpl> {
     
     public static final QName IMPLEMENTATION_OSGI  = new QName(Constants.SCA10_TUSCANY_NS, "implementation.osgi");
     
@@ -136,8 +137,8 @@ public class OSGiImplementationProcessor implements StAXArtifactProcessor<OSGiIm
         return IMPLEMENTATION_OSGI;
     }
 
-    public Class<OSGiImplementation> getModelType() {
-        return OSGiImplementation.class;
+    public Class<OSGiImplementationImpl> getModelType() {
+        return OSGiImplementationImpl.class;
     }
 
     private String[] tokenize(String str) {
@@ -150,7 +151,7 @@ public class OSGiImplementationProcessor implements StAXArtifactProcessor<OSGiIm
         return tokens;
     }
     
-    public OSGiImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
+    public OSGiImplementationImpl read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
         assert IMPLEMENTATION_OSGI.equals(reader.getName());
 
         String bundleSymbolicName = reader.getAttributeValue(null, BUNDLE_SYMBOLICNAME);
@@ -211,7 +212,7 @@ public class OSGiImplementationProcessor implements StAXArtifactProcessor<OSGiIm
 
         }
             
-        OSGiImplementation implementation = new OSGiImplementation(
+        OSGiImplementationImpl implementation = new OSGiImplementationImpl(
                     modelFactories,
                     bundleSymbolicName,
                     bundleVersion,
@@ -228,7 +229,7 @@ public class OSGiImplementationProcessor implements StAXArtifactProcessor<OSGiIm
     }
     
 
-    public void resolve(OSGiImplementation impl, ModelResolver resolver) throws ContributionResolveException {
+    public void resolve(OSGiImplementationImpl impl, ModelResolver resolver) throws ContributionResolveException {
         
         try {
         	
@@ -365,7 +366,7 @@ public class OSGiImplementationProcessor implements StAXArtifactProcessor<OSGiIm
         return reference;
     }
 
-    public void write(OSGiImplementation model, XMLStreamWriter outputSource) throws ContributionWriteException, XMLStreamException {
+    public void write(OSGiImplementationImpl model, XMLStreamWriter outputSource) throws ContributionWriteException, XMLStreamException {
         
         //FIXME Implement this method
     }
diff --git a/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 0f2b028e87..9ecff71874 100644
--- a/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.osgi.xml.OSGiImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#implementation.osgi,model=org.apache.tuscany.sca.implementation.osgi.OSGiImplementationInterface
+org.apache.tuscany.sca.implementation.osgi.xml.OSGiImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#implementation.osgi,model=org.apache.tuscany.sca.implementation.osgi.OSGiImplementation
diff --git a/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 0f0fa03f75..c2cd957351 100644
--- a/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
@@ -16,4 +16,4 @@
 # under the License. 

 

 # Implementation class for the implementation extension

-org.apache.tuscany.sca.implementation.osgi.invocation.OSGiImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.osgi.OSGiImplementationInterface

+org.apache.tuscany.sca.implementation.osgi.runtime.OSGiImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.osgi.OSGiImplementation

diff --git a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiPropertyTestCase.java b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java
index 489df31aa5..fb4cb4207a 100644
--- a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiPropertyTestCase.java
+++ b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.implementation.osgi.invocation;
+package org.apache.tuscany.sca.implementation.osgi.runtime;
 
 import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestBundles;
 import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestInterface;
diff --git a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTestCase.java b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
index 500c15dcc2..6a6d80f15e 100644
--- a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTestCase.java
+++ b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.implementation.osgi.invocation;
+package org.apache.tuscany.sca.implementation.osgi.runtime;
 
 import java.lang.reflect.Proxy;
 
diff --git a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
index 000c87d2b0..1831587896 100644
--- a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
+++ b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
@@ -41,6 +41,7 @@ import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtens
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
 import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
 import org.apache.tuscany.sca.core.UtilityExtensionPoint;
+import org.apache.tuscany.sca.implementation.osgi.impl.OSGiImplementationImpl;
 import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestBundles;
 import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestImpl;
 import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestInterface;
@@ -119,7 +120,7 @@ public class OSGiReadImplTestCase extends TestCase {
         XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
         reader.next();
 
-        OSGiImplementation osgiImpl = (OSGiImplementation)staxProcessor.read(reader);
+        OSGiImplementationImpl osgiImpl = (OSGiImplementationImpl)staxProcessor.read(reader);
 
         assertEquals(osgiImpl.getBundleSymbolicName(), "OSGiTestService");
         assertEquals(osgiImpl.getBundleVersion(), "2.0.0");
diff --git a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
index f22095fbbe..e1bbd97655 100644
--- a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
+++ b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
@@ -28,6 +28,7 @@ import org.apache.tuscany.sca.assembly.ComponentType;
 import org.apache.tuscany.sca.assembly.Property;
 import org.apache.tuscany.sca.contribution.resolver.ClassReference;
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.implementation.osgi.impl.OSGiImplementationImpl;
 
 
 /**
@@ -50,9 +51,9 @@ public class TestModelResolver implements ModelResolver {
         Object resolved = map.get(unresolved);
         if (resolved != null) {
             
-            if (unresolved instanceof OSGiImplementation && !(resolved instanceof OSGiImplementation)) {
+            if (unresolved instanceof OSGiImplementationImpl && !(resolved instanceof OSGiImplementationImpl)) {
                 
-                OSGiImplementation impl = ((OSGiImplementation)unresolved);
+                OSGiImplementationImpl impl = ((OSGiImplementationImpl)unresolved);
                 ComponentType componentType = (ComponentType)resolved;
                 
                 List<Property> properties = componentType.getProperties();