[jboss-svn-commits] JBL Code SVN: r7628 - in labs/jbossesb/trunk: product/core/listeners/src/org/jboss/soa/esb/listeners/old qa/junit/src/org/jboss/soa/esb/listeners/old
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Nov 15 16:42:56 EST 2006
Author: kurt.stam at jboss.com
Date: 2006-11-15 16:42:54 -0500 (Wed, 15 Nov 2006)
New Revision: 7628
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/old/DirectoryPoller.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/old/RemoteDirectoryPoller.java
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/old/DirectoryPollerConfig1.xml
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/old/DirectoryPollerTest.java
Log:
working on fix for this test
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/old/DirectoryPoller.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/old/DirectoryPoller.java 2006-11-15 20:16:46 UTC (rev 7627)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/old/DirectoryPoller.java 2006-11-15 21:42:54 UTC (rev 7628)
@@ -32,11 +32,19 @@
import org.jboss.soa.esb.actions.ActionDefinitionFactory;
import org.jboss.soa.esb.actions.ActionProcessor;
import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.listeners.ListenerTagNames;
import org.jboss.soa.esb.util.Util;
public class DirectoryPoller extends AbstractPoller
{
+ public static final String FILE_INPUT_DIR = "inputDirURI";
+ public static final String FILE_INPUT_SFX = "inputSuffix";
+ public static final String FILE_WORK_SFX = "workSuffix";
+ public static final String FILE_ERROR_DIR = "errorDirURI";
+ public static final String FILE_ERROR_SFX = "errorSuffix";
+ public static final String FILE_POST_DIR = "postDirURI";
+ public static final String FILE_POST_SFX = "postSuffix";
+ public static final String FILE_POST_DEL = "postDelete";
+
public DirectoryPoller(GpListener p_oDad, ConfigTree p_oParms, ActionDefinitionFactory actionDefinitionFactory) throws Exception
{
super(p_oDad, p_oParms, actionDefinitionFactory);
@@ -89,49 +97,49 @@
private void checkMyParms() throws Exception
{
// INPUT directory and suffix (used for FileFilter)
- String sInpDir = GpListener.obtainAtt(listenerConfig,ListenerTagNames.FILE_INPUT_DIR_TAG,null);
+ String sInpDir = GpListener.obtainAtt(listenerConfig,FILE_INPUT_DIR,null);
m_oInpDir = getFile(sInpDir);
seeIfOkToWorkOnDir(m_oInpDir);
- m_sInpSfx = GpListener.obtainAtt(listenerConfig,ListenerTagNames.FILE_INPUT_SFX_TAG,null);
+ m_sInpSfx = GpListener.obtainAtt(listenerConfig,FILE_INPUT_SFX,null);
m_sInpSfx = m_sInpSfx.trim();
if (m_sInpSfx.length()<1)
- throw new Exception ("Invalid "+ListenerTagNames.FILE_INPUT_SFX_TAG+" attribute");
+ throw new Exception ("Invalid "+FILE_INPUT_SFX+" attribute");
m_oFFilt = new FileEndsWith(m_sInpSfx);
// WORK suffix (will rename in input directory)
- m_sWrkSfx = GpListener.obtainAtt(listenerConfig,ListenerTagNames.FILE_WORK_SFX_TAG,".esbWork").trim();
+ m_sWrkSfx = GpListener.obtainAtt(listenerConfig,FILE_WORK_SFX,".esbWork").trim();
if (m_sWrkSfx.length()<1)
- throw new Exception ("Invalid "+ListenerTagNames.FILE_WORK_SFX_TAG+" attribute");
+ throw new Exception ("Invalid "+FILE_WORK_SFX+" attribute");
if (m_sInpSfx.equals(m_sWrkSfx))
throw new Exception("Work suffix must differ from input suffix <"+m_sWrkSfx+">");
// ERROR directory and suffix (defaults to input dir and ".esbError" suffix)
- String sErrDir = GpListener.obtainAtt(listenerConfig,ListenerTagNames.FILE_ERROR_DIR_TAG,sInpDir);
+ String sErrDir = GpListener.obtainAtt(listenerConfig,FILE_ERROR_DIR,sInpDir);
m_oErrorDir = getFile(sErrDir);
seeIfOkToWorkOnDir(m_oErrorDir);
- m_sErrSfx = GpListener.obtainAtt(listenerConfig,ListenerTagNames.FILE_ERROR_SFX_TAG,".esbError").trim();
+ m_sErrSfx = GpListener.obtainAtt(listenerConfig,FILE_ERROR_SFX,".esbError").trim();
if (m_sErrSfx.length()<1)
- throw new Exception ("Invalid "+ListenerTagNames.FILE_ERROR_SFX_TAG+" attribute");
+ throw new Exception ("Invalid "+FILE_ERROR_SFX+" attribute");
if (m_oErrorDir.equals(m_oInpDir) && m_sInpSfx.equals(m_sErrSfx))
throw new Exception("Error suffix must differ from input suffix <"+m_sErrSfx+">");
// Do users wish to delete files that were processed OK ?
- String sPostDel = GpListener.obtainAtt(listenerConfig,ListenerTagNames.FILE_POST_DEL_TAG,"false").trim();
+ String sPostDel = GpListener.obtainAtt(listenerConfig,FILE_POST_DEL,"false").trim();
m_bPostDel = Boolean.parseBoolean(sPostDel);
if (m_bPostDel)
return;
// POST (done) directory and suffix (defaults to input dir and ".esbDone" suffix)
- String sPostDir = GpListener.obtainAtt(listenerConfig,ListenerTagNames.FILE_POST_DIR_TAG,sInpDir);
+ String sPostDir = GpListener.obtainAtt(listenerConfig,FILE_POST_DIR,sInpDir);
m_oPostDir = getFile(sPostDir);
seeIfOkToWorkOnDir(m_oPostDir);
- m_sPostSfx = GpListener.obtainAtt(listenerConfig,ListenerTagNames.FILE_POST_SFX_TAG,".esbDone").trim();
+ m_sPostSfx = GpListener.obtainAtt(listenerConfig,FILE_POST_SFX,".esbDone").trim();
if (m_oPostDir.equals(m_oInpDir))
{ if (m_sPostSfx.length()<1)
- throw new Exception ("Invalid "+ListenerTagNames.FILE_POST_SFX_TAG+" attribute");
+ throw new Exception ("Invalid "+FILE_POST_SFX+" attribute");
if (m_sPostSfx.equals(m_sInpSfx))
throw new Exception("Post process suffix must differ from input suffix <"+m_sPostSfx+">");
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/old/RemoteDirectoryPoller.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/old/RemoteDirectoryPoller.java 2006-11-15 20:16:46 UTC (rev 7627)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/old/RemoteDirectoryPoller.java 2006-11-15 21:42:54 UTC (rev 7628)
@@ -32,12 +32,20 @@
import org.jboss.soa.esb.actions.ActionProcessor;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.helpers.KeyValuePair;
-import org.jboss.soa.esb.listeners.ListenerTagNames;
import org.jboss.soa.esb.util.FtpClientUtil;
import org.jboss.soa.esb.util.Util;
public class RemoteDirectoryPoller extends AbstractPoller
{
+ public static final String FILE_INPUT_DIR = "inputDir";
+ public static final String FILE_INPUT_SFX = "inputSuffix";
+ public static final String FILE_WORK_SFX = "workSuffix";
+ public static final String FILE_ERROR_DIR = "errorDir";
+ public static final String FILE_ERROR_SFX = "errorSuffix";
+ public static final String FILE_POST_DIR = "postDir";
+ public static final String FILE_POST_SFX = "postSuffix";
+ public static final String FILE_POST_DEL = "postDelete";
+
private ConfigTree _params;
private Logger _logger = Logger.getLogger(this.getClass());
FtpClientUtil _ftpClient;
@@ -123,45 +131,45 @@
protected void checkMyParms() throws Exception
{
// INPUT directory and suffix (used for FileFilter)
- String sInpDir = GpListener.obtainAtt(_params,ListenerTagNames.FILE_INPUT_DIR_TAG,null);
+ String sInpDir = GpListener.obtainAtt(_params,FILE_INPUT_DIR,null);
m_oInpDir = new File(sInpDir);
- m_sInpSfx = GpListener.obtainAtt(_params,ListenerTagNames.FILE_INPUT_SFX_TAG,null);
+ m_sInpSfx = GpListener.obtainAtt(_params,FILE_INPUT_SFX,null);
m_sInpSfx = m_sInpSfx.trim();
if (m_sInpSfx.length()<1)
- throw new Exception ("Invalid "+ListenerTagNames.FILE_INPUT_SFX_TAG+" attribute");
+ throw new Exception ("Invalid "+FILE_INPUT_SFX+" attribute");
// WORK suffix (will rename in input directory)
- m_sWrkSfx = GpListener.obtainAtt(_params,ListenerTagNames.FILE_WORK_SFX_TAG,".esbWork").trim();
+ m_sWrkSfx = GpListener.obtainAtt(_params,FILE_WORK_SFX,".esbWork").trim();
if (m_sWrkSfx.length()<1)
- throw new Exception ("Invalid "+ListenerTagNames.FILE_WORK_SFX_TAG+" attribute");
+ throw new Exception ("Invalid "+FILE_WORK_SFX+" attribute");
if (m_sInpSfx.equals(m_sWrkSfx))
throw new Exception("Work suffix must differ from input suffix <"+m_sWrkSfx+">");
// ERROR directory and suffix (defaults to input dir and ".esbError" suffix)
- String sErrDir = GpListener.obtainAtt(_params,ListenerTagNames.FILE_ERROR_DIR_TAG,sInpDir);
+ String sErrDir = GpListener.obtainAtt(_params,FILE_ERROR_DIR,sInpDir);
m_oErrorDir = new File(sErrDir);
- m_sErrSfx = GpListener.obtainAtt(_params,ListenerTagNames.FILE_ERROR_SFX_TAG,".esbError").trim();
+ m_sErrSfx = GpListener.obtainAtt(_params,FILE_ERROR_SFX,".esbError").trim();
if (m_sErrSfx.length()<1)
- throw new Exception ("Invalid "+ListenerTagNames.FILE_ERROR_SFX_TAG+" attribute");
+ throw new Exception ("Invalid "+FILE_ERROR_SFX+" attribute");
if (m_oErrorDir.equals(m_oInpDir) && m_sInpSfx.equals(m_sErrSfx))
throw new Exception("Error suffix must differ from input suffix <"+m_sErrSfx+">");
// Do users wish to delete files that were processed OK ?
- String sPostDel = GpListener.obtainAtt(_params,ListenerTagNames.FILE_POST_DEL_TAG,"false").trim();
+ String sPostDel = GpListener.obtainAtt(_params,FILE_POST_DEL,"false").trim();
m_bPostDel = Boolean.parseBoolean(sPostDel);
if (m_bPostDel)
return;
// POST (done) directory and suffix (defaults to input dir and ".esbDone" suffix)
- String sPostDir = GpListener.obtainAtt(_params,ListenerTagNames.FILE_POST_DIR_TAG,sInpDir);
+ String sPostDir = GpListener.obtainAtt(_params,FILE_POST_DIR,sInpDir);
m_oPostDir = new File(sPostDir);
- m_sPostSfx = GpListener.obtainAtt(_params,ListenerTagNames.FILE_POST_SFX_TAG,".esbDone").trim();
+ m_sPostSfx = GpListener.obtainAtt(_params,FILE_POST_SFX,".esbDone").trim();
if (m_oPostDir.equals(m_oInpDir))
{ if (m_sPostSfx.length()<1)
- throw new Exception ("Invalid "+ListenerTagNames.FILE_POST_SFX_TAG+" attribute");
+ throw new Exception ("Invalid "+FILE_POST_SFX+" attribute");
if (m_sPostSfx.equals(m_sInpSfx))
throw new Exception("Post process suffix must differ from input suffix <"+m_sPostSfx+">");
}
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/old/DirectoryPollerConfig1.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/old/DirectoryPollerConfig1.xml 2006-11-15 20:16:46 UTC (rev 7627)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/old/DirectoryPollerConfig1.xml 2006-11-15 21:42:54 UTC (rev 7628)
@@ -11,11 +11,11 @@
actions="FileCopy1, FileCopy2"
pollLatencySecs="2"
maxThreads="2"
- inputDirURI="@qa.build@/inputDir"
+ inputDirURI="build/inputDir"
inputSuffix=".inp"
workSuffix=".WORKING"
errorSuffix=".PROCERR"
- postDirURI="@qa.build@/inputDoneDir"
+ postDirURI="build/inputDoneDir"
postSuffix=".DONE"
postDelete="n"
>
@@ -23,11 +23,11 @@
<Actions>
<Action name="FileCopy1" processor="FileCopier">
- <property name="copyToDirURI" value="@qa.build@/copiedTo"/>
+ <property name="copyToDirURI" value="build"/>
<property name="copyToSuffix" value=".outFromFirst"/>
</Action>
<Action name="FileCopy2" processor="FileCopier">
- <property name="copyToDirURI" value="@qa.build@/copiedTo"/>
+ <property name="copyToDirURI" value="build"/>
<property name="copyToSuffix" value=".outFromSecond"/>
</Action>
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/old/DirectoryPollerTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/old/DirectoryPollerTest.java 2006-11-15 20:16:46 UTC (rev 7627)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/old/DirectoryPollerTest.java 2006-11-15 21:42:54 UTC (rev 7628)
@@ -26,6 +26,7 @@
import junit.framework.TestCase;
import org.jboss.soa.esb.helpers.KeyValuePair;
+import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
import org.jboss.soa.esb.util.ClassUtils;
import org.jboss.soa.esb.util.FileUtils;
import org.jboss.soa.esb.util.JMSClientUtil;
@@ -48,7 +49,8 @@
copiedTo = FileUtils.createTestDir("copiedTo");
// Start the listener...
- listenersMgr = ListenerUtils.startListeners(ClassUtils.toResourcePath(getClass().getPackage()) + "/DirectoryPollerConfig1.xml");
+ listenersMgr = ListenerUtils.startListeners(TestEnvironmentUtil.getUserDir("qa") +
+ "junit/src" +ClassUtils.toResourcePath(getClass().getPackage()) + "/DirectoryPollerConfig1.xml");
}
public void test() throws InterruptedException {
More information about the jboss-svn-commits
mailing list