Author: indika
Date: Wed Dec 19 01:59:12 2007
New Revision: 11540
Log:
fixes for ESB-JAVA 409 ,412
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EndpointAdmin.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EntriesAdmin.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ProxyServiceAdmin.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/SequenceAdmin.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/TaskAdmin.java
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/commons.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/config.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/sequences.js
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EndpointAdmin.java
==============================================================================
---
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EndpointAdmin.java
(original)
+++
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EndpointAdmin.java
Wed Dec 19 01:59:12 2007
@@ -36,9 +36,7 @@
import org.wso2.esb.services.tos.*;
import javax.xml.namespace.QName;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/*
*
*/
@@ -61,11 +59,27 @@
* SynapseConfiguration
*/
public EndpointMetaData[] endpointData() throws AxisFault {
+
SynapseConfiguration synapseConfiguration = getSynapseConfiguration();
Map namedEndpointMap = synapseConfiguration.getDefinedEndpoints();
Collection namedEndpointCollection = namedEndpointMap.values();
+
+ List epList = new ArrayList();
+ for (Iterator itr = namedEndpointCollection.iterator();
itr.hasNext();) {
+ Object ep = itr.next();
+ if (ep instanceof Endpoint) {
+ epList.add(ep);
+ }
+ }
+
+ Collections.sort(epList, new Comparator() {
+ public int compare(Object o1, Object o2) {
+ return ((Endpoint) o1).getName().compareToIgnoreCase(
+ ((Endpoint) o2).getName());
+ }
+ });
return listToEndpointMetaDatas((Endpoint[])
- namedEndpointCollection.toArray(new
Endpoint[namedEndpointCollection.size()]));
+ epList.toArray(new Endpoint[epList.size()]));
}
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EntriesAdmin.java
==============================================================================
---
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EntriesAdmin.java
(original)
+++
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EntriesAdmin.java
Wed Dec 19 01:59:12 2007
@@ -96,7 +96,7 @@
Collections.sort(globalEntryList, new Comparator() {
public int compare(Object o1, Object o2) {
- return ((EntryData) o1).getName().compareTo(
+ return ((EntryData) o1).getName().compareToIgnoreCase(
((EntryData) o2).getName());
}
});
@@ -357,7 +357,7 @@
Collections.sort(sequenceList, new Comparator() {
public int compare(Object o1, Object o2) {
- return ((String) o1).compareTo(
+ return ((String) o1).compareToIgnoreCase(
(String) o2);
}
});
@@ -373,7 +373,7 @@
Collections.sort(entryList, new Comparator() {
public int compare(Object o1, Object o2) {
- return ((String) o1).compareTo(
+ return ((String) o1).compareToIgnoreCase(
(String) o2);
}
});
@@ -389,7 +389,7 @@
Collections.sort(endpointList, new Comparator() {
public int compare(Object o1, Object o2) {
- return ((String) o1).compareTo(
+ return ((String) o1).compareToIgnoreCase(
(String) o2);
}
});
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ProxyServiceAdmin.java
==============================================================================
---
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ProxyServiceAdmin.java
(original)
+++
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ProxyServiceAdmin.java
Wed Dec 19 01:59:12 2007
@@ -92,7 +92,7 @@
Collections.sort(proxyServiceList, new Comparator() {
public int compare(Object o1, Object o2) {
- return ((ProxyData) o1).getName().compareTo(
+ return ((ProxyData) o1).getName().compareToIgnoreCase(
((ProxyData)o2).getName());
}
});
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/SequenceAdmin.java
==============================================================================
---
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/SequenceAdmin.java
(original)
+++
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/SequenceAdmin.java
Wed Dec 19 01:59:12 2007
@@ -78,7 +78,7 @@
Collections.sort(sequenceDataList, new Comparator() {
public int compare(Object o1, Object o2) {
- return ((SequenceData) o1).getName().compareTo(
+ return ((SequenceData) o1).getName().compareToIgnoreCase(
((SequenceData)o2).getName());
}
});
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/TaskAdmin.java
==============================================================================
---
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/TaskAdmin.java
(original)
+++
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/TaskAdmin.java
Wed Dec 19 01:59:12 2007
@@ -74,7 +74,7 @@
Collections.sort(taskData, new Comparator() {
public int compare(Object o1, Object o2) {
- return ((TaskData)
o1).getName().compareTo(((TaskData)o2).getName());
+ return ((TaskData)
o1).getName().compareToIgnoreCase(((TaskData)o2).getName());
}
});
Modified:
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/commons.js
==============================================================================
---
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/commons.js
(original)
+++
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/commons.js
Wed Dec 19 01:59:12 2007
@@ -332,4 +332,52 @@
warning.setHeader("Are you sure?");
warning.render(document.body);
warning.show();
-}
\ No newline at end of file
+}
+
+function getCorrectSequenceString(originalElementString) {
+ if (originalElementString != null && originalElementString != undefined) {
+ if (originalElementString.indexOf("syn:") > 0) {
+ var root = originalElementString.substring(0,
originalElementString.indexOf(">")) ;
+ if (root == undefined || root == null) {
+ return originalElementString
+ }
+ if (root.indexOf("xmlns:syn") > 0) {
+ return originalElementString;
+ } else {
+ var element = root + "
xmlns:syn='http://ws.apache.org/ns/synapse' " +
+ originalElementString.substring(root.length,
originalElementString.length - 1);
+ if (element != null && element != undefined) {
+ return element;
+ } else {
+ return originalElementString;
+ }
+ }
+ } else {
+ return originalElementString;
+ }
+ }
+}
+function isValidXml(docStr) {
+ if (window.ActiveXObject) {
+ try {
+ var doc = new ActiveXObject("Microsoft.XMLDOM");
+ doc.async = "false";
+ var hasParse = doc.loadXML(docStr);
+ if (!hasParse) {
+ esbwarning("Invalid XML configuration.. ", TYPE_WARN);
+ return false;
+ }
+ } catch (e) {
+ esbwarning("Invalid XML configuration.. ", TYPE_WARN);
+ return false;
+ }
+ } else {
+ var parser = new DOMParser();
+ var doc = parser.parseFromString(docStr, "text/xml");
+ if (doc.documentElement.nodeName == "parsererror") {
+ esbwarning("Invalid XML configuration.. ", TYPE_WARN);
+ return false;
+ }
+ }
+ return true;
+}
Modified:
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/config.js
==============================================================================
---
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/config.js
(original)
+++
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/config.js
Wed Dec 19 01:59:12 2007
@@ -77,27 +77,3 @@
showSaveConfig();
}
-function isValidXml(docStr) {
- if (window.ActiveXObject) {
- try {
- var doc = new ActiveXObject("Microsoft.XMLDOM");
- doc.async = "false";
- var hasParse = doc.loadXML(docStr);
- if (!hasParse) {
- esbwarning("Invalid XML configuration.. ", TYPE_WARN);
- return false;
- }
- } catch (e) {
- esbwarning("Invalid XML configuration.. ", TYPE_WARN);
- return false;
- }
- } else {
- var parser = new DOMParser();
- var doc = parser.parseFromString(docStr, "text/xml");
- if (doc.documentElement.nodeName == "parsererror") {
- esbwarning("Invalid XML configuration.. ", TYPE_WARN);
- return false;
- }
- }
- return true;
-}
Modified:
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/sequences.js
==============================================================================
---
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/sequences.js
(original)
+++
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/sequences.js
Wed Dec 19 01:59:12 2007
@@ -998,8 +998,11 @@
}
var fileContent = getmediatorstring(internalmodel.sequence);
+ var correctedSeq = getCorrectSequenceString(fileContent);
+ if(correctedSeq != null && correctedSeq != undefined &&
isValidXml(correctedSeq)){
+ fileContent = correctedSeq;
+ }
editFilePath = regTree.getSelected();
-
var body_xml = '<ns1:updateRegistryEntryValue
xmlns:ns1="http://org.apache.synapse/xsd";>' +
'<regEntry>' +
'<key>'+ regTree.getSelected() +'</key>' +
@@ -1053,7 +1056,6 @@
* This will return the string representation of the mediator node given, will
be used internally
*/
function getmediatorstring(mediator) {
-
if (mediator.nodeType == 3) {
if (browsername.indexOf(NETSCAPE_BROWSER_NAME) != -1) {
return mediator.textContent;
_______________________________________________
Esb-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
