[jboss-cvs] JBossAS SVN: r91244 - in branches/dml-log-service-integration: connector/src/main/org/jboss/resource/adapter/jms/inflow and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 14 16:14:28 EDT 2009
Author: david.lloyd at jboss.com
Date: 2009-07-14 16:14:27 -0400 (Tue, 14 Jul 2009)
New Revision: 91244
Modified:
branches/dml-log-service-integration/cluster/src/etc/hapartition-jboss-beans.xml
branches/dml-log-service-integration/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsServerSession.java
branches/dml-log-service-integration/testsuite/build.xml
branches/dml-log-service-integration/testsuite/imports/sections/classloader.xml
branches/dml-log-service-integration/testsuite/imports/sections/isolation.xml
branches/dml-log-service-integration/testsuite/imports/sections/jsf.xml
branches/dml-log-service-integration/testsuite/imports/sections/web.xml
branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/cluster/web/persistent/MockDataSource.java
Log:
Merge from trunk: -r91224:91240
Modified: branches/dml-log-service-integration/cluster/src/etc/hapartition-jboss-beans.xml
===================================================================
--- branches/dml-log-service-integration/cluster/src/etc/hapartition-jboss-beans.xml 2009-07-14 20:13:56 UTC (rev 91243)
+++ branches/dml-log-service-integration/cluster/src/etc/hapartition-jboss-beans.xml 2009-07-14 20:14:27 UTC (rev 91244)
@@ -43,7 +43,7 @@
<property name="methodCallTimeout">60000</property>
<!-- Optionally provide a thread source to allow async connect of our channel -->
- <property name="threadPool"><inject bean="ThreadPool"/></property>
+ <property name="threadPool"><inject bean="LongRunningTasksThreadPool"/></property>
<property name="distributedStateImpl">
<bean name="DistributedState"
Modified: branches/dml-log-service-integration/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsServerSession.java
===================================================================
--- branches/dml-log-service-integration/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsServerSession.java 2009-07-14 20:13:56 UTC (rev 91243)
+++ branches/dml-log-service-integration/connector/src/main/org/jboss/resource/adapter/jms/inflow/JmsServerSession.java 2009-07-14 20:14:27 UTC (rev 91244)
@@ -167,7 +167,8 @@
{
try
{
- endpoint.beforeDelivery(JmsActivation.ONMESSAGE);
+ if (!(txnStrategy != null && txnStrategy instanceof TraditionalXATransactionDemarcationStrategy))
+ endpoint.beforeDelivery(JmsActivation.ONMESSAGE);
try
{
@@ -179,7 +180,8 @@
}
} finally
{
- endpoint.afterDelivery();
+ if (!(txnStrategy != null && txnStrategy instanceof TraditionalXATransactionDemarcationStrategy))
+ endpoint.afterDelivery();
if (dlqHandler != null)
dlqHandler.messageDelivered(message);
Modified: branches/dml-log-service-integration/testsuite/build.xml
===================================================================
--- branches/dml-log-service-integration/testsuite/build.xml 2009-07-14 20:13:56 UTC (rev 91243)
+++ branches/dml-log-service-integration/testsuite/build.xml 2009-07-14 20:14:27 UTC (rev 91244)
@@ -121,12 +121,12 @@
<!-- The combined library classpath -->
<path id="library.classpath">
- <path refid="apache.avalon.classpath"/>
+ <fileset refid="apache-avalon:avalon-framework:jar"/>
<path refid="apache.commons.classpath"/>
<fileset refid="apache-httpclient:commons-httpclient:jar"/>
- <path refid="apache.codec.classpath"/>
- <path refid="apache.log4j.classpath"/>
- <path refid="apache.jaxme.classpath"/>
+ <fileset refid="commons-codec:commons-codec:jar"/>
+ <fileset refid="log4j:log4j:jar"/>
+ <fileset refid="apache-jaxme:jaxmexs:jar"/>
<path refid="apache.scout.classpath"/>
<path refid="apache.xerces.classpath"/>
<path refid="org.apache.classpath"/>
@@ -175,7 +175,7 @@
<!-- needed for messaging JMS provider tests -->
<path refid="jboss.messaging.classpath"/>
<!-- needed for proxy tests -->
- <path refid="apache.bcel.classpath"/>
+ <fileset refid="bcel:bcel:jar"/>
<!-- needed for security login module tests -->
<path refid="hsqldb.hsqldb.classpath"/>
<!-- Need hibernate jar for hibernate-based tests -->
Modified: branches/dml-log-service-integration/testsuite/imports/sections/classloader.xml
===================================================================
--- branches/dml-log-service-integration/testsuite/imports/sections/classloader.xml 2009-07-14 20:13:56 UTC (rev 91243)
+++ branches/dml-log-service-integration/testsuite/imports/sections/classloader.xml 2009-07-14 20:14:27 UTC (rev 91244)
@@ -226,12 +226,8 @@
Also, commons-logging.jar is needed as well (since it doesn't exist in the AS
and is only emulated)
-->
- <lib dir="${apache.log4j.lib}">
- <include name="log4j.jar" />
- </lib>
- <lib dir="${apache.logging.lib}">
- <include name="commons-logging.jar" />
- </lib>
+ <lib refid="log4j:log4j:jar"/>
+ <lib refid="commons-logging:commons-logging:jar"/>
<classes dir="${build.classes}">
<include
name="org/jboss/test/classloader/scoping/override/web/comlog/*"/>
@@ -326,9 +322,7 @@
<fileset dir="${build.resources}/classloader/leak/war">
<include name="simple.jsp"/>
</fileset>
- <lib dir="${apache.logging.lib}">
- <include name="commons-logging.jar"/>
- </lib>
+ <lib refid="commons-logging:commons-logging:jar"/>
</war>
<war destfile="${build.lib}/classloader-leak-simple-ejb.war"
webxml="${build.resources}/classloader/leak/war/ejb2/WEB-INF/web.xml">
@@ -355,9 +349,7 @@
<fileset dir="${build.resources}/classloader/leak/war/ejb2">
<include name="*.jsp"/>
</fileset>
- <lib dir="${apache.logging.lib}">
- <include name="commons-logging.jar"/>
- </lib>
+ <lib refid="commons-logging:commons-logging:jar"/>
</war>
<jar destfile="${build.lib}/classloader-leak-ejb.jar"
manifest="${build.resources}/classloader/leak/ejb/META-INF/MANIFEST.MF">
@@ -406,8 +398,9 @@
</fileset>
</ear>
<mkdir dir="${build.resources}/classloader/leak/ear/lib"/>
- <copy todir="${build.resources}/classloader/leak/ear/lib"
- file="${apache.logging.lib}/commons-logging.jar"/>
+ <copy todir="${build.resources}/classloader/leak/ear/lib">
+ <fileset refid="commons-logging:commons-logging:jar"/>
+ </copy>
<ear destfile="${build.lib}/classloader-leak-in-ear.ear"
appxml="${build.resources}/classloader/leak/ear/META-INF/application-jcl.xml">
<fileset dir="${build.lib}">
Modified: branches/dml-log-service-integration/testsuite/imports/sections/isolation.xml
===================================================================
--- branches/dml-log-service-integration/testsuite/imports/sections/isolation.xml 2009-07-14 20:13:56 UTC (rev 91243)
+++ branches/dml-log-service-integration/testsuite/imports/sections/isolation.xml 2009-07-14 20:14:27 UTC (rev 91244)
@@ -59,9 +59,7 @@
<classes dir="${build.resources}/isolation/c/war/WEB-INF/classes">
<include name="**/*"/>
</classes>
- <lib dir="${apache.log4j.lib}">
- <include name="log4j.jar"/>
- </lib>
+ <lib refid="log4j:log4j:jar"/>
</war>
<!-- build isolationC.ear -->
Modified: branches/dml-log-service-integration/testsuite/imports/sections/jsf.xml
===================================================================
--- branches/dml-log-service-integration/testsuite/imports/sections/jsf.xml 2009-07-14 20:13:56 UTC (rev 91243)
+++ branches/dml-log-service-integration/testsuite/imports/sections/jsf.xml 2009-07-14 20:14:27 UTC (rev 91244)
@@ -1,6 +1,6 @@
<project name="tests-jsf-jars">
<!-- jsf test -->
- <target name="_jars-jsf">
+ <target name="_jars-jsf" depends="init">
<mkdir dir="${build.lib}"/>
<!-- build jbosstest-jsf.war -->
<war destfile="${build.lib}/jbosstest-jsf.war"
@@ -21,26 +21,14 @@
<!-- make WAR for testing legacy WARs that bundle MyFaces -->
<war destfile="${build.lib}/bundled-myfaces-hellojsf.war"
webxml="${build.resources}/web/WEB-INF/bundled-myfaces-jsf.xml">
- <lib dir="${apache.myfaces.lib}">
- <include name="myfaces-api-1.1.3.jar"/>
- <include name="myfaces-impl-1.1.3.jar"/>
- <include name="jstl-1.1.0.jar"/>
- </lib>
- <lib dir="${apache.beanutils.lib}">
- <include name="commons-beanutils.jar"/>
- </lib>
- <lib dir="${apache.codec.lib}">
- <include name="commons-codec.jar"/>
- </lib>
- <lib dir="${apache.collections.lib}">
- <include name="commons-collections.jar"/>
- </lib>
- <lib dir="${apache.digester.lib}">
- <include name="commons-digester.jar"/>
- </lib>
- <lib dir="${apache.lang.lib}">
- <include name="commons-lang.jar"/>
- </lib>
+ <lib refid="apache-myfaces:myfaces-api:jar"/>
+ <lib refid="apache-myfaces:myfaces-impl:jar"/>
+ <!--<lib refid="javax.servlet:jstl:jar"/>-->
+ <lib refid="commons-beanutils:commons-beanutils:jar"/>
+ <lib refid="commons-codec:commons-codec:jar"/>
+ <lib refid="commons-collections:commons-collections:jar"/>
+ <lib refid="commons-digester:commons-digester:jar"/>
+ <lib refid="commons-lang:commons-lang:jar"/>
<lib dir="${commons.el.lib}">
<include name="commons-el.jar"/>
</lib>
Modified: branches/dml-log-service-integration/testsuite/imports/sections/web.xml
===================================================================
--- branches/dml-log-service-integration/testsuite/imports/sections/web.xml 2009-07-14 20:13:56 UTC (rev 91243)
+++ branches/dml-log-service-integration/testsuite/imports/sections/web.xml 2009-07-14 20:14:27 UTC (rev 91244)
@@ -764,9 +764,7 @@
<webinf dir="${build.resources}/web/class-loading">
<include name="jboss-web.xml"/>
</webinf>
- <lib dir="${apache.log4j.lib}">
- <include name="log4j.jar" />
- </lib>
+ <lib refid="log4j:log4j:jar"/>
<lib dir="${build.lib}">
<include name="jbosstest-web-util.jar"/>
<include name="resources.jar"/>
Modified: branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/cluster/web/persistent/MockDataSource.java
===================================================================
--- branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/cluster/web/persistent/MockDataSource.java 2009-07-14 20:13:56 UTC (rev 91243)
+++ branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/cluster/web/persistent/MockDataSource.java 2009-07-14 20:14:27 UTC (rev 91244)
@@ -76,4 +76,14 @@
this.loginTimeout = seconds;
}
+ public boolean isWrapperFor(Class<?> iface) throws SQLException
+ {
+ return false;
+ }
+
+ public <T> T unwrap(Class<T> iface) throws SQLException
+ {
+ throw new SQLException("No wrapper");
+ }
+
}
More information about the jboss-cvs-commits
mailing list