Add a QName as the type for binding/implementation and use it to compare model types instead of class

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

2 files changed, 10 insertions, 12 deletions

diff --git a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
index 4551821f5a..ba5e5284be 100644
--- a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
+++ b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
@@ -6,15 +6,15 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 package org.apache.tuscany.sca.implementation.osgi;
 
@@ -31,12 +31,10 @@ import org.osgi.framework.Bundle;
  * @version $Rev$ $Date$
  */
 public interface OSGiImplementation extends Implementation, Extensible {
-    // String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
-    String SCA11_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
-
     String BUNDLE_SYMBOLICNAME = "bundleSymbolicName";
     String BUNDLE_VERSION = "bundleVersion";
     QName IMPLEMENTATION_OSGI = new QName(SCA11_TUSCANY_NS, "implementation.osgi");
+    QName TYPE = IMPLEMENTATION_OSGI;
 
     String getBundleSymbolicName();
 
diff --git a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
index 41deef131f..f3397619f5 100644
--- a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
+++ b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
@@ -6,15 +6,15 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 package org.apache.tuscany.sca.implementation.osgi.impl;
 
@@ -25,7 +25,7 @@ import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 
 /**
- * OSGi implementation 
+ * OSGi implementation
  *    All attributes from <implementation.osgi> have getters in this class
  * This class implements OSGiImplementationInterface which is associated with OSGiImplementationProvider.
  *
@@ -40,12 +40,12 @@ public class OSGiImplementationImpl extends ImplementationImpl implements OSGiIm
     private FactoryExtensionPoint modelFactories;
 
     protected OSGiImplementationImpl(FactoryExtensionPoint modelFactories) {
+        super(TYPE);
         this.modelFactories = modelFactories;
     }
 
     public OSGiImplementationImpl(FactoryExtensionPoint modelFactories, String bundleSymbolicName, String bundleVersion) {
-
-        super();
+        super(TYPE);
         this.bundleSymbolicName = bundleSymbolicName;
         this.bundleVersion = bundleVersion;
         this.modelFactories = modelFactories;