You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by hi...@apache.org on 2013/10/11 23:50:40 UTC
svn commit: r1531437 - in /synapse/trunk/java: ./ modules/core/
modules/core/src/main/java/org/apache/synapse/
modules/core/src/main/java/org/apache/synapse/config/xml/
modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/
modules/core/sr...
Author: hiranya
Date: Fri Oct 11 21:50:39 2013
New Revision: 1531437
URL: http://svn.apache.org/r1531437
Log:
Retiring sandesha and RM related code - See http://osdir.com/ml/dev-synapse.apache.org/2013-09/msg00025.html for the mail thread
Removed:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RMSequenceMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/RMSequenceMediatorSerializationTest.java
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples/sample101.xml
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples/sample102.xml
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples/sample201.xml
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples/sample202.xml
synapse/trunk/java/modules/samples/services/ReliableStockQuoteService/
synapse/trunk/java/repository/conf/sample/resources/policy/sample_rm_policy_1.xml
synapse/trunk/java/repository/conf/sample/synapse_sample_101.xml
synapse/trunk/java/repository/conf/sample/synapse_sample_102.xml
synapse/trunk/java/repository/conf/sample/synapse_sample_201.xml
synapse/trunk/java/repository/conf/sample/synapse_sample_202.xml
synapse/trunk/java/repository/schema/mediators/advanced/rm_sequence.xsd
Modified:
synapse/trunk/java/modules/core/pom.xml
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorSerializerFinder.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/ProxyServiceSerializer.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/EndpointDefinitionFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointDefinitionSerializer.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/core/axis2/AnonymousServiceFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2BlockingClient.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/relay/ServiceRequestEarlyBuilder.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java
synapse/trunk/java/modules/distribution/pom.xml
synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/config.xml
synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples.xml
synapse/trunk/java/modules/integration/pom.xml
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java
synapse/trunk/java/modules/samples/pom.xml
synapse/trunk/java/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
synapse/trunk/java/modules/war/pom.xml
synapse/trunk/java/pom.xml
synapse/trunk/java/repository/schema/endpoint.xsd
synapse/trunk/java/repository/schema/mediators/mediators.xsd
synapse/trunk/java/repository/schema/proxy.xsd
Modified: synapse/trunk/java/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/pom.xml?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/pom.xml (original)
+++ synapse/trunk/java/modules/core/pom.xml Fri Oct 11 21:50:39 2013
@@ -277,10 +277,6 @@
<artifactId>wso2eventing-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2-core</artifactId>
- </dependency>
- <dependency>
<groupId>org.wso2.caching</groupId>
<artifactId>wso2caching-core</artifactId>
</dependency>
@@ -331,6 +327,14 @@
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-dom</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb</artifactId>
+ </dependency>
<dependency>
<!-- Required for validate mediator tests on JDK 5 -->
<groupId>xerces</groupId>
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java Fri Oct 11 21:50:39 2013
@@ -51,8 +51,6 @@ public final class SynapseConstants {
public static final QName SYNAPSE_OPERATION_NAME = new QName("mediate");
//- names of modules to be engaged at runtime -
- /** The Name of the WS-RM module */
- public static final String RM_MODULE_NAME = "sandesha2";
/** The Name of the WS-A Addressing module */
public static final String ADDRESSING_MODULE_NAME = "addressing";
/** The Name of the WS-Security module */
@@ -97,10 +95,8 @@ public final class SynapseConstants {
public static final String RAMPART_POLICY = "rampartPolicy";
/** The Axis2 client options property name for the Rampart in message policy */
public static final String RAMPART_IN_POLICY = "rampartInPolicy";
- /** The Axis2 client options property name for the Rampart out messsage policy */
+ /** The Axis2 client options property name for the Rampart out message policy */
public static final String RAMPART_OUT_POLICY = "rampartOutPolicy";
- /** The Axis2 client options property name for the Sandesha policy */
- public static final String SANDESHA_POLICY = "sandeshaPolicy";
/** ServerManager MBean category and id */
public static final String SERVER_MANAGER_MBEAN = "ServerManager";
public static final String RECEIVING_SEQUENCE = "RECEIVING_SEQUENCE";
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java Fri Oct 11 21:50:39 2013
@@ -60,7 +60,6 @@ public class MediatorFactoryFinder imple
SwitchMediatorFactory.class,
InMediatorFactory.class,
OutMediatorFactory.class,
- RMSequenceMediatorFactory.class,
ClassMediatorFactory.class,
ValidateMediatorFactory.class,
XSLTMediatorFactory.class,
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorSerializerFinder.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorSerializerFinder.java?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorSerializerFinder.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorSerializerFinder.java Fri Oct 11 21:50:39 2013
@@ -47,7 +47,6 @@ public class MediatorSerializerFinder {
SwitchMediatorSerializer.class,
InMediatorSerializer.class,
OutMediatorSerializer.class,
- RMSequenceMediatorSerializer.class,
ClassMediatorSerializer.class,
ValidateMediatorSerializer.class,
XSLTMediatorSerializer.class,
@@ -134,7 +133,7 @@ public class MediatorSerializerFinder {
/**
* This method will return the serializer Map registered with the Finder
*
- * @return Map of serilaizers already registered with the Finder
+ * @return Map of serializers already registered with the Finder
*/
public Map<String, MediatorSerializer> getSerializerMap() {
return serializerMap;
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=1531437&r1=1531436&r2=1531437&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 Fri Oct 11 21:50:39 2013
@@ -56,7 +56,6 @@ import java.util.*;
* </publishWSDL>?
* <enableAddressing/>?
* <enableSec/>?
- * <enableRM/>?
* <policy key="string"/>?
* <policy key="string" type=(in | out)/>?
* // optional service parameters
@@ -352,11 +351,6 @@ public class ProxyServiceFactory {
}
if (elem.getFirstChildWithName(
- new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "enableRM")) != null) {
- proxy.setWsRMEnabled(true);
- }
-
- if (elem.getFirstChildWithName(
new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "enableSec")) != null) {
proxy.setWsSecEnabled(true);
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java Fri Oct 11 21:50:39 2013
@@ -209,9 +209,6 @@ public class ProxyServiceSerializer {
if (service.isWsAddrEnabled()) {
proxy.addChild(fac.createOMElement("enableAddressing", synNS));
}
- if (service.isWsRMEnabled()) {
- proxy.addChild(fac.createOMElement("enableRM", synNS));
- }
if (service.isWsSecEnabled()) {
proxy.addChild(fac.createOMElement("enableSec", synNS));
}
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=1531437&r1=1531436&r2=1531437&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 Fri Oct 11 21:50:39 2013
@@ -42,7 +42,6 @@ import java.util.Properties;
* [statistics="enable|disable"] [trace="enable|disable"]>
* .. extensibility ..
*
- * <enableRM [policy="<em>key</em>"]/>?
* <enableSec [policy="<em>key</em>"]/>?
* <enableAddressing [version="final|submission"] [separateListener="true|false"]/>?
*
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=1531437&r1=1531436&r2=1531437&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 Fri Oct 11 21:50:39 2013
@@ -42,7 +42,6 @@ import java.util.Properties;
* [statistics="enable|disable"] [trace="enable|disable"]>
* .. extensibility ..
*
- * <enableRM [policy="<em>key</em>"]/>?
* <enableSec [policy="<em>key</em>"]/>?
* <enableAddressing [version="final|submission"] [separateListener="true|false"]/>?
*
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointDefinitionFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointDefinitionFactory.java?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointDefinitionFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointDefinitionFactory.java Fri Oct 11 21:50:39 2013
@@ -31,7 +31,8 @@ import org.apache.synapse.endpoints.Endp
import javax.xml.namespace.QName;
import java.util.StringTokenizer;
-public class EndpointDefinitionFactory implements DefinitionFactory{
+public class EndpointDefinitionFactory implements DefinitionFactory {
+
public static final Log log = LogFactory.getLog(EndpointDefinitionFactory.class);
/**
@@ -126,19 +127,6 @@ public class EndpointDefinitionFactory i
}
}
- OMElement wsRm = elem.getFirstChildWithName(
- new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "enableRM"));
- if (wsRm != null) {
-
- definition.setReliableMessagingOn(true);
-
- OMAttribute policy
- = wsRm.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "policy"));
- if (policy != null) {
- definition.setWsRMPolicyKey(policy.getAttributeValue());
- }
- }
-
// set the timeout configuration
OMElement timeout = elem.getFirstChildWithName(
new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "timeout"));
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointDefinitionSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointDefinitionSerializer.java?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointDefinitionSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointDefinitionSerializer.java Fri Oct 11 21:50:39 2013
@@ -77,16 +77,6 @@ public class EndpointDefinitionSerialize
element.addChild(addressing);
}
- if (endpointDefinition.isReliableMessagingOn()) {
- OMElement rm = fac.createOMElement("enableRM", SynapseConstants.SYNAPSE_OMNAMESPACE);
-
- if (endpointDefinition.getWsRMPolicyKey() != null) {
- rm.addAttribute(fac.createOMAttribute(
- "policy", null, endpointDefinition.getWsRMPolicyKey()));
- }
- element.addChild(rm);
- }
-
if (endpointDefinition.isSecurityOn()) {
OMElement sec = fac.createOMElement("enableSec", SynapseConstants.SYNAPSE_OMNAMESPACE);
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=1531437&r1=1531436&r2=1531437&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 Fri Oct 11 21:50:39 2013
@@ -52,7 +52,6 @@ import java.util.Properties;
* <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"]/>?
*
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AnonymousServiceFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AnonymousServiceFactory.java?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AnonymousServiceFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AnonymousServiceFactory.java Fri Oct 11 21:50:39 2013
@@ -42,9 +42,7 @@ public class AnonymousServiceFactory {
private static final String NONE = "__NONE__";
private static final String ADDR_ONLY = "__ADDR_ONLY__";
private static final String SEC_ONLY = "__SEC_ONLY__";
- private static final String RM_AND_ADDR = "__RM_AND_ADDR__";
private static final String SEC_AND_ADDR = "__SEC_AND_ADDR__";
- private static final String RM_SEC_AND_ADDR = "__RM_SEC_AND_ADDR__";
public static final String OUT_IN_OPERATION = "anonOutInOp";
public static final String OUT_ONLY_OPERATION = "anonOutonlyOp";
@@ -57,14 +55,13 @@ public class AnonymousServiceFactory {
* @param synCfg Synapse configuration
* @param axisCfg Axis2 configuration
* @param wsAddrOn whether addressing is on or not
- * @param wsRMOn whether RM is on ot not
* @param wsSecOn whether security is on or not
* @return An Axis service for the requested QoS
*/
public static AxisService getAnonymousService(SynapseConfiguration synCfg,
AxisConfiguration axisCfg, boolean wsAddrOn,
- boolean wsRMOn, boolean wsSecOn) {
- return getAnonymousService(synCfg, axisCfg, wsAddrOn, wsRMOn, wsSecOn, true);
+ boolean wsSecOn) {
+ return getAnonymousService(synCfg, axisCfg, wsAddrOn, wsSecOn, true);
}
@@ -74,14 +71,13 @@ public class AnonymousServiceFactory {
* @param synCfg Synapse configuration
* @param axisCfg Axis2 configuration
* @param wsAddrOn whether addressing is on or not
- * @param wsRMOn whether RM is on ot not
* @param wsSecOn whether security is on or not
* @param setCallback whether to register a synapse callback receiver or not
* @return An Axis service for the requested QoS
*/
public static AxisService getAnonymousService(SynapseConfiguration synCfg,
AxisConfiguration axisCfg, boolean wsAddrOn,
- boolean wsRMOn, boolean wsSecOn, boolean setCallback) {
+ boolean wsSecOn, boolean setCallback) {
// if non of addressing, security and rm is engaged then checkbit is 0
int checkbit = 0;
@@ -89,8 +85,6 @@ public class AnonymousServiceFactory {
if (wsAddrOn) { checkbit += 1; }
// if security is on increase the checkbit by 2
if (wsSecOn) { checkbit += 2; }
- // if reliable messaging is on increase the checkbit by 4
- if (wsRMOn) { checkbit += 4; }
String servicekey;
switch (checkbit) {
@@ -106,18 +100,6 @@ public class AnonymousServiceFactory {
case 3 :
servicekey = SEC_AND_ADDR;
break;
- case 4 :
- servicekey = RM_AND_ADDR;
- break;
- case 5 :
- servicekey = RM_AND_ADDR;
- break;
- case 6:
- servicekey = RM_SEC_AND_ADDR;
- break;
- case 7:
- servicekey = RM_SEC_AND_ADDR;
- break;
default :
servicekey = NONE;
break;
@@ -139,11 +121,6 @@ public class AnonymousServiceFactory {
if (wsAddrOn) {
service.engageModule(axisCfg.getModule(
SynapseConstants.ADDRESSING_MODULE_NAME), axisCfg);
-
- if (wsRMOn) {
- service.engageModule(axisCfg.getModule(
- SynapseConstants.RM_MODULE_NAME), axisCfg);
- }
}
// if WS-A is off, WS-RM should be too
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2BlockingClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2BlockingClient.java?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2BlockingClient.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2BlockingClient.java Fri Oct 11 21:50:39 2013
@@ -146,7 +146,7 @@ public class Axis2BlockingClient {
AxisService anonymousService = AnonymousServiceFactory.getAnonymousService(null,
configurationContext.getAxisConfiguration(), endpointDefinition.isAddressingOn(),
- false, endpointDefinition.isSecurityOn(), false);
+ endpointDefinition.isSecurityOn(), false);
anonymousService.getParent().addParameter(SynapseConstants.HIDDEN_SERVICE_PARAM, "true");
ServiceGroupContext serviceGroupContext = new ServiceGroupContext(configurationContext, (AxisServiceGroup) anonymousService.getParent());
ServiceContext serviceCtx = serviceGroupContext.getServiceContext(anonymousService);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java Fri Oct 11 21:50:39 2013
@@ -19,14 +19,12 @@
package org.apache.synapse.core.axis2;
-import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
-import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.ServiceContext;
@@ -39,11 +37,6 @@ import org.apache.axis2.transport.Transp
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.client.SandeshaClient;
-import org.apache.sandesha2.client.SandeshaClientConstants;
-import org.apache.sandesha2.policy.SandeshaPolicyBean;
-import org.apache.sandesha2.policy.builders.RMAssertionBuilder;
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.endpoints.EndpointDefinition;
import org.apache.synapse.rest.RESTConstants;
@@ -81,8 +74,6 @@ public class Axis2FlexibleMEPClient {
String wsSecPolicyKey = null;
String inboundWsSecPolicyKey = null;
String outboundWsSecPolicyKey = null;
- boolean wsRMEnabled = false;
- String wsRMPolicyKey = null;
boolean wsAddressingEnabled = false;
String wsAddressingVersion = null;
@@ -92,9 +83,7 @@ public class Axis2FlexibleMEPClient {
wsSecPolicyKey = endpoint.getWsSecPolicyKey();
inboundWsSecPolicyKey = endpoint.getInboundWsSecPolicyKey();
outboundWsSecPolicyKey = endpoint.getOutboundWsSecPolicyKey();
- wsRMEnabled = endpoint.isReliableMessagingOn();
- wsRMPolicyKey = endpoint.getWsRMPolicyKey();
- wsAddressingEnabled = endpoint.isAddressingOn() || wsRMEnabled;
+ wsAddressingEnabled = endpoint.isAddressingOn();
wsAddressingVersion = endpoint.getAddressingVersion();
}
@@ -109,7 +98,6 @@ public class Axis2FlexibleMEPClient {
log.debug(
"Sending [add = " + wsAddressingEnabled +
"] [sec = " + wsSecurityEnabled +
- "] [rm = " + wsRMEnabled +
(endpoint != null ?
"] [mtom = " + endpoint.isUseMTOM() +
"] [swa = " + endpoint.isUseSwa() +
@@ -329,7 +317,7 @@ public class Axis2FlexibleMEPClient {
AxisService anonymousService =
AnonymousServiceFactory.getAnonymousService(synapseOutMessageContext.getConfiguration(),
- axisCfg, wsAddressingEnabled, wsRMEnabled, wsSecurityEnabled);
+ axisCfg, wsAddressingEnabled, wsSecurityEnabled);
// mark the anon services created to be used in the client side of synapse as hidden
// from the server side of synapse point of view
anonymousService.getParent().addParameter(SynapseConstants.HIDDEN_SERVICE_PARAM, "true");
@@ -349,20 +337,6 @@ public class Axis2FlexibleMEPClient {
Options clientOptions = MessageHelper.cloneOptions(originalInMsgCtx.getOptions());
clientOptions.setUseSeparateListener(separateListener);
- // if RM is requested,
- if (wsRMEnabled) {
- // if a WS-RM policy is specified, use it
- if (wsRMPolicyKey != null) {
- Object property = synapseOutMessageContext.getEntry(wsRMPolicyKey);
- if (property instanceof OMElement) {
- OMElement policyOMElement = (OMElement) property;
- RMAssertionBuilder builder = new RMAssertionBuilder();
- SandeshaPolicyBean sandeshaPolicyBean = (SandeshaPolicyBean) builder.build(policyOMElement, null);
- Parameter policyParam = new Parameter(Sandesha2Constants.SANDESHA_PROPERTY_BEAN, sandeshaPolicyBean);
- anonymousService.addParameter(policyParam);
- }
- }
- }
// if security is enabled,
if (wsSecurityEnabled) {
@@ -416,7 +390,7 @@ public class Axis2FlexibleMEPClient {
// this is a temporary fix for converting messages from HTTP 1.1 chunking to HTTP 1.0.
// Without this HTTP transport can block & become unresponsive because we are streaming
- // HTTP 1.1 messages and HTTP 1.0 require the whole message to caculate the content length
+ // HTTP 1.1 messages and HTTP 1.0 require the whole message to calculate the content length
if (originalInMsgCtx.isPropertyTrue(NhttpConstants.FORCE_HTTP_1_0)) {
synapseOutMessageContext.getEnvelope().toString();
}
@@ -436,19 +410,6 @@ public class Axis2FlexibleMEPClient {
}
mepClient.execute(true);
- if (wsRMEnabled) {
- Object rm11 = clientOptions.getProperty(SandeshaClientConstants.RM_SPEC_VERSION);
- if ((rm11 != null) && rm11.equals(Sandesha2Constants.SPEC_VERSIONS.v1_1)){
- ServiceClient serviceClient = new ServiceClient(
- axisOutMsgCtx.getConfigurationContext(), axisOutMsgCtx.getAxisService());
- serviceClient.setTargetEPR(
- new EndpointReference(endpoint.getAddress(synapseOutMessageContext)));
- serviceClient.setOptions(clientOptions);
- serviceClient.getOptions().setTo(
- new EndpointReference(endpoint.getAddress(synapseOutMessageContext)));
- SandeshaClient.terminateSequence(serviceClient);
- }
- }
}
private static MessageContext cloneForSend(MessageContext ori, String preserveAddressing)
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java Fri Oct 11 21:50:39 2013
@@ -75,7 +75,6 @@ import java.util.*;
* <resource location="..." key="..."/>*
* </publishWSDL>?
* <enableSec/>?
- * <enableRM/>?
* <policy key="string" [type=("in" |"out")] [operationName="string"]
* [operationNamespace="string"]>?
* // optional service parameters
@@ -184,10 +183,6 @@ public class ProxyService implements Asp
*/
private boolean wsAddrEnabled = false;
/**
- * Should WS RM be engaged on this service
- */
- private boolean wsRMEnabled = false;
- /**
* Should WS Sec be engaged on this service
*/
private boolean wsSecEnabled = false;
@@ -605,17 +600,6 @@ public class ProxyService implements Asp
}
}
- // should RM be engaged on this service?
- if (wsRMEnabled) {
- auditInfo("WS-Reliable messaging is enabled for service : " + name);
- try {
- proxyService.engageModule(axisCfg.getModule(
- SynapseConstants.RM_MODULE_NAME), axisCfg);
- } catch (AxisFault axisFault) {
- handleException("Error loading WS RM module on proxy service : " + name, axisFault);
- }
- }
-
// should Security be engaged on this service?
if (wsSecEnabled) {
auditInfo("WS-Security is enabled for service : " + name);
@@ -628,7 +612,7 @@ public class ProxyService implements Asp
}
}
- moduleEngaged = wsSecEnabled || wsRMEnabled || wsAddrEnabled;
+ moduleEngaged = wsSecEnabled || wsAddrEnabled;
wsdlPublished = wsdlFound;
auditInfo("Successfully created the Axis2 service for Proxy service : " + name);
@@ -874,14 +858,6 @@ public class ProxyService implements Asp
this.wsAddrEnabled = wsAddrEnabled;
}
- public boolean isWsRMEnabled() {
- return wsRMEnabled;
- }
-
- public void setWsRMEnabled(boolean wsRMEnabled) {
- this.wsRMEnabled = wsRMEnabled;
- }
-
public boolean isWsSecEnabled() {
return wsSecEnabled;
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java Fri Oct 11 21:50:39 2013
@@ -33,7 +33,6 @@ import org.apache.axis2.transport.http.H
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.synapse.FaultHandler;
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.SynapseException;
@@ -199,7 +198,7 @@ public class SynapseCallbackReceiver imp
messageID = relatesTo.getValue();
}
}
- } else if (messageCtx.getProperty(SandeshaClientConstants.SEQUENCE_KEY) == null) {
+ } else {
messageID = (String) messageCtx.getProperty(SynapseConstants.RELATES_TO_FOR_POX);
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/relay/ServiceRequestEarlyBuilder.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/relay/ServiceRequestEarlyBuilder.java?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/relay/ServiceRequestEarlyBuilder.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/relay/ServiceRequestEarlyBuilder.java Fri Oct 11 21:50:39 2013
@@ -26,7 +26,6 @@ import org.apache.axis2.description.Axis
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.sandesha2.Sandesha2Constants;
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.core.axis2.ProxyService;
@@ -84,12 +83,6 @@ public class ServiceRequestEarlyBuilder
outMessage.getProperty(RelayConstants.FORCE_RESPONSE_EARLY_BUILD))) {
return buildMessage(messageContext);
}
-
- AxisOperation operation = messageContext.getAxisOperation();
- if (operation != null && operation.getName().getLocalPart().
- startsWith(Sandesha2Constants.SANDESHA_OP_PREFIX)) {
- return buildMessage(messageContext);
- }
}
return InvocationResponse.CONTINUE;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java Fri Oct 11 21:50:39 2013
@@ -219,8 +219,7 @@ public abstract class AbstractEndpoint e
contentAware = definition != null &&
((definition.getFormat() != null && !definition.getFormat().equals(SynapseConstants.FORMAT_REST)) ||
- definition.isSecurityOn() || definition.isReliableMessagingOn() ||
- definition.isAddressingOn());
+ definition.isSecurityOn() || definition.isAddressingOn());
}
public boolean readyToSend() {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java Fri Oct 11 21:50:39 2013
@@ -43,10 +43,6 @@ public class EndpointDefinition implemen
*/
private String address = null;
/**
- * Should messages be sent in an WS-RM Sequence ?
- */
- private boolean reliableMessagingOn = false;
- /**
* Should messages be sent using WS-A?
*/
private boolean addressingOn = false;
@@ -59,10 +55,6 @@ public class EndpointDefinition implemen
*/
private boolean securityOn = false;
/**
- * The "key" for any WS-RM Policy overrides to be used
- */
- private String wsRMPolicyKey = null;
- /**
* The "key" for any Rampart Security Policy to be used
*/
private String wsSecPolicyKey = null;
@@ -220,24 +212,6 @@ public class EndpointDefinition implemen
}
/**
- * Is RM turned on on this endpoint?
- *
- * @return true if on
- */
- public boolean isReliableMessagingOn() {
- return reliableMessagingOn;
- }
-
- /**
- * Request that RM be turned on/off on this endpoint
- *
- * @param reliableMessagingOn a boolean flag indicating RM is on or not
- */
- public void setReliableMessagingOn(boolean reliableMessagingOn) {
- this.reliableMessagingOn = reliableMessagingOn;
- }
-
- /**
* Is WS-A turned on on this endpoint?
*
* @return true if on
@@ -348,24 +322,6 @@ public class EndpointDefinition implemen
this.outboundWsSecPolicyKey = outboundWsSecPolicyKey;
}
- /**
- * Get the WS-RM configuration policys' 'key' to be used
- *
- * @return the WS-RM configuration policys' 'key' to be used
- */
- public String getWsRMPolicyKey() {
- return wsRMPolicyKey;
- }
-
- /**
- * Set the WS-RM configuration policys' 'key' to be used
- *
- * @param wsRMPolicyKey the WS-RM configuration policys' 'key' to be used
- */
- public void setWsRMPolicyKey(String wsRMPolicyKey) {
- this.wsRMPolicyKey = wsRMPolicyKey;
- }
-
public void setUseSeparateListener(boolean b) {
this.useSeparateListener = b;
}
Modified: synapse/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/pom.xml?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/pom.xml (original)
+++ synapse/trunk/java/modules/distribution/pom.xml Fri Oct 11 21:50:39 2013
@@ -98,15 +98,6 @@
<type>mar</type>
</dependency>
<dependency>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2</artifactId>
- <type>mar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2-policy</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>addressing</artifactId>
<type>mar</type>
Modified: synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml (original)
+++ synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml Fri Oct 11 21:50:39 2013
@@ -182,7 +182,6 @@
<exclude>org.apache.synapse:synapse-documentation:zip:docs</exclude>
<exclude>org.apache.axis2:addressing:mar</exclude>
<exclude>org.apache.rampart:rampart:mar</exclude>
- <exclude>org.apache.sandesha2:sandesha2:mar</exclude>
<exclude>javax.servlet:servlet-api:jar</exclude>
<exclude>xml-apis:xml-apis:jar</exclude>
<exclude>xerces:xercesImpl:jar</exclude>
@@ -245,7 +244,6 @@
<includes>
<include>org.apache.axis2:addressing:mar</include>
<include>org.apache.rampart:rampart:mar</include>
- <include>org.apache.sandesha2:sandesha2:mar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
@@ -256,7 +254,6 @@
<includes>
<include>org.apache.axis2:addressing:mar</include>
<include>org.apache.rampart:rampart:mar</include>
- <include>org.apache.sandesha2:sandesha2:mar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
@@ -267,7 +264,6 @@
<includes>
<include>org.apache.axis2:addressing:mar</include>
<include>org.apache.rampart:rampart:mar</include>
- <include>org.apache.sandesha2:sandesha2:mar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
Modified: synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/config.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/config.xml?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/config.xml (original)
+++ synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/config.xml Fri Oct 11 21:50:39 2013
@@ -737,7 +737,6 @@
<div class="xmlConf"><address uri="<em>endpoint address</em>" [format="soap11|soap12|pox|get"] [optimize="mtom|swa"]
[encoding="<em>charset encoding</em>"]
[statistics="enable|disable"] [trace="enable|disable"]>
- <enableRM [policy="<em>key</em>"]/>?
<enableSec [policy="<em>key</em>"]/>?
<enableAddressing [version="final|submission"] [separateListener="true|false"]/>?
@@ -764,9 +763,9 @@
attributes of the endpoint directly in the configuration. The 'uri' attribute
of the address element contains the EPR of the target endpoint. Message format
for the endpoint and the method to optimize attachments can be specified in the
- 'format' and 'optimize' attributes respectively. Reliable messaging and security
+ 'format' and 'optimize' attributes respectively. Security
policies for the endpoint can be specified in the policy attribute of the
- 'enableRM' and 'enableSec' elements respectively. WS-Addressing can be engaged
+ 'enableSec' element. WS-Addressing can be engaged
for the messages sent to the endpoint by using the 'enableAddressing' element.
</p>
<p>
@@ -844,7 +843,7 @@
Default endpoint is an endpoint defined for adding QoS and other configurations
to the endpoint which is resolved from the 'To' address of the message context.
All the configurations such as message format for the endpoint, the method to
- optimize attachments, reliable messaging, security policies for the endpoint
+ optimize attachments, and security policies for the endpoint
can be specified as in the case of Address Endpoint. This endpoint differs from
the address endpoint only in the 'uri' attribute which will not be present in
this endpoint. Following section describes the configuration of a default
@@ -853,7 +852,6 @@
<div class="xmlConf"><default [format="soap11|soap12|pox|get"] [optimize="mtom|swa"]
[encoding="<em>charset encoding</em>"]
[statistics="enable|disable"] [trace="enable|disable"]>
- <enableRM [policy="<em>key</em>"]/>?
<enableSec [policy="<em>key</em>"]/>?
<enableAddressing [version="final|submission"] [separateListener="true|false"]/>?
@@ -882,13 +880,12 @@
WSDL document can be specified either as a URI or as an inline definition within
the configuration. The service and port name containing the target EPR has to be
specified with the 'service' and 'port' (or 'endpoint') attributes respectively.
- Elements like 'enableRM', 'enableSec', 'enableAddressing', 'suspendOnFailure' and
+ Elements like 'enableSec', 'enableAddressing', 'suspendOnFailure' and
'timeout' are same as for an Address endpoint.
</p>
<div class="xmlConf"><wsdl [uri="wsdl-uri"] service="qname" port/endpoint="qname">
<wsdl:definition>...</wsdl:definition>?
<wsdl20:description>...</wsdl20:description>?
- <enableRM [policy="key"]/>?
<enableSec [policy="key"]/>?
<enableAddressing/>?
@@ -1035,7 +1032,6 @@
</publishWSDL>?
<enableAddressing/>?
<enableSec/>?
- <enableRM/>?
<policy key="string" [type="(in | out)"]/>? // optional service or message level policies such as (e.g. WS-Security and/or WS-RM policies)
<parameter name="string"> // optional service parameters such as (e.g. transport.jms.ConnectionFactory)
string | xml
@@ -1084,7 +1080,7 @@
elements (e.g. the JMS destination etc). If the proxy service should enable
WS-Reliable Messaging or Security, the appropriate modules should be engaged, and
specified service level policies will apply. To engage the required modules, one may
- use the 'enableSec', 'enableRM' and 'enableAddressing' elements.
+ use the 'enableSec', and 'enableAddressing' elements.
</p>
<p>
A dynamic proxy may be defined by specifying the properties of the proxy as dynamic
Modified: synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples.xml?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples.xml (original)
+++ synapse/trunk/java/modules/documentation/src/site/xdoc/userguide/samples.xml Fri Oct 11 21:50:39 2013
@@ -73,7 +73,6 @@
<p>
<ul>
<li><a href="samples/sample100.html">Sample 100: Using WS-Security for outgoing messages</a></li>
- <li><a href="samples/sample101.html">Sample 101: Using WS-ReliableMessaging for outgoing messages</a></li>
</ul>
</p>
</subsection>
@@ -96,7 +95,6 @@
<p>
<ul>
<li><a href="samples/sample200.html">Sample 200: Engaging WS-Security on proxy services</a></li>
- <li><a href="samples/sample201.html">Sample 201: Reliable communication between the client and proxy services using WS-ReliableMessaging</a></li>
</ul>
</p>
</subsection>
Modified: synapse/trunk/java/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/pom.xml?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/pom.xml (original)
+++ synapse/trunk/java/modules/integration/pom.xml Fri Oct 11 21:50:39 2013
@@ -167,31 +167,6 @@
<fileset dir="${SSQ3.dir}"/>
</jar>
- <property name="src4" value="../samples/services/ReliableStockQuoteService/src"/>
- <delete dir="${temp.dir}"/>
- <mkdir dir="${temp.dir}"/>
- <mkdir dir="${classes}"/>
- <javac debug="on" destdir="${classes}" fork="true" includeantruntime="false">
- <src path="${src4}"/>
- <classpath refid="maven.compile.classpath"/>
- </javac>
- <property name="RSQ.dir" value="${temp.dir}/ReliableStockQuoteService"/>
- <mkdir dir="${RSQ.dir}"/>
-
- <mkdir dir="${RSQ.dir}/META-INF"/>
- <copy file="${src4}/../conf/services.xml" tofile="${RSQ.dir}/META-INF/services.xml"/>
- <!--<copy file="${src4}/../wsdl/ReliableStockQuoteService.wsdl"-->
- <!--tofile="${RSQ.dir}/META-INF/service.wsdl"/>-->
- <copy toDir="${RSQ.dir}">
- <fileset dir="${classes}">
- <include name="**/*.class"/>
- </fileset>
- </copy>
-
- <jar destfile="${services}/ReliableStockQuoteService.aar">
- <fileset dir="${RSQ.dir}"/>
- </jar>
-
<property name="src5" value="../samples/services/LoadbalanceFailoverService/src"/>
<delete dir="${temp.dir}"/>
<mkdir dir="${temp.dir}"/>
@@ -270,14 +245,6 @@
</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2</artifactId>
- <version>${sandesha2.version}</version>
- <type>mar</type>
- <outputDirectory>target/test_repos/axis2Server/modules
- </outputDirectory>
- </artifactItem>
- <artifactItem>
<groupId>org.apache.axis2</groupId>
<artifactId>addressing</artifactId>
<version>${addressing.version}</version>
@@ -309,15 +276,6 @@
<outputDirectory>target/test_repos/synapse/modules
</outputDirectory>
</artifactItem>
- <artifactItem>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2</artifactId>
- <version>${sandesha2.version}</version>
- <type>mar</type>
- <outputDirectory>target/test_repos/synapse/modules
- </outputDirectory>
- </artifactItem>
-
</artifactItems>
</configuration>
</execution>
@@ -393,11 +351,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-base</artifactId>
<scope>test</scope>
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java Fri Oct 11 21:50:39 2013
@@ -194,7 +194,6 @@ public class TestSamplesHandlerSuite ext
//QoS
sampleClassRepo.put("100", Sample100.class);
- sampleClassRepo.put("101", Sample101.class);
//Proxy Service
sampleClassRepo.put("150", Sample150.class);
Modified: synapse/trunk/java/modules/samples/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/pom.xml?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/pom.xml (original)
+++ synapse/trunk/java/modules/samples/pom.xml Fri Oct 11 21:50:39 2013
@@ -300,17 +300,6 @@
</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2</artifactId>
- <version>${sandesha2.version}</version>
- <type>mar</type>
- <overWrite>true</overWrite>
- <outputDirectory>target/test_repos/axis2Server/modules
- </outputDirectory>
- </artifactItem>
-
-
- <artifactItem>
<groupId>org.apache.axis2</groupId>
<artifactId>addressing</artifactId>
<version>${addressing.version}</version>
@@ -329,15 +318,6 @@
</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2</artifactId>
- <version>${sandesha2.version}</version>
- <type>mar</type>
- <overWrite>true</overWrite>
- <outputDirectory>target/test_repos/synapse/modules
- </outputDirectory>
- </artifactItem>
- <artifactItem>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse</artifactId>
<version>${synapse.version}</version>
Modified: synapse/trunk/java/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java (original)
+++ synapse/trunk/java/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java Fri Oct 11 21:50:39 2013
@@ -22,7 +22,6 @@ package samples.userguide;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
@@ -34,9 +33,6 @@ import org.apache.axis2.transport.http.H
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.rampart.RampartMessageData;
-import org.apache.sandesha2.client.SandeshaClientConstants;
-import org.apache.sandesha2.client.SandeshaClient;
-import org.apache.sandesha2.Sandesha2Constants;
import samples.common.StockQuoteHandler;
import java.io.File;
@@ -117,8 +113,6 @@ public class StockQuoteClient {
String repo = getProperty("repository", "client_repo");
String svcPolicy = getProperty("policy", null);
String rest = getProperty("rest", null);
- String wsrm = getProperty("wsrm", null);
- String wsrm11 = getProperty("wsrm11", null);
String itr = getProperty("itr", "1");
int iterations = 1;
boolean infinite = false;
@@ -139,7 +133,7 @@ public class StockQuoteClient {
double price = 0;
int quantity = 0;
- ConfigurationContext configContext = null;
+ ConfigurationContext configContext;
Options options = new Options();
OMElement payload = null;
@@ -212,15 +206,6 @@ public class StockQuoteClient {
System.out.println("Sending as REST");
options.setProperty(Constants.Configuration.ENABLE_REST, Constants.VALUE_TRUE);
}
- if (Boolean.parseBoolean(wsrm) || Boolean.parseBoolean(wsrm11)) {
- System.out.println("Using WS-RM");
- serviceClient.engageModule("sandesha2");
- if (Boolean.parseBoolean(wsrm11)){
- options.setProperty(SandeshaClientConstants.RM_SPEC_VERSION, Sandesha2Constants.SPEC_VERSIONS.v1_1);
- }
- options.setProperty(SandeshaClientConstants.LAST_MESSAGE, Constants.VALUE_TRUE);
- options.setProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID, UIDGenerator.generateURNString());
- }
if ("soap12".equals(soapVer)) {
options.setSoapVersionURI(SOAP12Constants. SOAP_ENVELOPE_NAMESPACE_URI);
@@ -246,17 +231,6 @@ public class StockQuoteClient {
InnerStruct.RESULT = serviceClient.sendReceive(payload);
i++;
printResult();
- if (Boolean.parseBoolean(wsrm) || Boolean.parseBoolean(wsrm11)) {
- // give some time for RM to terminate normally
- if (Boolean.parseBoolean(wsrm11)){
- SandeshaClient.terminateSequence(serviceClient);
- }
- Thread.sleep(5000);
- if (configContext != null) {
- configContext.getListenerManager().stop();
- }
- serviceClient.cleanup();
- }
}
}
}
@@ -280,10 +254,10 @@ public class StockQuoteClient {
}
}
- private static double getRandom(double base, double varience, boolean onlypositive) {
+ private static double getRandom(double base, double variance, boolean onlyPositive) {
double rand = Math.random();
- return (base + ((rand > 0.5 ? 1 : -1) * varience * base * rand))
- * (onlypositive ? 1 : (rand > 0.5 ? 1 : -1));
+ return (base + ((rand > 0.5 ? 1 : -1) * variance * base * rand))
+ * (onlyPositive ? 1 : (rand > 0.5 ? 1 : -1));
}
}
Modified: synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java (original)
+++ synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java Fri Oct 11 21:50:39 2013
@@ -425,15 +425,6 @@ public class ClientHandler implements NH
final MessageContext mc = axis2Request.getMsgContext();
- // if the request message is a sandesha messag we ignore the
- // exception handling
- // we cannot use the declared sandesha2 constant since
- // nhttp transport shouldn't take a sandesha2 dependency
- String done = (String) mc.getProperty("Sandesha2AppProcessingDone");
- if (JavaUtils.isTrueExplicitly(done)) {
- return;
- }
-
if (mc.getAxisOperation() != null &&
mc.getAxisOperation().getMessageReceiver() != null) {
Modified: synapse/trunk/java/modules/war/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/war/pom.xml?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/modules/war/pom.xml (original)
+++ synapse/trunk/java/modules/war/pom.xml Fri Oct 11 21:50:39 2013
@@ -113,13 +113,6 @@
<outputDirectory>target/temp/lib</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2</artifactId>
- <version>${sandesha2.version}</version>
- <type>mar</type>
- <outputDirectory>target/temp/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart</artifactId>
<version>${rampart.version}</version>
@@ -208,7 +201,6 @@
<includes>
<include>addressing-${addressing.version}.mar</include>
<include>rampart-${rampart.version}.mar</include>
- <include>sandesha2-${sandesha2.version}.mar</include>
</includes>
</resource>
<resource>
Modified: synapse/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/pom.xml?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/pom.xml (original)
+++ synapse/trunk/java/pom.xml Fri Oct 11 21:50:39 2013
@@ -562,6 +562,11 @@
</exclusions>
<type>mar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <version>${neethi.version}</version>
+ </dependency>
<!-- Apache Axiom -->
<dependency>
@@ -587,36 +592,6 @@
<version>${xml_schema.version}</version>
</dependency>
- <!-- Apache Sandesha -->
- <dependency>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2-core</artifactId>
- <version>${sandesha2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2</artifactId>
- <version>${sandesha2.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2</artifactId>
- </exclusion>
- </exclusions>
- <type>mar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2-policy</artifactId>
- <version>${sandesha2.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<!-- Apache Commons -->
<dependency>
<groupId>commons-dbcp</groupId>
@@ -1095,10 +1070,10 @@
<xml_schema.version>1.4.3</xml_schema.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
- <!-- addressing, rampart -->
+ <!-- addressing, rampart, neethi -->
<addressing.version>${axis2.version}</addressing.version>
<rampart.version>1.7.0-SNAPSHOT</rampart.version>
- <sandesha2.version>1.7.0-SNAPSHOT</sandesha2.version>
+ <neethi.version>3.0.3-SNAPSHOT</neethi.version>
<jruby.version>1.3.0</jruby.version>
<bcprov.jdk15.version>140</bcprov.jdk15.version>
Modified: synapse/trunk/java/repository/schema/endpoint.xsd
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/schema/endpoint.xsd?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/repository/schema/endpoint.xsd (original)
+++ synapse/trunk/java/repository/schema/endpoint.xsd Fri Oct 11 21:50:39 2013
@@ -216,11 +216,6 @@
</xs:documentation>
</xs:annotation>
<xs:all>
- <xs:element name="enableRM" minOccurs="0" maxOccurs="1">
- <xs:complexType>
- <xs:attribute name="policy" type="xs:string" use="optional"/>
- </xs:complexType>
- </xs:element>
<xs:element name="enableSec" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:attribute name="policy" type="xs:string" use="required"/>
Modified: synapse/trunk/java/repository/schema/mediators/mediators.xsd
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/schema/mediators/mediators.xsd?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/repository/schema/mediators/mediators.xsd (original)
+++ synapse/trunk/java/repository/schema/mediators/mediators.xsd Fri Oct 11 21:50:39 2013
@@ -38,7 +38,6 @@
<xs:include schemaLocation="transformation/xslt.xsd"/>
<xs:include schemaLocation="transformation/xquery.xsd"/>
<xs:include schemaLocation="transformation/rewrite.xsd"/>
- <xs:include schemaLocation="advanced/rm_sequence.xsd"/>
<xs:include schemaLocation="advanced/db_mediators.xsd"/>
<xs:include schemaLocation="advanced/cache.xsd"/>
<xs:include schemaLocation="advanced/event.xsd"/>
@@ -77,7 +76,6 @@
<xs:element ref="validate"/>
<xs:element ref="filter"/>
<xs:element ref="switch"/>
- <xs:element ref="RMSequence"/>
<xs:element ref="makefault"/>
<xs:element ref="script"/>
<xs:element ref="xslt"/>
Modified: synapse/trunk/java/repository/schema/proxy.xsd
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/schema/proxy.xsd?rev=1531437&r1=1531436&r2=1531437&view=diff
==============================================================================
--- synapse/trunk/java/repository/schema/proxy.xsd (original)
+++ synapse/trunk/java/repository/schema/proxy.xsd Fri Oct 11 21:50:39 2013
@@ -60,7 +60,6 @@
</xs:element>
<xs:element name="enableAddressing" minOccurs="0" maxOccurs="1"/>
<xs:element name="enableSec" minOccurs="0" maxOccurs="1"/>
- <xs:element name="enableRM" minOccurs="0" maxOccurs="1"/>
<xs:element name="policy" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:attribute name="key" type="xs:string" use="required"/>