Author: asankha
Date: Wed Nov 1 03:24:38 2006
New Revision: 469861
URL: http://svn.apache.org/viewvc?view=rev&rev=469861
Log:
minor fixes to support actual serialization of configuration to disk
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/SynapseConfiguration.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/SynapseConfigurationBuilder.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/EndpointSerializer.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/PropertySerializer.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ProxyServiceFactory.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/XMLConfigurationSerializer.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyService.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/SynapseConfiguration.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/SynapseConfiguration.java?view=diff&rev=469861&r1=469860&r2=469861
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/SynapseConfiguration.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/SynapseConfiguration.java
Wed Nov 1 03:24:38 2006
@@ -64,11 +64,30 @@
* This is the "main" (or default) synapse mediator which mediates each
and every message
* It could/would hold a Mediator object or a Property (if loaded from a
registry)
*/
- private Object mainMediator = null;
-
+ private Object mainMediator = null;
+
/** Hold reference to the Axis2 ConfigurationContext */
private ConfigurationContext configContext = null;
+ /** Save the path to the configuration file loaded, to save it later */
+ private String pathToConfigFile = null;
+
+ /**
+ * The path to the currently loaded configuration file
+ * @return file path to synapse.xml
+ */
+ public String getPathToConfigFile() {
+ return pathToConfigFile;
+ }
+
+ /**
+ * Set the path to the loaded synapse.xml
+ * @param pathToConfigFile path to the synapse.xml loaded
+ */
+ public void setPathToConfigFile(String pathToConfigFile) {
+ this.pathToConfigFile = pathToConfigFile;
+ }
+
/**
* Add a named mediator into this configuration
* @param name the name for the sequence
@@ -170,7 +189,7 @@
} catch (XMLStreamException e) {
handleException("Can not load the source property : "
+ value.getName());
}
- }
+ }
globalProps.put(name, value);
}
} else {
@@ -409,8 +428,8 @@
*/
public Map getRegistries() {
return registryMap;
- }
-
+ }
+
/**
* Set the Axis2 ConfigurationContext to the SynapseConfiguration
* @param configContext
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/SynapseConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/SynapseConfigurationBuilder.java?view=diff&rev=469861&r1=469860&r2=469861
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/SynapseConfigurationBuilder.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/SynapseConfigurationBuilder.java
Wed Nov 1 03:24:38 2006
@@ -25,6 +25,7 @@
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import java.io.File;
/**
* Builds a Synapse Configuration model with a given input (e.g. XML,
programmatic creation, default etc)
@@ -58,6 +59,7 @@
try {
SynapseConfiguration synCfg =
XMLConfigurationBuilder.getConfiguration(new FileInputStream(configFile));
log.info("Loaded Synapse configuration from : " + configFile);
+ synCfg.setPathToConfigFile(new File(configFile).getAbsolutePath());
return synCfg;
} catch (FileNotFoundException fnf) {
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/EndpointSerializer.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/EndpointSerializer.java?view=diff&rev=469861&r1=469860&r2=469861
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/EndpointSerializer.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/EndpointSerializer.java
Wed Nov 1 03:24:38 2006
@@ -57,6 +57,8 @@
public static OMElement serializeEndpoint(Endpoint endpt, OMElement
parent) {
OMElement endpoint = fac.createOMElement("endpoint", synNS);
+ endpoint.addAttribute(fac.createOMAttribute(
+ "name", nullNS, endpt.getName()));
if (endpt.getAddress() != null) {
endpoint.addAttribute(fac.createOMAttribute(
"address", nullNS, endpt.getAddress()));
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/PropertySerializer.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/PropertySerializer.java?view=diff&rev=469861&r1=469860&r2=469861
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/PropertySerializer.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/PropertySerializer.java
Wed Nov 1 03:24:38 2006
@@ -43,11 +43,11 @@
*/
public static OMElement serializeProperty(Property property, OMElement
parent) {
- OMElement propertyElement = fac.createOMElement("property", synNS);
+ OMElement propertyElement = fac.createOMElement("set-property", synNS);
propertyElement.addAttribute(fac.createOMAttribute(
"name", nullNS, property.getName()));
- propertyElement.addAttribute(fac.createOMAttribute(
- "type", nullNS, "" + property.getType()));
+// propertyElement.addAttribute(fac.createOMAttribute(
+// "type", nullNS, "" + property.getType()));
if (property.getType() == Property.DYNAMIC_TYPE) {
propertyElement.addAttribute(fac.createOMAttribute(
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ProxyServiceFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ProxyServiceFactory.java?view=diff&rev=469861&r1=469860&r2=469861
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ProxyServiceFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ProxyServiceFactory.java
Wed Nov 1 03:24:38 2006
@@ -107,15 +107,11 @@
Object o = policies.next();
if (o instanceof OMElement) {
OMElement policy = (OMElement) o;
- OMAttribute url = policy.getAttribute(new
QName(Constants.NULL_NAMESPACE, "key"));
- if (url != null) {
- try {
- proxy.addServiceLevelPoliciy(new
URL(url.getAttributeValue()));
- } catch (MalformedURLException e) {
- handleException("Invalid policy URL : " +
url.getAttributeValue());
- }
+ OMAttribute key = policy.getAttribute(new
QName(Constants.NULL_NAMESPACE, "key"));
+ if (key != null) {
+ proxy.addServiceLevelPoliciy(key.getAttributeValue());
} else {
- handleException("Policy element does not specify the
policy URL");
+ handleException("Policy element does not specify the
policy key");
}
} else {
handleException("Invalid 'policy' element found under element
'policies'");
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/XMLConfigurationSerializer.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/XMLConfigurationSerializer.java?view=diff&rev=469861&r1=469860&r2=469861
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/XMLConfigurationSerializer.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/XMLConfigurationSerializer.java
Wed Nov 1 03:24:38 2006
@@ -104,20 +104,20 @@
String endpointName = (String) iter.next();
Object endpt = synCfg.getNamedEndpoint(endpointName);
- OMElement endpoint = fac.createOMElement("endpoint", synNS);
if (endpt instanceof Property) {
+ OMElement endpoint = fac.createOMElement("endpoint", synNS);
Property dp = (Property) endpt;
endpoint.addAttribute(fac.createOMAttribute(
"name", nullNS, endpointName));
endpoint.addAttribute(fac.createOMAttribute(
"key", nullNS, dp.getKey()));
+ definitions.addChild(endpoint);
} else if (endpt instanceof Endpoint) {
EndpointSerializer.serializeEndpoint((Endpoint) endpt,
definitions);
} else {
handleException("Invalid endpoint. Type : " +
endpt.getClass());
}
- definitions.addChild(endpoint);
}
}
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=469861&r1=469860&r2=469861
==============================================================================
---
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
Wed Nov 1 03:24:38 2006
@@ -28,9 +28,8 @@
import org.apache.synapse.SynapseException;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.config.Util;
-import org.apache.ws.policy.Policy;
-import org.apache.ws.policy.util.PolicyFactory;
-import org.apache.ws.policy.util.PolicyReader;
+import org.apache.neethi.PolicyEngine;
+import org.apache.neethi.Policy;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
@@ -174,28 +173,26 @@
}
// if service level policies are specified, apply them
- /*if (!serviceLevelPolicies.isEmpty()) {
- PolicyReader reader =
PolicyFactory.getPolicyReader(PolicyFactory.OM_POLICY_READER);
+ if (!serviceLevelPolicies.isEmpty()) {
+
Policy svcEffectivePolicy = null;
- String policyKey;
iter = serviceLevelPolicies.iterator();
while (iter.hasNext()) {
- policyKey = (String) iter.next();
+ String policyKey = (String) iter.next();
if (svcEffectivePolicy == null) {
- svcEffectivePolicy = reader.readPolicy(
+ svcEffectivePolicy = PolicyEngine.getPolicy(
Util.getStreamSource(synCfg.getProperty(policyKey)).getInputStream());
} else {
- svcEffectivePolicy.merge(reader.readPolicy(
-
Util.getStreamSource(synCfg.getProperty(policyKey)).getInputStream()));
+ svcEffectivePolicy = (Policy) svcEffectivePolicy.merge(
+ PolicyEngine.getPolicy(
+
Util.getStreamSource(synCfg.getProperty(policyKey)).getInputStream()));
}
}
- PolicyInclude policyInclude = new PolicyInclude();
- policyInclude.addPolicyElement(PolicyInclude.SERVICE_POLICY,
svcEffectivePolicy);
- proxyService.setPolicyInclude(policyInclude);
+ proxyService.getPolicyInclude().setPolicy(svcEffectivePolicy);
}
-*/
+
// create a custom message receiver for this proxy service to use a
given named
// endpoint or sequence for forwarding/message mediation
ProxyServiceMessageReceiver msgRcvr = new
ProxyServiceMessageReceiver();
@@ -321,7 +318,7 @@
return serviceLevelPolicies;
}
- public void addServiceLevelPoliciy(URL serviceLevelPolicy) {
+ public void addServiceLevelPoliciy(String serviceLevelPolicy) {
this.serviceLevelPolicies.add(serviceLevelPolicy);
}
Modified:
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/n2n/SynapseCommodityServiceTest.java?view=diff&rev=469861&r1=469860&r2=469861
==============================================================================
---
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
(original)
+++
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
Wed Nov 1 03:24:38 2006
@@ -27,7 +27,7 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
-import org.apache.axis2.transport.nhttp.AsyncHTTPListener;
+import org.apache.axis2.transport.http.SimpleHTTPServer;
import org.apache.synapse.Constants;
import org.apache.synapse.utils.Services;
@@ -36,8 +36,8 @@
public class SynapseCommodityServiceTest extends TestCase {
- private AsyncHTTPListener synapseServer = null;
- private AsyncHTTPListener businessServer = null;
+ private SimpleHTTPServer synapseServer = null;
+ private SimpleHTTPServer businessServer = null;
protected void setUp() throws java.lang.Exception {
// Initializing Synapse repository
@@ -64,8 +64,8 @@
"http://business.org";,
"http://business.org";);
businessConfigCtx.getAxisConfiguration().addService(businessService);
- synapseServer = new AsyncHTTPListener(synapseConfigCtx, 10000);
- businessServer = new AsyncHTTPListener(businessConfigCtx, 10001);
+ synapseServer = new SimpleHTTPServer(synapseConfigCtx, 10000);
+ businessServer = new SimpleHTTPServer(businessConfigCtx, 10001);
//starting servers
synapseServer.start();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
