Author: asankha
Date: Mon Sep 25 04:06:25 2006
New Revision: 449647
URL: http://svn.apache.org/viewvc?view=rev&rev=449647
Log:
update to latest neethi (policy) changes, still need to update endpoints to
support new policies
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/OutflowRMPolicyBuilder.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/SynapseEnvironment.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/Axis2MessageContext.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/Axis2SynapseEnvironment.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyService.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseModule.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/metrics/MetricsAggregatorModule.java
incubator/synapse/trunk/java/modules/core/test-resources/axis2/conf/axis2.xml
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPListener.java
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPSender.java
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/Axis2AsyncWebProcessor.java
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=449647&r1=449646&r2=449647
==============================================================================
---
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
Mon Sep 25 04:06:25 2006
@@ -35,6 +35,9 @@
/** The name used to denote the Axis2 Parameter specifying the Synapse
configuration */
String SYNAPSE_CONFIGURATION = "SynapseConfiguration";
+ /** The name used to denote the SynapseEnvironment implementation class */
+ String SYNAPSE_ENV_IMPL = "SynapseEnvironmentImpl";
+
/** The system property used to specify/override the synapse configuration
XML location */
String SYNAPSE_XML = "synapse.xml";
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=449647&r1=449646&r2=449647
==============================================================================
---
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
Mon Sep 25 04:06:25 2006
@@ -16,7 +16,7 @@
package org.apache.synapse.config;
import org.apache.axis2.description.Parameter;
-import org.apache.ws.policy.Policy;
+import org.apache.neethi.Policy;
import java.net.URL;
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/OutflowRMPolicyBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/OutflowRMPolicyBuilder.java?view=diff&rev=449647&r1=449646&r2=449647
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/OutflowRMPolicyBuilder.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/OutflowRMPolicyBuilder.java
Mon Sep 25 04:06:25 2006
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseException;
-import org.apache.ws.policy.Policy;
+import org.apache.neethi.Policy;
import org.apache.ws.policy.util.OMPolicyReader;
import org.apache.ws.policy.util.PolicyFactory;
import org.apache.ws.policy.util.PolicyReader;
@@ -62,7 +62,8 @@
PolicyReader reader =
PolicyFactory.getPolicyReader(PolicyFactory.OM_POLICY_READER);
try {
URL url = new URL(policyUrl.getAttributeValue());
- return reader.readPolicy(url.openStream());
+ // TODO fix this return
reader.readPolicy(url.openStream());
+ return null;
} catch (MalformedURLException e) {
handleException("Invalid policy URL : " +
policyUrl.getAttributeValue(), e);
} catch (IOException e) {
@@ -73,7 +74,8 @@
new QName(org.apache.axis2.namespace.Constants.URI_POLICY,
"Policy"));
if (policy != null) {
OMPolicyReader reader = (OMPolicyReader)
PolicyFactory.getPolicyReader(PolicyFactory.OM_POLICY_READER);
- return reader.readPolicy(policy);
+ // TODO fix this return reader.readPolicy(policy);
+ return null;
}
}
return null;
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/SynapseEnvironment.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/SynapseEnvironment.java?view=diff&rev=449647&r1=449646&r2=449647
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/SynapseEnvironment.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/SynapseEnvironment.java
Mon Sep 25 04:06:25 2006
@@ -31,11 +31,6 @@
public void injectMessage(MessageContext smc);
/**
- * Mediators may get access to the relevant classloader through this
- */
- public ClassLoader getClassLoader();
-
- /**
* This method allows a message to be sent through the underlying SOAP
engine.
* <p/>
* This will send request messages on (forward), and send the response
messages back to the client
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=449647&r1=449646&r2=449647
==============================================================================
---
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
Mon Sep 25 04:06:25 2006
@@ -36,7 +36,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Constants;
-import org.apache.ws.policy.Policy;
+import org.apache.neethi.Policy;
import javax.xml.namespace.QName;
import java.util.ArrayList;
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2MessageContext.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2MessageContext.java?view=diff&rev=449647&r1=449646&r2=449647
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2MessageContext.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2MessageContext.java
Mon Sep 25 04:06:25 2006
@@ -16,6 +16,7 @@
package org.apache.synapse.core.axis2;
import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.axiom.om.impl.llom.OMTextImpl;
import org.apache.axiom.om.impl.llom.OMElementImpl;
@@ -303,6 +304,37 @@
private static void handleException(String msg) {
log.error(msg);
throw new SynapseException(msg);
+ }
+
+ public String toString() {
+ StringBuffer sb = new StringBuffer();
+ String separator = "\n";
+
+ if (getTo() != null)
+ sb.append("To: " + getTo().getAddress());
+ else
+ sb.append("To: ");
+ if (getFrom() != null)
+ sb.append(separator + "From: " + getFrom().getAddress());
+ if (getWSAAction() != null)
+ sb.append(separator + "WSAction: " + getWSAAction());
+ if (getSoapAction() != null)
+ sb.append(separator + "SOAPAction: " + getSoapAction());
+ if (getReplyTo() != null)
+ sb.append(separator + "ReplyTo: " + getReplyTo().getAddress());
+ if (getMessageID() != null)
+ sb.append(separator + "MessageID: " + getMessageID());
+
+ Iterator iter = getEnvelope().getHeader().examineAllHeaderBlocks();
+ if (iter.hasNext()) {
+ sb.append(separator + "Headers : ");
+ while (iter.hasNext()) {
+ SOAPHeader header = (SOAPHeader) iter.next();
+ sb.append(separator + header.getLocalName() + " : " +
header.getText());
+ }
+ }
+
+ return sb.toString();
}
public static void setErrorInformation(MessageContext synCtx,
SynapseException e) {
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=449647&r1=449646&r2=449647
==============================================================================
---
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
Mon Sep 25 04:06:25 2006
@@ -24,7 +24,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Constants;
import org.apache.synapse.SynapseException;
-import org.apache.ws.policy.Policy;
+import org.apache.neethi.Policy;
import java.util.Iterator;
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java?view=diff&rev=449647&r1=449646&r2=449647
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
Mon Sep 25 04:06:25 2006
@@ -17,6 +17,8 @@
package org.apache.synapse.core.axis2;
import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.util.threadpool.ThreadFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.MessageContext;
@@ -27,33 +29,25 @@
*/
public class Axis2SynapseEnvironment implements SynapseEnvironment {
- private ClassLoader cl = null;
- /** If synapse is initialized by the SynapseAxis2Interceptor, the Axis2
- * class loaders were not initialized properly at init time. Hence in such
- * a case, the axisCfg would be set to refer to the Axis configuration
- * from which the correct and properly initialized classloader could be
picked
- * up at runtime. This would be used only if the explicit classloader
referrenced
- * by "cl" is null (i.e. has not been set) and the axisCfg is available.
- */
- private AxisConfiguration axisCfg = null;
private static final Log log =
LogFactory.getLog(Axis2SynapseEnvironment.class);
- public Axis2SynapseEnvironment() {
- super();
- }
+ private ConfigurationContext cfgCtx = null;
+ private ThreadFactory threadFactory = null;
- public Axis2SynapseEnvironment(ClassLoader cl) {
- super();
- this.cl = cl;
- }
+ public Axis2SynapseEnvironment() {}
- public Axis2SynapseEnvironment(AxisConfiguration axisCfg) {
- super();
- this.axisCfg = axisCfg;
+ public Axis2SynapseEnvironment(ConfigurationContext cfgCtx) {
+ this.cfgCtx = cfgCtx;
+ threadFactory = cfgCtx.getThreadPool();
}
- public void injectMessage(MessageContext synCtx) {
+ public void injectMessage(final MessageContext synCtx) {
synCtx.setEnvironment(this);
+ /*threadFactory.execute(new Runnable() {
+ public void run() {
+ synCtx.getConfiguration().getMainMediator().mediate(synCtx);
+ }
+ });*/
synCtx.getConfiguration().getMainMediator().mediate(synCtx);
}
@@ -62,19 +56,6 @@
Axis2Sender.sendBack(synCtx);
else
Axis2Sender.sendOn(synCtx);
- }
-
- public ClassLoader getClassLoader() {
- if (cl != null) {
- return cl;
- } else if (axisCfg != null) {
- axisCfg.getServiceClassLoader();
- }
- return null;
- }
-
- public void setClassLoader(ClassLoader cl) {
- this.cl = cl;
}
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyService.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyService.java?view=diff&rev=449647&r1=449646&r2=449647
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyService.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyService.java
Mon Sep 25 04:06:25 2006
@@ -20,7 +20,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.description.*;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.transport.njms.JMSConstants;
+import org.apache.axis2.transport.jms.JMSConstants;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseModule.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseModule.java?view=diff&rev=449647&r1=449646&r2=449647
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseModule.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseModule.java
Mon Sep 25 04:06:25 2006
@@ -26,61 +26,64 @@
import org.apache.synapse.SynapseException;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.config.SynapseConfigurationBuilder;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.Policy;
import javax.xml.namespace.QName;
import java.util.Iterator;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
-public class SynapseModule implements Module, Constants {
+/**
+ * This is the Synapse Module implementation class, which would initialize
Synapse when it is
+ * deployed onto an Axis2 configuration.
+ */
+public class SynapseModule implements Module {
+
+ private static final Log log = LogFactory.getLog(SynapseModule.class);
private static final String SYNAPSE_SERVICE_NAME = "synapse";
private static final QName MEDIATE_OPERATION_Q_NAME = new QName("mediate");
- private static final Log log = LogFactory.getLog(SynapseModule.class);
-
public void init(ConfigurationContext configurationContext,
AxisModule axisModule) throws AxisFault {
- log.info("Initializing Synapse ..");
+ log.info("Deploying the Synapse service..");
- // Dynamically initialize the Empty Synapse Service
+ // Dynamically initialize the Synapse Service and deploy it into Axis2
AxisConfiguration axisCfg =
configurationContext.getAxisConfiguration();
AxisService synapseService = new AxisService(SYNAPSE_SERVICE_NAME);
- AxisOperation mediateOperation =
- new InOutAxisOperation(MEDIATE_OPERATION_Q_NAME);
+ AxisOperation mediateOperation = new
InOutAxisOperation(MEDIATE_OPERATION_Q_NAME);
mediateOperation.setMessageReceiver(new SynapseMessageReceiver());
synapseService.addOperation(mediateOperation);
axisCfg.addService(synapseService);
- // Initializing the SynapseEnvironment For Synapse to work
- log.info("Initializing Synapse Environment ...");
-
- SynapseConfiguration synCfg =
- initializeSynapseConfigurationBuilder(axisCfg);
-
- log.info("Initializing Proxy services...");
- if (synCfg == null) {
- handleException("SynapseConfiguration wouldn't initialize");
- } else {
- Iterator iter = synCfg.getProxyServices().iterator();
- while (iter.hasNext()) {
- ProxyService proxy = (ProxyService) iter.next();
- axisCfg.addService(proxy.buildAxisService(synCfg, axisCfg));
- }
+ // Initializing the SynapseEnvironment and SynapseConfiguration
+ log.info("Initializing the Synapse configuration ...");
+ SynapseConfiguration synCfg = initializeSynapse(configurationContext);
+
+ log.info("Deploying Proxy services...");
+ Iterator iter = synCfg.getProxyServices().iterator();
+ while (iter.hasNext()) {
+ ProxyService proxy = (ProxyService) iter.next();
+ axisCfg.addService(proxy.buildAxisService(synCfg, axisCfg));
}
- log.info("Synapse initialized...!");
+ log.info("Synapse initialized successfully...!");
}
- private static SynapseConfiguration initializeSynapseConfigurationBuilder(
- AxisConfiguration axisConfiguration) {
+ private static SynapseConfiguration initializeSynapse(
+ ConfigurationContext cfgCtx) {
+
+ AxisConfiguration axisConfiguration = cfgCtx.getAxisConfiguration();
+
/*
First check, if synapse.xml URL is provided as a system property, if
so use it..
else check if synapse.xml location is available from the axis2.xml
- SynapseConfiguration else use the default config
+ "SynapseConfiguration" else use the default config
*/
SynapseConfiguration synapseConfiguration;
- Parameter configParam =
- axisConfiguration.getParameter(SYNAPSE_CONFIGURATION);
+ Parameter configParam =
axisConfiguration.getParameter(Constants.SYNAPSE_CONFIGURATION);
String config = System.getProperty(Constants.SYNAPSE_XML);
@@ -91,24 +94,45 @@
SynapseConfigurationBuilder.getConfiguration(config);
} else if (configParam != null) {
log.info(
- "Synapse.xml is available via SynapseConfiguration in
Axis2.xml");
+ "Synapse configuration is available via the " +
+ "'SynapseConfiguration' parameter in axis2.xml");
synapseConfiguration = SynapseConfigurationBuilder
.getConfiguration(configParam.getValue().toString().trim());
} else {
log.warn("System property '" + Constants.SYNAPSE_XML +
- "' is not specified or SynapseConfiguration Parameter " +
- "is not available via Axis2.xml. Thus, Using default
configuration");
+ "' is not specified or 'SynapseConfiguration' Parameter "
+
+ "is not available via axis2.xml. Using default
configuration..");
synapseConfiguration =
SynapseConfigurationBuilder.getDefaultConfiguration();
}
// set the Synapse configuration and environment into the Axis2
configuration
- Parameter synapseCtxParam = new Parameter(SYNAPSE_CONFIG, null);
+ Parameter synapseCtxParam = new Parameter(Constants.SYNAPSE_CONFIG,
null);
synapseCtxParam.setValue(synapseConfiguration);
- Parameter synapseEnvParam = new Parameter(SYNAPSE_ENV, null);
- synapseEnvParam
- .setValue(new Axis2SynapseEnvironment(axisConfiguration));
+ Parameter synapseEnvParam = new Parameter(Constants.SYNAPSE_ENV, null);
+
+ Parameter synEnvImpl =
axisConfiguration.getParameter(Constants.SYNAPSE_ENV_IMPL);
+ if (synEnvImpl != null && synEnvImpl.getValue() != null) {
+ String clazz = (String) synEnvImpl.getValue();
+ try {
+ Constructor constr =
Class.forName(clazz).getDeclaredConstructor(
+ new Class [] {ConfigurationContext.class});
+ synapseEnvParam.setValue(constr.newInstance(new Object[]
{cfgCtx}));
+ } catch (ClassNotFoundException e) {
+ handleException("Cannot find Synapse environment
implementation : " + clazz, e);
+ } catch (NoSuchMethodException e) {
+ handleException("Cannot find Synapse environment constructor :
" + clazz, e);
+ } catch (IllegalAccessException e) {
+ handleException("Error instantiating Synapse environment with
: " + clazz, e);
+ } catch (InvocationTargetException e) {
+ handleException("Error invoking constructor of Synapse
environment : " + clazz, e);
+ } catch (InstantiationException e) {
+ handleException("Error instantiating Synapse environment with
: " + clazz, e);
+ }
+ } else {
+ synapseEnvParam.setValue(new Axis2SynapseEnvironment(cfgCtx));
+ }
try {
axisConfiguration.addParameter(synapseCtxParam);
@@ -116,8 +140,8 @@
} catch (AxisFault e) {
String msg =
- "Could not set parameters '" + SYNAPSE_CONFIG +
- "' and/or '" + SYNAPSE_ENV +
+ "Could not set parameters '" + Constants.SYNAPSE_CONFIG +
+ "' and/or '" + Constants.SYNAPSE_ENV +
"'to the Axis2 configuration : " + e.getMessage();
log.fatal(msg, e);
throw new SynapseException(msg, e);
@@ -130,13 +154,21 @@
// FixMe
}
+ public boolean canSupportAssertion(Assertion assertion) {
+ return false;
+ }
+
+ public void applyPolicy(Policy policy, AxisDescription axisDescription)
throws AxisFault {
+ // no implementation
+ }
+
public void shutdown(ConfigurationContext configurationContext)
throws AxisFault {
// FixMe
}
- private void handleException(String msg) {
- log.error(msg);
- throw new SynapseException(msg);
+ private static void handleException(String msg, Exception e) {
+ log.error(msg, e);
+ throw new SynapseException(msg, e);
}
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/metrics/MetricsAggregatorModule.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/metrics/MetricsAggregatorModule.java?view=diff&rev=449647&r1=449646&r2=449647
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/metrics/MetricsAggregatorModule.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/metrics/MetricsAggregatorModule.java
Mon Sep 25 04:06:25 2006
@@ -22,6 +22,8 @@
import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.modules.Module;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.Policy;
/*
*
*/
@@ -40,6 +42,14 @@
}
public void engageNotify(AxisDescription axisDescription) throws AxisFault
{}
+
+ public boolean canSupportAssertion(Assertion assertion) {
+ return false;
+ }
+
+ public void applyPolicy(Policy policy, AxisDescription axisDescription)
throws AxisFault {
+ // no implementation
+ }
// shutdown the module
public void shutdown(ConfigurationContext configurationContext) throws
AxisFault {}
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=449647&r1=449646&r2=449647
==============================================================================
---
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
Mon Sep 25 04:06:25 2006
@@ -82,7 +82,7 @@
</transportReceiver>
<!--Uncomment this for JMS after setting up your JMS environment (e.g.
ActiveMQ)
- <transportReceiver name="jms"
class="org.apache.axis2.transport.njms.JMSListener">
+ <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>
@@ -111,7 +111,7 @@
<transportSender name="local"
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="jms"
- class="org.apache.axis2.transport.njms.JMSSender"/>
+ class="org.apache.axis2.transport.jms.JMSSender"/>
<!--<transportSender name="http"
class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">-->
<transportSender name="http"
Modified:
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPListener.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPListener.java?view=diff&rev=449647&r1=449646&r2=449647
==============================================================================
---
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPListener.java
(original)
+++
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPListener.java
Mon Sep 25 04:06:25 2006
@@ -27,7 +27,6 @@
import org.apache.commons.logging.LogFactory;
import org.safehaus.asyncweb.container.basic.BasicServiceContainer;
import org.safehaus.asyncweb.container.ContainerLifecycleException;
-import org.safehaus.asyncweb.transport.nio.NIOTransport;
import org.safehaus.asyncweb.transport.nio.HttpIOHandler;
import javax.xml.namespace.QName;
Modified:
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPSender.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPSender.java?view=diff&rev=449647&r1=449646&r2=449647
==============================================================================
---
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPSender.java
(original)
+++
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/AsyncHTTPSender.java
Mon Sep 25 04:06:25 2006
@@ -138,6 +138,22 @@
HttpResponse response = request.createHttpResponse();
response.setStatus(ResponseStatus.OK);
+
+ String contentType;
+ Object contentTypeObject =
msgContext.getProperty(Constants.Configuration.CONTENT_TYPE);
+ if (contentTypeObject != null) {
+ contentType = (String) contentTypeObject;
+ } else if (msgContext.isDoingREST()) {
+ contentType = HTTPConstants.MEDIA_TYPE_APPLICATION_XML;
+ } else {
+ contentType = format.getContentType();
+ format.setSOAP11(msgContext.isSOAP11());
+ }
+
+ response.setHeader("Content-Type:",
+ contentType + "; charset=" + format.getCharSetEncoding());
+ //response.setHeader("Content-Type:", "text/xml; charset=UTF-8");
+
OutputStream out = response.getOutputStream();
format.setDoOptimize(msgContext.isDoingMTOM());
Modified:
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/Axis2AsyncWebProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/Axis2AsyncWebProcessor.java?view=diff&rev=449647&r1=449646&r2=449647
==============================================================================
---
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/Axis2AsyncWebProcessor.java
(original)
+++
incubator/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/Axis2AsyncWebProcessor.java
Mon Sep 25 04:06:25 2006
@@ -23,11 +23,11 @@
import org.apache.axis2.Constants;
import org.apache.axis2.AxisFault;
import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.transport.njms.DefaultThreadFactory;
import org.apache.axis2.transport.http.HTTPTransportUtils;
import org.apache.axis2.transport.http.HTTPTransportReceiver;
import org.apache.axis2.transport.http.server.SessionManager;
import org.apache.axis2.util.UUIDGenerator;
+import org.apache.axis2.util.threadpool.DefaultThreadFactory;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.AxisService;
@@ -181,7 +181,7 @@
} else if (HttpMethod.POST.equals(request.getMethod())) {
processPost(response);
- // Finalize response
+ /*// Finalize response
OperationContext operationContext =
msgContext.getOperationContext();
Object contextWritten = null;
if (operationContext != null) {
@@ -196,7 +196,7 @@
response.setStatus(ResponseStatus.ACCEPTED);
}
request.commitResponse(response);
- }
+ }*/
} else {
handleException("Unsupported method : " + request.getMethod(),
null, response);
Modified: incubator/synapse/trunk/java/project.properties
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/project.properties?view=diff&rev=449647&r1=449646&r2=449647
==============================================================================
--- incubator/synapse/trunk/java/project.properties (original)
+++ incubator/synapse/trunk/java/project.properties Mon Sep 25 04:06:25 2006
@@ -48,6 +48,7 @@
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=449647&r1=449646&r2=449647
==============================================================================
--- incubator/synapse/trunk/java/project.xml (original)
+++ incubator/synapse/trunk/java/project.xml Mon Sep 25 04:06:25 2006
@@ -107,6 +107,15 @@
</dependency>
<dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-secpolicy</artifactId>
+ <version>${secpolicy.version}</version>
+ <properties>
+ <module>false</module>
+ </properties>
+ </dependency>
+
+ <dependency>
<groupId>xml-security</groupId>
<artifactId>xmlsec</artifactId>
<version>${xmlsec.version}</version>
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=449647&r1=449646&r2=449647
==============================================================================
--- incubator/synapse/trunk/java/repository/conf/axis2.xml (original)
+++ incubator/synapse/trunk/java/repository/conf/axis2.xml Mon Sep 25 04:06:25
2006
@@ -83,7 +83,7 @@
</transportReceiver>
<!--Uncomment this for JMS after setting up your JMS environment (e.g.
ActiveMQ)
- <transportReceiver name="jms"
class="org.apache.axis2.transport.njms.JMSListener">
+ <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>
@@ -112,7 +112,7 @@
<transportSender name="local"
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="jms"
- class="org.apache.axis2.transport.njms.JMSSender"/>
+ class="org.apache.axis2.transport.jms.JMSSender"/>
<!--<transportSender name="http"
class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">-->
<transportSender name="http"
@@ -160,13 +160,13 @@
</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">
<!-- 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-->
@@ -203,12 +203,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">
<!-- 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"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
