You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by in...@apache.org on 2007/09/27 08:04:15 UTC
svn commit: r579898 - in
/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse:
config/xml/ mediators/db/
Author: indika
Date: Wed Sep 26 23:04:14 2007
New Revision: 579898
URL: http://svn.apache.org/viewvc?rev=579898&view=rev
Log:
fixed some minor issues in DBMediator factory and serializer
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorSerializer.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DBReportMediatorSerializer.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/Statement.java
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java?rev=579898&r1=579897&r2=579898&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java Wed Sep 26 23:04:14 2007
@@ -206,14 +206,26 @@
while (paramIter.hasNext()) {
OMElement paramElt = (OMElement) paramIter.next();
- try {
+ String xpath = getAttribute(paramElt, ATT_EXPRN);
+ String value = getAttribute(paramElt, ATT_VALUE);
+
+ if (xpath != null || value != null) {
+
+ AXIOMXPath xp = null;
+ if (xpath != null) {
+ try {
+ xp = new AXIOMXPath(xpath);
+ OMElementUtils.addNameSpaces(xp, paramElt, log);
+
+ } catch (JaxenException e) {
+ handleException("Invalid XPath specified for the source attribute : " +
+ xpath);
+ }
+ }
statement.addParameter(
- getAttribute(paramElt, ATT_VALUE),
- getAttribute(paramElt, ATT_EXPRN),
- getAttribute(paramElt, ATT_TYPE));
- } catch (JaxenException e) {
- handleException("Invalid XPath expression for query : "
- + getAttribute(paramElt, ATT_EXPRN));
+ value,
+ xp,
+ getAttribute(paramElt, ATT_TYPE));
}
}
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorSerializer.java?rev=579898&r1=579897&r2=579898&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorSerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorSerializer.java Wed Sep 26 23:04:14 2007
@@ -126,11 +126,11 @@
switch (param.getType()) {
case Types.VARCHAR: {
- paramElt.addAttribute(fac.createOMAttribute("type", nullNS, "string"));
+ paramElt.addAttribute(fac.createOMAttribute("type", nullNS, "VARCHAR"));
break;
}
case Types.INTEGER: {
- paramElt.addAttribute(fac.createOMAttribute("type", nullNS, "int"));
+ paramElt.addAttribute(fac.createOMAttribute("type", nullNS, "INTEGER"));
break;
}
default:
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DBReportMediatorSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DBReportMediatorSerializer.java?rev=579898&r1=579897&r2=579898&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DBReportMediatorSerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/DBReportMediatorSerializer.java Wed Sep 26 23:04:14 2007
@@ -50,7 +50,7 @@
}
DBReportMediator mediator = (DBReportMediator) m;
- OMElement dbReport = fac.createOMElement("dbReport", synNS);
+ OMElement dbReport = fac.createOMElement("dbreport", synNS);
saveTracingState(dbReport,mediator);
serializeDBInformation(mediator, dbReport);
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/Statement.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/Statement.java?rev=579898&r1=579897&r2=579898&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/Statement.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/Statement.java Wed Sep 26 23:04:14 2007
@@ -47,7 +47,7 @@
return rawStatement;
}
- public void addParameter(String propertyName, String xpath, String type) throws JaxenException {
+ public void addParameter(String propertyName, AXIOMXPath xpath, String type){
parameters.add(new Parameter(propertyName, xpath, type));
}
@@ -68,17 +68,12 @@
AXIOMXPath xpath = null;
int type = 0;
- Parameter(String value, String xpath, String type) throws JaxenException {
+ Parameter(String value, AXIOMXPath xpath, String type) {
this.propertyName = value;
- if (xpath != null) {
- this.xpath = new AXIOMXPath(xpath);
- }
-
+ this.xpath = xpath;
if ("CHAR".equals(type)) {
this.type = Types.CHAR;
- } else if ("VARCHAR".equals(type)) {
- this.type = Types.VARCHAR;
} else if ("VARCHAR".equals(type)) {
this.type = Types.VARCHAR;
} else if ("LONGVARCHAR".equals(type)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org