Author: keith
Date: Mon Jun 30 21:47:28 2008
New Revision: 18739
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=18739

Log:
Fixing Mashup-794


Modified:
   
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java

Modified: 
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
URL: 
http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java?rev=18739&r1=18738&r2=18739&view=diff
==============================================================================
--- 
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
   (original)
+++ 
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
   Mon Jun 30 21:47:28 2008
@@ -519,7 +519,7 @@
                 if (object instanceof Function) {
                     processOperation(engine, axisService, method, (Function) 
object,
                                      schemaGenerator,
-                                     targetNamespace, name);
+                                     targetNamespace);
                 }
             }
             axisService.addSchema(schemaGenerator.getSchema());
@@ -872,12 +872,11 @@
      * @param schemaGenerator An instance of SchemaGenerator in order to 
genarate the schema for
      * this operation
      * @param targetNamespace The targetNamespace for this service
-     * @param serviceName The name of this service
      * @throws AxisFault Thrown in case an exception occured while creating 
the axisoperation
      */
     private void processOperation(JavaScriptEngine engine, AxisService 
axisService, String method,
                                   Function function, SchemaGenerator 
schemaGenerator,
-                                  String targetNamespace, String serviceName)
+                                  String targetNamespace)
             throws AxisFault {
 
         /*
@@ -940,10 +939,10 @@
 
             String httpLocation = annotationParser.getHttpLocation();
 
-            // If the user did not specify a httpLocation default it to 
serviceName/operationName
+            // If the user did not specify a httpLocation default it to 
operationName
             // cause this is the default that axis2 uses
             if (httpLocation == null) {
-                httpLocation = serviceName + MashupConstants.FORWARD_SLASH + 
name;
+                httpLocation = name;
             }
 
             String httpMethod = annotationParser.getHttpMethod();

_______________________________________________
Mashup-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/mashup-dev

Reply via email to