Updates to get the JMS binding requestConnection and responseConnection attributes working using bindings defined in the definitions.xml file. This is not the final code for this as the definitions.xml processing is being refactored (by Simon Laws?) as part of TUSCANY-2499, this shows the type of function that the JMS binding will need as part of that work. Two parts that need work are that SCADefinitions.getBindings currently returns a list of Objects not Bindings as otherwise theres a cyclic dependency in the maven modules, and there needs to be a way for bindings to get at the SCADefinitions which is currently being done by getting at the contribution processing internals with ExtensibleModelResolver.getDefaultModelResolver and DefaultModelResolver.getModels.

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

3 files changed, 13 insertions, 0 deletions

diff --git a/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java b/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
index 018b65de98..2039b9ecc9 100644
--- a/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
+++ b/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
@@ -72,4 +72,11 @@ public interface SCADefinitions {
      * @return a list of domain wide Implementation Types 

      */

     List<IntentAttachPointType> getImplementationTypes();

+

+    /**

+     * Returns a list of domain wide binding definition objects

+     * 

+     * @return a list of domain wide binding definition objects 

+     */

+    List<Object> getBindings();

 }

diff --git a/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java b/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
index baaf9d7a28..a5178497a0 100644
--- a/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
+++ b/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
@@ -38,6 +38,7 @@ public class SCADefinitionsImpl implements SCADefinitions {
     private List<PolicySet> policySets = new CopyOnWriteArrayList<PolicySet>();

     private List<IntentAttachPointType> bindingTypes = new CopyOnWriteArrayList<IntentAttachPointType>();

     private List<IntentAttachPointType> implementationTypes = new CopyOnWriteArrayList<IntentAttachPointType>();

+    private List<Object> bindings = new CopyOnWriteArrayList<Object>();

 

    

     public List<IntentAttachPointType> getBindingTypes() {

@@ -63,4 +64,8 @@ public class SCADefinitionsImpl implements SCADefinitions {
     public void setTargetNamespace(String ns) {

        this.targetNamespace = ns;

     }

+

+    public List<Object> getBindings() {

+        return bindings;

+    }

 }

diff --git a/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java b/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
index 3ba3255ee7..8de6f63c05 100644
--- a/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
+++ b/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
@@ -73,6 +73,7 @@ public class SCADefinitionsUtil {
         target.getPolicySets().addAll(source.getPolicySets());

         target.getBindingTypes().addAll(source.getBindingTypes());

         target.getImplementationTypes().addAll(source.getImplementationTypes());

+        target.getBindings().addAll(source.getBindings());

     }

     

     public static boolean isSCADefnsFile(URI uri) {