[jbossws-commits] JBossWS SVN: r1596 - trunk/src/main/java/org/jboss/ws/metadata
Author: jason.greene(a)jboss.com
Date: 2006-12-07 02:02:46 -0500 (Thu, 07 Dec 2006)
New Revision: 1596
Modified:
trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java
Log:
Dont generate types for header parameters
Modified: trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java 2006-12-07 01:22:45
UTC (rev 1595)
+++ trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java 2006-12-07 07:02:46
UTC (rev 1596)
@@ -56,7 +56,7 @@
{
// provide logging
private final Logger log = Logger.getLogger(ParameterMetaData.class);
-
+
// The parent operation
private OperationMetaData opMetaData;
@@ -89,7 +89,7 @@
messageTypes.add("javax.xml.soap.SOAPElement");
messageTypes.add("org.w3c.dom.Element");
}
-
+
public ParameterMetaData(OperationMetaData opMetaData, QName xmlName, QName xmlType,
String javaTypeName)
{
this(opMetaData, xmlName, javaTypeName);
@@ -172,7 +172,7 @@
String mimeType = convertXmlTypeToMimeType(xmlType);
setMimeTypes(mimeType);
this.isSwA = true;
- }
+ }
}
public String getJavaTypeName()
@@ -186,7 +186,7 @@
UnifiedMetaData wsMetaData =
opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData();
if (wsMetaData.isEagerInitialized() && UnifiedMetaData.isFinalRelease() ==
false)
log.warn("Set java type name after eager initialization", new
IllegalStateException());
-
+
javaTypeName = typeName;
javaType = null;
}
@@ -203,7 +203,7 @@
{
ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader();
tmpJavaType = JavaUtils.loadJavaType(javaTypeName, loader);
-
+
UnifiedMetaData wsMetaData =
opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData();
if (wsMetaData.isEagerInitialized())
{
@@ -302,12 +302,12 @@
{
this.soapArrayCompType = xmlType;
}
-
+
public boolean isMessageType()
{
return messageTypes.contains(javaTypeName);
}
-
+
public static boolean isMessageType(String javaTypeName)
{
return messageTypes.contains(javaTypeName);
@@ -360,7 +360,7 @@
{
// nothing to do
}
-
+
/**
* @see UnifiedMetaData#eagerInitialize()
*/
@@ -368,8 +368,9 @@
{
// reset java type
javaType = null;
-
- if (getOperationMetaData().isDocumentWrapped() && isMessageType() ==
false)
+
+ // FIXME - Message types are only valid for BARE types, checks should not be
needed
+ if (getOperationMetaData().isDocumentWrapped() && !isInHeader() &&
!isMessageType())
{
new DynamicWrapperGenerator(getClassLoader()).generate(this);