[jboss-svn-commits] JBL Code SVN: r8843 - in labs/jbossesb/trunk/product/core/rosetta/src/org/jboss: soa/esb/addressing and 1 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Jan 12 16:40:10 EST 2007


Author: mark.little at jboss.com
Date: 2007-01-12 16:40:03 -0500 (Fri, 12 Jan 2007)
New Revision: 8843

Modified:
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/EPRHelper.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/PortReference.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/XMLUtil.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/EmailEpr.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FTPEpr.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FileEpr.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JDBCEpr.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java
Log:
Removed arjuna namespace reference.

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/EPRHelper.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/EPRHelper.java	2007-01-12 19:23:18 UTC (rev 8842)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/EPRHelper.java	2007-01-12 21:40:03 UTC (rev 8843)
@@ -393,7 +393,7 @@
 			
 			for (int i = 0; i < children.getLength(); i++)
 			{
-				if (children.item(i).getNodeName().equals(XMLUtil.WSARJADDR_PREFIX+":"+EPR_TYPE))
+				if (children.item(i).getNodeName().equals(XMLUtil.JBOSSESB_PREFIX+":"+EPR_TYPE))
 					eprType = children.item(i).getTextContent();
 			}
 

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/PortReference.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/PortReference.java	2007-01-12 19:23:18 UTC (rev 8842)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/PortReference.java	2007-01-12 21:40:03 UTC (rev 8843)
@@ -72,15 +72,15 @@
 
 	public void addExtension(String value)
 	{
-		addExtension(XMLUtil.INSTANCE_IDENTIFIER_TAG, XMLUtil.WSARJADDR_PREFIX,
-				XMLUtil.WSARJADDR_NAMESPACE_URI, value,
+		addExtension(XMLUtil.INSTANCE_IDENTIFIER_TAG, XMLUtil.JBOSSESB_PREFIX,
+				XMLUtil.JBOSSESB_NAMESPACE_URI, value,
 				Extension.REFERENCE_PROPERTIES);
 	}
 
 	public void addExtension(String tag, String value)
 	{
-		addExtension(tag, XMLUtil.WSARJADDR_PREFIX,
-				XMLUtil.WSARJADDR_NAMESPACE_URI, value,
+		addExtension(tag, XMLUtil.JBOSSESB_PREFIX,
+				XMLUtil.JBOSSESB_NAMESPACE_URI, value,
 				Extension.REFERENCE_PROPERTIES);
 	}
 
@@ -237,10 +237,10 @@
 			 */
 			
 			if (_uri == null)
-				_uri = XMLUtil.WSARJADDR_NAMESPACE_URI;
+				_uri = XMLUtil.JBOSSESB_NAMESPACE_URI;
 			
 			if (_prefix == null)
-				_prefix = XMLUtil.WSARJADDR_PREFIX;
+				_prefix = XMLUtil.JBOSSESB_PREFIX;
 			
 			if (_tag.contains(":"))
 			{

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/XMLUtil.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/XMLUtil.java	2007-01-12 19:23:18 UTC (rev 8842)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/XMLUtil.java	2007-01-12 21:40:03 UTC (rev 8843)
@@ -47,10 +47,10 @@
     public static final String RELATES_TO_TAG           = "RelatesTo";
     public static final String FAULT_TO_TAG             = "FaultTo";
     
-    // WS-ARJADDR
+    // JBossESB
 
-    public static final String WSARJADDR_PREFIX        = "wsarjaddr";
-    public static final String WSARJADDR_NAMESPACE_URI = "http://schemas.arjuna.com/ws/2004/06/wsarjaddr";
+    public static final String JBOSSESB_PREFIX        = "jbossesb";
+    public static final String JBOSSESB_NAMESPACE_URI = "http://schemas.jboss.com/ws/2007/01/jbossesb";
 
     public static final String INSTANCE_IDENTIFIER_TAG = "InstanceIdentifier";
 

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/EmailEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/EmailEpr.java	2007-01-12 19:23:18 UTC (rev 8842)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/EmailEpr.java	2007-01-12 21:40:03 UTC (rev 8843)
@@ -75,12 +75,12 @@
 			
 			try
 			{
-				if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+USERNAME_TAG))
+				if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+USERNAME_TAG))
 				{
 					getAddr().addExtension(USERNAME_TAG, nl.item(i).getTextContent());
 				}
 				else
-					if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+PASSWORD_TAG))
+					if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+PASSWORD_TAG))
 					{
 						getAddr().addExtension(PASSWORD_TAG, nl.item(i).getTextContent());
 					}

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FTPEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FTPEpr.java	2007-01-12 19:23:18 UTC (rev 8842)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FTPEpr.java	2007-01-12 21:40:03 UTC (rev 8843)
@@ -72,17 +72,17 @@
 
 			try
 			{
-				if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+USERNAME_TAG))
+				if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+USERNAME_TAG))
 				{
 					getAddr().addExtension(USERNAME_TAG, nl.item(i).getTextContent());
 				}
 				else
-					if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+PASSWORD_TAG))
+					if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+PASSWORD_TAG))
 					{
 						getAddr().addExtension(PASSWORD_TAG, nl.item(i).getTextContent());
 					}
 					else
-						if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+PASSIVE_TAG))
+						if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+PASSIVE_TAG))
 					{
 						getAddr().addExtension(PASSIVE_TAG, nl.item(i).getTextContent());
 					}

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FileEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FileEpr.java	2007-01-12 19:23:18 UTC (rev 8842)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/FileEpr.java	2007-01-12 21:40:03 UTC (rev 8843)
@@ -74,37 +74,37 @@
 
 			try
 			{
-				if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+INPUT_SUFFIX_TAG))
+				if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+INPUT_SUFFIX_TAG))
 				{
 					getAddr().addExtension(INPUT_SUFFIX_TAG, nl.item(i).getTextContent());
 				}
 				else
-					if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+POST_DIR_TAG))
+					if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+POST_DIR_TAG))
 					{
 						getAddr().addExtension(POST_DIR_TAG, nl.item(i).getTextContent());
 					}
 					else
-						if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+POST_SUFFIX_TAG))
+						if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+POST_SUFFIX_TAG))
 						{
 							getAddr().addExtension(POST_SUFFIX_TAG, nl.item(i).getTextContent());
 						}
 						else
-							if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+POST_DEL_TAG))
+							if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+POST_DEL_TAG))
 							{
 								getAddr().addExtension(POST_DEL_TAG, nl.item(i).getTextContent());
 							}
 							else
-				if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+ERROR_DIR_TAG))
+				if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+ERROR_DIR_TAG))
 				{
 					getAddr().addExtension(ERROR_DIR_TAG, nl.item(i).getTextContent());
 				}
 				else
-					if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+ERROR_SUFFIX_TAG))
+					if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+ERROR_SUFFIX_TAG))
 					{
 						getAddr().addExtension(ERROR_SUFFIX_TAG, nl.item(i).getTextContent());
 					}
 					else
-						if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+ERROR_DEL_TAG))
+						if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+ERROR_DEL_TAG))
 						{
 							getAddr().addExtension(ERROR_DEL_TAG, nl.item(i).getTextContent());
 						}

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JDBCEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JDBCEpr.java	2007-01-12 19:23:18 UTC (rev 8842)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JDBCEpr.java	2007-01-12 21:40:03 UTC (rev 8843)
@@ -78,62 +78,62 @@
 			
 			try
 			{
-				if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+USERNAME_TAG))
+				if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+USERNAME_TAG))
 				{
 					getAddr().addExtension(USERNAME_TAG, nl.item(i).getTextContent());
 				}
 				else
-					if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+PASSWORD_TAG))
+					if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+PASSWORD_TAG))
 					{
 						getAddr().addExtension(PASSWORD_TAG, nl.item(i).getTextContent());
 					}
 					else
-						if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+SQL_TAG))
+						if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+SQL_TAG))
 						{
 							getAddr().addExtension(SQL_TAG, nl.item(i).getTextContent());
 						}
 						else
-							if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+DRIVER_TAG))
+							if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+DRIVER_TAG))
 							{
 								getAddr().addExtension(DRIVER_TAG, nl.item(i).getTextContent());
 							}
 							else
-								if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+URL_TAG))
+								if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+URL_TAG))
 								{
 									getAddr().addExtension(URL_TAG, nl.item(i).getTextContent());
 								}
 								else
-									if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+TABLE_NAME_TAG))
+									if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+TABLE_NAME_TAG))
 									{
 										getAddr().addExtension(TABLE_NAME_TAG, nl.item(i).getTextContent());
 									}
 									else
-										if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+MESSAGE_ID_COLUMN_TAG))
+										if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+MESSAGE_ID_COLUMN_TAG))
 										{
 											getAddr().addExtension(MESSAGE_ID_COLUMN_TAG, nl.item(i).getTextContent());
 										}
 										else
-											if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+STATUS_COLUMN_TAG))
+											if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+STATUS_COLUMN_TAG))
 											{
 												getAddr().addExtension(STATUS_COLUMN_TAG, nl.item(i).getTextContent());
 											}
 											else
-												if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+DATA_COLUMN_TAG))
+												if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+DATA_COLUMN_TAG))
 												{
 													getAddr().addExtension(DATA_COLUMN_TAG, nl.item(i).getTextContent());
 												}
 												else
-													if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+TIMESTAMP_COLUMN_TAG))
+													if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+TIMESTAMP_COLUMN_TAG))
 													{
 														getAddr().addExtension(TIMESTAMP_COLUMN_TAG, nl.item(i).getTextContent());
 													}
 													else
-														if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+POST_DEL_TAG))
+														if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+POST_DEL_TAG))
 														{
 															getAddr().addExtension(POST_DEL_TAG, nl.item(i).getTextContent());
 														}
 														else
-															if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+ERROR_DEL_TAG))
+															if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+ERROR_DEL_TAG))
 															{
 																getAddr().addExtension(ERROR_DEL_TAG, nl.item(i).getTextContent());
 															}

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java	2007-01-12 19:23:18 UTC (rev 8842)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java	2007-01-12 21:40:03 UTC (rev 8843)
@@ -90,37 +90,37 @@
 			
 			try
 			{
-				if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+SPECIFICATION_VERSION_TAG))
+				if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+SPECIFICATION_VERSION_TAG))
 				{
 					getAddr().addExtension(SPECIFICATION_VERSION_TAG, nl.item(i).getTextContent());
 				}
 				else
-				if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+DESTINATION_NAME_TAG))
+				if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+DESTINATION_NAME_TAG))
 				{
 					getAddr().addExtension(DESTINATION_NAME_TAG, nl.item(i).getTextContent());
 				}
 				else
-				if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+CONNECTION_FACTORY_TAG))
+				if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+CONNECTION_FACTORY_TAG))
 				{
 					getAddr().addExtension(CONNECTION_FACTORY_TAG, nl.item(i).getTextContent());
 				}
 				else
-				if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+JNDI_CONTEXT_FACTORY_TAG))
+				if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+JNDI_CONTEXT_FACTORY_TAG))
 				{
 					getAddr().addExtension(JNDI_CONTEXT_FACTORY_TAG, nl.item(i).getTextContent());
 				}
 				else
-				if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+JNDI_PKG_PREFIX_TAG))
+				if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+JNDI_PKG_PREFIX_TAG))
 				{
 					getAddr().addExtension(JNDI_PKG_PREFIX_TAG, nl.item(i).getTextContent());
 				}
 				else
-				if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+JNDI_URL_TAG))
+				if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+JNDI_URL_TAG))
 				{
 					getAddr().addExtension(JNDI_URL_TAG, nl.item(i).getTextContent());
 				}
 				else
-				if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+MESSAGE_SELECTOR_TAG))
+				if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+MESSAGE_SELECTOR_TAG))
 				{
 					getAddr().addExtension(MESSAGE_SELECTOR_TAG, nl.item(i).getTextContent());
 				}

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java	2007-01-12 19:23:18 UTC (rev 8842)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java	2007-01-12 21:40:03 UTC (rev 8843)
@@ -68,7 +68,7 @@
 			
 			try
 			{		
-				if (nodeName.equals(XMLUtil.WSARJADDR_PREFIX+":"+CERTIFICATE_TAG))
+				if (nodeName.equals(XMLUtil.JBOSSESB_PREFIX+":"+CERTIFICATE_TAG))
 				{
 					getAddr().addExtension(CERTIFICATE_TAG, nl.item(i).getTextContent());
 				}




More information about the jboss-svn-commits mailing list