Author: keith
Date: Wed Jul  2 07:15:42 2008
New Revision: 18802
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=18802

Log:
Fixing mashup-859


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=18802&r1=18801&r2=18802&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
   Wed Jul  2 07:15:42 2008
@@ -941,7 +941,18 @@
 
             // If the user did not specify a httpLocation default it to 
operationName
             // cause this is the default that axis2 uses
-            if (httpLocation == null) {
+            if (httpLocation != null) {
+                if (!httpLocation.startsWith("{{") && 
httpLocation.startsWith("{")) {
+
+                    // We cannot extract parameters off the URL in situations 
such as
+                    // foo.httpLocation="{param}"; Rather it should be
+                    // foo.httpLocation="bar/{param}";
+                    throw new DeploymentException("The httpLocation Annotation 
of operation " +
+                            name + " is invalid. The httpLocation found was 
\"" + httpLocation +
+                            "\". The httpLocation should not start with a 
parameter. " +
+                            "Please include a constant part at the start of 
the templete.");
+                }
+            } else {
                 httpLocation = name;
             }
 

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

Reply via email to