Author: ropalka
Date: 2012-05-11 07:40:50 -0400 (Fri, 11 May 2012)
New Revision: 16269
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/jboss-ejb-client.properties
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/jboss-ejb-client.properties
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties
Log:
Merged revisions 16230,16244-16245 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r16230 | ropalka | 2012-05-04 08:11:07 +0200 (Fri, 04 May 2012) | 1 line
sync. AS7 dependencies
.......
r16244 | ropalka | 2012-05-10 10:15:51 +0200 (Thu, 10 May 2012) | 1 line
sync. with AS 7.1.2.Final
.......
r16245 | ropalka | 2012-05-10 11:12:12 +0200 (Thu, 10 May 2012) | 1 line
don't rely on ejb client authentication fallbacks - fix regressions after 1.0.8
-> 1.0.10 ejb-client upgrade
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
-
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
+
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16230,16244-16245
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/jboss-ejb-client.properties
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/jboss-ejb-client.properties 2012-05-11
11:39:27 UTC (rev 16268)
+++
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/jboss-ejb-client.properties 2012-05-11
11:40:50 UTC (rev 16269)
@@ -3,3 +3,5 @@
remote.connection.default.host=(a)jboss.bind.address@
remote.connection.default.port=4447
remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
+remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false
+callback.handler.class=org.jboss.wsf.test.CallbackHandler
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/jboss-ejb-client.properties
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/jboss-ejb-client.properties 2012-05-11
11:39:27 UTC (rev 16268)
+++
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/jboss-ejb-client.properties 2012-05-11
11:40:50 UTC (rev 16269)
@@ -3,3 +3,5 @@
remote.connection.default.host=(a)jboss.bind.address@
remote.connection.default.port=4447
remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
+remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false
+callback.handler.class=org.jboss.wsf.test.CallbackHandler
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-05-11 11:39:27 UTC
(rev 16268)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-05-11 11:40:50 UTC
(rev 16269)
@@ -604,7 +604,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-remote-naming</artifactId>
- <version>1.0.2.Final</version>
+ <version>1.0.3.Final</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
@@ -613,7 +613,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-ejb-client</artifactId>
- <version>1.0.4.Final</version>
+ <version>1.0.10.Final</version>
<exclusions>
<exclusion>
<groupId>org.jboss.remoting3</groupId>
@@ -699,25 +699,25 @@
<dependency>
<groupId>org.jboss.remotingjmx</groupId>
<artifactId>remoting-jmx</artifactId>
- <version>1.0.2.Final</version>
+ <version>1.0.3.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.remoting3</groupId>
<artifactId>jboss-remoting</artifactId>
- <version>3.2.2.GA</version>
+ <version>3.2.7.GA</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-jms</artifactId>
- <version>2.2.13.Final</version>
+ <version>2.2.16.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-core</artifactId>
- <version>2.2.13.Final</version>
+ <version>2.2.16.Final</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties 2012-05-11
11:39:27 UTC (rev 16268)
+++
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties 2012-05-11
11:40:50 UTC (rev 16269)
@@ -3,3 +3,5 @@
remote.connection.default.host=(a)jboss.bind.address@
remote.connection.default.port=4447
remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
+remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false
+callback.handler.class=org.jboss.wsf.test.CallbackHandler