You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by gd...@apache.org on 2009/08/07 17:21:16 UTC
svn commit: r802044 - in /webservices/axis2/branches/java/1_5: ./
modules/jaxbri/src/org/apache/axis2/jaxbri/template/
modules/kernel/src/org/apache/axis2/transport/http/util/
modules/kernel/test/org/apache/axis2/transport/http/util/
modules/transport/...
Author: gdaniels
Date: Fri Aug 7 15:21:12 2009
New Revision: 802044
URL: http://svn.apache.org/viewvc?rev=802044&view=rev
Log:
Merge fix for https://issues.apache.org/jira/browse/AXIS2-4458 from trunk.
Modified:
webservices/axis2/branches/java/1_5/ (props changed)
webservices/axis2/branches/java/1_5/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java (props changed)
webservices/axis2/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java (props changed)
webservices/axis2/branches/java/1_5/modules/transport/http/pom.xml (props changed)
webservices/axis2/branches/java/1_5/modules/transport/http/src/ (props changed)
webservices/axis2/branches/java/1_5/modules/transport/local/ (props changed)
webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (props changed)
webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (props changed)
Propchange: webservices/axis2/branches/java/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 7 15:21:12 2009
@@ -1 +1 @@
-/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102
+/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,801630
Modified: webservices/axis2/branches/java/1_5/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl?rev=802044&r1=802043&r2=802044&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl (original)
+++ webservices/axis2/branches/java/1_5/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl Fri Aug 7 15:21:12 2009
@@ -20,7 +20,7 @@
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="text"/>
<!-- ################################################################################# -->
- <!-- ############################ JiBX template ############################## -->
+ <!-- ############################ JAXB-RI template ############################## -->
<xsl:template match="databinders[@dbtype='jaxbri']">
<xsl:variable name="base64"><xsl:value-of select="base64Elements/name"/></xsl:variable>
@@ -33,33 +33,29 @@
</xsl:if>
<xsl:variable name="firstType"><xsl:value-of select="param[1]/@type"/></xsl:variable>
-
- <xsl:for-each select="param[not(@type = preceding-sibling::param/@type)]">
- <xsl:if test="@type!=''">
- private static javax.xml.bind.JAXBContext _<xsl:value-of select="translate(@type,'.><[]','_____')"/>;
- </xsl:if>
- </xsl:for-each>
-
- private static final java.util.HashMap<Class,javax.xml.bind.JAXBContext> classContextMap = new java.util.HashMap<Class,javax.xml.bind.JAXBContext>();
-
+
+ private static final javax.xml.bind.JAXBContext wsContext;
static {
javax.xml.bind.JAXBContext jc;
+ jc = null;
+ try {
+ jc = javax.xml.bind.JAXBContext.newInstance(
<xsl:for-each select="param[not(@type = preceding-sibling::param/@type)]">
<xsl:if test="@type!=''">
- jc = null;
- try {
- jc = javax.xml.bind.JAXBContext.newInstance(<xsl:value-of select="@type"/>.class);
- }
- catch ( javax.xml.bind.JAXBException ex ) {
- System.err.println("Unable to create JAXBContext for class: <xsl:value-of select='@type'/>");
- Runtime.getRuntime().exit(-1);
- }
- finally {
- _<xsl:value-of select="translate(@type,'.><[]','_____')"/> = jc;
- classContextMap.put(<xsl:value-of select="@type"/>.class, jc);
- }
+ <xsl:value-of select="@type"/>.class<xsl:if test="position() != last()">,
+ </xsl:if>
</xsl:if>
</xsl:for-each>
+ );
+ }
+ catch ( javax.xml.bind.JAXBException ex ) {
+ System.err.println("Unable to create JAXBContext: " + ex.getMessage());
+ ex.printStackTrace(System.err);
+ Runtime.getRuntime().exit(-1);
+ }
+ finally {
+ wsContext = jc;
+ }
}
<xsl:for-each select="param[not(@type = preceding-sibling::param/@type)]">
@@ -68,7 +64,7 @@
private org.apache.axiom.om.OMElement toOM(<xsl:value-of select="@type"/> param, boolean optimizeContent)
throws org.apache.axis2.AxisFault {
try {
- javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.><[]','_____')"/>;
+ javax.xml.bind.JAXBContext context = wsContext;
javax.xml.bind.Marshaller marshaller = context.createMarshaller();
marshaller.setProperty(javax.xml.bind.Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
@@ -101,7 +97,7 @@
org.apache.axiom.om.OMElement param,
java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
try {
- javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.><[]','_____')"/>;
+ javax.xml.bind.JAXBContext context = wsContext;
javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
java.lang.Byte ret = (java.lang.Integer)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), byte.class).getValue();
@@ -116,7 +112,7 @@
org.apache.axiom.om.OMElement param,
java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
try {
- javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.><[]','_____')"/>;
+ javax.xml.bind.JAXBContext context = wsContext;
javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
java.lang.Character ret = (java.lang.Character)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), char.class).getValue();
@@ -131,7 +127,7 @@
org.apache.axiom.om.OMElement param,
java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
try {
- javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.><[]','_____')"/>;
+ javax.xml.bind.JAXBContext context = wsContext;
javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
java.lang.Double ret = (java.lang.Double)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), double.class).getValue();
@@ -146,7 +142,7 @@
org.apache.axiom.om.OMElement param,
java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
try {
- javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.><[]','_____')"/>;
+ javax.xml.bind.JAXBContext context = wsContext;
javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
java.lang.Float ret = (java.lang.Float)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), float.class).getValue();
@@ -161,7 +157,7 @@
org.apache.axiom.om.OMElement param,
java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
try {
- javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.><[]','_____')"/>;
+ javax.xml.bind.JAXBContext context = wsContext;
javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
java.lang.Integer ret = (java.lang.Integer)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), int.class).getValue();
@@ -176,7 +172,7 @@
org.apache.axiom.om.OMElement param,
java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
try {
- javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.><[]','_____')"/>;
+ javax.xml.bind.JAXBContext context = wsContext;
javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
java.lang.Long ret = (java.lang.Long)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), long.class).getValue();
@@ -191,7 +187,7 @@
org.apache.axiom.om.OMElement param,
java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
try {
- javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.><[]','_____')"/>;
+ javax.xml.bind.JAXBContext context = wsContext;
javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
java.lang.Short ret = (java.lang.Short)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), short.class).getValue();
@@ -206,7 +202,7 @@
org.apache.axiom.om.OMElement param,
java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
try {
- javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.><[]','_____')"/>;
+ javax.xml.bind.JAXBContext context = wsContext;
javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
java.lang.Boolean ret = (java.lang.Boolean)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), boolean.class).getValue();
@@ -232,7 +228,7 @@
java.lang.Class type,
java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
try {
- javax.xml.bind.JAXBContext context = classContextMap.get(type);
+ javax.xml.bind.JAXBContext context = wsContext;
javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
return unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), type).getValue();
@@ -310,7 +306,7 @@
public javax.xml.stream.XMLStreamReader getReader() throws javax.xml.stream.XMLStreamException {
try {
- javax.xml.bind.JAXBContext context = classContextMap.get(outClazz);
+ javax.xml.bind.JAXBContext context = wsContext;
org.apache.axiom.om.impl.builder.SAXOMBuilder builder = new org.apache.axiom.om.impl.builder.SAXOMBuilder();
javax.xml.bind.Marshaller marshaller = context.createMarshaller();
marshaller.marshal(new javax.xml.bind.JAXBElement(
@@ -324,4 +320,4 @@
}
</xsl:template>
- </xsl:stylesheet>
\ No newline at end of file
+ </xsl:stylesheet>
Propchange: webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 7 15:21:12 2009
@@ -1 +1 @@
-/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:761709
+/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:761709,801630
Propchange: webservices/axis2/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 7 15:21:12 2009
@@ -1 +1 @@
-/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:761709
+/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:761709,801630
Propchange: webservices/axis2/branches/java/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 7 15:21:12 2009
@@ -0,0 +1 @@
+/webservices/axis2/trunk/java/modules/transport/http/pom.xml:801630
Propchange: webservices/axis2/branches/java/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 7 15:21:12 2009
@@ -0,0 +1 @@
+/webservices/axis2/trunk/java/modules/transport/http/src:801630
Propchange: webservices/axis2/branches/java/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 7 15:21:12 2009
@@ -0,0 +1 @@
+/webservices/axis2/trunk/java/modules/transport/local:801630
Propchange: webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 7 15:21:12 2009
@@ -1 +1 @@
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:761709
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:761709,801630
Propchange: webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 7 15:21:12 2009
@@ -1 +1 @@
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:761709
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:761709,801630