[wsas-java-dev] svn commit r3852 - trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util

[svn at wso2.org]

Author: saminda
Date: Fri Jun 15 02:17:21 2007
New Revision: 3852

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
   trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/XsdProcessor.java
Log:
Fixing the annotation issue 


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 Jun 15 02:17:21 2007
@@ -57,6 +57,22 @@
         }
     }
 
+    /**
+     * This method check for annotation=true query param. If it is available
+     * this method return true, otherwise false.
+     * @param request
+     * @return boolean 
+     */
+    protected boolean checkForAnnotation(HttpServletRequest request) {
+        String queryString = request.getQueryString();
+        if (queryString != null && queryString.length() != 0 ) {
+            if (queryString.indexOf("annotation=true") > -1) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     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 Jun 15 02:17:21 2007
@@ -32,17 +32,9 @@
     public void process(final HttpServletRequest request,
                         final HttpServletResponse response,
                         final ConfigurationContext configurationContext) throws Exception {
-        String queryString = request.getQueryString();
-        boolean annotation = false;
-        if (queryString != null && queryString.length() != 0 ) {
-            if (queryString.indexOf("annotation") > -1) {
-                annotation = true;
-            }
-        }
-        final boolean annotation1 = annotation;
-        WSDLPrinter wsdlPrinter = new WSDLPrinter() {
-
 
+        final boolean annotation = checkForAnnotation(request);
+        WSDLPrinter wsdlPrinter = new WSDLPrinter() {
             public void printWSDL(AxisService axisService) throws IOException {
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 axisService.printWSDL(baos,NetworkUtils.getLocalHostname());
@@ -50,7 +42,7 @@
                                                    response.getOutputStream(),
                                                    "annotated-wsdl.xsl",
                                                    configurationContext.getContextRoot(),
-                                                   annotation1);
+                                                   annotation);
             }
         };
         printWSDL(configurationContext, request, 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 Jun 15 02:17:21 2007
@@ -33,6 +33,7 @@
     public void process(final HttpServletRequest request,
                         final HttpServletResponse response,
                         final ConfigurationContext configurationContext) throws Exception {
+        final boolean annotation = checkForAnnotation(request);
         WSDLPrinter wsdlPrinter = new WSDLPrinter() {
             public void printWSDL(AxisService axisService) throws IOException {
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -40,7 +41,8 @@
                 RequestProcessorUtil.writeDocument(baos,
                                                    response.getOutputStream(),
                                                    "annotated-wsdl2.xsl",
-                                                   configurationContext.getContextRoot());
+                                                   configurationContext.getContextRoot(),
+                                                   annotation);
             }
         };
         printWSDL(configurationContext, request, response, wsdlPrinter);

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/XsdProcessor.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/XsdProcessor.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/XsdProcessor.java	Fri Jun 15 02:17:21 2007
@@ -115,6 +115,6 @@
                                String contextRoot) {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         schema.write(baos);
-        RequestProcessorUtil.writeDocument(baos, outputStream, "annotated-xsd.xsl", contextRoot);
+        RequestProcessorUtil.writeDocument(baos, outputStream, "annotated-xsd.xsl", contextRoot,true);
     }
 }