Hi Isuru, On Tue, May 31, 2011 at 1:49 PM, Isuru Suriarachchi <[email protected]> wrote:
> > > On Mon, May 30, 2011 at 6:18 PM, <[email protected]> wrote: > >> Author: prabatha >> Date: Mon May 30 05:48:29 2011 >> New Revision: 106458 >> URL: http://wso2.org/svn/browse/wso2?view=rev&revision=106458 >> >> Log: >> fixing CARBON-9583 >> >> Modified: >> >> branches/carbon/3.2.0/components/data-services/org.wso2.carbon.dataservices.ui/3.2.0/src/main/java/org/wso2/carbon/dataservices/ui/fileupload/DBSFileUploadExecutor.java >> >> branches/carbon/3.2.0/components/data-services/org.wso2.carbon.dataservices.ui/3.2.0/src/main/java/org/wso2/carbon/dataservices/ui/fileupload/WSDLUploadExecutor.java >> >> Modified: >> branches/carbon/3.2.0/components/data-services/org.wso2.carbon.dataservices.ui/3.2.0/src/main/java/org/wso2/carbon/dataservices/ui/fileupload/DBSFileUploadExecutor.java >> URL: >> http://wso2.org/svn/browse/wso2/branches/carbon/3.2.0/components/data-services/org.wso2.carbon.dataservices.ui/3.2.0/src/main/java/org/wso2/carbon/dataservices/ui/fileupload/DBSFileUploadExecutor.java?rev=106458&r1=106457&r2=106458&view=diff >> >> ============================================================================== >> --- >> branches/carbon/3.2.0/components/data-services/org.wso2.carbon.dataservices.ui/3.2.0/src/main/java/org/wso2/carbon/dataservices/ui/fileupload/DBSFileUploadExecutor.java >> (original) >> +++ >> branches/carbon/3.2.0/components/data-services/org.wso2.carbon.dataservices.ui/3.2.0/src/main/java/org/wso2/carbon/dataservices/ui/fileupload/DBSFileUploadExecutor.java >> Mon May 30 05:48:29 2011 >> @@ -39,6 +39,8 @@ >> if (fileItemsMap == null || fileItemsMap.isEmpty()) { >> String msg = "File uploading failed. No files are specified"; >> log.error(msg); >> + log.info("Context Root :" + getContextRoot(request)); >> + log.info("Web Context :"+webContext); >> > > Prabath, why did you add these two info logs here? Is it committed by > mistake? > Yeah it was a mistake. :) I ll remove 'em.. > Thanks, > ~Isuru > > >> CarbonUIMessage.sendCarbonUIMessage(msg, >> CarbonUIMessage.ERROR, request, >> response, getContextRoot(request) + "/" + webContext + >> "/ds/upload.jsp"); >> } >> @@ -63,14 +65,14 @@ >> response.setContentType("text/html; charset=utf-8"); >> msg = "Data Service configuration file uploaded >> successfully."; >> CarbonUIMessage.sendCarbonUIMessage(msg, CarbonUIMessage.INFO, >> request, >> - response, "../" + webContext + >> "/service-mgt/index.jsp" ); >> + response, getContextRoot(request) + "/" + webContext >> + "/service-mgt/index.jsp" ); >> return true; >> } catch (java.lang.Exception e) { >> msg = "File upload failed. " + e.getMessage(); >> log.error(msg); >> CarbonUIMessage.sendCarbonUIMessage(msg.replace("'", >> "`").replace("\"", "`").replace('\n', ' '), >> CarbonUIMessage.ERROR, request, >> - response, "../" + webContext + "/ds/upload.jsp"); >> + response, getContextRoot(request) + "/" + webContext >> + "/ds/upload.jsp"); >> } >> return false; >> } >> >> Modified: >> branches/carbon/3.2.0/components/data-services/org.wso2.carbon.dataservices.ui/3.2.0/src/main/java/org/wso2/carbon/dataservices/ui/fileupload/WSDLUploadExecutor.java >> URL: >> http://wso2.org/svn/browse/wso2/branches/carbon/3.2.0/components/data-services/org.wso2.carbon.dataservices.ui/3.2.0/src/main/java/org/wso2/carbon/dataservices/ui/fileupload/WSDLUploadExecutor.java?rev=106458&r1=106457&r2=106458&view=diff >> >> ============================================================================== >> --- >> branches/carbon/3.2.0/components/data-services/org.wso2.carbon.dataservices.ui/3.2.0/src/main/java/org/wso2/carbon/dataservices/ui/fileupload/WSDLUploadExecutor.java >> (original) >> +++ >> branches/carbon/3.2.0/components/data-services/org.wso2.carbon.dataservices.ui/3.2.0/src/main/java/org/wso2/carbon/dataservices/ui/fileupload/WSDLUploadExecutor.java >> Mon May 30 05:48:29 2011 >> @@ -40,7 +40,7 @@ >> String msg = "File uploading failed. No files are specified"; >> log.error(msg); >> CarbonUIMessage.sendCarbonUIMessage(msg, >> CarbonUIMessage.ERROR, request, >> - response, "../" + webContext + "/ds/uploadWsdl.jsp"); >> + response, getContextRoot(request) + "/" + webContext >> + "/ds/uploadWsdl.jsp"); >> return false; >> } >> DBSFileUploadClient serviceUploaderClient = new >> DBSFileUploadClient(configurationContext, serverURL, cookie); >> @@ -61,14 +61,14 @@ >> response.setContentType("text/html; charset=utf-8"); >> msg = "WSDL uploaded successfully."; >> CarbonUIMessage.sendCarbonUIMessage(msg, CarbonUIMessage.INFO, >> request, >> - response, "../" + webContext + >> "/ds/wizardDoneProcessor.jsp?flag=wip"); >> + response, getContextRoot(request) + "/" + webContext >> + "/ds/wizardDoneProcessor.jsp?flag=wip"); >> return true; >> } catch (java.lang.Exception e) { >> msg = "WSDL upload failed. " + e.getMessage(); >> log.error(msg); >> CarbonUIMessage.sendCarbonUIMessage(msg.replace("'", >> "`").replace("\"", "`").replace('\n', ' '), >> CarbonUIMessage.ERROR, request, >> - response, "../" + webContext + "/ds/uploadWsdl.jsp"); >> + response, getContextRoot(request) + "/" + webContext >> + "/ds/uploadWsdl.jsp"); >> return false; >> } >> >> _______________________________________________ >> Carbon-commits mailing list >> [email protected] >> https://wso2.org/cgi-bin/mailman/listinfo/carbon-commits >> > > > > -- > Isuru Suriarachchi > Technical Lead & Product Manager, WSO2 Application Server > WSO2 Inc. http://wso2.com > email : [email protected] > blog : http://isurues.wordpress.com/ > > lean . enterprise . middleware > > Regards, -- Prabath Abeysekara Software Engineer WSO2 Inc. Email: [email protected] <[email protected]> Mobile: +94774171471 <http://harshana05.blogspot.com/>
_______________________________________________ Carbon-dev mailing list [email protected] http://mail.wso2.org/cgi-bin/mailman/listinfo/carbon-dev
