Author: ropalka Date: 2012-05-15 06:50:56 -0400 (Tue, 15 May 2012) New Revision: 16278 Removed: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/test-excludes-jboss510.txt Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml stack/native/branches/jbossws-native-3.1.2/pom.xml Log: [JBPAPP-8917] fix JDK7 compilation issues Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java 2012-05-11 15:28:32 UTC (rev 16277) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java 2012-05-15 10:50:56 UTC (rev 16278) @@ -122,7 +122,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/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2012-05-11 15:28:32 UTC (rev 16277) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2012-05-15 10:50:56 UTC (rev 16278) @@ -344,13 +344,6 @@ <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> @@ -359,6 +352,16 @@ <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement> </additionalClasspathElements> + <excludes> + <!--# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration --> + <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude> + + <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored --> + <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude> + + <!--# [JBWS-2217] Fix BPEL jaxrpc samples --> + <exclude>org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*</exclude> + </excludes> </configuration> </plugin> </plugins> Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/test-excludes-jboss510.txt 2012-05-11 15:28:32 UTC (rev 16277) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/test-excludes-jboss510.txt 2012-05-15 10:50:56 UTC (rev 16278) @@ -1,9 +0,0 @@ -# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [JBWS-2217] Fix BPEL jaxrpc samples -org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* - Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/pom.xml 2012-05-11 15:28:32 UTC (rev 16277) +++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2012-05-15 10:50:56 UTC (rev 16278) @@ -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 -->