[mashup-dev] svn commit r15060 - trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor

[svn]

Author: keith
Date: Mon Mar 24 23:44:29 2008
New Revision: 15060

Log:

Fixing eprs for dataservices



Modified:
   
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/Wsdl11Processor.java
   
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/Wsdl20Processor.java

Modified: 
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/Wsdl11Processor.java
==============================================================================
--- 
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/Wsdl11Processor.java
    (original)
+++ 
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/Wsdl11Processor.java
    Mon Mar 24 23:44:29 2008
@@ -70,8 +70,7 @@
 
                 String importedWSDL = getImportedWSDL(request, "wsdl");
                 if ("".equals(importedWSDL)) {
-                    if (MashupConstants.MASHUP_JS_SERVICE
-                        
.equals(axisService.getParameterValue(ServerConstants.SERVICE_TYPE))) {
+                    if (MashupUtils.isMashupService(serviceName)) {
                     int index = 
serviceName.indexOf(MashupConstants.SEPARATOR_CHAR);
 
                     try {

Modified: 
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/Wsdl20Processor.java
==============================================================================
--- 
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/Wsdl20Processor.java
    (original)
+++ 
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/Wsdl20Processor.java
    Mon Mar 24 23:44:29 2008
@@ -65,8 +65,7 @@
         WSDLPrinter wsdlPrinter = new WSDLPrinter() {
             public void printWSDL(AxisService axisService) throws IOException {
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                if (MashupConstants.MASHUP_JS_SERVICE
-                        
.equals(axisService.getParameterValue(ServerConstants.SERVICE_TYPE))) {
+                if (MashupUtils.isMashupService(serviceName)) {
                     int index = 
serviceName.indexOf(MashupConstants.SEPARATOR_CHAR);
                     AxisService2WSDL20 axisService2WSDL2 =
                             new AxisService2WSDL20(axisService, 
serviceName.substring(index + 1));

_______________________________________________
Mashup-dev mailing list
Mashup-dev@wso2.org
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev