You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ds...@apache.org on 2007/03/18 12:38:57 UTC
svn commit: r519598 - in
/webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx:
CodeGenerationUtility.java JiBXDataSource.java
template/JibXDatabindingTemplate.xsl
Author: dsosnoski
Date: Sun Mar 18 04:38:56 2007
New Revision: 519598
URL: http://svn.apache.org/viewvc?view=rev&rev=519598
Log:
Merge fixes from post-1.1.1 code
Modified:
webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/CodeGenerationUtility.java
webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/JiBXDataSource.java
webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl
Modified: webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/CodeGenerationUtility.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/CodeGenerationUtility.java?view=diff&rev=519598&r1=519597&r2=519598
==============================================================================
--- webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/CodeGenerationUtility.java (original)
+++ webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/CodeGenerationUtility.java Sun Mar 18 04:38:56 2007
@@ -736,6 +736,9 @@
String dflt = element.getDefaultValue();
if (dflt == null) {
dflt = format.getDefaultText();
+ if (javatype.equals("float")) {
+ dflt = dflt + 'F';
+ }
}
if (dflt != null) {
param.setAttribute("default", dflt);
Modified: webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/JiBXDataSource.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/JiBXDataSource.java?view=diff&rev=519598&r1=519597&r2=519598
==============================================================================
--- webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/JiBXDataSource.java (original)
+++ webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/JiBXDataSource.java Sun Mar 18 04:38:56 2007
@@ -143,7 +143,8 @@
public void serialize(OutputStream output, OMOutputFormat format) throws XMLStreamException {
try {
IMarshallingContext ctx = bindingFactory.createMarshallingContext();
- ctx.setOutput(output, format.getCharSetEncoding());
+ ctx.setOutput(output,
+ format == null ? null : format.getCharSetEncoding());
marshal(ctx);
} catch (JiBXException e) {
throw new XMLStreamException("Error in JiBX marshalling", e);
Modified: webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl?view=diff&rev=519598&r1=519597&r2=519598
==============================================================================
--- webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl Sun Mar 18 04:38:56 2007
@@ -859,7 +859,7 @@
}
</xsl:if>
<xsl:choose>
- <xsl:when test="optional">
+ <xsl:when test="@optional='true'">
}
</xsl:when>
<xsl:otherwise>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org