Merge r767683 from 1.x branch

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

2 files changed, 15 insertions, 13 deletions

diff --git a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
index f35f35ac4c..c0bd9465e4 100644
--- a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
+++ b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
@@ -6,28 +6,29 @@
  * 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.contribution.java.impl;
 
+import org.apache.tuscany.sca.assembly.impl.ExtensibleImpl;
 import org.apache.tuscany.sca.contribution.java.JavaExport;
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
 
 /**
  * Implementation of a Java Import model
- * 
+ *
  * @version $Rev$ $Date$
  */
-public class JavaExportImpl implements JavaExport {
+public class JavaExportImpl extends ExtensibleImpl implements JavaExport {
     private ModelResolver modelResolver;
 
     /**
diff --git a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
index cc18d5f798..f2fdb3278e 100644
--- a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
+++ b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
@@ -6,21 +6,22 @@
  * 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.contribution.java.impl;
 
 import java.util.List;
 
+import org.apache.tuscany.sca.assembly.impl.ExtensibleImpl;
 import org.apache.tuscany.sca.contribution.Contribution;
 import org.apache.tuscany.sca.contribution.Export;
 import org.apache.tuscany.sca.contribution.java.JavaExport;
@@ -29,10 +30,10 @@ import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
 
 /**
  * Implementation of a Java Import model
- * 
+ *
  * @version $Rev$ $Date$
  */
-public class JavaImportImpl implements JavaImport {
+public class JavaImportImpl extends ExtensibleImpl implements JavaImport {
     private ModelResolver modelResolver;
     private List<Contribution> contributions;
     /**
@@ -43,7 +44,7 @@ public class JavaImportImpl implements JavaImport {
      * Contribution URI where the artifact is imported from
      */
     private String location;
-    
+
     public JavaImportImpl() {
         super();
     }
@@ -99,10 +100,10 @@ public class JavaImportImpl implements JavaImport {
                 }
             }
         }
-        
+
         return false;
     }
-    
+
     @Override
     public String toString() {
         return String.valueOf(packageName);