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 di...@apache.org on 2005/09/30 04:51:03 UTC
svn commit: r292605 - in /webservices/axis2/trunk/java/modules:
common/src/org/apache/axis2/i18n/
wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/
wsdl/src/org/apache/axis2/wsdl/codegen/
wsdl/src/org/apache/axis2/wsdl/codegen/emitter/ wsdl/src/org/apache...
Author: dims
Date: Thu Sep 29 19:50:47 2005
New Revision: 292605
URL: http://svn.apache.org/viewcvs?rev=292605&view=rev
Log:
Remove JUNK!!!!!!!!!! Please don't comment code. Remove it and rely on svn for history.
Modified:
webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/ProjectResourceBundle.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL11MEPFinder.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/databinding/JavaTypeMapper.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/ConfigPropertyFileLoader.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XMLUtils.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XSLTTemplateProcessor.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/XMLComparator.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPHeaderImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java
Modified: webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/ProjectResourceBundle.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/ProjectResourceBundle.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/ProjectResourceBundle.java (original)
+++ webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/ProjectResourceBundle.java Thu Sep 29 19:50:47 2005
@@ -67,7 +67,6 @@
if (log.isDebugEnabled()) {
log.debug(this.toString() + "::handleGetObject(" + key + ")");
}
-// return resourceBundle.handleGetObject(key);
Object obj;
try {
obj = resourceBundle.getObject(key);
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL11MEPFinder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL11MEPFinder.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL11MEPFinder.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL11MEPFinder.java Thu Sep 29 19:50:47 2005
@@ -25,26 +25,6 @@
public class WSDL11MEPFinder {
public static String getMEP(Operation operation) {
-// boolean inMessageExist = false, outMessageExist = false;
-// if(null != operation.getInput()){
-// inMessageExist = true;
-// }
-// if(null != operation.getOutput()){
-// outMessageExist = true;
-// }
-//
-// if(inMessageExist && outMessageExist){
-// return WSDLConstants.MEP_URI_IN_OUT;
-// }
-//
-// if(inMessageExist && !outMessageExist){
-// return WSDLConstants.MEP_URI_IN_ONLY;
-// }
-//
-// if(!inMessageExist && outMessageExist){
-// return WSDLConstants.MEP_URI_OUT_ONLY;
-// }
-//
OperationType operationType = operation.getStyle();
if (null != operationType) {
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java Thu Sep 29 19:50:47 2005
@@ -838,7 +838,6 @@
Part msgPart = msg.getPart(soapHeader.getPart());
soapHeaderExtensibilityElement.setElement(msgPart.getElementName());
}
-// msgPart.
soapHeaderExtensibilityElement.setMessage(soapHeader.getMessage());
soapHeaderExtensibilityElement.setPart(soapHeader.getPart());
@@ -857,10 +856,6 @@
soapBindingExtensibilityElement.setRequired(required.booleanValue());
}
component.addExtensibilityElement(soapBindingExtensibilityElement);
- } else {
- // throw new AxisError(
-// "An Extensible item "+wsdl4jElement.getElementType()+" went unparsed during WSDL Parsing");
-
}
}
}
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java Thu Sep 29 19:50:47 2005
@@ -102,7 +102,6 @@
this.databindingType = XSLTConstants.DataBindingTypes.NONE;
} else {
this.databindingType = XSLTConstants.DataBindingTypes.NONE;
-// throw new UnsupportedOperationException();
}
}
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java Thu Sep 29 19:50:47 2005
@@ -63,7 +63,6 @@
private static final String CALL_BACK_HANDLER_SUFFIX = "CallbackHandler";
private static final String STUB_SUFFIX = "Stub";
private static final String TEST_SUFFIX = "Test";
-// private static final String LOCAL_TEST_SUFFIX = "LocalTest";
private static final String SERVICE_CLASS_SUFFIX = "Skeleton";
private static final String TEST_PACKAGE_NAME_SUFFIX = ".test";
private static final String DATABINDING_SUPPORTER_NAME_SUFFIX = "DatabindingSupporter";
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java Thu Sep 29 19:50:47 2005
@@ -82,10 +82,6 @@
//create the type mapper
JavaTypeMapper mapper = new JavaTypeMapper();
- int length = 0;
- for (int j = 0; j < length; j++) {
-// mapper.addTypeMapping();
- }
//set the type mapper to the config
configuration.setTypeMapper(mapper);
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java Thu Sep 29 19:50:47 2005
@@ -129,16 +129,6 @@
,null));
}
-// //////////////////////////////////////////////////////////////////////////
-// for (int i = 0; i < xmlObjectsVector.size(); i++) {
-// XmlObject xmlObject = (XmlObject) xmlObjectsVector.get(i);
-// //System.out.println("xmlObject = " + xmlObject.toString());
-// System.out.println("xmlObject = " + xmlObject.getClass().getName());
-//
-// }
-// //System.out.println("xmlObjectsVector = " + xmlObjectsVector);
- //////////////////////////////////////////////////////////////////////////
-
//compile the type system
XmlObject[] objeArray = convertToXMLObjectArray(xmlObjectsVector);
BindingConfig config = new Axis2BindingConfig();
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/databinding/JavaTypeMapper.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/databinding/JavaTypeMapper.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/databinding/JavaTypeMapper.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/databinding/JavaTypeMapper.java Thu Sep 29 19:50:47 2005
@@ -20,18 +20,6 @@
public class JavaTypeMapper extends TypeMappingAdapter {
public JavaTypeMapper() {
- //add the basic types to the table
-// this.map.put(new QName(XSD_SCHEMA_URL,"string"),String.class.getName());
-// this.map.put(new QName(XSD_SCHEMA_URL,"boolean"),Boolean.class.getName());
-// this.map.put(new QName(XSD_SCHEMA_URL,"double"),Double.class.getName());
-// this.map.put(new QName(XSD_SCHEMA_URL,"long"),Long.class.getName());
-// this.map.put(new QName(XSD_SCHEMA_URL,"float"),Float.class.getName());
-// this.map.put(new QName(XSD_SCHEMA_URL,"int"),Integer.class.getName());
-// this.map.put(new QName(XSD_SCHEMA_URL,"short"),Short.class.getName());
-// this.map.put(new QName(XSD_SCHEMA_URL,"byte"),Byte.class.getName());
-// this.map.put(new QName(XSD_SCHEMA_URL,"decimal"),BigDecimal.class.getName());
-// this.map.put(new QName(XSD_SCHEMA_URL,"date"),Date.class.getName());
-// this.map.put(new QName(XSD_SCHEMA_URL,"QName"),QName.class.getName());
}
public String toString() {
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/ConfigPropertyFileLoader.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/ConfigPropertyFileLoader.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/ConfigPropertyFileLoader.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/ConfigPropertyFileLoader.java Thu Sep 29 19:50:47 2005
@@ -39,7 +39,6 @@
URL url = ConfigPropertyFileLoader.class.getResource("/org/apache/axis2/wsdl/codegen/codegen-config.properties");
stream = new FileInputStream(url.toString());
}
-// InputStream stream = Object.class.getResourceAsStream("/org/apache/axis2/wsdl/codegen/codegen-config.properties");
Properties props = new Properties();
props.load(stream);
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XMLUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XMLUtils.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XMLUtils.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XMLUtils.java Thu Sep 29 19:50:47 2005
@@ -50,9 +50,6 @@
public class XMLUtils {
-// protected Log log =
-// LogFactory.getLog(getClass().getName());
-
public static final String charEncoding = "ISO-8859-1";
private static final String saxParserFactoryProperty =
"javax.xml.parsers.SAXParserFactory";
@@ -189,32 +186,6 @@
private static boolean tryReset= true;
-// /** Get a SAX parser instance from the JAXP factory.
-// *
-// * @return a SAXParser instance.
-// */
-// public static synchronized SAXParser getSAXParser() {
-// if(!saxParsers.empty()) {
-// return (SAXParser )saxParsers.pop();
-// }
-//
-// try {
-// SAXParser parser = saxFactory.newSAXParser();
-// parser.getParser().setEntityResolver(new DefaultEntityResolver());
-// XMLReader reader = parser.getXMLReader();
-// reader.setEntityResolver(new DefaultEntityResolver());
-// reader.setFeature("http://xml.org/sax/features/namespace-prefixes", false);
-// return parser;
-// } catch (ParserConfigurationException e) {
-// log.error(Messages.getMessage("parserConfigurationException00"), e);
-// return null;
-// } catch (SAXException se) {
-// log.error(Messages.getMessage("SAXException00"), se);
-// return null;
-// }
-// }
-
-
/** Return a SAX parser for reuse.
* @param parser A SAX parser that is available for reuse
*/
@@ -225,10 +196,6 @@
try{
XMLReader xmlReader= parser.getXMLReader();
if(null != xmlReader){
-// xmlReader.setContentHandler(doNothingContentHandler);
-// xmlReader.setDTDHandler(doNothingContentHandler);
-// xmlReader.setEntityResolver(doNothingContentHandler);
-// xmlReader.setErrorHandler(doNothingContentHandler);
synchronized (XMLUtils.class ) {
saxParsers.push(parser);
}
@@ -426,8 +393,6 @@
public static class ParserErrorHandler implements ErrorHandler
{
-// protected static Log log =
-// LogFactory.getLog(ParserErrorHandler.class.getName());
/**
* Returns a string describing parse exception details
*/
@@ -445,8 +410,6 @@
// See SAX documentation for more info.
public void warning(SAXParseException spe) throws SAXException {
-// if (log.isDebugEnabled())
-// log.debug( Messages.getMessage("warning00", getParseExceptionInfo(spe)));
}
public void error(SAXParseException spe) throws SAXException {
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XSLTTemplateProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XSLTTemplateProcessor.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XSLTTemplateProcessor.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XSLTTemplateProcessor.java Thu Sep 29 19:50:47 2005
@@ -45,15 +45,6 @@
InputStream xmlStream,
InputStream xsltStream)
throws TransformerFactoryConfigurationError, TransformerException {
-
-// byte [] bytes = new byte[10000];
-// try {
-// IOUtils.readFully(xmlStream, bytes);
-// } catch (IOException e) {
-// e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
-// }
-// System.out.print(new String(bytes));
-
Source xmlSource = new StreamSource(xmlStream);
Source xsltSource = new StreamSource(xsltStream);
Result result = new StreamResult(out);
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java Thu Sep 29 19:50:47 2005
@@ -39,11 +39,6 @@
*/
public class OMStAXWrapper implements XMLStreamReader, XMLStreamConstants {
/**
- * Field log
- */
-// private Log log = LogFactory.getLog(getClass());
-
- /**
* Field navigator
*/
private OMNavigator navigator;
@@ -962,7 +957,6 @@
* @return
*/
public String getVersion() {
-// throw new UnsupportedOperationException();
return "1.0"; //todo put the constant
}
@@ -991,8 +985,6 @@
* @return
*/
public String getCharacterEncodingScheme() {
-// throw new UnsupportedOperationException();
-// throw new UnsupportedOperationException();
return "utf-8";
}
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/XMLComparator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/XMLComparator.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/XMLComparator.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/XMLComparator.java Thu Sep 29 19:50:47 2005
@@ -142,9 +142,6 @@
if (omNode instanceof OMElement) {
OMElement elementOneChild = (OMElement) omNode;
OMElement elementTwoChild = null;
-// if ("Reference4".equals(elementOneChild.getLocalName())) {
-// log.info("Reference4");
-// }
//Do the comparison only if the element is not ignorable
if (!isIgnorable(elementOneChild)){
elementTwoChild = elementTwo.getFirstChildWithName(
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java Thu Sep 29 19:50:47 2005
@@ -149,7 +149,6 @@
protected void putExceptionToSOAPFault(Exception e) throws SOAPProcessingException {
StringWriter sw = new StringWriter();
-// sw.write(e.getMessage());
e.printStackTrace(new PrintWriter(sw));
sw.flush();
getDetail();
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPHeaderImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPHeaderImpl.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPHeaderImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPHeaderImpl.java Thu Sep 29 19:50:47 2005
@@ -83,7 +83,6 @@
* @see #extractHeaderBlocks(String) extractHeaderBlocks(java.lang.String)
*/
public Iterator examineHeaderBlocks(String paramRole) {
-//
Iterator headerBlocksIter = this.getChildren();
ArrayList headersWithGivenActor = new ArrayList();
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java Thu Sep 29 19:50:47 2005
@@ -234,12 +234,12 @@
(SOAPEnvelopeImpl) soapFactory.createSOAPEnvelope(this);
element = envelope;
processNamespaceData(element, true);
-// fill in the attributes
+ // fill in the attributes
processAttributes(element);
} else if (elementLevel == 2) {
-// this is either a header or a body
+ // this is either a header or a body
if (elementName.equals(SOAPConstants.HEADER_LOCAL_NAME)) {
if (headerPresent) {
throw new SOAPProcessingException("Multiple headers encountered!", getSenderFaultCode());
@@ -252,7 +252,6 @@
soapFactory.createSOAPHeader((SOAPEnvelope) parent,
this);
-// envelope.setHeader((SOAPHeader)element);
processNamespaceData(element, true);
processAttributes(element);
@@ -265,7 +264,6 @@
soapFactory.createSOAPBody((SOAPEnvelope) parent,
this);
-// envelope.setBody((SOAPBody)element);
processNamespaceData(element, true);
processAttributes(element);
@@ -278,7 +276,7 @@
&&
parent.getLocalName().equalsIgnoreCase(SOAPConstants.HEADER_LOCAL_NAME)) {
-// this is a headerblock
+ // this is a headerblock
try {
element =
soapFactory.createSOAPHeaderBlock(elementName, null,
@@ -293,15 +291,13 @@
parent.getLocalName().equalsIgnoreCase(SOAPConstants.BODY_LOCAL_NAME) &&
elementName.equalsIgnoreCase(SOAPConstants.BODY_FAULT_LOCAL_NAME)) {
-// this is a headerblock
+ // this is a headerblock
element = soapFactory.createSOAPFault((SOAPBody) parent, this);
processNamespaceData(element, false);
processAttributes(element);
processingFault = true;
-
-//added
processingMandatoryFaultElements = true;
if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(envelopeNamespace.getName())) {
builderHelper = new SOAP12BuilderHelper(this);
@@ -313,7 +309,7 @@
element = builderHelper.handleEvent(parser, parent, elementLevel);
} else {
-// this is neither of above. Just create an element
+ // this is neither of above. Just create an element
element = soapFactory.createOMElement(elementName, null,
parent, this);
processNamespaceData(element, false);
@@ -391,13 +387,13 @@
parser.getNamespacePrefix(i));
}
-// set the own namespace
+ // set the owner namespace
String namespaceURI = parser.getNamespaceURI();
String prefix = parser.getPrefix();
OMNamespace namespace = null;
if (namespaceURI != null && namespaceURI.length() > 0) {
if (prefix == null) {
-// this means, this elements has a default namespace or it has inherited a default namespace from its parent
+ // this means, this elements has a default namespace or it has inherited a default namespace from its parent
namespace = node.findNamespace(namespaceURI, "");
if (namespace == null) {
namespace = node.declareNamespace(namespaceURI, "");
@@ -408,13 +404,6 @@
node.setNamespace(namespace);
}
-
-
-// TODO we got to have this to make sure OM reject mesagess that are not name space qualified
-// But got to comment this to interop with Axis.1.x
-// if (namespace == null) {
-// throw new OMException("All elements must be namespace qualified!");
-// }
if (isSOAPElement) {
if (node.getNamespace() != null &&
!node.getNamespace().getName().equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI) &&
@@ -428,7 +417,6 @@
}
-//added
/*these three methods to set and check detail element processing or mandatory fault element are present
*/
public OMNamespace getEnvelopeNamespace() {
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java Thu Sep 29 19:50:47 2005
@@ -106,17 +106,6 @@
String text = this.getValue().getText();
writer.writeCharacters(text);
writer.writeEndElement();
-
-// //serilize siblings
-// if (this.nextSibling != null) {
-// nextSibling.serialize(omOutput);
-// } else if (this.parent != null) {
-// if (!this.parent.isComplete()) {
-// builder.setCache(cache);
-// builder.next();
-// }
-// }
-
}
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java Thu Sep 29 19:50:47 2005
@@ -44,14 +44,6 @@
}
}
-// public void addDetailEntry(OMElement detailElement) {
-// throw new UnsupportedOperationException();
-// }
-//
-// public Iterator getAllDetailEntries() {
-// throw new UnsupportedOperationException();
-// }
-
public void serialize(org.apache.axis2.om.impl.OMOutputImpl omOutput, boolean cache) throws XMLStreamException {
// select the builder
@@ -86,12 +78,6 @@
firstChild.serialize(omOutput);
}
writer.writeEndElement();
-
-// //serilize siblings
-// if (this.nextSibling != null) {
-// nextSibling.serialize(omOutput);
-// }
-
}
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultImpl.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultImpl.java Thu Sep 29 19:50:47 2005
@@ -82,7 +82,7 @@
}
super.setReason(reason);
}
-//
+
public void setNode(SOAPFaultNode node) throws SOAPProcessingException {
if (!(node instanceof SOAP11FaultNodeImpl)) {
throw new SOAPProcessingException(
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java Thu Sep 29 19:50:47 2005
@@ -90,17 +90,6 @@
String text = this.getSOAPText().getText();
writer.writeCharacters(text);
writer.writeEndElement();
-
- //serilize siblings
-// if (this.nextSibling != null) {
-// nextSibling.serialize(omOutput);
-// } else if (this.parent != null) {
-// if (!this.parent.isComplete()) {
-// builder.setCache(cache);
-// builder.next();
-// }
-// }
-
}
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java?rev=292605&r1=292604&r2=292605&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java Thu Sep 29 19:50:47 2005
@@ -73,17 +73,6 @@
String text = this.getText();
writer.writeCharacters(text);
writer.writeEndElement();
-
-// //serilize siblings
-// if (this.nextSibling != null) {
-// nextSibling.serialize(omOutput);
-// } else if (this.parent != null) {
-// if (!this.parent.isComplete()) {
-// builder.setCache(cache);
-// builder.next();
-// }
-// }
-
}