Author: richard.opalka(a)jboss.com
Date: 2011-07-27 08:44:16 -0400 (Wed, 27 Jul 2011)
New Revision: 14754
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java
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/usecase2/service/EJB3Impl.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.java
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-INF/ejb-jar.xml
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1/WEB-INF/web.xml
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2/META-INF/ejb-jar.xml
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3/WEB-INF/web.xml
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4/META-INF/ejb-jar.xml
Log:
[JBWS-3334] fixing injection method lookup algorithm
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java 2011-07-27
12:22:45 UTC (rev 14753)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java 2011-07-27
12:44:16 UTC (rev 14754)
@@ -42,23 +42,23 @@
@WebServiceRef(value = EndpointService.class,
mappedName="jbossws-client/service/TestService",
wsdlLocation="META-INF/wsdl/TestService.wsdl")
EndpointInterface endpoint1;
- EndpointInterface endpoint2;
+ EndpointInterface _endpoint2;
@WebServiceRef(value = EndpointService.class,
mappedName="jbossws-client/service/TestService",
wsdlLocation="META-INF/wsdl/TestService.wsdl")
public void setEndpoint2(EndpointInterface endpoint2)
{
- this.endpoint2 = endpoint2;
+ this._endpoint2 = endpoint2;
}
// via XML
EndpointInterface endpoint3;
// via XML
- EndpointInterface endpoint4;
+ EndpointInterface _endpoint4;
public void setEndpoint4(EndpointInterface endpoint4)
{
- this.endpoint4 = endpoint4;
+ this._endpoint4 = endpoint4;
}
@@ -72,10 +72,10 @@
public String echo2(String string) throws Exception
{
- if(null==endpoint2)
+ if(null==_endpoint2)
throw new IllegalArgumentException("Serviceref for property
'endpoint2' not injected");
- return endpoint2.echo(string);
+ return _endpoint2.echo(string);
}
public String echo3(String string) throws Exception
@@ -88,10 +88,10 @@
public String echo4(String string) throws Exception
{
- if(null==endpoint4)
+ if(null==_endpoint4)
throw new IllegalArgumentException("Serviceref for property
'endpoint4' not injected");
- return endpoint4.echo(string);
+ return _endpoint4.echo(string);
}
}
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-07-27
12:22:45 UTC (rev 14753)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java 2011-07-27
12:44:16 UTC (rev 14754)
@@ -52,12 +52,12 @@
// XML driven injection
private Boolean boolean0;
- private Boolean boolean1;
+ private Boolean _boolean1;
// XML driven injection
private void setBoolean1(Boolean b)
{
- this.boolean1 = b;
+ this._boolean1 = b;
}
/**
@@ -67,12 +67,12 @@
// XML driven injection
private Byte byte0;
- private Byte byte1;
+ private Byte _byte1;
// XML driven injection
private void setByte1(Byte b)
{
- this.byte1 = b;
+ this._byte1 = b;
}
/**
@@ -82,12 +82,12 @@
// XML driven injection
private Character character0;
- private Character character1;
+ private Character _character1;
// XML driven injection
private void setCharacter1(Character c)
{
- this.character1 = c;
+ this._character1 = c;
}
/**
@@ -97,12 +97,12 @@
// XML driven injection
private Short short0;
- private Short short1;
+ private Short _short1;
// XML driven injection
private void setShort1(Short i)
{
- this.short1 = i;
+ this._short1 = i;
}
/**
@@ -112,12 +112,12 @@
// XML driven injection
private Integer integer0;
- private Integer integer1;
+ private Integer _integer1;
// XML driven injection
private void setInteger1(Integer i)
{
- this.integer1 = i;
+ this._integer1 = i;
}
/**
@@ -127,12 +127,12 @@
// XML driven injection
private Long long0;
- private Long long1;
+ private Long _long1;
// XML driven injection
private void setLong1(Long l)
{
- this.long1 = l;
+ this._long1 = l;
}
/**
@@ -142,12 +142,12 @@
// XML driven injection
private Float float0;
- private Float float1;
+ private Float _float1;
// XML driven injection
private void setFloat1(Float f)
{
- this.float1 = f;
+ this._float1 = f;
}
/**
@@ -157,12 +157,12 @@
// XML driven injection
private Double double0;
- private Double double1;
+ private Double _double1;
// XML driven injection
private void setDouble1(Double d)
{
- this.double1 = d;
+ this._double1 = d;
}
/**
@@ -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;
}
/**
@@ -196,7 +196,7 @@
log.error("Descriptor driven initialization for boolean0 failed");
correctInitialization = false;
}
- if (this.boolean1 == null || this.boolean1 != true)
+ if (this._boolean1 == null || this._boolean1 != true)
{
log.error("Descriptor driven initialization for boolean1 failed");
correctInitialization = false;
@@ -208,7 +208,7 @@
log.error("Descriptor driven initialization for byte0 failed");
correctInitialization = false;
}
- if (this.byte1 == null || this.byte1 != (byte)1)
+ if (this._byte1 == null || this._byte1 != (byte)1)
{
log.error("Descriptor driven initialization for byte1 failed");
correctInitialization = false;
@@ -220,7 +220,7 @@
log.error("Descriptor driven initialization for character0 failed");
correctInitialization = false;
}
- if (this.character1 == null || this.character1 != 'c')
+ if (this._character1 == null || this._character1 != 'c')
{
log.error("Descriptor driven initialization for character1 failed");
correctInitialization = false;
@@ -232,7 +232,7 @@
log.error("Descriptor driven initialization for short0 failed");
correctInitialization = false;
}
- if (this.short1 == null || this.short1 != (short)5)
+ if (this._short1 == null || this._short1 != (short)5)
{
log.error("Descriptor driven initialization for short1 failed");
correctInitialization = false;
@@ -244,7 +244,7 @@
log.error("Descriptor driven initialization for integer0 failed");
correctInitialization = false;
}
- if (this.integer1 == null || this.integer1 != 7)
+ if (this._integer1 == null || this._integer1 != 7)
{
log.error("Descriptor driven initialization for integer1 failed");
correctInitialization = false;
@@ -256,7 +256,7 @@
log.error("Descriptor driven initialization for long0 failed");
correctInitialization = false;
}
- if (this.long1 == null || this.long1 != 11L)
+ if (this._long1 == null || this._long1 != 11L)
{
log.error("Descriptor driven initialization for long1 failed");
correctInitialization = false;
@@ -268,7 +268,7 @@
log.error("Descriptor driven initialization for float0 failed");
correctInitialization = false;
}
- if (this.float1 == null || this.float1 != 13.0f)
+ if (this._float1 == null || this._float1 != 13.0f)
{
log.error("Descriptor driven initialization for float1 failed");
correctInitialization = false;
@@ -280,7 +280,7 @@
log.error("Descriptor driven initialization for double0 failed");
correctInitialization = false;
}
- if (this.double1 == null || this.double1 != 17.0)
+ if (this._double1 == null || this._double1 != 17.0)
{
log.error("Descriptor driven initialization for double1 failed");
correctInitialization = false;
@@ -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-07-27
12:22:45 UTC (rev 14753)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.java 2011-07-27
12:44:16 UTC (rev 14754)
@@ -53,12 +53,12 @@
@Resource(name = "boolean")
private Boolean boolean0;
- private Boolean boolean1;
+ private Boolean _boolean1;
@Resource(name = "boolean")
private void setBoolean1(Boolean b)
{
- this.boolean1 = b;
+ this._boolean1 = b;
}
/**
@@ -68,12 +68,12 @@
@Resource(name = "byte")
private Byte byte0;
- private Byte byte1;
+ private Byte _byte1;
@Resource(name = "byte")
private void setByte1(Byte b)
{
- this.byte1 = b;
+ this._byte1 = b;
}
/**
@@ -83,12 +83,12 @@
@Resource(name = "character")
private Character character0;
- private Character character1;
+ private Character _character1;
@Resource(name = "character")
private void setCharacter1(Character c)
{
- this.character1 = c;
+ this._character1 = c;
}
/**
@@ -98,12 +98,12 @@
@Resource(name = "short")
private Short short0;
- private Short short1;
+ private Short _short1;
@Resource(name = "short")
private void setShort1(Short i)
{
- this.short1 = i;
+ this._short1 = i;
}
/**
@@ -113,12 +113,12 @@
@Resource(name = "integer")
private Integer integer0;
- private Integer integer1;
+ private Integer _integer1;
@Resource(name = "integer")
private void setInteger1(Integer i)
{
- this.integer1 = i;
+ this._integer1 = i;
}
/**
@@ -128,12 +128,12 @@
@Resource(name = "long")
private Long long0;
- private Long long1;
+ private Long _long1;
@Resource(name = "long")
private void setLong1(Long l)
{
- this.long1 = l;
+ this._long1 = l;
}
/**
@@ -143,12 +143,12 @@
@Resource(name = "float")
private Float float0;
- private Float float1;
+ private Float _float1;
@Resource(name = "float")
private void setFloat1(Float f)
{
- this.float1 = f;
+ this._float1 = f;
}
/**
@@ -158,12 +158,12 @@
@Resource(name = "double")
private Double double0;
- private Double double1;
+ private Double _double1;
@Resource(name = "double")
private void setDouble1(Double d)
{
- this.double1 = d;
+ this._double1 = d;
}
/**
@@ -173,12 +173,12 @@
@Resource
private String string;
- private String string1;
+ private String _string1;
@Resource
private void setString(String s)
{
- this.string1 = s;
+ this._string1 = s;
}
/**
@@ -197,7 +197,7 @@
log.error("@Resource initialization for boolean0 failed");
correctInitialization = false;
}
- if (this.boolean1 == null || this.boolean1 != true)
+ if (this._boolean1 == null || this._boolean1 != true)
{
log.error("@Resource initialization for boolean1 failed");
correctInitialization = false;
@@ -209,7 +209,7 @@
log.error("@Resource initialization for byte0 failed");
correctInitialization = false;
}
- if (this.byte1 == null || this.byte1 != (byte)1)
+ if (this._byte1 == null || this._byte1 != (byte)1)
{
log.error("@Resource initialization for byte1 failed");
correctInitialization = false;
@@ -221,7 +221,7 @@
log.error("@Resource initialization for character0 failed");
correctInitialization = false;
}
- if (this.character1 == null || this.character1 != 'c')
+ if (this._character1 == null || this._character1 != 'c')
{
log.error("@Resource initialization for character1 failed");
correctInitialization = false;
@@ -233,7 +233,7 @@
log.error("@Resource initialization for short0 failed");
correctInitialization = false;
}
- if (this.short1 == null || this.short1 != (short)5)
+ if (this._short1 == null || this._short1 != (short)5)
{
log.error("@Resource initialization for short1 failed");
correctInitialization = false;
@@ -245,7 +245,7 @@
log.error("@Resource initialization for integer0 failed");
correctInitialization = false;
}
- if (this.integer1 == null || this.integer1 != 7)
+ if (this._integer1 == null || this._integer1 != 7)
{
log.error("@Resource initialization for integer1 failed");
correctInitialization = false;
@@ -257,7 +257,7 @@
log.error("@Resource initialization for long0 failed");
correctInitialization = false;
}
- if (this.long1 == null || this.long1 != 11L)
+ if (this._long1 == null || this._long1 != 11L)
{
log.error("@Resource initialization for long1 failed");
correctInitialization = false;
@@ -269,7 +269,7 @@
log.error("@Resource initialization for float0 failed");
correctInitialization = false;
}
- if (this.float1 == null || this.float1 != 13.0f)
+ if (this._float1 == null || this._float1 != 13.0f)
{
log.error("@Resource initialization for float1 failed");
correctInitialization = false;
@@ -281,7 +281,7 @@
log.error("@Resource initialization for double0 failed");
correctInitialization = false;
}
- if (this.double1 == null || this.double1 != 17.0)
+ if (this._double1 == null || this._double1 != 17.0)
{
log.error("@Resource initialization for double1 failed");
correctInitialization = false;
@@ -293,7 +293,7 @@
log.error("@Resource initialization for string0 failed");
correctInitialization = false;
}
- if ("s".equals(this.string1) == false)
+ if ("s".equals(this._string1) == false)
{
log.error("@Resource initialization for string1 failed");
correctInitialization = false;
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/service/EJB3Impl.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/service/EJB3Impl.java 2011-07-27
12:22:45 UTC (rev 14753)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/service/EJB3Impl.java 2011-07-27
12:44:16 UTC (rev 14754)
@@ -54,12 +54,12 @@
// XML driven injection
private Boolean boolean0;
- private Boolean boolean1;
+ private Boolean _boolean1;
// XML driven injection
private void setBoolean1(Boolean b)
{
- this.boolean1 = b;
+ this._boolean1 = b;
}
/**
@@ -69,12 +69,12 @@
// XML driven injection
private Byte byte0;
- private Byte byte1;
+ private Byte _byte1;
// XML driven injection
private void setByte1(Byte b)
{
- this.byte1 = b;
+ this._byte1 = b;
}
/**
@@ -84,12 +84,12 @@
// XML driven injection
private Character character0;
- private Character character1;
+ private Character _character1;
// XML driven injection
private void setCharacter1(Character c)
{
- this.character1 = c;
+ this._character1 = c;
}
/**
@@ -99,12 +99,12 @@
// XML driven injection
private Short short0;
- private Short short1;
+ private Short _short1;
// XML driven injection
private void setShort1(Short i)
{
- this.short1 = i;
+ this._short1 = i;
}
/**
@@ -114,12 +114,12 @@
@Resource(name = "integer")
private Integer integer0;
- private Integer integer1;
+ private Integer _integer1;
@Resource(name = "integer")
private void setInteger1(Integer i)
{
- this.integer1 = i;
+ this._integer1 = i;
}
/**
@@ -129,12 +129,12 @@
@Resource(name = "long")
private Long long0;
- private Long long1;
+ private Long _long1;
@Resource(name = "long")
private void setLong1(Long l)
{
- this.long1 = l;
+ this._long1 = l;
}
/**
@@ -144,12 +144,12 @@
@Resource(name = "float")
private Float float0;
- private Float float1;
+ private Float _float1;
@Resource(name = "float")
private void setFloat1(Float f)
{
- this.float1 = f;
+ this._float1 = f;
}
/**
@@ -159,12 +159,12 @@
@Resource(name = "double")
private Double double0;
- private Double double1;
+ private Double _double1;
@Resource(name = "double")
private void setDouble1(Double d)
{
- this.double1 = d;
+ this._double1 = d;
}
/**
@@ -174,12 +174,12 @@
@Resource(name = "string")
private String string;
- private String string1;
+ private String _string1;
@Resource(name = "string")
private void setString1(String s)
{
- this.string1 = s;
+ this._string1 = s;
}
/**
@@ -198,7 +198,7 @@
log.error("Descriptor driven initialization for boolean0 failed");
correctInitialization = false;
}
- if (this.boolean1 == null || this.boolean1 != true)
+ if (this._boolean1 == null || this._boolean1 != true)
{
log.error("Descriptor driven initialization for boolean1 failed");
correctInitialization = false;
@@ -210,7 +210,7 @@
log.error("Descriptor driven initialization for byte0 failed");
correctInitialization = false;
}
- if (this.byte1 == null || this.byte1 != (byte)1)
+ if (this._byte1 == null || this._byte1 != (byte)1)
{
log.error("Descriptor driven initialization for byte1 failed");
correctInitialization = false;
@@ -222,7 +222,7 @@
log.error("Descriptor driven initialization for character0 failed");
correctInitialization = false;
}
- if (this.character1 == null || this.character1 != 'c')
+ if (this._character1 == null || this._character1 != 'c')
{
log.error("Descriptor driven initialization for character1 failed");
correctInitialization = false;
@@ -234,7 +234,7 @@
log.error("Descriptor driven initialization for short0 failed");
correctInitialization = false;
}
- if (this.short1 == null || this.short1 != (short)5)
+ if (this._short1 == null || this._short1 != (short)5)
{
log.error("Descriptor driven initialization for short1 failed");
correctInitialization = false;
@@ -246,7 +246,7 @@
log.error("@Resource initialization for integer0 failed");
correctInitialization = false;
}
- if (this.integer1 == null || this.integer1 != 7)
+ if (this._integer1 == null || this._integer1 != 7)
{
log.error("@Resource initialization for integer1 failed");
correctInitialization = false;
@@ -258,7 +258,7 @@
log.error("@Resource initialization for long0 failed");
correctInitialization = false;
}
- if (this.long1 == null || this.long1 != 11L)
+ if (this._long1 == null || this._long1 != 11L)
{
log.error("@Resource initialization for long1 failed");
correctInitialization = false;
@@ -270,7 +270,7 @@
log.error("@Resource initialization for float0 failed");
correctInitialization = false;
}
- if (this.float1 == null || this.float1 != 13.0f)
+ if (this._float1 == null || this._float1 != 13.0f)
{
log.error("@Resource initialization for float1 failed");
correctInitialization = false;
@@ -282,7 +282,7 @@
log.error("@Resource initialization for double0 failed");
correctInitialization = false;
}
- if (this.double1 == null || this.double1 != 17.0)
+ if (this._double1 == null || this._double1 != 17.0)
{
log.error("@Resource initialization for double1 failed");
correctInitialization = false;
@@ -294,7 +294,7 @@
log.error("@Resource initialization for string0 failed");
correctInitialization = false;
}
- if ("s".equals(this.string1) == false)
+ if ("s".equals(this._string1) == false)
{
log.error("@Resource initialization for string1 failed");
correctInitialization = false;
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-07-27
12:22:45 UTC (rev 14753)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.java 2011-07-27
12:44:16 UTC (rev 14754)
@@ -47,12 +47,12 @@
// XML driven injection
private Boolean boolean0;
- private Boolean boolean1;
+ private Boolean _boolean1;
// XML driven injection
private void setBoolean1(Boolean b)
{
- this.boolean1 = b;
+ this._boolean1 = b;
}
/**
@@ -62,12 +62,12 @@
// XML driven injection
private Byte byte0;
- private Byte byte1;
+ private Byte _byte1;
// XML driven injection
private void setByte1(Byte b)
{
- this.byte1 = b;
+ this._byte1 = b;
}
/**
@@ -77,12 +77,12 @@
// XML driven injection
private Character character0;
- private Character character1;
+ private Character _character1;
// XML driven injection
private void setCharacter1(Character c)
{
- this.character1 = c;
+ this._character1 = c;
}
/**
@@ -92,12 +92,12 @@
// XML driven injection
private Short short0;
- private Short short1;
+ private Short _short1;
// XML driven injection
private void setShort1(Short i)
{
- this.short1 = i;
+ this._short1 = i;
}
/**
@@ -107,12 +107,12 @@
@Resource(name = "integer")
private Integer integer0;
- private Integer integer1;
+ private Integer _integer1;
@Resource(name = "integer")
private void setInteger1(Integer i)
{
- this.integer1 = i;
+ this._integer1 = i;
}
/**
@@ -122,12 +122,12 @@
@Resource(name = "long")
private Long long0;
- private Long long1;
+ private Long _long1;
@Resource(name = "long")
private void setLong1(Long l)
{
- this.long1 = l;
+ this._long1 = l;
}
/**
@@ -137,12 +137,12 @@
@Resource(name = "float")
private Float float0;
- private Float float1;
+ private Float _float1;
@Resource(name = "float")
private void setFloat1(Float f)
{
- this.float1 = f;
+ this._float1 = f;
}
/**
@@ -152,12 +152,12 @@
@Resource(name = "double")
private Double double0;
- private Double double1;
+ private Double _double1;
@Resource(name = "double")
private void setDouble1(Double d)
{
- this.double1 = d;
+ this._double1 = d;
}
/**
@@ -167,12 +167,12 @@
@Resource
private String string;
- private String string1;
+ private String _string1;
@Resource
private void setString(String s)
{
- this.string1 = s;
+ this._string1 = s;
}
/**
@@ -191,7 +191,7 @@
log.error("Descriptor driven initialization for boolean0 failed");
correctInitialization = false;
}
- if (this.boolean1 == null || this.boolean1 != true)
+ if (this._boolean1 == null || this._boolean1 != true)
{
log.error("Descriptor driven initialization for boolean1 failed");
correctInitialization = false;
@@ -203,7 +203,7 @@
log.error("Descriptor driven initialization for byte0 failed");
correctInitialization = false;
}
- if (this.byte1 == null || this.byte1 != (byte)1)
+ if (this._byte1 == null || this._byte1 != (byte)1)
{
log.error("Descriptor driven initialization for byte1 failed");
correctInitialization = false;
@@ -215,7 +215,7 @@
log.error("Descriptor driven initialization for character0 failed");
correctInitialization = false;
}
- if (this.character1 == null || this.character1 != 'c')
+ if (this._character1 == null || this._character1 != 'c')
{
log.error("Descriptor driven initialization for character1 failed");
correctInitialization = false;
@@ -227,7 +227,7 @@
log.error("Descriptor driven initialization for short0 failed");
correctInitialization = false;
}
- if (this.short1 == null || this.short1 != (short)5)
+ if (this._short1 == null || this._short1 != (short)5)
{
log.error("Descriptor driven initialization for short1 failed");
correctInitialization = false;
@@ -239,7 +239,7 @@
log.error("@Resource initialization for integer0 failed");
correctInitialization = false;
}
- if (this.integer1 == null || this.integer1 != 7)
+ if (this._integer1 == null || this._integer1 != 7)
{
log.error("@Resource initialization for integer1 failed");
correctInitialization = false;
@@ -251,7 +251,7 @@
log.error("@Resource initialization for long0 failed");
correctInitialization = false;
}
- if (this.long1 == null || this.long1 != 11L)
+ if (this._long1 == null || this._long1 != 11L)
{
log.error("@Resource initialization for long1 failed");
correctInitialization = false;
@@ -263,7 +263,7 @@
log.error("@Resource initialization for float0 failed");
correctInitialization = false;
}
- if (this.float1 == null || this.float1 != 13.0f)
+ if (this._float1 == null || this._float1 != 13.0f)
{
log.error("@Resource initialization for float1 failed");
correctInitialization = false;
@@ -275,7 +275,7 @@
log.error("@Resource initialization for double0 failed");
correctInitialization = false;
}
- if (this.double1 == null || this.double1 != 17.0)
+ if (this._double1 == null || this._double1 != 17.0)
{
log.error("@Resource initialization for double1 failed");
correctInitialization = false;
@@ -287,7 +287,7 @@
log.error("@Resource initialization for string0 failed");
correctInitialization = false;
}
- if ("s".equals(this.string1) == false)
+ if ("s".equals(this._string1) == false)
{
log.error("@Resource initialization for string1 failed");
correctInitialization = false;
Modified:
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-INF/ejb-jar.xml
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-INF/ejb-jar.xml 2011-07-27
12:22:45 UTC (rev 14753)
+++
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-INF/ejb-jar.xml 2011-07-27
12:44:16 UTC (rev 14754)
@@ -24,7 +24,7 @@
<mapped-name>jbossws-client/service/TestService</mapped-name>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws1841.StatelessBean</injection-target-class>
- <injection-target-name>setEndpoint4</injection-target-name>
+ <injection-target-name>endpoint4</injection-target-name>
</injection-target>
</service-ref>
</session>
Modified:
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1/WEB-INF/web.xml
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1/WEB-INF/web.xml 2011-07-27
12:22:45 UTC (rev 14753)
+++
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1/WEB-INF/web.xml 2011-07-27
12:44:16 UTC (rev 14754)
@@ -25,7 +25,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setBoolean1</injection-target-name>
+ <injection-target-name>boolean1</injection-target-name>
</injection-target>
</env-entry>
@@ -39,7 +39,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setByte1</injection-target-name>
+ <injection-target-name>byte1</injection-target-name>
</injection-target>
</env-entry>
@@ -53,7 +53,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setCharacter1</injection-target-name>
+ <injection-target-name>character1</injection-target-name>
</injection-target>
</env-entry>
@@ -67,7 +67,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setShort1</injection-target-name>
+ <injection-target-name>short1</injection-target-name>
</injection-target>
</env-entry>
@@ -81,7 +81,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setInteger1</injection-target-name>
+ <injection-target-name>integer1</injection-target-name>
</injection-target>
</env-entry>
@@ -95,7 +95,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setLong1</injection-target-name>
+ <injection-target-name>long1</injection-target-name>
</injection-target>
</env-entry>
@@ -109,7 +109,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setFloat1</injection-target-name>
+ <injection-target-name>float1</injection-target-name>
</injection-target>
</env-entry>
@@ -123,7 +123,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setDouble1</injection-target-name>
+ <injection-target-name>double1</injection-target-name>
</injection-target>
</env-entry>
@@ -137,7 +137,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setString1</injection-target-name>
+ <injection-target-name>string1</injection-target-name>
</injection-target>
</env-entry>
Modified:
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2/META-INF/ejb-jar.xml
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2/META-INF/ejb-jar.xml 2011-07-27
12:22:45 UTC (rev 14753)
+++
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2/META-INF/ejb-jar.xml 2011-07-27
12:44:16 UTC (rev 14754)
@@ -20,7 +20,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Impl</injection-target-class>
- <injection-target-name>setBoolean1</injection-target-name>
+ <injection-target-name>boolean1</injection-target-name>
</injection-target>
</env-entry>
@@ -34,7 +34,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Impl</injection-target-class>
- <injection-target-name>setByte1</injection-target-name>
+ <injection-target-name>byte1</injection-target-name>
</injection-target>
</env-entry>
@@ -48,7 +48,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Impl</injection-target-class>
- <injection-target-name>setCharacter1</injection-target-name>
+ <injection-target-name>character1</injection-target-name>
</injection-target>
</env-entry>
@@ -62,7 +62,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Impl</injection-target-class>
- <injection-target-name>setShort1</injection-target-name>
+ <injection-target-name>short1</injection-target-name>
</injection-target>
</env-entry>
Modified:
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3/WEB-INF/web.xml
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3/WEB-INF/web.xml 2011-07-27
12:22:45 UTC (rev 14753)
+++
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3/WEB-INF/web.xml 2011-07-27
12:44:16 UTC (rev 14754)
@@ -25,7 +25,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOImpl</injection-target-class>
- <injection-target-name>setBoolean1</injection-target-name>
+ <injection-target-name>boolean1</injection-target-name>
</injection-target>
</env-entry>
@@ -39,7 +39,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOImpl</injection-target-class>
- <injection-target-name>setByte1</injection-target-name>
+ <injection-target-name>byte1</injection-target-name>
</injection-target>
</env-entry>
@@ -53,7 +53,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOImpl</injection-target-class>
- <injection-target-name>setCharacter1</injection-target-name>
+ <injection-target-name>character1</injection-target-name>
</injection-target>
</env-entry>
@@ -67,7 +67,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOImpl</injection-target-class>
- <injection-target-name>setShort1</injection-target-name>
+ <injection-target-name>short1</injection-target-name>
</injection-target>
</env-entry>
Modified:
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4/META-INF/ejb-jar.xml
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4/META-INF/ejb-jar.xml 2011-07-27
12:22:45 UTC (rev 14753)
+++
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4/META-INF/ejb-jar.xml 2011-07-27
12:44:16 UTC (rev 14754)
@@ -18,7 +18,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setBoolean1</injection-target-name>
+ <injection-target-name>boolean1</injection-target-name>
</injection-target>
</env-entry>
@@ -32,7 +32,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setByte1</injection-target-name>
+ <injection-target-name>byte1</injection-target-name>
</injection-target>
</env-entry>
@@ -46,7 +46,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setCharacter1</injection-target-name>
+ <injection-target-name>character1</injection-target-name>
</injection-target>
</env-entry>
@@ -60,7 +60,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setShort1</injection-target-name>
+ <injection-target-name>short1</injection-target-name>
</injection-target>
</env-entry>
@@ -74,7 +74,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setInteger1</injection-target-name>
+ <injection-target-name>integer1</injection-target-name>
</injection-target>
</env-entry>
@@ -88,7 +88,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setLong1</injection-target-name>
+ <injection-target-name>long1</injection-target-name>
</injection-target>
</env-entry>
@@ -102,7 +102,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setFloat1</injection-target-name>
+ <injection-target-name>float1</injection-target-name>
</injection-target>
</env-entry>
@@ -116,7 +116,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setDouble1</injection-target-name>
+ <injection-target-name>double1</injection-target-name>
</injection-target>
</env-entry>
@@ -130,7 +130,7 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setString1</injection-target-name>
+ <injection-target-name>string1</injection-target-name>
</injection-target>
</env-entry>