Author: indika
Date: Tue Apr 24 22:18:07 2007
New Revision: 532203
URL: http://svn.apache.org/viewvc?view=rev&rev=532203
Log:
Fixes To the Entry Factory and Entry Serializer
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java?view=diff&rev=532203&r1=532202&r2=532203
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java
Tue Apr 24 22:18:07 2007
@@ -54,7 +54,8 @@
// are initialized at startup
if (src != null) {
try {
- entry.setSrc(new URL(src));
+ entry.setSrc(new URL(src.trim()));
+ entry.setType(Entry.URL_SRC);
entry.setValue(
org.apache.synapse.config.Util.getObject(entry.getSrc()));
} catch (MalformedURLException e) {
@@ -70,7 +71,7 @@
entry.setValue(elemValue);
} else if (nodeValue != null && nodeValue instanceof OMText) {
entry.setType(Entry.INLINE_TEXT);
- entry.setValue(((OMText) nodeValue).getText());
+ entry.setValue(((OMText) nodeValue).getText().trim());
}
}
return entry;
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java?view=diff&rev=532203&r1=532202&r2=532203
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java
Tue Apr 24 22:18:07 2007
@@ -29,6 +29,7 @@
import org.apache.synapse.SynapseException;
import org.apache.axiom.om.impl.llom.OMTextImpl;
import javax.xml.stream.XMLStreamConstants;
+import java.net.URL;
public class EntrySerializer {
@@ -46,32 +47,32 @@
* @return OMElement representing the entry
*/
public static OMElement serializeEntry(Entry entry, OMElement parent) {
-
OMElement propertyElement = fac.createOMElement("localEntry", synNS);
propertyElement.addAttribute(fac.createOMAttribute(
- "key", nullNS, entry.getKey()));
-// propertyElement.addAttribute(fac.createOMAttribute(
-// "type", nullNS, "" + entry.getType()));
-
- if (entry.getType() == Entry.REMOTE_ENTRY) {
- propertyElement.addAttribute(fac.createOMAttribute(
- "key", nullNS, entry.getKey()));
- } else if (entry.getType() == Entry.URL_SRC) {
- propertyElement.addAttribute(fac.createOMAttribute(
- "src", nullNS, entry.getSrc().toString()));
-// } else if (entry.getType() == Entry.VALUE_TYPE) {
-// propertyElement.addAttribute(fac.createOMAttribute(
-// "value", nullNS, (String) entry.getValue()));
- } else if (entry.getType() == Entry.INLINE_XML) {
- propertyElement.addChild((OMElement) entry.getValue());
- } else if (entry.getType() == Entry.INLINE_TEXT) {
- OMTextImpl textData = (OMTextImpl) fac.createOMText((String)
entry.getValue());
- textData.setType(XMLStreamConstants.CDATA);
- propertyElement.addChild(textData);
+ "key", nullNS, entry.getKey().trim()));
+ int type = entry.getType();
+ if (type == Entry.URL_SRC) {
+ URL srcUrl = entry.getSrc();
+ if (srcUrl != null) {
+ propertyElement.addAttribute(fac.createOMAttribute(
+ "src", nullNS, srcUrl.toString().trim()));
+ }
+ } else if (type == Entry.INLINE_XML) {
+ Object value = entry.getValue();
+ if (value != null && value instanceof OMElement) {
+ propertyElement.addChild((OMElement) value);
+ }
+ } else if (type == Entry.INLINE_TEXT) {
+ Object value = entry.getValue();
+ if (value != null && value instanceof String) {
+ OMTextImpl textData = (OMTextImpl) fac.createOMText(((String)
value).trim());
+ textData.setType(XMLStreamConstants.CDATA);
+ propertyElement.addChild(textData);
+ }
} else {
handleException("Entry type undefined");
}
- if(parent != null) {
+ if (parent != null) {
parent.addChild(propertyElement);
}
return propertyElement;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
