[jbossws-commits] JBossWS SVN: r9705 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/jbws2074 and 13 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Apr 2 10:05:09 EDT 2009
Author: richard.opalka at jboss.com
Date: 2009-04-02 10:05:09 -0400 (Thu, 02 Apr 2009)
New Revision: 9705
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOIface.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.java
framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase3/
framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase3/WEB-INF/
framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase3/WEB-INF/web.xml
Removed:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/service/jaxws-service-handlers.xml
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/service/jaxws-service-handlers.xml
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/service/EJB3Impl.java
framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase1/WEB-INF/web.xml
framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase2/META-INF/ejb-jar.xml
Log:
[JBWS-2074] providing all test cases
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-04-02 08:35:37 UTC (rev 9704)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-04-02 14:05:09 UTC (rev 9705)
@@ -531,7 +531,7 @@
</webinf>
</war>
- <!-- jaxws-jbws2074 -->
+ <!-- jaxws-jbws2074 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase1.war"
webxml="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase1/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -542,20 +542,24 @@
<include name="org/jboss/test/ws/jaxws/jbws2074/usecase1/service/jaxws-service-handlers.xml"/>
</classes>
</war>
- <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase2.jar">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase2.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws2074/usecase2/service/EJB3Iface.class"/>
<include name="org/jboss/test/ws/jaxws/jbws2074/usecase2/service/EJB3Impl.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws2074/usecase2/service/jaxws-service-handlers.xml"/>
</fileset>
<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase2/META-INF">
<include name="ejb-jar.xml"/>
</metainf>
</jar>
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase3.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase3/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOIface.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.class"/>
+ </classes>
+ </war>
- <!-- jaxws-jbws2150 -->
+ <!-- jaxws-jbws2150 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2150.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2150/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws2150/*Service*.class"/>
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java 2009-04-02 08:35:37 UTC (rev 9704)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java 2009-04-02 14:05:09 UTC (rev 9705)
@@ -49,393 +49,240 @@
* java.lang.Boolean
*/
- private boolean boolean0;
-
+ private Boolean boolean0;
+
private Boolean boolean1;
-
- private boolean boolean2;
-
- private void setBoolean2(boolean b)
- {
- this.boolean2 = b;
- }
-
- private Boolean boolean3;
- private void setBoolean3(Boolean b)
+ private void setBoolean1(Boolean b)
{
- this.boolean3 = b;
+ this.boolean1 = b;
}
-
+
/**
* java.lang.Byte
*/
- private byte byte0;
-
+ private Byte byte0;
+
private Byte byte1;
-
- private byte byte2;
-
- private void setByte2(byte b)
- {
- this.byte2 = b;
- }
-
- private Byte byte3;
- private void setByte3(Byte b)
+ private void setByte1(Byte b)
{
- this.byte3 = b;
+ this.byte1 = b;
}
-
+
/**
* java.lang.Character
*/
- private char character0;
-
+ private Character character0;
+
private Character character1;
-
- private char character2;
-
- private void setCharacter2(char c)
- {
- this.character2 = c;
- }
-
- private Character character3;
- private void setCharacter3(Character c)
+ private void setCharacter1(Character c)
{
- this.character3 = c;
+ this.character1 = c;
}
-
+
/**
* java.lang.Short
*/
-
- private short short0;
-
+
+ private Short short0;
+
private Short short1;
-
- private short short2;
-
- private void setShort2(short i)
+
+ private void setShort1(Short i)
{
- this.short2 = i;
+ this.short1 = i;
}
-
- private Short short3;
-
- private void setShort3(Short i)
- {
- this.short3 = i;
- }
-
+
/**
* java.lang.Integer
*/
-
- private int integer0;
-
+
+ private Integer integer0;
+
private Integer integer1;
-
- private int integer2;
-
- private void setInteger2(int i)
+
+ private void setInteger1(Integer i)
{
- this.integer2 = i;
+ this.integer1 = i;
}
-
- private Integer integer3;
-
- private void setInteger3(Integer i)
- {
- this.integer3 = i;
- }
-
+
/**
* java.lang.Long
*/
-
- private long long0;
-
+
+ private Long long0;
+
private Long long1;
-
- private long long2;
- private void setLong2(long l)
+ private void setLong1(Long l)
{
- this.long2 = l;
+ this.long1 = l;
}
-
- private Long long3;
-
- private void setLong3(Long l)
- {
- this.long3 = l;
- }
-
+
/**
* java.lang.Float
*/
-
- private float float0;
-
+
+ private Float float0;
+
private Float float1;
-
- private float float2;
- private void setFloat2(float f)
+ private void setFloat1(Float f)
{
- this.float2 = f;
+ this.float1 = f;
}
-
- private Float float3;
-
- private void setFloat3(Float f)
- {
- this.float3 = f;
- }
-
+
/**
* java.lang.Double
*/
-
- private double double0;
-
+
+ private Double double0;
+
private Double double1;
-
- private double double2;
- private void setDouble2(double d)
+ private void setDouble1(Double d)
{
- this.double2 = d;
+ this.double1 = d;
}
-
- private Double double3;
-
- private void setDouble3(Double d)
- {
- this.double3 = d;
- }
-
+
/**
* java.lang.String
*/
-
+
private String string0;
-
+
private String string1;
private void setString1(String s)
{
this.string1 = s;
}
-
+
/**
* Indicates whether handler is in correct state.
*/
private boolean correctState;
-
- // TODO: implement PreDestroy
+
@PostConstruct
private void init()
{
boolean correctInitialization = true;
-
+
// java.lang.Boolean
- if (this.boolean0 != true)
+ if (this.boolean0 == null || this.boolean0 != true)
{
- log.error("@Resource initialization for boolean0 failed");
+ log.error("Descriptor driven initialization for boolean0 failed");
correctInitialization = false;
}
if (this.boolean1 == null || this.boolean1 != true)
{
- log.error("@Resource initialization for boolean1 failed");
+ log.error("Descriptor driven initialization for boolean1 failed");
correctInitialization = false;
}
- if (this.boolean2 != true)
- {
- log.error("@Resource initialization for boolean2 failed");
- correctInitialization = false;
- }
- if (this.boolean3 == null || this.boolean3 != true)
- {
- log.error("@Resource initialization for boolean3 failed");
- correctInitialization = false;
- }
// java.lang.Byte
- if (this.byte0 != (byte)2)
+ if (this.byte0 == null || this.byte0 != (byte)1)
{
- log.error("@Resource initialization for byte0 failed");
+ log.error("Descriptor driven initialization for byte0 failed");
correctInitialization = false;
}
- if (this.byte1 == null || this.byte1 != (byte)2)
+ if (this.byte1 == null || this.byte1 != (byte)1)
{
- log.error("@Resource initialization for byte1 failed");
+ log.error("Descriptor driven initialization for byte1 failed");
correctInitialization = false;
}
- if (this.byte2 != (byte)2)
- {
- log.error("@Resource initialization for byte2 failed");
- correctInitialization = false;
- }
- if (this.byte3 == null || this.byte3 != (byte)2)
- {
- log.error("@Resource initialization for byte3 failed");
- correctInitialization = false;
- }
// java.lang.Character
- if (this.character0 != 'c')
+ if (this.character0 == null || this.character0 != 'c')
{
- log.error("@Resource initialization for character0 failed");
+ log.error("Descriptor driven initialization for character0 failed");
correctInitialization = false;
}
if (this.character1 == null || this.character1 != 'c')
{
- log.error("@Resource initialization for character1 failed");
+ log.error("Descriptor driven initialization for character1 failed");
correctInitialization = false;
}
- if (this.character2 != 'c')
- {
- log.error("@Resource initialization for character2 failed");
- correctInitialization = false;
- }
- if (this.character3 == null || this.character3 != 'c')
- {
- log.error("@Resource initialization for character3 failed");
- correctInitialization = false;
- }
// java.lang.Short
- if (this.short0 != (short)5)
+ if (this.short0 == null || this.short0 != (short)5)
{
- log.error("@Resource initialization for short0 failed");
+ log.error("Descriptor driven initialization for short0 failed");
correctInitialization = false;
}
if (this.short1 == null || this.short1 != (short)5)
{
- log.error("@Resource initialization for short1 failed");
+ log.error("Descriptor driven initialization for short1 failed");
correctInitialization = false;
}
- if (this.short2 != (short)5)
- {
- log.error("@Resource initialization for short2 failed");
- correctInitialization = false;
- }
- if (this.short3 == null || this.short3 != (short)5)
- {
- log.error("@Resource initialization for short3 failed");
- correctInitialization = false;
- }
// java.lang.Integer
- if (this.integer0 != 7)
+ if (this.integer0 == null || this.integer0 != 7)
{
- log.error("@Resource initialization for integer0 failed");
+ log.error("Descriptor driven initialization for integer0 failed");
correctInitialization = false;
}
if (this.integer1 == null || this.integer1 != 7)
{
- log.error("@Resource initialization for integer1 failed");
+ log.error("Descriptor driven initialization for integer1 failed");
correctInitialization = false;
}
- if (this.integer2 != 7)
- {
- log.error("@Resource initialization for integer2 failed");
- correctInitialization = false;
- }
- if (this.integer3 == null || this.integer3 != 7)
- {
- log.error("@Resource initialization for integer3 failed");
- correctInitialization = false;
- }
// java.lang.Long
- if (this.long0 != 11L)
+ if (this.long0 == null || this.long0 != 11L)
{
- log.error("@Resource initialization for long0 failed");
+ log.error("Descriptor driven initialization for long0 failed");
correctInitialization = false;
}
if (this.long1 == null || this.long1 != 11L)
{
- log.error("@Resource initialization for long1 failed");
+ log.error("Descriptor driven initialization for long1 failed");
correctInitialization = false;
}
- if (this.long2 != 11L)
- {
- log.error("@Resource initialization for long2 failed");
- correctInitialization = false;
- }
- if (this.long3 == null || this.long3 != 11L)
- {
- log.error("@Resource initialization for long3 failed");
- correctInitialization = false;
- }
// java.lang.Float
- if (this.float0 != 13.0f)
+ if (this.float0 == null || this.float0 != 13.0f)
{
- log.error("@Resource initialization for float0 failed");
+ log.error("Descriptor driven initialization for float0 failed");
correctInitialization = false;
}
if (this.float1 == null || this.float1 != 13.0f)
{
- log.error("@Resource initialization for float1 failed");
+ log.error("Descriptor driven initialization for float1 failed");
correctInitialization = false;
}
- if (this.float2 != 13.0f)
- {
- log.error("@Resource initialization for float2 failed");
- correctInitialization = false;
- }
- if (this.float3 == null || this.float3 != 13.0f)
- {
- log.error("@Resource initialization for float3 failed");
- correctInitialization = false;
- }
// java.lang.Double
- if (this.double0 != 17.0)
+ if (this.double0 == null || this.double0 != 17.0)
{
- log.error("@Resource initialization for double0 failed");
+ log.error("Descriptor driven initialization for double0 failed");
correctInitialization = false;
}
if (this.double1 == null || this.double1 != 17.0)
{
- log.error("@Resource initialization for double1 failed");
+ log.error("Descriptor driven initialization for double1 failed");
correctInitialization = false;
}
- if (this.double2 != 17.0)
- {
- log.error("@Resource initialization for double2 failed");
- correctInitialization = false;
- }
- if (this.double3 == null || this.double3 != 17.0)
- {
- log.error("@Resource initialization for double3 failed");
- correctInitialization = false;
- }
-
+
// java.lang.String
if ("s".equals(this.string0) == false)
{
- log.error("@Resource initialization for string0 failed");
+ log.error("Descriptor driven initialization for string0 failed");
correctInitialization = false;
}
if ("s".equals(this.string1) == false)
{
- log.error("@Resource initialization for string1 failed");
+ log.error("Descriptor driven initialization for string1 failed");
correctInitialization = false;
}
-
+
this.correctState = correctInitialization;
}
-
+
@Override
public boolean handleOutbound(MessageContext msgContext)
{
@@ -447,27 +294,27 @@
{
return ensureInjectionsAndInitialization(msgContext, "Inbound");
}
-
+
private boolean ensureInjectionsAndInitialization(MessageContext msgContext, String direction)
{
if (!this.correctState)
{
throw new WebServiceException("Unfunctional javax.annotation.* annotations");
}
-
+
try
{
SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next();
soapElement = (SOAPElement)soapElement.getChildElements().next();
-
+
String oldValue = soapElement.getValue();
String newValue = oldValue + ":" + direction + ":DescriptorResourcesHandler";
soapElement.setValue(newValue);
-
+
log.debug("oldValue: " + oldValue);
log.debug("newValue: " + newValue);
-
+
return true;
}
catch (SOAPException ex)
@@ -475,4 +322,5 @@
throw new WebServiceException(ex);
}
}
+
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.java 2009-04-02 08:35:37 UTC (rev 9704)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.java 2009-04-02 14:05:09 UTC (rev 9705)
@@ -51,237 +51,148 @@
*/
@Resource(name = "boolean")
- private boolean boolean0;
-
- @Resource(name = "booleanWrapper")
+ private Boolean boolean0;
+
private Boolean boolean1;
-
- private boolean boolean2;
-
+
@Resource(name = "boolean")
- private void setBoolean2(boolean b)
+ private void setBoolean1(Boolean b)
{
- this.boolean2 = b;
+ this.boolean1 = b;
}
-
- private Boolean boolean3;
- @Resource(name = "booleanWrapper")
- private void setBoolean3(Boolean b)
- {
- this.boolean3 = b;
- }
-
/**
* java.lang.Byte
*/
@Resource(name = "byte")
- private byte byte0;
-
- @Resource(name = "byteWrapper")
+ private Byte byte0;
+
private Byte byte1;
-
- private byte byte2;
-
+
@Resource(name = "byte")
- private void setByte2(byte b)
+ private void setByte1(Byte b)
{
- this.byte2 = b;
+ this.byte1 = b;
}
-
- private Byte byte3;
- @Resource(name = "byteWrapper")
- private void setByte3(Byte b)
- {
- this.byte3 = b;
- }
-
/**
* java.lang.Character
*/
@Resource(name = "character")
- private char character0;
-
- @Resource(name = "characterWrapper")
+ private Character character0;
+
private Character character1;
-
- private char character2;
-
+
@Resource(name = "character")
- private void setCharacter2(char c)
+ private void setCharacter1(Character c)
{
- this.character2 = c;
+ this.character1 = c;
}
-
- private Character character3;
- @Resource(name = "characterWrapper")
- private void setCharacter3(Character c)
- {
- this.character3 = c;
- }
-
/**
* java.lang.Short
*/
-
+
@Resource(name = "short")
- private short short0;
-
- @Resource(name = "shortWrapper")
+ private Short short0;
+
private Short short1;
-
- private short short2;
-
+
@Resource(name = "short")
- private void setShort2(short i)
+ private void setShort1(Short i)
{
- this.short2 = i;
+ this.short1 = i;
}
-
- private Short short3;
-
- @Resource(name = "shortWrapper")
- private void setShort3(Short i)
- {
- this.short3 = i;
- }
-
+
/**
* java.lang.Integer
*/
-
+
@Resource(name = "integer")
- private int integer0;
-
- @Resource(name = "integerWrapper")
+ private Integer integer0;
+
private Integer integer1;
-
- private int integer2;
-
+
@Resource(name = "integer")
- private void setInteger2(int i)
+ private void setInteger1(Integer i)
{
- this.integer2 = i;
+ this.integer1 = i;
}
-
- @Resource(name = "integerWrapper")
- private Integer integer3;
-
- private void setInteger3(Integer i)
- {
- this.integer3 = i;
- }
-
+
/**
* java.lang.Long
*/
-
+
@Resource(name = "long")
- private long long0;
-
- @Resource(name = "longWrapper")
+ private Long long0;
+
private Long long1;
-
- private long long2;
@Resource(name = "long")
- private void setLong2(long l)
+ private void setLong1(Long l)
{
- this.long2 = l;
+ this.long1 = l;
}
-
- private Long long3;
-
- @Resource(name = "longWrapper")
- private void setLong3(Long l)
- {
- this.long3 = l;
- }
-
+
/**
* java.lang.Float
*/
-
+
@Resource(name = "float")
- private float float0;
-
- @Resource(name = "floatWrapper")
+ private Float float0;
+
private Float float1;
-
- private float float2;
@Resource(name = "float")
- private void setFloat2(float f)
+ private void setFloat1(Float f)
{
- this.float2 = f;
+ this.float1 = f;
}
-
- private Float float3;
-
- @Resource(name = "floatWrapper")
- private void setFloat3(Float f)
- {
- this.float3 = f;
- }
-
+
/**
* java.lang.Double
*/
-
+
@Resource(name = "double")
- private double double0;
-
- @Resource(name = "doubleWrapper")
+ private Double double0;
+
private Double double1;
-
- private double double2;
@Resource(name = "double")
- private void setDouble2(double d)
+ private void setDouble1(Double d)
{
- this.double2 = d;
+ this.double1 = d;
}
-
- private Double double3;
-
- @Resource(name = "doubleWrapper")
- private void setDouble3(Double d)
- {
- this.double3 = d;
- }
-
+
/**
* java.lang.String
*/
-
- @Resource(name = "string")
- private String string0;
-
+
+ @Resource
+ private String string;
+
private String string1;
- @Resource(name = "string")
- private void setString1(String s)
+ @Resource
+ private void setString(String s)
{
this.string1 = s;
}
-
+
/**
* Indicates whether handler is in correct state.
*/
private boolean correctState;
-
- // TODO: implement PreDestroy
+
@PostConstruct
private void init()
{
boolean correctInitialization = true;
-
+
// java.lang.Boolean
- if (this.boolean0 != true)
+ if (this.boolean0 == null || this.boolean0 != true)
{
log.error("@Resource initialization for boolean0 failed");
correctInitialization = false;
@@ -291,41 +202,21 @@
log.error("@Resource initialization for boolean1 failed");
correctInitialization = false;
}
- if (this.boolean2 != true)
- {
- log.error("@Resource initialization for boolean2 failed");
- correctInitialization = false;
- }
- if (this.boolean3 == null || this.boolean3 != true)
- {
- log.error("@Resource initialization for boolean3 failed");
- correctInitialization = false;
- }
// java.lang.Byte
- if (this.byte0 != (byte)2)
+ if (this.byte0 == null || this.byte0 != (byte)1)
{
log.error("@Resource initialization for byte0 failed");
correctInitialization = false;
}
- if (this.byte1 == null || this.byte1 != (byte)2)
+ if (this.byte1 == null || this.byte1 != (byte)1)
{
log.error("@Resource initialization for byte1 failed");
correctInitialization = false;
}
- if (this.byte2 != (byte)2)
- {
- log.error("@Resource initialization for byte2 failed");
- correctInitialization = false;
- }
- if (this.byte3 == null || this.byte3 != (byte)2)
- {
- log.error("@Resource initialization for byte3 failed");
- correctInitialization = false;
- }
// java.lang.Character
- if (this.character0 != 'c')
+ if (this.character0 == null || this.character0 != 'c')
{
log.error("@Resource initialization for character0 failed");
correctInitialization = false;
@@ -335,19 +226,9 @@
log.error("@Resource initialization for character1 failed");
correctInitialization = false;
}
- if (this.character2 != 'c')
- {
- log.error("@Resource initialization for character2 failed");
- correctInitialization = false;
- }
- if (this.character3 == null || this.character3 != 'c')
- {
- log.error("@Resource initialization for character3 failed");
- correctInitialization = false;
- }
// java.lang.Short
- if (this.short0 != (short)5)
+ if (this.short0 == null || this.short0 != (short)5)
{
log.error("@Resource initialization for short0 failed");
correctInitialization = false;
@@ -357,19 +238,9 @@
log.error("@Resource initialization for short1 failed");
correctInitialization = false;
}
- if (this.short2 != (short)5)
- {
- log.error("@Resource initialization for short2 failed");
- correctInitialization = false;
- }
- if (this.short3 == null || this.short3 != (short)5)
- {
- log.error("@Resource initialization for short3 failed");
- correctInitialization = false;
- }
// java.lang.Integer
- if (this.integer0 != 7)
+ if (this.integer0 == null || this.integer0 != 7)
{
log.error("@Resource initialization for integer0 failed");
correctInitialization = false;
@@ -379,19 +250,9 @@
log.error("@Resource initialization for integer1 failed");
correctInitialization = false;
}
- if (this.integer2 != 7)
- {
- log.error("@Resource initialization for integer2 failed");
- correctInitialization = false;
- }
- if (this.integer3 == null || this.integer3 != 7)
- {
- log.error("@Resource initialization for integer3 failed");
- correctInitialization = false;
- }
// java.lang.Long
- if (this.long0 != 11L)
+ if (this.long0 == null || this.long0 != 11L)
{
log.error("@Resource initialization for long0 failed");
correctInitialization = false;
@@ -401,19 +262,9 @@
log.error("@Resource initialization for long1 failed");
correctInitialization = false;
}
- if (this.long2 != 11L)
- {
- log.error("@Resource initialization for long2 failed");
- correctInitialization = false;
- }
- if (this.long3 == null || this.long3 != 11L)
- {
- log.error("@Resource initialization for long3 failed");
- correctInitialization = false;
- }
// java.lang.Float
- if (this.float0 != 13.0f)
+ if (this.float0 == null || this.float0 != 13.0f)
{
log.error("@Resource initialization for float0 failed");
correctInitialization = false;
@@ -423,19 +274,9 @@
log.error("@Resource initialization for float1 failed");
correctInitialization = false;
}
- if (this.float2 != 13.0f)
- {
- log.error("@Resource initialization for float2 failed");
- correctInitialization = false;
- }
- if (this.float3 == null || this.float3 != 13.0f)
- {
- log.error("@Resource initialization for float3 failed");
- correctInitialization = false;
- }
// java.lang.Double
- if (this.double0 != 17.0)
+ if (this.double0 == null || this.double0 != 17.0)
{
log.error("@Resource initialization for double0 failed");
correctInitialization = false;
@@ -445,19 +286,9 @@
log.error("@Resource initialization for double1 failed");
correctInitialization = false;
}
- if (this.double2 != 17.0)
- {
- log.error("@Resource initialization for double2 failed");
- correctInitialization = false;
- }
- if (this.double3 == null || this.double3 != 17.0)
- {
- log.error("@Resource initialization for double3 failed");
- correctInitialization = false;
- }
-
+
// java.lang.String
- if ("s".equals(this.string0) == false)
+ if ("s".equals(this.string) == false)
{
log.error("@Resource initialization for string0 failed");
correctInitialization = false;
@@ -467,10 +298,10 @@
log.error("@Resource initialization for string1 failed");
correctInitialization = false;
}
-
+
this.correctState = correctInitialization;
}
-
+
@Override
public boolean handleOutbound(MessageContext msgContext)
{
@@ -482,27 +313,27 @@
{
return ensureInjectionsAndInitialization(msgContext, "Inbound");
}
-
+
private boolean ensureInjectionsAndInitialization(MessageContext msgContext, String direction)
{
if (!this.correctState)
{
throw new WebServiceException("Unfunctional javax.annotation.* annotations");
}
-
+
try
{
SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next();
soapElement = (SOAPElement)soapElement.getChildElements().next();
-
+
String oldValue = soapElement.getValue();
String newValue = oldValue + ":" + direction + ":JavaResourcesHandler";
soapElement.setValue(newValue);
-
+
log.debug("oldValue: " + oldValue);
log.debug("newValue: " + newValue);
-
+
return true;
}
catch (SOAPException ex)
@@ -510,4 +341,5 @@
throw new WebServiceException(ex);
}
}
+
}
\ No newline at end of file
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2009-04-02 08:35:37 UTC (rev 9704)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2009-04-02 14:05:09 UTC (rev 9705)
@@ -50,9 +50,9 @@
QName serviceName = new QName("http://ws.jboss.org/jbws2074", "POJOService");
Service service = Service.create(new URL(endpointAddress + "?wsdl"), serviceName);
POJOIface port = (POJOIface)service.getPort(POJOIface.class);
-
+
String retStr = port.echo("hello");
-
+
StringBuffer expStr = new StringBuffer("hello");
expStr.append(":Inbound:JavaResourcesHandler");
expStr.append(":Inbound:DescriptorResourcesHandler");
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/service/jaxws-service-handlers.xml
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/service/jaxws-service-handlers.xml 2009-04-02 08:35:37 UTC (rev 9704)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/service/jaxws-service-handlers.xml 2009-04-02 14:05:09 UTC (rev 9705)
@@ -5,18 +5,18 @@
xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
- <handler-chain>
- <handler>
- <handler-name>DescriptorResourcesHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</handler-class>
- </handler>
- </handler-chain>
-
- <handler-chain>
- <handler>
- <handler-name>JavaResourcesHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxws.jbws2074.handler.JavaResourcesHandler</handler-class>
- </handler>
- </handler-chain>
-
+ <handler-chain>
+ <handler>
+ <handler-name>DescriptorResourcesHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</handler-class>
+ </handler>
+ </handler-chain>
+
+ <handler-chain>
+ <handler>
+ <handler-name>JavaResourcesHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxws.jbws2074.handler.JavaResourcesHandler</handler-class>
+ </handler>
+ </handler-chain>
+
</handler-chains>
\ No newline at end of file
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2009-04-02 08:35:37 UTC (rev 9704)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2009-04-02 14:05:09 UTC (rev 9705)
@@ -50,15 +50,11 @@
QName serviceName = new QName("http://ws.jboss.org/jbws2074", "EJB3Service");
Service service = Service.create(new URL(endpointAddress + "?wsdl"), serviceName);
EJB3Iface port = (EJB3Iface)service.getPort(EJB3Iface.class);
-
+
String retStr = port.echo("hello");
-
+
StringBuffer expStr = new StringBuffer("hello");
- expStr.append(":Inbound:JavaResourcesHandler");
- expStr.append(":Inbound:DescriptorResourcesHandler");
expStr.append(":EJB3Impl");
- expStr.append(":Outbound:DescriptorResourcesHandler");
- expStr.append(":Outbound:JavaResourcesHandler");
assertEquals(expStr.toString(), retStr);
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/service/EJB3Impl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/service/EJB3Impl.java 2009-04-02 08:35:37 UTC (rev 9704)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/service/EJB3Impl.java 2009-04-02 14:05:09 UTC (rev 9705)
@@ -21,9 +21,11 @@
*/
package org.jboss.test.ws.jaxws.jbws2074.usecase2.service;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
import javax.ejb.Stateless;
-import javax.jws.HandlerChain;
import javax.jws.WebService;
+import javax.xml.ws.WebServiceException;
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.annotation.WebContext;
@@ -36,19 +38,272 @@
targetNamespace = "http://ws.jboss.org/jbws2074",
endpointInterface = "org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Iface"
)
- at HandlerChain(file = "jaxws-service-handlers.xml")
@WebContext
(
- urlPattern="/Service",
+ urlPattern="/Service",
contextRoot="/jaxws-jbws2074-usecase2"
)
public class EJB3Impl implements EJB3Iface
-{
+{
private static Logger log = Logger.getLogger(EJB3Impl.class);
+ /**
+ * java.lang.Boolean
+ */
+
+ private Boolean boolean0;
+
+ private Boolean boolean1;
+
+ private void setBoolean1(Boolean b)
+ {
+ this.boolean1 = b;
+ }
+
+ /**
+ * java.lang.Byte
+ */
+
+ private Byte byte0;
+
+ private Byte byte1;
+
+ private void setByte1(Byte b)
+ {
+ this.byte1 = b;
+ }
+
+ /**
+ * java.lang.Character
+ */
+
+ private Character character0;
+
+ private Character character1;
+
+ private void setCharacter1(Character c)
+ {
+ this.character1 = c;
+ }
+
+ /**
+ * java.lang.Short
+ */
+
+ private Short short0;
+
+ private Short short1;
+
+ private void setShort1(Short i)
+ {
+ this.short1 = i;
+ }
+
+ /**
+ * java.lang.Integer
+ */
+
+ @Resource(name = "integer")
+ private Integer integer0;
+
+ private Integer integer1;
+
+ @Resource(name = "integer")
+ private void setInteger1(Integer i)
+ {
+ this.integer1 = i;
+ }
+
+ /**
+ * java.lang.Long
+ */
+
+ @Resource(name = "long")
+ private Long long0;
+
+ private Long long1;
+
+ @Resource(name = "long")
+ private void setLong1(Long l)
+ {
+ this.long1 = l;
+ }
+
+ /**
+ * java.lang.Float
+ */
+
+ @Resource(name = "float")
+ private Float float0;
+
+ private Float float1;
+
+ @Resource(name = "float")
+ private void setFloat1(Float f)
+ {
+ this.float1 = f;
+ }
+
+ /**
+ * java.lang.Double
+ */
+
+ @Resource(name = "double")
+ private Double double0;
+
+ private Double double1;
+
+ @Resource(name = "double")
+ private void setDouble1(Double d)
+ {
+ this.double1 = d;
+ }
+
+ /**
+ * java.lang.String
+ */
+
+ @Resource(name = "string")
+ private String string;
+
+ private String string1;
+
+ @Resource(name = "string")
+ private void setString(String s)
+ {
+ this.string1 = s;
+ }
+
+ /**
+ * Indicates whether handler is in correct state.
+ */
+ private boolean correctState;
+
+ @PostConstruct
+ private void init()
+ {
+ boolean correctInitialization = true;
+
+ // java.lang.Boolean
+ if (this.boolean0 == null || this.boolean0 != true)
+ {
+ log.error("Descriptor driven initialization for boolean0 failed");
+ correctInitialization = false;
+ }
+ if (this.boolean1 == null || this.boolean1 != true)
+ {
+ log.error("Descriptor driven initialization for boolean1 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Byte
+ if (this.byte0 == null || this.byte0 != (byte)1)
+ {
+ log.error("Descriptor driven initialization for byte0 failed");
+ correctInitialization = false;
+ }
+ if (this.byte1 == null || this.byte1 != (byte)1)
+ {
+ log.error("Descriptor driven initialization for byte1 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Character
+ if (this.character0 == null || this.character0 != 'c')
+ {
+ log.error("Descriptor driven initialization for character0 failed");
+ correctInitialization = false;
+ }
+ if (this.character1 == null || this.character1 != 'c')
+ {
+ log.error("Descriptor driven initialization for character1 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Short
+ if (this.short0 == null || this.short0 != (short)5)
+ {
+ log.error("Descriptor driven initialization for short0 failed");
+ correctInitialization = false;
+ }
+ if (this.short1 == null || this.short1 != (short)5)
+ {
+ log.error("Descriptor driven initialization for short1 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Integer
+ if (this.integer0 == null || this.integer0 != 7)
+ {
+ log.error("@Resource initialization for integer0 failed");
+ correctInitialization = false;
+ }
+ if (this.integer1 == null || this.integer1 != 7)
+ {
+ log.error("@Resource initialization for integer1 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Long
+ if (this.long0 == null || this.long0 != 11L)
+ {
+ log.error("@Resource initialization for long0 failed");
+ correctInitialization = false;
+ }
+ if (this.long1 == null || this.long1 != 11L)
+ {
+ log.error("@Resource initialization for long1 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Float
+ if (this.float0 == null || this.float0 != 13.0f)
+ {
+ log.error("@Resource initialization for float0 failed");
+ correctInitialization = false;
+ }
+ if (this.float1 == null || this.float1 != 13.0f)
+ {
+ log.error("@Resource initialization for float1 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Double
+ if (this.double0 == null || this.double0 != 17.0)
+ {
+ log.error("@Resource initialization for double0 failed");
+ correctInitialization = false;
+ }
+ if (this.double1 == null || this.double1 != 17.0)
+ {
+ log.error("@Resource initialization for double1 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.String
+ if ("s".equals(this.string) == false)
+ {
+ log.error("@Resource initialization for string0 failed");
+ correctInitialization = false;
+ }
+ if ("s".equals(this.string1) == false)
+ {
+ log.error("@Resource initialization for string1 failed");
+ correctInitialization = false;
+ }
+
+ this.correctState = correctInitialization;
+ }
+
public String echo(String msg)
{
+ if (!this.correctState)
+ {
+ throw new WebServiceException("Unfunctional javax.annotation.* annotations");
+ }
+
log.info("echo: " + msg);
return msg + ":EJB3Impl";
}
+
}
Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/service/jaxws-service-handlers.xml
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/service/jaxws-service-handlers.xml 2009-04-02 08:35:37 UTC (rev 9704)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/service/jaxws-service-handlers.xml 2009-04-02 14:05:09 UTC (rev 9705)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
-
- <handler-chain>
- <handler>
- <handler-name>DescriptorResourcesHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</handler-class>
- </handler>
- </handler-chain>
-
- <handler-chain>
- <handler>
- <handler-name>JavaResourcesHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxws.jbws2074.handler.JavaResourcesHandler</handler-class>
- </handler>
- </handler-chain>
-
-</handler-chains>
\ No newline at end of file
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java 2009-04-02 14:05:09 UTC (rev 9705)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws2074.usecase3.client;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOIface;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-2074] Resource injection in jaxws endpoints and handlers
+ *
+ * @author ropalka at redhat.com
+ */
+public final class JBWS2074TestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2074TestCase.class, "jaxws-jbws2074-usecase3.war");
+ }
+
+ public void testUsecase1() throws Exception
+ {
+ String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws2074-usecase3/Service";
+ QName serviceName = new QName("http://ws.jboss.org/jbws2074", "POJOService");
+ Service service = Service.create(new URL(endpointAddress + "?wsdl"), serviceName);
+ POJOIface port = (POJOIface)service.getPort(POJOIface.class);
+
+ String retStr = port.echo("hello");
+
+ StringBuffer expStr = new StringBuffer("hello");
+ expStr.append(":POJOImpl");
+ assertEquals(expStr.toString(), retStr);
+ }
+
+}
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOIface.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOIface.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOIface.java 2009-04-02 14:05:09 UTC (rev 9705)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws2074.usecase3.service;
+
+import javax.jws.WebService;
+
+ at WebService
+(
+ name = "POJO",
+ targetNamespace = "http://ws.jboss.org/jbws2074"
+)
+public interface POJOIface
+{
+ String echo(String s);
+}
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.java 2009-04-02 14:05:09 UTC (rev 9705)
@@ -0,0 +1,303 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws2074.usecase3.service;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceException;
+
+import org.jboss.logging.Logger;
+
+ at WebService
+(
+ name = "POJO",
+ serviceName = "POJOService",
+ targetNamespace = "http://ws.jboss.org/jbws2074",
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOIface"
+)
+public class POJOImpl implements POJOIface
+{
+ private static Logger log = Logger.getLogger(POJOImpl.class);
+
+ /**
+ * java.lang.Boolean
+ */
+
+ private Boolean boolean0;
+
+ private Boolean boolean1;
+
+ private void setBoolean1(Boolean b)
+ {
+ this.boolean1 = b;
+ }
+
+ /**
+ * java.lang.Byte
+ */
+
+ private Byte byte0;
+
+ private Byte byte1;
+
+ private void setByte1(Byte b)
+ {
+ this.byte1 = b;
+ }
+
+ /**
+ * java.lang.Character
+ */
+
+ private Character character0;
+
+ private Character character1;
+
+ private void setCharacter1(Character c)
+ {
+ this.character1 = c;
+ }
+
+ /**
+ * java.lang.Short
+ */
+
+ private Short short0;
+
+ private Short short1;
+
+ private void setShort1(Short i)
+ {
+ this.short1 = i;
+ }
+
+ /**
+ * java.lang.Integer
+ */
+
+ @Resource(name = "integer")
+ private Integer integer0;
+
+ private Integer integer1;
+
+ @Resource(name = "integer")
+ private void setInteger1(Integer i)
+ {
+ this.integer1 = i;
+ }
+
+ /**
+ * java.lang.Long
+ */
+
+ @Resource(name = "long")
+ private Long long0;
+
+ private Long long1;
+
+ @Resource(name = "long")
+ private void setLong1(Long l)
+ {
+ this.long1 = l;
+ }
+
+ /**
+ * java.lang.Float
+ */
+
+ @Resource(name = "float")
+ private Float float0;
+
+ private Float float1;
+
+ @Resource(name = "float")
+ private void setFloat1(Float f)
+ {
+ this.float1 = f;
+ }
+
+ /**
+ * java.lang.Double
+ */
+
+ @Resource(name = "double")
+ private Double double0;
+
+ private Double double1;
+
+ @Resource(name = "double")
+ private void setDouble1(Double d)
+ {
+ this.double1 = d;
+ }
+
+ /**
+ * java.lang.String
+ */
+
+ @Resource
+ private String string;
+
+ private String string1;
+
+ @Resource
+ private void setString(String s)
+ {
+ this.string1 = s;
+ }
+
+ /**
+ * Indicates whether handler is in correct state.
+ */
+ private boolean correctState;
+
+ @PostConstruct
+ private void init()
+ {
+ boolean correctInitialization = true;
+
+ // java.lang.Boolean
+ if (this.boolean0 == null || this.boolean0 != true)
+ {
+ log.error("Descriptor driven initialization for boolean0 failed");
+ correctInitialization = false;
+ }
+ if (this.boolean1 == null || this.boolean1 != true)
+ {
+ log.error("Descriptor driven initialization for boolean1 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Byte
+ if (this.byte0 == null || this.byte0 != (byte)1)
+ {
+ log.error("Descriptor driven initialization for byte0 failed");
+ correctInitialization = false;
+ }
+ if (this.byte1 == null || this.byte1 != (byte)1)
+ {
+ log.error("Descriptor driven initialization for byte1 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Character
+ if (this.character0 == null || this.character0 != 'c')
+ {
+ log.error("Descriptor driven initialization for character0 failed");
+ correctInitialization = false;
+ }
+ if (this.character1 == null || this.character1 != 'c')
+ {
+ log.error("Descriptor driven initialization for character1 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Short
+ if (this.short0 == null || this.short0 != (short)5)
+ {
+ log.error("Descriptor driven initialization for short0 failed");
+ correctInitialization = false;
+ }
+ if (this.short1 == null || this.short1 != (short)5)
+ {
+ log.error("Descriptor driven initialization for short1 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Integer
+ if (this.integer0 == null || this.integer0 != 7)
+ {
+ log.error("@Resource initialization for integer0 failed");
+ correctInitialization = false;
+ }
+ if (this.integer1 == null || this.integer1 != 7)
+ {
+ log.error("@Resource initialization for integer1 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Long
+ if (this.long0 == null || this.long0 != 11L)
+ {
+ log.error("@Resource initialization for long0 failed");
+ correctInitialization = false;
+ }
+ if (this.long1 == null || this.long1 != 11L)
+ {
+ log.error("@Resource initialization for long1 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Float
+ if (this.float0 == null || this.float0 != 13.0f)
+ {
+ log.error("@Resource initialization for float0 failed");
+ correctInitialization = false;
+ }
+ if (this.float1 == null || this.float1 != 13.0f)
+ {
+ log.error("@Resource initialization for float1 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Double
+ if (this.double0 == null || this.double0 != 17.0)
+ {
+ log.error("@Resource initialization for double0 failed");
+ correctInitialization = false;
+ }
+ if (this.double1 == null || this.double1 != 17.0)
+ {
+ log.error("@Resource initialization for double1 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.String
+ if ("s".equals(this.string) == false)
+ {
+ log.error("@Resource initialization for string0 failed");
+ correctInitialization = false;
+ }
+ if ("s".equals(this.string1) == false)
+ {
+ log.error("@Resource initialization for string1 failed");
+ correctInitialization = false;
+ }
+
+ this.correctState = correctInitialization;
+ }
+
+ @WebMethod
+ public String echo(String msg)
+ {
+ if (!this.correctState)
+ {
+ throw new WebServiceException("Unfunctional javax.annotation.* annotations");
+ }
+
+ log.info("echo: " + msg);
+ return msg + ":POJOImpl";
+ }
+
+}
Modified: framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase1/WEB-INF/web.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase1/WEB-INF/web.xml 2009-04-02 08:35:37 UTC (rev 9704)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase1/WEB-INF/web.xml 2009-04-02 14:05:09 UTC (rev 9705)
@@ -14,7 +14,7 @@
<servlet-name>Service</servlet-name>
<url-pattern>/Service</url-pattern>
</servlet-mapping>
-
+
<env-entry>
<env-entry-name>boolean</env-entry-name>
<env-entry-type>java.lang.Boolean</env-entry-type>
@@ -25,53 +25,25 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setBoolean2</injection-target-name>
+ <injection-target-name>setBoolean1</injection-target-name>
</injection-target>
</env-entry>
<env-entry>
- <env-entry-name>booleanWrapper</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>true</env-entry-value>
- <injection-target>
- <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>boolean1</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setBoolean3</injection-target-name>
- </injection-target>
- </env-entry>
-
- <env-entry>
<env-entry-name>byte</env-entry-name>
<env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>2</env-entry-value>
+ <env-entry-value>1</env-entry-value>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
<injection-target-name>byte0</injection-target-name>
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setByte2</injection-target-name>
+ <injection-target-name>setByte1</injection-target-name>
</injection-target>
</env-entry>
<env-entry>
- <env-entry-name>byteWrapper</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>2</env-entry-value>
- <injection-target>
- <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>byte1</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setByte3</injection-target-name>
- </injection-target>
- </env-entry>
-
- <env-entry>
<env-entry-name>character</env-entry-name>
<env-entry-type>java.lang.Character</env-entry-type>
<env-entry-value>c</env-entry-value>
@@ -81,25 +53,11 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setCharacter2</injection-target-name>
+ <injection-target-name>setCharacter1</injection-target-name>
</injection-target>
</env-entry>
<env-entry>
- <env-entry-name>characterWrapper</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>c</env-entry-value>
- <injection-target>
- <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>character1</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setCharacter3</injection-target-name>
- </injection-target>
- </env-entry>
-
- <env-entry>
<env-entry-name>short</env-entry-name>
<env-entry-type>java.lang.Short</env-entry-type>
<env-entry-value>5</env-entry-value>
@@ -109,25 +67,11 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setShort2</injection-target-name>
+ <injection-target-name>setShort1</injection-target-name>
</injection-target>
</env-entry>
<env-entry>
- <env-entry-name>shortWrapper</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>5</env-entry-value>
- <injection-target>
- <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>short1</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setShort3</injection-target-name>
- </injection-target>
- </env-entry>
-
- <env-entry>
<env-entry-name>integer</env-entry-name>
<env-entry-type>java.lang.Integer</env-entry-type>
<env-entry-value>7</env-entry-value>
@@ -137,25 +81,11 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setInteger2</injection-target-name>
+ <injection-target-name>setInteger1</injection-target-name>
</injection-target>
</env-entry>
<env-entry>
- <env-entry-name>integerWrapper</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>7</env-entry-value>
- <injection-target>
- <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>integer1</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setInteger3</injection-target-name>
- </injection-target>
- </env-entry>
-
- <env-entry>
<env-entry-name>long</env-entry-name>
<env-entry-type>java.lang.Long</env-entry-type>
<env-entry-value>11</env-entry-value>
@@ -165,25 +95,11 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setLong2</injection-target-name>
+ <injection-target-name>setLong1</injection-target-name>
</injection-target>
</env-entry>
<env-entry>
- <env-entry-name>longWrapper</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>11</env-entry-value>
- <injection-target>
- <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>long1</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setLong3</injection-target-name>
- </injection-target>
- </env-entry>
-
- <env-entry>
<env-entry-name>float</env-entry-name>
<env-entry-type>java.lang.Float</env-entry-type>
<env-entry-value>13</env-entry-value>
@@ -193,25 +109,11 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setFloat2</injection-target-name>
+ <injection-target-name>setFloat1</injection-target-name>
</injection-target>
</env-entry>
<env-entry>
- <env-entry-name>floatWrapper</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>13</env-entry-value>
- <injection-target>
- <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>float1</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setFloat3</injection-target-name>
- </injection-target>
- </env-entry>
-
- <env-entry>
<env-entry-name>double</env-entry-name>
<env-entry-type>java.lang.Double</env-entry-type>
<env-entry-value>17</env-entry-value>
@@ -221,25 +123,11 @@
</injection-target>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setDouble2</injection-target-name>
+ <injection-target-name>setDouble1</injection-target-name>
</injection-target>
</env-entry>
<env-entry>
- <env-entry-name>doubleWrapper</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>17</env-entry-value>
- <injection-target>
- <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>double1</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setDouble3</injection-target-name>
- </injection-target>
- </env-entry>
-
- <env-entry>
<env-entry-name>string</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>s</env-entry-value>
Modified: framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase2/META-INF/ejb-jar.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase2/META-INF/ejb-jar.xml 2009-04-02 08:35:37 UTC (rev 9704)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase2/META-INF/ejb-jar.xml 2009-04-02 14:05:09 UTC (rev 9705)
@@ -1,286 +1,102 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ejb-jar version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd">
+<ejb-jar
+ version="3.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd">
- <enterprise-beans>
- <session>
-
- <ejb-name>EJB3Impl</ejb-name>
+ <enterprise-beans>
+ <session>
- <env-entry>
- <env-entry-name>boolean</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>true</env-entry-value>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>boolean0</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setBoolean2</injection-target-name>
- </injection-target>
- </env-entry>
+ <ejb-name>EJB3Impl</ejb-name>
- <env-entry>
- <env-entry-name>booleanWrapper</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>true</env-entry-value>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>boolean1</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setBoolean3</injection-target-name>
- </injection-target>
- </env-entry>
+ <env-entry>
+ <env-entry-name>boolean</env-entry-name>
+ <env-entry-type>java.lang.Boolean</env-entry-type>
+ <env-entry-value>true</env-entry-value>
+ <injection-target>
+ <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Impl</injection-target-class>
+ <injection-target-name>boolean0</injection-target-name>
+ </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>
+ </env-entry>
- <env-entry>
- <env-entry-name>byte</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>2</env-entry-value>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>byte0</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setByte2</injection-target-name>
- </injection-target>
- </env-entry>
+ <env-entry>
+ <env-entry-name>byte</env-entry-name>
+ <env-entry-type>java.lang.Byte</env-entry-type>
+ <env-entry-value>1</env-entry-value>
+ <injection-target>
+ <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Impl</injection-target-class>
+ <injection-target-name>byte0</injection-target-name>
+ </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>
+ </env-entry>
- <env-entry>
- <env-entry-name>byteWrapper</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>2</env-entry-value>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>byte1</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setByte3</injection-target-name>
- </injection-target>
- </env-entry>
+ <env-entry>
+ <env-entry-name>character</env-entry-name>
+ <env-entry-type>java.lang.Character</env-entry-type>
+ <env-entry-value>c</env-entry-value>
+ <injection-target>
+ <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Impl</injection-target-class>
+ <injection-target-name>character0</injection-target-name>
+ </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>
+ </env-entry>
- <env-entry>
- <env-entry-name>character</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>c</env-entry-value>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>character0</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setCharacter2</injection-target-name>
- </injection-target>
- </env-entry>
+ <env-entry>
+ <env-entry-name>short</env-entry-name>
+ <env-entry-type>java.lang.Short</env-entry-type>
+ <env-entry-value>5</env-entry-value>
+ <injection-target>
+ <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Impl</injection-target-class>
+ <injection-target-name>short0</injection-target-name>
+ </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>
+ </env-entry>
- <env-entry>
- <env-entry-name>characterWrapper</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>c</env-entry-value>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>character1</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setCharacter3</injection-target-name>
- </injection-target>
- </env-entry>
+ <env-entry>
+ <env-entry-name>integer</env-entry-name>
+ <env-entry-type>java.lang.Integer</env-entry-type>
+ <env-entry-value>7</env-entry-value>
+ </env-entry>
- <env-entry>
- <env-entry-name>short</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>5</env-entry-value>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>short0</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setShort2</injection-target-name>
- </injection-target>
- </env-entry>
+ <env-entry>
+ <env-entry-name>long</env-entry-name>
+ <env-entry-type>java.lang.Long</env-entry-type>
+ <env-entry-value>11</env-entry-value>
+ </env-entry>
- <env-entry>
- <env-entry-name>shortWrapper</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>5</env-entry-value>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>short1</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setShort3</injection-target-name>
- </injection-target>
- </env-entry>
+ <env-entry>
+ <env-entry-name>float</env-entry-name>
+ <env-entry-type>java.lang.Float</env-entry-type>
+ <env-entry-value>13</env-entry-value>
+ </env-entry>
- <env-entry>
- <env-entry-name>integer</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>7</env-entry-value>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>integer0</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setInteger2</injection-target-name>
- </injection-target>
- </env-entry>
+ <env-entry>
+ <env-entry-name>double</env-entry-name>
+ <env-entry-type>java.lang.Double</env-entry-type>
+ <env-entry-value>17</env-entry-value>
+ </env-entry>
- <env-entry>
- <env-entry-name>integerWrapper</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>7</env-entry-value>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>integer1</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setInteger3</injection-target-name>
- </injection-target>
- </env-entry>
+ <env-entry>
+ <env-entry-name>string</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>s</env-entry-value>
+ </env-entry>
- <env-entry>
- <env-entry-name>long</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>11</env-entry-value>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>long0</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setLong2</injection-target-name>
- </injection-target>
- </env-entry>
+ </session>
+ </enterprise-beans>
- <env-entry>
- <env-entry-name>longWrapper</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>11</env-entry-value>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>long1</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setLong3</injection-target-name>
- </injection-target>
- </env-entry>
-
- <env-entry>
- <env-entry-name>float</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>13</env-entry-value>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>float0</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setFloat2</injection-target-name>
- </injection-target>
- </env-entry>
-
- <env-entry>
- <env-entry-name>floatWrapper</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>13</env-entry-value>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>float1</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setFloat3</injection-target-name>
- </injection-target>
- </env-entry>
-
- <env-entry>
- <env-entry-name>double</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>17</env-entry-value>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>double0</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setDouble2</injection-target-name>
- </injection-target>
- </env-entry>
-
- <env-entry>
- <env-entry-name>doubleWrapper</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>17</env-entry-value>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>double1</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>setDouble3</injection-target-name>
- </injection-target>
- </env-entry>
-
- <env-entry>
- <env-entry-name>string</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>s</env-entry-value>
- <injection-target>
- <injection-target-class>
- org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class>
- <injection-target-name>string0</injection-target-name>
- </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>
- </env-entry>
-
- </session>
- </enterprise-beans>
-
</ejb-jar>
Added: framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase3/WEB-INF/web.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase3/WEB-INF/web.xml (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2074/usecase3/WEB-INF/web.xml 2009-04-02 14:05:09 UTC (rev 9705)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
+
+ <servlet>
+ <servlet-name>Service</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Service</servlet-name>
+ <url-pattern>/Service</url-pattern>
+ </servlet-mapping>
+
+ <env-entry>
+ <env-entry-name>boolean</env-entry-name>
+ <env-entry-type>java.lang.Boolean</env-entry-type>
+ <env-entry-value>true</env-entry-value>
+ <injection-target>
+ <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOImpl</injection-target-class>
+ <injection-target-name>boolean0</injection-target-name>
+ </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>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>byte</env-entry-name>
+ <env-entry-type>java.lang.Byte</env-entry-type>
+ <env-entry-value>1</env-entry-value>
+ <injection-target>
+ <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOImpl</injection-target-class>
+ <injection-target-name>byte0</injection-target-name>
+ </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>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>character</env-entry-name>
+ <env-entry-type>java.lang.Character</env-entry-type>
+ <env-entry-value>c</env-entry-value>
+ <injection-target>
+ <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOImpl</injection-target-class>
+ <injection-target-name>character0</injection-target-name>
+ </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>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>short</env-entry-name>
+ <env-entry-type>java.lang.Short</env-entry-type>
+ <env-entry-value>5</env-entry-value>
+ <injection-target>
+ <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOImpl</injection-target-class>
+ <injection-target-name>short0</injection-target-name>
+ </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>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>integer</env-entry-name>
+ <env-entry-type>java.lang.Integer</env-entry-type>
+ <env-entry-value>7</env-entry-value>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>long</env-entry-name>
+ <env-entry-type>java.lang.Long</env-entry-type>
+ <env-entry-value>11</env-entry-value>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>float</env-entry-name>
+ <env-entry-type>java.lang.Float</env-entry-type>
+ <env-entry-value>13</env-entry-value>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>double</env-entry-name>
+ <env-entry-type>java.lang.Double</env-entry-type>
+ <env-entry-value>17</env-entry-value>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>string</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>s</env-entry-value>
+ </env-entry>
+
+</web-app>
More information about the jbossws-commits
mailing list