You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by as...@apache.org on 2008/07/10 03:50:23 UTC
svn commit: r675406 - in /synapse/trunk/java/modules:
core/src/main/java/org/apache/synapse/mediators/ext/
samples/services/FastStockQuoteService/
samples/services/ReliableStockQuoteService/
samples/services/SecureStockQuoteService/ samples/services/Si...
Author: asankha
Date: Wed Jul 9 18:50:23 2008
New Revision: 675406
URL: http://svn.apache.org/viewvc?rev=675406&view=rev
Log:
update samples to not depend on the bundled WSDL, and to generate the WSDL from code
Will remove the bundled WSDL's altogether later
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java
synapse/trunk/java/modules/samples/services/FastStockQuoteService/build.xml
synapse/trunk/java/modules/samples/services/ReliableStockQuoteService/build.xml
synapse/trunk/java/modules/samples/services/SecureStockQuoteService/build.xml
synapse/trunk/java/modules/samples/services/SimpleStockQuoteService/build.xml
synapse/trunk/java/modules/samples/src/main/java/samples/common/StockQuoteHandler.java
synapse/trunk/java/modules/samples/src/main/java/samples/mediators/DiscountQuoteMediator.java
synapse/trunk/java/modules/samples/src/main/java/samples/userguide/GenericJMSClient.java
synapse/trunk/java/modules/samples/src/main/java/samples/userguide/MTOMSwAClient.java
synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/AbstractAutomationTestCase.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java?rev=675406&r1=675405&r2=675406&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java Wed Jul 9 18:50:23 2008
@@ -72,14 +72,12 @@
traceOrDebug(traceOn, "invoking : " + mediator.getClass() + ".mediate()");
}
- boolean result;
+ boolean result = false;
try {
result = mediator.mediate(synCtx);
} catch (Exception e) {
- // throw Synapse Exception for any exception in class meditor
- // so that the fault handler will be invoked
- throw new SynapseException("Error occured in the mediation of the class mediator", e);
+ handleException(e.getMessage(), e, synCtx);
}
if (traceOrDebugOn) {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java?rev=675406&r1=675405&r2=675406&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/POJOCommandMediator.java Wed Jul 9 18:50:23 2008
@@ -24,6 +24,7 @@
import org.apache.axiom.om.OMNode;
import org.apache.synapse.Command;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.SynapseException;
import org.apache.synapse.mediators.AbstractMediator;
import org.apache.synapse.mediators.eip.EIPUtils;
import org.apache.synapse.util.xpath.SynapseXPath;
@@ -146,8 +147,7 @@
try {
((Command) commandObject).execute();
} catch (Exception e) {
- handleException("Error invoking POJO command class : "
- + command.getClass(), e, synCtx);
+ handleException(e.getMessage(), e, synCtx);
}
} else {
@@ -160,8 +160,7 @@
handleException("Cannot locate an execute() method on POJO class : " +
command.getClass(), e, synCtx);
} catch (Exception e) {
- handleException("Error invoking the execute() method on POJO class : " +
- command.getClass(), e, synCtx);
+ handleException(e.getMessage(), e, synCtx);
}
}
Modified: synapse/trunk/java/modules/samples/services/FastStockQuoteService/build.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/services/FastStockQuoteService/build.xml?rev=675406&r1=675405&r2=675406&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/services/FastStockQuoteService/build.xml (original)
+++ synapse/trunk/java/modules/samples/services/FastStockQuoteService/build.xml Wed Jul 9 18:50:23 2008
@@ -56,7 +56,7 @@
<mkdir dir="${SSQ.dir}/META-INF"/>
<copy file="conf/services.xml" tofile="${SSQ.dir}/META-INF/services.xml"/>
- <copy file="wsdl/FastStockQuoteService.wsdl" tofile="${SSQ.dir}/META-INF/service.wsdl"/>
+ <!--<copy file="wsdl/FastStockQuoteService.wsdl" tofile="${SSQ.dir}/META-INF/service.wsdl"/>-->
<copy toDir="${SSQ.dir}">
<fileset dir="${classes}">
<include name="**/*.class"/>
Modified: synapse/trunk/java/modules/samples/services/ReliableStockQuoteService/build.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/services/ReliableStockQuoteService/build.xml?rev=675406&r1=675405&r2=675406&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/services/ReliableStockQuoteService/build.xml (original)
+++ synapse/trunk/java/modules/samples/services/ReliableStockQuoteService/build.xml Wed Jul 9 18:50:23 2008
@@ -56,7 +56,7 @@
<mkdir dir="${RSQ.dir}/META-INF"/>
<copy file="conf/services.xml" tofile="${RSQ.dir}/META-INF/services.xml"/>
- <copy file="wsdl/ReliableStockQuoteService.wsdl" tofile="${RSQ.dir}/META-INF/service.wsdl"/>
+ <!--<copy file="wsdl/ReliableStockQuoteService.wsdl" tofile="${RSQ.dir}/META-INF/service.wsdl"/> -->
<copy toDir="${RSQ.dir}">
<fileset dir="${classes}">
<include name="**/*.class"/>
Modified: synapse/trunk/java/modules/samples/services/SecureStockQuoteService/build.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/services/SecureStockQuoteService/build.xml?rev=675406&r1=675405&r2=675406&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/services/SecureStockQuoteService/build.xml (original)
+++ synapse/trunk/java/modules/samples/services/SecureStockQuoteService/build.xml Wed Jul 9 18:50:23 2008
@@ -56,7 +56,7 @@
<mkdir dir="${SSQ.dir}/META-INF"/>
<copy file="conf/services.xml" tofile="${SSQ.dir}/META-INF/services.xml"/>
- <copy file="wsdl/SimpleStockQuoteService.wsdl" tofile="${SSQ.dir}/META-INF/service.wsdl"/>
+ <!--<copy file="wsdl/SimpleStockQuoteService.wsdl" tofile="${SSQ.dir}/META-INF/service.wsdl"/> -->
<copy file="store.jks" tofile="${SSQ.dir}/store.jks"/>
<copy toDir="${SSQ.dir}">
<fileset dir="${classes}">
Modified: synapse/trunk/java/modules/samples/services/SimpleStockQuoteService/build.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/services/SimpleStockQuoteService/build.xml?rev=675406&r1=675405&r2=675406&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/services/SimpleStockQuoteService/build.xml (original)
+++ synapse/trunk/java/modules/samples/services/SimpleStockQuoteService/build.xml Wed Jul 9 18:50:23 2008
@@ -56,7 +56,7 @@
<mkdir dir="${SSQ.dir}/META-INF"/>
<copy file="conf/services.xml" tofile="${SSQ.dir}/META-INF/services.xml"/>
- <copy file="wsdl/SimpleStockQuoteService.wsdl" tofile="${SSQ.dir}/META-INF/service.wsdl"/>
+ <!--<copy file="wsdl/SimpleStockQuoteService.wsdl" tofile="${SSQ.dir}/META-INF/service.wsdl"/> -->
<copy toDir="${SSQ.dir}">
<fileset dir="${classes}">
<include name="**/*.class"/>
Modified: synapse/trunk/java/modules/samples/src/main/java/samples/common/StockQuoteHandler.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/src/main/java/samples/common/StockQuoteHandler.java?rev=675406&r1=675405&r2=675406&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/src/main/java/samples/common/StockQuoteHandler.java (original)
+++ synapse/trunk/java/modules/samples/src/main/java/samples/common/StockQuoteHandler.java Wed Jul 9 18:50:23 2008
@@ -39,7 +39,7 @@
/**
* Create a new custom quote request with a body as follows
- * <m0:CheckPriceRequest xmlns:m0="http://services.samples/xsd">
+ * <m0:CheckPriceRequest xmlns:m0="http://services.samples">
* <m0:Code>symbol</m0:Code>
* </m0:CheckPriceRequest>
* @param symbol the stock symbol
@@ -48,7 +48,7 @@
public static OMElement createCustomQuoteRequest(String symbol) {
OMFactory factory = OMAbstractFactory.getOMFactory();
OMNamespace ns = factory.createOMNamespace(
- "http://services.samples/xsd", "m0");
+ "http://services.samples", "m0");
OMElement chkPrice = factory.createOMElement("CheckPriceRequest", ns);
OMElement code = factory.createOMElement("Code", ns);
chkPrice.addChild(code);
@@ -58,7 +58,7 @@
/**
* Create a new quote request with a body as follows
- * <m:GetQuote xmlns:m="http://services.samples/xsd">
+ * <m:GetQuote xmlns:m="http://services.samples">
* <m:request>
* <m:symbol>IBM</m:symbol>
* </m:request>
@@ -68,7 +68,7 @@
*/
public static OMElement createStandardQuoteRequest(String symbol, int itrCount) {
OMFactory factory = OMAbstractFactory.getOMFactory();
- OMNamespace ns = factory.createOMNamespace("http://services.samples/xsd", "m0");
+ OMNamespace ns = factory.createOMNamespace("http://services.samples", "m0");
OMElement getQuote = factory.createOMElement("getQuote", ns);
for (int i =0; i<itrCount; i++) {
OMElement request = factory.createOMElement("request", ns);
@@ -82,7 +82,7 @@
/**
* Create a new full quote request with a body as follows
- * <m:GetFullQuote xmlns:m="http://services.samples/xsd">
+ * <m:GetFullQuote xmlns:m="http://services.samples">
* <m:request>
* <m:symbol>IBM</m:symbol>
* </m:request>
@@ -92,7 +92,7 @@
*/
public static OMElement createFullQuoteRequest(String symbol) {
OMFactory factory = OMAbstractFactory.getOMFactory();
- OMNamespace ns = factory.createOMNamespace("http://services.samples/xsd", "m0");
+ OMNamespace ns = factory.createOMNamespace("http://services.samples", "m0");
OMElement getQuote = factory.createOMElement("getFullQuote", ns);
OMElement request = factory.createOMElement("request", ns);
OMElement symb = factory.createOMElement("symbol", ns);
@@ -104,7 +104,7 @@
/**
* Create a new market activity request with a body as follows
- * <m:getMarketActivity xmlns:m="http://services.samples/xsd">
+ * <m:getMarketActivity xmlns:m="http://services.samples">
* <m:request>
* <m:symbol>IBM</m:symbol>
* ...
@@ -115,7 +115,7 @@
*/
public static OMElement createMarketActivityRequest() {
OMFactory factory = OMAbstractFactory.getOMFactory();
- OMNamespace ns = factory.createOMNamespace("http://services.samples/xsd", "m0");
+ OMNamespace ns = factory.createOMNamespace("http://services.samples", "m0");
OMElement getQuote = factory.createOMElement("getMarketActivity", ns);
OMElement request = factory.createOMElement("request", ns);
@@ -132,7 +132,7 @@
/**
* Create a new order for a quantiry of a stock at a given price
- * <m:placeOrder xmlns:m="http://services.samples/xsd">
+ * <m:placeOrder xmlns:m="http://services.samples">
* <m:order>
* <m:price>3.141593E0</m:price>
* <m:quantity>4</m:quantity>
@@ -147,7 +147,7 @@
*/
public static OMElement createPlaceOrderRequest(double purchPrice, int qty, String symbol) {
OMFactory factory = OMAbstractFactory.getOMFactory();
- OMNamespace ns = factory.createOMNamespace("http://services.samples/xsd", "m0");
+ OMNamespace ns = factory.createOMNamespace("http://services.samples", "m0");
OMElement placeOrder= factory.createOMElement("placeOrder", ns);
OMElement order = factory.createOMElement("order", ns);
OMElement price = factory.createOMElement("price", ns);
@@ -169,7 +169,7 @@
* @return
* @throws javax.xml.stream.XMLStreamException
*
- * <ns:getQuoteResponse xmlns:ns="http://services.samples/xsd">
+ * <ns:getQuoteResponse xmlns:ns="http://services.samples">
* <ns:return>
* <ns:change>-2.3238706829151026</ns:change>
* ...
@@ -191,9 +191,9 @@
}
/**
- * <ns:getFullQuoteResponse xmlns:ns="http://services.samples/xsd">
+ * <ns:getFullQuoteResponse xmlns:ns="http://services.samples">
<ns:return>
- <tradeHistory xmlns="http://services.samples/xsd">
+ <tradeHistory xmlns="http://services.samples">
<day>0</day>
<quote>
<change>-2.367492989603466</change>
@@ -212,7 +212,7 @@
<volume>8935</volume>
</quote>
</tradeHistory>
- <tradeHistory xmlns="http://services.samples/xsd">
+ <tradeHistory xmlns="http://services.samples">
<day>1</day>
<quote>
<change>3.794122022240518</change>
@@ -263,9 +263,9 @@
}
/**
- * <ns:getMarketActivityResponse xmlns:ns="http://services.samples/xsd">
+ * <ns:getMarketActivityResponse xmlns:ns="http://services.samples">
<ns:return>
- <quotes xmlns="http://services.samples/xsd">
+ <quotes xmlns="http://services.samples">
<change>4.183958555301184</change>
<earnings>-8.585281368244686</earnings>
<high>-158.70528805517333</high>
@@ -281,7 +281,7 @@
<symbol>EHM</symbol>
<volume>6319</volume>
</quotes>
- <quotes xmlns="http://services.samples/xsd">
+ <quotes xmlns="http://services.samples">
....
<volume>7613</volume>
</quotes>
Modified: synapse/trunk/java/modules/samples/src/main/java/samples/mediators/DiscountQuoteMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/src/main/java/samples/mediators/DiscountQuoteMediator.java?rev=675406&r1=675405&r2=675406&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/src/main/java/samples/mediators/DiscountQuoteMediator.java (original)
+++ synapse/trunk/java/modules/samples/src/main/java/samples/mediators/DiscountQuoteMediator.java Wed Jul 9 18:50:23 2008
@@ -46,7 +46,7 @@
public boolean mediate(MessageContext mc) {
String price= mc.getEnvelope().getBody().getFirstElement().getFirstElement().
- getFirstChildWithName(new QName("http://services.samples/xsd","last")).getText();
+ getFirstChildWithName(new QName("http://services.samples","last")).getText();
//converting String properties into integers
int discount=Integer.parseInt(discountFactor);
@@ -65,7 +65,7 @@
String discountedPrice = lastPrice.toString();
mc.getEnvelope().getBody().getFirstElement().getFirstElement().getFirstChildWithName
- (new QName("http://services.samples/xsd","last")).setText(discountedPrice);
+ (new QName("http://services.samples","last")).setText(discountedPrice);
System.out.println("Quote value discounted.");
System.out.println("Original price: " + price);
Modified: synapse/trunk/java/modules/samples/src/main/java/samples/userguide/GenericJMSClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/GenericJMSClient.java?rev=675406&r1=675405&r2=675406&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/src/main/java/samples/userguide/GenericJMSClient.java (original)
+++ synapse/trunk/java/modules/samples/src/main/java/samples/userguide/GenericJMSClient.java Wed Jul 9 18:50:23 2008
@@ -55,7 +55,7 @@
app.sendBytesMessage(dest, getBytesFromFile(param));
} else if ("pox".equalsIgnoreCase(type)) {
app.sendTextMessage(dest,
- "<m:placeOrder xmlns:m=\"http://services.samples/xsd\">\n" +
+ "<m:placeOrder xmlns:m=\"http://services.samples\">\n" +
" <m:order>\n" +
" <m:price>" + getRandom(100, 0.9, true) + "</m:price>\n" +
" <m:quantity>" + (int) getRandom(10000, 1.0, true) + "</m:quantity>\n" +
Modified: synapse/trunk/java/modules/samples/src/main/java/samples/userguide/MTOMSwAClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/MTOMSwAClient.java?rev=675406&r1=675405&r2=675406&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/src/main/java/samples/userguide/MTOMSwAClient.java (original)
+++ synapse/trunk/java/modules/samples/src/main/java/samples/userguide/MTOMSwAClient.java Wed Jul 9 18:50:23 2008
@@ -87,7 +87,7 @@
SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
SOAPEnvelope env = factory.getDefaultEnvelope();
- OMNamespace ns = factory.createOMNamespace("http://services.samples/xsd", "m0");
+ OMNamespace ns = factory.createOMNamespace("http://services.samples", "m0");
OMElement payload = factory.createOMElement("uploadFileUsingSwA", ns);
OMElement request = factory.createOMElement("request", ns);
OMElement imageId = factory.createOMElement("imageId", ns);
@@ -103,9 +103,9 @@
SOAPBody body = response.getEnvelope().getBody();
String imageContentId = body.
- getFirstChildWithName(new QName("http://services.samples/xsd", "uploadFileUsingSwAResponse")).
- getFirstChildWithName(new QName("http://services.samples/xsd", "response")).
- getFirstChildWithName(new QName("http://services.samples/xsd", "imageId")).
+ getFirstChildWithName(new QName("http://services.samples", "uploadFileUsingSwAResponse")).
+ getFirstChildWithName(new QName("http://services.samples", "response")).
+ getFirstChildWithName(new QName("http://services.samples", "imageId")).
getText();
Attachments attachment = response.getAttachmentMap();
@@ -123,7 +123,7 @@
public static OMElement sendUsingMTOM(String fileName, String targetEPR) throws IOException {
OMFactory factory = OMAbstractFactory.getOMFactory();
- OMNamespace ns = factory.createOMNamespace("http://services.samples/xsd", "m0");
+ OMNamespace ns = factory.createOMNamespace("http://services.samples", "m0");
OMElement payload = factory.createOMElement("uploadFileUsingMTOM", ns);
OMElement request = factory.createOMElement("request", ns);
OMElement image = factory.createOMElement("image", ns);
@@ -146,8 +146,8 @@
OMElement response = serviceClient.sendReceive(payload);
OMText binaryNode = (OMText) response.
- getFirstChildWithName(new QName("http://services.samples/xsd", "response")).
- getFirstChildWithName(new QName("http://services.samples/xsd", "image")).
+ getFirstChildWithName(new QName("http://services.samples", "response")).
+ getFirstChildWithName(new QName("http://services.samples", "image")).
getFirstOMChild();
dataHandler = (DataHandler) binaryNode.getDataHandler();
InputStream is = dataHandler.getInputStream();
Modified: synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/AbstractAutomationTestCase.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/AbstractAutomationTestCase.java?rev=675406&r1=675405&r2=675406&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/AbstractAutomationTestCase.java (original)
+++ synapse/trunk/java/modules/samples/src/test/java/org/apache/synapse/samples/n2n/AbstractAutomationTestCase.java Wed Jul 9 18:50:23 2008
@@ -59,8 +59,8 @@
protected void setUpNSContext() {
Map m = new HashMap();
- m.put("ms", "http://services.samples/xsd");
- m.put("ns", "http://services.samples/xsd");
+ m.put("ms", "http://services.samples");
+ m.put("ns", "http://services.samples");
NamespaceContext nsCtx = new SimpleNamespaceContext(m);
XMLUnit.setXpathNamespaceContext(nsCtx);
}