Author: ajborley
Date: Mon Feb 19 07:44:05 2007
New Revision: 509224

URL: http://svn.apache.org/viewvc?view=rev&rev=509224
Log:
Fix for TUSCANY-1121. SCAGEN was trying to create proxies/wrappers when the 
component, service or reference was not C++

Modified:
    
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java
    
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java

Modified: 
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java?view=diff&rev=509224&r1=509223&r2=509224
==============================================================================
--- 
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java
 (original)
+++ 
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java
 Mon Feb 19 07:44:05 2007
@@ -47,8 +47,10 @@
         super.handleNode(node, contextXPath, handlers, parameters);
 
         //OK we know we are handling a reference
-        //now go and create the wrapper and proxy for it
-        createProxyForReference(parameters);
+        //now go and create the wrapper and proxy for it if it is a C++ 
reference
+        
if(parameters.containsKey("/componentType/reference/interface.cpp/@header")) {
+            createProxyForReference(parameters);
+        }
 
     }
 
@@ -70,4 +72,4 @@
         }
 
     }
-}
\ No newline at end of file
+}

Modified: 
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java?view=diff&rev=509224&r1=509223&r2=509224
==============================================================================
--- 
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java
 (original)
+++ 
incubator/tuscany/cpp/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java
 Mon Feb 19 07:44:05 2007
@@ -41,8 +41,11 @@
         // Pick up attrs and the interface.cpp child elements
         super.handleNode(node, contextXPath, handlers, parameters);
 
-        //OK now go and create the wrapper and proxy for the service
-        createWrapperAndProxyForService(parameters);
+        // Only generate if this is a C++ service
+        
if(parameters.containsKey("/componentType/service/interface.cpp/@header")) {
+            //OK now go and create the wrapper and proxy for the service
+            createWrapperAndProxyForService(parameters);
+        }
 
     }
 
@@ -65,4 +68,4 @@
         }
 
     }
-}
\ No newline at end of file
+}



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to