You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by in...@apache.org on 2009/05/28 11:07:02 UTC
svn commit: r779494 - in
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse:
config/xml/ config/xml/endpoints/ mediators/
Author: indika
Date: Thu May 28 09:07:01 2009
New Revision: 779494
URL: http://svn.apache.org/viewvc?rev=779494&view=rev
Log:
fix an issue with stat configuration serialze and factory
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java?rev=779494&r1=779493&r2=779494&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java Thu May 28 09:07:01 2009
@@ -106,22 +106,24 @@
}
}
- OMAttribute statistics = mediatorOmElement.getAttribute(ATT_STATS);
- if (statistics != null) {
- String statisticsValue = statistics.getAttributeValue();
- if (statisticsValue != null) {
- String name = null;
- if (mediator instanceof Nameable) {
- name = ((Nameable) mediator).getName();
- }
- if (name == null || "".equals(name)) {
- name = SynapseConstants.ANONYMOUS_SEQUENCE;
- }
- if (mediator instanceof AspectConfigurable) {
+ String name = null;
+ if (mediator instanceof Nameable) {
+ name = ((Nameable) mediator).getName();
+ }
+ if (name == null || "".equals(name)) {
+ name = SynapseConstants.ANONYMOUS_SEQUENCE;
+ }
+
+ if (mediator instanceof AspectConfigurable) {
+ AspectConfiguration configuration = new AspectConfiguration(name);
+ ((AspectConfigurable) mediator).configure(configuration);
+
+ OMAttribute statistics = mediatorOmElement.getAttribute(ATT_STATS);
+ if (statistics != null) {
+ String statisticsValue = statistics.getAttributeValue();
+ if (statisticsValue != null) {
if (XMLConfigConstants.STATISTICS_ENABLE.equals(statisticsValue)) {
- AspectConfiguration configuration = new AspectConfiguration(name);
configuration.enableStatistics();
- ((AspectConfigurable) mediator).configure(configuration);
}
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java?rev=779494&r1=779493&r2=779494&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java Thu May 28 09:07:01 2009
@@ -137,7 +137,7 @@
OMAttribute startOnLoad = elem.getAttribute(
new QName(XMLConfigConstants.NULL_NAMESPACE, "startOnLoad"));
if (startOnLoad != null) {
- proxy.setStartOnLoad(Boolean.valueOf(startOnLoad.getAttributeValue()).booleanValue());
+ proxy.setStartOnLoad(Boolean.valueOf(startOnLoad.getAttributeValue()));
} else {
proxy.setStartOnLoad(true);
}
@@ -302,19 +302,20 @@
}
}
+ String nameString = proxy.getName();
+ if (nameString == null || "".equals(nameString)) {
+ nameString = SynapseConstants.ANONYMOUS_PROXYSERVICE;
+ }
+ AspectConfiguration aspectConfiguration = new AspectConfiguration(nameString);
+ proxy.configure(aspectConfiguration);
+
OMAttribute statistics = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE,
XMLConfigConstants.STATISTICS_ATTRIB_NAME));
if (statistics != null) {
String statisticsValue = statistics.getAttributeValue();
if (statisticsValue != null) {
if (XMLConfigConstants.STATISTICS_ENABLE.equals(statisticsValue)) {
- String nameString = proxy.getName();
- if (nameString == null || "".equals(nameString)) {
- nameString = SynapseConstants.ANONYMOUS_PROXYSERVICE;
- }
- AspectConfiguration aspectConfiguration = new AspectConfiguration(nameString);
aspectConfiguration.enableStatistics();
- proxy.configure(aspectConfiguration);
}
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java?rev=779494&r1=779493&r2=779494&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java Thu May 28 09:07:01 2009
@@ -109,7 +109,7 @@
}
extractCommonEndpointProperties(endpointDefinition, elem);
- extractSpecificEndpointProperties(endpointDefinition,elem);
+ extractSpecificEndpointProperties(endpointDefinition, elem);
return endpointDefinition;
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java?rev=779494&r1=779493&r2=779494&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java Thu May 28 09:07:01 2009
@@ -143,15 +143,15 @@
if (name == null || "".equals(name)) {
name = SynapseConstants.ANONYMOUS_ENDPOINT;
}
+ AspectConfiguration aspectConfiguration = new AspectConfiguration(name);
+ definition.configure(aspectConfiguration);
OMAttribute statistics = epOmElement.getAttribute(
new QName(XMLConfigConstants.STATISTICS_ATTRIB_NAME));
if (statistics != null) {
String statisticsValue = statistics.getAttributeValue();
if (statisticsValue != null) {
if (XMLConfigConstants.STATISTICS_ENABLE.equals(statisticsValue)) {
- AspectConfiguration aspectConfiguration = new AspectConfiguration(name);
aspectConfiguration.enableStatistics();
- definition.configure(aspectConfiguration);
}
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointSerializer.java?rev=779494&r1=779493&r2=779494&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointSerializer.java Thu May 28 09:07:01 2009
@@ -82,17 +82,6 @@
element.addAttribute(fac.createOMAttribute("format", null, "soap12"));
}
- StatisticsConfigurable statisticsConfigurable =
- endpointDefinition.getAspectConfiguration();
-
- if (statisticsConfigurable != null &&
- statisticsConfigurable.isStatisticsEnable()) {
-
- element.addAttribute(fac.createOMAttribute(
- XMLConfigConstants.STATISTICS_ATTRIB_NAME, null,
- XMLConfigConstants.STATISTICS_ENABLE));
- }
-
}
public OMElement serializeEndpointDefinition(EndpointDefinition endpointDefinition) {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java?rev=779494&r1=779493&r2=779494&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java Thu May 28 09:07:01 2009
@@ -25,6 +25,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.aspects.statistics.StatisticsConfigurable;
import org.apache.synapse.config.xml.XMLConfigConstants;
import org.apache.synapse.endpoints.*;
import org.apache.synapse.endpoints.EndpointDefinition;
@@ -83,6 +84,17 @@
null, XMLConfigConstants.TRACE_DISABLE));
}
+ StatisticsConfigurable statisticsConfigurable =
+ endpointDefinition.getAspectConfiguration();
+
+ if (statisticsConfigurable != null &&
+ statisticsConfigurable.isStatisticsEnable()) {
+
+ element.addAttribute(fac.createOMAttribute(
+ XMLConfigConstants.STATISTICS_ATTRIB_NAME, null,
+ XMLConfigConstants.STATISTICS_ENABLE));
+ }
+
if (endpointDefinition.isUseSwa()) {
element.addAttribute(fac.createOMAttribute("optimize", null, "swa"));
} else if (endpointDefinition.isUseMTOM()) {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java?rev=779494&r1=779493&r2=779494&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java Thu May 28 09:07:01 2009
@@ -48,16 +48,16 @@
* [statistics="enable|disable"] [trace="enable|disable"]>
* <wsdl:definition>...</wsdl:definition>?
* <wsdl20:description>...</wsdl20:description>?
- *
+ *
* <enableRM [policy="<em>key</em>"]/>?
* <enableSec [policy="<em>key</em>"]/>?
* <enableAddressing [version="final|submission"] [separateListener="true|false"]/>?
- *
+ *
* <timeout>
* <duration><em>timeout duration in seconds</em></duration>
* <action>discard|fault</action>
* </timeout>?
- *
+ *
* <suspendDurationOnFailure>
* <em>suspend duration in seconds</em>
* </suspendDurationOnFailure>?
@@ -65,7 +65,7 @@
* </endpoint>
* </pre>
*/
-public class WSDLEndpointFactory extends EndpointFactory {
+public class WSDLEndpointFactory extends DefaultEndpointFactory {
private static WSDLEndpointFactory instance = new WSDLEndpointFactory();
@@ -156,7 +156,6 @@
OMElement descriptionElement = wsdlElement.getFirstChildWithName
(new QName(org.apache.axis2.namespace.Constants.NS_URI_WSDL11, "description"));
if (endpoint == null && descriptionElement != null) {
- wsdlEndpoint.setWsdlDoc(descriptionElement);
handleException("WSDL 2.0 Endpoints are currently not supported.");
}
@@ -164,7 +163,8 @@
// for now, QOS information has to be provided explicitly.
extractCommonEndpointProperties(endpoint, wsdlElement);
extractSpecificEndpointProperties(endpoint, wsdlElement);
- wsdlEndpoint.setDefinition(endpoint);
+ wsdlEndpoint.setDefinition(endpoint);
+ processAuditStatus(endpoint, wsdlEndpoint.getName(), wsdlElement);
} else {
handleException("WSDL is not specified for WSDL endpoint.");
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java?rev=779494&r1=779493&r2=779494&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java Thu May 28 09:07:01 2009
@@ -288,7 +288,7 @@
public void enableStatistics() {
if (this.aspectConfiguration != null) {
- this.aspectConfiguration.disableStatistics();
+ this.aspectConfiguration.enableStatistics();
}
}