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 ch...@apache.org on 2006/03/31 20:56:07 UTC
svn commit: r390475 - in /webservices/axis2/trunk/java/modules:
adb/test/org/apache/axis2/databinding/ codegen/test/org/apache/axis2/wsdl/
core/src/org/apache/axis2/description/ jibx/src/org/apache/axis2/jibx/
saaj/src/org/apache/axis2/saaj/ saaj/test/...
Author: chinthaka
Date: Fri Mar 31 10:56:05 2006
New Revision: 390475
URL: http://svn.apache.org/viewcvs?rev=390475&view=rev
Log:
Fixing to comply with latest axiom changes in default ns handling.
Modified:
webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java
webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/WSDLServiceBuilderTest.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java
webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/OMJiBXElementImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/TextTest.java
Modified: webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java?rev=390475&r1=390474&r2=390475&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java (original)
+++ webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java Fri Mar 31 10:56:05 2006
@@ -18,12 +18,12 @@
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axis2.databinding.utils.ADBPullParser;
import org.apache.axis2.databinding.utils.PrintEvents;
-import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
import org.custommonkey.xmlunit.XMLTestCase;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -68,7 +68,7 @@
XMLStreamReader r = getTestEnvelope().getXMLStreamReader();
PrintEvents.print(r);
}
-
+
public void testPrintEvents2() throws Exception {
//TODO: FIXME. Check the output difference between this method and the testPrintEvents method
XMLStreamReader r = getTestEnvelope().getXMLStreamReaderWithoutCaching();
@@ -81,14 +81,17 @@
StAXSOAPModelBuilder builder2 = new StAXSOAPModelBuilder(getTestEnvelope().getXMLStreamReader(), DOOMAbstractFactory.getSOAP11Factory(), SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
SOAPEnvelope envelope = builder2.getSOAPEnvelope();
envelope.build();
-
+
StringWriter writer = new StringWriter();
envelope.serialize(writer);
writer.flush();
-
- XMLStreamReader r = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(writer.toString()));
+
+ String s2 = writer.toString();
+ System.out.println("s2 = " + s2);
+
+ XMLStreamReader r = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(s2));
PrintEvents.print(r);
-
+
assertXMLEqual(writer.toString(),xml);
}
@@ -134,7 +137,7 @@
XMLStreamReader r = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(writer.toString()));
PrintEvents.print(r);
- //TODO: FIXME. Simpler test in testPrintEvents2
+ //TODO: FIXME. Simpler test in testPrintEvents2
//assertXMLEqual(writer.toString(),xml);
}
Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/WSDLServiceBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/WSDLServiceBuilderTest.java?rev=390475&r1=390474&r2=390475&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/WSDLServiceBuilderTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/WSDLServiceBuilderTest.java Fri Mar 31 10:56:05 2006
@@ -66,7 +66,6 @@
AxisService service = builder.populateService();
System.out.println("Testinf file: " + file1.getName());
configContext.getAxisConfiguration().addService(service);
- System.out.println("");
OutputStream out = new FileOutputStream(new File(outLocation, file1.getName()));
service.printWSDL(out, "http://google.com/axis2/services");
out.flush();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java?rev=390475&r1=390474&r2=390475&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java Fri Mar 31 10:56:05 2006
@@ -9,7 +9,13 @@
import org.apache.ws.java2wsdl.Java2WSDLConstants;
import org.apache.wsdl.WSDLConstants;
import org.apache.wsdl.WSDLExtensibilityElement;
-import org.apache.wsdl.extensions.*;
+import org.apache.wsdl.extensions.DefaultExtensibilityElement;
+import org.apache.wsdl.extensions.PolicyExtensibilityElement;
+import org.apache.wsdl.extensions.SOAPAddress;
+import org.apache.wsdl.extensions.SOAPBinding;
+import org.apache.wsdl.extensions.SOAPBody;
+import org.apache.wsdl.extensions.SOAPHeader;
+import org.apache.wsdl.extensions.SOAPOperation;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
@@ -77,7 +83,11 @@
Iterator keys = nameSpaceMap.keySet().iterator();
while (keys.hasNext()) {
String key = (String) keys.next();
- ele.declareNamespace((String) nameSpaceMap.get(key), key);
+ if ("".equals(key)) {
+ ele.declareDefaultNamespace((String) nameSpaceMap.get(key));
+ }else {
+ ele.declareNamespace((String) nameSpaceMap.get(key), key);
+ }
}
soap = ele.declareNamespace(DEFAULT_SOAP_NAMESPACE, DEFAULT_SOAP_NAMESPACE_PREFIX);
String prefix = getPrefix(axisService.getTargetNamespace());
Modified: webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/OMJiBXElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/OMJiBXElementImpl.java?rev=390475&r1=390474&r2=390475&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/OMJiBXElementImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/OMJiBXElementImpl.java Fri Mar 31 10:56:05 2006
@@ -101,6 +101,14 @@
return forceTree().declareNamespace(uri, prefix);
}
+ public OMNamespace declareDefaultNamespace(String uri) {
+ throw new UnsupportedOperationException(); //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public OMNamespace getDefaultNamespace() {
+ throw new UnsupportedOperationException(); //To change body of implemented methods use File | Settings | File Templates.
+ }
+
/* (non-Javadoc)
* @see org.apache.axiom.om.OMElement#declareNamespace(org.apache.axiom.om.OMNamespace)
*/
@@ -232,7 +240,7 @@
}
public QName getTextAsQName() {
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ throw new UnsupportedOperationException(); //To change body of implemented methods use File | Settings | File Templates.
}
/* (non-Javadoc)
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?rev=390475&r1=390474&r2=390475&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java Fri Mar 31 10:56:05 2006
@@ -102,7 +102,8 @@
* @see javax.xml.soap.SOAPElement#addChildElement(javax.xml.soap.Name)
*/
public SOAPElement addChildElement(Name name) throws SOAPException {
- return addChildElement(name.getLocalName(), name.getPrefix(), name.getURI());
+ String prefix = name.getPrefix();
+ return addChildElement(name.getLocalName(), "".equals(prefix) ? null : prefix , name.getURI());
}
/* (non-Javadoc)
@@ -158,8 +159,8 @@
* @see javax.xml.soap.SOAPElement#addChildElement(java.lang.String, java.lang.String, java.lang.String)
*/
public SOAPElement addChildElement(String localName, String prefix, String uri) throws SOAPException {
- element.declareNamespace(uri, prefix);
- return addChildElement(localName, prefix);
+ OMNamespace omNamespace = element.declareNamespace(uri, prefix);
+ return addChildElement(localName, omNamespace.getPrefix());
}
/* (non-Javadoc)
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/TextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/TextTest.java?rev=390475&r1=390474&r2=390475&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/TextTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/TextTest.java Fri Mar 31 10:56:05 2006
@@ -34,7 +34,7 @@
Name bodyName = soapFactory.createName("VBGenReceiver", "xsi",
"http://www.w3.org/2001/XMLSchema-instance");
SOAPBodyElement bodyElement = body.addBodyElement(bodyName);
-
+
// Create the MetaData Tag
Name name = soapFactory.createName("MetaData");
SOAPElement metaData = bodyElement.addChildElement(name);