Author: ruchithf
Date: Wed Jan 10 03:25:59 2007
New Revision: 494788
URL: http://svn.apache.org/viewvc?view=rev&rev=494788
Log:
1.) Checking in Sumedha's patch to WSCOMMONS-147
2.) Getting rid of unnecessary serilization logic from SOAPFaultReasonImpl
3.) No need to maintain nodeType in AttrImpl
4.) Setting the axiom version to snapshot
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultReasonImpl.java
webservices/commons/trunk/modules/axiom/project.properties
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java?view=diff&rev=494788&r1=494787&r2=494788
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
Wed Jan 10 03:25:59 2007
@@ -148,18 +148,8 @@
// /org.w3c.dom.Attr methods
// /
public String getName() {
- if(this.namespace != null)
- {
- if((OMConstants.XMLNS_NS_PREFIX.equals(this.attrName))){
- return this.attrName;
- }else
if(OMConstants.XMLNS_NS_URI.equals(this.namespace.getNamespaceURI())){
- return OMConstants.XMLNS_NS_PREFIX + ":" +
this.attrName;
- }else{
- return this.namespace.getPrefix()+":"+this.attrName;
- }
- }else{
- return this.attrName;
- }
+ return (this.namespace == null) ? this.attrName
+ : (OMConstants.XMLNS_NS_PREFIX.equals(this.attrName) ?
this.attrName : OMConstants.XMLNS_NS_PREFIX + ":" + this.attrName);
}
/**
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java?view=diff&rev=494788&r1=494787&r2=494788
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
Wed Jan 10 03:25:59 2007
@@ -56,11 +56,6 @@
*/
protected boolean done = false;
- /**
- * Field nodeType
- */
- protected int nodeType;
-
protected DocumentImpl ownerNode;
/**
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultReasonImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultReasonImpl.java?view=diff&rev=494788&r1=494787&r2=494788
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultReasonImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultReasonImpl.java
Wed Jan 10 03:25:59 2007
@@ -18,8 +18,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.util.OMSerializerUtil;
-import
org.apache.axiom.om.impl.serialize.StreamWriterToContentHandlerConverter;
import org.apache.axiom.om.util.ElementHelper;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPFactory;
@@ -28,8 +26,6 @@
import org.apache.axiom.soap.SOAPFaultText;
import org.apache.axiom.soap.SOAPProcessingException;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
import java.util.List;
public abstract class SOAPFaultReasonImpl extends SOAPElement implements
@@ -68,46 +64,6 @@
public SOAPFaultText getFirstSOAPText() {
return (SOAPFaultText) ElementHelper.getChildWithName(this,
SOAP12Constants.SOAP_FAULT_TEXT_LOCAL_NAME);
- }
-
- protected void internalSerialize(XMLStreamWriter writer, boolean cache)
throws XMLStreamException {
- // select the builder
- short builderType = PULL_TYPE_BUILDER; // default is pull type
- if (builder != null) {
- builderType = this.builder.getBuilderType();
- }
- if ((builderType == PUSH_TYPE_BUILDER)
- && (builder.getRegisteredContentHandler() == null)) {
- builder.registerExternalContentHandler(new
StreamWriterToContentHandlerConverter(writer));
- }
-
- if (!cache) {
- //No caching
- if (this.firstChild != null) {
- OMSerializerUtil.serializeStartpart(this, writer);
- firstChild.internalSerializeAndConsume(writer);
- OMSerializerUtil.serializeEndpart(writer);
- } else if (!this.done) {
- if (builderType == PULL_TYPE_BUILDER) {
- OMSerializerUtil.serializeByPullStream(this, writer);
- } else {
- OMSerializerUtil.serializeStartpart(this, writer);
- builder.setCache(cache);
- builder.next();
- OMSerializerUtil.serializeEndpart(writer);
- }
- } else {
- OMSerializerUtil.serializeNormal(this, writer, cache);
- }
- // do not serialise the siblings
-
-
- } else {
- //Cached
- OMSerializerUtil.serializeNormal(this, writer, cache);
-
- // do not serialise the siblings
- }
}
public List getAllSoapTexts() {
Modified: webservices/commons/trunk/modules/axiom/project.properties
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/project.properties?view=diff&rev=494788&r1=494787&r2=494788
==============================================================================
--- webservices/commons/trunk/modules/axiom/project.properties (original)
+++ webservices/commons/trunk/modules/axiom/project.properties Wed Jan 10
03:25:59 2007
@@ -19,7 +19,7 @@
# -------------------------------------------------------------------
# Project Information
# -------------------------------------------------------------------
-axiom.version=1.2.2
+axiom.version=SNAPSHOT
# -------------------------------------------------------------------
# Dependency Repositories
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
