TUSCANY-3459 - Allow the remotable status of an interface to be overridden using the remotable attributed on the SCDL interface element as described by the OASIS assembly spec.

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

2 files changed, 3 insertions, 2 deletions

diff --git a/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java b/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
index 6611c6af79..304d39a51d 100644
--- a/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
+++ b/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
@@ -111,7 +111,7 @@ public class JavaInterfaceIntrospectorImpl {
         }
 
         if (remotable) {
-            if (javaInterface.isRemotableSet() && javaInterface.isRemotable() == false) {
+            if (javaInterface.isRemotableSetFromSCDL() && javaInterface.isRemotable() == false) {
                 throw new InvalidAnnotationException("[JCA30005] @Remotable annotation present in a interface marked as not remotable in the SCDL", Remotable.class);
             }
         } else {
diff --git a/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java b/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
index 87628d9901..b321b0d5de 100644
--- a/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
+++ b/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
@@ -166,6 +166,7 @@ public class JavaInterfaceProcessor implements StAXArtifactProcessor<JavaInterfa
         String remotable = reader.getAttributeValue(null, REMOTABLE);
         if (remotable != null) {
             javaInterfaceContract.getInterface().setRemotable(Boolean.parseBoolean(remotable));
+            javaInterfaceContract.getInterface().setRemotableSetFromSCDL();
         }
         
         // Read intents and policy sets
@@ -190,7 +191,7 @@ public class JavaInterfaceProcessor implements StAXArtifactProcessor<JavaInterfa
             writer.writeAttribute(INTERFACE, javaInterface.getName());
         }
         
-        if(javaInterface != null && javaInterface.isRemotableSet()) {
+        if(javaInterface != null && javaInterface.isRemotableSetFromSCDL()) {
             writer.writeAttribute(REMOTABLE, String.valueOf(javaInterface.isRemotable()));
         }