Author: ropalka Date: 2012-05-15 07:16:49 -0400 (Tue, 15 May 2012) New Revision: 16279 Removed: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss510.txt Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/pom.xml stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml Log: [JBPAPP-8917] fix JDK7 compilation issues Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java 2012-05-15 10:50:56 UTC (rev 16278) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java 2012-05-15 11:16:49 UTC (rev 16279) @@ -121,7 +121,7 @@ String serviceImplClass = null; // #1 Use the explicit @WebServiceRef.value - if (wsref != null && wsref.value() != Object.class) + if (wsref != null && wsref.value().getName() != null && !wsref.value().getName().equals(Object.class.getName())) serviceImplClass = wsref.value().getName(); // #2 Use the target ref type Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/pom.xml 2012-05-15 10:50:56 UTC (rev 16278) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/pom.xml 2012-05-15 11:16:49 UTC (rev 16279) @@ -318,16 +318,57 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</argLine> + <excludes> + <!-- # UsernameTestCase requires trustore in jboss-web tomcat configuration --> + <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude> + + <!-- # [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope --> + <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*</exclude> + + <!-- # [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext --> + <exclude>org/jboss/test/ws/jaxws/binding/**</exclude> + + <!-- # [CXF-1517] HTTP bindings for Provider --> + <exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude> + + <!-- # [CXF-1519] Explicitly set the namespace of a WebFault --> + <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> + + <!-- # [CXF-1521] Exception handling with @WebFault annotation --> + <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude> + + <!-- # [CXF-2006] RespectBinding feature and not understood required extensibility elements --> + <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude> + + <!-- # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored --> + <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude> + + <!-- # [JBWS-2596] Resource injection in jaxws endpoints and handlers --> + <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude> + + <!-- # [JBWS-2561] XOP request not properly inlined --> + <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> + + <!-- # [JBWS-2571] Mode.INOUT parameter not generated --> + <exclude>org/jboss/test/ws/jaxws/holder/**</exclude> + + <!-- # [JBWS-2480] Soap attachments are dropped on server response --> + <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> + + <!-- # [JBWS-2397] Fix jbws1797 testcase --> + <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude> + + <!-- # [JBWS-3020] Investigate why HandlerScopeTestCase fails --> + <exclude>org/jboss/test/ws/jaxws/handlerscope/*TestCase.*</exclude> + + <!-- # Seems MSFT interop. endpoints are down :( --> + <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude> + </excludes> </configuration> </plugin> </plugins> Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss510.txt 2012-05-15 10:50:56 UTC (rev 16278) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss510.txt 2012-05-15 11:16:49 UTC (rev 16279) @@ -1,47 +0,0 @@ -# UsernameTestCase requires trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.* - -# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* -org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* - -# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -org/jboss/test/ws/jaxws/binding/** - -# [CXF-1517] HTTP bindings for Provider -org/jboss/test/ws/jaxws/jbws1807/** - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-1521] Exception handling with @WebFault annotation -org/jboss/test/ws/jaxws/webfault/** - -# [CXF-2006] RespectBinding feature and not understood required extensibility elements -org/jboss/test/ws/jaxws/jbws2449/** - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [JBWS-2596] Resource injection in jaxws endpoints and handlers -org/jboss/test/ws/jaxws/jbws2074/** -org/jboss/test/ws/jaxws/jbws2634/** - -# [JBWS-2561] XOP request not properly inlined -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# [JBWS-2571] Mode.INOUT parameter not generated -org/jboss/test/ws/jaxws/holder/** - -# [JBWS-2480] Soap attachments are dropped on server response -org/jboss/test/ws/jaxws/jbws1283/** - -# [JBWS-2397] Fix jbws1797 testcase -org/jboss/test/ws/jaxws/jbws1797/** - -# [JBWS-3020] Investigate why HandlerScopeTestCase fails -org/jboss/test/ws/jaxws/handlerscope/*TestCase.* - -# Seems MSFT interop. endpoints are down :( -org/jboss/test/ws/jaxws/cxf/interop/wstrust10/** - Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2012-05-15 10:50:56 UTC (rev 16278) +++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2012-05-15 11:16:49 UTC (rev 16279) @@ -23,7 +23,7 @@ <parent> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-parent</artifactId> - <version>1.0.8.GA</version> + <version>1.0.8.SP1</version> </parent> <!-- Source Control Management -->