axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thil...@apache.org
Subject svn commit: r534294 - in /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment: AxisConfigBuilder.java repository/util/WSInfo.java
Date Wed, 02 May 2007 02:36:25 GMT
Author: thilina
Date: Tue May  1 19:36:25 2007
New Revision: 534294

URL: http://svn.apache.org/viewvc?view=rev&rev=534294
Log:
Quick and dirty fix for AXIS2-2626 Hotupdate for custom deployers, moving the hard coded app/xml
& app/formurl builders overridable by the config

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfo.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java?view=diff&rev=534294&r1=534293&r2=534294
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
Tue May  1 19:36:25 2007
@@ -173,6 +173,9 @@
             axisConfig.addMessageBuilder("application/soap+xml", new SOAPBuilder());
             axisConfig.addMessageBuilder("text/xml", new SOAPBuilder());
             axisConfig.addMessageBuilder("application/xop+xml", new MTOMBuilder());
+            axisConfig.addMessageBuilder("application/xml", new ApplicationXMLBuilder());
+            axisConfig.addMessageBuilder("application/x-www-form-urlencoded",
+                                         new XFormURLEncodedBuilder());
             // process MessageBuilders
             OMElement messageBuildersElement =
                     config_element.getFirstChildWithName(new QName(TAG_MESSAGE_BUILDERS));
@@ -184,9 +187,7 @@
                     axisConfig.addMessageBuilder(key, (Builder) builderSelector.get(key));
                 }
             }
-            axisConfig.addMessageBuilder("application/xml", new ApplicationXMLBuilder());
-            axisConfig.addMessageBuilder("application/x-www-form-urlencoded",
-                                         new XFormURLEncodedBuilder());
+            
 
             //process dataLocator configuration
             OMElement dataLocatorElement =

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfo.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfo.java?view=diff&rev=534294&r1=534293&r2=534294
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfo.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfo.java
Tue May  1 19:36:25 2007
@@ -18,6 +18,7 @@
 package org.apache.axis2.deployment.repository.util;
 
 import org.apache.axis2.deployment.Deployer;
+import org.apache.axis2.deployment.ServiceDeployer;
 
 public class WSInfo {
     private String fileName;
@@ -49,6 +50,10 @@
         this.fileName = fileName;
         this.lastModifiedDate = lastModifiedDate;
         this.deployer = deployer;
+        //TODO: This is a temporary fix for the hot update in custom deployers
+        if (!(deployer instanceof ServiceDeployer)) {
+           this.type=2;
+        }
     }
 
     public String getFileName() {



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


Mime
View raw message