You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by as...@apache.org on 2007/05/15 07:55:06 UTC
svn commit: r538062 - in /webservices/synapse/trunk/java/modules:
core/src/main/java/org/apache/synapse/core/axis2/
core/src/main/java/org/apache/synapse/mediators/transform/
extensions/src/main/java/org/apache/synapse/mediators/spring/
samples/service...
Author: asankha
Date: Mon May 14 22:55:05 2007
New Revision: 538062
URL: http://svn.apache.org/viewvc?view=rev&rev=538062
Log:
fix SYNAPSE-101
after initialization at runtime (i.e. when a synapse MC is available), always load resources using SynapseMC.getEntry()
When building proxy services, load from SynapseConfiguration.getEntry()
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
webservices/synapse/trunk/java/modules/samples/services/SecureStockQuoteService/src/samples/services/SimpleStockQuoteService.java
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java?view=diff&rev=538062&r1=538061&r2=538062
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java Mon May 14 22:55:05 2007
@@ -307,7 +307,7 @@
* @return the Policy object with the given name, from the configuration
*/
private static Policy getPolicy(org.apache.synapse.MessageContext synCtx, String propertyKey) {
- Object property = synCtx.getConfiguration().getEntry(propertyKey);
+ Object property = synCtx.getEntry(propertyKey);
if (property != null && property instanceof OMElement) {
return PolicyEngine.getPolicy((OMElement) property);
} else {
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java?view=diff&rev=538062&r1=538061&r2=538062
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java Mon May 14 22:55:05 2007
@@ -147,8 +147,13 @@
return ((Entry) o).getValue();
} else {
Object e = getConfiguration().getEntry(key);
- localEntries.put(key, e);
- return e;
+ if (e != null) {
+ localEntries.put(key, e);
+ return e;
+ } else {
+ getConfiguration().getEntryDefinition(key);
+ return getConfiguration().getEntry(key);
+ }
}
}
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java?view=diff&rev=538062&r1=538061&r2=538062
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java Mon May 14 22:55:05 2007
@@ -186,6 +186,7 @@
InputStream wsdlInputStream = null;
OMElement wsdlElement = null;
if (wsdlKey != null) {
+ synCfg.getEntryDefinition(wsdlKey);
Object keyObject = synCfg.getEntry(wsdlKey);
if (keyObject instanceof OMElement) {
wsdlElement = (OMElement) keyObject;
@@ -314,6 +315,7 @@
iter = serviceLevelPolicies.iterator();
while (iter.hasNext()) {
String policyKey = (String) iter.next();
+ synCfg.getEntryDefinition(policyKey);
Object policyProp = synCfg.getEntry(policyKey);
if (policyProp != null) {
if (svcEffectivePolicy == null) {
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java?view=diff&rev=538062&r1=538061&r2=538062
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java Mon May 14 22:55:05 2007
@@ -165,7 +165,7 @@
try {
transformer = TransformerFactory.newInstance().
newTransformer(Util.getStreamSource(
- msgCtx.getConfiguration().getEntry(xsltKey)
+ msgCtx.getEntry(xsltKey)
));
} catch (TransformerConfigurationException e) {
handleException("Error creating XSLT transformer using : " + xsltKey, e);
@@ -181,7 +181,7 @@
transformer = TransformerFactory.newInstance().
newTransformer(
Util.getStreamSource(
- msgCtx.getConfiguration().getEntry(xsltKey)));
+ msgCtx.getEntry(xsltKey)));
} catch (TransformerConfigurationException e) {
handleException("Error creating XSLT transformer using : " + xsltKey, e);
}
Modified: webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java?view=diff&rev=538062&r1=538061&r2=538062
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java Mon May 14 22:55:05 2007
@@ -112,7 +112,7 @@
xbdr.setValidating(false);
xbdr.loadBeanDefinitions(new InputStreamResource(
Util.getStreamSource(
- synCtx.getConfiguration().getEntry(configKey)).getInputStream()));
+ synCtx.getEntry(configKey)).getInputStream()));
appContext.refresh();
this.appContext = appContext;
}
Modified: webservices/synapse/trunk/java/modules/samples/services/SecureStockQuoteService/src/samples/services/SimpleStockQuoteService.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/samples/services/SecureStockQuoteService/src/samples/services/SimpleStockQuoteService.java?view=diff&rev=538062&r1=538061&r2=538062
==============================================================================
--- webservices/synapse/trunk/java/modules/samples/services/SecureStockQuoteService/src/samples/services/SimpleStockQuoteService.java (original)
+++ webservices/synapse/trunk/java/modules/samples/services/SecureStockQuoteService/src/samples/services/SimpleStockQuoteService.java Mon May 14 22:55:05 2007
@@ -23,14 +23,14 @@
// in-out
public GetQuoteResponse getQuote(GetQuote request) {
- System.out.println(new Date() + " " + this.getClass().getName() +
+ System.out.println(new Date() + " " + "SecureStockQuoteService" +
" :: Generating quote for : " + request.getSymbol());
return new GetQuoteResponse(request.getSymbol());
}
// in-out large response
public GetFullQuoteResponse getFullQuote(GetFullQuote request) {
- System.out.println(new Date() + " " + this.getClass().getName() +
+ System.out.println(new Date() + " " + "SecureStockQuoteService" +
" :: Full quote for : " + request.getSymbol());
return new GetFullQuoteResponse(request.getSymbol());
}
@@ -47,14 +47,14 @@
}
}
sb.append("]");
- System.out.println(new Date() + " " + this.getClass().getName() +
+ System.out.println(new Date() + " " + "SecureStockQuoteService" +
" :: Generating Market activity report for : " + sb.toString());
return new GetMarketActivityResponse(request.getSymbols());
}
// in only
public void placeOrder(PlaceOrder order) {
- System.out.println(new Date() + " " + this.getClass().getName() +
+ System.out.println(new Date() + " " + "SecureStockQuoteService" +
" :: Accepted order for : " + order.getQuantity() +
" stocks of " + order.getSymbol() + " at $ " + order.getPrice());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org