[jboss-svn-commits] JBL Code SVN: r14387 - in labs/jbossesb/workspace/rearch2/core/src: main/java/org/jboss/internal/soa/esb/message/format and 18 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 20 08:45:28 EDT 2007
Author: mark.little at jboss.com
Date: 2007-08-20 08:45:28 -0400 (Mon, 20 Aug 2007)
New Revision: 14387
Added:
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/addressing/helpers/HeaderHelper.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/annotations/
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/annotations/ESBMethod.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/annotations/ESBService.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessageFactory.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessagePlugin.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessageType.java
labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/annotations/
labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/annotations/ESBMethodUnitTest.java
labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/tests/
labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/tests/application/
labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/tests/application/BusinessObject.java
Removed:
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/addressing/helpers/CallHelper.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/xml/PropertiesImpl.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/addressing/Call.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/Attachment.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/Properties.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessageFactory.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessagePlugin.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessageType.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/format/
Modified:
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/MessageFactoryImpl.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/serialized/HeaderImpl.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/serialized/MessageImpl.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/serialized/SerializedMessagePlugin.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/xml/HeaderImpl.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/xml/MessageImpl.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/xml/XMLMessagePlugin.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/domain/Domain.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/domain/DomainManager.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/Body.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/Header.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/Message.java
labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/spi/Service.java
labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/infrastructure/tests/DispatcherUnitTest.java
labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/format/tests/ExampleMessagePlugin.java
labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/format/tests/MessageFactoryUnitTest.java
labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/AttachmentUnitTest.java
labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/BodyUnitTest.java
labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/FaultUnitTest.java
labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/MessageUnitTest.java
labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/PropertiesUnitTest.java
labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/SerializedMessageUnitTest.java
labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/XMLMessageUnitTest.java
labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/remoting/oneway/TcpClient.java
labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/remoting/oneway/TcpService.java
labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/remoting/twoway/TcpClient.java
labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/remoting/twoway/TcpService.java
Log:
Deleted: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/addressing/helpers/CallHelper.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/addressing/helpers/CallHelper.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/addressing/helpers/CallHelper.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -1,196 +0,0 @@
-package org.jboss.internal.soa.esb.addressing.helpers;
-
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author mark.little at jboss.com
- */
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.jboss.internal.soa.esb.assertion.AssertArgument;
-import org.jboss.soa.esb.MarshalException;
-import org.jboss.soa.esb.UnmarshalException;
-import org.jboss.soa.esb.addressing.Call;
-import org.jboss.soa.esb.addressing.XMLUtil;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public abstract class CallHelper
-{
-
- 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)
- {
- 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)
- {
- 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)
- {
- 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)
- {
- 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)
- {
- 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)
- {
- 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)
- {
- 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
- {
- 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.getPrefix() != null) && (n.getLocalName() != null))
- {
- if (n.getPrefix().equals(XMLUtil.WSA_PREFIX) && (n.getLocalName().equals(XMLUtil.TO_TAG)))
- {
- call.setTo(EPRHelper.fromXML((Element) header, true));
- }
-
- if (n.getPrefix().equals(XMLUtil.WSA_PREFIX) && (n.getLocalName().equals(XMLUtil.FROM_TAG)))
- {
- call.setFrom(EPRHelper.fromXML((Element) n, false));
- }
-
- 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
Copied: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/addressing/helpers/HeaderHelper.java (from rev 11838, labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/addressing/helpers/CallHelper.java)
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/addressing/helpers/HeaderHelper.java (rev 0)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/addressing/helpers/HeaderHelper.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -0,0 +1,196 @@
+package org.jboss.internal.soa.esb.addressing.helpers;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.jboss.internal.soa.esb.assertion.AssertArgument;
+import org.jboss.soa.esb.MarshalException;
+import org.jboss.soa.esb.UnmarshalException;
+import org.jboss.soa.esb.addressing.Call;
+import org.jboss.soa.esb.addressing.XMLUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+public abstract class HeaderHelper
+{
+
+ 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)
+ {
+ 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)
+ {
+ 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)
+ {
+ 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)
+ {
+ 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)
+ {
+ 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)
+ {
+ 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)
+ {
+ 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
+ {
+ 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.getPrefix() != null) && (n.getLocalName() != null))
+ {
+ if (n.getPrefix().equals(XMLUtil.WSA_PREFIX) && (n.getLocalName().equals(XMLUtil.TO_TAG)))
+ {
+ call.setTo(EPRHelper.fromXML((Element) header, true));
+ }
+
+ if (n.getPrefix().equals(XMLUtil.WSA_PREFIX) && (n.getLocalName().equals(XMLUtil.FROM_TAG)))
+ {
+ call.setFrom(EPRHelper.fromXML((Element) n, false));
+ }
+
+ 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
Modified: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/MessageFactoryImpl.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/MessageFactoryImpl.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/MessageFactoryImpl.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -9,9 +9,9 @@
import org.jboss.internal.soa.esb.message.format.xml.XMLMessagePlugin;
import org.jboss.soa.esb.common.ModulePropertyManager;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.message.format.MessagePlugin;
-import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.message.externalization.MessageFactory;
+import org.jboss.soa.esb.message.externalization.MessagePlugin;
+import org.jboss.soa.esb.message.externalization.ExternalizationType;
/*
* JBoss, Home of Professional Open Source
@@ -99,13 +99,13 @@
* Now add the default(s).
*/
- messageFormats.put(MessageType.JBOSS_XML, new XMLMessagePlugin());
- messageFormats.put(MessageType.JAVA_SERIALIZED, new SerializedMessagePlugin());
+ messageFormats.put(ExternalizationType.JBOSS_XML, new XMLMessagePlugin());
+ messageFormats.put(ExternalizationType.JAVA_SERIALIZED, new SerializedMessagePlugin());
}
public Message getMessage() // returns some default implementation.
{
- return ((MessagePlugin) messageFormats.get(MessageType.DEFAULT_TYPE)).getMessage();
+ return ((MessagePlugin) messageFormats.get(ExternalizationType.DEFAULT_TYPE)).getMessage();
}
public Message getMessage(URI type) // returns a message of a specific type.
Modified: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/serialized/HeaderImpl.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/serialized/HeaderImpl.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/serialized/HeaderImpl.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -31,7 +31,7 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.jboss.internal.soa.esb.addressing.helpers.CallHelper;
+import org.jboss.internal.soa.esb.addressing.helpers.HeaderHelper;
import org.jboss.soa.esb.MarshalException;
import org.jboss.soa.esb.UnmarshalException;
import org.jboss.soa.esb.addressing.Call;
@@ -94,7 +94,7 @@
doc.appendChild(header);
- header = CallHelper.toXML(_call, doc, header);
+ header = HeaderHelper.toXML(_call, doc, header);
StringWriter sWriter = new StringWriter();
OutputFormat format = new OutputFormat();
@@ -135,7 +135,7 @@
Element headerElement = doc.getDocumentElement();
- _call = CallHelper.fromXML(headerElement);
+ _call = HeaderHelper.fromXML(headerElement);
}
catch (UnmarshalException ex)
{
Modified: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/serialized/MessageImpl.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/serialized/MessageImpl.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/serialized/MessageImpl.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -30,7 +30,7 @@
import org.jboss.soa.esb.message.Header;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.Properties;
-import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.message.externalization.ExternalizationType;
/**
@@ -109,7 +109,7 @@
public URI getType ()
{
- return MessageType.JAVA_SERIALIZED;
+ return ExternalizationType.JAVA_SERIALIZED;
}
/**
Modified: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/serialized/SerializedMessagePlugin.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/serialized/SerializedMessagePlugin.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/serialized/SerializedMessagePlugin.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -3,8 +3,8 @@
import java.net.URI;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessagePlugin;
-import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.message.externalization.MessagePlugin;
+import org.jboss.soa.esb.message.externalization.ExternalizationType;
/*
* JBoss, Home of Professional Open Source
@@ -43,6 +43,6 @@
public URI getType ()
{
- return MessageType.JAVA_SERIALIZED;
+ return ExternalizationType.JAVA_SERIALIZED;
}
}
Modified: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/xml/HeaderImpl.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/xml/HeaderImpl.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/xml/HeaderImpl.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -21,7 +21,7 @@
* @author mark.little at jboss.com
*/
-import org.jboss.internal.soa.esb.addressing.helpers.CallHelper;
+import org.jboss.internal.soa.esb.addressing.helpers.HeaderHelper;
import org.jboss.soa.esb.MarshalException;
import org.jboss.soa.esb.UnmarshalException;
import org.jboss.soa.esb.addressing.Call;
@@ -70,7 +70,7 @@
envelope.appendChild(headerElement);
if (_call != null)
- return CallHelper.toXML(_call, doc, headerElement);
+ return HeaderHelper.toXML(_call, doc, headerElement);
else
return headerElement;
}
@@ -96,7 +96,7 @@
// TODO error handling!!
if (headerElement != null)
- _call = CallHelper.fromXML(headerElement);
+ _call = HeaderHelper.fromXML(headerElement);
}
private Call _call;
Modified: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/xml/MessageImpl.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/xml/MessageImpl.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/xml/MessageImpl.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -32,7 +32,7 @@
import org.jboss.soa.esb.message.Header;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.Properties;
-import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.message.externalization.ExternalizationType;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -118,7 +118,7 @@
public URI getType ()
{
- return MessageType.JBOSS_XML;
+ return ExternalizationType.JBOSS_XML;
}
/**
* getProperties()
Deleted: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/xml/PropertiesImpl.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/xml/PropertiesImpl.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/xml/PropertiesImpl.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -1,218 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author schifest at heuristica.com.ar
- */
-package org.jboss.internal.soa.esb.message.format.xml;
-
-import java.io.Serializable;
-import java.util.Hashtable;
-import java.util.Map;
-
-import org.jboss.internal.soa.esb.thirdparty.Base64;
-import org.jboss.soa.esb.MarshalException;
-import org.jboss.soa.esb.UnmarshalException;
-import org.jboss.soa.esb.message.Properties;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class PropertiesImpl extends Properties
-{
- public static final String PROPERTIES_TAG = "Properties";
-
- public static final String PROPERTY_TAG = "Property";
-
- public static final String KEY_TAG = "Key";
-
- public static final String VALUE_TAG = "Value";
-
- public Object getProperty(String name)
- {
- return _table.get(name);
- }
-
- public Object getProperty(String name, Object defaultVal)
- {
- Object oRet = getProperty(name);
- return (null == oRet) ? defaultVal : oRet;
- }
-
- public Object setProperty(String name, Object value)
- {
- if (value instanceof Serializable)
- return _table.put(name, (Serializable) value);
- else
- throw new IllegalArgumentException("value must be XmlSerializable");
- }
-
- public Object remove(String name)
- {
- return _table.remove(name);
- }
-
- public int size()
- {
- return _table.size();
- }
-
- public String[] getNames()
- {
- return _table.keySet().toArray(new String[_table.size()]);
- }
-
- /**
- * toXML(elem) - Will build a child element with appropriate values and
- * append it to arg0
- *
- * @param elem
- * Element - where to add 'this' as a child node
- * @return Element - 'this' as the added Element, or <null> if no
- * properties in table and nothing was appended to arg0
- */
- public Element toXML(Element elem) throws MarshalException
- {
- if (_table.size() < 1)
- return null;
-
- Document doc = elem.getOwnerDocument();
- Element thisElement = doc.createElement(PROPERTIES_TAG);
-
- boolean bAdd = false;
- for (Map.Entry<String, Serializable> oCurr : _table.entrySet())
- {
- Element oProp = doc.createElement(PROPERTY_TAG);
- Element keyElement = doc.createElement(KEY_TAG);
- Element valueElement = doc.createElement(VALUE_TAG);
-
- keyElement.appendChild(doc.createCDATASection(Base64.encodeBytes(oCurr.getKey().getBytes())));
- oProp.appendChild(keyElement);
-
- valueElement.appendChild(doc.createCDATASection(Base64.encodeObject(oCurr.getValue())));
- oProp.appendChild(valueElement);
-
- thisElement.appendChild(oProp);
- bAdd = true;
- }
- if (bAdd)
- {
- elem.appendChild(thisElement);
- return thisElement;
- }
- else
- return null;
- }
-
- /**
- * fromXml(elem) - Populate properties found in appropriate child element
- *
- * @see XMLUtil.PROPERTIES_TAG
- * @param elem -
- * Element where to look for child nodes
- */
- public void fromXML(Element elem) throws UnmarshalException
- {
- _table.clear();
-
- /*
- * There should be only one!
- */
-
- NodeList NL = elem.getElementsByTagName(PROPERTIES_TAG);
-
- if (NL.getLength() > 1)
- throw new UnmarshalException("More "+PROPERTIES_TAG+" than we expected!");
-
- if (NL.getLength() == 1)
- NL = NL.item(0).getChildNodes();
-
- for (int i1 = 0; i1 < NL.getLength(); i1++)
- {
- Node oCurr = NL.item(i1);
-
- if (!(oCurr instanceof Element))
- continue;
-
- if (oCurr.getNodeName().equals(PROPERTY_TAG))
- {
- NodeList props = oCurr.getChildNodes();
- String key = null;
- Object value = null;
-
- for (int i2 = 0; i2 < props.getLength(); i2++)
- {
- Node oProp = props.item(i2);
-
- if (oProp instanceof Element)
- {
- if (oProp.getNodeName().equals(VALUE_TAG))
- {
- CDATASection cdata = (CDATASection) oProp.getFirstChild();
- value = Base64.decodeToObject(cdata.getWholeText());
- }
- else
- {
- if (oProp.getNodeName().equals(KEY_TAG))
- {
- CDATASection cdata = (CDATASection) oProp.getFirstChild();
- key = new String(Base64.decode(cdata.getWholeText()));
- }
- }
- }
- }
-
- if ((key != null) && (value != null))
- _table.put(key, (Serializable) value);
- else
- throw new UnmarshalException("Could not get tuple for "+oCurr.getNodeName());
- }
- }
- }
-
- public String toString()
- {
- return _table.toString();
- }
-
- @Override
- public boolean equals(Object arg)
- {
- if (!(arg instanceof Properties))
- return false;
- Properties other = (Properties) arg;
- if (other.size() != _table.size())
- return false;
- for (Map.Entry<String, Serializable> oCurr : _table.entrySet())
- {
- Object val = other.getProperty(oCurr.getKey());
- if (null == oCurr.getValue())
- if (null == val)
- continue;
- else
- return false;
- if (!oCurr.getValue().equals(val))
- return false;
- }
- return true;
- }
-
- Hashtable<String, Serializable> _table = new Hashtable<String, Serializable>();
-
-}
Modified: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/xml/XMLMessagePlugin.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/xml/XMLMessagePlugin.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/internal/soa/esb/message/format/xml/XMLMessagePlugin.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -3,8 +3,8 @@
import java.net.URI;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessagePlugin;
-import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.message.externalization.MessagePlugin;
+import org.jboss.soa.esb.message.externalization.ExternalizationType;
/*
* JBoss, Home of Professional Open Source
@@ -43,6 +43,6 @@
public URI getType ()
{
- return MessageType.JBOSS_XML;
+ return ExternalizationType.JBOSS_XML;
}
}
Deleted: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/addressing/Call.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/addressing/Call.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/addressing/Call.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -1,276 +0,0 @@
-package org.jboss.soa.esb.addressing;
-
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author mark.little at jboss.com
- */
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-/**
- * Represents an interaction pattern for a specific message exchange. When sending a message
- * the sender application can specify where errors are to be returned, where responses are
- * to go, along with other interaction information.
- *
- * A call represents an exchange pattern for this message. It is built up as the message
- * flows through the ESB and identifies where the message should go, along with any
- * routing information for faults, replies etc.
- *
- *
- * To: the destination. MANDATORY.
- * From: the sender. OPTIONAL. If not defined, then the sender MAY be inferred from the transport.
- * ReplyTo: the destination for any response. OPTIONAL.
- * FaultTo: the destination for any error message. OPTIONAL.
- * RelatesTo: used to indicate that this message is related to another. OPTIONAL.
- * Action: used by the sender to indicate the semantics of the message. Must be unique. MANDATORY.
- * MessageID: used to uniquely identify this message. OPTIONAL.
- *
- * @author marklittle
- *
- */
-
-// TODO maybe this should simply go into the Header interface?
-
-public class Call
-{
- /**
- * Create a new (empty) call.
- */
-
- public Call ()
- {
- }
-
- /**
- * Create a new call, whose To field is set to the supplied EPR.
- *
- * @param epr the To field.
- */
-
- public Call (EPR epr)
- {
- _to = epr;
- }
-
- /**
- * Set the To field. Must not be null.
- *
- * @param epr the To field value.
- */
-
- public void setTo (EPR epr)
- {
- if (epr == null)
- throw new IllegalArgumentException();
-
- _to = epr;
- }
-
- /**
- * @return the To field.
- */
-
- public EPR getTo ()
- {
- return _to;
- }
-
- /**
- * Set the From field. May be null.
- *
- * @param from the value of the field.
- */
-
- public void setFrom (EPR from)
- {
- _from = from;
- }
-
- /**
- * @return the From field.
- * @throws URISyntaxException thrown if the address is invalid.
- */
-
- public EPR getFrom ()
- {
- return _from;
- }
-
- /**
- * Set the ReplyTo field. May be null.
- *
- * @param replyTo the value of the field.
- */
-
- public void setReplyTo (EPR replyTo)
- {
- _replyTo = replyTo;
- }
-
- /**
- * @return the ReplyTo field.
- * @throws URISyntaxException thrown if the address is invalid.
- */
-
- public EPR getReplyTo ()
- {
- return _replyTo;
- }
-
- /**
- * Set the FaultTo field. May be null.
- *
- * @param uri the value of the field.
- */
-
- public void setFaultTo (EPR uri)
- {
- _faultTo = uri;
- }
-
- /**
- * @return the FaultTo field.
- */
-
- public EPR getFaultTo ()
- {
- return _faultTo;
- }
-
- /**
- * Set the RelatesTo field.
- *
- * @param uri the value to set.
- */
-
- public void setRelatesTo (URI uri)
- {
- _relatesTo = uri;
- }
-
- /**
- * @return the RelatesTo field.
- */
-
- public URI getRelatesTo ()
- {
- return _relatesTo;
- }
-
- /**
- * Set the Action field.
- * @param uri the value to set.
- */
-
- public void setAction (URI uri)
- {
- _action = uri;
- }
-
- /**
- * @return the Action field.
- */
- public URI getAction ()
- {
- return _action;
- }
-
- /**
- * Set the MessageId for this instance.
- *
- * @param uri the value to use.
- */
-
- public void setMessageID (URI uri)
- {
- _messageID = uri;
- }
-
- /**
- * @return the MessageID field.
- */
-
- public URI getMessageID ()
- {
- return _messageID;
- }
-
- public final boolean empty ()
- {
- if ((_to == null) && (_from == null) && (_replyTo == null))
- {
- if ((_relatesTo == null) && (_faultTo == null) && (_action == null) && (_messageID == null))
- return true;
- }
-
- return false;
- }
-
- /**
- * Copy the instance specified.
- *
- * @param from the instance to copy.
- */
-
- public void copy (Call from)
- {
- Call fromImpl = (Call) from;
-
- _to = fromImpl._to;
- _from = fromImpl._from;
- _replyTo = fromImpl._replyTo;
- _relatesTo = fromImpl._relatesTo;
- _faultTo = fromImpl._faultTo;
- _action = fromImpl._action;
- _messageID = fromImpl._messageID;
- }
-
-// public void setMetaData (MetaData md);
-// public MetaData getMetaData ();
-// public void addReferenceParameter (...);
-
- public String toString ()
- {
- return "To: "+_to+" From: "+_from+" ReplyTo: "+_replyTo+" FaultTo: "+_faultTo+" Action: "+_action+" MessagdID: "+_messageID;
- }
-
- /**
- * This instance is valid if all mandatory elements are set.
- *
- * @return <code>true</code> if all mandatory elements are set, <code>false</code> otherwise.
- */
-
- public boolean valid ()
- {
- if ((_to != null) && (_action != null))
- return true;
- else
- return false;
- }
-
- private EPR _to = null;
- private EPR _from = null;
- private EPR _faultTo = null;
- private EPR _replyTo = null;
- private URI _relatesTo = null;
- private URI _action = null;
- private URI _messageID = null;
-
-}
\ No newline at end of file
Added: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/annotations/ESBMethod.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/annotations/ESBMethod.java (rev 0)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/annotations/ESBMethod.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+package org.jboss.soa.esb.annotations;
+
+import java.lang.annotation.*;
+
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({ ElementType.METHOD })
+public @interface ESBMethod
+{
+ String operation ();
+ boolean fromByteArray () default false;
+ boolean fromDefault () default false;
+ String[] parameters () default "";
+ String resultName () default "";
+}
\ No newline at end of file
Added: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/annotations/ESBService.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/annotations/ESBService.java (rev 0)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/annotations/ESBService.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+package org.jboss.soa.esb.annotations;
+
+//import java.lang.annotation.*;
+
+/*
+ * import javax.jws.WebService;
+import javax.jws.WebMethod;
+
+ at WebService
+public class HelloWorldService {
+
+ @WebMethod
+ public String helloWorld() {
+ return "Hello World!";
+ }
+}
+ */
\ No newline at end of file
Modified: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/domain/Domain.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/domain/Domain.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/domain/Domain.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -30,6 +30,9 @@
* (domain wide). Therefore, the domain within which the service is deployed
* will dictate the type of dispatcher hierarchy it is associated with. Any
* number of services may be deployed within a domain, including just one.
+ *
+ * Proxies for services must also reside in equivalent domains to ensure that
+ * they receive the equivalent dispatcher hierarchy.
*/
public class Domain
@@ -217,6 +220,14 @@
}
}
+ public final void setHierarchy (URI hierarchy)
+ {
+ }
+
+ public final void addDispatcher ()
+ {
+ }
+
protected Domain (URI name)
{
_name = name;
Modified: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/domain/DomainManager.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/domain/DomainManager.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/domain/DomainManager.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -58,6 +58,25 @@
return domain;
}
+ public final Domain createDomain (URI domainName, URI hierarchy)
+ {
+ if (domainName == null)
+ throw new IllegalArgumentException();
+
+ // if already present then throw an exception
+
+ if (_domains.get(domainName) != null)
+ throw new IllegalArgumentException("Domain already present.");
+
+ // not created in active state
+
+ Domain domain = new Domain(domainName);
+
+ _domains.put(domainName, domain);
+
+ return domain;
+ }
+
public final Domain getDomain (URI domainName)
{
if (domainName == null)
Deleted: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/Attachment.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/Attachment.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/Attachment.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -1,152 +0,0 @@
-package org.jboss.soa.esb.message;
-
-import java.net.URI;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.jboss.soa.esb.addressing.Call;
-import org.jboss.soa.esb.addressing.EPR;
-import org.jboss.soa.esb.addressing.XMLUtil;
-
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author mark.little at jboss.com
- */
-
-/**
- * Messages may contain attachments that do not appear in the main payload body.
- * For example, binary document formats, zip files etc.
- * <br/>Handles both 'named' attachment and a list of 'unnamed' attachments
- *
- * @author Mark Little
- */
-
-public abstract class Attachment
-{
- /**
- * Populate the header.
- *
- * @param contents the values to populate.
- */
-
- public void setContents (Map<String, Object> contents)
- {
- if (contents == null)
- throw new IllegalArgumentException();
-
- Set<String> keys = contents.keySet();
-
- try
- {
- if (keys != null)
- {
- Iterator<String> iter = keys.iterator();
-
- while (iter.hasNext())
- {
- String value = iter.next();
-
- put(value, contents.get(value));
- }
- }
- }
- catch (ClassCastException ex)
- {
- throw new IllegalArgumentException(ex.toString());
- }
- }
-
- /**
- * Returns the attachment to which this object maps the specified key.
- * Returns null if the there's no value mapped for this key.
- * @param name String - The name of the attachment to get
- * @return Object - the value mapped to arg0 or <null> if none
- */
- public abstract Object get(String name);
- /**
- * Associates the specified value with the specified name
- * If there was already a mapping for this name, the old value is replaced by
- * arg1
- * @param name String - the name for the object to be stored
- * @param value Object - the object to be associated with the name (arg0)
- * @return Object - previous value associated with specified name,
- * or null if there was none
- */
- public abstract Object put(String name, Object value);
- /**
- * Removes the mapping for this name if it was present
- * @param name String - the name of the object to be removed
- * @return the value previously associated the name, or null if there was none
- */
- public abstract Object remove(String name);
- /**
- * @return String[] - the list of names of the named Objects
- */
- public abstract String[] getNames();
-
- /**
- * get the item at the specified position in the list of unnamed objects
- * @param index int - index of element to return
- * @return Object the element at the specified position in the list of unnamed objects
- * @throws IndexOutOfBoundsException - if the index is out of range
- */
- public abstract Object itemAt (int index) throws IndexOutOfBoundsException;
- /**
- * Removes the element at the specified position in the list of unnamed objects
- * Shifts any subsequent elements to the left
- * @param index int - index of element to remove
- * @return Object - the element that was removed from the list
- * @throws IndexOutOfBoundsException - if the index is out of range
- */
- public abstract Object removeItemAt (int index) throws IndexOutOfBoundsException;
- /**
- * Replaces the element at the specified position in the list of unnamed objects
- * with the value supplied
- * @param index int - index of element to be replaced
- * @param value Object - the object to replace the one previously stored at that index
- * @return Object - previous value at that index
- * @throws IndexOutOfBoundsException - if the index is out of range
- */
- public abstract Object replaceItemAt(int index, Object value) throws IndexOutOfBoundsException;
- /**
- * Appends the specified element to the end of the list of unnamed objects
- * <br/>null values are allowed
- * @param value Object - the object to be appended
- */
- public abstract void addItem (Object value);
- /**
- * Replaces the element at the specified position in the list of unnamed objects
- * <br/> allows null values
- * @param index int - index where to insert the value - Shifts any subsequent elements to the right
- * @param value Object - value to be stored at the specified position
- * @throws IndexOutOfBoundsException
- */
- public abstract void addItemAt (int index, Object value) throws IndexOutOfBoundsException;
- /**
- * getUnnamedCount()
- * @return the count of unnamed objects
- */
- public abstract int getUnnamedCount();
- /**
- * getNamedCount()
- * @return the count of named objects
- */
- public abstract int getNamedCount();
-}
Modified: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/Body.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/Body.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/Body.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -42,8 +42,7 @@
public abstract class Body
{
- public static String BYTES = "bytes";
-
+
/**
* Populate the header.
*
@@ -66,15 +65,8 @@
while (iter.hasNext())
{
String value = iter.next();
-
- if (value.equals(BYTES))
- {
- addBytes((byte[]) contents.get(value));
- }
- else
- {
- add(value, contents.get(value));
- }
+
+ add(value, contents.get(value));
}
}
}
@@ -112,20 +104,6 @@
*/
public abstract Object remove (String name);
-
- /**
- * Set the byte content of the body.
- *
- * @param content the message bytes
- */
-
- public abstract void addBytes (byte[] content);
-
- /**
- * @return the byte content of the body.
- */
-
- public abstract byte[] getBytes ();
/**
* Replace this body instance with the one given.
Modified: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/Header.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/Header.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/Header.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -22,6 +22,7 @@
*/
import java.net.URI;
+import java.net.URISyntaxException;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
@@ -34,7 +35,7 @@
* The message header. Contains such things as routing information.
*/
-public abstract class Header
+public class Header
{
/**
* Populate the header.
@@ -42,12 +43,6 @@
* @param contents the values to populate.
*/
- /**
- * Populate the header.
- *
- * @param contents the values to populate.
- */
-
public void setContents (Map<String, Object> contents)
{
if (contents == null)
@@ -137,16 +132,205 @@
}
/**
- * @return get the Call information for this message.
+ * Set the To field. Must not be null.
+ *
+ * @param epr the To field value.
*/
- public abstract Call getCall ();
+ public void setTo (EPR epr)
+ {
+ if (epr == null)
+ throw new IllegalArgumentException();
+
+ _to = epr;
+ }
/**
- * Set the call information for this message.
+ * @return the To field.
+ */
+
+ public EPR getTo ()
+ {
+ return _to;
+ }
+
+ /**
+ * Set the From field. May be null.
*
- * @param call the information.
+ * @param from the value of the field.
*/
- public abstract void setCall (Call call);
+ public void setFrom (EPR from)
+ {
+ _from = from;
+ }
+
+ /**
+ * @return the From field.
+ * @throws URISyntaxException thrown if the address is invalid.
+ */
+
+ public EPR getFrom ()
+ {
+ return _from;
+ }
+
+ /**
+ * Set the ReplyTo field. May be null.
+ *
+ * @param replyTo the value of the field.
+ */
+
+ public void setReplyTo (EPR replyTo)
+ {
+ _replyTo = replyTo;
+ }
+
+ /**
+ * @return the ReplyTo field.
+ * @throws URISyntaxException thrown if the address is invalid.
+ */
+
+ public EPR getReplyTo ()
+ {
+ return _replyTo;
+ }
+
+ /**
+ * Set the FaultTo field. May be null.
+ *
+ * @param uri the value of the field.
+ */
+
+ public void setFaultTo (EPR uri)
+ {
+ _faultTo = uri;
+ }
+
+ /**
+ * @return the FaultTo field.
+ */
+
+ public EPR getFaultTo ()
+ {
+ return _faultTo;
+ }
+
+ /**
+ * Set the RelatesTo field.
+ *
+ * @param uri the value to set.
+ */
+
+ public void setRelatesTo (URI uri)
+ {
+ _relatesTo = uri;
+ }
+
+ /**
+ * @return the RelatesTo field.
+ */
+
+ public URI getRelatesTo ()
+ {
+ return _relatesTo;
+ }
+
+ /**
+ * Set the Action field.
+ * @param uri the value to set.
+ */
+
+ public void setAction (URI uri)
+ {
+ _action = uri;
+ }
+
+ /**
+ * @return the Action field.
+ */
+ public URI getAction ()
+ {
+ return _action;
+ }
+
+ /**
+ * Set the MessageId for this instance.
+ *
+ * @param uri the value to use.
+ */
+
+ public void setMessageID (URI uri)
+ {
+ _messageID = uri;
+ }
+
+ /**
+ * @return the MessageID field.
+ */
+
+ public URI getMessageID ()
+ {
+ return _messageID;
+ }
+
+ public final boolean empty ()
+ {
+ if ((_to == null) && (_from == null) && (_replyTo == null))
+ {
+ if ((_relatesTo == null) && (_faultTo == null) && (_action == null) && (_messageID == null))
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Copy the instance specified.
+ *
+ * @param from the instance to copy.
+ */
+
+ public void copy (Header fromImpl)
+ {
+ _to = fromImpl._to;
+ _from = fromImpl._from;
+ _replyTo = fromImpl._replyTo;
+ _relatesTo = fromImpl._relatesTo;
+ _faultTo = fromImpl._faultTo;
+ _action = fromImpl._action;
+ _messageID = fromImpl._messageID;
+ }
+
+// public void setMetaData (MetaData md);
+// public MetaData getMetaData ();
+// public void addReferenceParameter (...);
+
+ public String toString ()
+ {
+ return "To: "+_to+" From: "+_from+" ReplyTo: "+_replyTo+" FaultTo: "+_faultTo+" Action: "+_action+" MessagdID: "+_messageID;
+ }
+
+ /**
+ * This instance is valid if all mandatory elements are set.
+ *
+ * @return <code>true</code> if all mandatory elements are set, <code>false</code> otherwise.
+ */
+
+ public boolean valid ()
+ {
+ if ((_to != null) && (_action != null))
+ return true;
+ else
+ return false;
+ }
+
+ private EPR _to = null;
+ private EPR _from = null;
+ private EPR _faultTo = null;
+ private EPR _replyTo = null;
+ private URI _relatesTo = null;
+ private URI _action = null;
+ private URI _messageID = null;
+
}
\ No newline at end of file
Modified: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/Message.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/Message.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/Message.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -72,21 +72,9 @@
public Fault getFault ();
/**
- * @return get any message attachments.
- */
-
- public Attachment getAttachment ();
-
- /**
* @return the type of this message.
*/
public URI getType ();
- /**
- * @return Properties - any message properties.
- */
-
- public Properties getProperties ();
-
}
Deleted: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/Properties.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/Properties.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/Properties.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -1,125 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author schifest at heuristica.com.ar
- */
-
-package org.jboss.soa.esb.message;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * The message properties hold arbitrary information in the form of
- * <String,Object> pairs
- *
- */
-
-public abstract class Properties
-{
- /**
- * Populate the header.
- *
- * @param contents the values to populate.
- */
-
- public void setContents (Map<String, Object> contents)
- {
- if (contents == null)
- throw new IllegalArgumentException();
-
- Set<String> keys = contents.keySet();
-
- try
- {
- if (keys != null)
- {
- Iterator<String> iter = keys.iterator();
-
- while (iter.hasNext())
- {
- String value = iter.next();
-
- setProperty(value, contents.get(value));
- }
- }
- }
- catch (ClassCastException ex)
- {
- throw new IllegalArgumentException(ex.toString());
- }
- }
-
- /**
- * getProperty(name)
- *
- * @param name
- * String - name of property
- * @return Object - the value stored under the specified name
- */
- public abstract Object getProperty(String name);
-
- /**
- * getProperty(name,defaultVal)
- *
- * @param name
- * String - name of property
- * @param defaultVal
- * Object - value to return if no value found
- * @return Object - the value stored under the specified name
- */
- public abstract Object getProperty(String name, Object defaultVal);
-
- /**
- * setProperty(name,value)
- *
- * @param name
- * String - name of property to store
- * @param value
- * Object - value of property to store under specified name
- * @return Object - the previous value of the specified name, or null if it
- * did not have one
- */
- public abstract Object setProperty(String name, Object value);
-
- /**
- * remove(name)
- *
- * @param name
- * String - name of property to remove
- * @return Object - the previous value of the specified name, or null if it
- * did not have one
- */
- public abstract Object remove(String name);
-
- /**
- * size()
- *
- * @return int - Returns the number of properties in this object
- */
- public abstract int size();
-
- /**
- * getNames()
- *
- * @return String[] - containing the names of all properties
- */
- public abstract String[] getNames();
-
-}
Copied: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization (from rev 11838, labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/format)
Deleted: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessageFactory.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/format/MessageFactory.java 2007-05-12 08:12:41 UTC (rev 11838)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessageFactory.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -1,76 +0,0 @@
-package org.jboss.soa.esb.message.format;
-
-import java.net.URI;
-
-import org.jboss.internal.soa.esb.message.format.MessageFactoryImpl;
-import org.jboss.soa.esb.message.Message;
-
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author mark.little at jboss.com
- */
-
-/**
- * You get a message of a specific type when you need it. Obviously that type may not be
- * suitable for the service (hopefully you've got that contractual information a priori, but
- * maybe not) and in which case some translation/transformation may be necessary.
- *
- * @author Mark Little
- *
- */
-
-public abstract class MessageFactory
-{
- /**
- * @return some default implementation.
- */
-
- public abstract Message getMessage ();
-
- /**
- * @param type the unique identifier representing the type of this message.
- * @return the message, or <code>null</code> if no suitable plugin is available.
- */
-
- public abstract Message getMessage (URI type);
-
- /**
- * @param msg the message to convert.
- * @param type the type of the message we want to convert to.
- * @return a translated message, or <code>null</code> if no suitable plugin is available.
- */
-
- public abstract Message getMessage (Message msg, URI type);
-
- /**
- * Reload the plugins.
- */
-
- public abstract void reset ();
-
- // TODO setters/getters for the plugin programmatically too.
-
- public static MessageFactory getInstance ()
- {
- return theFactory;
- }
-
- private static final MessageFactory theFactory = new MessageFactoryImpl();
-
-}
Copied: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessageFactory.java (from rev 14386, labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/format/MessageFactory.java)
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessageFactory.java (rev 0)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessageFactory.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -0,0 +1,76 @@
+package org.jboss.soa.esb.message.externalization;
+
+import java.net.URI;
+
+import org.jboss.internal.soa.esb.message.format.MessageFactoryImpl;
+import org.jboss.soa.esb.message.Message;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+/**
+ * You get a message of a specific type when you need it. Obviously that type may not be
+ * suitable for the service (hopefully you've got that contractual information a priori, but
+ * maybe not) and in which case some translation/transformation may be necessary.
+ *
+ * @author Mark Little
+ *
+ */
+
+public abstract class MessageFactory
+{
+ /**
+ * @return some default implementation.
+ */
+
+ public abstract Message getMessage ();
+
+ /**
+ * @param type the unique identifier representing the type of this message.
+ * @return the message, or <code>null</code> if no suitable plugin is available.
+ */
+
+ public abstract Message getMessage (URI type);
+
+ /**
+ * @param msg the message to convert.
+ * @param type the type of the message we want to convert to.
+ * @return a translated message, or <code>null</code> if no suitable plugin is available.
+ */
+
+ public abstract Message getMessage (Message msg, URI type);
+
+ /**
+ * Reload the plugins.
+ */
+
+ public abstract void reset ();
+
+ // TODO setters/getters for the plugin programmatically too.
+
+ public static MessageFactory getInstance ()
+ {
+ return theFactory;
+ }
+
+ private static final MessageFactory theFactory = new MessageFactoryImpl();
+
+}
Deleted: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessagePlugin.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/format/MessagePlugin.java 2007-05-12 08:12:41 UTC (rev 11838)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessagePlugin.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -1,52 +0,0 @@
-package org.jboss.soa.esb.message.format;
-
-import java.net.URI;
-
-import org.jboss.soa.esb.message.Message;
-
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author mark.little at jboss.com
- */
-
-/**
- * Used to plug in new message formats dynamically. Each plugin is responsible for
- * returning a message implementation that knows how to serialize its state in a
- * specific manner, e.g., XML or ASN.1.
- *
- * @author Mark Little
- *
- */
-
-public interface MessagePlugin
-{
- public static final String MESSAGE_PLUGIN = "org.jboss.soa.esb.message.format.plugin";
-
- /**
- * @return the message instance.
- */
-
- public Message getMessage ();
-
- /**
- * @return the unique identifier for this message plugin.
- */
-
- public URI getType ();
-}
Copied: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessagePlugin.java (from rev 14386, labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/format/MessagePlugin.java)
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessagePlugin.java (rev 0)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessagePlugin.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -0,0 +1,52 @@
+package org.jboss.soa.esb.message.externalization;
+
+import java.net.URI;
+
+import org.jboss.soa.esb.message.Message;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+/**
+ * Used to plug in new message formats dynamically. Each plugin is responsible for
+ * returning a message implementation that knows how to serialize its state in a
+ * specific manner, e.g., XML or ASN.1.
+ *
+ * @author Mark Little
+ *
+ */
+
+public interface MessagePlugin
+{
+ public static final String MESSAGE_PLUGIN = "org.jboss.soa.esb.message.format.plugin";
+
+ /**
+ * @return the message instance.
+ */
+
+ public Message getMessage ();
+
+ /**
+ * @return the unique identifier for this message plugin.
+ */
+
+ public URI getType ();
+}
Deleted: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessageType.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/format/MessageType.java 2007-05-12 08:12:41 UTC (rev 11838)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessageType.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -1,62 +0,0 @@
-package org.jboss.soa.esb.message.format;
-
-import java.net.URI;
-
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author mark.little at jboss.com
- */
-
-/**
- * You get a message of a specific type when you need it. Obviously that type may not be
- * suitable for the service (hopefully you've got that contractual information a priori, but
- * maybe not) and in which case some translation/transformation may be necessary.
- *
- * @author Mark Little
- *
- */
-
-public abstract class MessageType
-{
- /*
- * DO NOT reorder this list. New types may be added as required.
- */
-
- public static URI JBOSS_XML = null;
- public static URI JAVA_SERIALIZED = null;
-
- public static URI DEFAULT_TYPE = null;
-
- static
- {
- try
- {
- 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;
- }
- catch (Exception ex)
- {
- throw new ExceptionInInitializerError(ex.toString());
- }
-
- }
-
-}
Copied: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessageType.java (from rev 14386, labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/format/MessageType.java)
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessageType.java (rev 0)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/message/externalization/MessageType.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -0,0 +1,62 @@
+package org.jboss.soa.esb.message.externalization;
+
+import java.net.URI;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+/**
+ * You get a message of a specific type when you need it. Obviously that type may not be
+ * suitable for the service (hopefully you've got that contractual information a priori, but
+ * maybe not) and in which case some translation/transformation may be necessary.
+ *
+ * @author Mark Little
+ *
+ */
+
+public abstract class MessageType
+{
+ /*
+ * DO NOT reorder this list. New types may be added as required.
+ */
+
+ public static URI JBOSS_XML = null;
+ public static URI JAVA_SERIALIZED = null;
+
+ public static URI DEFAULT_TYPE = null;
+
+ static
+ {
+ try
+ {
+ 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;
+ }
+ catch (Exception ex)
+ {
+ throw new ExceptionInInitializerError(ex.toString());
+ }
+
+ }
+
+}
Modified: labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/spi/Service.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/spi/Service.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/main/java/org/jboss/soa/esb/spi/Service.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -28,8 +28,6 @@
* with the message.
*/
-// should this be the basis for Dispatcher?
-
public interface Service
{
// TODO add exceptions
Added: labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/annotations/ESBMethodUnitTest.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/annotations/ESBMethodUnitTest.java (rev 0)
+++ labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/annotations/ESBMethodUnitTest.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -0,0 +1,101 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.annotations;
+
+import java.lang.reflect.Method;
+
+import junit.framework.TestCase;
+
+/**
+ * Unit tests for the Class class.
+ *
+ * @author Mark Little
+ */
+
+public class ESBMethodUnitTest extends TestCase
+{
+ public class TestObject
+ {
+ @ESBMethod(operation="doSomeWork")
+ public void doSomeWork ()
+ {
+
+ }
+
+ @ESBMethod(operation="doSomeOtherWork", resultName="result")
+ public boolean doSomeOtherWork ()
+ {
+ return true;
+ }
+
+ @ESBMethod(operation="yetMore", resultName="result", parameters={"one", "two"})
+ public String moreWork (String one, String two)
+ {
+ return one+" add "+two;
+ }
+
+ @ESBMethod(operation="yetMore", resultName="result", fromDefault=true)
+ public int yetMoreWork (int value)
+ {
+ return value++;
+ }
+
+ }
+
+ public void testMethods ()
+ {
+ TestObject tester = new TestObject();
+ Method[] methods = tester.getClass().getDeclaredMethods();
+
+ assertNotNull(methods);
+
+ for (Method amethod : methods)
+ {
+ ESBMethod esbAnnotation = amethod.getAnnotation(ESBMethod.class);
+
+ if (esbAnnotation != null)
+ {
+ System.out.println(esbAnnotation.operation() +" : "+esbAnnotation.resultName());
+ }
+ }
+ }
+
+ public void testMethodTypes ()
+ {
+ TestObject tester = new TestObject();
+ Method[] methods = tester.getClass().getDeclaredMethods();
+
+ assertNotNull(methods);
+
+ for (Method amethod : methods)
+ {
+ ESBMethod esbAnnotation = amethod.getAnnotation(ESBMethod.class);
+
+ if (esbAnnotation != null)
+ {
+ System.out.println(esbAnnotation.operation() +" : "+esbAnnotation.resultName());
+ }
+ }
+ }
+
+}
Modified: labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/infrastructure/tests/DispatcherUnitTest.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/infrastructure/tests/DispatcherUnitTest.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/infrastructure/tests/DispatcherUnitTest.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -33,7 +33,7 @@
import org.jboss.soa.esb.infrastructure.NullReceiverDispatcherPlugin;
import org.jboss.soa.esb.infrastructure.NullSenderDispatcherPlugin;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.externalization.MessageFactory;
/**
* Unit tests for the Dispatchers.
Modified: labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/format/tests/ExampleMessagePlugin.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/format/tests/ExampleMessagePlugin.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/format/tests/ExampleMessagePlugin.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -3,7 +3,7 @@
import java.net.URI;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessagePlugin;
+import org.jboss.soa.esb.message.externalization.MessagePlugin;
/*
* JBoss, Home of Professional Open Source
Modified: labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/format/tests/MessageFactoryUnitTest.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/format/tests/MessageFactoryUnitTest.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/format/tests/MessageFactoryUnitTest.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -27,9 +27,9 @@
import junit.framework.TestCase;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.message.format.MessagePlugin;
-import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.message.externalization.MessageFactory;
+import org.jboss.soa.esb.message.externalization.MessagePlugin;
+import org.jboss.soa.esb.message.externalization.ExternalizationType;
/**
* Unit tests for the Class class.
@@ -48,12 +48,12 @@
public void testURIMessage ()
{
- Message msg1 = MessageFactory.getInstance().getMessage(MessageType.DEFAULT_TYPE);
+ Message msg1 = MessageFactory.getInstance().getMessage(ExternalizationType.DEFAULT_TYPE);
Message msg2 = MessageFactory.getInstance().getMessage();
assertEquals(msg1.getType().equals(msg2.getType()), true);
- Message msg3 = MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED);
+ Message msg3 = MessageFactory.getInstance().getMessage(ExternalizationType.JAVA_SERIALIZED);
assertEquals(msg1.getType().equals(msg3.getType()), false);
}
Modified: labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/AttachmentUnitTest.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/AttachmentUnitTest.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/AttachmentUnitTest.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -36,8 +36,8 @@
import org.jboss.internal.soa.esb.message.format.serialized.MessageImpl;
import org.jboss.soa.esb.message.Attachment;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.message.externalization.MessageFactory;
+import org.jboss.soa.esb.message.externalization.ExternalizationType;
import org.w3c.dom.Document;
import com.sun.org.apache.xml.internal.serialize.OutputFormat;
@@ -55,7 +55,7 @@
public void testSerializeAttachment()
{
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JAVA_SERIALIZED);
+ ExternalizationType.JAVA_SERIALIZED);
assertEquals((msg != null), true);
@@ -123,7 +123,7 @@
public void testXMLAttachment()
{
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JBOSS_XML);
+ ExternalizationType.JBOSS_XML);
assertEquals((msg != null), true);
Modified: labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/BodyUnitTest.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/BodyUnitTest.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/BodyUnitTest.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -35,8 +35,8 @@
import org.jboss.internal.soa.esb.message.format.xml.MessageImpl;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.message.externalization.MessageFactory;
+import org.jboss.soa.esb.message.externalization.ExternalizationType;
import org.w3c.dom.Document;
import com.sun.org.apache.xml.internal.serialize.OutputFormat;
@@ -56,7 +56,7 @@
// get XML message
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JBOSS_XML);
+ ExternalizationType.JBOSS_XML);
assertEquals((msg != null), true);
@@ -109,7 +109,7 @@
// get XML message
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JBOSS_XML);
+ ExternalizationType.JBOSS_XML);
assertEquals((msg != null), true);
@@ -159,7 +159,7 @@
// get XML message
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JAVA_SERIALIZED);
+ ExternalizationType.JAVA_SERIALIZED);
assertEquals((msg != null), true);
@@ -195,7 +195,7 @@
// get XML message
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JAVA_SERIALIZED);
+ ExternalizationType.JAVA_SERIALIZED);
assertEquals((msg != null), true);
Modified: labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/FaultUnitTest.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/FaultUnitTest.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/FaultUnitTest.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -36,8 +36,8 @@
import org.jboss.internal.soa.esb.message.format.serialized.MessageImpl;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.message.externalization.MessageFactory;
+import org.jboss.soa.esb.message.externalization.ExternalizationType;
import org.w3c.dom.Document;
import com.sun.org.apache.xml.internal.serialize.OutputFormat;
@@ -55,7 +55,7 @@
public void testSerializeFault ()
{
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JAVA_SERIALIZED);
+ ExternalizationType.JAVA_SERIALIZED);
assertEquals((msg != null), true);
@@ -93,7 +93,7 @@
public void testXMLFault ()
{
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JBOSS_XML);
+ ExternalizationType.JBOSS_XML);
assertEquals((msg != null), true);
Modified: labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/MessageUnitTest.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/MessageUnitTest.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/MessageUnitTest.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -25,8 +25,8 @@
import junit.framework.TestCase;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.message.externalization.MessageFactory;
+import org.jboss.soa.esb.message.externalization.ExternalizationType;
/**
* Unit tests for the Class class.
@@ -51,7 +51,7 @@
public void testXMLMessageFields ()
{
- Message msg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
+ Message msg = MessageFactory.getInstance().getMessage(ExternalizationType.JBOSS_XML);
assertEquals((msg.getBody() != null), true);
assertEquals((msg.getHeader() != null), true);
@@ -63,7 +63,7 @@
public void testSerializedMessageFields ()
{
- Message msg = MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED);
+ Message msg = MessageFactory.getInstance().getMessage(ExternalizationType.JAVA_SERIALIZED);
assertEquals((msg.getBody() != null), true);
assertEquals((msg.getHeader() != null), true);
Modified: labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/PropertiesUnitTest.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/PropertiesUnitTest.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/PropertiesUnitTest.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -34,8 +34,8 @@
import org.jboss.internal.soa.esb.message.format.serialized.MessageImpl;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.message.externalization.MessageFactory;
+import org.jboss.soa.esb.message.externalization.ExternalizationType;
import org.w3c.dom.Document;
/**
@@ -50,7 +50,7 @@
public void testSerializeProperties()
{
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JAVA_SERIALIZED);
+ ExternalizationType.JAVA_SERIALIZED);
assertEquals((msg != null), true);
@@ -106,7 +106,7 @@
public void testXMLProperties()
{
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JBOSS_XML);
+ ExternalizationType.JBOSS_XML);
assertEquals((msg != null), true);
Modified: labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/SerializedMessageUnitTest.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/SerializedMessageUnitTest.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/SerializedMessageUnitTest.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -41,8 +41,8 @@
import org.jboss.soa.esb.addressing.eprs.JMSEpr;
import org.jboss.soa.esb.addressing.eprs.SFTPEpr;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.message.externalization.MessageFactory;
+import org.jboss.soa.esb.message.externalization.ExternalizationType;
/**
* Unit tests for the Class class.
@@ -56,7 +56,7 @@
public void testSerialize()
{
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JAVA_SERIALIZED);
+ ExternalizationType.JAVA_SERIALIZED);
assertEquals((msg != null), true);
@@ -80,7 +80,7 @@
// get XML message
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JAVA_SERIALIZED);
+ ExternalizationType.JAVA_SERIALIZED);
assertEquals((msg != null), true);
@@ -109,7 +109,7 @@
public void testHeader ()
{
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JAVA_SERIALIZED);
+ ExternalizationType.JAVA_SERIALIZED);
assertEquals((msg != null), true);
@@ -139,7 +139,7 @@
public void testInvalidAdd ()
{
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JAVA_SERIALIZED);
+ ExternalizationType.JAVA_SERIALIZED);
assertEquals((msg != null), true);
@@ -161,7 +161,7 @@
public void testAddBytes ()
{
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JAVA_SERIALIZED);
+ ExternalizationType.JAVA_SERIALIZED);
assertEquals((msg != null), true);
@@ -197,14 +197,14 @@
public void testReplace ()
{
Message msg1 = MessageFactory.getInstance().getMessage(
- MessageType.JAVA_SERIALIZED);
+ ExternalizationType.JAVA_SERIALIZED);
assertEquals((msg1 != null), true);
String foo = "foo";
Message msg2 = MessageFactory.getInstance().getMessage(
- MessageType.JAVA_SERIALIZED);
+ ExternalizationType.JAVA_SERIALIZED);
assertEquals((msg2 != null), true);
@@ -223,14 +223,14 @@
public void testMerge ()
{
Message msg1 = MessageFactory.getInstance().getMessage(
- MessageType.JAVA_SERIALIZED);
+ ExternalizationType.JAVA_SERIALIZED);
assertEquals((msg1 != null), true);
String foo = "foo";
Message msg2 = MessageFactory.getInstance().getMessage(
- MessageType.JAVA_SERIALIZED);
+ ExternalizationType.JAVA_SERIALIZED);
assertEquals((msg2 != null), true);
@@ -249,7 +249,7 @@
public void testAddObjects ()
{
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JAVA_SERIALIZED);
+ ExternalizationType.JAVA_SERIALIZED);
assertEquals((msg != null), true);
@@ -285,7 +285,7 @@
public void testGetNames ()
{
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JAVA_SERIALIZED);
+ ExternalizationType.JAVA_SERIALIZED);
assertEquals((msg != null), true);
@@ -343,7 +343,7 @@
public void testAddInvalidObject ()
{
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JAVA_SERIALIZED);
+ ExternalizationType.JAVA_SERIALIZED);
assertEquals((msg != null), true);
@@ -365,7 +365,7 @@
public void testRemoveObjects ()
{
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JAVA_SERIALIZED);
+ ExternalizationType.JAVA_SERIALIZED);
assertEquals((msg != null), true);
@@ -402,7 +402,7 @@
public void testJmsEPRType ()
{
- Message msg = MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED);
+ Message msg = MessageFactory.getInstance().getMessage(ExternalizationType.JAVA_SERIALIZED);
JMSEpr epr = new JMSEpr(JMSEpr.TOPIC_TYPE, "foo", "bar");
msg.getHeader().getCall().setTo(epr);
@@ -438,7 +438,7 @@
public void testHttpEPRType ()
{
- Message msg = MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED);
+ Message msg = MessageFactory.getInstance().getMessage(ExternalizationType.JAVA_SERIALIZED);
try
{
@@ -475,7 +475,7 @@
public void testEmailEPRType ()
{
- Message msg = MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED);
+ Message msg = MessageFactory.getInstance().getMessage(ExternalizationType.JAVA_SERIALIZED);
try
{
@@ -512,7 +512,7 @@
public void testFtpEPRType ()
{
- Message msg = MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED);
+ Message msg = MessageFactory.getInstance().getMessage(ExternalizationType.JAVA_SERIALIZED);
try
{
@@ -551,7 +551,7 @@
public void testJdbcEPRType ()
{
- Message msg = MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED);
+ Message msg = MessageFactory.getInstance().getMessage(ExternalizationType.JAVA_SERIALIZED);
try
{
@@ -588,7 +588,7 @@
public void testFileEPRType ()
{
- Message msg = MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED);
+ Message msg = MessageFactory.getInstance().getMessage(ExternalizationType.JAVA_SERIALIZED);
try
{
@@ -627,7 +627,7 @@
public void testSFtpEPRType ()
{
- Message msg = MessageFactory.getInstance().getMessage(MessageType.JAVA_SERIALIZED);
+ Message msg = MessageFactory.getInstance().getMessage(ExternalizationType.JAVA_SERIALIZED);
try
{
Modified: labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/XMLMessageUnitTest.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/XMLMessageUnitTest.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/message/tests/XMLMessageUnitTest.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -42,8 +42,8 @@
import org.jboss.soa.esb.addressing.eprs.JMSEpr;
import org.jboss.soa.esb.addressing.eprs.SFTPEpr;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
-import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.message.externalization.MessageFactory;
+import org.jboss.soa.esb.message.externalization.ExternalizationType;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
@@ -64,7 +64,7 @@
// get XML message
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JBOSS_XML);
+ ExternalizationType.JBOSS_XML);
assertNotNull("created message", msg);
@@ -85,7 +85,7 @@
// get XML message
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JBOSS_XML);
+ ExternalizationType.JBOSS_XML);
assertNotNull("created message", msg);
@@ -104,7 +104,7 @@
public void testHeader ()
{
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JBOSS_XML);
+ ExternalizationType.JBOSS_XML);
assertNotNull("created message", msg);
@@ -134,7 +134,7 @@
public void testInvalidAdd ()
{
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JBOSS_XML);
+ ExternalizationType.JBOSS_XML);
assertNotNull("created message", msg);
@@ -156,7 +156,7 @@
public void testAddBytes ()
{
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JBOSS_XML);
+ ExternalizationType.JBOSS_XML);
assertNotNull("created message", msg);
@@ -184,14 +184,14 @@
public void testReplace ()
{
Message msg1 = MessageFactory.getInstance().getMessage(
- MessageType.JBOSS_XML);
+ ExternalizationType.JBOSS_XML);
assertNotNull("created message", msg1);
String foo = "foo";
Message msg2 = MessageFactory.getInstance().getMessage(
- MessageType.JBOSS_XML);
+ ExternalizationType.JBOSS_XML);
assertNotNull("second created message", msg2);
@@ -210,14 +210,14 @@
public void testMerge ()
{
Message msg1 = MessageFactory.getInstance().getMessage(
- MessageType.JBOSS_XML);
+ ExternalizationType.JBOSS_XML);
assertNotNull("created message", msg1);
String foo = "foo";
Message msg2 = MessageFactory.getInstance().getMessage(
- MessageType.JBOSS_XML);
+ ExternalizationType.JBOSS_XML);
assertNotNull("second created message", msg2);
@@ -236,7 +236,7 @@
public void testAddObjects ()
{
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JBOSS_XML);
+ ExternalizationType.JBOSS_XML);
assertNotNull("created message", msg);
@@ -268,7 +268,7 @@
public void testGetNames ()
{
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JBOSS_XML);
+ ExternalizationType.JBOSS_XML);
assertNotNull("created message", msg);
@@ -325,7 +325,7 @@
public void testRemoveObjects ()
{
Message msg = MessageFactory.getInstance().getMessage(
- MessageType.JBOSS_XML);
+ ExternalizationType.JBOSS_XML);
assertNotNull("created message", msg);
@@ -354,7 +354,7 @@
public void testJmsEPRType ()
{
- Message msg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
+ Message msg = MessageFactory.getInstance().getMessage(ExternalizationType.JBOSS_XML);
JMSEpr epr = new JMSEpr(JMSEpr.TOPIC_TYPE, "foo", "bar");
msg.getHeader().getCall().setTo(epr);
@@ -380,7 +380,7 @@
public void testHttpEPRType ()
{
- Message msg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
+ Message msg = MessageFactory.getInstance().getMessage(ExternalizationType.JBOSS_XML);
try
{
@@ -407,7 +407,7 @@
public void testEmailEPRType ()
{
- Message msg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
+ Message msg = MessageFactory.getInstance().getMessage(ExternalizationType.JBOSS_XML);
try
{
@@ -434,7 +434,7 @@
public void testFtpEPRType ()
{
- Message msg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
+ Message msg = MessageFactory.getInstance().getMessage(ExternalizationType.JBOSS_XML);
try
{
@@ -463,7 +463,7 @@
public void testJdbcEPRType ()
{
- Message msg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
+ Message msg = MessageFactory.getInstance().getMessage(ExternalizationType.JBOSS_XML);
try
{
@@ -490,7 +490,7 @@
public void testFileEPRType ()
{
- Message msg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
+ Message msg = MessageFactory.getInstance().getMessage(ExternalizationType.JBOSS_XML);
try
{
@@ -519,7 +519,7 @@
public void testSFtpEPRType ()
{
- Message msg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
+ Message msg = MessageFactory.getInstance().getMessage(ExternalizationType.JBOSS_XML);
try
{
Modified: labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/remoting/oneway/TcpClient.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/remoting/oneway/TcpClient.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/remoting/oneway/TcpClient.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -11,7 +11,7 @@
import org.jboss.soa.esb.api.SenderFactory;
import org.jboss.soa.esb.message.Body;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.externalization.MessageFactory;
import org.jboss.soa.esb.spi.Receiver;
import org.jboss.soa.esb.spi.ReceiverFactory;
import org.jboss.soa.esb.spi.Service;
Modified: labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/remoting/oneway/TcpService.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/remoting/oneway/TcpService.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/remoting/oneway/TcpService.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -11,7 +11,7 @@
import org.jboss.soa.esb.api.SenderFactory;
import org.jboss.soa.esb.message.Body;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.externalization.MessageFactory;
import org.jboss.soa.esb.spi.Receiver;
import org.jboss.soa.esb.spi.ReceiverFactory;
import org.jboss.soa.esb.spi.Service;
Modified: labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/remoting/twoway/TcpClient.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/remoting/twoway/TcpClient.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/remoting/twoway/TcpClient.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -11,7 +11,7 @@
import org.jboss.soa.esb.api.TwoWaySender;
import org.jboss.soa.esb.message.Body;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.externalization.MessageFactory;
import org.w3c.dom.Document;
import com.sun.org.apache.xml.internal.serialize.OutputFormat;
Modified: labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/remoting/twoway/TcpService.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/remoting/twoway/TcpService.java 2007-08-20 07:49:40 UTC (rev 14386)
+++ labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/remoting/twoway/TcpService.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -8,7 +8,7 @@
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.message.Body;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.externalization.MessageFactory;
import org.jboss.soa.esb.spi.Receiver;
import org.jboss.soa.esb.spi.ReceiverFactory;
import org.jboss.soa.esb.spi.Service;
Added: labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/tests/application/BusinessObject.java
===================================================================
--- labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/tests/application/BusinessObject.java (rev 0)
+++ labs/jbossesb/workspace/rearch2/core/src/test/java/org/jboss/soa/esb/tests/application/BusinessObject.java 2007-08-20 12:45:28 UTC (rev 14387)
@@ -0,0 +1,52 @@
+package org.jboss.soa.esb.tests.application;
+
+import org.jboss.soa.esb.annotations.ESBMethod;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+public class BusinessObject
+{
+ @ESBMethod(operation="doSomeWork")
+ public void doSomeWork ()
+ {
+
+ }
+
+ @ESBMethod(operation="doSomeOtherWork", resultName="result")
+ public boolean doSomeOtherWork ()
+ {
+ return true;
+ }
+
+ @ESBMethod(operation="yetMore", resultName="result", parameters={"one", "two"})
+ public String moreWork (String one, String two)
+ {
+ return one+" add "+two;
+ }
+
+ @ESBMethod(operation="yetMore", resultName="result", fromDefault=true)
+ public int yetMoreWork (int value)
+ {
+ return value++;
+ }
+
+}
\ No newline at end of file
More information about the jboss-svn-commits
mailing list