32,7 → 32,6 |
import javax.xml.stream.XMLStreamException; |
import javax.xml.stream.XMLStreamWriter; |
|
import lombok.extern.slf4j.Slf4j; |
import net.brutex.xservices.types.AttributeType; |
import net.brutex.xservices.types.NamespaceListType; |
import net.brutex.xservices.types.NamespaceType; |
55,7 → 54,8 |
import org.apache.axiom.om.OMXMLBuilderFactory; |
import org.apache.axiom.om.xpath.AXIOMXPath; |
|
|
import org.apache.logging.log4j.LogManager; |
import org.apache.logging.log4j.Logger; |
import org.apache.shiro.authz.annotation.RequiresPermissions; |
import org.jaxen.JaxenException; |
import org.jaxen.SimpleNamespaceContext; |
64,11 → 64,10 |
* @author Brian Rosenberger, bru(at)brutex.de |
* |
*/ |
@Slf4j |
@WebService(targetNamespace = "http://ws.xservices.brutex.net", endpointInterface = "net.brutex.xservices.ws.XmlService", serviceName = "XmlService") |
public class XmlServiceImpl implements XmlService { |
private static final Logger logger = LogManager.getLogger(); |
|
|
public String insertNodesFromFile(FileResource res, NamespaceListType nsList, String xpath, String xmlFragment) |
throws XServicesFault { |
try { |
95,7 → 94,7 |
XMLStreamWriter writer = xof.createXMLStreamWriter(sw); |
document.serialize(writer); |
|
log.debug(sw.getBuffer().toString()); |
this.logger.trace(sw.getBuffer().toString()); |
return sw.getBuffer().toString(); |
} catch (JaxenException e) { |
e.printStackTrace(); |
135,7 → 134,7 |
XMLStreamWriter writer = xof.createXMLStreamWriter(sw); |
document.serialize(writer); |
|
log.debug(sw.getBuffer().toString()); |
this.logger.trace(sw.getBuffer().toString()); |
return sw.getBuffer().toString(); |
} catch (JaxenException e) { |
e.printStackTrace(); |
176,7 → 175,7 |
XMLStreamWriter writer = xof.createXMLStreamWriter(sw); |
document.serialize(writer); |
|
log.debug(sw.getBuffer().toString()); |
this.logger.trace(sw.getBuffer().toString()); |
return sw.getBuffer().toString(); |
} catch (JaxenException e) { |
e.printStackTrace(); |
217,7 → 216,7 |
XMLStreamWriter writer = xof.createXMLStreamWriter(sw); |
document.serialize(writer); |
|
log.debug(sw.getBuffer().toString()); |
this.logger.trace(sw.getBuffer().toString()); |
return sw.getBuffer().toString(); |
} catch (JaxenException e) { |
e.printStackTrace(); |
358,8 → 357,8 |
List<?> olist = null; |
try { |
olist = axp.selectNodes(xmldocument.getOMDocumentElement()); |
log.debug("XPath '" + axp.toString() + "' has " + olist.size() + " matches."); |
log.debug("XPath root expression is: '" + axp.debug() + "'."); |
this.logger.debug("XPath '" + axp.toString() + "' has " + olist.size() + " matches."); |
this.logger.trace("XPath root expression is: '" + axp.debug() + "'."); |
} catch (JaxenException e) { |
throw new XServicesFault(e.getMessage(), e); |
} |
381,25 → 380,26 |
match = (OMElement) o; |
if ((o instanceof OMDocument)) |
match = ((OMDocument) o).getOMDocumentElement(); |
log.debug(Messages.getString("XmlService.8")); |
this.logger.debug(Messages.getString("XmlService.8")); |
break; |
case OMNode.TEXT_NODE: |
match = ((OMText) o).getParent(); |
log.debug(Messages.getString("XmlService.9")); |
this.logger.debug(Messages.getString("XmlService.9")); |
break; |
case OMNode.COMMENT_NODE: |
// match = node.getParent(); |
match = (OMContainer) node; |
log.debug(Messages.getString("XmlService.10")); |
this.logger.debug(Messages.getString("XmlService.10")); |
break; |
default: |
log.error("XPath matched " + o.getClass().getCanonicalName() + " Node Type:" + node.getType()); |
log.error(Messages.getString("XmlService.11")); |
this.logger |
.error("XPath matched " + o.getClass().getCanonicalName() + " Node Type:" + node.getType()); |
this.logger.error(Messages.getString("XmlService.11")); |
throw new XServicesFault(Messages.getString("XmlService.12")); |
} |
} else { |
log.error("XPath matched " + o.getClass().getCanonicalName()); |
log.error(Messages.getString("XmlService.11")); |
this.logger.error("XPath matched " + o.getClass().getCanonicalName()); |
this.logger.error(Messages.getString("XmlService.11")); |
throw new XServicesFault(Messages.getString("XmlService.12")); |
} |
|
419,8 → 419,8 |
List<?> olist = null; |
try { |
olist = axp.selectNodes(xmldocument.getOMDocumentElement()); |
log.debug("XPath '" + axp.toString() + "' has " + olist.size() + " matches."); |
log.debug("XPath root expression is: '" + axp.debug() + "'."); |
this.logger.debug("XPath '" + axp.toString() + "' has " + olist.size() + " matches."); |
this.logger.trace("XPath root expression is: '" + axp.debug() + "'."); |
} catch (JaxenException e) { |
throw new XServicesFault(e.getMessage(), e); |
} |
442,16 → 442,17 |
match = (OMElement) o; |
if ((o instanceof OMDocument)) |
match = ((OMDocument) o).getOMDocumentElement(); |
log.debug(Messages.getString("XmlService.8")); |
this.logger.debug(Messages.getString("XmlService.8")); |
break; |
default: |
log.error("XPath matched " + o.getClass().getCanonicalName() + " Node Type:" + node.getType()); |
log.error(Messages.getString("XmlService.11")); |
this.logger |
.error("XPath matched " + o.getClass().getCanonicalName() + " Node Type:" + node.getType()); |
this.logger.error(Messages.getString("XmlService.11")); |
throw new XServicesFault(Messages.getString("XmlService.12")); |
} |
} else { |
log.error("XPath matched " + o.getClass().getCanonicalName()); |
log.error(Messages.getString("XmlService.11")); |
this.logger.error("XPath matched " + o.getClass().getCanonicalName()); |
this.logger.error(Messages.getString("XmlService.11")); |
throw new XServicesFault(Messages.getString("XmlService.12")); |
} |
|
471,11 → 472,11 |
if (nsList != null) { |
for (NamespaceType ns : nsList.getNamespaces()) { |
context.addNamespace(ns.getPrefix(), ns.getUri().toString()); |
log.debug( |
this.logger.debug( |
Messages.getString("XmlService.0") + ns.getPrefix() + "=\"" + ns.getUri().toString() + "\"'"); |
} |
} else { |
log.debug("No namespaces defined."); |
logger.debug("No namespaces defined."); |
} |
return context; |
} |
489,7 → 490,7 |
} catch (IllegalCharsetNameException e) { |
throw new XServicesFault("Endcoding '" + encoding + "' is not supported by this JRE."); |
} |
log.debug("Setting source xml string encoding to '" + encoding + "'"); |
logger.debug("Setting source xml string encoding to '" + encoding + "'"); |
return encoding; |
} |
|