Author: keith
Date: Fri Dec 14 00:37:52 2007
New Revision: 11113

Log:

Moving some of the logic in AbstractWsdlProcessor down to the subclasses (This 
is a bit of duplicate code in WSAS but its needed for the Mashup Server)



Modified:
   
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/AbstractWsdlProcessor.java
   
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/Wsdl11Processor.java
   
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/Wsdl20Processor.java

Modified: 
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/AbstractWsdlProcessor.java
==============================================================================
--- 
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/AbstractWsdlProcessor.java
    (original)
+++ 
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/AbstractWsdlProcessor.java
    Fri Dec 14 00:37:52 2007
@@ -32,12 +32,9 @@
 public abstract class AbstractWsdlProcessor implements HttpGetRequestProcessor 
{
 
     protected void printWSDL(ConfigurationContext configurationContext,
-                             HttpServletRequest request,
+                             String serviceName,
                              HttpServletResponse response,
-                             WSDLPrinter wsdlPrinter) throws IOException {
-        String requestURI = request.getRequestURI();
-        String contextPath = configurationContext.getServiceContextPath();
-        String serviceName = 
requestURI.substring(requestURI.indexOf(contextPath) + contextPath.length() + 
1);
+                             WSDLPrinter wsdlPrinter) throws IOException {     
   
         AxisService axisService =
                 
configurationContext.getAxisConfiguration().getServiceForActivation(serviceName);
 
@@ -96,7 +93,7 @@
 
     }
 
-    interface WSDLPrinter {
+    protected interface WSDLPrinter {
         void printWSDL(AxisService axisService) throws IOException;
     }
 }

Modified: 
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/Wsdl11Processor.java
==============================================================================
--- 
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/Wsdl11Processor.java
  (original)
+++ 
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/Wsdl11Processor.java
  Fri Dec 14 00:37:52 2007
@@ -51,6 +51,9 @@
                                                    
checkForAnnotation(request));
             }
         };
-        printWSDL(configurationContext, request, response, wsdlPrinter);
+        String requestURI = request.getRequestURI();
+        String contextPath = configurationContext.getServiceContextPath();
+        String serviceName = 
requestURI.substring(requestURI.indexOf(contextPath) + contextPath.length() + 
1);
+        printWSDL(configurationContext, serviceName, response, wsdlPrinter);
     }
 }

Modified: 
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/Wsdl20Processor.java
==============================================================================
--- 
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/Wsdl20Processor.java
  (original)
+++ 
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/Wsdl20Processor.java
  Fri Dec 14 00:37:52 2007
@@ -44,6 +44,9 @@
                                                    
checkForAnnotation(request));
             }
         };
-        printWSDL(configurationContext, request, response, wsdlPrinter);
+        String requestURI = request.getRequestURI();
+        String contextPath = configurationContext.getServiceContextPath();
+        String serviceName = 
requestURI.substring(requestURI.indexOf(contextPath) + contextPath.length() + 
1);
+        printWSDL(configurationContext, serviceName, response, wsdlPrinter);
     }
 }

_______________________________________________
Wsas-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev

Reply via email to