[jboss-svn-commits] JBL Code SVN: r17269 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/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
Sun Dec 16 09:36:44 EST 2007
Author: mark.little at jboss.com
Date: 2007-12-16 09:36:44 -0500 (Sun, 16 Dec 2007)
New Revision: 17269
Modified:
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultHibernateReplyToEpr.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultJdbcReplyToEpr.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/Call.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/EPR.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/PortReference.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/EmailEpr.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/FTPEpr.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/FileEpr.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/HTTPEpr.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/HibernateEpr.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JDBCEpr.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/LogicalEPR.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java
Log:
http://jira.jboss.com/jira/browse/JBESB-1410
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultHibernateReplyToEpr.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultHibernateReplyToEpr.java 2007-12-16 13:42:34 UTC (rev 17268)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultHibernateReplyToEpr.java 2007-12-16 14:36:44 UTC (rev 17269)
@@ -31,7 +31,11 @@
public DefaultHibernateReplyToEpr(HibernateEpr epr) throws URISyntaxException
{
super(epr);
- setClassName(replyToClassName(epr));
+
+ if (getClassName() == null)
+ setClassName(replyToClassName(epr));
+ else
+ changeClassName(replyToClassName(epr));
}
public static String replyToClassName(HibernateEpr epr) throws URISyntaxException
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultJdbcReplyToEpr.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultJdbcReplyToEpr.java 2007-12-16 13:42:34 UTC (rev 17268)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/addressing/eprs/DefaultJdbcReplyToEpr.java 2007-12-16 14:36:44 UTC (rev 17269)
@@ -30,7 +30,11 @@
public DefaultJdbcReplyToEpr(JDBCEpr epr) throws URISyntaxException
{
super(epr);
- setTableName(replyToTableName(epr));
+
+ if (super.getTableName() == null)
+ setTableName(replyToTableName(epr));
+ else
+ changeTableName(replyToTableName(epr));
}
public static String replyToTableName(JDBCEpr epr) throws URISyntaxException
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/Call.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/Call.java 2007-12-16 13:42:34 UTC (rev 17268)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/Call.java 2007-12-16 14:36:44 UTC (rev 17269)
@@ -59,6 +59,23 @@
}
/**
+ * Copy constructor.
+ *
+ * @param copy
+ */
+
+ public Call (Call copy) throws URISyntaxException
+ {
+ _to = ((copy._to == null) ? null : copy._to.copy());
+ _from = ((copy._from == null) ? null : copy._from.copy());
+ _replyTo = ((copy._replyTo == null) ? null : copy._replyTo.copy());
+ _relatesTo = ((copy._relatesTo == null) ? null : new URI(copy._relatesTo.toString()));
+ _faultTo = ((copy._faultTo == null) ? null : copy._faultTo.copy());
+ _action = ((copy._action == null) ? null : new URI(copy._action.toString()));
+ _messageID = ((copy._messageID == null) ? null : new URI(copy._messageID.toString()));
+ }
+
+ /**
* Create a new call, whose To field is set to the supplied EPR.
*
* @param epr the To field.
@@ -224,9 +241,11 @@
}
/**
- * Copy the instance specified.
+ * Copy the instance specified. This does a shallow (ptr) copy, so is not
+ * recommended.
*
* @param from the instance to copy.
+ * @deprecated use the copy constructor.
*/
public void copy (Call from)
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/EPR.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/EPR.java 2007-12-16 13:42:34 UTC (rev 17268)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/EPR.java 2007-12-16 14:36:44 UTC (rev 17269)
@@ -73,6 +73,21 @@
}
/**
+ * Copy constructor.
+ *
+ * @param from
+ */
+
+ public EPR (EPR from)
+ {
+ /*
+ * Copy the underlying EPR values.
+ */
+
+ _addr = (PortReference) from._addr.copy();
+ }
+
+ /**
* Override the address of this EPR.
*
* @param uri the new address.
@@ -95,22 +110,12 @@
}
/**
- * Copy the contents of the specified EPR into this instance.
- * Can be used by copy constructors.
- *
- * @param from the instance to copy.
- * @deprecated use the copy constructor instead.
+ * Return a copy of this EPR.
*/
- public void copy (EPR from)
+ public EPR copy ()
{
- EPR fromImpl = (EPR) from;
-
- /*
- * Copy the underlying EPR values.
- */
-
- _addr = (PortReference) fromImpl._addr.copy();
+ return new EPR(this);
}
// public void setMetaData (MetaData md);
@@ -134,21 +139,6 @@
return false;
}
- /**
- * Copy constructor.
- *
- * @param from
- */
-
- protected EPR (EPR from)
- {
- /*
- * Copy the underlying EPR values.
- */
-
- _addr = (PortReference) from._addr.copy();
- }
-
private PortReference _addr;
}
\ No newline at end of file
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/PortReference.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/PortReference.java 2007-12-16 13:42:34 UTC (rev 17268)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/PortReference.java 2007-12-16 14:36:44 UTC (rev 17269)
@@ -76,7 +76,16 @@
XMLUtil.JBOSSESB_NAMESPACE_URI, value,
Extension.REFERENCE_PROPERTIES);
}
-
+
+ public void removeExtension (String tag, String value)
+ {
+ /*
+ * Need tag and value to make sure it's unique.
+ */
+
+ _extensions.remove(new Extension(tag, XMLUtil.JBOSSESB_PREFIX, XMLUtil.JBOSSESB_NAMESPACE_URI, value));
+ }
+
public void addExtension(String tag, String value)
{
addExtension(tag, XMLUtil.JBOSSESB_PREFIX,
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/EmailEpr.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/EmailEpr.java 2007-12-16 13:42:34 UTC (rev 17268)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/EmailEpr.java 2007-12-16 14:36:44 UTC (rev 17269)
@@ -206,6 +206,11 @@
{
return "EmailEpr [ "+super.getAddr().extendedToString()+" ]";
}
+
+ public EPR copy ()
+ {
+ return new EmailEpr(this);
+ }
public static final URI type ()
{
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/FTPEpr.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/FTPEpr.java 2007-12-16 13:42:34 UTC (rev 17268)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/FTPEpr.java 2007-12-16 14:36:44 UTC (rev 17269)
@@ -54,6 +54,15 @@
public FTPEpr (EPR epr)
{
super(epr);
+
+ if (epr instanceof FTPEpr)
+ {
+ FTPEpr instance = (FTPEpr) epr;
+
+ passwordSet = instance.passwordSet;
+ userSet = instance.userSet;
+ passiveSet = instance.passiveSet;
+ }
}
public FTPEpr (EPR epr, Element header)
@@ -74,15 +83,25 @@
if (tag != null)
{
if (tag.equals(USERNAME_TAG))
- getAddr().addExtension(USERNAME_TAG, nl.item(i).getTextContent());
+ setUserName(nl.item(i).getTextContent());
else
{
if (tag.equals(PASSWORD_TAG))
- getAddr().addExtension(PASSWORD_TAG, nl.item(i).getTextContent());
+ setPassword(nl.item(i).getTextContent());
else
{
if (tag.equals(PASSIVE_TAG))
- getAddr().addExtension(PASSIVE_TAG, nl.item(i).getTextContent());
+ {
+ String content = nl.item(i).getTextContent();
+
+ if ("true".equalsIgnoreCase(content))
+ setPassive(true);
+ else
+ {
+ if ("false".equalsIgnoreCase(content))
+ setPassive(false);
+ }
+ }
}
}
}
@@ -220,6 +239,11 @@
{
return "FTPEpr [ "+super.getAddr().extendedToString()+" ]";
}
+
+ public EPR copy ()
+ {
+ return new FTPEpr(this);
+ }
public static URI type ()
{
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/FileEpr.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/FileEpr.java 2007-12-16 13:42:34 UTC (rev 17268)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/FileEpr.java 2007-12-16 14:36:44 UTC (rev 17269)
@@ -62,6 +62,20 @@
public FileEpr (EPR epr)
{
super(epr);
+
+ if (epr instanceof FileEpr)
+ {
+ FileEpr instance = (FileEpr) epr;
+
+ inputSet = instance.inputSet;
+ workSet = instance.workSet;
+ postDirSet = instance.postDirSet;
+ postSuffixSet = instance.postSuffixSet;
+ postDelSet = instance.postDelSet;
+ errorDirSet = instance.errorDirSet;
+ errorSuffixSet = instance.errorSuffixSet;
+ errorDelSet = instance.errorDelSet;
+ }
}
public FileEpr (EPR epr, Element header)
@@ -82,33 +96,53 @@
if (tag != null)
{
if (tag.equals(INPUT_SUFFIX_TAG))
- getAddr().addExtension(INPUT_SUFFIX_TAG, nl.item(i).getTextContent());
+ setInputSuffix(nl.item(i).getTextContent());
else
{
if (tag.equals(POST_DIR_TAG))
- getAddr().addExtension(POST_DIR_TAG, nl.item(i).getTextContent());
+ setPostDirectory(nl.item(i).getTextContent());
else
{
if (tag.equals(POST_SUFFIX_TAG))
- getAddr().addExtension(POST_SUFFIX_TAG, nl.item(i).getTextContent());
+ setPostSuffix(nl.item(i).getTextContent());
else
{
if (tag.equals(POST_DEL_TAG))
- getAddr().addExtension(POST_DEL_TAG, nl.item(i).getTextContent());
+ {
+ String content = nl.item(i).getTextContent();
+
+ if ("true".equalsIgnoreCase(content))
+ setPostDelete(true);
+ else
+ {
+ if ("false".equalsIgnoreCase(content))
+ setPostDelete(false);
+ }
+ }
else
{
if (tag.equals(ERROR_DIR_TAG))
{
- getAddr().addExtension(ERROR_DIR_TAG, nl.item(i).getTextContent());
+ setErrorDirectory(nl.item(i).getTextContent());
}
else
{
if (tag.equals((ERROR_SUFFIX_TAG)))
- getAddr().addExtension(ERROR_SUFFIX_TAG, nl.item(i).getTextContent());
+ setErrorSuffix(nl.item(i).getTextContent());
else
{
if (tag.equals((ERROR_DEL_TAG)))
- getAddr().addExtension(ERROR_DEL_TAG, nl.item(i).getTextContent());
+ {
+ String content = nl.item(i).getTextContent();
+
+ if ("true".equalsIgnoreCase(content))
+ setErrorDelete(true);
+ else
+ {
+ if ("false".equalsIgnoreCase(content))
+ setErrorDelete(false);
+ }
+ }
}
}
}
@@ -397,6 +431,11 @@
{
return "FileEpr [ "+super.getAddr().extendedToString()+" ]";
}
+
+ public EPR copy ()
+ {
+ return new FileEpr(this);
+ }
public static URI type ()
{
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/HTTPEpr.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/HTTPEpr.java 2007-12-16 13:42:34 UTC (rev 17268)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/HTTPEpr.java 2007-12-16 14:36:44 UTC (rev 17269)
@@ -92,6 +92,11 @@
{
return "HTTPEpr [ "+super.getAddr().extendedToString()+" ]";
}
+
+ public EPR copy ()
+ {
+ return new HTTPEpr(this);
+ }
public static final URI type ()
{
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/HibernateEpr.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/HibernateEpr.java 2007-12-16 13:42:34 UTC (rev 17268)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/HibernateEpr.java 2007-12-16 14:36:44 UTC (rev 17269)
@@ -74,6 +74,18 @@
public HibernateEpr(EPR epr) {
super(epr);
+
+ if (epr instanceof HibernateEpr)
+ {
+ HibernateEpr instance = (HibernateEpr) epr;
+
+ cfgFileSet = instance.cfgFileSet;
+ classNameSet = instance.classNameSet;
+ statusSet = instance.statusSet;
+ messageSet = instance.messageSet;
+ timestampSet = instance.timestampSet;
+ dataSet = instance.dataSet;
+ }
}
public HibernateEpr (EPR epr, Element header)
@@ -90,11 +102,11 @@
if (tag != null)
{
if (tag.equals(HIBERNATE_CFG_TAG)) {
- getAddr().addExtension(HIBERNATE_CFG_TAG, nl.item(i).getTextContent());
+ setHibernateCfgFile(nl.item(i).getTextContent());
} else if (tag.equals(CLASS_NAME_TAG)) {
- getAddr().addExtension(CLASS_NAME_TAG, nl.item(i).getTextContent());
+ setClassName(nl.item(i).getTextContent());
} else if (tag.equals(EVENT_TAG)) {
- getAddr().addExtension(EVENT_TAG, nl.item(i).getTextContent());
+ setEvent(nl.item(i).getTextContent());
}
}
} catch (Exception ex) {
@@ -350,7 +362,21 @@
{
return "HibernateEpr [ "+super.getAddr().extendedToString()+" ]";
}
+
+ public EPR copy ()
+ {
+ return new HibernateEpr(this);
+ }
+ protected final void changeClassName (String className) throws URISyntaxException
+ {
+ classNameSet = false;
+
+ super.getAddr().removeExtension(CLASS_NAME_TAG, getClassName());
+
+ setClassName(className);
+ }
+
public static final URI type ()
{
return m_type;
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JDBCEpr.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JDBCEpr.java 2007-12-16 13:42:34 UTC (rev 17268)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JDBCEpr.java 2007-12-16 14:36:44 UTC (rev 17269)
@@ -68,6 +68,21 @@
public JDBCEpr (EPR epr)
{
super(epr);
+
+ if (epr instanceof JDBCEpr)
+ {
+ JDBCEpr instance = (JDBCEpr) epr;
+
+ userSet = instance.userSet;
+ passwordSet = instance.passwordSet;
+ sqlSet = instance.sqlSet;
+ driverSet = instance.driverSet;
+ tableNameSet = instance.tableNameSet;
+ messageIdSet = instance.messageIdSet;
+ statusSet = instance.statusSet;
+ dataSet = instance.dataSet;
+ timestampSet = instance.timestampSet;
+ }
}
public JDBCEpr (EPR epr, Element header)
@@ -88,43 +103,43 @@
if (tag != null)
{
if (tag.equals(USERNAME_TAG))
- getAddr().addExtension(USERNAME_TAG, nl.item(i).getTextContent());
+ setUserName(nl.item(i).getTextContent());
else
{
if (tag.equals(PASSWORD_TAG))
- getAddr().addExtension(PASSWORD_TAG, nl.item(i).getTextContent());
+ setPassword(nl.item(i).getTextContent());
else
{
if (tag.equals(SQL_TAG))
- getAddr().addExtension(SQL_TAG, nl.item(i).getTextContent());
+ setSQL(nl.item(i).getTextContent());
else
{
if (tag.equals(DRIVER_TAG))
- getAddr().addExtension(DRIVER_TAG, nl.item(i).getTextContent());
+ setDriver(nl.item(i).getTextContent());
else
{
if (tag.equals(URL_TAG))
- getAddr().addExtension(URL_TAG, nl.item(i).getTextContent());
+ setURL(nl.item(i).getTextContent());
else
{
if (tag.equals(TABLE_NAME_TAG))
- getAddr().addExtension(TABLE_NAME_TAG, nl.item(i).getTextContent());
+ setTableName(nl.item(i).getTextContent());
else
{
if (tag.equals(MESSAGE_ID_COLUMN_TAG))
- getAddr().addExtension(MESSAGE_ID_COLUMN_TAG, nl.item(i).getTextContent());
+ setMessageIdColumn(nl.item(i).getTextContent());
else
{
if (tag.equals(STATUS_COLUMN_TAG))
- getAddr().addExtension(STATUS_COLUMN_TAG, nl.item(i).getTextContent());
+ setStatusColumn(nl.item(i).getTextContent());
else
{
if (tag.equals(DATA_COLUMN_TAG))
- getAddr().addExtension(DATA_COLUMN_TAG, nl.item(i).getTextContent());
+ setDataColumn(nl.item(i).getTextContent());
else
{
if (tag.equals(TIMESTAMP_COLUMN_TAG))
- getAddr().addExtension(TIMESTAMP_COLUMN_TAG, nl.item(i).getTextContent());
+ setTimestampColumn(nl.item(i).getTextContent());
else
{
if (tag.equals(POST_DEL_TAG))
@@ -175,6 +190,11 @@
getAddr().addExtension(ERROR_DEL_TAG,Boolean.toString(errorDelete));
}
+ public EPR copy ()
+ {
+ return new JDBCEpr(this);
+ }
+
/**
* Set the URL for this endpoint.
*
@@ -496,6 +516,15 @@
return _type;
}
+ protected final void changeTableName (String tableName) throws URISyntaxException
+ {
+ tableNameSet = false;
+
+ super.getAddr().removeExtension(TABLE_NAME_TAG, getTableName());
+
+ setTableName(tableName);
+ }
+
private boolean userSet = false;
private boolean passwordSet = false;
private boolean sqlSet = false;
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java 2007-12-16 13:42:34 UTC (rev 17268)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java 2007-12-16 14:36:44 UTC (rev 17269)
@@ -419,6 +419,11 @@
}
}
+ public EPR copy ()
+ {
+ return new JMSEpr(this);
+ }
+
public String toString ()
{
return "JMSEpr [ "+super.getAddr().extendedToString()+" ]";
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/LogicalEPR.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/LogicalEPR.java 2007-12-16 13:42:34 UTC (rev 17268)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/LogicalEPR.java 2007-12-16 14:36:44 UTC (rev 17269)
@@ -133,6 +133,11 @@
}
}
+ public EPR copy ()
+ {
+ return new LogicalEPR(this);
+ }
+
public static URI type() {
return _type;
}
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java 2007-12-16 13:42:34 UTC (rev 17268)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java 2007-12-16 14:36:44 UTC (rev 17269)
@@ -50,6 +50,9 @@
public SFTPEpr(EPR epr)
{
super(epr);
+
+ if (epr instanceof SFTPEpr)
+ certificateSet = ((SFTPEpr) epr).certificateSet;
}
public SFTPEpr (EPR epr, Element header)
@@ -68,7 +71,10 @@
if ((prefix != null) && (prefix.equals(XMLUtil.JBOSSESB_PREFIX)))
{
if ((tag != null) && (tag.equals(CERTIFICATE_TAG)))
+ {
getAddr().addExtension(CERTIFICATE_TAG, nl.item(i).getTextContent());
+ certificateSet = true;
+ }
}
}
catch (Exception ex)
@@ -135,6 +141,11 @@
return null;
}
+ public EPR copy ()
+ {
+ return new SFTPEpr(this);
+ }
+
public String toString ()
{
return "SFTPEpr [ "+super.getAddr().extendedToString()+" ]";
More information about the jboss-svn-commits
mailing list