Author: saliya Date: Tue Mar 10 21:45:49 2009 New Revision: 32014 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=32014
Log: Fixed anon integration with send mediator Modified: branches/esb/java/2.0.1/carbon-components/mediators/send/org.wso2.carbon.mediator.send.ui/src/main/resources/web/send-mediator/anon_endpoints_ajaxprocessor.jsp branches/esb/java/2.0.1/carbon-components/mediators/send/org.wso2.carbon.mediator.send.ui/src/main/resources/web/send-mediator/edit-mediator.jsp branches/esb/java/2.0.1/carbon-components/mediators/send/org.wso2.carbon.mediator.send.ui/src/main/resources/web/send-mediator/update-mediator.jsp Modified: branches/esb/java/2.0.1/carbon-components/mediators/send/org.wso2.carbon.mediator.send.ui/src/main/resources/web/send-mediator/anon_endpoints_ajaxprocessor.jsp URL: http://wso2.org/svn/browse/wso2/branches/esb/java/2.0.1/carbon-components/mediators/send/org.wso2.carbon.mediator.send.ui/src/main/resources/web/send-mediator/anon_endpoints_ajaxprocessor.jsp?rev=32014&r1=32013&r2=32014&view=diff ============================================================================== --- branches/esb/java/2.0.1/carbon-components/mediators/send/org.wso2.carbon.mediator.send.ui/src/main/resources/web/send-mediator/anon_endpoints_ajaxprocessor.jsp (original) +++ branches/esb/java/2.0.1/carbon-components/mediators/send/org.wso2.carbon.mediator.send.ui/src/main/resources/web/send-mediator/anon_endpoints_ajaxprocessor.jsp Tue Mar 10 21:45:49 2009 @@ -16,12 +16,12 @@ // going to add a new EP forwardTo = "../endpoints/index.jsp"; // remove anonEpXML attribute from session if exists - if (session.getAttribute("anonEpXML") != null) { - session.removeAttribute("anonEpXML"); - } + session.removeAttribute("anonEpXML"); + session.removeAttribute("endpointXML"); } else if ("edit".equals(anonEpAction)) { // going to modify the existing EP - anonEpXML = (String) session.getAttribute("anonEpXML"); + anonEpXML = (String) session.getAttribute("endpointXML"); + session.removeAttribute("endpointXML"); if (anonEpXML != null && !"".equals(anonEpXML)) { try { StAXOMBuilder builder = new StAXOMBuilder(new ByteArrayInputStream(anonEpXML.getBytes())); @@ -49,7 +49,6 @@ } } } - response.sendRedirect(forwardTo); %> Modified: branches/esb/java/2.0.1/carbon-components/mediators/send/org.wso2.carbon.mediator.send.ui/src/main/resources/web/send-mediator/edit-mediator.jsp URL: http://wso2.org/svn/browse/wso2/branches/esb/java/2.0.1/carbon-components/mediators/send/org.wso2.carbon.mediator.send.ui/src/main/resources/web/send-mediator/edit-mediator.jsp?rev=32014&r1=32013&r2=32014&view=diff ============================================================================== --- branches/esb/java/2.0.1/carbon-components/mediators/send/org.wso2.carbon.mediator.send.ui/src/main/resources/web/send-mediator/edit-mediator.jsp (original) +++ branches/esb/java/2.0.1/carbon-components/mediators/send/org.wso2.carbon.mediator.send.ui/src/main/resources/web/send-mediator/edit-mediator.jsp Tue Mar 10 21:45:49 2009 @@ -27,23 +27,22 @@ String key = ""; // The endpoint already associated with send mediator - Endpoint endpoint = sendMediator.getEndpoint(); + Endpoint endpoint = sendMediator.getEndpoint(); if (session.getAttribute("anonEpXML") != null) { whichEP = "Anon"; anonEpXML = (String)session.getAttribute("anonEpXML"); + session.removeAttribute("anonEpXML"); } else if (endpoint != null) { - // if an endpoint has a name then it is an defined endpoint. So the option is Imp + // if an endpoint has a name then it is a defined endpoint. So the option is Imp if (endpoint instanceof IndirectEndpoint) { if ((key = ((IndirectEndpoint)endpoint).getKey()) != null && !"".equals(key)) { whichEP = "Reg"; } else { - //TODO can an IndirectEndpoint be an anon endpoint ? do we need to remove the code below // no key, no name means it is an anonymous endpoint anonEpXML = EndpointSerializer.getElementFromEndpoint(endpoint).toString(); if (anonEpXML != null && !"".equals(anonEpXML)) { whichEP = "Anon"; - session.setAttribute("anonEpXML", anonEpXML); } } } else if (endpoint instanceof AbstractEndpoint) { @@ -51,10 +50,13 @@ anonEpXML = EndpointSerializer.getElementFromEndpoint(endpoint).toString(); if (anonEpXML != null && !"".equals(anonEpXML)) { whichEP = "Anon"; - session.setAttribute("anonEpXML", anonEpXML); - } + } } } + + if (anonEpXML != null && !"".equals(anonEpXML)) { + session.setAttribute("endpointXML", anonEpXML); + } %> <script type="text/javascript"> var whichEP = '<%=whichEP%>'; @@ -87,15 +89,12 @@ <input id="epOpNone" type="radio" name="epOp" value="none" onclick="hideEpOps();"/><fmt:message key="select.ep.none"/> </td> - </tr> + </tr> <tr> <td> <input id="epOpAnon" type="radio" name="epOp" value="anon" onclick="showEpAddtionalOptions('epAnonAddEdit');"/><fmt:message key="anonymous"/> </td> - <% - - %> <% if( anonEpXML != null && !"".equals(anonEpXML)) { %> <td> <a href="#" class="add-icon-link" id="epAnonAdd" onclick="anonEpAdd();"><fmt:message key="add"/></a> Modified: branches/esb/java/2.0.1/carbon-components/mediators/send/org.wso2.carbon.mediator.send.ui/src/main/resources/web/send-mediator/update-mediator.jsp URL: http://wso2.org/svn/browse/wso2/branches/esb/java/2.0.1/carbon-components/mediators/send/org.wso2.carbon.mediator.send.ui/src/main/resources/web/send-mediator/update-mediator.jsp?rev=32014&r1=32013&r2=32014&view=diff ============================================================================== --- branches/esb/java/2.0.1/carbon-components/mediators/send/org.wso2.carbon.mediator.send.ui/src/main/resources/web/send-mediator/update-mediator.jsp (original) +++ branches/esb/java/2.0.1/carbon-components/mediators/send/org.wso2.carbon.mediator.send.ui/src/main/resources/web/send-mediator/update-mediator.jsp Tue Mar 10 21:45:49 2009 @@ -37,24 +37,21 @@ String option = request.getParameter("epOp"); if ("none".equals(option)) { sendMediator.setEndpoint(null); - //removes session attribute if it is present - session.removeAttribute("anonEpXML"); } else if ("anon".equals(option)) { - String anonEpXML = (String)session.getAttribute("anonEpXML"); + String anonEpXML = (String)session.getAttribute("endpointXML"); + session.removeAttribute("endpointXML"); if (anonEpXML != null && !"".equals(anonEpXML) && !"Add".equals(request.getParameter("anonEpAction"))) { OMElement anonEpXMLElem = AXIOMUtil.stringToOM(anonEpXML); Endpoint endpoint = EndpointFactory.getEndpointFromElement(anonEpXMLElem,true); sendMediator.setEndpoint(endpoint); - //removes session attribute after using it - session.removeAttribute("anonEpXML"); - } + } } else if ("registry".equals(option)) { String key = request.getParameter("registryKey"); Endpoint endpoint = client.getEndpoint(key); sendMediator.setEndpoint(endpoint); - //removes session attribute if it is present - session.removeAttribute("anonEpXML"); } + session.removeAttribute("anonEpXML"); + session.removeAttribute("endpointXML"); %> <% if (SequenceEditorHelper.isRedirected(request)) { %> _______________________________________________ Esb-java-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
