[jboss-svn-commits] JBL Code SVN: r8364 - in labs/jbossesb/trunk/product/core: listeners/src/org/jboss/soa/esb/listeners listeners/src/org/jboss/soa/esb/listeners/message rosetta/src/org/jboss/internal/soa/esb/couriers rosetta/src/org/jboss/internal/soa/esb/couriers/helpers rosetta/src/org/jboss/soa/esb/couriers
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Dec 16 08:39:57 EST 2006
Author: estebanschifman
Date: 2006-12-16 08:39:45 -0500 (Sat, 16 Dec 2006)
New Revision: 8364
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerTagNames.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/LocalFileHandler.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java
Log:
Tune details needed for transport independent ESB aware listener classes
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerTagNames.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerTagNames.java 2006-12-16 09:40:54 UTC (rev 8363)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerTagNames.java 2006-12-16 13:39:45 UTC (rev 8364)
@@ -28,6 +28,7 @@
public class ListenerTagNames
{
/** EPRs */
+ public static final String EPR_TAG = "EPR";
public static final String URL_TAG = "URL";
public static final String PROTOCOL_TAG = "protocol";
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java 2006-12-16 09:40:54 UTC (rev 8363)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java 2006-12-16 13:39:45 UTC (rev 8364)
@@ -1,6 +1,7 @@
package org.jboss.soa.esb.listeners;
import java.io.File;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collection;
@@ -83,13 +84,23 @@
public static EPR assembleEpr(ConfigTree tree)
throws ConfigurationException
{
- String protocol = tree.getAttribute(ListenerTagNames.PROTOCOL_TAG);
- ConfigTree eprElement = tree.getFirstChild(protocol+"EPR");
+ String urlString = tree.getAttribute(ListenerTagNames.URL_TAG);
+ URL url = null;
+ if (null!=urlString)
+ try { url = new URL(urlString); }
+ catch (MalformedURLException e)
+ {
+ throw new ConfigurationException("Invalid URL syntax for EPR",e);
+ }
+
+ String protocol = (null==url) ? tree.getAttribute(ListenerTagNames.PROTOCOL_TAG)
+ : url.getProtocol();
try
{
- if ("jms" .equals(protocol)) return jmsEprFromElement(eprElement);
- if ("file" .equals(protocol)) return fileEprFromElement(eprElement);
+ if ("jms" .equals(protocol)) return jmsEprFromElement(tree);
+ if ("file" .equals(protocol)) return fileEprFromElement(tree);
+ if ("ftp" .equals(protocol)) return fileEprFromElement(tree);
}
catch (Exception e)
{
@@ -153,12 +164,12 @@
if (null==epr)
throw new ConfigurationException("Unsupported file protocol : "+protocol);
- epr.setInputSuffix(tree.getAttribute(FileEpr.INPUT_SUFFIX_TAG,null));
+ String inputSuffix = tree.getAttribute(FileEpr.INPUT_SUFFIX_TAG);
+ if (! Util.isNullString(inputSuffix))
+ epr.setInputSuffix(inputSuffix);
boolean bErrorDel = Boolean.parseBoolean
(getAttrAndWarn(tree,FileEpr.ERROR_DEL_TAG,"true"));
- epr.setErrorDelete(bErrorDel);
-
String errorDir = tree.getAttribute(FileEpr.ERROR_DIR_TAG);
String errorSuffix = tree.getAttribute(FileEpr.ERROR_SUFFIX_TAG);
if (bErrorDel)
@@ -178,18 +189,19 @@
errorSuffix = ".esbERROR";
warnDefault(FileEpr.ERROR_SUFFIX_TAG, errorSuffix);
}
+ epr.setErrorDelete(bErrorDel);
+ epr.setErrorDirectory(errorDir);
+ epr.setErrorSuffix(errorSuffix);
-
boolean bPostDel = Boolean.parseBoolean
- (getAttrAndWarn(tree,FileEpr.POST_DEL_TAG,"false"));
- epr.setPostDelete(bPostDel);
+ (getAttrAndWarn(tree,FileEpr.POST_DEL_TAG,"true"));
String postDir = tree.getAttribute(FileEpr.POST_DIR_TAG);
String postSuffix = tree.getAttribute(FileEpr.POST_SUFFIX_TAG);
if (bPostDel)
{
if (null!= postDir || null!=postSuffix)
- _logger.warn("If you specify "+FileEpr.POST_DEL_TAG+"'true' ,"
+ _logger.warn("If you don't specify "+FileEpr.POST_DEL_TAG+"'false' ,"
+FileEpr.POST_DIR_TAG+" and "+FileEpr.POST_SUFFIX_TAG
+" will have no effect because processed input messages will be deleted");
}
@@ -203,12 +215,13 @@
postSuffix = ".esbDONE";
warnDefault(FileEpr.POST_SUFFIX_TAG, postSuffix);
}
+ epr.setPostDelete (bPostDel);
+ epr.setPostDirectory(postDir);
+ epr.setPostSuffix (postSuffix);
if (epr instanceof FTPEpr)
{
FTPEpr ftp = (FTPEpr)epr;
- ftp.setUserName(getAttrAndWarn(tree, FTPEpr.USERNAME_TAG, null));
- ftp.setPassword(getAttrAndWarn(tree, FTPEpr.PASSWORD_TAG, ""));
ftp.setPassive(Boolean.valueOf(getAttrAndWarn(tree,FTPEpr.PASSIVE_TAG,"false")));
}
return epr;
@@ -235,7 +248,7 @@
catch (Exception e) { throw new ConfigurationException(e); }
} //________________________________
- private static final boolean LOGWARN=false;
+ private static final boolean LOGWARN=true;
private static void warnDefault(String tag, String defaultValue)
{
if (LOGWARN)
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java 2006-12-16 09:40:54 UTC (rev 8363)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java 2006-12-16 13:39:45 UTC (rev 8364)
@@ -72,15 +72,15 @@
{
super.checkMyParms();
- // make sure a protocol was specified
- obtainAttribute(ListenerTagNames.PROTOCOL_TAG, null);
-
if (Util.isNullString(_eprCategoryName))
throw new ConfigurationException("Missing or invalid "+ListenerTagNames.SERVICE_CATEGORY_NAME_TAG);
if (Util.isNullString(_eprName))
throw new ConfigurationException("Missing or invalid "+ListenerTagNames.SERVICE_NAME_TAG);
- _epr = ListenerUtil.assembleEpr(_config);
+ ConfigTree eprElement = _config.getFirstChild(ListenerTagNames.EPR_TAG);
+ if (null==eprElement)
+ throw new ConfigurationException("Missing or invalid "+ListenerTagNames.EPR_TAG+" element");
+ _epr = ListenerUtil.assembleEpr(eprElement);
// _logger.debug(EPRHelper.toXMLString(_epr));
} // ________________________________
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java 2006-12-16 09:40:54 UTC (rev 8363)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java 2006-12-16 13:39:45 UTC (rev 8364)
@@ -35,7 +35,6 @@
import org.jboss.internal.soa.esb.couriers.helpers.FileHandler;
import org.jboss.internal.soa.esb.couriers.helpers.FileHandlerFactory;
import org.jboss.internal.soa.esb.couriers.helpers.LocalFileHandler;
-import org.jboss.soa.esb.addressing.eprs.FTPEpr;
import org.jboss.soa.esb.addressing.eprs.FileEpr;
import org.jboss.soa.esb.common.Environment;
import org.jboss.soa.esb.common.ModulePropertyManager;
@@ -372,7 +371,8 @@
{
try
{
- if (_epr instanceof FTPEpr || _epr.getPostDelete())
+// if (_epr instanceof FTPEpr || _epr.getPostDelete())
+ if (_epr.getPostDelete())
return null;
}
catch (Exception e)
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/LocalFileHandler.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/LocalFileHandler.java 2006-12-16 09:40:54 UTC (rev 8363)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/LocalFileHandler.java 2006-12-16 13:39:45 UTC (rev 8364)
@@ -9,6 +9,7 @@
import java.net.MalformedURLException;
import java.net.URISyntaxException;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.addressing.eprs.FileEpr;
import org.jboss.soa.esb.couriers.CourierException;
import org.jboss.soa.esb.util.Util;
@@ -68,7 +69,9 @@
try
{
to.delete();
- return from.renameTo(to);
+ if (!from.renameTo(to))
+ throw new CourierException("Unable to rename from "+from+" to "+to);
+ return true;
}
catch (Exception e) {throw new CourierException(e);}
}
@@ -91,4 +94,5 @@
} //____________________________________________________
protected FileEpr _epr;
+ static Logger _logger = Logger.getLogger(LocalFileHandler.class);
}
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java 2006-12-16 09:40:54 UTC (rev 8363)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java 2006-12-16 13:39:45 UTC (rev 8364)
@@ -163,18 +163,6 @@
reader = new FileInputStream(from);
serial = (Serializable) new ObjectInputStream(reader).readObject();
return Util.deserialize(serial);
- /*
- URI msgId = msg.getHeader().getCall().getMessageID();
- if (null == msgId || Util.isNullString(msgId.toString()))
- {
- // this should not happen - Serialization/Deserialization perhaps ??
- String sId = from.getName();
- int iDot = sId.indexOf(".");
- URI fileUri = new URI((iDot < 0) ? sId : sId.substring(0, iDot));
- msg.getHeader().getCall().setMessageID(fileUri);
- }
- return msg;
- */
}
catch (Exception e)
{
More information about the jboss-svn-commits
mailing list