Author: veithen
Date: Sun Sep 23 09:22:51 2012
New Revision: 1388989
URL: http://svn.apache.org/viewvc?rev=1388989&view=rev
Log:
Merged latest changes from trunk.
Modified:
synapse/branches/SYNAPSE-905/ (props changed)
synapse/branches/SYNAPSE-905/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java
(props changed)
synapse/branches/SYNAPSE-905/modules/samples/services/ReliableStockQuoteService/conf/services.xml
synapse/branches/SYNAPSE-905/modules/samples/services/SecureStockQuoteService/conf/services.xml
synapse/branches/SYNAPSE-905/repository/conf/synapse-config/synapse.xml
(props changed)
Propchange: synapse/branches/SYNAPSE-905/
------------------------------------------------------------------------------
Merged /synapse/trunk/java:r1388967-1388988
Propchange:
synapse/branches/SYNAPSE-905/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java
------------------------------------------------------------------------------
Merged
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java:r1388967-1388988
Modified:
synapse/branches/SYNAPSE-905/modules/samples/services/ReliableStockQuoteService/conf/services.xml
URL:
http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/modules/samples/services/ReliableStockQuoteService/conf/services.xml?rev=1388989&r1=1388988&r2=1388989&view=diff
==============================================================================
---
synapse/branches/SYNAPSE-905/modules/samples/services/ReliableStockQuoteService/conf/services.xml
(original)
+++
synapse/branches/SYNAPSE-905/modules/samples/services/ReliableStockQuoteService/conf/services.xml
Sun Sep 23 09:22:51 2012
@@ -18,39 +18,39 @@
-->
<serviceGroup>
-<service name="ReliableStockQuoteService">
-
- <module ref="sandesha2"/>
-
- <messageReceivers>
- <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only";
- class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver" />
- <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out";
- class="org.apache.axis2.rpc.receivers.RPCMessageReceiver" />
- </messageReceivers>
- <parameter locked="false"
name="ServiceClass">samples.services.ReliableStockQuoteService</parameter>
- <operation name="placeOrder">
- <messageReceiver
class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"/>
- <actionMapping>urn:placeOrder</actionMapping>
- </operation>
- <operation name="getQuote">
- <messageReceiver
class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
- <actionMapping>urn:getQuote</actionMapping>
- </operation>
- <supported-policy-namespaces
namespaces="http://ws.apache.org/sandesha2/policy"; />
-
- <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
-
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
- xmlns:wsrm="http://ws.apache.org/sandesha2/policy";
wsu:Id="RMPolicy">
-
- <!-- Following policy value has been overrided from the default
values.-->>
- <wsrm:AcknowledgementInterval>3500</wsrm:AcknowledgementInterval>
- <wsrm:RetransmissionInterval>6000</wsrm:RetransmissionInterval>
- <wsrm:InactivityTimeout>1</wsrm:InactivityTimeout>
-
<wsrm:InactivityTimeoutMeasure>minutes</wsrm:InactivityTimeoutMeasure>
- <wsrm:InvokeInOrder>true</wsrm:InvokeInOrder>
-
- </wsp:Policy>
-
-</service>
+ <service name="ReliableStockQuoteService">
+
+ <module ref="sandesha2"/>
+
+ <messageReceivers>
+ <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only";
+
class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver" />
+ <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out";
+
class="org.apache.axis2.rpc.receivers.RPCMessageReceiver" />
+ </messageReceivers>
+ <parameter locked="false"
name="ServiceClass">samples.services.ReliableStockQuoteService</parameter>
+ <operation name="placeOrder">
+ <messageReceiver
class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"/>
+ <actionMapping>urn:placeOrder</actionMapping>
+ </operation>
+ <operation name="getQuote">
+ <messageReceiver
class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
+ <actionMapping>urn:getQuote</actionMapping>
+ </operation>
+ <supported-policy-namespaces
namespaces="http://ws.apache.org/sandesha2/policy"; />
+
+ <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
+
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
+ xmlns:wsrm="http://ws.apache.org/sandesha2/policy";
wsu:Id="RMPolicy">
+
+ <!-- Following policy value has been overrided from the default
values.-->>
+ <wsrm:AcknowledgementInterval>3500</wsrm:AcknowledgementInterval>
+ <wsrm:RetransmissionInterval>6000</wsrm:RetransmissionInterval>
+ <wsrm:InactivityTimeout>1</wsrm:InactivityTimeout>
+
<wsrm:InactivityTimeoutMeasure>minutes</wsrm:InactivityTimeoutMeasure>
+ <wsrm:InvokeInOrder>true</wsrm:InvokeInOrder>
+
+ </wsp:Policy>
+
+ </service>
</serviceGroup>
\ No newline at end of file
Modified:
synapse/branches/SYNAPSE-905/modules/samples/services/SecureStockQuoteService/conf/services.xml
URL:
http://svn.apache.org/viewvc/synapse/branches/SYNAPSE-905/modules/samples/services/SecureStockQuoteService/conf/services.xml?rev=1388989&r1=1388988&r2=1388989&view=diff
==============================================================================
---
synapse/branches/SYNAPSE-905/modules/samples/services/SecureStockQuoteService/conf/services.xml
(original)
+++
synapse/branches/SYNAPSE-905/modules/samples/services/SecureStockQuoteService/conf/services.xml
Sun Sep 23 09:22:51 2012
@@ -18,95 +18,95 @@
-->
<serviceGroup>
-<service name="SecureStockQuoteService" scope="application">
- <module ref="rampart"/>
-
- <schema>
- <mapping package="samples.services"
namespace="http://services.samples"/>
- </schema>
-
- <messageReceivers>
- <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only";
- class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver" />
- <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out";
- class="org.apache.axis2.rpc.receivers.RPCMessageReceiver" />
- </messageReceivers>
- <parameter locked="false"
name="ServiceClass">samples.services.SimpleStockQuoteService</parameter>
-
- <wsp:Policy wsu:Id="SigEncr"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:AsymmetricBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <wsp:Policy>
- <sp:InitiatorToken>
- <wsp:Policy>
- <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
-
<wsp:Policy>
-
<sp:WssX509V3Token10/>
-
</wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:InitiatorToken>
- <sp:RecipientToken>
- <wsp:Policy>
- <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
-
<wsp:Policy>
-
<sp:WssX509V3Token10/>
-
</wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:RecipientToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic256/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- <wsp:Policy>
- <sp:Strict/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
-
<sp:OnlySignEntireHeadersAndBody/>
- </wsp:Policy>
- </sp:AsymmetricBinding>
- <sp:Wss10
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <wsp:Policy>
-
<sp:MustSupportRefKeyIdentifier/>
- <sp:MustSupportRefIssuerSerial/>
- </wsp:Policy>
- </sp:Wss10>
- <sp:SignedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <sp:Body/>
- </sp:SignedParts>
- <sp:EncryptedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <sp:Body/>
- </sp:EncryptedParts>
-
- <ramp:RampartConfig
xmlns:ramp="http://ws.apache.org/rampart/policy";>
- <ramp:user>alice</ramp:user>
-
<ramp:encryptionUser>bob</ramp:encryptionUser>
-
<ramp:passwordCallbackClass>samples.userguide.PWCallback</ramp:passwordCallbackClass>
-
- <ramp:signatureCrypto>
- <ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
- <ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">store.jks</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
- </ramp:crypto>
- </ramp:signatureCrypto>
- <ramp:encryptionCypto>
- <ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
- <ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">store.jks</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
- </ramp:crypto>
- </ramp:encryptionCypto>
- </ramp:RampartConfig>
-
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
-
-</service>
+ <service name="SecureStockQuoteService" scope="application">
+ <module ref="rampart"/>
+
+ <schema>
+ <mapping package="samples.services"
namespace="http://services.samples"/>
+ </schema>
+
+ <messageReceivers>
+ <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only";
+
class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver" />
+ <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out";
+
class="org.apache.axis2.rpc.receivers.RPCMessageReceiver" />
+ </messageReceivers>
+ <parameter locked="false"
name="ServiceClass">samples.services.SimpleStockQuoteService</parameter>
+
+ <wsp:Policy wsu:Id="SigEncr"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:AsymmetricBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+ <wsp:Policy>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+ <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:RecipientToken>
+ <wsp:Policy>
+ <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:RecipientToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic256/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:AsymmetricBinding>
+ <sp:Wss10
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ </wsp:Policy>
+ </sp:Wss10>
+ <sp:SignedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+ <sp:Body/>
+ </sp:SignedParts>
+ <sp:EncryptedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+ <sp:Body/>
+ </sp:EncryptedParts>
+
+ <ramp:RampartConfig
xmlns:ramp="http://ws.apache.org/rampart/policy";>
+ <ramp:user>alice</ramp:user>
+ <ramp:encryptionUser>bob</ramp:encryptionUser>
+
<ramp:passwordCallbackClass>samples.userguide.PWCallback</ramp:passwordCallbackClass>
+
+ <ramp:signatureCrypto>
+ <ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">store.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+ </ramp:crypto>
+ </ramp:signatureCrypto>
+ <ramp:encryptionCypto>
+ <ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">store.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+ </ramp:crypto>
+ </ramp:encryptionCypto>
+ </ramp:RampartConfig>
+
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+ </service>
</serviceGroup>
Propchange:
synapse/branches/SYNAPSE-905/repository/conf/synapse-config/synapse.xml
------------------------------------------------------------------------------
Merged
/synapse/trunk/java/repository/conf/synapse-config/synapse.xml:r1388967-1388988
