svn commit: r707874 - in /ode/trunk: Rakefile axis2/src/main/java/org/apache/ode/axis2/soapbinding/SoapExternalService.java

[midon]

Author: midon
Date: Sat Oct 25 10:38:37 2008
New Revision: 707874

URL: http://svn.apache.org/viewvc?rev=707874&view=rev
Log:
ODE-388: mex axis2 module needed

Modified:
    ode/trunk/Rakefile
    
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/soapbinding/SoapExternalService.java

Modified: ode/trunk/Rakefile
URL: 
http://svn.apache.org/viewvc/ode/trunk/Rakefile?rev=707874&r1=707873&r2=707874&view=diff
==============================================================================
--- ode/trunk/Rakefile (original)
+++ ode/trunk/Rakefile Sat Oct 25 10:38:37 2008
@@ -88,8 +88,7 @@
     "org.apache.ws.commons.schema:XmlSchema:jar:1.4.2",
     "xml-apis:xml-apis:jar:1.3.04",
     "xml-resolver:xml-resolver:jar:1.2",
-    "javax.mail:mail:jar:1.4",
-    #"mex:jar:1.41-impl", # aren't they actually module archives?
+    "javax.mail:mail:jar:1.4"
     #"soapmonitor:jar:1.4.1", # aren't they actually module archives?
 ]
 
@@ -100,7 +99,8 @@
 AXIS2_MODULES        = struct(
  :mods              => ["org.apache.rampart:rampart:mar:1.4", 
                          "org.apache.rampart:rahas:mar:1.4",
-                         "org.apache.axis2:addressing:mar:1.4"],
+                         "org.apache.axis2:addressing:mar:1.4",
+                              "org.apache.axis2:mex:mar:1.41"],
  :libs              => [group("rampart-core", "rampart-policy", 
"rampart-trust",
                               :under=>"org.apache.rampart",
                               :version=>"1.4"), 
@@ -258,7 +258,7 @@
     end
     
     test.using :testng
-    test.with(projects("tools"), libs, AXIS2_ALL, HTTPCORE, JAVAX.servlet, 
Buildr::Jetty::REQUIRES, file(_("target/test"))).using(:fork => :each)
+    test.with(projects("tools"), libs, AXIS2_MODULES.mods, AXIS2_ALL, 
HTTPCORE, JAVAX.servlet, Buildr::Jetty::REQUIRES, 
file(_("target/test"))).using(:fork => :each)
     test.setup task(:prepare_webapp) do |task|
       cp_r _("src/main/webapp"), _("target/test")
       cp Dir[_("src/main/webapp/WEB-INF/classes/*")], _("target/test")

Modified: 
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/soapbinding/SoapExternalService.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/soapbinding/SoapExternalService.java?rev=707874&r1=707873&r2=707874&view=diff
==============================================================================
--- 
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/soapbinding/SoapExternalService.java
 (original)
+++ 
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/soapbinding/SoapExternalService.java
 Sat Oct 25 10:38:37 2008
@@ -224,6 +224,10 @@
                             && 
!serviceClient.getAxisService().isEngaged("rampart")) {
                         serviceClient.engageModule("rampart");
                     }
+                    if 
(!serviceClient.getAxisService().getAxisConfiguration().isEngaged("metadataExchange")
+                            && 
!serviceClient.getAxisService().isEngaged("metadataExchange")) {
+                        serviceClient.engageModule("metadataExchange");
+                    }
                 } finally {
                     policyStream.close();
                 }