synapse-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asan...@apache.org
Subject svn commit: r573742 - in /webservices/synapse/trunk/java: modules/core/src/main/java/org/apache/synapse/core/axis2/ src/main/bin/
Date Fri, 07 Sep 2007 22:42:01 GMT
Author: asankha
Date: Fri Sep  7 15:42:00 2007
New Revision: 573742

URL: http://svn.apache.org/viewvc?rev=573742&view=rev
Log:
make sure to load synapse-* jars before any other (i.e. axis2-kernel) that has old NIO and
JMS
Temp fix to comment patch by Ruwan to ProxyService - needs to be fixed properly
Return the toString() as the string rep of an element if getText() returns non null white
space only

Modified:
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
    webservices/synapse/trunk/java/src/main/bin/synapse.bat
    webservices/synapse/trunk/java/src/main/bin/synapse.sh

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java?rev=573742&r1=573741&r2=573742&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
(original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
Fri Sep  7 15:42:00 2007
@@ -410,7 +410,11 @@
                         if (o instanceof OMTextImpl) {
                             textValue.append(((OMTextImpl) o).getText());
                         } else if (o instanceof OMElementImpl) {
-                            textValue.append(((OMElementImpl) o).getText());
+                            String s = ((OMElementImpl) o).getText();
+                            if (s.trim().length() == 0) {
+                                s = o.toString();
+                            }
+                            textValue.append(s);
                         }
                     }
                 } else {

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java?rev=573742&r1=573741&r2=573742&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
(original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
Fri Sep  7 15:42:00 2007
@@ -23,6 +23,8 @@
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.transport.http.server.HttpUtils;
 import org.apache.axis2.description.*;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.wsdl.WSDLConstants;
@@ -46,10 +48,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayInputStream;
 import java.util.*;
-import java.net.URI;
-import java.net.URLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.*;
 
 /**
  * <proxy-service name="string" [transports="(http |https |jms )+|all"]>
@@ -386,7 +385,7 @@
             }
         }
 
-        try {
+        /*try {
             String[] eprs = proxyService.getEPRs();
             boolean found = false;
             for (int i=0; i<eprs.length; i++) {
@@ -405,7 +404,7 @@
         } catch (AxisFault axisFault) {
             axisFault.printStackTrace();  //To change body of catch statement use File |
Settings | File Templates.
         }
-
+*/
         return proxyService;
     }
 
@@ -416,9 +415,12 @@
     }
 
     public void stop(SynapseConfiguration synCfg) {
-        AxisConfiguration axisConfig = synCfg.getAxisConfiguration().getAxisConfiguration();
+        AxisConfiguration axisConfig = synCfg.getAxisConfiguration();
         try {
-            axisConfig.getService(this.getName()).setActive(false);
+            AxisService as = axisConfig.getService(this.getName());
+            if (as != null) {
+                as.setActive(false);
+            }
             this.setRunning(false);
         } catch (AxisFault axisFault) {
             handleException(axisFault.getMessage());

Modified: webservices/synapse/trunk/java/src/main/bin/synapse.bat
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/bin/synapse.bat?rev=573742&r1=573741&r2=573742&view=diff
==============================================================================
--- webservices/synapse/trunk/java/src/main/bin/synapse.bat (original)
+++ webservices/synapse/trunk/java/src/main/bin/synapse.bat Fri Sep  7 15:42:00 2007
@@ -96,6 +96,7 @@
 FOR %%C in ("%SYNAPSE_HOME%\lib\patches\*.jar") DO set SYNAPSE_CLASS_PATH=!SYNAPSE_CLASS_PATH!;"%%~fC"
 
 set SYNAPSE_CLASS_PATH=!SYNAPSE_CLASS_PATH!;"%SYNAPSE_HOME%\lib"
+FOR %%C in ("%SYNAPSE_HOME%\lib\synapse-*.jar") DO set SYNAPSE_CLASS_PATH=!SYNAPSE_CLASS_PATH!;"%%~fC"
 FOR %%C in ("%SYNAPSE_HOME%\lib\*.jar") DO set SYNAPSE_CLASS_PATH=!SYNAPSE_CLASS_PATH!;"%%~fC"
 set SYNAPSE_CLASS_PATH="%SYNAPSE_HOME%\lib";%SYNAPSE_CLASS_PATH%
 

Modified: webservices/synapse/trunk/java/src/main/bin/synapse.sh
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/bin/synapse.sh?rev=573742&r1=573741&r2=573742&view=diff
==============================================================================
--- webservices/synapse/trunk/java/src/main/bin/synapse.sh (original)
+++ webservices/synapse/trunk/java/src/main/bin/synapse.sh Fri Sep  7 15:42:00 2007
@@ -91,6 +91,10 @@
 done
 
 SYNAPSE_CLASSPATH=$SYNAPSE_CLASSPATH:"$SYNAPSE_HOME/lib"
+for f in $SYNAPSE_HOME/lib/synapse-*.jar
+do
+  SYNAPSE_CLASSPATH=$SYNAPSE_CLASSPATH:$f
+done
 for f in $SYNAPSE_HOME/lib/*.jar
 do
   SYNAPSE_CLASSPATH=$SYNAPSE_CLASSPATH:$f



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


Mime
View raw message