[jboss-svn-commits] JBL Code SVN: r6596 - in labs/jbossesb/trunk: product/core/listeners/src/org/jboss/soa/esb/listeners product/core/rosetta/src/org/jboss/soa/esb/common product/core/services/src/org/jboss/soa/esb/services/beans qa/junit qa/junit/src/org/jboss/soa/esb/util
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Oct 4 13:49:12 EDT 2006
Author: tfennelly
Date: 2006-10-04 13:49:01 -0400 (Wed, 04 Oct 2006)
New Revision: 6596
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/GpListener.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/beans/PersistHandlerBean.java
labs/jbossesb/trunk/qa/junit/build.xml
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/ListenerUtils.java
Log:
Some fixes and logs to get the QA tests to run - still broken.
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/GpListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/GpListener.java 2006-10-04 17:44:04 UTC (rev 6595)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/GpListener.java 2006-10-04 17:49:01 UTC (rev 6596)
@@ -159,6 +159,8 @@
private ActionDefinitionFactory actionDefinitionFactory;
+ private static CommandQueue defaultCommandQueue = null;
+
/**
* Construct a Listener Manager from the named repository based
* configuration.
@@ -288,13 +290,18 @@
}
}
- return null;
-
- // Default command queue...
-// return new JmsCommandQueue();
+ return defaultCommandQueue;
}
/**
+ * Allows a default command queue to be set statically for all GpListener instances.
+ * @param defaultCommandQueue The defaultCommandQueue to set.
+ */
+ public static void setDefaultCommandQueue(CommandQueue defaultCommandQueue) {
+ GpListener.defaultCommandQueue = defaultCommandQueue;
+ }
+
+ /**
* Main execution loop <p/> Will continue to run until either <p/>a) run
* time is expired <p/>b) quiesce command is received in command queue
* <p/>For every child element that contains a PARM_LISTENER_CLASS
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-04 17:44:04 UTC (rev 6595)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java 2006-10-04 17:49:01 UTC (rev 6596)
@@ -32,7 +32,10 @@
package org.jboss.soa.esb.common;
import java.util.Hashtable;
+import java.util.Properties;
+import org.apache.log4j.Logger;
+
import com.arjuna.common.internal.util.propertyservice.plugins.io.XMLFilePlugin;
import com.arjuna.common.util.propertyservice.PropertyManager;
import com.arjuna.common.util.propertyservice.PropertyManagerFactory;
@@ -72,6 +75,8 @@
*/
public class ModulePropertyManager
{
+ private static Logger logger = Logger.getLogger(ModulePropertyManager.class);
+
/*
* The names of the various modules in the property file.
*/
@@ -101,8 +106,9 @@
{
theManager = initialise(name);
- if (theManager != null)
+ if (theManager != null) {
managers.put(name, theManager);
+ }
}
return theManager;
@@ -125,11 +131,31 @@
try
{
+ Properties properties = propertyManager.getProperties();
+ int propertyCountBefore = 0;
+
+ if(properties != null) {
+ propertyCountBefore = properties.size();
+ }
+ if(logger.isDebugEnabled()) {
+ logger.debug("PropertyManager contents before loading properties file [" + propertiesFilename + "]: " + properties);
+ }
+
+ logger.info("Loading properties file: " + propertiesFilename);
propertyManager.load(XMLFilePlugin.class.getName(),
propertiesFilename);
+
+ properties = propertyManager.getProperties();
+ if(properties != null && properties.size() == propertyCountBefore) {
+ logger.warn("No change in property count [" + properties.size() + "] after loading properties file: " + propertiesFilename);
+ }
+
+ if(logger.isDebugEnabled()) {
+ logger.debug("PropertyManager contents after loading properties file [" + propertiesFilename + "]: " + properties);
+ }
} catch (Exception e)
{
- e.printStackTrace();
+ logger.error("Failed to load properties file: " + propertiesFilename, e);
return null;
}
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/beans/PersistHandlerBean.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/beans/PersistHandlerBean.java 2006-10-04 17:44:04 UTC (rev 6595)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/beans/PersistHandlerBean.java 2006-10-04 17:49:01 UTC (rev 6596)
@@ -98,7 +98,7 @@
}
catch (Exception e)
{ m_oLogger.error("EJB Create Failed <"+e.getMessage()+">");
- throw new Exception(e.getMessage());
+ throw e;
}
} //__________________________________
Modified: labs/jbossesb/trunk/qa/junit/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/build.xml 2006-10-04 17:44:04 UTC (rev 6595)
+++ labs/jbossesb/trunk/qa/junit/build.xml 2006-10-04 17:49:01 UTC (rev 6596)
@@ -11,15 +11,25 @@
<property name="qa.junit.src" value="src"/>
<property name="qa.junit.classes" value="${qa.build}/junit/classes"/>
<property name="qa.junit.report" value="${qa.build}/junit/report" />
-
- <path id="qa.junit.cp">
- <fileset dir="${coverage}/all/" includes="jbossesb-instr-all.jar" />
+
+ <path id="base.cp">
<fileset dir="${qa.lib}/ext" includes="*.jar" />
<fileset dir="${build.lib}/ext" includes="*.jar" />
<fileset dir="${build.lib}/ext/ejb3" includes="*.jar" />
+ <fileset dir="${build.lib}/ext/ejb3_embedded" includes="*.jar" />
<pathelement location="../" />
</path>
+ <path id="qa.junit.cp">
+ <fileset dir="${product.lib}" includes="*.jar" />
+ <path refid="base.cp"/>
+ </path>
+
+ <path id="qa.junit.emma.cp">
+ <fileset dir="${coverage}/all" includes="jbossesb-instr-all.jar" />
+ <path refid="base.cp"/>
+ </path>
+
<target name="test">
<echo message="Running JUnit based QA tests..."/>
@@ -49,6 +59,63 @@
<pathelement location="${qa.junit.src}"/>
</classpath>
+ <!-- Listener Sys Props... -->
+ <sysproperty key="org.jboss.soa.esb.paramsRepository.file.root" value="junit/src" />
+
+ <!-- Sys Props from the test.properties file... -->
+ <sysproperty key="org.jboss.soa.esb.jndi.server.type" value="${org.jboss.soa.esb.jndi.server.type}" />
+ <sysproperty key="org.jboss.soa.esb.jndi.server.url" value="${org.jboss.soa.esb.jndi.server.url}" />
+
+ <!-- Sys Props from the deployment.properties file... -->
+ <sysproperty key="org.jboss.esb.db.driver" value="${org.jboss.esb.db.driver}" />
+ <sysproperty key="org.jboss.esb.db.url" value="${org.jboss.esb.db.url}" />
+ <sysproperty key="org.jboss.esb.db.user" value="${org.jboss.esb.db.user}" />
+ <sysproperty key="org.jboss.esb.db.password" value="${org.jboss.esb.db.password}" />
+ </junit>
+
+ <!-- Remove all "fixed-up" listener configuration files -->
+ <delete><fileset dir="${qa.junit.src}" includes="**/*.conftmp" /></delete>
+
+ <!-- Report on the tests (format results) ... -->
+ <junitreport todir="${qa.junit.report}">
+ <fileset dir="${qa.junit.report}">
+ <include name="*.xml"/>
+ </fileset>
+ <report format="frames" todir="${qa.junit.report}"/>
+ <report format="noframes" todir="${qa.junit.report}"/>
+ </junitreport>
+
+ </target>
+
+ <target name="test-emma">
+ <echo message="Running JUnit based QA tests (with ema enabled) ..."/>
+
+ <!-- Build the tests... -->
+ <mkdir dir="${qa.junit.classes}"/>
+ <javac srcdir="${qa.junit.src}" destdir="${qa.junit.classes}" classpathref="qa.junit.emma.cp" debug="on" />
+
+ <echo message="" />
+ <echo message="" />
+ <input message='Which tests? (Press return to run all tests - Wildcards Supported - already assumes test cases end with the "Test" suffix)'
+ addproperty="tests.filter"
+ defaultvalue="*"/>
+
+ <!-- Run the tests... -->
+ <mkdir dir="${qa.junit.report}"/>
+ <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="yes" fork="true">
+ <formatter type="plain" usefile="false"/>
+ <formatter type="xml"/>
+ <batchtest todir="${qa.junit.report}">
+ <fileset dir="${qa.junit.src}">
+ <include name="**/${tests.filter}Test.java"/>
+ </fileset>
+ </batchtest>
+ <classpath>
+ <pathelement location="${qa.junit.classes}"/>
+ <path refid="qa.junit.emma.cp"/>
+ <pathelement location="${qa.junit.src}"/>
+ </classpath>
+
<!-- emma jvm args -->
<jvmarg value="-Demma.coverage.out.file=../product/build/tests/coverage/all/coverage.emma" />
<jvmarg value="-Demma.coverage.out.merge=true" />
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/ListenerUtils.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/ListenerUtils.java 2006-10-04 17:44:04 UTC (rev 6595)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/ListenerUtils.java 2006-10-04 17:49:01 UTC (rev 6596)
@@ -28,6 +28,7 @@
import junit.framework.TestCase;
import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.command.JmsCommandQueue;
import org.jboss.internal.soa.esb.parameters.ParamFileRepository;
import org.jboss.soa.esb.listeners.GpListener;
import org.jboss.soa.esb.parameters.ParamRepositoryException;
@@ -79,6 +80,7 @@
*/
public static GpListener createGpListener(String paramName) throws Exception {
fixUpConfig(paramName);
+ GpListener.setDefaultCommandQueue(new JmsCommandQueue());
return new GpListener(paramName + CONFIG_TMP_EXT);
}
More information about the jboss-svn-commits
mailing list