[wsas-java-dev] svn commit r3476 - in trunk/wsas/java: . modules/admin/src/org/wso2/wsas/admin/service modules/admin/src/org/wso2/wsas/admin/service/util modules/core/src/org/wso2/wsas/transport/util

[svn at wso2.org]

Author: saminda
Date: Sun Jun  3 23:56:37 2007
New Revision: 3476

Modified:
   trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
   trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServiceArchiveCreator.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/pom.xml
Log:
1. Fixes to cope with Axis2 trunk
2. Updated 1.2-SNAPSHOTS to SNAPSHOT 


Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java	(original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java	Sun Jun  3 23:56:37 2007
@@ -24,7 +24,6 @@
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver;
 import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
-import org.apache.axis2.rpc.receivers.ejb.EJBUtil;
 import org.apache.log4j.Logger;
 import org.apache.neethi.Policy;
 import org.apache.neethi.PolicyRegistry;
@@ -603,7 +602,7 @@
                 }
             }
 
-            axisService.printWSDL(out, ip, getConfigContext().getServiceContextPath());
+            axisService.printWSDL(out, ip);
 
             try {
                 XMLStreamReader xmlReader = XMLInputFactory.newInstance()

Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServiceArchiveCreator.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServiceArchiveCreator.java	(original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServiceArchiveCreator.java	Sun Jun  3 23:56:37 2007
@@ -20,13 +20,13 @@
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.deployment.DeploymentConstants;
 import org.apache.axis2.description.*;
+import org.apache.axis2.description.java2wsdl.TypeTable;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.neethi.Policy;
 import org.apache.neethi.PolicyReference;
 import org.apache.neethi.PolicyRegistry;
-import org.apache.ws.java2wsdl.utils.TypeTable;
 import org.wso2.utils.ArchiveManipulator;
 import org.wso2.utils.NetworkUtils;
 import org.wso2.utils.WSO2Constants;
@@ -124,9 +124,7 @@
                         f.getAbsolutePath() + File.separator + "META-INF",
                         axisService.getName() + ".wsdl");
                 OutputStream wbOut = new FileOutputStream(wsdlF);
-                axisService.printWSDL(wbOut, NetworkUtils.getLocalHostname(),
-                                      RequestProcessorUtil.getServiceContextPath(
-                                              configurationContext));
+                axisService.printWSDL(wbOut, NetworkUtils.getLocalHostname());
 
 
             }

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	Sun Jun  3 23:56:37 2007
@@ -35,9 +35,7 @@
         WSDLPrinter wsdlPrinter = new WSDLPrinter() {
             public void printWSDL(AxisService axisService) throws IOException {
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                axisService.printWSDL(baos,
-                                      NetworkUtils.getLocalHostname(),
-                                      RequestProcessorUtil.getServiceContextPath(configurationContext));
+                axisService.printWSDL(baos,NetworkUtils.getLocalHostname());
                 RequestProcessorUtil.writeDocument(baos,
                                                    response.getOutputStream(),
                                                    "annotated-wsdl.xsl",

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	Sun Jun  3 23:56:37 2007
@@ -36,9 +36,7 @@
         WSDLPrinter wsdlPrinter = new WSDLPrinter() {
             public void printWSDL(AxisService axisService) throws IOException {
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                axisService.printWSDL2(baos,
-                                       NetworkUtils.getLocalHostname(),
-                                       RequestProcessorUtil.getServiceContextPath(configurationContext));
+                axisService.printWSDL2(baos);
                 RequestProcessorUtil.writeDocument(baos,
                                                    response.getOutputStream(),
                                                    "annotated-wsdl2.xsl",

Modified: trunk/wsas/java/pom.xml
==============================================================================
--- trunk/wsas/java/pom.xml	(original)
+++ trunk/wsas/java/pom.xml	Sun Jun  3 23:56:37 2007
@@ -1266,13 +1266,13 @@
 
         <wso2wsas.version>${pom.version}</wso2wsas.version>
 
-        <wso2utils.version>1.2-SNAPSHOT</wso2utils.version>
-        <wso2codegen.version>1.2-SNAPSHOT</wso2codegen.version>
-        <wso2mex.version>1.2-SNAPSHOT</wso2mex.version>
-        <wso2xfer.version>1.2-SNAPSHOT</wso2xfer.version>
-        <wso2statistics.version>1.2-SNAPSHOT</wso2statistics.version>
-        <wso2throttle.version>1.2-SNAPSHOT</wso2throttle.version>
-        <wso2tracer.version>1.2-SNAPSHOT</wso2tracer.version>
+        <wso2utils.version>SNAPSHOT</wso2utils.version>
+        <wso2codegen.version>SNAPSHOT</wso2codegen.version>
+        <wso2mex.version>SNAPSHOT</wso2mex.version>
+        <wso2xfer.version>SNAPSHOT</wso2xfer.version>
+        <wso2statistics.version>SNAPSHOT</wso2statistics.version>
+        <wso2throttle.version>SNAPSHOT</wso2throttle.version>
+        <wso2tracer.version>SNAPSHOT</wso2tracer.version>
         <dynamiccodegen.version>SNAPSHOT</dynamiccodegen.version>
         <wsrequest.version>SNAPSHOT</wsrequest.version>