You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by pz...@apache.org on 2006/11/23 13:11:00 UTC

svn commit: r478542 - in /incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: config/ config/xml/ core/axis2/ mediators/builtin/

Author: pzf
Date: Thu Nov 23 04:10:59 2006
New Revision: 478542

URL: http://svn.apache.org/viewvc?view=rev&rev=478542
Log:
renamed REST to POX

Modified:
    incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Endpoint.java
    incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EndpointFactory.java
    incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EndpointSerializer.java
    incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
    incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java

Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Endpoint.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Endpoint.java?view=diff&rev=478542&r1=478541&r2=478542
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Endpoint.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Endpoint.java Thu Nov 23 04:10:59 2006
@@ -49,7 +49,7 @@
     /** use a separate listener - implies addressing is on **/
 	private boolean useSeparateListener = false;
 	/** force REST on **/
-	private boolean forceREST = false;
+	private boolean forcePOX = false;
 	/** force SOAP on **/
 	private boolean forceSOAP = false;
 	
@@ -190,12 +190,12 @@
 		return useSeparateListener;
 	}
 
-	public void setForceREST(boolean forceREST) {
-		this.forceREST = forceREST;
+	public void setForcePOX(boolean forcePOX) {
+		this.forcePOX = forcePOX;
 	}
 
-	public boolean isForceREST() {
-		return forceREST;
+	public boolean isForcePOX() {
+		return forcePOX;
 	}
 
 	public void setForceSOAP(boolean forceSOAP) {

Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EndpointFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EndpointFactory.java?view=diff&rev=478542&r1=478541&r2=478542
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EndpointFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EndpointFactory.java Thu Nov 23 04:10:59 2006
@@ -33,12 +33,13 @@
 /**
  * Creates an Endpoint instance using the XML fragment specification
  * 
- * <endpoint name="string" address="url">
+ * <endpoint name="string" address="url" force="soap|pox">
  *  .. extensibility ..
  * 
  * <enableRM [policy="key"]/>+ <enableSec [policy="key"]/>+ <enableAddressing
  * separateListener="true|false"/>+
  * 
+ * 
  * </endpoint>
  */
 public class EndpointFactory implements XMLToObjectMapper {
@@ -90,8 +91,8 @@
 		if (force!=null) 
 		{
 			String forceValue = force.getAttributeValue().trim().toLowerCase();
-			if (forceValue.equals("rest")) {
-				endpoint.setForceREST(true);
+			if (forceValue.equals("pox")) {
+				endpoint.setForcePOX(true);
 			} else if (forceValue.equals("soap")) {
 				endpoint.setForceSOAP(true);
 			} else {

Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EndpointSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EndpointSerializer.java?view=diff&rev=478542&r1=478541&r2=478542
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EndpointSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EndpointSerializer.java Thu Nov 23 04:10:59 2006
@@ -68,8 +68,8 @@
                 "ref", nullNS, endpt.getRef()));
             
         } else {
-        	if (endpt.isForceREST()) {
-        		endpoint.addAttribute(fac.createOMAttribute("force", nullNS, "rest"));
+        	if (endpt.isForcePOX()) {
+        		endpoint.addAttribute(fac.createOMAttribute("force", nullNS, "pox"));
         	} else if (endpt.isForceSOAP()) {
         		endpoint.addAttribute(fac.createOMAttribute("force", nullNS, "soap"));
         	}

Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java?view=diff&rev=478542&r1=478541&r2=478542
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java Thu Nov 23 04:10:59 2006
@@ -101,7 +101,7 @@
                 // TODO this may be really strange but true.. unless you call the below, sometimes
                 // it results in an unbound URI exception for no credible reason - needs more
                 // investigation seems like a woodstox issue. Use hack for now
-                axisOutMsgContext.getEnvelope().build();
+                //axisOutMsgContext.getEnvelope().build();
                 
                 log.debug("Reply Body : \n" + axisOutMsgContext.getEnvelope());
 

Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java?view=diff&rev=478542&r1=478541&r2=478542
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java Thu Nov 23 04:10:59 2006
@@ -82,7 +82,7 @@
                 eprAddress = singleEndpoint.getAddress().toString();
             }
 
-            if (singleEndpoint.isForceREST()) {
+            if (singleEndpoint.isForcePOX()) {
             	synCtx.setDoingREST(true);
             } else if (singleEndpoint.isForceSOAP()) {
             	synCtx.setDoingREST(false);



---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org