You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/04/14 04:56:10 UTC

svn commit: r528746 - in /incubator/tuscany/java/sca/modules: implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/ implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/

Author: jsdelfino
Date: Fri Apr 13 19:56:09 2007
New Revision: 528746

URL: http://svn.apache.org/viewvc?view=rev&rev=528746
Log:
Index callback Java members by callback interface name instead of property name.

Modified:
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PojoAtomicComponent.java
    incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceProcessor.java

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PojoAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PojoAtomicComponent.java?view=diff&rev=528746&r1=528745&r2=528746
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PojoAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/context/PojoAtomicComponent.java Fri Apr 13 19:56:09 2007
@@ -177,9 +177,8 @@
     public void attachCallbackWire(Wire wire) {
         assert wire.getSourceUri().getFragment() != null;
         // FIXME: [rfeng] This is a hack to get it compiled
-        //FIXME callbackName must contain the name of a callback property  
         String callbackName = wire.getSourceContract().getCallbackInterface().toString();
-        //assert configuration.getDefinition().getCallbackMembers().get(callbackName) != null;
+        assert configuration.getDefinition().getCallbackMembers().get(callbackName) != null;
         List<Wire> wireList = callBackwires.get(callbackName);
         if (wireList == null) {
             wireList = new ArrayList<Wire>();

Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceProcessor.java?view=diff&rev=528746&r1=528745&r2=528746
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspect/impl/ServiceProcessor.java Fri Apr 13 19:56:09 2007
@@ -115,7 +115,7 @@
         if (callbackService == null) {
             throw new IllegalCallbackReferenceException("Callback type does not match a service callback interface");
         }
-        type.getCallbackMembers().put(name, new JavaElement(method, 0));
+        type.getCallbackMembers().put(callbackClass.getName(), new JavaElement(method, 0));
     }
 
     public void visitField(Field field, JavaImplementationDefinition type) throws IntrospectionException {
@@ -136,7 +136,7 @@
         if (callbackService == null) {
             throw new IllegalCallbackReferenceException("Callback type does not match a service callback interface");
         }
-        type.getCallbackMembers().put(name, new JavaElement(field));
+        type.getCallbackMembers().put(callbackClass.getName(), new JavaElement(field));
     }
 
     public Service createService(Class<?> interfaze) throws InvalidInterfaceException {



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org