You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2009/03/26 17:00:01 UTC
svn commit: r758708 - in /cxf/branches/2.1.x-fixes: ./
distribution/src/main/release/samples/integration/JBI/service-engine/build.xml
rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
Author: sergeyb
Date: Thu Mar 26 15:59:42 2009
New Revision: 758708
URL: http://svn.apache.org/viewvc?rev=758708&view=rev
Log:
Merged revisions 758690 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r758690 | sergeyb | 2009-03-26 15:38:06 +0000 (Thu, 26 Mar 2009) | 1 line
Updating Coloc binding test to use a thread-safe EasyMock control, updating classpath for integration demos
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml
cxf/branches/2.1.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 26 15:59:42 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml?rev=758708&r1=758707&r2=758708&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml Thu Mar 26 15:59:42 2009
@@ -43,6 +43,7 @@
<include name="geronimo-jaxws_2.1_spec-1.0.jar"/>
<include name="geronimo-annotation_1.0_spec-*.jar"/>
<include name="geronimo-ws-metadata_2.0_spec-*.jar"/>
+ <include name="org.apache.servicemix.specs.jbi-api-*.jar"/>
<include name="xml-resolver-*.jar"/>
<include name="saaj*.jar"/>
<include name="XmlSchema-*.jar"/>
Modified: cxf/branches/2.1.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java?rev=758708&r1=758707&r2=758708&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java (original)
+++ cxf/branches/2.1.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java Thu Mar 26 15:59:42 2009
@@ -61,6 +61,10 @@
private Message msg;
private Exchange ex;
+ public ColocOutInterceptorTest() {
+ control.makeThreadSafe(true);
+ }
+
@Before
public void setUp() throws Exception {
colocOut = new ColocOutInterceptor();