You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pr...@apache.org on 2007/06/27 18:46:04 UTC
svn commit: r551228 [15/23] - in /webservices/axis2/branches/java/jaxws21:
./ etc/ modules/adb-codegen/src/org/apache/axis2/schema/
modules/adb-codegen/src/org/apache/axis2/schema/template/
modules/adb-codegen/src/org/apache/axis2/schema/writer/ module...
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/serviceGroupRepo/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/serviceGroupRepo/axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/serviceGroupRepo/axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/serviceGroupRepo/axis2.xml Wed Jun 27 09:45:37 2007
@@ -2,14 +2,14 @@
<!-- ================================================= -->
<!-- Parameters -->
<!-- ================================================= -->
- <parameter name="hotdeployment" locked="false">true</parameter>
- <parameter name="hotupdate" locked="false">false</parameter>
- <parameter name="enableMTOM" locked="false">true</parameter>
+ <parameter name="hotdeployment">true</parameter>
+ <parameter name="hotupdate">false</parameter>
+ <parameter name="enableMTOM">true</parameter>
- <parameter name="userName" locked="false">admin</parameter>
- <parameter name="password" locked="false">axis2</parameter>
+ <parameter name="userName">admin</parameter>
+ <parameter name="password">axis2</parameter>
- <parameter name="seralizeLocation" locked="false">./target</parameter>
+ <parameter name="seralizeLocation">./target</parameter>
<!-- ================================================= -->
@@ -22,22 +22,22 @@
<!-- Transport Ins -->
<!-- ================================================= -->
<transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
- <parameter name="port" locked="false">6060</parameter>
+ <parameter name="port">6060</parameter>
</transportReceiver>
- <parameter name="extractServiceArchive" locked="false">true</parameter>
+ <parameter name="extractServiceArchive">true</parameter>
<!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
<transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
- <parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>
- <parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>
- <parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>
- <parameter name="transport.mail.pop3.port" locked="false">110</parameter>
- <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
+ <parameter name="transport.mail.pop3.host">127.0.0.1</parameter>
+ <parameter name="transport.mail.pop3.user">axis2</parameter>
+ <parameter name="transport.mail.pop3.password">axis2</parameter>
+ <parameter name="transport.mail.pop3.port">110</parameter>
+ <parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>
</transportReceiver> -->
<transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">6060</parameter>
+ <parameter name="port">6060</parameter>
</transportReceiver>
<!-- ================================================= -->
@@ -47,29 +47,29 @@
<transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
+ <parameter name="PROTOCOL">HTTP/1.0</parameter>
</transportSender>
<transportSender name="https"
class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+ <parameter name="PROTOCOL">HTTP/1.1</parameter>
</transportSender>
<phaseOrder type="InFlow">
<!-- System pre defined phases -->
<phase name="Transport">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
</phase>
<phase name="Security"/>
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -87,16 +87,16 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- user can add his own phases to this area -->
<phase name="OperationInFaultPhase"/>
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java Wed Jun 27 09:45:37 2007
@@ -32,168 +32,184 @@
*/
public class ModuleDisengagementTest extends TestCase {
- AxisConfiguration er;
+ AxisConfiguration config;
String serviceName = "testService";
QName opName = new QName("testOperation");
protected void setUp() throws Exception {
String filename =
AbstractTestCase.basedir + "/test-resources/deployment/moduleDisEngegeRepo";
- er = ConfigurationContextFactory.
+ config = ConfigurationContextFactory.
createConfigurationContextFromFileSystem(filename, null).getAxisConfiguration();
AxisService testService = new AxisService();
testService.setName(serviceName);
AxisOperation testOperation = new InOutAxisOperation();
testOperation.setName(opName);
testService.addOperation(testOperation);
- er.addService(testService);
+
+ testOperation = new InOutAxisOperation();
+ testOperation.setName(new QName("oper2"));
+ testService.addOperation(testOperation);
+
+ config.addService(testService);
}
- public void testGloalDisengagement() throws AxisFault {
- AxisModule module = er.getModule("testModule");
+ public void testGlobalDisengagement() throws AxisFault {
+ AxisModule module = config.getModule("testModule");
assertNotNull(module);
- Phase predisptah;
+ Phase phase;
Phase userPhase;
- ArrayList globalinflow = er.getInFlowPhases();
+ ArrayList globalinflow = config.getInFlowPhases();
assertNotNull(globalinflow);
- predisptah = (Phase) globalinflow.get(2);
- assertNotNull(predisptah);
- assertEquals(predisptah.getHandlerCount(), 0);
- AxisService service = er.getService(serviceName);
+ phase = (Phase) globalinflow.get(2);
+ assertNotNull(phase);
+ assertEquals(phase.getHandlerCount(), 0);
+ AxisService service = config.getService(serviceName);
assertNotNull(service);
AxisOperation operation = service.getOperation(opName);
assertNotNull(operation);
userPhase = (Phase) operation.getRemainingPhasesInFlow().get(1);
assertNotNull(userPhase);
assertEquals(0, userPhase.getHandlerCount());
- er.engageModule(module.getName());
- assertEquals(predisptah.getHandlerCount(), 2);
+
+ config.engageModule(module.getName());
+ assertEquals(2, phase.getHandlerCount());
assertEquals(1, userPhase.getHandlerCount());
- er.disengageModule(module);
- assertEquals(predisptah.getHandlerCount(), 0);
+
+ config.disengageModule(module);
+ assertEquals(0, phase.getHandlerCount());
assertEquals(0, userPhase.getHandlerCount());
}
public void testServiceDisengagement() throws AxisFault {
- AxisModule module = er.getModule("testModule");
+ AxisModule module = config.getModule("testModule");
assertNotNull(module);
- Phase predisptah;
+ Phase phase;
Phase userPhase;
- ArrayList globalinflow = er.getInFlowPhases();
+ ArrayList globalinflow = config.getInFlowPhases();
assertNotNull(globalinflow);
- predisptah = (Phase) globalinflow.get(2);
- assertNotNull(predisptah);
- assertEquals(predisptah.getHandlerCount(), 0);
- AxisService service = er.getService(serviceName);
+ phase = (Phase) globalinflow.get(2);
+ assertNotNull(phase);
+ assertEquals(0, phase.getHandlerCount());
+ AxisService service = config.getService(serviceName);
assertNotNull(service);
AxisOperation operation = service.getOperation(opName);
assertNotNull(operation);
+
userPhase = (Phase) operation.getRemainingPhasesInFlow().get(1);
assertNotNull(userPhase);
assertEquals(0, userPhase.getHandlerCount());
- er.engageModule(module.getName());
- assertEquals(predisptah.getHandlerCount(), 2);
+
+ config.engageModule(module.getName());
+ assertEquals(2, phase.getHandlerCount());
assertEquals(1, userPhase.getHandlerCount());
+
service.disengageModule(module);
- assertEquals(predisptah.getHandlerCount(), 2);
+ assertEquals(2, phase.getHandlerCount());
assertEquals(0, userPhase.getHandlerCount());
}
- public void testGlobalChcek() throws AxisFault {
- AxisModule module = er.getModule("testModule");
+ public void testGlobalCheck() throws AxisFault {
+ AxisModule module = config.getModule("testModule");
assertNotNull(module);
- er.engageModule(module.getName());
- er.disengageModule(module);
- er.engageModule(module.getName());
+ config.engageModule(module.getName());
+ config.disengageModule(module);
+ config.engageModule(module.getName());
}
public void testOperationDisengagement() throws AxisFault {
- AxisModule module = er.getModule("testModule");
+ AxisModule module = config.getModule("testModule");
assertNotNull(module);
- Phase predisptah;
+ Phase phase;
Phase userPhase;
- ArrayList globalinflow = er.getInFlowPhases();
+ ArrayList globalinflow = config.getInFlowPhases();
assertNotNull(globalinflow);
- predisptah = (Phase) globalinflow.get(2);
- assertNotNull(predisptah);
- assertEquals(predisptah.getHandlerCount(), 0);
- AxisService service = er.getService(serviceName);
+ phase = (Phase) globalinflow.get(2);
+ assertNotNull(phase);
+ assertEquals(phase.getHandlerCount(), 0);
+ AxisService service = config.getService(serviceName);
assertNotNull(service);
AxisOperation operation = service.getOperation(opName);
assertNotNull(operation);
userPhase = (Phase) operation.getRemainingPhasesInFlow().get(1);
assertNotNull(userPhase);
assertEquals(0, userPhase.getHandlerCount());
- er.engageModule(module.getName());
- assertEquals(predisptah.getHandlerCount(), 2);
+
+ config.engageModule(module.getName());
+ assertEquals(2, phase.getHandlerCount());
assertEquals(1, userPhase.getHandlerCount());
+
operation.disengageModule(module);
- assertEquals(predisptah.getHandlerCount(), 2);
+ assertEquals(2, phase.getHandlerCount());
assertEquals(0, userPhase.getHandlerCount());
}
- public void testServiceEnageServiceDisengag() throws AxisFault {
- AxisModule module = er.getModule("testModule");
+ public void testServiceEngageServiceDisengage() throws AxisFault {
+ AxisModule module = config.getModule("testModule");
assertNotNull(module);
Phase predisptah;
Phase userPhase;
- ArrayList globalinflow = er.getInFlowPhases();
+ ArrayList globalinflow = config.getInFlowPhases();
assertNotNull(globalinflow);
predisptah = (Phase) globalinflow.get(2);
assertNotNull(predisptah);
assertEquals(predisptah.getHandlerCount(), 0);
- AxisService service = er.getService(serviceName);
+ AxisService service = config.getService(serviceName);
assertNotNull(service);
AxisOperation operation = service.getOperation(opName);
assertNotNull(operation);
userPhase = (Phase) operation.getRemainingPhasesInFlow().get(1);
assertNotNull(userPhase);
assertEquals(0, userPhase.getHandlerCount());
+
service.engageModule(module);
- assertEquals(predisptah.getHandlerCount(), 2);
+ assertEquals(2, predisptah.getHandlerCount());
assertEquals(1, userPhase.getHandlerCount());
+
service.disengageModule(module);
- assertEquals(predisptah.getHandlerCount(), 0);
+ assertEquals(0, predisptah.getHandlerCount());
assertEquals(0, userPhase.getHandlerCount());
}
- public void testServiceEnageOperationDisengag() throws AxisFault {
- AxisModule module = er.getModule("testModule");
+ public void testServiceEngageOperationDisengage() throws AxisFault {
+ AxisModule module = config.getModule("testModule");
assertNotNull(module);
- Phase predisptah;
+ Phase phase;
Phase userPhase;
- ArrayList globalinflow = er.getInFlowPhases();
+ ArrayList globalinflow = config.getInFlowPhases();
assertNotNull(globalinflow);
- predisptah = (Phase) globalinflow.get(2);
- assertNotNull(predisptah);
- assertEquals(predisptah.getHandlerCount(), 0);
- AxisService service = er.getService(serviceName);
+ phase = (Phase) globalinflow.get(2);
+ assertNotNull(phase);
+ assertEquals(phase.getHandlerCount(), 0);
+ AxisService service = config.getService(serviceName);
assertNotNull(service);
AxisOperation operation = service.getOperation(opName);
assertNotNull(operation);
userPhase = (Phase) operation.getRemainingPhasesInFlow().get(1);
assertNotNull(userPhase);
assertEquals(0, userPhase.getHandlerCount());
+
service.engageModule(module);
- assertEquals(predisptah.getHandlerCount(), 2);
+ assertEquals(2, phase.getHandlerCount());
assertEquals(1, userPhase.getHandlerCount());
+
operation.disengageModule(module);
- assertEquals(predisptah.getHandlerCount(), 2);
+ assertEquals(2, phase.getHandlerCount());
assertEquals(0, userPhase.getHandlerCount());
}
- public void testOperationEnageOperationDisengage() throws AxisFault {
- AxisModule module = er.getModule("testModule");
+ public void testOperationEngageOperationDisengage() throws AxisFault {
+ AxisModule module = config.getModule("testModule");
assertNotNull(module);
- Phase predisptah;
+ Phase phase;
Phase userPhase;
- ArrayList globalinflow = er.getInFlowPhases();
+ ArrayList globalinflow = config.getInFlowPhases();
assertNotNull(globalinflow);
- predisptah = (Phase) globalinflow.get(2);
- assertNotNull(predisptah);
- assertEquals(predisptah.getHandlerCount(), 0);
- AxisService service = er.getService(serviceName);
+ phase = (Phase) globalinflow.get(2);
+ assertNotNull(phase);
+ assertEquals(phase.getHandlerCount(), 0);
+ AxisService service = config.getService(serviceName);
assertNotNull(service);
AxisOperation operation = service.getOperation(opName);
assertNotNull(operation);
@@ -201,10 +217,10 @@
assertNotNull(userPhase);
assertEquals(0, userPhase.getHandlerCount());
operation.engageModule(module);
- assertEquals(predisptah.getHandlerCount(), 2);
+ assertEquals(2, phase.getHandlerCount());
assertEquals(1, userPhase.getHandlerCount());
operation.disengageModule(module);
- assertEquals(predisptah.getHandlerCount(), 0);
+ assertEquals(0, phase.getHandlerCount());
assertEquals(0, userPhase.getHandlerCount());
}
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/deployment/ModuleversionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/deployment/ModuleversionTest.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/deployment/ModuleversionTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/deployment/ModuleversionTest.java Wed Jun 27 09:45:37 2007
@@ -41,69 +41,60 @@
}
public void testCalculateDefaultModuleVersions() throws AxisFault {
- AxisConfiguration axiConfiguration = new AxisConfiguration();
+ AxisConfiguration axisConfiguration = new AxisConfiguration();
AxisModule module1 = new AxisModule();
module1.setName("Module1");
- axiConfiguration.addModule(module1);
+ axisConfiguration.addModule(module1);
AxisModule module2 = new AxisModule();
module2.setName("Module2-0.94");
- axiConfiguration.addModule(module2);
+ axisConfiguration.addModule(module2);
AxisModule module3 = new AxisModule();
module3.setName("Module2-0.95");
- axiConfiguration.addModule(module3);
+ axisConfiguration.addModule(module3);
AxisModule module4 = new AxisModule();
module4.setName("Module2-0.93");
- axiConfiguration.addModule(module4);
+ axisConfiguration.addModule(module4);
AxisModule module5 = new AxisModule();
module5.setName("testModule-1.93");
- axiConfiguration.addModule(module5);
+ axisConfiguration.addModule(module5);
- Utils.calculateDefaultModuleVersion(axiConfiguration.getModules(), axiConfiguration);
- assertEquals(module1, axiConfiguration.getDefaultModule("Module1"));
- assertEquals(module3, axiConfiguration.getDefaultModule("Module2"));
- assertEquals(module5, axiConfiguration.getDefaultModule("testModule"));
- axiConfiguration.engageModule("Module2");
- axiConfiguration.engageModule("Module1");
- axiConfiguration.engageModule("testModule", "1.93");
+ Utils.calculateDefaultModuleVersion(axisConfiguration.getModules(), axisConfiguration);
+ assertEquals(module1, axisConfiguration.getDefaultModule("Module1"));
+ assertEquals(module3, axisConfiguration.getDefaultModule("Module2"));
+ assertEquals(module5, axisConfiguration.getDefaultModule("testModule"));
+ axisConfiguration.engageModule("Module2");
+ axisConfiguration.engageModule("Module1");
+ axisConfiguration.engageModule("testModule", "1.93");
- Iterator engageModules = axiConfiguration.getEngagedModules().iterator();
+ Iterator engageModules = axisConfiguration.getEngagedModules().iterator();
boolean found1 = false;
boolean found2 = false;
boolean found3 = false;
while (engageModules.hasNext()) {
- String qName = ((AxisModule) engageModules.next()).getName();
- if (qName.equals("Module2-0.95")) {
+ String name = ((AxisModule)engageModules.next()).getName();
+ if (name.equals("Module2-0.95")) {
found1 = true;
}
- }
- engageModules = axiConfiguration.getEngagedModules().iterator();
- while (engageModules.hasNext()) {
- String name = ((AxisModule) engageModules.next()).getName();
if (name.equals("Module1")) {
found2 = true;
}
- }
- engageModules = axiConfiguration.getEngagedModules().iterator();
- while (engageModules.hasNext()) {
- String qName = ((AxisModule) engageModules.next()).getName();
- if (qName.equals("testModule-1.93")) {
+ if (name.equals("testModule-1.93")) {
found3 = true;
}
}
-
if (!found1) {
- fail("this should fail");
+ fail("Didn't find Module2-0.95");
}
if (!found2) {
- fail("this should fail");
+ fail("Didn't find Module1");
}
if (!found3) {
- fail("this should fail");
+ fail("Didn't find testModule-1.93");
}
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/deployment/SameServiceAddingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/deployment/SameServiceAddingTest.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/deployment/SameServiceAddingTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/deployment/SameServiceAddingTest.java Wed Jun 27 09:45:37 2007
@@ -25,52 +25,61 @@
*/
/**
- * Author: Deepal Jayasinghe
- * Date: Sep 16, 2005
- * Time: 11:29:06 PM
+ * This test confirms that we behave correctly when adding ServiceGroups with duplicate
+ * Services to ones that have already been deployed.
*/
public class SameServiceAddingTest extends TestCase {
- AxisConfiguration ar;
+ AxisConfiguration config;
public void testServiceGroup() throws AxisFault {
- ar = ConfigurationContextFactory.createConfigurationContextFromFileSystem(null, null)
+ final String SERVICE1 = "serevice1";
+ final String SERVICE2 = "serevice2";
+ final String SERVICE4 = "serevice4";
+ final String SERVICE_GROUP2 = "ServiceGroup2";
+
+ config = ConfigurationContextFactory.createConfigurationContextFromFileSystem(null, null)
.getAxisConfiguration();
+
+ // First create a ServiceGroup with S1 and S4
AxisServiceGroup axisServiceGroup1 = new AxisServiceGroup();
axisServiceGroup1.setServiceGroupName("ServiceGroup1");
AxisService service1 = new AxisService();
- service1.setName("serevice1");
+ service1.setName(SERVICE1);
axisServiceGroup1.addService(service1);
AxisService service4 = new AxisService();
- service4.setName("serevice4");
+ service4.setName(SERVICE4);
axisServiceGroup1.addService(service4);
- ar.addServiceGroup(axisServiceGroup1);
-
+ config.addServiceGroup(axisServiceGroup1);
+ // Now create another ServiceGroup with S2 and S4
AxisServiceGroup axisServiceGroup2 = new AxisServiceGroup();
- axisServiceGroup2.setServiceGroupName("ServiceGroup2");
+ axisServiceGroup2.setServiceGroupName(SERVICE_GROUP2);
AxisService service2 = new AxisService();
- service2.setName("serevice2");
+ service2.setName(SERVICE2);
axisServiceGroup2.addService(service2);
AxisService service24 = new AxisService();
- service24.setName("serevice4");
+ service24.setName(SERVICE4);
axisServiceGroup2.addService(service24);
try {
- ar.addServiceGroup(axisServiceGroup2);
+ // This should fail!
+ config.addServiceGroup(axisServiceGroup2);
} catch (AxisFault axisFault) {
- //I have to ignore this
+ // This is expected because S4 was a duplicate name to an already existing service
+ assertTrue("Caught the wrong fault!", axisFault.getMessage().indexOf(SERVICE4) > -1);
}
- AxisService servie = ar.getService("serevice1");
- assertNotNull(servie);
- servie = ar.getService("serevice4");
- assertNotNull(servie);
-
- servie = ar.getService("serevice2");
- assertEquals(null, servie);
- assertEquals(null, ar.getServiceGroup("service2"));
+ AxisService service = config.getService(SERVICE1);
+ assertNotNull("Service 1 wasn't deployed!", service);
+ service = config.getService(SERVICE4);
+ assertNotNull("Service 4 wasn't deployed!", service);
+
+ service = config.getService(SERVICE2);
+ assertNull("Service 2 wasn't supposed to be deployed!", service);
+ assertNull("ServiceGroup2 wasn't supposed to be deployed!",
+ config.getServiceGroup("service2"));
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java Wed Jun 27 09:45:37 2007
@@ -33,6 +33,10 @@
import org.apache.axis2.description.InOutAxisOperation;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.dispatchers.AddressingBasedDispatcher;
+import org.apache.axis2.dispatchers.RequestURIBasedDispatcher;
+import org.apache.axis2.dispatchers.SOAPActionBasedDispatcher;
+import org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher;
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java Wed Jun 27 09:45:37 2007
@@ -35,6 +35,10 @@
import org.apache.axis2.description.InOutAxisOperation;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.dispatchers.AddressingBasedDispatcher;
+import org.apache.axis2.dispatchers.RequestURIBasedDispatcher;
+import org.apache.axis2.dispatchers.SOAPActionBasedDispatcher;
+import org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher;
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java Wed Jun 27 09:45:37 2007
@@ -35,6 +35,10 @@
import org.apache.axis2.description.InOutAxisOperation;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.dispatchers.AddressingBasedDispatcher;
+import org.apache.axis2.dispatchers.RequestURIBasedDispatcher;
+import org.apache.axis2.dispatchers.SOAPActionBasedDispatcher;
+import org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher;
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java Wed Jun 27 09:45:37 2007
@@ -35,6 +35,10 @@
import org.apache.axis2.description.InOutAxisOperation;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.dispatchers.AddressingBasedDispatcher;
+import org.apache.axis2.dispatchers.RequestURIBasedDispatcher;
+import org.apache.axis2.dispatchers.SOAPActionBasedDispatcher;
+import org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher;
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java Wed Jun 27 09:45:37 2007
@@ -34,6 +34,10 @@
import org.apache.axis2.description.InOutAxisOperation;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.dispatchers.AddressingBasedDispatcher;
+import org.apache.axis2.dispatchers.RequestURIBasedDispatcher;
+import org.apache.axis2.dispatchers.SOAPActionBasedDispatcher;
+import org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher;
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java Wed Jun 27 09:45:37 2007
@@ -34,6 +34,10 @@
import org.apache.axis2.description.InOutAxisOperation;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.dispatchers.AddressingBasedDispatcher;
+import org.apache.axis2.dispatchers.RequestURIBasedDispatcher;
+import org.apache.axis2.dispatchers.SOAPActionBasedDispatcher;
+import org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher;
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/SOAPActionBasedDispatcherTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/SOAPActionBasedDispatcherTest.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/SOAPActionBasedDispatcherTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/SOAPActionBasedDispatcherTest.java Wed Jun 27 09:45:37 2007
@@ -18,6 +18,7 @@
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.InOnlyAxisOperation;
+import org.apache.axis2.dispatchers.SOAPActionBasedDispatcher;
import javax.xml.namespace.QName;
Modified: webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/builder/DescriptionBuilderUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/builder/DescriptionBuilderUtils.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/builder/DescriptionBuilderUtils.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/builder/DescriptionBuilderUtils.java Wed Jun 27 09:45:37 2007
@@ -18,14 +18,11 @@
*/
package org.apache.axis2.jaxws.description.builder;
-import org.apache.axis2.java.security.AccessController;
import org.apache.axis2.jaxws.ExceptionFactory;
+import org.apache.axis2.jaxws.util.ClassLoaderUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-
/**
*
*/
@@ -319,7 +316,7 @@
if (classLoader != null) {
// Use the specified classloader to load the class.
try {
- returnClass = forName(classToLoad, false, classLoader);
+ returnClass = ClassLoaderUtils.forName(classToLoad, false, classLoader);
}
//Catch Throwable as ClassLoader can throw an NoClassDefFoundError that
//does not extend Exception, so lets catch everything that extends Throwable
@@ -332,13 +329,13 @@
} else {
//Use the thread context class loader to load the class.
try {
- returnClass = forName(classToLoad, false,
- getContextClassLoader());
+ returnClass = ClassLoaderUtils.forName(classToLoad, false,
+ ClassLoaderUtils.getContextClassLoader());
}
catch (Throwable ex) {
//Use the default classloader to load the class.
try {
- returnClass = forName(classToLoad);
+ returnClass = ClassLoaderUtils.forName(classToLoad);
}
//Catch Throwable as ClassLoader can throw an NoClassDefFoundError that
//does not extend Exception
@@ -352,78 +349,4 @@
return returnClass;
}
- /** @return ClassLoader */
- private static ClassLoader getContextClassLoader() {
- // NOTE: This method must remain private because it uses AccessController
- ClassLoader cl = null;
- try {
- cl = (ClassLoader)AccessController.doPrivileged(
- new PrivilegedExceptionAction() {
- public Object run() throws ClassNotFoundException {
- return Thread.currentThread().getContextClassLoader();
- }
- }
- );
- } catch (PrivilegedActionException e) {
- if (log.isDebugEnabled()) {
- log.debug("Exception thrown from AccessController: " + e);
- }
- throw ExceptionFactory.makeWebServiceException(e.getException());
- }
-
- return cl;
- }
-
- /**
- * Return the class for this name
- *
- * @return Class
- */
- private static Class forName(final String className, final boolean initialize,
- final ClassLoader classloader) throws ClassNotFoundException {
- // NOTE: This method must remain private because it uses AccessController
- Class cl = null;
- try {
- cl = (Class)AccessController.doPrivileged(
- new PrivilegedExceptionAction() {
- public Object run() throws ClassNotFoundException {
- return Class.forName(className, initialize, classloader);
- }
- }
- );
- } catch (PrivilegedActionException e) {
- if (log.isDebugEnabled()) {
- log.debug("Exception thrown from AccessController: " + e);
- }
- throw (ClassNotFoundException)e.getException();
- }
-
- return cl;
- }
-
- /**
- * Return the class for this name
- *
- * @return Class
- */
- private static Class forName(final String className) throws ClassNotFoundException {
- // NOTE: This method must remain private because it uses AccessController
- Class cl = null;
- try {
- cl = (Class)AccessController.doPrivileged(
- new PrivilegedExceptionAction() {
- public Object run() throws ClassNotFoundException {
- return Class.forName(className);
- }
- }
- );
- } catch (PrivilegedActionException e) {
- if (log.isDebugEnabled()) {
- log.debug("Exception thrown from AccessController: " + e);
- }
- throw (ClassNotFoundException)e.getException();
- }
-
- return cl;
- }
}
Modified: webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebResultAnnot.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebResultAnnot.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebResultAnnot.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebResultAnnot.java Wed Jun 27 09:45:37 2007
@@ -20,7 +20,7 @@
public class WebResultAnnot implements javax.jws.WebResult {
- private String name = "return";
+ private String name = "";
private String targetNamespace = "";
private boolean header = false;
private String partName = "";
Modified: webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java Wed Jun 27 09:45:37 2007
@@ -18,6 +18,31 @@
*/
package org.apache.axis2.jaxws.description.impl;
+import java.io.InputStream;
+import java.security.PrivilegedAction;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+
+import javax.jws.HandlerChain;
+import javax.jws.WebService;
+import javax.wsdl.Binding;
+import javax.wsdl.Definition;
+import javax.wsdl.Port;
+import javax.wsdl.extensions.ExtensibilityElement;
+import javax.wsdl.extensions.http.HTTPBinding;
+import javax.wsdl.extensions.soap.SOAPAddress;
+import javax.wsdl.extensions.soap12.SOAP12Address;
+import javax.wsdl.extensions.soap12.SOAP12Binding;
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingType;
+import javax.xml.ws.Service;
+import javax.xml.ws.ServiceMode;
+import javax.xml.ws.WebServiceProvider;
+import javax.xml.ws.handler.PortInfo;
+import javax.xml.ws.soap.SOAPBinding;
+
import org.apache.axis2.AxisFault;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
@@ -42,40 +67,12 @@
import org.apache.axis2.jaxws.description.builder.WsdlComposite;
import org.apache.axis2.jaxws.description.xml.handler.HandlerChainsType;
import org.apache.axis2.jaxws.i18n.Messages;
+import org.apache.axis2.jaxws.util.ClassLoaderUtils;
import org.apache.axis2.jaxws.util.WSDL4JWrapper;
import org.apache.axis2.jaxws.util.WSDLWrapper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.jws.HandlerChain;
-import javax.jws.WebService;
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.http.HTTPBinding;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap12.SOAP12Address;
-import javax.wsdl.extensions.soap12.SOAP12Binding;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.handler.PortInfo;
-import javax.xml.ws.soap.SOAPBinding;
-import java.io.InputStream;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeSet;
-
/** @see ../EndpointDescription */
/*
* TODO: EndpointDescription should be created via AxisService objects and not directly from WSDL
@@ -519,8 +516,8 @@
} else {
try {
// TODO: Using Class forName() is probably not the best long-term way to get the SEI class from the annotation
- seiClass = forName(seiClassName, false,
- getContextClassLoader());
+ seiClass = ClassLoaderUtils.forName(seiClassName, false,
+ ClassLoaderUtils.getContextClassLoader());
// Catch Throwable as ClassLoader can throw an NoClassDefFoundError that
// does not extend Exception, so lets catch everything that extends Throwable
// rather than just Exception.
@@ -1621,55 +1618,6 @@
}
}
return wsdlComposite;
- }
-
- /**
- * Return the class for this name
- *
- * @return Class
- */
- private static Class forName(final String className, final boolean initialize,
- final ClassLoader classloader) throws ClassNotFoundException {
- // NOTE: This method must remain protected because it uses AccessController
- Class cl = null;
- try {
- cl = (Class)AccessController.doPrivileged(
- new PrivilegedExceptionAction() {
- public Object run() throws ClassNotFoundException {
- return Class.forName(className, initialize, classloader);
- }
- }
- );
- } catch (PrivilegedActionException e) {
- if (log.isDebugEnabled()) {
- log.debug("Exception thrown from AccessController: " + e);
- }
- throw (ClassNotFoundException)e.getException();
- }
-
- return cl;
- }
-
- /** @return ClassLoader */
- private static ClassLoader getContextClassLoader() {
- // NOTE: This method must remain private because it uses AccessController
- ClassLoader cl = null;
- try {
- cl = (ClassLoader)AccessController.doPrivileged(
- new PrivilegedExceptionAction() {
- public Object run() throws ClassNotFoundException {
- return Thread.currentThread().getContextClassLoader();
- }
- }
- );
- } catch (PrivilegedActionException e) {
- if (log.isDebugEnabled()) {
- log.debug("Exception thrown from AccessController: " + e);
- }
- throw (RuntimeException)e.getException();
- }
-
- return cl;
}
public String toString() {
Modified: webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java Wed Jun 27 09:45:37 2007
@@ -412,7 +412,7 @@
new ArrayList<OperationDescription>();
OperationDescription[] allOperations = getOperations();
for (OperationDescription operation : allOperations) {
- if (operation.getName().equals(operationQName)) {
+ if (operation.getName().getLocalPart().equals(operationQName.getLocalPart())) {
matchingOperations.add(operation);
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java Wed Jun 27 09:45:37 2007
@@ -18,10 +18,13 @@
package org.apache.axis2.jaxws.description.impl;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.wsdl.WSDL11ActionHelper;
import org.apache.axis2.description.AxisMessage;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisOperationFactory;
import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.WSDL2Constants;
import org.apache.axis2.jaxws.ExceptionFactory;
import org.apache.axis2.jaxws.description.EndpointDescriptionJava;
@@ -205,7 +208,9 @@
} else {
this.axisOperation = createAxisOperation();
}
- }
+ // Register understood headers on axisOperation
+ registerMustUnderstandHeaders();
+}
/**
* Create an AxisOperation for this Operation. Note that the ParameterDescriptions must be
@@ -240,6 +245,76 @@
newAxisOperation.setName(determineOperationQName(this.methodComposite));
newAxisOperation.setSoapAction(this.getAction());
+ //*************************************************************************************
+ //NOTE: assumption here is that all info. need to generate the actions will have to come
+ // from annotations (or default values)
+ //*************************************************************************************
+
+ String messageExchangePattern = newAxisOperation.getMessageExchangePattern();
+ String targetNS = getEndpointInterfaceDescriptionImpl().getTargetNamespace();
+ String portTypeName = getEndpointInterfaceDescriptionImpl().getEndpointDescriptionImpl().getName();
+ ArrayList inputActions = new ArrayList();
+
+ //We don't have a name at this point, shouldn't matter if we have the MEP
+ //String inputName = newAxisOperation.getName().getLocalPart();
+ String inputName = null;
+ String inputAction =
+ WSDL11ActionHelper.getInputActionFromStringInformation(messageExchangePattern,
+ targetNS,
+ portTypeName,
+ newAxisOperation.getName().getLocalPart(),
+ inputName);
+
+ if (inputAction != null) {
+ inputActions.add(inputAction);
+ newAxisOperation.setWsamappingList(inputActions);
+ }
+
+ //Map the action to the operation on the actual axisService
+ //TODO: Determine whether this should be done at a higher level in the
+ // description hierarchy
+ getEndpointInterfaceDescriptionImpl().getEndpointDescriptionImpl().
+ getAxisService().mapActionToOperation(inputAction, newAxisOperation);
+
+ //set the OUTPUT ACTION
+
+ //We don't have a name at this point, shouldn't matter if we have the MEP
+ //String outputName = newAxisOperation.getName().getLocalPart(); //REVIEW:
+ String outputName = null;
+ String outputAction =
+ WSDL11ActionHelper.getOutputActionFromStringInformation(messageExchangePattern,
+ targetNS,
+ portTypeName,
+ newAxisOperation.getName().getLocalPart(),
+ outputName);
+
+ if (outputAction != null) {
+ newAxisOperation.setOutputAction(outputAction);
+ }
+
+ //Set the FAULT ACTION
+ // Walk the fault information
+ FaultDescription[] faultDescs = getFaultDescriptions();
+ if (faultDescs != null) {
+ for (int i=0; i <faultDescs.length; i++) {
+
+ AxisMessage faultMessage = new AxisMessage();
+ String faultName = faultDescs[i].getName();
+ faultMessage.setName(faultName);
+
+ String faultAction =
+ WSDL11ActionHelper.getFaultActionFromStringInformation( messageExchangePattern,
+ portTypeName,
+ newAxisOperation.getName().getLocalPart(),
+ faultMessage.getName());
+
+ if (faultAction != null) {
+ newAxisOperation.addFaultAction(faultMessage.getName(), faultAction);
+ }
+ newAxisOperation.setFaultMessages(faultMessage);
+ }
+ }
+
//REVIEW: Determine if other axisOperation values may need to be set
// Currently, the following values are being set on AxisOperation in
// ServiceBuilder.populateService which we are not setting:
@@ -346,6 +421,8 @@
parameterDescriptions = createParameterDescriptions();
faultDescriptions = createFaultDescriptions();
}
+ // Register understood headers on axisOperation
+ registerMustUnderstandHeaders();
}
public EndpointInterfaceDescription getEndpointInterfaceDescription() {
@@ -1617,5 +1694,48 @@
return string.toString();
}
return string.toString();
+ }
+
+ /**
+ * Adds a list of SOAP header QNames that are understood by JAXWS for this operation to the
+ * AxisOperation. This will be used by Axis2 to verify that all headers marked as
+ * mustUnderstand have been or will be processed.
+ *
+ * Server side headers considered understood [JAXWS 2.0 Sec 10.2.1 page 117]
+ * - SEI method params that are in headers
+ * - Headers processed by application handlers (TBD)
+ *
+ * Client side headers considered understood: None
+ *
+ */
+ private void registerMustUnderstandHeaders() {
+
+ // REVIEW: If client side (return value, OUT or INOUT params) needs to be supported then
+ // this needs to process client and server differently.
+
+ AxisOperation theAxisOperation = getAxisOperation();
+ if (theAxisOperation == null) {
+ if (log.isDebugEnabled()) {
+ log.debug("The axis operation is null, so header QNames could not be registered. OpDesc = " + this);
+ }
+ return;
+ }
+
+ // If any IN or INOUT parameters are in the header, then add their QNames to the list
+ ParameterDescription paramDescs[] = getParameterDescriptions();
+ if (paramDescs != null && paramDescs.length > 0) {
+ for (ParameterDescription paramDesc : paramDescs) {
+ if (paramDesc.isHeader()
+ && (paramDesc.getMode() == WebParam.Mode.IN
+ || paramDesc.getMode() == WebParam.Mode.INOUT)) {
+ QName headerQN = new QName(paramDesc.getTargetNamespace(),
+ paramDesc.getParameterName());
+ theAxisOperation.registerUnderstoodHeaderQName(headerQN);
+ if (log.isDebugEnabled()) {
+ log.debug("OpDesc: understoodQName added to AxisOperation (if not null) " + headerQN);
+ }
+ }
+ }
+ }
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/util/WSDL4JWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/util/WSDL4JWrapper.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/util/WSDL4JWrapper.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/util/WSDL4JWrapper.java Wed Jun 27 09:45:37 2007
@@ -122,7 +122,7 @@
URLConnection urlCon = url.openConnection();
InputStream is = null;
try {
- is = urlCon.getInputStream();
+ is = getInputStream(urlCon);
}
catch(IOException e) {
if(log.isDebugEnabled()) {
@@ -476,6 +476,29 @@
public String getTargetNamespace() {
// TODO Auto-generated method stub
return wsdlDefinition.getTargetNamespace();
+ }
+
+ /**
+ * This method provides a Java2 Security compliant way to obtain the InputStream
+ * for a given URLConnection object. This is needed as a given URLConnection object
+ * may be an instance of a FileURLConnection object which would require access
+ * permissions if Java2 Security was enabled.
+ */
+ private InputStream getInputStream(URLConnection urlCon) throws Exception {
+ final URLConnection finalURLCon = urlCon;
+ InputStream is = null;
+ try {
+ is = (InputStream) AccessController.doPrivileged(
+ new PrivilegedExceptionAction() {
+ public Object run() throws IOException {
+ return finalURLCon.getInputStream();
+ }
+ });
+ }
+ catch(PrivilegedActionException e) {
+ throw e.getException();
+ }
+ return is;
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/mex/src/org/apache/axis2/mex/MexConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/mex/src/org/apache/axis2/mex/MexConstants.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/mex/src/org/apache/axis2/mex/MexConstants.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/mex/src/org/apache/axis2/mex/MexConstants.java Wed Jun 27 09:45:37 2007
@@ -68,7 +68,7 @@
* MEX Configuration
*
* Sample mex configuration:
- * <parameter name="metadataexchange" locked="false">
+ * <parameter name="metadataexchange">
* <outputform dialect="http://schemas.xmlsoap.org/wsdl/" forms="location" />
* <outputform forms="inline,reference,location" />
* </parameter>
Modified: webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml Wed Jun 27 09:45:37 2007
@@ -100,6 +100,7 @@
<geronimo.spec.activation.version>1.0-M1</geronimo.spec.activation.version>
<geronimo.spec.javamail.version>1.0-M1</geronimo.spec.javamail.version>
<geronimo.spec.jms.version>1.1</geronimo.spec.jms.version>
+ <geronimo.spec.annotation.version>1.1</geronimo.spec.annotation.version>
<groovy.all.version>1.0-jsr-06</groovy.all.version>
<intellij.version>5.0</intellij.version>
<jakarta.httpcore.version>4.0-alpha4</jakarta.httpcore.version>
@@ -597,6 +598,11 @@
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>${geronimo.spec.jms.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>${geronimo.spec.annotation.version}</version>
+ </dependency>
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
@@ -628,6 +634,16 @@
<artifactId>jakarta-httpcore</artifactId>
<version>${jakarta.httpcore.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>jakarta-httpcore-nio</artifactId>
+ <version>${jakarta.httpcore.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>jakarta-httpcore-niossl</artifactId>
+ <version>${jakarta.httpcore.version}</version>
+ </dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
Modified: webservices/axis2/branches/java/jaxws21/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java Wed Jun 27 09:45:37 2007
@@ -407,13 +407,16 @@
Element domEle = ((Element)node);
int indexOfColon = domEle.getTagName().indexOf(":");
NamespaceImpl ns;
- String localname;
+ String localName;
if (indexOfColon != -1) {
- localname = domEle.getTagName().substring(indexOfColon + 1);
+ localName = domEle.getTagName().substring(indexOfColon + 1);
ns = new NamespaceImpl(domEle.getNamespaceURI(),
domEle.getTagName().substring(0, indexOfColon));
} else {
- localname = domEle.getLocalName();
+ localName = domEle.getLocalName();
+ if (localName == null) { //it is possible that localname isn't set but name is set
+ localName = domEle.getTagName();
+ }
if (domEle.getNamespaceURI() != null) {
ns = new NamespaceImpl(domEle.getNamespaceURI(), domEle.getPrefix());
} else {
@@ -427,7 +430,7 @@
}
ElementImpl eleImpl =
new ElementImpl((DocumentImpl)this.getOwnerDocument(),
- localname, ns, this.element.getOMFactory());
+ localName, ns, this.element.getOMFactory());
SOAPElementImpl saajEle = new SOAPElementImpl(eleImpl);
@@ -435,18 +438,18 @@
NamedNodeMap domAttrs = domEle.getAttributes();
for (int i = 0; i < domAttrs.getLength(); i++) {
org.w3c.dom.Node attrNode = domAttrs.item(i);
- if (attrNode.getLocalName() == null) {
- //local part is required. "" is allowed to preserve compatibility with QName 1.0
- saajEle.addAttribute(new PrefixedQName(attrNode.getNamespaceURI(),
- "",
- attrNode.getPrefix()),
- attrNode.getNodeValue());
- } else {
- saajEle.addAttribute(new PrefixedQName(attrNode.getNamespaceURI(),
- attrNode.getLocalName(),
- attrNode.getPrefix()),
- attrNode.getNodeValue());
+ String attrLocalName = attrNode.getLocalName();
+ if (attrLocalName == null) {
+ attrLocalName = attrNode.getNodeName();
}
+ if (attrLocalName == null) {
+ //local part is required. "" is allowed to preserve compatibility with QName 1.0
+ attrLocalName = "";
+ }
+ saajEle.addAttribute(new PrefixedQName(attrNode.getNamespaceURI(),
+ attrLocalName,
+ attrNode.getPrefix()),
+ attrNode.getNodeValue());
}
NodeList childNodes = node.getChildNodes();
Modified: webservices/axis2/branches/java/jaxws21/modules/saaj/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/saaj/test-resources/axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/saaj/test-resources/axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/saaj/test-resources/axis2.xml Wed Jun 27 09:45:37 2007
@@ -2,16 +2,16 @@
<!-- ================================================= -->
<!-- Parameters -->
<!-- ================================================= -->
- <parameter name="hotdeployment" locked="false">true</parameter>
- <parameter name="hotupdate" locked="false">false</parameter>
- <parameter name="enableMTOM" locked="false">true</parameter>
- <parameter name="cacheAttachments" locked="false">false</parameter>
+ <parameter name="hotdeployment">true</parameter>
+ <parameter name="hotupdate">false</parameter>
+ <parameter name="enableMTOM">true</parameter>
+ <parameter name="cacheAttachments">false</parameter>
<!-- Uncomment this to enable REST support -->
- <!-- <parameter name="eanbleREST" locked="false">true</parameter>-->
+ <!-- <parameter name="eanbleREST">true</parameter>-->
- <parameter name="userName" locked="false">admin</parameter>
- <parameter name="password" locked="false">axis2</parameter>
+ <parameter name="userName">admin</parameter>
+ <parameter name="password">axis2</parameter>
@@ -25,20 +25,20 @@
<!-- Transport Ins -->
<!-- ================================================= -->
<transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
- <parameter name="port" locked="false">6060</parameter>
+ <parameter name="port">6060</parameter>
</transportReceiver>
<!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
<transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
- <parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>
- <parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>
- <parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>
- <parameter name="transport.mail.pop3.port" locked="false">110</parameter>
- <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
+ <parameter name="transport.mail.pop3.host">127.0.0.1</parameter>
+ <parameter name="transport.mail.pop3.user">axis2</parameter>
+ <parameter name="transport.mail.pop3.password">axis2</parameter>
+ <parameter name="transport.mail.pop3.port">110</parameter>
+ <parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>
</transportReceiver> -->
<transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">6060</parameter>
+ <parameter name="port">6060</parameter>
</transportReceiver>
<!-- ================================================= -->
@@ -46,17 +46,17 @@
<!-- ================================================= -->
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+ <parameter name="PROTOCOL">HTTP/1.1</parameter>
</transportSender>
<transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
<!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
<transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
- <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
- <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
- <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
- <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
+ <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
+ <parameter name="transport.mail.smtp.user">axis2</parameter>
+ <parameter name="transport.mail.smtp.password">axis2</parameter>
+ <parameter name="transport.mail.smtp.port">25</parameter>
</transportSender>
-->
@@ -75,16 +75,16 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -103,21 +103,21 @@
<phase name="userphase1"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
<handler name="HTTPLocationBasedDispatcher"
- class="org.apache.axis2.engine.HTTPLocationBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
</phase>
</phaseOrder>
<phaseOrder type="OutFaultFlow">
Modified: webservices/axis2/branches/java/jaxws21/modules/samples/conf/service4withhandler.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/samples/conf/service4withhandler.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/samples/conf/service4withhandler.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/samples/conf/service4withhandler.xml Wed Jun 27 09:45:37 2007
@@ -1,5 +1,5 @@
<service messageReceiver="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" style="rpc" contextPath="services">
- <parameter name="ServiceClass" locked="false">userguide.sample1.EchoXML</parameter>
+ <parameter name="ServiceClass">userguide.sample1.EchoXML</parameter>
<operation name="echo" qname="echo"/>
</service>
Modified: webservices/axis2/branches/java/jaxws21/modules/samples/conf/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/samples/conf/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/samples/conf/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/samples/conf/services.xml Wed Jun 27 09:45:37 2007
@@ -1,4 +1,4 @@
<service name="">
- <parameter name="ServiceClass" locked="false">userguide.sample1.EchoXML</parameter>
+ <parameter name="ServiceClass">userguide.sample1.EchoXML</parameter>
<operation name="echo" qname="echo"/>
</service>
Modified: webservices/axis2/branches/java/jaxws21/modules/samples/deprecated/groovy/src/sample/groovy/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/samples/deprecated/groovy/src/sample/groovy/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/samples/deprecated/groovy/src/sample/groovy/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/samples/deprecated/groovy/src/sample/groovy/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -4,7 +4,7 @@
and hand that over to Groovy class and which process the message and return a SOAP
message back to MessageReceiver
</description>
- <parameter name="GroovyClass" locked="false">GroovyRcv.groovy</parameter>
+ <parameter name="GroovyClass">GroovyRcv.groovy</parameter>
<operation name="echo">
<messageReceiver class="sample.groovy.GroovyReceiver"/>
Modified: webservices/axis2/branches/java/jaxws21/modules/samples/deprecated/mtomsample/src/sample/mtom/filetransfer/service/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/samples/deprecated/mtomsample/src/sample/mtom/filetransfer/service/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/samples/deprecated/mtomsample/src/sample/mtom/filetransfer/service/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/samples/deprecated/mtomsample/src/sample/mtom/filetransfer/service/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -2,28 +2,28 @@
<description>
This is a sample Web Service for illustrating MTOM based binary data transfer.
</description>
- <parameter name="ServiceClass" locked="false">sample.mtom.filetransfer.service.MTOMService</parameter>
+ <parameter name="ServiceClass">sample.mtom.filetransfer.service.MTOMService</parameter>
<operation name="uploadFileUsingMTOM">
- <parameter name="enableMTOM" locked="false">true</parameter>
- <parameter name="enableSwA" locked="false">false</parameter>
+ <parameter name="enableMTOM">true</parameter>
+ <parameter name="enableSwA">false</parameter>
<actionMapping>urn:uploadFileUsingMTOM</actionMapping>
<messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
</operation>
<operation name="uploadFileUsingSwA">
- <parameter name="enableMTOM" locked="false">false</parameter>
- <parameter name="enableSwA" locked="false">true</parameter>
+ <parameter name="enableMTOM">false</parameter>
+ <parameter name="enableSwA">true</parameter>
<actionMapping>urn:uploadFileUsingSwA</actionMapping>
<messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
</operation>
<operation name="sendReceiveUsingMTOM">
- <parameter name="enableMTOM" locked="false">true</parameter>
- <parameter name="enableSwA" locked="false">false</parameter>
+ <parameter name="enableMTOM">true</parameter>
+ <parameter name="enableSwA">false</parameter>
<actionMapping>urn:sendReceiveUsingMTOM</actionMapping>
<messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
</operation>
<operation name="sendReceiveUsingSwA">
- <parameter name="enableMTOM" locked="false">false</parameter>
- <parameter name="enableSwA" locked="false">true</parameter>
+ <parameter name="enableMTOM">false</parameter>
+ <parameter name="enableSwA">true</parameter>
<actionMapping>urn:sendReceiveUsingSwA</actionMapping>
<messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
</operation>
Modified: webservices/axis2/branches/java/jaxws21/modules/samples/jaxws-calculator/resources/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/samples/jaxws-calculator/resources/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/samples/jaxws-calculator/resources/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/samples/jaxws-calculator/resources/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -23,7 +23,7 @@
<messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
</messageReceivers>
- <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.calculator.CalculatorService</parameter>
+ <parameter name="ServiceClass">org.apache.axis2.jaxws.calculator.CalculatorService</parameter>
<operation name="invoke" mep="http://www.w3.org/2004/08/wsdl/in-out">
<actionMapping/>
</operation>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org