[jbossws-commits] JBossWS SVN: r15684 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus and 1 other directory.
Author: ropalka
Date: 2012-02-17 08:51:17 -0500 (Fri, 17 Feb 2012)
New Revision: 15684
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java
Log:
Merged revisions 15682 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r15682 | ropalka | 2012-02-17 14:45:17 +0100 (Fri, 17 Feb 2012) | 1 line
remove AS6 support
.......
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,15675
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15675,15682
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2012-02-17
13:45:53 UTC (rev 15683)
+++
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2012-02-17
13:51:17 UTC (rev 15684)
@@ -49,7 +49,7 @@
{
String host = getServerHost();
InitialContext iniCtx = getInitialContext();
- Object obj = iniCtx.lookup(isTargetJBoss6() ? "/EJB3Client/remote" :
"ejb:/jaxws-cxf-bus-ejb3-client//EJB3Client!" +
EJB3ClientRemoteInterface.class.getName());
+ Object obj =
iniCtx.lookup("ejb:/jaxws-cxf-bus-ejb3-client//EJB3Client!" +
EJB3ClientRemoteInterface.class.getName());
EJB3ClientRemoteInterface ejb3Remote = (EJB3ClientRemoteInterface)obj;
ejb3Remote.testBusCreation();
ejb3Remote.testSOAPConnection(host);