Author: asankha
Date: Wed Oct 4 09:55:24 2006
New Revision: 452934
URL: http://svn.apache.org/viewvc?view=rev&rev=452934
Log:
checkin support for new neethi/Policy framework for WS-Security
Removed:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/OutflowRMPolicyBuilder.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/RampartSecurityBuilder.java
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/Constants.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/Endpoint.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/Constants.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/EndpointFactory.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2Sender.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/SendMediator.java
incubator/synapse/trunk/java/modules/core/test-resources/axis2/conf/axis2.xml
incubator/synapse/trunk/java/project.properties
incubator/synapse/trunk/java/project.xml
incubator/synapse/trunk/java/repository/conf/axis2.xml
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/Constants.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/Constants.java?view=diff&rev=452934&r1=452933&r2=452934
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/Constants.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/Constants.java
Wed Oct 4 09:55:24 2006
@@ -56,17 +56,14 @@
/** If the message context contains a Boolean.TRUE with this key, RM would
be turned on send */
String OUTFLOW_RM_ON = "OUTFLOW_RM_ON";
- /** The message context property name which holds the RM policy to be used
for outgoing messages */
+ /** The message context property name which holds the RM 'Policy' object
for outgoing messages */
String OUTFLOW_RM_POLICY = "OUTFLOW_RM_POLICY";
/** If the message context contains a Boolean.TRUE with this key, Rampart
would be engaged on send */
String OUTFLOW_SECURITY_ON = "OUTFLOW_SECURITY_ON";
- /** The message context property name which holds the Security 'Parameter'
object to be used for outgoing messages */
- String OUTFLOW_SEC_PARAMETER = "OUTFLOW_SEC_PARAMETER";
-
- /** The message context property name which holds the Security 'Parameter'
object to be used for incoming messages */
- String INFLOW_SEC_PARAMETER = "INFLOW_SEC_PARAMETER";
+ /** The message context property name which holds the Security 'Policy'
object for outgoing messages */
+ String OUTFLOW_SEC_POLICY = "OUTFLOW_SEC_POLICY";
/** The message context property name which holds the error code for the
last encountered exception */
String ERROR_CODE = "ERROR_CODE";
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/Endpoint.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/Endpoint.java?view=diff&rev=452934&r1=452933&r2=452934
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/Endpoint.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/Endpoint.java
Wed Oct 4 09:55:24 2006
@@ -15,8 +15,6 @@
*/
package org.apache.synapse.config;
-import org.apache.axis2.description.Parameter;
-import org.apache.neethi.Policy;
import java.net.URL;
@@ -41,12 +39,10 @@
private boolean addressingOn = false;
/** Should messages be sent using WS-Security? */
private boolean securityOn = false;
- /** Any WS-RM Policy overrides to be used when communicating with this
endpoint */
- private Policy wsRMPolicy = null;
- /** The Apache Rampart OutflowSecurity configuration to be used */
- private Parameter outflowSecurity = null;
- /** The Apache Rampart InflowSecurity configuration to be used */
- private Parameter inflowSecurity = null;
+ /** 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;
/**
* Return the name of the endpoint
@@ -145,50 +141,34 @@
}
/**
- * Return the OutflowSecurity configuration to be used (See Rampart)
- * @return the OutflowSecurity to be used, or null if WS-Sec is not on
+ * Return the Rampart Security configuration policys' 'key' to be used
(See Rampart)
+ * @return the ORampart Security configuration policys' 'key' to be used
(See Rampart)
*/
- public Parameter getOutflowSecurity() {
- return outflowSecurity;
+ public String getWsSecPolicyKey() {
+ return wsSecPolicyKey;
}
/**
- * Set the OutflowSecurity configuration to be used (See Apache Rampart)
- * @param outflowSecurity the Rampart OutflowSecurity configuration to be
used if any
+ * Set the Rampart Security configuration policys' 'key' to be used (See
Rampart)
+ * @param wsSecPolicyKey the Rampart Security configuration policys' 'key'
to be used (See Rampart)
*/
- public void setOutflowSecurity(Parameter outflowSecurity) {
- this.outflowSecurity = outflowSecurity;
+ public void setWsSecPolicyKey(String wsSecPolicyKey) {
+ this.wsSecPolicyKey = wsSecPolicyKey;
}
/**
- * Return the InflowSecurity configuration to be used (See Rampart)
- * @return the InflowSecurity to be used, or null if WS-Sec is not on
+ * Get the WS-RM configuration policys' 'key' to be used (See Sandesha2)
+ * @return the WS-RM configuration policys' 'key' to be used (See
Sandesha2)
*/
- public Parameter getInflowSecurity() {
- return inflowSecurity;
+ public String getWsRMPolicyKey() {
+ return wsRMPolicyKey;
}
/**
- * Set the InflowSecurity configuration to be used (See Apache Rampart)
- * @param inflowSecurity the Rampart InflowSecurity configuration to be
used if any
+ * Set the WS-RM configuration policys' 'key' to be used (See Sandesha2)
+ * @param wsRMPolicyKey the WS-RM configuration policys' 'key' to be used
(See Sandesha2)
*/
- public void setInflowSecurity(Parameter inflowSecurity) {
- this.inflowSecurity = inflowSecurity;
- }
-
- /**
- * Get the WS-RM Policy overrides
- * @return the WS-RM Policy to be used when communicating with this
endpoint
- */
- public Policy getWsRMPolicy() {
- return wsRMPolicy;
- }
-
- /**
- * Set the WS-RM Policy to be used when communicating with this endpoint
- * @param wsRMPolicy the Policy override
- */
- public void setWsRMPolicy(Policy wsRMPolicy) {
- this.wsRMPolicy = wsRMPolicy;
+ public void setWsRMPolicyKey(String wsRMPolicyKey) {
+ this.wsRMPolicyKey = wsRMPolicyKey;
}
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/Constants.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/Constants.java?view=diff&rev=452934&r1=452933&r2=452934
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/Constants.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/Constants.java
Wed Oct 4 09:55:24 2006
@@ -32,6 +32,6 @@
public static final String SYNAPSE_NAMESPACE =
org.apache.synapse.Constants.SYNAPSE_NAMESPACE;
public static final String NULL_NAMESPACE = "";
- public static final String OUTFLOW_SECURITY = "OutflowSecurity";
- public static final String INFLOW_SECURITY = "InflowSecurity";
+ public static final String RAMPART_POLICY = "rampartPolicy";
+ public static final String SANDESHA_POLICY = "sandeshaPolicy";
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/EndpointFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/EndpointFactory.java?view=diff&rev=452934&r1=452933&r2=452934
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/EndpointFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/EndpointFactory.java
Wed Oct 4 09:55:24 2006
@@ -35,19 +35,8 @@
*
* .. extensibility ..
*
- * <!-- Axis2 Rampart configurations : may be obsolete soon -->
- * <parameter name="OutflowSecurity">
- * ...
- * </parameter>+
- *
- * <!-- Apache Sandesha configurations : may be obsolete soon -->
- * <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";..
- * xmlns:wsrm="http://ws.apache.org/sandesha2/policy"; wsu:Id="RMPolicy">
- * ...
- * </Policy>+
- *
- * <enableRM/>+
- * <enableSec/>+
+ * <enableRM [policy="key"]/>+
+ * <enableSec [policy="key"]/>+
* <enableAddressing/>+
*
* </endpoint>
@@ -91,24 +80,22 @@
new QName(Constants.SYNAPSE_NAMESPACE, "enableSec"));
if (wsSec != null) {
endpoint.setSecurityOn(true);
+ OMAttribute policy = wsSec.getAttribute(
+ new QName(Constants.NULL_NAMESPACE, "policy"));
+ if (policy != null) {
+ endpoint.setWsSecPolicyKey(policy.getAttributeValue());
+ }
}
OMElement wsRm = elem.getFirstChildWithName(
new QName(Constants.SYNAPSE_NAMESPACE, "enableRM"));
if (wsRm != null) {
endpoint.setReliableMessagingOn(true);
+ OMAttribute policy = wsRm.getAttribute(
+ new QName(Constants.NULL_NAMESPACE, "policy"));
+ if (policy != null) {
+ endpoint.setWsRMPolicyKey(policy.getAttributeValue());
+ }
}
-
- // if a Rampart OutflowSecurity parameter is specified, digest it
- endpoint.setOutflowSecurity(
- RampartSecurityBuilder.getSecurityParameter(elem,
Constants.OUTFLOW_SECURITY));
-
- // if a Rampart InflowSecurity parameter is specified, digest it
- endpoint.setInflowSecurity(
- RampartSecurityBuilder.getSecurityParameter(elem,
Constants.INFLOW_SECURITY));
-
- // if WS-RM is enabled, set it as requested
-
//endpoint.setReliableMessagingOn(OutflowRMPolicyBuilder.isRMEnabled(elem));
- endpoint.setWsRMPolicy(OutflowRMPolicyBuilder.getRMPolicy(elem));
return endpoint;
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java?view=diff&rev=452934&r1=452933&r2=452934
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
Wed Oct 4 09:55:24 2006
@@ -19,12 +19,11 @@
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
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.async.Callback;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.ServiceContext;
@@ -36,7 +35,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseException;
import org.apache.neethi.Policy;
+import org.apache.neethi.PolicyEngine;
import javax.xml.namespace.QName;
import java.util.ArrayList;
@@ -59,19 +60,18 @@
*
* @param wsAddressingEnabled
* @param wsSecurityEnabled
- * @param outflowSecurityParameter
+ * @param wsSecPolicyKey
* @param wsRMEnabled
- * @param wsRMPolicy
+ * @param wsRMPolicyKey
* @param synapseOutMessageContext
* @return The Axis2 reponse message context
*/
public static MessageContext send(
boolean wsAddressingEnabled,
boolean wsSecurityEnabled,
- Parameter outflowSecurityParameter,
- Parameter inflowSecurityParameter,
+ String wsSecPolicyKey,
boolean wsRMEnabled,
- Policy wsRMPolicy,
+ String wsRMPolicyKey,
org.apache.synapse.MessageContext synapseOutMessageContext) throws
AxisFault {
MessageContext axisOutMsgCtx =
@@ -112,11 +112,13 @@
Options clientOptions = new Options();
clientOptions.setTransportInProtocol(org.apache.axis2.Constants.TRANSPORT_HTTP);
- // if RM is requested, and if a WS-RM policy is specified, use it
+ // if RM is requested,
if (wsRMEnabled) {
- if (wsRMPolicy != null) {
- axisAnonymousOperation.getPolicyInclude().
- addPolicyElement(PolicyInclude.OPERATION_POLICY,
wsRMPolicy);
+ // if a WS-RM policy is specified, use it
+ if (wsRMPolicyKey != null) {
+ clientOptions.setProperty(
+ org.apache.synapse.config.xml.Constants.SANDESHA_POLICY,
+ getPolicy(synapseOutMessageContext, wsRMPolicyKey));
}
clientOptions.setUseSeparateListener(true);
@@ -126,18 +128,11 @@
// if security is enabled,
if (wsSecurityEnabled) {
- // if a WS-Sec OutflowSecurity parameter is specified, use it
- if (outflowSecurityParameter != null) {
+ // if a WS-Sec policy is specified, use it
+ if (wsSecPolicyKey != null) {
clientOptions.setProperty(
- org.apache.synapse.config.xml.Constants.OUTFLOW_SECURITY,
- outflowSecurityParameter);
- }
-
- // if a WS-Sec InflowSecurity parameter is specified, use it
- if (inflowSecurityParameter != null) {
- clientOptions.setProperty(
- org.apache.synapse.config.xml.Constants.INFLOW_SECURITY,
- inflowSecurityParameter);
+ org.apache.synapse.config.xml.Constants.RAMPART_POLICY,
+ getPolicy(synapseOutMessageContext, wsSecPolicyKey));
}
}
@@ -178,6 +173,27 @@
return response;
}
+ }
+
+ /**
+ * Get the Policy object for the given name from the Synapse configuration
at runtime
+ * @param synCtx the current synapse configuration to get to the synapse
configuration
+ * @param propertyKey the name of the property which holds the Policy
required
+ * @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().getProperty(propertyKey);
+ if (property != null && property instanceof OMElement) {
+ return PolicyEngine.getPolicy((OMElement) property);
+ } else {
+ handleException("Cannot locate Policy from the property : " +
propertyKey);
+ }
+ return null;
+ }
+
+ private static void handleException(String msg) {
+ log.error(msg);
+ throw new SynapseException(msg);
}
/**
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2Sender.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2Sender.java?view=diff&rev=452934&r1=452933&r2=452934
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2Sender.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2Sender.java
Wed Oct 4 09:55:24 2006
@@ -54,19 +54,15 @@
// WS-Sec default is off
(wsSecOn != null && wsSecOn.booleanValue()),
- // The OutflowSecurity Parameter
- (Parameter) synapseInMessageContext.getProperty(
- Constants.OUTFLOW_SEC_PARAMETER),
-
- // The InflowSecurity Parameter
- (Parameter) synapseInMessageContext.getProperty(
- Constants.INFLOW_SEC_PARAMETER),
+ // The Rampart security policy
+ (String) synapseInMessageContext.getProperty(
+ Constants.OUTFLOW_SEC_POLICY),
// WS-RM default is off
(wsRmOn != null && wsRmOn.booleanValue()),
- // The outflow RM Policy (or override)
- (Policy) synapseInMessageContext.getProperty(
+ // The Sandesha security policy
+ (String) synapseInMessageContext.getProperty(
Constants.OUTFLOW_RM_POLICY),
// The Axis2 Message context of the Synapse MC
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java?view=diff&rev=452934&r1=452933&r2=452934
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
Wed Oct 4 09:55:24 2006
@@ -74,10 +74,9 @@
org.apache.axis2.context.MessageContext axisOutMsgContext =
Axis2FlexibleMEPClient.send(
false, false,
- endpoint.getOutflowSecurity(),
- endpoint.getInflowSecurity(),
+ endpoint.getWsSecPolicyKey(),
endpoint.isReliableMessagingOn(),
- endpoint.getWsRMPolicy(),
+ endpoint.getWsRMPolicyKey(),
synCtx);
axisOutMsgContext.setServerSide(true);
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/SendMediator.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/SendMediator.java?view=diff&rev=452934&r1=452933&r2=452934
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/SendMediator.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/SendMediator.java
Wed Oct 4 09:55:24 2006
@@ -93,9 +93,9 @@
if (singleEndpoint.isReliableMessagingOn()) {
synCtx.setProperty(Constants.OUTFLOW_ADDRESSING_ON,
Boolean.TRUE);
synCtx.setProperty(Constants.OUTFLOW_RM_ON, Boolean.TRUE);
- if (singleEndpoint.getWsRMPolicy() != null) {
+ if (singleEndpoint.getWsRMPolicyKey() != null) {
synCtx.setProperty(Constants.OUTFLOW_RM_POLICY,
- singleEndpoint.getWsRMPolicy());
+ singleEndpoint.getWsRMPolicyKey());
}
}
@@ -103,13 +103,9 @@
if (singleEndpoint.isSecurityOn()) {
synCtx.setProperty(Constants.OUTFLOW_ADDRESSING_ON,
Boolean.TRUE);
synCtx.setProperty(Constants.OUTFLOW_SECURITY_ON,
Boolean.TRUE);
- if (singleEndpoint.getOutflowSecurity() != null) {
- synCtx.setProperty(Constants.OUTFLOW_SEC_PARAMETER,
- singleEndpoint.getOutflowSecurity());
- }
- if (singleEndpoint.getInflowSecurity() != null) {
- synCtx.setProperty(Constants.INFLOW_SEC_PARAMETER,
- singleEndpoint.getInflowSecurity());
+ if (singleEndpoint.getWsSecPolicyKey() != null) {
+ synCtx.setProperty(Constants.OUTFLOW_SEC_POLICY,
+ singleEndpoint.getWsSecPolicyKey());
}
}
Modified:
incubator/synapse/trunk/java/modules/core/test-resources/axis2/conf/axis2.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/test-resources/axis2/conf/axis2.xml?view=diff&rev=452934&r1=452933&r2=452934
==============================================================================
---
incubator/synapse/trunk/java/modules/core/test-resources/axis2/conf/axis2.xml
(original)
+++
incubator/synapse/trunk/java/modules/core/test-resources/axis2/conf/axis2.xml
Wed Oct 4 09:55:24 2006
@@ -5,6 +5,15 @@
<parameter name="hotdeployment" locked="false">true</parameter>
<parameter name="hotupdate" locked="false">false</parameter>
<parameter name="enableMTOM" locked="false">false</parameter>
+ <parameter name="enableSwA" locked="false">false</parameter>
+
+ <!--Uncomment if you want to enable file caching for attachments -->
+ <!--parameter name="cacheAttachments" locked="false">true</parameter>
+ <parameter name="attachmentDIR" locked="false"></parameter>
+ <parameter name="sizeThreshold" locked="false">4000</parameter-->
+
+ <!--This will give out the timout of the configuration contexts, in
seconds-->
+ <parameter name="ConfigContextTimeoutInterval"
locked="false">30</parameter>
<!--During a fault, stacktrace can be sent with the fault message. The
following flag will control -->
<!--that behaviour.-->
@@ -18,16 +27,45 @@
<parameter name="Sandesha2StorageManager"
locked="false">inmemory</parameter>
-
- <!--This is the user name and password of admin console-->
<parameter name="userName" locked="false">admin</parameter>
<parameter name="password" locked="false">axis2</parameter>
- <!-- ==================================================== -->
- <parameter name="Sandesha2StorageManager"
locked="false">inmemory</parameter>
- <module ref="synapse"/>
+ <!--Following params will set the proper context paths for invocations.
All the endpoints will have a commons context-->
+ <!--root which can configured using the following contextRoot parameter-->
+ <!--<parameter name="contextRoot" locked="false">axis2</parameter>-->
+
+ <!--Our HTTP endpoints can handle both REST and SOAP. Following parameters
can be used to distingiush those endpoints-->
+ <!--In case of a servlet, if you change this you have to manually change
the settings of your servlet container to map this -->
+ <!--context path to proper Axis2 servlets-->
+ <!--<parameter name="servicePath" locked="false">services</parameter>-->
+ <!--<parameter name="restPath" locked="false">rest</parameter>-->
+
+
+ <!--Set the flag to true if you want to enable transport level session
mangment-->
+ <parameter name="manageTransportSession" locked="false">false</parameter>
+
+ <!--Following two parameters will be used to handle REST in Axis2. The
default settings will make Axis2 to have two-->
+ <!--different endpoints, one for REST (AxisRESTServlet) one for SOAP
message handling (AxisServlet). But following-->
+ <!--parameters help to tweak the message handling of two main servlets. -->
+
+ <!-- If the enableRESTInAxis2MainServlet is true, then Axis2MainServlet
will handle both SOAP and REST messages -->
+ <parameter name="enableRESTInAxis2MainServlet"
locked="true">false</parameter>
+
+ <!-- Following parameter will completely disable REST handling in both the
servlets-->
+ <parameter name="disableREST" locked="true">false</parameter>
+
+ <!-- This will disable the separate servlet we have for REST handling. -->
+ <parameter name="disableSeparateEndpointForREST"
locked="true">false</parameter>
+
+ <!-- If you have a frontend host which exposes this webservice using a
different public URL -->
+ <!-- use this parameter to override autodetected url -->
+ <!--<parameter name="httpFrontendHostUrl"
locked="false">https://someotherhost/context</parameter>-->
- <!-- ==================================================== -->
+
+ <!-- The way of adding listener to the system-->
+ <!-- <listener class="org.apache.axis2.ObserverIMPL">-->
+ <!-- <parameter name="RSS_URL"
locked="false">http://127.0.0.1/rss</parameter>-->
+ <!-- </listener>-->
<!-- ================================================= -->
<!-- Message Receivers -->
@@ -72,10 +110,40 @@
<!-- <parameter name="threadKeepAliveTime"
locked="false">240000</parameter> -->
<!-- <parameter name="threadKeepAliveTimeUnit"
locked="false">MILLISECONDS</parameter> -->
<!--</transportReceiver>-->
+
+ <!--Uncomment this and configure as appropriate for JMS transport support,
after setting up your JMS environment (e.g. ActiveMQ)
+ <transportReceiver name="jms"
class="org.apache.axis2.transport.jms.JMSListener">
+ <parameter name="myTopicConnectionFactory" locked="false">
+ <parameter name="java.naming.factory.initial"
locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url"
locked="false">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName"
locked="false">TopicConnectionFactory</parameter>
+ </parameter>
+
+ <parameter name="myQueueConnectionFactory" locked="false">
+ <parameter name="java.naming.factory.initial"
locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url"
locked="false">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName"
locked="false">QueueConnectionFactory</parameter>
+ </parameter>
+
+ <parameter name="default" locked="false">
+ <parameter name="java.naming.factory.initial"
locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url"
locked="false">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName"
locked="false">QueueConnectionFactory</parameter>
+ </parameter>
+ </transportReceiver>-->
+
+ <!--Uncomment if you want to have SMTP transport support-->
+ <!--<transportReceiver name="mail"
class="org.apache.axis2.transport.mail.SimpleMailListener">-->
+ <!--<parameter name="transport.mail.pop3.host"
locked="false">127.0.0.1</parameter>-->
+ <!--<parameter name="transport.mail.pop3.user"
locked="false">axis2</parameter>-->
+ <!--<parameter name="transport.mail.pop3.password"
locked="false">axis2</parameter>-->
+ <!--<parameter name="transport.mail.pop3.port"
locked="false">110</parameter>-->
+ <!--<parameter name="transport.mail.replyToAddress" locked="false">[EMAIL
PROTECTED]</parameter>-->
+ <!--</transportReceiver>-->
<transportReceiver name="tcp"
class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">6061</parameter>
+ <parameter name="port" locked="false">6060</parameter>
<!--If you want to give your own host address for EPR generation-->
<!--uncommet following paramter , and set as you required.-->
<!--<parameter name="hostname"
locked="false">tcp://myApp.com/ws</parameter>-->
@@ -110,8 +178,6 @@
class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local"
class="org.apache.axis2.transport.local.LocalTransportSender"/>
- <transportSender name="jms"
- class="org.apache.axis2.transport.jms.JMSSender"/>
<!--<transportSender name="http"
class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">-->
<transportSender name="http"
@@ -124,11 +190,33 @@
<parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
<parameter name="Transfer-Encoding" locked="false">chunked</parameter>
</transportSender>
+ <transportSender name="jms"
+ class="org.apache.axis2.transport.jms.JMSSender"/>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP
transport Receiver
+ <transportSender name="mailto"
class="org.apache.axis2.transport.mail.MailTransportSender">
+ <parameter name="transport.mail.smtp.host"
locked="false">127.0.0.1</parameter>
+ <parameter name="transport.mail.smtp.user"
locked="false">axis2</parameter>
+ <parameter name="transport.mail.smtp.password"
locked="false">axis2</parameter>
+ <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
+ </transportSender>
+ -->
+
+ <!-- ================================================= -->
+ <!-- Global Modules -->
+ <!-- ================================================= -->
+ <!-- Comment this to disable Addressing -->
+ <module ref="synapse"/>
+
+ <!--Configuring module , providing parameters for modules whether they
refer or not-->
+ <!--<moduleConfig name="addressing">-->
+ <!--<parameter name="addressingPara" locked="false">N/A</parameter>-->
+ <!--</moduleConfig>-->
<!-- ================================================= -->
<!-- Phases -->
<!-- ================================================= -->
- <phaseOrder type="inflow">
+ <phaseOrder type="InFlow">
<!-- System pre defined phases -->
<phase name="Transport">
<handler name="RequestURIBasedDispatcher"
@@ -154,26 +242,27 @@
</handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
+ <order phase="Dispatch"/>
</handler>
</phase>
<!-- System pre defined phases -->
<phase name="RMPhase"/>
- <phase name="MUPhase"/>
+ <phase name="MUPhase"/> <!-- Must Understand Header processing
phase -->
<!-- After Postdispatch phase module author or or service author can
add any phase he want -->
<phase name="OperationInPhase"/>
</phaseOrder>
- <phaseOrder type="outflow">
+ <phaseOrder type="OutFlow">
<!-- user can add his own phases to this area -->
- <phase name="MUPhase"/>
+ <phase name="MUPhase"/> <!-- Must Understand Header processing phase
-->
<phase name="RMPhase"/>
<phase name="OperationOutPhase"/>
<!--system predefined phase-->
<!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
+ <phase name="Security"/>
</phaseOrder>
- <phaseOrder type="INfaultflow">
+ <phaseOrder type="InFaultFlow">
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
@@ -202,12 +291,12 @@
</phase>
<!-- user can add his own phases to this area -->
<phase name="RMPhase"/>
- <phase name="MUPhase"/>
+ <phase name="MUPhase"/> <!-- Must Understand Header processing phase
-->
<phase name="OperationInFaultPhase"/>
</phaseOrder>
- <phaseOrder type="Outfaultflow">
+ <phaseOrder type="OutFaultFlow">
<!-- user can add his own phases to this area -->
- <phase name="MUPhase"/>
+ <phase name="MUPhase"/> <!-- Must Understand Header processing phase
-->
<phase name="RMPhase"/>
<phase name="OperationOutFaultPhase"/>
<phase name="PolicyDetermination"/>
Modified: incubator/synapse/trunk/java/project.properties
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/project.properties?view=diff&rev=452934&r1=452933&r2=452934
==============================================================================
--- incubator/synapse/trunk/java/project.properties (original)
+++ incubator/synapse/trunk/java/project.properties Wed Oct 4 09:55:24 2006
@@ -48,7 +48,6 @@
axis.wsdl4j.version=1.2
wss4j.version=SNAPSHOT
xmlsec.version=1.3.0
-secpolicy.version=SNAPSHOT
wsdl4j.version=1.5.2
axis2.version=SNAPSHOT
woden.version=SNAPSHOT
Modified: incubator/synapse/trunk/java/project.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/project.xml?view=diff&rev=452934&r1=452933&r2=452934
==============================================================================
--- incubator/synapse/trunk/java/project.xml (original)
+++ incubator/synapse/trunk/java/project.xml Wed Oct 4 09:55:24 2006
@@ -109,7 +109,16 @@
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-secpolicy</artifactId>
- <version>${secpolicy.version}</version>
+ <version>${axis2.version}</version>
+ <properties>
+ <module>false</module>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-security</artifactId>
+ <version>${axis2.version}</version>
<properties>
<module>false</module>
</properties>
Modified: incubator/synapse/trunk/java/repository/conf/axis2.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/repository/conf/axis2.xml?view=diff&rev=452934&r1=452933&r2=452934
==============================================================================
--- incubator/synapse/trunk/java/repository/conf/axis2.xml (original)
+++ incubator/synapse/trunk/java/repository/conf/axis2.xml Wed Oct 4 09:55:24
2006
@@ -67,8 +67,6 @@
<!-- <parameter name="RSS_URL"
locked="false">http://127.0.0.1/rss</parameter>-->
<!-- </listener>-->
- <parameter name="Sandesha2StorageManager"
locked="false">inmemory</parameter>
-
<!-- ================================================= -->
<!-- Message Receivers -->
<!-- ================================================= -->
@@ -111,6 +109,28 @@
<!-- <parameter name="RequestMaxThreadPoolSize"
locked="false">100</parameter> -->
<!-- <parameter name="threadKeepAliveTime"
locked="false">240000</parameter> -->
<!-- <parameter name="threadKeepAliveTimeUnit"
locked="false">MILLISECONDS</parameter> -->
+ <!--</transportReceiver>-->
+
+ <!--Uncomment this and configure as appropriate for JMS transport support,
after setting up your JMS environment (e.g. ActiveMQ)
+ <transportReceiver name="jms"
class="org.apache.axis2.transport.jms.JMSListener">
+ <parameter name="myTopicConnectionFactory" locked="false">
+ <parameter name="java.naming.factory.initial"
locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url"
locked="false">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName"
locked="false">TopicConnectionFactory</parameter>
+ </parameter>
+
+ <parameter name="myQueueConnectionFactory" locked="false">
+ <parameter name="java.naming.factory.initial"
locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url"
locked="false">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName"
locked="false">QueueConnectionFactory</parameter>
+ </parameter>
+
+ <parameter name="default" locked="false">
+ <parameter name="java.naming.factory.initial"
locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url"
locked="false">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName"
locked="false">QueueConnectionFactory</parameter>
+ </parameter>
+ </transportReceiver>-->
<!--Uncomment if you want to have SMTP transport support-->
<!--<transportReceiver name="mail"
class="org.apache.axis2.transport.mail.SimpleMailListener">-->
@@ -197,7 +217,7 @@
<!-- ================================================= -->
<!-- Phases -->
<!-- ================================================= -->
- <phaseOrder type="inflow">
+ <phaseOrder type="InFlow">
<!-- System pre defined phases -->
<phase name="Transport">
<handler name="RequestURIBasedDispatcher"
@@ -232,7 +252,7 @@
<!-- After Postdispatch phase module author or or service author can
add any phase he want -->
<phase name="OperationInPhase"/>
</phaseOrder>
- <phaseOrder type="outflow">
+ <phaseOrder type="OutFlow">
<!-- user can add his own phases to this area -->
<phase name="MUPhase"/> <!-- Must Understand Header processing phase
-->
<phase name="RMPhase"/>
@@ -243,7 +263,7 @@
<phase name="MessageOut"/>
<phase name="Security"/>
</phaseOrder>
- <phaseOrder type="INfaultflow">
+ <phaseOrder type="InFaultFlow">
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
@@ -275,7 +295,7 @@
<phase name="MUPhase"/> <!-- Must Understand Header processing phase
-->
<phase name="OperationInFaultPhase"/>
</phaseOrder>
- <phaseOrder type="Outfaultflow">
+ <phaseOrder type="OutFaultFlow">
<!-- user can add his own phases to this area -->
<phase name="MUPhase"/> <!-- Must Understand Header processing phase
-->
<phase name="RMPhase"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
