geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r726070 - in /geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main: java/org/apache/geronimo/axis2/client/Axis2ClientConfigurationFactory.java resources/META-INF/geronimo-axis2.xml
Date Fri, 12 Dec 2008 16:45:49 GMT
Author: gawor
Date: Fri Dec 12 08:45:48 2008
New Revision: 726070

URL: http://svn.apache.org/viewvc?rev=726070&view=rev
Log:
Make Provider<DataSource> work on Axis2. Based on patch from Ivan (GERONIMO-4459)

Modified:
    geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ClientConfigurationFactory.java
    geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/resources/META-INF/geronimo-axis2.xml

Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ClientConfigurationFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ClientConfigurationFactory.java?rev=726070&r1=726069&r2=726070&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ClientConfigurationFactory.java
(original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ClientConfigurationFactory.java
Fri Dec 12 08:45:48 2008
@@ -24,7 +24,7 @@
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.jaxws.ClientConfigurationFactory;
 import org.apache.axis2.jaxws.util.ClassLoaderUtils;
-import org.apache.axis2.jaxws.util.Constants;
+import org.apache.geronimo.axis2.GeronimoConfigurator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -96,10 +96,9 @@
     }
     
     private ConfigurationContext createConfigurationContext() {
-        String repoPath = System.getProperty(Constants.AXIS2_REPO_PATH);
-        String axisConfigPath = System.getProperty(Constants.AXIS2_CONFIG_PATH);
         try {
-            return ConfigurationContextFactory.createConfigurationContextFromFileSystem(repoPath,
axisConfigPath);
+            GeronimoConfigurator configurator = new GeronimoConfigurator("META-INF/geronimo-axis2.xml");
+            return ConfigurationContextFactory.createConfigurationContext(configurator);
         } catch (AxisFault e) {
             throw new RuntimeException(e.getMessage(), e);
         }

Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/resources/META-INF/geronimo-axis2.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/resources/META-INF/geronimo-axis2.xml?rev=726070&r1=726069&r2=726070&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/resources/META-INF/geronimo-axis2.xml
(original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/resources/META-INF/geronimo-axis2.xml
Fri Dec 12 08:45:48 2008
@@ -116,6 +116,8 @@
         Please uncomment to Receive messages in multipart/form-data format-->
         <!--<messageBuilder contentType="multipart/form-data"-->
                          <!--class="org.apache.axis2.builder.MultipartFormDataBuilder"/>-->
+        <messageBuilder contentType=".*"
+                        class="org.apache.axis2.builder.DataSourceBuilder"/>
     </messageBuilders>
 
     <!-- ================================================= -->



Mime
View raw message