JBossWS SVN: r15076 - in shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws: jbws2074/usecase3/service and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-11 08:09:33 -0400 (Tue, 11 Oct 2011)
New Revision: 15076
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.java
Log:
fixing tests - JAXWS handlers cannot be final classes
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java 2011-10-11 08:39:26 UTC (rev 15075)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java 2011-10-11 12:09:33 UTC (rev 15076)
@@ -40,7 +40,7 @@
*
* @author ropalka(a)redhat.com
*/
-public final class DescriptorResourcesHandler extends GenericSOAPHandler
+public class DescriptorResourcesHandler extends GenericSOAPHandler
{
// provide logging
private static final Logger log = Logger.getLogger(DescriptorResourcesHandler.class);
@@ -172,12 +172,12 @@
// XML driven injection
private String string0;
- private String _string1;
+ private String string1;
// XML driven injection
private void setString1(String s)
{
- this._string1 = s;
+ this.string1 = s;
}
/**
@@ -292,7 +292,7 @@
log.error("Descriptor driven initialization for string0 failed");
correctInitialization = false;
}
- if ("s".equals(this._string1) == false)
+ if ("s".equals(this.string1) == false)
{
log.error("Descriptor driven initialization for string1 failed");
correctInitialization = false;
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.java 2011-10-11 08:39:26 UTC (rev 15075)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.java 2011-10-11 12:09:33 UTC (rev 15076)
@@ -41,7 +41,7 @@
*
* @author ropalka(a)redhat.com
*/
-public final class JavaResourcesHandler extends GenericSOAPHandler
+public class JavaResourcesHandler extends GenericSOAPHandler
{
// provide logging
private static final Logger log = Logger.getLogger(JavaResourcesHandler.class);
@@ -170,12 +170,12 @@
* java.lang.String
*/
- @Resource
+ @Resource(name = "string")
private String string;
private String _string1;
- @Resource
+ @Resource(name = "string")
private void setString(String s)
{
this._string1 = s;
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.java 2011-10-11 08:39:26 UTC (rev 15075)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.java 2011-10-11 12:09:33 UTC (rev 15076)
@@ -164,12 +164,12 @@
* java.lang.String
*/
- @Resource
- private String string;
+ @Resource(name = "string")
+ private String string0;
private String _string1;
- @Resource
+ @Resource(name = "string")
private void setString(String s)
{
this._string1 = s;
@@ -282,7 +282,7 @@
}
// java.lang.String
- if ("s".equals(this.string) == false)
+ if ("s".equals(this.string0) == false)
{
log.error("@Resource initialization for string0 failed");
correctInitialization = false;
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.java 2011-10-11 08:39:26 UTC (rev 15075)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.java 2011-10-11 12:09:33 UTC (rev 15076)
@@ -40,12 +40,12 @@
*
* @author <a href="mailto:richard.opalka@jboss.org">Richard Opalka</a>
*/
-public final class TestHandler extends GenericSOAPHandler
+public class TestHandler extends GenericSOAPHandler
{
// provide logging
private static final Logger log = Logger.getLogger(TestHandler.class);
- @Resource
+ @Resource(name="boolean1")
private Boolean boolean1;
@EJB