Author: ropalka Date: 2011-12-07 09:28:26 -0500 (Wed, 07 Dec 2011) New Revision: 15362 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java stack/cxf/trunk/modules/testsuite/pom.xml Log: enabling tests plus fixing excludes Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-12-06 19:33:25 UTC (rev 15361) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-12-07 14:28:26 UTC (rev 15362) @@ -58,6 +58,9 @@ <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/bus/META-INF"> <include name="wsdl/**/*" /> </metainf> + <manifest> + <attribute name="Dependencies" value="org.apache.cxf"/> + </manifest> </jar> <!-- jaxws-cxf-bus-servlet-client --> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2011-12-06 19:33:25 UTC (rev 15361) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2011-12-07 14:28:26 UTC (rev 15362) @@ -49,7 +49,8 @@ { String host = getServerHost(); InitialContext iniCtx = getInitialContext(); - EJB3ClientRemoteInterface ejb3Remote = (EJB3ClientRemoteInterface)iniCtx.lookup("/EJB3Client/remote"); + Object obj = iniCtx.lookup(isTargetJBoss6() ? "/EJB3Client/remote" : "ejb:/jaxws-cxf-bus-ejb3-client//EJB3Client!" + EJB3ClientRemoteInterface.class.getName()); + EJB3ClientRemoteInterface ejb3Remote = (EJB3ClientRemoteInterface)obj; ejb3Remote.testBusCreation(); ejb3Remote.testSOAPConnection(host); ejb3Remote.testWebServiceClient(host); Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-12-06 19:33:25 UTC (rev 15361) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-12-07 14:28:26 UTC (rev 15362) @@ -1624,7 +1624,6 @@ <configuration> <testExcludes> <!-- EJB3 client API dependencies --> - <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> </testExcludes> </configuration> @@ -1696,21 +1695,18 @@ <!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher --> <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> - <!-- # [JBWS-3234] JNDI over RMI not available on AS7 --> - <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude> - <exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude> - <!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on AS7 --> <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude> - <!-- JAXR not available --> + <!-- # TODO: JAXR not available --> <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - <!-- TODO: JSR109 w/ jaxrpc, remote JNDI support --> - <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude> + <!-- # TODO: appclient --> + <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase*</exclude> + + <!-- # TODO: remote JNDI support (non EJB objects) --> + <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase*</exclude> </excludes>