[jboss-svn-commits] JBL Code SVN: r9351 - in labs/jbossesb/trunk/product/core: rosetta/src/org/jboss/internal/soa/esb/addressing/helpers and 12 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Feb 5 16:21:50 EST 2007
Author: mark.little at jboss.com
Date: 2007-02-05 16:21:50 -0500 (Mon, 05 Feb 2007)
New Revision: 9351
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListener.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/CallHelper.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/EPRHelper.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/LocalFileHandler.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/HeaderImpl.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/marshal/MarshalUnmarshalManager.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/marshal/MarshalUnmarshalPlugin.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/marshal/SerializedMarshalUnmarshalPlugin.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/EmailEpr.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FTPEpr.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FileEpr.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/HTTPEpr.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JDBCEpr.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/util/EPRManager.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/message/format/MessageType.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/Util.java
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/tests/EPRUnitTest.java
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/BodyUnitTest.java
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/XMLMessageUnitTest.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/persistence/MessageStoreType.java
Log:
http://jira.jboss.com/jira/browse/JBESB-382
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListener.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListener.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -79,7 +79,7 @@
try
{
ByteArrayOutputStream out = new ByteArrayOutputStream();
- byte[] ba = new byte[1000];
+ byte[] ba = new byte[1000]; // TODO magic number
int iQread;
FileInputStream inp = new FileInputStream(file);
while (-1 != (iQread = inp.read(ba)))
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/CallHelper.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/CallHelper.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/CallHelper.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -37,124 +37,160 @@
public abstract class CallHelper
{
- public static Element toXML (Call call, Document doc, Element header) throws MarshalException
+ public static Element toXML(Call call, Document doc, Element header)
+ throws MarshalException
{
AssertArgument.isNotNull(call, "call");
AssertArgument.isNotNull(doc, "doc");
AssertArgument.isNotNull(header, "header");
+
+ header.setAttributeNS(XMLUtil.XMLNS_URI, XMLUtil.XMLNS_PREFIX
+ + XMLUtil.WSA_PREFIX, XMLUtil.WSA_NAMESPACE_URI);
if (call.getTo() != null)
{
- Element toElement = doc.createElementNS(XMLUtil.WSA_NAMESPACE_URI, XMLUtil.WSA_PREFIX+":"+XMLUtil.TO_TAG);
+ final Element toElement = doc.createElementNS(
+ XMLUtil.WSA_NAMESPACE_URI, XMLUtil.TO_TAG);
+ toElement.setPrefix(XMLUtil.WSA_PREFIX);
EPRHelper.toXML(call.getTo(), doc, header, toElement, true);
header.appendChild(toElement);
}
-
+
if (call.getFrom() != null)
{
- Element fromElement = doc.createElementNS(XMLUtil.WSA_NAMESPACE_URI, XMLUtil.WSA_PREFIX+":"+XMLUtil.FROM_TAG);
+ final Element fromElement = doc.createElementNS(
+ XMLUtil.WSA_NAMESPACE_URI, XMLUtil.FROM_TAG);
+ fromElement.setPrefix(XMLUtil.WSA_PREFIX);
EPRHelper.toXML(call.getFrom(), doc, header, fromElement, false);
header.appendChild(fromElement);
}
-
+
if (call.getReplyTo() != null)
{
- Element replyToElement = doc.createElementNS(XMLUtil.WSA_NAMESPACE_URI, XMLUtil.WSA_PREFIX+":"+XMLUtil.REPLY_TO_TAG);
- EPRHelper.toXML(call.getReplyTo(), doc, header, replyToElement, false);
+ final Element replyToElement = doc.createElementNS(
+ XMLUtil.WSA_NAMESPACE_URI, XMLUtil.REPLY_TO_TAG);
+ replyToElement.setPrefix(XMLUtil.WSA_PREFIX);
+ EPRHelper.toXML(call.getReplyTo(), doc, header, replyToElement,
+ false);
header.appendChild(replyToElement);
}
-
+
if (call.getRelatesTo() != null)
{
- Element relatesToElement = doc.createElementNS(XMLUtil.WSA_NAMESPACE_URI, XMLUtil.WSA_PREFIX+":"+XMLUtil.RELATES_TO_TAG);
+ final Element relatesToElement = doc.createElementNS(
+ XMLUtil.WSA_NAMESPACE_URI, XMLUtil.RELATES_TO_TAG);
+ relatesToElement.setPrefix(XMLUtil.WSA_PREFIX);
relatesToElement.setNodeValue(call.getRelatesTo().toString());
header.appendChild(relatesToElement);
}
-
+
if (call.getFaultTo() != null)
{
- Element faultToElement = doc.createElementNS(XMLUtil.WSA_NAMESPACE_URI, XMLUtil.WSA_PREFIX+":"+XMLUtil.FAULT_TO_TAG);
- EPRHelper.toXML(call.getFaultTo(), doc, header, faultToElement, false);
+ final Element faultToElement = doc.createElementNS(
+ XMLUtil.WSA_NAMESPACE_URI, XMLUtil.FAULT_TO_TAG);
+ faultToElement.setPrefix(XMLUtil.WSA_PREFIX);
+ EPRHelper.toXML(call.getFaultTo(), doc, header, faultToElement,
+ false);
header.appendChild(faultToElement);
}
-
+
if (call.getAction() != null)
{
- Element actionElement = doc.createElementNS(XMLUtil.WSA_NAMESPACE_URI, XMLUtil.WSA_PREFIX+":"+XMLUtil.ACTION_TAG);
+ final Element actionElement = doc.createElementNS(
+ XMLUtil.WSA_NAMESPACE_URI, XMLUtil.ACTION_TAG);
+ actionElement.setPrefix(XMLUtil.WSA_PREFIX);
actionElement.setTextContent(call.getAction().toString());
header.appendChild(actionElement);
}
-
+
if (call.getMessageID() != null)
{
- Element messageIDElement = doc.createElementNS(XMLUtil.WSA_NAMESPACE_URI, XMLUtil.WSA_PREFIX+":"+XMLUtil.MESSAGE_IDENTIFIER_TAG);
+ final Element messageIDElement = doc.createElementNS(
+ XMLUtil.WSA_NAMESPACE_URI, XMLUtil.MESSAGE_IDENTIFIER_TAG);
+ messageIDElement.setPrefix(XMLUtil.WSA_PREFIX);
messageIDElement.setTextContent(call.getMessageID().toString());
header.appendChild(messageIDElement);
}
-
+
return header;
}
-
- public static Call fromXML (Element header) throws UnmarshalException
+
+ public static Call fromXML(Element header) throws UnmarshalException
{
AssertArgument.isNotNull(header, "header");
-
+
Call call = new Call();
NodeList nl = header.getChildNodes();
-
+
for (int i = 0; i < nl.getLength(); i++)
{
Node n = nl.item(i);
-
- if (n.getNodeName().equals(XMLUtil.WSA_PREFIX+":"+XMLUtil.TO_TAG))
- {
- call.setTo(EPRHelper.fromXML((Element) header, true));
- }
-
- if (n.getNodeName().equals(XMLUtil.WSA_PREFIX+":"+XMLUtil.FROM_TAG))
- {
- call.setFrom(EPRHelper.fromXML((Element) n, false));
- }
-
- if (n.getNodeName().equals(XMLUtil.WSA_PREFIX+":"+XMLUtil.REPLY_TO_TAG))
- {
- call.setReplyTo(EPRHelper.fromXML((Element) n, false));
- }
- if (n.getNodeName().equals(XMLUtil.WSA_PREFIX+":"+XMLUtil.RELATES_TO_TAG))
+ if ((n.getPrefix() != null) && (n.getLocalName() != null))
{
- try {
- call.setRelatesTo(new URI(n.getNodeValue()));
- } catch (URISyntaxException e) {
- throw new UnmarshalException("'" + XMLUtil.RELATES_TO_TAG + "' must be a valid URI", e);
+ if (n.getPrefix().equals(XMLUtil.WSA_PREFIX) && (n.getLocalName().equals(XMLUtil.TO_TAG)))
+ {
+ call.setTo(EPRHelper.fromXML((Element) header, true));
}
- }
-
- if (n.getNodeName().equals(XMLUtil.WSA_PREFIX+":"+XMLUtil.FAULT_TO_TAG))
- {
- call.setFaultTo(EPRHelper.fromXML((Element) n, false));
- }
-
- if (n.getNodeName().equals(XMLUtil.WSA_PREFIX+":"+XMLUtil.ACTION_TAG))
- {
- try {
- call.setAction(new URI(n.getTextContent()));
- } catch (URISyntaxException e) {
- throw new UnmarshalException("'" + XMLUtil.ACTION_TAG + "' must be a valid URI", e);
+
+ if (n.getPrefix().equals(XMLUtil.WSA_PREFIX) && (n.getLocalName().equals(XMLUtil.FROM_TAG)))
+ {
+ call.setFrom(EPRHelper.fromXML((Element) n, false));
}
- }
-
- if (n.getNodeName().equals(XMLUtil.WSA_PREFIX+":"+XMLUtil.MESSAGE_IDENTIFIER_TAG))
- {
- try {
- call.setMessageID(new URI(n.getTextContent()));
- } catch (URISyntaxException e) {
- throw new UnmarshalException("'" + XMLUtil.MESSAGE_IDENTIFIER_TAG + "' must be a valid URI", e);
+
+ if (n.getPrefix().equals(XMLUtil.WSA_PREFIX) && (n.getLocalName().equals(XMLUtil.REPLY_TO_TAG)))
+ {
+ call.setReplyTo(EPRHelper.fromXML((Element) n, false));
}
+
+ if (n.getPrefix().equals(XMLUtil.WSA_PREFIX) && (n.getLocalName().equals(XMLUtil.RELATES_TO_TAG)))
+ {
+ try
+ {
+ call.setRelatesTo(new URI(n.getNodeValue()));
+ }
+ catch (URISyntaxException e)
+ {
+ throw new UnmarshalException("'" + XMLUtil.RELATES_TO_TAG
+ + "' must be a valid URI", e);
+ }
+ }
+
+ if (n.getPrefix().equals(XMLUtil.WSA_PREFIX) && (n.getLocalName().equals(XMLUtil.FAULT_TO_TAG)))
+ {
+ call.setFaultTo(EPRHelper.fromXML((Element) n, false));
+ }
+
+ if (n.getPrefix().equals(XMLUtil.WSA_PREFIX) && (n.getLocalName().equals(XMLUtil.ACTION_TAG)))
+ {
+ try
+ {
+ call.setAction(new URI(n.getTextContent()));
+ }
+ catch (URISyntaxException e)
+ {
+ throw new UnmarshalException("'" + XMLUtil.ACTION_TAG
+ + "' must be a valid URI", e);
+ }
+ }
+
+ if (n.getPrefix().equals(XMLUtil.WSA_PREFIX) && (n.getLocalName().equals(XMLUtil.MESSAGE_IDENTIFIER_TAG)))
+ {
+ try
+ {
+ call.setMessageID(new URI(n.getTextContent()));
+ }
+ catch (URISyntaxException e)
+ {
+ throw new UnmarshalException("'"
+ + XMLUtil.MESSAGE_IDENTIFIER_TAG
+ + "' must be a valid URI", e);
+ }
+ }
}
}
-
+
return call;
}
-
-}
\ No newline at end of file
+
+}
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/EPRHelper.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/EPRHelper.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/EPRHelper.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -129,11 +129,17 @@
if (n instanceof Element)
{
Element el = (Element) n;
-
- if (el.getNodeName().equals(
- XMLUtil.WSA_PREFIX + ":" + XMLUtil.TO_TAG))
- return getSpecificEPR(new EPR(PortReferenceHelper
- .fromXML(el, true)), header);
+ String prefix = el.getPrefix();
+ String tag = el.getLocalName();
+
+ if ((prefix != null) && (prefix.equals(XMLUtil.WSA_PREFIX)))
+ {
+ if ((tag != null) && (tag.equals(XMLUtil.TO_TAG)))
+ {
+ return getSpecificEPR(new EPR(PortReferenceHelper
+ .fromXML(el, true)), header);
+ }
+ }
}
}
}
@@ -175,22 +181,30 @@
{
DocumentBuilderFactory factory = DocumentBuilderFactory
.newInstance();
+
+ factory.setNamespaceAware(true);
+
DocumentBuilder builder = factory.newDocumentBuilder();
Document doc = builder.newDocument();
Element portReferenceElement = doc.createElementNS(
- XMLUtil.WSA_NAMESPACE_URI, XMLUtil.WSA_PREFIX + ":" + tag);
-
+ XMLUtil.WSA_NAMESPACE_URI, tag);
+
setSpecificEPR(epr);
if (to)
{
Element header = doc.createElement("header");
doc.appendChild(header);
+ header.setAttributeNS(XMLUtil.XMLNS_URI, XMLUtil.XMLNS_PREFIX
+ + XMLUtil.WSA_PREFIX, XMLUtil.WSA_NAMESPACE_URI);
toXML(epr, doc, header, portReferenceElement, to);
header.appendChild(portReferenceElement);
}
else
{
+ portReferenceElement.setAttributeNS(XMLUtil.XMLNS_URI, XMLUtil.XMLNS_PREFIX
+ + XMLUtil.WSA_PREFIX, XMLUtil.WSA_NAMESPACE_URI);
+
doc.appendChild(portReferenceElement);
toXML(epr, doc, portReferenceElement, portReferenceElement, to);
}
@@ -249,6 +263,9 @@
{
DocumentBuilderFactory factory = DocumentBuilderFactory
.newInstance();
+
+ factory.setNamespaceAware(true);
+
DocumentBuilder builder = factory.newDocumentBuilder();
Document doc = builder.parse(new ByteArrayInputStream(xml
.getBytes()));
@@ -349,9 +366,16 @@
for (int i = 0; i < children.getLength(); i++)
{
- if (children.item(i).getNodeName().equals(
- XMLUtil.JBOSSESB_PREFIX + ":" + EPR_TYPE))
- eprType = children.item(i).getTextContent();
+ String prefix = children.item(i).getPrefix();
+ String tag = children.item(i).getLocalName();
+
+ if ((prefix != null) && (prefix.equals(XMLUtil.JBOSSESB_PREFIX)))
+ {
+ if ((tag != null) && (tag.equals(EPR_TYPE)))
+ {
+ eprType = children.item(i).getTextContent();
+ }
+ }
}
if (eprType != null)
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/LocalFileHandler.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/LocalFileHandler.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/LocalFileHandler.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -33,7 +33,7 @@
public byte[] getFileContents(File file) throws CourierException
{
ByteArrayOutputStream out = new ByteArrayOutputStream();
- byte[] ba = new byte[1000];
+ byte[] ba = new byte[1000]; // TODO MAGIC NUMBER
int iQread;
try
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/HeaderImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/HeaderImpl.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/HeaderImpl.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -84,7 +84,12 @@
{
try
{
- Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+
+ factory.setNamespaceAware(true);
+
+ DocumentBuilder builder = factory.newDocumentBuilder();
+ Document doc = builder.newDocument();
Element header = doc.createElement(HEADER_TAG);
doc.appendChild(header);
@@ -122,8 +127,11 @@
String header = (String) in.readObject();
InputStream inStream = new ByteArrayInputStream(header.getBytes());
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+
+ factory.setNamespaceAware(true);
+
DocumentBuilder builder = factory.newDocumentBuilder();
- Document doc = builder.parse(inStream);
+ Document doc = builder.parse(inStream);
Element headerElement = doc.getDocumentElement();
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -70,15 +70,15 @@
return _objects.get(name);
}
}
-
- public String[] getNames ()
+
+ public String[] getNames()
{
Set<String> keys = _objects.keySet();
-
+
if (keys != null)
{
String[] toReturn = new String[keys.size()];
-
+
return keys.toArray(toReturn);
}
else
@@ -123,10 +123,11 @@
Element objElement = doc.createElement(key);
- if (MarshalUnmarshalManager.getInstance().marshal(objElement, value))
+ if (MarshalUnmarshalManager.getInstance()
+ .marshal(objElement, value))
bodyElement.appendChild(objElement);
else
- throw new MarshalException("Cannot pack object "+key);
+ throw new MarshalException("Cannot pack object " + key);
}
return bodyElement;
@@ -158,26 +159,34 @@
Element child = (Element) xxx;
if (child.getNodeName().equals(BYTES_TAG))
{
- CDATASection cdata = (CDATASection) child.getFirstChild();
-
+ CDATASection cdata = (CDATASection) child
+ .getFirstChild();
+
// support empty byte (null files etc.)
-
+
if (cdata != null)
_content = Base64.decode(cdata.getWholeText());
else
- _content = new byte[0] ;
+ _content = new byte[0];
}
else
{
Node node = child.getFirstChild();
- while(!(node instanceof Element))
+
+ while (!(node instanceof Element))
{
- node = node.getNextSibling() ;
+ node = node.getNextSibling();
}
- if (node instanceof Element) {
- final Object value = MarshalUnmarshalManager.getInstance().unmarshal((Element)node);
+
+ if (node instanceof Element)
+ {
+ final Object value = MarshalUnmarshalManager
+ .getInstance().unmarshal((Element) node);
+
if (value == null)
- throw new UnmarshalException("Cannot unpack object "+child.getNodeName());
+ throw new UnmarshalException(
+ "Cannot unpack object "
+ + child.getNodeName());
else
_objects.put(child.getNodeName(), value);
}
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/marshal/MarshalUnmarshalManager.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/marshal/MarshalUnmarshalManager.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/marshal/MarshalUnmarshalManager.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -9,6 +9,7 @@
import org.jboss.soa.esb.UnmarshalException;
import org.jboss.soa.esb.common.ModulePropertyManager;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/*
* JBoss, Home of Professional Open Source
@@ -113,6 +114,9 @@
public boolean marshal (Element doc, Object param) throws MarshalException
{
+ if ((doc == null) || (param == null))
+ throw new IllegalArgumentException();
+
Enumeration<URI> keys = _plugins.keys();
while (keys.hasMoreElements())
@@ -136,16 +140,17 @@
public Object unmarshal (Element doc) throws UnmarshalException
{
+ if (doc == null)
+ throw new IllegalArgumentException();
+
Enumeration<URI> keys = _plugins.keys();
while (keys.hasMoreElements())
{
- URI uri = keys.nextElement();
-
- if (doc.getNodeName().equals(uri.toString()))
- {
- return _plugins.get(uri).unmarshal(doc);
- }
+ Object result = _plugins.get(keys.nextElement()).unmarshal(doc);
+
+ if (result != null)
+ return result;
}
return null;
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/marshal/MarshalUnmarshalPlugin.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/marshal/MarshalUnmarshalPlugin.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/marshal/MarshalUnmarshalPlugin.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -41,6 +41,9 @@
{
public static final String MARSHAL_UNMARSHAL_PLUGIN = "org.jboss.soa.esb.message.format.xml.plugin";
+ public static final String tagName = "marshalunmarshal";
+ public static final String pluginType = "plugin-type";
+
/**
* Pack the provided object into the document.
*
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/marshal/SerializedMarshalUnmarshalPlugin.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/marshal/SerializedMarshalUnmarshalPlugin.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/marshal/SerializedMarshalUnmarshalPlugin.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -9,6 +9,8 @@
import org.jboss.soa.esb.UnmarshalException;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/*
* JBoss, Home of Professional Open Source
@@ -43,11 +45,12 @@
public class SerializedMarshalUnmarshalPlugin implements MarshalUnmarshalPlugin
{
+
public SerializedMarshalUnmarshalPlugin ()
{
try
{
- _type = new URI("urn:xml:marshalunmarshal:plugin:serialization");
+ _type = new URI("urn:xml/marshalunmarshal/plugin/serialization");
}
catch (URISyntaxException ex)
{
@@ -73,14 +76,20 @@
try
{
- Element nodeElement = doc.getOwnerDocument().createElement(type().toString());
+ Element nodeElement = doc.getOwnerDocument().createElement(MarshalUnmarshalPlugin.tagName);
+ Element pluginType = doc.getOwnerDocument().createElement(MarshalUnmarshalPlugin.pluginType);
+ pluginType.appendChild(doc.getOwnerDocument().createTextNode(type().toString()));
+ nodeElement.appendChild(pluginType);
+
nodeElement.appendChild(doc.getOwnerDocument().createCDATASection(Base64.encodeObject((Serializable) param)));
doc.appendChild(nodeElement);
}
catch (Exception ex)
{
+ ex.printStackTrace();
+
throw new MarshalException(ex);
}
@@ -104,11 +113,26 @@
{
try
{
- if (doc.getNodeName().equals(type().toString()))
+ if (doc.getNodeName().equals(MarshalUnmarshalPlugin.tagName))
{
- CDATASection cdata = (CDATASection) doc.getFirstChild();
-
- return Base64.decodeToObject(cdata.getWholeText());
+ NodeList nl = doc.getChildNodes();
+
+ for (int i = 0; i < nl.getLength(); i++)
+ {
+ Node el = nl.item(i);
+
+ if (el.getNodeName().equals(MarshalUnmarshalPlugin.pluginType))
+ {
+ if (el.getTextContent().equals(type().toString()))
+ {
+ CDATASection cdata = (CDATASection) nl.item(i+1);
+
+ return Base64.decodeToObject(cdata.getWholeText());
+ }
+ }
+ }
+
+ return null;
}
else
return null;
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/EmailEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/EmailEpr.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/EmailEpr.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -71,19 +71,23 @@
for (int i = 0; i < nl.getLength(); i++)
{
- String nodeName = nl.item(i).getNodeName();
-
try
{
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+USERNAME_TAG))
+ String prefix = nl.item(i).getPrefix();
+ String tag = nl.item(i).getLocalName();
+
+ if ((prefix != null) && (prefix.equals(XMLUtil.JBOSSESB_PREFIX)))
{
- getAddr().addExtension(USERNAME_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+PASSWORD_TAG))
+ if ((tag != null) && (tag.equals(USERNAME_TAG)))
{
- getAddr().addExtension(PASSWORD_TAG, nl.item(i).getTextContent());
+ getAddr().addExtension(USERNAME_TAG, nl.item(i).getTextContent());
}
+ else
+ {
+ if ((tag != null) && (tag.equals(PASSWORD_TAG)))
+ getAddr().addExtension(PASSWORD_TAG, nl.item(i).getTextContent());
+ }
+ }
}
catch (Exception ex)
{
@@ -209,7 +213,7 @@
{
try
{
- _type = new URI("urn:jboss:esb:epr:type:email");
+ _type = new URI("urn:jboss/esb/epr/type/email");
}
catch (Exception ex)
{
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FTPEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FTPEpr.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FTPEpr.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -68,24 +68,29 @@
for (int i = 0; i < nl.getLength(); i++)
{
- String nodeName = nl.item(i).getNodeName();
-
try
{
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+USERNAME_TAG))
+ String prefix = nl.item(i).getPrefix();
+ String tag = nl.item(i).getLocalName();
+
+ if ((prefix != null) && (prefix.equals(XMLUtil.JBOSSESB_PREFIX)))
{
- getAddr().addExtension(USERNAME_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+PASSWORD_TAG))
+ if (tag != null)
{
- getAddr().addExtension(PASSWORD_TAG, nl.item(i).getTextContent());
+ if (tag.equals(USERNAME_TAG))
+ getAddr().addExtension(USERNAME_TAG, nl.item(i).getTextContent());
+ else
+ {
+ if (tag.equals(PASSWORD_TAG))
+ getAddr().addExtension(PASSWORD_TAG, nl.item(i).getTextContent());
+ else
+ {
+ if (tag.equals(PASSIVE_TAG))
+ getAddr().addExtension(PASSIVE_TAG, nl.item(i).getTextContent());
+ }
+ }
}
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+PASSIVE_TAG))
- {
- getAddr().addExtension(PASSIVE_TAG, nl.item(i).getTextContent());
- }
+ }
}
catch (Exception ex)
{
@@ -231,7 +236,7 @@
{
try
{
- _type = new URI("urn:jboss:esb:epr:type:ftp");
+ _type = new URI("urn:jboss/esb/epr/type/ftp");
}
catch (Exception ex)
{
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FileEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FileEpr.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FileEpr.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -74,40 +74,49 @@
try
{
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+INPUT_SUFFIX_TAG))
+ String prefix = nl.item(i).getPrefix();
+ String tag = nl.item(i).getLocalName();
+
+ if ((prefix != null) && (prefix.equals(XMLUtil.JBOSSESB_PREFIX)))
{
- getAddr().addExtension(INPUT_SUFFIX_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+POST_DIR_TAG))
+ if (tag != null)
{
- getAddr().addExtension(POST_DIR_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+POST_SUFFIX_TAG))
+ if (tag.equals(INPUT_SUFFIX_TAG))
+ getAddr().addExtension(INPUT_SUFFIX_TAG, nl.item(i).getTextContent());
+ else
{
- getAddr().addExtension(POST_SUFFIX_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+POST_DEL_TAG))
+ if (tag.equals(POST_DIR_TAG))
+ getAddr().addExtension(POST_DIR_TAG, nl.item(i).getTextContent());
+ else
{
- getAddr().addExtension(POST_DEL_TAG, nl.item(i).getTextContent());
+ if (tag.equals(POST_SUFFIX_TAG))
+ getAddr().addExtension(POST_SUFFIX_TAG, nl.item(i).getTextContent());
+ else
+ {
+ if (tag.equals(POST_DEL_TAG))
+ getAddr().addExtension(POST_DEL_TAG, nl.item(i).getTextContent());
+ else
+ {
+ if (tag.equals(ERROR_DIR_TAG))
+ {
+ getAddr().addExtension(ERROR_DIR_TAG, nl.item(i).getTextContent());
+ }
+ else
+ {
+ if (tag.equals((ERROR_SUFFIX_TAG)))
+ getAddr().addExtension(ERROR_SUFFIX_TAG, nl.item(i).getTextContent());
+ else
+ {
+ if (tag.equals((ERROR_DEL_TAG)))
+ getAddr().addExtension(ERROR_DEL_TAG, nl.item(i).getTextContent());
+ }
+ }
+ }
+ }
}
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+ERROR_DIR_TAG))
- {
- getAddr().addExtension(ERROR_DIR_TAG, nl.item(i).getTextContent());
+ }
+ }
}
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+ERROR_SUFFIX_TAG))
- {
- getAddr().addExtension(ERROR_SUFFIX_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+ERROR_DEL_TAG))
- {
- getAddr().addExtension(ERROR_DEL_TAG, nl.item(i).getTextContent());
- }
}
catch (Exception ex)
{
@@ -409,7 +418,7 @@
{
try
{
- _type = new URI("urn:jboss:esb:epr:type:file");
+ _type = new URI("urn:jboss/esb/epr/type/file");
}
catch (Exception ex)
{
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/HTTPEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/HTTPEpr.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/HTTPEpr.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -99,7 +99,7 @@
{
try
{
- _type = new URI("urn:jboss:esb:epr:type:http");
+ _type = new URI("urn:jboss/esb/epr/type/http");
}
catch (Exception ex)
{
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JDBCEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JDBCEpr.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JDBCEpr.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -74,69 +74,74 @@
for (int i = 0; i < nl.getLength(); i++)
{
- String nodeName = nl.item(i).getNodeName();
-
try
{
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+USERNAME_TAG))
+ String prefix = nl.item(i).getPrefix();
+ String tag = nl.item(i).getLocalName();
+
+ if ((prefix != null) && (prefix.equals(XMLUtil.JBOSSESB_PREFIX)))
{
- getAddr().addExtension(USERNAME_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+PASSWORD_TAG))
+ if (tag != null)
{
- getAddr().addExtension(PASSWORD_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+SQL_TAG))
+ if (tag.equals(USERNAME_TAG))
+ getAddr().addExtension(USERNAME_TAG, nl.item(i).getTextContent());
+ else
{
- getAddr().addExtension(SQL_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+DRIVER_TAG))
+ if (tag.equals(PASSWORD_TAG))
+ getAddr().addExtension(PASSWORD_TAG, nl.item(i).getTextContent());
+ else
{
- getAddr().addExtension(DRIVER_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+URL_TAG))
+ if (tag.equals(SQL_TAG))
+ getAddr().addExtension(SQL_TAG, nl.item(i).getTextContent());
+ else
{
- getAddr().addExtension(URL_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+TABLE_NAME_TAG))
+ if (tag.equals(DRIVER_TAG))
+ getAddr().addExtension(DRIVER_TAG, nl.item(i).getTextContent());
+ else
{
- getAddr().addExtension(TABLE_NAME_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+MESSAGE_ID_COLUMN_TAG))
+ if (tag.equals(URL_TAG))
+ getAddr().addExtension(URL_TAG, nl.item(i).getTextContent());
+ else
{
- getAddr().addExtension(MESSAGE_ID_COLUMN_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+STATUS_COLUMN_TAG))
+ if (tag.equals(TABLE_NAME_TAG))
+ getAddr().addExtension(TABLE_NAME_TAG, nl.item(i).getTextContent());
+ else
{
- getAddr().addExtension(STATUS_COLUMN_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+DATA_COLUMN_TAG))
+ if (tag.equals(MESSAGE_ID_COLUMN_TAG))
+ getAddr().addExtension(MESSAGE_ID_COLUMN_TAG, nl.item(i).getTextContent());
+ else
{
- getAddr().addExtension(DATA_COLUMN_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+TIMESTAMP_COLUMN_TAG))
+ if (tag.equals(STATUS_COLUMN_TAG))
+ getAddr().addExtension(STATUS_COLUMN_TAG, nl.item(i).getTextContent());
+ else
{
- getAddr().addExtension(TIMESTAMP_COLUMN_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+POST_DEL_TAG))
+ if (tag.equals(DATA_COLUMN_TAG))
+ getAddr().addExtension(DATA_COLUMN_TAG, nl.item(i).getTextContent());
+ else
{
- getAddr().addExtension(POST_DEL_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+ERROR_DEL_TAG))
+ if (tag.equals(TIMESTAMP_COLUMN_TAG))
+ getAddr().addExtension(TIMESTAMP_COLUMN_TAG, nl.item(i).getTextContent());
+ else
{
- getAddr().addExtension(ERROR_DEL_TAG, nl.item(i).getTextContent());
+ if (tag.equals(POST_DEL_TAG))
+ getAddr().addExtension(POST_DEL_TAG, nl.item(i).getTextContent());
+ else
+ {
+ if (tag.equals(ERROR_DEL_TAG))
+ getAddr().addExtension(ERROR_DEL_TAG, nl.item(i).getTextContent());
+ }
}
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
}
catch (Exception ex)
{
@@ -482,7 +487,7 @@
{
try
{
- _type = new URI("urn:jboss:esb:epr:type:jdbc");
+ _type = new URI("urn:jboss/esb/epr/type/jdbc");
}
catch (Exception ex)
{
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -86,42 +86,47 @@
for (int i = 0; i < nl.getLength(); i++)
{
- String nodeName = nl.item(i).getNodeName();
+ String prefix = nl.item(i).getPrefix();
+ String tag = nl.item(i).getLocalName();
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+SPECIFICATION_VERSION_TAG))
+ if ((prefix != null) && (prefix.equals(XMLUtil.JBOSSESB_PREFIX)))
{
- getAddr().addExtension(SPECIFICATION_VERSION_TAG, nl.item(i).getTextContent());
+ if (tag != null)
+ {
+ if (tag.equals(SPECIFICATION_VERSION_TAG))
+ getAddr().addExtension(SPECIFICATION_VERSION_TAG, nl.item(i).getTextContent());
+ else
+ {
+ if (tag.equals(DESTINATION_NAME_TAG))
+ getAddr().addExtension(DESTINATION_NAME_TAG, nl.item(i).getTextContent());
+ else
+ {
+ if (tag.equals(CONNECTION_FACTORY_TAG))
+ getAddr().addExtension(CONNECTION_FACTORY_TAG, nl.item(i).getTextContent());
+ else
+ {
+ if (tag.equals(JNDI_CONTEXT_FACTORY_TAG))
+ getAddr().addExtension(JNDI_CONTEXT_FACTORY_TAG, nl.item(i).getTextContent());
+ else
+ {
+ if (tag.equals(JNDI_PKG_PREFIX_TAG))
+ getAddr().addExtension(JNDI_PKG_PREFIX_TAG, nl.item(i).getTextContent());
+ else
+ {
+ if (tag.equals(JNDI_URL_TAG))
+ getAddr().addExtension(JNDI_URL_TAG, nl.item(i).getTextContent());
+ else
+ {
+ if (tag.equals(MESSAGE_SELECTOR_TAG))
+ getAddr().addExtension(MESSAGE_SELECTOR_TAG, nl.item(i).getTextContent());
+ }
+ }
+ }
+ }
+ }
+ }
+ }
}
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+DESTINATION_NAME_TAG))
- {
- getAddr().addExtension(DESTINATION_NAME_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+CONNECTION_FACTORY_TAG))
- {
- getAddr().addExtension(CONNECTION_FACTORY_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+JNDI_CONTEXT_FACTORY_TAG))
- {
- getAddr().addExtension(JNDI_CONTEXT_FACTORY_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+JNDI_PKG_PREFIX_TAG))
- {
- getAddr().addExtension(JNDI_PKG_PREFIX_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+JNDI_URL_TAG))
- {
- getAddr().addExtension(JNDI_URL_TAG, nl.item(i).getTextContent());
- }
- else
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+MESSAGE_SELECTOR_TAG))
- {
- getAddr().addExtension(MESSAGE_SELECTOR_TAG, nl.item(i).getTextContent());
- }
}
}
@@ -349,7 +354,7 @@
{
try
{
- _type = new URI("urn:jboss:esb:epr:type:jms");
+ _type = new URI("urn:jboss/esb/epr/type/jms");
}
catch (Exception ex)
{
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -64,13 +64,15 @@
for (int i = 0; i < nl.getLength(); i++)
{
- String nodeName = nl.item(i).getNodeName();
+ String prefix = nl.item(i).getPrefix();
+ String tag = nl.item(i).getLocalName();
try
- {
- if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+CERTIFICATE_TAG))
+ {
+ if ((prefix != null) && (prefix.equals(XMLUtil.JBOSSESB_PREFIX)))
{
- getAddr().addExtension(CERTIFICATE_TAG, nl.item(i).getTextContent());
+ if ((tag != null) && (tag.equals(CERTIFICATE_TAG)))
+ getAddr().addExtension(CERTIFICATE_TAG, nl.item(i).getTextContent());
}
}
catch (Exception ex)
@@ -150,7 +152,7 @@
{
try
{
- _type = new URI("urn:jboss:esb:epr:type:sftp");
+ _type = new URI("urn:jboss/esb/epr/type/sftp");
}
catch (Exception ex)
{
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/util/EPRManager.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/util/EPRManager.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/util/EPRManager.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -188,6 +188,9 @@
{
DocumentBuilderFactory factory = DocumentBuilderFactory
.newInstance();
+
+ factory.setNamespaceAware(true);
+
DocumentBuilder builder = factory.newDocumentBuilder();
Document doc = builder.parse(theFile);
Element rootElement = doc.getDocumentElement();
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/message/format/MessageType.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/message/format/MessageType.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/message/format/MessageType.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -47,8 +47,8 @@
{
try
{
- JBOSS_XML = new URI("urn:jboss:esb:message:type:JBOSS_XML");
- JAVA_SERIALIZED = new URI("urn:jboss:esb:message:type:JAVA_SERIALIZED");
+ JBOSS_XML = new URI("urn:jboss/esb/message/type/JBOSS_XML");
+ JAVA_SERIALIZED = new URI("urn:jboss/esb/message/type/JAVA_SERIALIZED");
DEFAULT_TYPE = JBOSS_XML;
}
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/Util.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/Util.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/Util.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -172,8 +172,11 @@
try
{
- Document doc = DocumentBuilderFactory.newInstance()
- .newDocumentBuilder().newDocument();
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+
+ factory.setNamespaceAware(true);
+
+ Document doc = factory.newDocumentBuilder().newDocument();
((org.jboss.internal.soa.esb.message.format.xml.MessageImpl) message)
.toXML(doc);
StringWriter sWriter = new StringWriter();
@@ -202,6 +205,8 @@
InputStream inStream = new ByteArrayInputStream(((String) serial)
.getBytes());
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+
DocumentBuilder builder = factory.newDocumentBuilder();
Document doc = builder.parse(inStream);
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/tests/EPRUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/tests/EPRUnitTest.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/tests/EPRUnitTest.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -68,9 +68,9 @@
{
try
{
- EPR epr = new EPR(new URI("urn:foo:bar"));
+ EPR epr = new EPR(new URI("urn:foo/bar"));
- assertEquals(epr.toString(), "EPR: PortReference < urn:foo:bar >");
+ assertEquals(epr.toString(), "EPR: PortReference < urn:foo/bar >");
}
catch (Exception ex)
{
@@ -82,9 +82,9 @@
{
try
{
- EPR epr = new EPR(new URI("urn:foo:bar"));
+ EPR epr = new EPR(new URI("urn:foo/bar"));
- assertEquals(epr.getAddr().getAddress(), "urn:foo:bar");
+ assertEquals(epr.getAddr().getAddress(), "urn:foo/bar");
}
catch (Exception ex)
{
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/BodyUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/BodyUnitTest.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/BodyUnitTest.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -68,6 +68,9 @@
DocumentBuilderFactory factory = DocumentBuilderFactory
.newInstance();
+
+ factory.setNamespaceAware(true);
+
DocumentBuilder builder = factory.newDocumentBuilder();
Document doc = builder.newDocument();
MessageImpl theImpl = (MessageImpl) msg;
@@ -95,6 +98,8 @@
}
catch (Exception ex)
{
+ ex.printStackTrace();
+
fail(ex.toString());
}
}
@@ -116,6 +121,8 @@
DocumentBuilderFactory factory = DocumentBuilderFactory
.newInstance();
+ factory.setNamespaceAware(true);
+
DocumentBuilder builder = factory.newDocumentBuilder();
Document doc = builder.newDocument();
MessageImpl theImpl = (MessageImpl) msg;
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/XMLMessageUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/XMLMessageUnitTest.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/XMLMessageUnitTest.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -259,6 +259,8 @@
}
catch (Exception ex)
{
+ ex.printStackTrace();
+
fail(ex.toString());
}
}
@@ -548,6 +550,9 @@
throws Exception
{
final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance() ;
+
+ factory.setNamespaceAware(true);
+
final DocumentBuilder builder = factory.newDocumentBuilder() ;
Document doc = builder.newDocument() ;
@@ -572,6 +577,9 @@
final InputSource inputSource = new InputSource(stringReader) ;
final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance() ;
+
+ factory.setNamespaceAware(true);
+
final DocumentBuilder builder = factory.newDocumentBuilder() ;
final Document doc = builder.parse(inputSource) ;
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -61,7 +61,7 @@
{
conn = mgr.getConnection();
- uid = new URI("urn:jboss:esb:message:UID:" + UUID.randomUUID()
+ uid = new URI("urn:jboss/esb/message/UID#" + UUID.randomUUID()
.toString());
String messageString = Base64.encodeObject(Util.serialize(message));
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/persistence/MessageStoreType.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/persistence/MessageStoreType.java 2007-02-05 19:21:44 UTC (rev 9350)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/persistence/MessageStoreType.java 2007-02-05 21:21:50 UTC (rev 9351)
@@ -43,7 +43,7 @@
{
try
{
- DATABASE = new URI("urn:jboss:esb:persistence:type:DATABASE");
+ DATABASE = new URI("urn:jboss/esb/persistence/type/DATABASE");
DEFAULT_TYPE = DATABASE;
}
More information about the jboss-svn-commits
mailing list