[jboss-svn-commits] JBL Code SVN: r6618 - in labs/jbossesb/trunk: product/core/listeners/src/org/jboss/soa/esb/actions/routing product/core/rosetta/src/org/jboss/soa/esb/common product/install/conf qa/junit/src/org/jboss/soa/esb/rosetta

[jboss-svn-commits at lists.jboss.org]

Author: tfennelly
Date: 2006-10-05 10:58:32 -0400 (Thu, 05 Oct 2006)
New Revision: 6618

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/FileCopier.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java
   labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/rosetta/MessageAttachmentSerializeTest.java
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/rosetta/MessagePropertiesSerializeTest.java
Log:
Fixing the QA tests

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/FileCopier.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/FileCopier.java	2006-10-05 14:30:40 UTC (rev 6617)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/FileCopier.java	2006-10-05 14:58:32 UTC (rev 6618)
@@ -37,6 +37,7 @@
 import org.jboss.soa.esb.actions.ActionProcessingException;
 import org.jboss.soa.esb.helpers.*;
 import org.jboss.soa.esb.listeners.DirectoryPoller.WorkingFile;
+import org.jboss.soa.esb.message.Message;
 
 /**
  * File copy action.
@@ -132,12 +133,16 @@
     } // __________________________________
 
     public Serializable getOkNotification(Object message) {
-        return "File " + ((WorkingFile)message).getInputFile().getAbsolutePath()
+    	Object currentObject = ((Message)message).getBody().get(CURRENT_OBJECT);
+
+    	return "File " + ((WorkingFile)currentObject).getInputFile().getAbsolutePath()
                 + " successfully copied to all destination";
     }
 
     public Serializable getErrorNotification(Object message) {
-        return "Problems copying " + ((WorkingFile)message).getInputFile().getAbsolutePath()
+    	Object currentObject = ((Message)message).getBody().get(CURRENT_OBJECT);
+
+    	return "File " + ((WorkingFile)currentObject).getInputFile().getAbsolutePath()
                 + " to configured destination";
     }
 

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java	2006-10-05 14:30:40 UTC (rev 6617)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java	2006-10-05 14:58:32 UTC (rev 6618)
@@ -128,6 +128,8 @@
 		String propertiesFilename = System.getProperty(
 				Environment.PROPERTIES_FILE, Environment.DEFAULT_PROPERTY_FILE);
 
+		propertyManager.setProperty("com.arjuna.common.util.propertyservice.verbosePropertyManager", "ON");
+		
 		try
 		{
 			propertyManager.load(XMLFilePlugin.class.getName(),

Modified: labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml	2006-10-05 14:30:40 UTC (rev 6617)
+++ labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml	2006-10-05 14:58:32 UTC (rev 6618)
@@ -34,27 +34,17 @@
 		<property name="org.jboss.soa.esb.jndi.server.type" value="jboss"/>
 		<property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
 		<property name="org.jboss.soa.esb.objStore.configFile" value="file:@org.jboss.esb.config.objstore@" />
-		<!-- property name="org.jboss.soa.esb.paramsRepository.class" value="" -->
-		<!-- property name="org.jboss.soa.esb.encryption.factory.class" value="" -->
     </properties>
     <properties name="transports" depends="core">
     	<property name="org.jboss.soa.esb.mail.smtp.host" value="@org.jboss.soa.esb.mail.smtp.host@"/>
     	<property name="org.jboss.soa.esb.mail.smtp.user" value="@org.jboss.soa.esb.mail.smtp.user@"/>
     	<property name="org.jboss.soa.esb.mail.smtp.password" value="@org.jboss.soa.esb.mail.smtp.password@"/>
     	<property name="org.jboss.soa.esb.mail.smtp.port" value="@org.jboss.soa.esb.mail.smtp.port@"/>
-    	<!--  property name="org.jboss.soa.esb.mail.smtp.from" value="" -->
-    	<!--  property name="org.jboss.soa.esb.mail.smtp.auth" value="" -->
     </properties>
     <properties name="connection">
-    	<!-- property name="isolation" value="" -->
-    	<!-- property name="connection-url" value="" -->
     	<property name="min-pool-size" value="5"/>
     	<property name="max-pool=size" value="10"/>
     	<property name="blocking-timeout-millis" value="5000"/>
-    	<!-- property name="connection-pool-class" value="" -->
-    	<!-- property name="user-name" value="" -->
-    	<!-- property name="password" value="" -->
-    	<!-- property name"password-decrypter" value="" -->
     	<property name="abandoned-connection-timeout" value="10000"/>
     	<property name="abandoned-connection-time-interval" value="30000"/>
     </properties>

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/rosetta/MessageAttachmentSerializeTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/rosetta/MessageAttachmentSerializeTest.java	2006-10-05 14:30:40 UTC (rev 6617)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/rosetta/MessageAttachmentSerializeTest.java	2006-10-05 14:58:32 UTC (rev 6618)
@@ -60,7 +60,7 @@
 		TESTFILE.delete();
 	}
 	
-	private void testJavaSerializable() throws Exception
+	public void testJavaSerializable() throws Exception
 	{
 		org.jboss.internal.soa.esb.message.format.serialized.AttachmentImpl
 		old = new  org.jboss.internal.soa.esb.message.format.serialized.AttachmentImpl();
@@ -78,7 +78,7 @@
 		assertEquals(old,oNew);
 	}
 
-	private void testXml() throws Exception
+	public void testXml() throws Exception
 	{
 		DocumentBuilder oDB = DocumentBuilderFactory.newInstance().newDocumentBuilder();	
 		Document oDoc = oDB.newDocument();

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/rosetta/MessagePropertiesSerializeTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/rosetta/MessagePropertiesSerializeTest.java	2006-10-05 14:30:40 UTC (rev 6617)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/rosetta/MessagePropertiesSerializeTest.java	2006-10-05 14:58:32 UTC (rev 6618)
@@ -59,7 +59,7 @@
 		TESTFILE.delete();
 	}
 	
-	private void testJavaSerializable() throws Exception
+	public void testJavaSerializable() throws Exception
 	{
 		org.jboss.internal.soa.esb.message.format.serialized.PropertiesImpl
 		old = new  org.jboss.internal.soa.esb.message.format.serialized.PropertiesImpl();
@@ -77,7 +77,7 @@
 		assertEquals(old,oNew);
 	}
 
-	private void testXml() throws Exception
+	public void testXml() throws Exception
 	{
 		DocumentBuilder oDB = DocumentBuilderFactory.newInstance().newDocumentBuilder();	
 		Document oDoc = oDB.newDocument();