[jboss-svn-commits] JBL Code SVN: r6335 - labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Sep 21 06:42:38 EDT 2006


Author: mark.little at jboss.com
Date: 2006-09-21 06:42:32 -0400 (Thu, 21 Sep 2006)
New Revision: 6335

Added:
   labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/XMLUtil.java
Modified:
   labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/AttachmentImpl.java
   labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java
   labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/ContextImpl.java
   labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/FaultImpl.java
   labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/HeaderImpl.java
   labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/MessageImpl.java
   labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/PropertiesImpl.java
Log:
added XMLUtil for tags and namespaces.

Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/AttachmentImpl.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/AttachmentImpl.java	2006-09-20 21:03:00 UTC (rev 6334)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/AttachmentImpl.java	2006-09-21 10:42:32 UTC (rev 6335)
@@ -37,7 +37,7 @@
 {
 	public Element toXML (Document doc, Element envelope)
 	{
-		Element attachmentElement = doc.createElement("attachment");
+		Element attachmentElement = doc.createElement(XMLUtil.ATTACHMENT_TAG);
 		
 		envelope.appendChild(attachmentElement);
 		

Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java	2006-09-20 21:03:00 UTC (rev 6334)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java	2006-09-21 10:42:32 UTC (rev 6335)
@@ -42,6 +42,8 @@
 
 public class BodyImpl implements Body
 {
+	private static final String BYTES_TAG = "Bytes";
+	
 	public BodyImpl ()
 	{
 		_content = null;
@@ -82,13 +84,13 @@
 	
 	public Element toXML (Document doc, Element envelope)
 	{
-		Element bodyElement = doc.createElement("body");
+		Element bodyElement = doc.createElement(XMLUtil.BODY_TAG);
 		
 		envelope.appendChild(bodyElement);
 		
 		if (_content != null)
 		{
-			Element byteElement = doc.createElement("bytes");
+			Element byteElement = doc.createElement(BYTES_TAG);
 			
 			byteElement.appendChild(doc.createCDATASection(Base64.encodeBytes(_content)));
 			
@@ -125,7 +127,7 @@
 		
 		for (int i = 0; i < nl.getLength(); i++)
 		{
-			if (nl.item(i).getNodeName().equals("body"))
+			if (nl.item(i).getNodeName().equals(XMLUtil.BODY_TAG))
 			{
 				NodeList children = nl.item(i).getChildNodes();
 				
@@ -136,7 +138,7 @@
 					// treat bytes specially.
 					CDATASection cdata = (CDATASection) child.getFirstChild();
 				
-					if (child.getNodeName().equals("bytes"))
+					if (child.getNodeName().equals(BYTES_TAG))
 					{
 						_content = Base64.decode(cdata.getWholeText());
 					}

Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/ContextImpl.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/ContextImpl.java	2006-09-20 21:03:00 UTC (rev 6334)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/ContextImpl.java	2006-09-21 10:42:32 UTC (rev 6335)
@@ -30,7 +30,7 @@
 {
 	public Element toXML (Document doc, Element envelope)
 	{
-		Element contextElement = doc.createElement("context");
+		Element contextElement = doc.createElement(XMLUtil.CONTEXT_TAG);
 		
 		envelope.appendChild(contextElement);
 		

Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/FaultImpl.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/FaultImpl.java	2006-09-20 21:03:00 UTC (rev 6334)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/FaultImpl.java	2006-09-21 10:42:32 UTC (rev 6335)
@@ -30,7 +30,7 @@
 {
 	public Element toXML (Document doc, Element envelope)
 	{
-		Element faultElement = doc.createElement("fault");
+		Element faultElement = doc.createElement(XMLUtil.FAULT_TAG);
 		
 		envelope.appendChild(faultElement);
 		

Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/HeaderImpl.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/HeaderImpl.java	2006-09-20 21:03:00 UTC (rev 6334)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/HeaderImpl.java	2006-09-21 10:42:32 UTC (rev 6335)
@@ -62,7 +62,7 @@
 	{
 		// TODO remove MAGIC strings!!
 		
-		Element headerElement = doc.createElement("header");
+		Element headerElement = doc.createElement(XMLUtil.HEADER_TAG);
 		
 		envelope.appendChild(headerElement);
 		
@@ -80,7 +80,7 @@
 		{
 			Node n = nl.item(i);
 			
-			if (n.getNodeName().equals("header"))
+			if (n.getNodeName().equals(XMLUtil.HEADER_TAG))
 			{
 				headerElement = (Element) n;
 				break;

Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/MessageImpl.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/MessageImpl.java	2006-09-20 21:03:00 UTC (rev 6334)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/MessageImpl.java	2006-09-21 10:42:32 UTC (rev 6335)
@@ -131,7 +131,7 @@
 		{		
 			// TODO remove magic strings!
 			
-			Element envelope = doc.createElement("envelope");
+			Element envelope = doc.createElement(XMLUtil.ENVELOPE_TAG);
 
 			doc.appendChild(envelope);
 			
@@ -165,7 +165,7 @@
 			{
 				Node n = nl.item(i);
 				
-				if (n.getNodeName().equals("envelope"))
+				if (n.getNodeName().equals(XMLUtil.ENVELOPE_TAG))
 				{
 					envelope = (Element) n;
 					break;

Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/PropertiesImpl.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/PropertiesImpl.java	2006-09-20 21:03:00 UTC (rev 6334)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/PropertiesImpl.java	2006-09-21 10:42:32 UTC (rev 6335)
@@ -65,7 +65,7 @@
 			return null;
 
 		Document doc = elem.getOwnerDocument();
-		Element thisElement = doc.createElement(THIS_TAG_NAME);
+		Element thisElement = doc.createElement(XMLUtil.PROPERTIES_TAG);
 
 		boolean bAdd = false;
 		for (Map.Entry<String,Serializable> oCurr: _table.entrySet())
@@ -84,14 +84,14 @@
 	}
 /**
  * fromXml(elem) - Populate properties found in appropriate child element
- * @see THIS_TAG_NAME
+ * @see XMLUtil.PROPERTIES_TAG
  * @param elem - Element where to look for child nodes
  */
 	public void fromXML(Element elem) 
 	{
 		_table.clear();
 
-		NodeList NL = elem.getElementsByTagName(THIS_TAG_NAME);
+		NodeList NL = elem.getElementsByTagName(XMLUtil.PROPERTIES_TAG);
 		for (int i1=0; i1<NL.getLength(); i1++)
 		{	
 			Node oCurr = NL.item(i1);
@@ -112,11 +112,6 @@
 	}
 	
 	public String toString() { return _table.toString(); }
-	
-	/**
-	 * THIS_TAG_NAME - contains tag name for XML
-	 */
-	public static final String THIS_TAG_NAME = "__properties";
 
 	Hashtable<String,Serializable> _table = new Hashtable<String,Serializable>();
 

Added: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/XMLUtil.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/XMLUtil.java	2006-09-20 21:03:00 UTC (rev 6334)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/XMLUtil.java	2006-09-21 10:42:32 UTC (rev 6335)
@@ -0,0 +1,42 @@
+/*
+ * 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
+ */
+
+/*
+ * Copyright (c) 2002, 2003, Arjuna Technologies Limited.
+ *
+ * XMLUtil.java
+ */
+
+package org.jboss.internal.soa.esb.message.format.xml;
+
+public class XMLUtil
+{
+    public static final String ESB_PREFIX = "jbesb";
+    public static final String ESB_NAMESPACE_URI = "http://www.jboss.org/ws/2006/09/esb";
+
+    public static final String ATTACHMENT_TAG   = "Attachment";
+    public static final String BODY_TAG   = "Body";
+    public static final String CONTEXT_TAG = "Context";
+    public static final String FAULT_TAG = "Fault";
+    public static final String HEADER_TAG = "Header";
+    public static final String ENVELOPE_TAG = "Envelope";
+    public static final String PROPERTIES_TAG = "Properties";
+}




More information about the jboss-svn-commits mailing list