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 de...@apache.org on 2006/01/18 05:29:43 UTC
svn commit: r370041 [2/3] - in /webservices/axis2/trunk/java/modules:
addressing/test/org/apache/axis2/handlers/addressing/
codegen/src/org/apache/axis2/wsdl/template/java/
codegen/test/org/apache/axis2/rpc/ core/conf/ core/src/org/apache/axis2/
core/s...
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AddingObserverTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AddingObserverTest.java?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AddingObserverTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AddingObserverTest.java Tue Jan 17 20:24:14 2006
@@ -20,15 +20,15 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.engine.AxisConfiguration;
-public class AddingObserverTest extends TestCase{
+public class AddingObserverTest extends TestCase {
- AxisConfiguration er;
+ AxisConfiguration er;
- public void testAddingObservs() throws Exception{
+ public void testAddingObservs() throws Exception {
try {
String filename = "./test-resources/deployment/ConfigWithObservers";
ConfigurationContextFactory builder = new ConfigurationContextFactory();
- er = builder.createConfigurationContextFromFileSystem(filename).getAxisConfiguration();
+ er = builder.createConfigurationContextFromFileSystem(filename, filename + "/axis2.xml").getAxisConfiguration();
assertNotNull(er);
} catch (DeploymentException e) {
throw new DeploymentException(e);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisMessageTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisMessageTest.java?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisMessageTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisMessageTest.java Tue Jan 17 20:24:14 2006
@@ -31,7 +31,7 @@
public void testAxisMessage() throws Exception {
String filename = "./test-resources/deployment/AxisMessageTestRepo";
ConfigurationContextFactory builder = new ConfigurationContextFactory();
- AxisConfiguration er = builder.createConfigurationContextFromFileSystem(filename)
+ AxisConfiguration er = builder.createConfigurationContextFromFileSystem(filename, filename + "/axis2.xml")
.getAxisConfiguration();
assertNotNull(er);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java Tue Jan 17 20:24:14 2006
@@ -36,7 +36,7 @@
try {
String filename = "./target/test-resources/deployment";
ConfigurationContextFactory builder = new ConfigurationContextFactory();
- AxisConfiguration er = builder.createConfigurationContextFromFileSystem(filename)
+ AxisConfiguration er = builder.createConfigurationContextFromFileSystem(filename,null)
.getAxisConfiguration();
assertNotNull(er);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/DeploymentTotalTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/DeploymentTotalTest.java?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/DeploymentTotalTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/DeploymentTotalTest.java Tue Jan 17 20:24:14 2006
@@ -34,8 +34,8 @@
String filename = "./target/test-resources/deployment";
ConfigurationContextFactory builder = new ConfigurationContextFactory();
er =
- builder.createConfigurationContextFromFileSystem(filename)
- .getAxisConfiguration();
+ builder.createConfigurationContextFromFileSystem(filename, null)
+ .getAxisConfiguration();
}
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/HostCongigurationTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/HostCongigurationTest.java?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/HostCongigurationTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/HostCongigurationTest.java Tue Jan 17 20:24:14 2006
@@ -24,18 +24,17 @@
public class HostCongigurationTest extends TestCase {
AxisConfiguration ar;
- String repo ="./test-resources/deployment/hostConfigrepo";
-
+ String xml = "./test-resources/deployment/hostConfigrepo/axis2.xml";
protected void setUp() throws Exception {
ConfigurationContextFactory builder = new ConfigurationContextFactory();
- ar = builder.createConfigurationContextFromFileSystem(repo).getAxisConfiguration();
+ ar = builder.createConfigurationContextFromFileSystem(null, xml).getAxisConfiguration();
}
public void testHostConfig() throws AxisFault {
- HostConfiguration hc = ar.getHostConfiguration();
+ HostConfiguration hc = ar.getHostConfiguration();
assertNotNull(hc);
- assertEquals(5555,hc.getPort());
+ assertEquals(5555, hc.getPort());
}
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/InvalidServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/InvalidServiceTest.java?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/InvalidServiceTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/InvalidServiceTest.java Tue Jan 17 20:24:14 2006
@@ -32,7 +32,7 @@
try {
String filename = "./target/test-resources/InvalidDeployment";
ConfigurationContextFactory builder = new ConfigurationContextFactory();
- er =builder.createConfigurationContextFromFileSystem(filename)
+ er =builder.createConfigurationContextFromFileSystem(filename,null)
.getAxisConfiguration();
String msg = (String) er.getFaultyServices().get("invalidService");
if (msg == null || "".equals(msg)) {
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModifiedConfigFileTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModifiedConfigFileTest.java?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModifiedConfigFileTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModifiedConfigFileTest.java Tue Jan 17 20:24:14 2006
@@ -27,9 +27,9 @@
public void testPhaseOrderchage() {
try {
- String filename = "./test-resources/deployment/BadConfigOrderChange";
+ String filename = "./test-resources/deployment/BadConfigOrderChange/axis2.xml";
ConfigurationContextFactory builder = new ConfigurationContextFactory();
- er = builder.createConfigurationContextFromFileSystem(filename).getAxisConfiguration();
+ er = builder.createConfigurationContextFromFileSystem(null,filename).getAxisConfiguration();
fail(
"this must failed gracefully with DeploymentException \"Invalid System predefined " +
"inphases , phase order does not\" +\n support\\n recheck axis2.xml\"");
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModuleversionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModuleversionTest.java?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModuleversionTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModuleversionTest.java Tue Jan 17 20:24:14 2006
@@ -30,9 +30,9 @@
public class ModuleversionTest extends TestCase {
public void testDefautModuleVersion() throws AxisFault {
- String filename = "./test-resources/deployment/moduleVersion/Test1";
+ String filename = "./test-resources/deployment/moduleVersion/Test1/axis2.xml";
ConfigurationContextFactory builder = new ConfigurationContextFactory();
- AxisConfiguration ac = builder.createConfigurationContextFromFileSystem(filename)
+ AxisConfiguration ac = builder.createConfigurationContextFromFileSystem(null,filename)
.getAxisConfiguration();
assertNotNull(ac);
assertEquals(ac.getDefaultModuleVersion("abc"), "1.23");
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SameServiceAddingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SameServiceAddingTest.java?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SameServiceAddingTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SameServiceAddingTest.java Tue Jan 17 20:24:14 2006
@@ -35,7 +35,7 @@
public void testServiceGroup() throws AxisFault {
ConfigurationContextFactory builder = new ConfigurationContextFactory();
- ar = builder.createConfigurationContextFromFileSystem(repo).getAxisConfiguration();
+ ar = builder.createConfigurationContextFromFileSystem(repo,null).getAxisConfiguration();
AxisService servie = ar.getService("serevice1");
assertNotNull(servie);
servie = ar.getService("serevice4");
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ServiceGroupTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ServiceGroupTest.java?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ServiceGroupTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ServiceGroupTest.java Tue Jan 17 20:24:14 2006
@@ -30,7 +30,7 @@
protected void setUp() throws Exception {
ConfigurationContextFactory builder = new ConfigurationContextFactory();
- ar = builder.createConfigurationContextFromFileSystem(repo).getAxisConfiguration();
+ ar = builder.createConfigurationContextFromFileSystem(repo,null).getAxisConfiguration();
}
public void testServiceGroup() throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SystemPhasesremovedTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SystemPhasesremovedTest.java?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SystemPhasesremovedTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SystemPhasesremovedTest.java Tue Jan 17 20:24:14 2006
@@ -33,7 +33,7 @@
String filename = "./test-resources/deployment/SystemPhaseRemove";
ConfigurationContextFactory builder = new ConfigurationContextFactory();
er =
- builder.createConfigurationContextFromFileSystem(filename)
+ builder.createConfigurationContextFromFileSystem(filename,filename + "/axis2.xml")
.getAxisConfiguration();
fail(
"this must failed gracefully with DeploymentException \"Invalid System predefined " +
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/TransportDeploymentTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/TransportDeploymentTest.java?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/TransportDeploymentTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/TransportDeploymentTest.java Tue Jan 17 20:24:14 2006
@@ -39,7 +39,7 @@
DeploymentException,
XMLStreamException {
DeploymentEngine engine = new DeploymentEngine(
- testResourceDir + "/deployment", "server-transport.xml");
+ testResourceDir + "/deployment", testResourceDir + "/deployment/server-transport.xml");
engine.load();
AxisConfiguration er = engine.getAxisConfig();
TransportInDescription transport = er.getTransportIn(new QName("http"));
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java Tue Jan 17 20:24:14 2006
@@ -35,13 +35,14 @@
public class ModuleConfigTest extends TestCase {
AxisConfiguration ar;
+ String axis2xml = "./test-resources/deployment/moduleConfig/axis2.xml";
String repo = "./test-resources/deployment/moduleConfig";
public void testModuleConfigAtAxisConfig() {
try {
ConfigurationContextFactory builder = new ConfigurationContextFactory();
- ar = builder.createConfigurationContextFromFileSystem(repo).getAxisConfiguration();
+ ar = builder.createConfigurationContextFromFileSystem(null, axis2xml).getAxisConfiguration();
ModuleConfiguration moduleConfiguration =
ar.getModuleConfig(new QName("testModule"));
assertNotNull(moduleConfiguration);
@@ -62,7 +63,7 @@
public void testModuleConfigAtService() {
try {
ConfigurationContextFactory builder = new ConfigurationContextFactory();
- ar = builder.createConfigurationContextFromFileSystem(repo).getAxisConfiguration();
+ ar = builder.createConfigurationContextFromFileSystem(null, axis2xml).getAxisConfiguration();
AxisService service = new AxisService();
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java Tue Jan 17 20:24:14 2006
@@ -38,7 +38,7 @@
String filename = "./target/test-resources/deployment";
ConfigurationContextFactory builder = new ConfigurationContextFactory();
ac =
- builder.createConfigurationContextFromFileSystem(filename)
+ builder.createConfigurationContextFromFileSystem(filename,null)
.getAxisConfiguration();
ModuleDescription module = ac.getModule(new QName("module1"));
assertNotNull(module);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterLocked.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterLocked.java?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterLocked.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterLocked.java Tue Jan 17 20:24:14 2006
@@ -29,129 +29,129 @@
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
+
public class ParameterLocked extends TestCase {
AxisConfiguration ar;
- String repo ="./test-resources/deployment/ParaLockedRepo";
-
+ String repo = "./test-resources/deployment/ParaLockedRepo";
protected void setUp() throws Exception {
ConfigurationContextFactory builder = new ConfigurationContextFactory();
- ar = builder.createConfigurationContextFromFileSystem(repo).getAxisConfiguration();
+ ar = builder.createConfigurationContextFromFileSystem(null, repo + "/axis2.xml").getAxisConfiguration();
}
- public void testOveride_Non_locked_Para_Service(){
+ public void testOveride_Non_locked_Para_Service() {
try {
assertNotNull(ar);
AxisService service = new AxisService();
ar.addService(service);
InputStream in = new FileInputStream(repo + "/service_overide_non_locked_para.xml");
- ServiceBuilder sbuilder = new ServiceBuilder(in,null,service);
+ ServiceBuilder sbuilder = new ServiceBuilder(in, null, service);
sbuilder.populateService(sbuilder.buildOM());
assertNotNull(sbuilder);
- }catch (FileNotFoundException e) {
- fail("This can not fail with this FileNotFoundException " + e) ;
+ } catch (FileNotFoundException e) {
+ fail("This can not fail with this FileNotFoundException " + e);
} catch (DeploymentException e) {
- fail("This can not fail with this DeploymentException " + e) ;
+ fail("This can not fail with this DeploymentException " + e);
} catch (AxisFault axisFault) {
- fail("This can not fail with this AxisFault " + axisFault) ;
+ fail("This can not fail with this AxisFault " + axisFault);
} catch (XMLStreamException e) {
- fail("This can not fail with this AxisFault " + e) ;
+ fail("This can not fail with this AxisFault " + e);
}
}
- public void testOveride_locked_Para_Service(){
+ public void testOveride_locked_Para_Service() {
try {
assertNotNull(ar);
AxisService service = new AxisService();
ar.addService(service);
InputStream in = new FileInputStream(repo + "/service_overide_locked_para.xml");
- ServiceBuilder sbuilder = new ServiceBuilder(in,null,service);
+ ServiceBuilder sbuilder = new ServiceBuilder(in, null, service);
sbuilder.populateService(sbuilder.buildOM());
assertNotNull(sbuilder);
- fail("Parmter is locked can not overide" ) ;
- }catch (FileNotFoundException e) {
- fail("This can not fail with this FileNotFoundException " + e) ;
+ fail("Parmter is locked can not overide");
+ } catch (FileNotFoundException e) {
+ fail("This can not fail with this FileNotFoundException " + e);
} catch (DeploymentException e) {
} catch (AxisFault axisFault) {
- fail("This can not fail with this AxisFault " + axisFault) ;
+ fail("This can not fail with this AxisFault " + axisFault);
} catch (XMLStreamException e) {
- fail("This can not fail with this AxisFault " + e) ;
+ fail("This can not fail with this AxisFault " + e);
}
- }
+ }
- public void testOveride_locked_Para_Operation(){
+ public void testOveride_locked_Para_Operation() {
try {
assertNotNull(ar);
AxisService service = new AxisService();
ar.addService(service);
InputStream in = new FileInputStream(repo + "/op_overide_global_para.xml");
- ServiceBuilder sbuilder = new ServiceBuilder(in,null,service);
+ ServiceBuilder sbuilder = new ServiceBuilder(in, null, service);
sbuilder.populateService(sbuilder.buildOM());
assertNotNull(sbuilder);
- fail("Parmter is locked can not overide" ) ;
- }catch (FileNotFoundException e) {
- fail("This can not fail with this FileNotFoundException " + e) ;
+ fail("Parmter is locked can not overide");
+ } catch (FileNotFoundException e) {
+ fail("This can not fail with this FileNotFoundException " + e);
} catch (DeploymentException e) {
} catch (AxisFault axisFault) {
- fail("This can not fail with this AxisFault " + axisFault) ;
+ fail("This can not fail with this AxisFault " + axisFault);
} catch (XMLStreamException e) {
- fail("This can not fail with this AxisFault " + e) ;
+ fail("This can not fail with this AxisFault " + e);
}
}
- public void testOveride_Service_locked_Para_Operation(){
+ public void testOveride_Service_locked_Para_Operation() {
try {
assertNotNull(ar);
AxisService service = new AxisService();
ar.addService(service);
InputStream in = new FileInputStream(repo + "/Op_overide_Service_para.xml");
- ServiceBuilder sbuilder = new ServiceBuilder(in,null,service);
+ ServiceBuilder sbuilder = new ServiceBuilder(in, null, service);
sbuilder.populateService(sbuilder.buildOM());
- fail("Parmter is locked can not overide" ) ;
- }catch (FileNotFoundException e) {
- fail("This can not fail with this FileNotFoundException " + e) ;
+ fail("Parmter is locked can not overide");
+ } catch (FileNotFoundException e) {
+ fail("This can not fail with this FileNotFoundException " + e);
} catch (DeploymentException e) {
} catch (AxisFault axisFault) {
- fail("This can not fail with this AxisFault " + axisFault) ;
+ fail("This can not fail with this AxisFault " + axisFault);
} catch (XMLStreamException e) {
- fail("This can not fail with this AxisFault " + e) ;
+ fail("This can not fail with this AxisFault " + e);
}
}
- public void testOveride_Non_locked_Para_Module(){
+ public void testOveride_Non_locked_Para_Module() {
try {
assertNotNull(ar);
ModuleDescription module = new ModuleDescription();
module.setParent(ar);
InputStream in = new FileInputStream(repo + "/module_overide_global_non_locked_para.xml");
- ModuleBuilder mbuilder = new ModuleBuilder(in,module,ar);
+ ModuleBuilder mbuilder = new ModuleBuilder(in, module, ar);
mbuilder.populateModule();
- }catch (FileNotFoundException e) {
- fail("This can not fail with this FileNotFoundException " + e) ;
+ } catch (FileNotFoundException e) {
+ fail("This can not fail with this FileNotFoundException " + e);
} catch (DeploymentException e) {
}
- }
+ }
- public void testOveride_locked_Para_Module(){
+ public void testOveride_locked_Para_Module() {
try {
assertNotNull(ar);
ModuleDescription module = new ModuleDescription();
module.setParent(ar);
InputStream in = new FileInputStream(repo + "/module_overide_locked_para.xml");
- ModuleBuilder mbuilder = new ModuleBuilder(in,module,ar);
+ ModuleBuilder mbuilder = new ModuleBuilder(in, module, ar);
mbuilder.populateModule();
- fail("Parmter is locked can not overide" ) ;
- }catch (FileNotFoundException e) {
- fail("This can not fail with this FileNotFoundException " + e) ;
+ fail("Parmter is locked can not overide");
+ } catch (FileNotFoundException e) {
+ fail("This can not fail with this FileNotFoundException " + e);
} catch (DeploymentException e) {
}
- }
+ }
}
Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java Tue Jan 17 20:24:14 2006
@@ -90,7 +90,7 @@
ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo");
+ factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
options.setTo(targetEPR);
Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestMultipleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestMultipleTest.java?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestMultipleTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestMultipleTest.java Tue Jan 17 20:24:14 2006
@@ -54,7 +54,7 @@
ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo");
+ factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
ServiceClient sender = new ServiceClient(configContext,null);
sender.setOptions(options);
options.setTo(targetEPR);
Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestSingleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestSingleTest.java?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestSingleTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestSingleTest.java Tue Jan 17 20:24:14 2006
@@ -50,7 +50,7 @@
options.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo");
+ factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
options.setTo(targetEPR);
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Tue Jan 17 20:24:14 2006
@@ -3,11 +3,11 @@
<!-- $Revision: 1.21 $ $Date: 2004-10-27 20:54:09 +0600 (Wed, 27 Oct 2004) $ -->
<project default="jar"
- xmlns:j="jelly:core"
- xmlns:u="jelly:util"
- xmlns:maven="jelly:maven"
- xmlns:deploy="deploy"
- xmlns:ant="jelly:ant">
+ xmlns:j="jelly:core"
+ xmlns:u="jelly:util"
+ xmlns:maven="jelly:maven"
+ xmlns:deploy="deploy"
+ xmlns:ant="jelly:ant">
<j:set var="samples.dir" value="target/samples"/>
<postGoal name="itest:compile">
@@ -17,482 +17,551 @@
</postGoal>
<preGoal name="test:compile">
- <!-- Set a property that can be picked up from the ant build.xml's -->
+ <!-- Set a property that can be picked up from the ant build.xml's -->
<ant:property name="maven.class.path" refid="maven.dependency.classpath"/>
- <!-- copy the mars so that they are available on the test classpath -->
+ <!-- copy the mars so that they are available on the test classpath -->
<copy file="../addressing/target/addressing.mar"
- tofile="target/test-classes/modules/addressing.mar"/>
+ tofile="target/test-classes/modules/addressing.mar"/>
<copy file="../security/target/security.mar"
- tofile="target/test-classes/modules/security.mar"/>
+ tofile="target/test-classes/modules/security.mar"/>
- <j:set var="axis2.home" value="${basedir}/target"/>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <j:set var="axis2.home" value="${basedir}/target"/>
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<classpath refid="maven.dependency.classpath"/>
<arg line="-d xmlbeans -p samples.wsdl.perf -o target/perf -s -t -ss -sd -uri test/samples/wsdl/perf/perf.wsdl"/>
- </java>
+ </java>
<ant:copy overwrite="yes" todir="target/perf/test/samples/perf">
<ant:fileset dir="test/samples/wsdl/perf">
<ant:include name="*Skeleton.java"/>
</ant:fileset>
</ant:copy>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf" target="make.repo"/>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf" target="jar.client"/>
- <ant:path id="samples.wsdl.perf.client.jar" location="target/perf/build/lib/PerfSoapService-test-client.jar"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf"
+ target="make.repo"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf"
+ target="jar.client"/>
+ <ant:path id="samples.wsdl.perf.client.jar"
+ location="target/perf/build/lib/PerfSoapService-test-client.jar"/>
<maven:addPath id="maven.dependency.classpath" refid="samples.wsdl.perf.client.jar"/>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<classpath refid="maven.dependency.classpath"/>
<arg line="-d adb -p samples.wsdl.perf2 -o target/perf2 -s -t -ss -sd -uri test/samples/wsdl/perf2/perf.wsdl"/>
- </java>
+ </java>
<ant:copy overwrite="yes" todir="target/perf2/test/samples/perf2">
<ant:fileset dir="test/samples/wsdl/perf2">
<ant:include name="*Skeleton.java"/>
</ant:fileset>
</ant:copy>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf2" target="make.repo"/>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf2" target="jar.client"/>
- <ant:path id="samples.wsdl.perf2.client.jar" location="target/perf2/build/lib/PerfSoapService2-test-client.jar"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf2"
+ target="make.repo"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf2"
+ target="jar.client"/>
+ <ant:path id="samples.wsdl.perf2.client.jar"
+ location="target/perf2/build/lib/PerfSoapService2-test-client.jar"/>
<maven:addPath id="maven.dependency.classpath" refid="samples.wsdl.perf2.client.jar"/>
</preGoal>
<postGoal name="test:compile">
- <j:if test="${context.getVariable('maven.test.skip') != 'true'}">
- <mkdir dir="target/test-resources/samples/modules"/>
- <mkdir dir="target/test-resources/repository-client/modules"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/test-resources/samples/modules/addressing.mar"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/test-resources/repository-client/modules/addressing.mar"/>
- <mkdir dir="target/toWar/services/"/>
-
- <!-- Create Chunked enabled Repository -->
- <mkdir dir="target/test-resources/chunking-enabledRepository"/>
- <copy file="test/org/apache/axis2/engine/chunking-enabled-axis2.xml"
- tofile="target/test-resources/chunking-enabledRepository/axis2.xml"/>
-
- <!-- Create Chunked disabled Repository -->
- <mkdir dir="target/test-resources/chunking-disabledRepository"/>
- <copy file="test/org/apache/axis2/engine/chunking-disabled-axis2.xml"
- tofile="target/test-resources/chunking-disabledRepository/axis2.xml"/>
-
- <!-- Create Mail Client transport enabled Repository -->
- <mkdir dir="target/test-resources/mail-transport-client-enabledRepository"/>
- <mkdir dir="target/test-resources/mail-transport-client-enabledRepository/modules"/>
- <copy file="test/org/apache/axis2/mail/mail-enabled-client-axis2.xml"
- tofile="target/test-resources/mail-transport-client-enabledRepository/axis2.xml"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/test-resources/mail-transport-client-enabledRepository/modules/addressing.mar"/>
-
- <!-- Create Mail Server transport enabled Repository -->
- <mkdir dir="target/test-resources/mail-transport-server-enabledRepository"/>
- <mkdir dir="target/test-resources/mail-transport-server-enabledRepository/modules"/>
- <copy file="test/org/apache/axis2/mail/mail-enabled-server-axis2.xml"
- tofile="target/test-resources/mail-transport-server-enabledRepository/axis2.xml"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/test-resources/mail-transport-server-enabledRepository/modules/addressing.mar"/>
-
- <mkdir dir="target/test-resources/MessageContextInjectionRepo"/>
- <mkdir dir="target/test-resources/integrationRepo/modules"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/test-resources/integrationRepo/modules/addressing.mar"/>
-
-
- <!-- Commons transport enabled enabled Repository -->
- <mkdir dir="target/test-resources/commons-http-enabledRepository"/>
- <copy file="test/org/apache/axis2/engine/commons-http-enabled-axis2.xml"
- tofile="target/test-resources/commons-http-enabledRepository/axis2.xml"/>
-
- <!-- MTOM enabled Repository -->
- <mkdir dir="target/test-resources/MTOM-enabledRepository"/>
- <copy file="test/org/apache/axis2/mtom/MTOM-enabled-axis2.xml"
- tofile="target/test-resources/MTOM-enabledRepository/axis2.xml"/>
-
- <!-- MTOM enabled Repository -->
- <mkdir dir="target/test-resources/MTOM-fileCache-enabledRepository"/>
- <copy file="test/org/apache/axis2/mtom/MTOM-fileCache-enabled-axis2.xml"
- tofile="target/test-resources/MTOM-fileCache-enabledRepository/axis2.xml"/>
-
- <!-- Groovy repository -->
- <mkdir dir="target/groovyRepo"/>
- <mkdir dir="target/groovyRepo/services"/>
- <mkdir dir="target/groovyRepo/modules"/>
- <ant:copy file="../samples/target/samples/groovyService.aar" tofile="target/groovyRepo/services/groovyService.aar"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/groovyRepo/modules/addressing.mar"/>
-
- <!--Axis2 repositories for WS-Security interop tests -->
-
- <!-- A default repository with security and addressing modules -->
- <mkdir dir="target/test-resources/default_security_client_repo"/>
- <mkdir dir="target/test-resources/default_security_client_repo/modules"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/default_security_client_repo/modules/security.mar"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/test-resources/default_security_client_repo/modules/addressing.mar"/>
-
- <!-- Scenario 1 -->
- <mkdir dir="target/test-resources/scenario1_client_repo"/>
- <mkdir dir="target/test-resources/scenario1_client_repo/modules"/>
- <mkdir dir="target/test-resources/scenario1_client_repo/services"/>
-
- <mkdir dir="target/test-resources/scenario1_service_repo"/>
- <mkdir dir="target/test-resources/scenario1_service_repo/services"/>
- <mkdir dir="target/test-resources/scenario1_service_repo/modules"/>
-
- <!-- setup scenario 1 client repository-->
- <copy file="test-resources/security/s1.client.axis2.xml"
- tofile="target/test-resources/scenario1_client_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario1_client_repo/modules/security.mar"/>
-
- <!-- This is to add the PWCallback in to the classpath for the client to pick
- the password callback class.
- -->
- <ant:path id="sec.interop.service.jar" location="../security/target/PingPort.aar"/>
- <maven:addPath id="maven.dependency.classpath" refid="sec.interop.service.jar"/>
-
- <!-- setup scenario 1 service repository-->
- <copy file="test-resources/security/s1.service.axis2.xml"
- tofile="target/test-resources/scenario1_service_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario1_service_repo/modules/security.mar"/>
-
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/s1.service.xml"
- tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario1_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
-
- <!-- Scenario 2 -->
- <mkdir dir="target/test-resources/scenario2_client_repo"/>
- <mkdir dir="target/test-resources/scenario2_client_repo/modules"/>
-
- <mkdir dir="target/test-resources/scenario2_service_repo"/>
- <mkdir dir="target/test-resources/scenario2_service_repo/services"/>
- <mkdir dir="target/test-resources/scenario2_service_repo/modules"/>
-
- <!-- setup scenario 2 client repository-->
- <copy file="test-resources/security/s2.client.axis2.xml"
- tofile="target/test-resources/scenario2_client_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario2_client_repo/modules/security.mar"/>
-
- <!-- setup scenario 2 service repository-->
- <copy file="test-resources/security/s2.service.axis2.xml"
- tofile="target/test-resources/scenario2_service_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario2_service_repo/modules/security.mar"/>
-
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/s2.service.xml"
- tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario2_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
-
- <!-- Scenario 2a -->
- <mkdir dir="target/test-resources/scenario2a_client_repo"/>
- <mkdir dir="target/test-resources/scenario2a_client_repo/modules"/>
-
- <mkdir dir="target/test-resources/scenario2a_service_repo"/>
- <mkdir dir="target/test-resources/scenario2a_service_repo/services"/>
- <mkdir dir="target/test-resources/scenario2a_service_repo/modules"/>
-
- <!-- setup scenario 2a client repository-->
- <copy file="test-resources/security/s2a.client.axis2.xml"
- tofile="target/test-resources/scenario2a_client_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario2a_client_repo/modules/security.mar"/>
-
- <!-- setup scenario 2a service repository-->
- <copy file="test-resources/security/s2a.service.axis2.xml"
- tofile="target/test-resources/scenario2a_service_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario2a_service_repo/modules/security.mar"/>
-
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/s2a.service.xml"
- tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario2a_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
-
- <!-- Scenario 3 -->
- <mkdir dir="target/test-resources/scenario3_client_repo"/>
- <mkdir dir="target/test-resources/scenario3_client_repo/modules"/>
-
- <mkdir dir="target/test-resources/scenario3_service_repo"/>
- <mkdir dir="target/test-resources/scenario3_service_repo/services"/>
- <mkdir dir="target/test-resources/scenario3_service_repo/modules"/>
-
- <!-- setup scenario 3 client repository-->
- <copy file="test-resources/security/s3.client.axis2.xml"
- tofile="target/test-resources/scenario3_client_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario3_client_repo/modules/security.mar"/>
-
- <!-- setup scenario 3 service repository-->
- <copy file="test-resources/security/s3.service.axis2.xml"
- tofile="target/test-resources/scenario3_service_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario3_service_repo/modules/security.mar"/>
-
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/s3.service.xml"
- tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario3_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
-
-
- <!-- Scenario 4 -->
- <mkdir dir="target/test-resources/scenario4_client_repo"/>
- <mkdir dir="target/test-resources/scenario4_client_repo/modules"/>
-
- <mkdir dir="target/test-resources/scenario4_service_repo"/>
- <mkdir dir="target/test-resources/scenario4_service_repo/services"/>
- <mkdir dir="target/test-resources/scenario4_service_repo/modules"/>
-
- <!-- setup scenario 4 client repository-->
- <copy file="test-resources/security/s4.client.axis2.xml"
- tofile="target/test-resources/scenario4_client_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario4_client_repo/modules/security.mar"/>
-
- <!-- setup scenario 4 service repository-->
- <copy file="test-resources/security/s4.service.axis2.xml"
- tofile="target/test-resources/scenario4_service_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario4_service_repo/modules/security.mar"/>
-
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/s4.service.xml"
- tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario4_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
-
-
- <!-- Scenario 5 -->
- <mkdir dir="target/test-resources/scenario5_client_repo"/>
- <mkdir dir="target/test-resources/scenario5_client_repo/modules"/>
-
- <mkdir dir="target/test-resources/scenario5_service_repo"/>
- <mkdir dir="target/test-resources/scenario5_service_repo/services"/>
- <mkdir dir="target/test-resources/scenario5_service_repo/modules"/>
-
- <!-- setup scenario 5 client repository-->
- <copy file="test-resources/security/s5.client.axis2.xml"
- tofile="target/test-resources/scenario5_client_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario5_client_repo/modules/security.mar"/>
-
- <!-- setup scenario 5 service repository-->
- <copy file="test-resources/security/s5.service.axis2.xml"
- tofile="target/test-resources/scenario5_service_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario5_service_repo/modules/security.mar"/>
-
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/s5.service.xml"
- tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario5_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
-
-
- <!-- Scenario 6 -->
- <mkdir dir="target/test-resources/scenario6_client_repo"/>
- <mkdir dir="target/test-resources/scenario6_client_repo/modules"/>
-
- <mkdir dir="target/test-resources/scenario6_service_repo"/>
- <mkdir dir="target/test-resources/scenario6_service_repo/services"/>
- <mkdir dir="target/test-resources/scenario6_service_repo/modules"/>
-
- <!-- setup scenario 6 client repository-->
- <copy file="test-resources/security/s6.client.axis2.xml"
- tofile="target/test-resources/scenario6_client_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario6_client_repo/modules/security.mar"/>
-
- <!-- setup scenario 6 service repository-->
- <copy file="test-resources/security/s6.service.axis2.xml"
- tofile="target/test-resources/scenario6_service_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario6_service_repo/modules/security.mar"/>
-
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/s6.service.xml"
- tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario6_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
-
-
- <!-- Scenario 7 -->
- <mkdir dir="target/test-resources/scenario7_client_repo"/>
- <mkdir dir="target/test-resources/scenario7_client_repo/modules"/>
-
- <mkdir dir="target/test-resources/scenario7_service_repo"/>
- <mkdir dir="target/test-resources/scenario7_service_repo/services"/>
- <mkdir dir="target/test-resources/scenario7_service_repo/modules"/>
-
- <!-- setup scenario 7 client repository-->
- <copy file="test-resources/security/s7.client.axis2.xml"
- tofile="target/test-resources/scenario7_client_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario7_client_repo/modules/security.mar"/>
-
- <!-- setup scenario 7 service repository-->
- <copy file="test-resources/security/s7.service.axis2.xml"
- tofile="target/test-resources/scenario7_service_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario7_service_repo/modules/security.mar"/>
-
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/s7.service.xml"
- tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario7_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
-
-
- <!-- Copying the DOM3 stuff to the endorsed dir -->
- <mkdir dir="target/test-resources/endorsed"/>
- <copy file="${maven.repo.local}/xerces/jars/xercesImpl-${xerces.version}.jar" todir="target/test-resources/endorsed"/>
- <copy file="${maven.repo.local}/xml-apis/jars/xml-apis-${xml_apis.version}.jar" todir="target/test-resources/endorsed"/>
-
-
- <!-- Scenario ST1 -->
- <mkdir dir="target/test-resources/scenarioST1_client_repo"/>
- <mkdir dir="target/test-resources/scenarioST1_client_repo/modules"/>
-
- <mkdir dir="target/test-resources/scenarioST1_service_repo"/>
- <mkdir dir="target/test-resources/scenarioST1_service_repo/services"/>
- <mkdir dir="target/test-resources/scenarioST1_service_repo/modules"/>
-
- <!-- setup scenario ST1 client repository-->
- <copy file="test-resources/security/sST1.client.axis2.xml"
- tofile="target/test-resources/scenarioST1_client_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenarioST1_client_repo/modules/security.mar"/>
-
- <!-- setup scenario ST1 service repository-->
- <copy file="test-resources/security/sST1.service.axis2.xml"
- tofile="target/test-resources/scenarioST1_service_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenarioST1_service_repo/modules/security.mar"/>
-
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/sST1.service.xml"
- tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenarioST1_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
-
-
- <!-- MTOM Optimized Security Test -->
- <mkdir dir="target/test-resources/mtom_sec_client_repo"/>
- <mkdir dir="target/test-resources/mtom_sec_client_repo/modules"/>
-
- <mkdir dir="target/test-resources/mtom_sec_service_repo"/>
- <mkdir dir="target/test-resources/mtom_sec_service_repo/services"/>
- <mkdir dir="target/test-resources/mtom_sec_service_repo/modules"/>
-
- <!-- MTOM Optimized Security Test client repository-->
- <copy file="test-resources/security/secMtom.client.axis2.xml"
- tofile="target/test-resources/mtom_sec_client_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/mtom_sec_client_repo/modules/security.mar"/>
-
- <!-- MTOM Optimized Security Test service repository-->
- <copy file="test-resources/security/secMtom.service.axis2.xml"
- tofile="target/test-resources/mtom_sec_service_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/mtom_sec_service_repo/modules/security.mar"/>
-
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/secMtom.service.xml"
- tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/mtom_sec_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
-
-
-
- <!-- Test with addressing and MTOM -->
- <mkdir dir="target/test-resources/complete_client_repo"/>
- <mkdir dir="target/test-resources/complete_client_repo/modules"/>
-
- <mkdir dir="target/test-resources/complete_service_repo"/>
- <mkdir dir="target/test-resources/complete_service_repo/services"/>
- <mkdir dir="target/test-resources/complete_service_repo/modules"/>
-
- <!-- Test with addressing and MTOM client repository-->
- <copy file="test-resources/security/complete.client.axis2.xml"
- tofile="target/test-resources/complete_client_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/complete_client_repo/modules/security.mar"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/test-resources/complete_client_repo/modules/addressing.mar"/>
-
- <!-- Test with addressing and MTOMservice repository-->
- <copy file="test-resources/security/complete.service.axis2.xml"
- tofile="target/test-resources/complete_service_repo/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/complete_service_repo/modules/security.mar"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/test-resources/complete_service_repo/modules/addressing.mar"/>
-
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/complete.service.xml"
- tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/complete_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes" />
-
-
-
- <!-- Standard repository -->
- <mkdir dir="target/Repository"/>
- <mkdir dir="target/Repository/services"/>
- <mkdir dir="target/Repository/modules"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/Repository/modules/addressing.mar"/>
-
- <j:jelly xmlns="jelly:ant">
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/SOAP12Testing/SOAP12TestModuleB"/>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/SOAP12Testing/SOAP12TestModuleC"/>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/SOAP12Testing/SOAP12TestServiceB"/>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/SOAP12Testing/SOAP12TestServiceC"/>
- </j:jelly>
- </j:if>
+ <j:if test="${context.getVariable('maven.test.skip') != 'true'}">
+ <mkdir dir="target/test-resources/samples/modules"/>
+ <mkdir dir="target/test-resources/samples/conf"/>
+ <mkdir dir="target/test-resources/repository-client/modules"/>
+ <mkdir dir="target/test-resources/repository-client/conf"/>
+ <copy file="../addressing/target/addressing.mar"
+ tofile="target/test-resources/samples/modules/addressing.mar"/>
+ <copy file="../core/conf/axis2.xml"
+ tofile="target/test-resources/samples/conf/axis2.xml"/>
+ <copy file="../addressing/target/addressing.mar"
+ tofile="target/test-resources/repository-client/modules/addressing.mar"/>
+ <copy file="../core/conf/axis2.xml"
+ tofile="target/test-resources/repository-client/conf/axis2.xml"/>
+ <mkdir dir="target/toWar/services/"/>
+
+ <!-- Create Chunked enabled Repository -->
+ <mkdir dir="target/test-resources/chunking-enabledRepository"/>
+ <mkdir dir="target/test-resources/chunking-enabledRepository/conf"/>
+ <copy file="test/org/apache/axis2/engine/chunking-enabled-axis2.xml"
+ tofile="target/test-resources/chunking-enabledRepository/conf/axis2.xml"/>
+
+ <!-- Create Chunked disabled Repository -->
+ <mkdir dir="target/test-resources/chunking-disabledRepository"/>
+ <mkdir dir="target/test-resources/chunking-disabledRepository/conf"/>
+ <copy file="test/org/apache/axis2/engine/chunking-disabled-axis2.xml"
+ tofile="target/test-resources/chunking-disabledRepository/conf/axis2.xml"/>
+
+ <!-- Create Mail Client transport enabled Repository -->
+ <mkdir dir="target/test-resources/mail-transport-client-enabledRepository"/>
+ <mkdir dir="target/test-resources/mail-transport-client-enabledRepository/conf"/>
+ <mkdir dir="target/test-resources/mail-transport-client-enabledRepository/modules"/>
+ <copy file="test/org/apache/axis2/mail/mail-enabled-client-axis2.xml"
+ tofile="target/test-resources/mail-transport-client-enabledRepository/conf/axis2.xml"/>
+ <copy file="../addressing/target/addressing.mar"
+ tofile="target/test-resources/mail-transport-client-enabledRepository/modules/addressing.mar"/>
+
+ <!-- Create Mail Server transport enabled Repository -->
+ <mkdir dir="target/test-resources/mail-transport-server-enabledRepository"/>
+ <mkdir dir="target/test-resources/mail-transport-server-enabledRepository/conf"/>
+ <mkdir dir="target/test-resources/mail-transport-server-enabledRepository/modules"/>
+ <copy file="test/org/apache/axis2/mail/mail-enabled-server-axis2.xml"
+ tofile="target/test-resources/mail-transport-server-enabledRepository/conf/axis2.xml"/>
+ <copy file="../addressing/target/addressing.mar"
+ tofile="target/test-resources/mail-transport-server-enabledRepository/modules/addressing.mar"/>
+
+ <mkdir dir="target/test-resources/MessageContextInjectionRepo"/>
+ <mkdir dir="target/test-resources/integrationRepo/modules"/>
+ <mkdir dir="target/test-resources/integrationRepo/conf"/>
+ <copy file="../addressing/target/addressing.mar"
+ tofile="target/test-resources/integrationRepo/modules/addressing.mar"/>
+ <copy file="../core/conf/axis2.xml"
+ tofile="target/test-resources/integrationRepo/conf/axis2.xml"/>
+
+
+ <!-- Commons transport enabled enabled Repository -->
+ <mkdir dir="target/test-resources/commons-http-enabledRepository"/>
+ <mkdir dir="target/test-resources/commons-http-enabledRepository/conf"/>
+ <copy file="test/org/apache/axis2/engine/commons-http-enabled-axis2.xml"
+ tofile="target/test-resources/commons-http-enabledRepository/conf/axis2.xml"/>
+
+ <!-- MTOM enabled Repository -->
+ <mkdir dir="target/test-resources/MTOM-enabledRepository"/>
+ <mkdir dir="target/test-resources/MTOM-enabledRepository/conf"/>
+ <copy file="test/org/apache/axis2/mtom/MTOM-enabled-axis2.xml"
+ tofile="target/test-resources/MTOM-enabledRepository/conf/axis2.xml"/>
+
+ <!-- MTOM enabled Repository -->
+ <mkdir dir="target/test-resources/MTOM-fileCache-enabledRepository"/>
+ <mkdir dir="target/test-resources/MTOM-fileCache-enabledRepository/conf"/>
+ <copy file="test/org/apache/axis2/mtom/MTOM-fileCache-enabled-axis2.xml"
+ tofile="target/test-resources/MTOM-fileCache-enabledRepository/conf/axis2.xml"/>
+
+ <!-- Groovy repository -->
+ <mkdir dir="target/groovyRepo"/>
+ <mkdir dir="target/groovyRepo/conf"/>
+ <mkdir dir="target/groovyRepo/services"/>
+ <mkdir dir="target/groovyRepo/modules"/>
+ <ant:copy file="../samples/target/samples/groovyService.aar"
+ tofile="target/groovyRepo/services/groovyService.aar"/>
+ <copy file="../addressing/target/addressing.mar"
+ tofile="target/groovyRepo/modules/addressing.mar"/>
+ <copy file="../core/conf/axis2.xml"
+ tofile="target/groovyRepo/conf/axis2.xml"/>
+
+ <!--Axis2 repositories for WS-Security interop tests -->
+
+ <!-- A default repository with security and addressing modules -->
+ <mkdir dir="target/test-resources/default_security_client_repo"/>
+ <mkdir dir="target/test-resources/default_security_client_repo/conf"/>
+ <mkdir dir="target/test-resources/default_security_client_repo/modules"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/default_security_client_repo/modules/security.mar"/>
+ <copy file="../addressing/target/addressing.mar"
+ tofile="target/test-resources/default_security_client_repo/modules/addressing.mar"/>
+ <copy file="../core/conf/axis2.xml"
+ tofile="target/test-resources/default_security_client_repo/conf/axis2.xml"/>
+
+ <!-- Scenario 1 -->
+ <mkdir dir="target/test-resources/scenario1_client_repo"/>
+ <mkdir dir="target/test-resources/scenario1_client_repo/conf"/>
+ <mkdir dir="target/test-resources/scenario1_client_repo/modules"/>
+ <mkdir dir="target/test-resources/scenario1_client_repo/services"/>
+
+ <mkdir dir="target/test-resources/scenario1_service_repo"/>
+ <mkdir dir="target/test-resources/scenario1_service_repo/conf"/>
+ <mkdir dir="target/test-resources/scenario1_service_repo/services"/>
+ <mkdir dir="target/test-resources/scenario1_service_repo/modules"/>
+
+ <!-- setup scenario 1 client repository-->
+ <copy file="test-resources/security/s1.client.axis2.xml"
+ tofile="target/test-resources/scenario1_client_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario1_client_repo/modules/security.mar"/>
+
+ <!-- This is to add the PWCallback in to the classpath for the client to pick
+ the password callback class.
+ -->
+ <ant:path id="sec.interop.service.jar" location="../security/target/PingPort.aar"/>
+ <maven:addPath id="maven.dependency.classpath" refid="sec.interop.service.jar"/>
+
+ <!-- setup scenario 1 service repository-->
+ <copy file="test-resources/security/s1.service.axis2.xml"
+ tofile="target/test-resources/scenario1_service_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario1_service_repo/modules/security.mar"/>
+
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s1.service.xml"
+ tofile="../security/target/interop/classes/META-INF/services.xml"
+ overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario1_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes"/>
+
+ <!-- Scenario 2 -->
+ <mkdir dir="target/test-resources/scenario2_client_repo"/>
+ <mkdir dir="target/test-resources/scenario2_client_repo/conf"/>
+ <mkdir dir="target/test-resources/scenario2_client_repo/modules"/>
+
+ <mkdir dir="target/test-resources/scenario2_service_repo"/>
+ <mkdir dir="target/test-resources/scenario2_service_repo/conf"/>
+ <mkdir dir="target/test-resources/scenario2_service_repo/services"/>
+ <mkdir dir="target/test-resources/scenario2_service_repo/modules"/>
+
+ <!-- setup scenario 2 client repository-->
+ <copy file="test-resources/security/s2.client.axis2.xml"
+ tofile="target/test-resources/scenario2_client_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario2_client_repo/modules/security.mar"/>
+
+ <!-- setup scenario 2 service repository-->
+ <copy file="test-resources/security/s2.service.axis2.xml"
+ tofile="target/test-resources/scenario2_service_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario2_service_repo/modules/security.mar"/>
+
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s2.service.xml"
+ tofile="../security/target/interop/classes/META-INF/services.xml"
+ overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario2_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes"/>
+
+ <!-- Scenario 2a -->
+ <mkdir dir="target/test-resources/scenario2a_client_repo"/>
+ <mkdir dir="target/test-resources/scenario2a_client_repo/conf"/>
+ <mkdir dir="target/test-resources/scenario2a_client_repo/modules"/>
+
+ <mkdir dir="target/test-resources/scenario2a_service_repo"/>
+ <mkdir dir="target/test-resources/scenario2a_service_repo/conf"/>
+ <mkdir dir="target/test-resources/scenario2a_service_repo/services"/>
+ <mkdir dir="target/test-resources/scenario2a_service_repo/modules"/>
+
+ <!-- setup scenario 2a client repository-->
+ <copy file="test-resources/security/s2a.client.axis2.xml"
+ tofile="target/test-resources/scenario2a_client_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario2a_client_repo/modules/security.mar"/>
+
+ <!-- setup scenario 2a service repository-->
+ <copy file="test-resources/security/s2a.service.axis2.xml"
+ tofile="target/test-resources/scenario2a_service_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario2a_service_repo/modules/security.mar"/>
+
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s2a.service.xml"
+ tofile="../security/target/interop/classes/META-INF/services.xml"
+ overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario2a_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes"/>
+
+ <!-- Scenario 3 -->
+ <mkdir dir="target/test-resources/scenario3_client_repo"/>
+ <mkdir dir="target/test-resources/scenario3_client_repo/conf"/>
+ <mkdir dir="target/test-resources/scenario3_client_repo/modules"/>
+
+ <mkdir dir="target/test-resources/scenario3_service_repo"/>
+ <mkdir dir="target/test-resources/scenario3_service_repo/conf"/>
+ <mkdir dir="target/test-resources/scenario3_service_repo/services"/>
+ <mkdir dir="target/test-resources/scenario3_service_repo/modules"/>
+
+ <!-- setup scenario 3 client repository-->
+ <copy file="test-resources/security/s3.client.axis2.xml"
+ tofile="target/test-resources/scenario3_client_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario3_client_repo/modules/security.mar"/>
+
+ <!-- setup scenario 3 service repository-->
+ <copy file="test-resources/security/s3.service.axis2.xml"
+ tofile="target/test-resources/scenario3_service_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario3_service_repo/modules/security.mar"/>
+
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s3.service.xml"
+ tofile="../security/target/interop/classes/META-INF/services.xml"
+ overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario3_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes"/>
+
+
+ <!-- Scenario 4 -->
+ <mkdir dir="target/test-resources/scenario4_client_repo"/>
+ <mkdir dir="target/test-resources/scenario4_client_repo/conf"/>
+ <mkdir dir="target/test-resources/scenario4_client_repo/modules"/>
+
+ <mkdir dir="target/test-resources/scenario4_service_repo"/>
+ <mkdir dir="target/test-resources/scenario4_service_repo/conf"/>
+ <mkdir dir="target/test-resources/scenario4_service_repo/services"/>
+ <mkdir dir="target/test-resources/scenario4_service_repo/modules"/>
+
+ <!-- setup scenario 4 client repository-->
+ <copy file="test-resources/security/s4.client.axis2.xml"
+ tofile="target/test-resources/scenario4_client_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario4_client_repo/modules/security.mar"/>
+
+ <!-- setup scenario 4 service repository-->
+ <copy file="test-resources/security/s4.service.axis2.xml"
+ tofile="target/test-resources/scenario4_service_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario4_service_repo/modules/security.mar"/>
+
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s4.service.xml"
+ tofile="../security/target/interop/classes/META-INF/services.xml"
+ overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario4_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes"/>
+
+
+ <!-- Scenario 5 -->
+ <mkdir dir="target/test-resources/scenario5_client_repo"/>
+ <mkdir dir="target/test-resources/scenario5_client_repo/conf"/>
+ <mkdir dir="target/test-resources/scenario5_client_repo/modules"/>
+
+ <mkdir dir="target/test-resources/scenario5_service_repo"/>
+ <mkdir dir="target/test-resources/scenario5_service_repo/conf"/>
+ <mkdir dir="target/test-resources/scenario5_service_repo/services"/>
+ <mkdir dir="target/test-resources/scenario5_service_repo/modules"/>
+
+ <!-- setup scenario 5 client repository-->
+ <copy file="test-resources/security/s5.client.axis2.xml"
+ tofile="target/test-resources/scenario5_client_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario5_client_repo/modules/security.mar"/>
+
+ <!-- setup scenario 5 service repository-->
+ <copy file="test-resources/security/s5.service.axis2.xml"
+ tofile="target/test-resources/scenario5_service_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario5_service_repo/modules/security.mar"/>
+
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s5.service.xml"
+ tofile="../security/target/interop/classes/META-INF/services.xml"
+ overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario5_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes"/>
+
+
+ <!-- Scenario 6 -->
+ <mkdir dir="target/test-resources/scenario6_client_repo"/>
+ <mkdir dir="target/test-resources/scenario6_client_repo/conf"/>
+ <mkdir dir="target/test-resources/scenario6_client_repo/modules"/>
+
+ <mkdir dir="target/test-resources/scenario6_service_repo"/>
+ <mkdir dir="target/test-resources/scenario6_service_repo/conf"/>
+ <mkdir dir="target/test-resources/scenario6_service_repo/services"/>
+ <mkdir dir="target/test-resources/scenario6_service_repo/modules"/>
+
+ <!-- setup scenario 6 client repository-->
+ <copy file="test-resources/security/s6.client.axis2.xml"
+ tofile="target/test-resources/scenario6_client_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario6_client_repo/modules/security.mar"/>
+
+ <!-- setup scenario 6 service repository-->
+ <copy file="test-resources/security/s6.service.axis2.xml"
+ tofile="target/test-resources/scenario6_service_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario6_service_repo/modules/security.mar"/>
+
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s6.service.xml"
+ tofile="../security/target/interop/classes/META-INF/services.xml"
+ overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario6_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes"/>
+
+
+ <!-- Scenario 7 -->
+ <mkdir dir="target/test-resources/scenario7_client_repo"/>
+ <mkdir dir="target/test-resources/scenario7_client_repo/conf"/>
+ <mkdir dir="target/test-resources/scenario7_client_repo/modules"/>
+
+ <mkdir dir="target/test-resources/scenario7_service_repo"/>
+ <mkdir dir="target/test-resources/scenario7_service_repo/conf"/>
+ <mkdir dir="target/test-resources/scenario7_service_repo/services"/>
+ <mkdir dir="target/test-resources/scenario7_service_repo/modules"/>
+
+ <!-- setup scenario 7 client repository-->
+ <copy file="test-resources/security/s7.client.axis2.xml"
+ tofile="target/test-resources/scenario7_client_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario7_client_repo/modules/security.mar"/>
+
+ <!-- setup scenario 7 service repository-->
+ <copy file="test-resources/security/s7.service.axis2.xml"
+ tofile="target/test-resources/scenario7_service_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario7_service_repo/modules/security.mar"/>
+
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/s7.service.xml"
+ tofile="../security/target/interop/classes/META-INF/services.xml"
+ overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenario7_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes"/>
+
+
+ <!-- Copying the DOM3 stuff to the endorsed dir -->
+ <mkdir dir="target/test-resources/endorsed"/>
+ <copy file="${maven.repo.local}/xerces/jars/xercesImpl-${xerces.version}.jar"
+ todir="target/test-resources/endorsed"/>
+ <copy file="${maven.repo.local}/xml-apis/jars/xml-apis-${xml_apis.version}.jar"
+ todir="target/test-resources/endorsed"/>
+
+
+ <!-- Scenario ST1 -->
+ <mkdir dir="target/test-resources/scenarioST1_client_repo"/>
+ <mkdir dir="target/test-resources/scenarioST1_client_repo/conf"/>
+ <mkdir dir="target/test-resources/scenarioST1_client_repo/modules"/>
+
+ <mkdir dir="target/test-resources/scenarioST1_service_repo"/>
+ <mkdir dir="target/test-resources/scenarioST1_service_repo/conf"/>
+ <mkdir dir="target/test-resources/scenarioST1_service_repo/services"/>
+ <mkdir dir="target/test-resources/scenarioST1_service_repo/modules"/>
+
+ <!-- setup scenario ST1 client repository-->
+ <copy file="test-resources/security/sST1.client.axis2.xml"
+ tofile="target/test-resources/scenarioST1_client_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenarioST1_client_repo/modules/security.mar"/>
+
+ <!-- setup scenario ST1 service repository-->
+ <copy file="test-resources/security/sST1.service.axis2.xml"
+ tofile="target/test-resources/scenarioST1_service_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenarioST1_service_repo/modules/security.mar"/>
+
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/sST1.service.xml"
+ tofile="../security/target/interop/classes/META-INF/services.xml"
+ overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/scenarioST1_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes"/>
+
+
+ <!-- MTOM Optimized Security Test -->
+ <mkdir dir="target/test-resources/mtom_sec_client_repo"/>
+ <mkdir dir="target/test-resources/mtom_sec_client_repo/conf"/>
+ <mkdir dir="target/test-resources/mtom_sec_client_repo/modules"/>
+
+ <mkdir dir="target/test-resources/mtom_sec_service_repo"/>
+ <mkdir dir="target/test-resources/mtom_sec_service_repo/conf"/>
+ <mkdir dir="target/test-resources/mtom_sec_service_repo/services"/>
+ <mkdir dir="target/test-resources/mtom_sec_service_repo/modules"/>
+
+ <!-- MTOM Optimized Security Test client repository-->
+ <copy file="test-resources/security/secMtom.client.axis2.xml"
+ tofile="target/test-resources/mtom_sec_client_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/mtom_sec_client_repo/modules/security.mar"/>
+
+ <!-- MTOM Optimized Security Test service repository-->
+ <copy file="test-resources/security/secMtom.service.axis2.xml"
+ tofile="target/test-resources/mtom_sec_service_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/mtom_sec_service_repo/modules/security.mar"/>
+
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/secMtom.service.xml"
+ tofile="../security/target/interop/classes/META-INF/services.xml"
+ overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/mtom_sec_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes"/>
+
+
+ <!-- Test with addressing and MTOM -->
+ <mkdir dir="target/test-resources/complete_client_repo"/>
+ <mkdir dir="target/test-resources/complete_client_repo/conf"/>
+ <mkdir dir="target/test-resources/complete_client_repo/modules"/>
+
+ <mkdir dir="target/test-resources/complete_service_repo"/>
+ <mkdir dir="target/test-resources/complete_service_repo/conf"/>
+ <mkdir dir="target/test-resources/complete_service_repo/services"/>
+ <mkdir dir="target/test-resources/complete_service_repo/modules"/>
+
+ <!-- Test with addressing and MTOM client repository-->
+ <copy file="test-resources/security/complete.client.axis2.xml"
+ tofile="target/test-resources/complete_client_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/complete_client_repo/modules/security.mar"/>
+ <copy file="../addressing/target/addressing.mar"
+ tofile="target/test-resources/complete_client_repo/modules/addressing.mar"/>
+
+ <!-- Test with addressing and MTOMservice repository-->
+ <copy file="test-resources/security/complete.service.axis2.xml"
+ tofile="target/test-resources/complete_service_repo/conf/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/complete_service_repo/modules/security.mar"/>
+ <copy file="../addressing/target/addressing.mar"
+ tofile="target/test-resources/complete_service_repo/modules/addressing.mar"/>
+
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
+ <copy file="test-resources/security/complete.service.xml"
+ tofile="../security/target/interop/classes/META-INF/services.xml"
+ overwrite="true"/>
+
+ <!-- Create the .aar file -->
+ <jar jarfile="target/test-resources/complete_service_repo/services/PingPort.aar"
+ basedir="../security/target/interop/classes"/>
+
+
+ <!-- Standard repository -->
+ <mkdir dir="target/Repository"/>
+ <mkdir dir="target/Repository/conf"/>
+ <mkdir dir="target/Repository/services"/>
+ <mkdir dir="target/Repository/modules"/>
+ <copy file="../addressing/target/addressing.mar"
+ tofile="target/Repository/modules/addressing.mar"/>
+ <copy file="../core/conf/axis2.xml"
+ tofile="target/Repository/conf/axis2.xml"/>
+
+ <j:jelly xmlns="jelly:ant">
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true"
+ dir="test-resources/SOAP12Testing/SOAP12TestModuleB"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true"
+ dir="test-resources/SOAP12Testing/SOAP12TestModuleC"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true"
+ dir="test-resources/SOAP12Testing/SOAP12TestServiceB"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true"
+ dir="test-resources/SOAP12Testing/SOAP12TestServiceC"/>
+ </j:jelly>
+ </j:if>
</postGoal>
<postGoal name="test:test">
<attainGoal name="mail-tests"/>
</postGoal>
-
+
<goal name="mail-tests">
- <!-- TODO call the Mail tests if the mail jar is presents
- <j:if test="${maven.repo.local}/j2ee/jars/mail.jar">
- <ant:ant antfile="script/mail-test.xml" inheritall="true" inheritrefs="true" dir="."/>
- </j:if>
- maven -Dtestcase=org.foo.bar.MyTest test:single-test
- -->
+ <!-- TODO call the Mail tests if the mail jar is presents
+ <j:if test="${maven.repo.local}/j2ee/jars/mail.jar">
+ <ant:ant antfile="script/mail-test.xml" inheritall="true" inheritrefs="true" dir="."/>
+ </j:if>
+ maven -Dtestcase=org.foo.bar.MyTest test:single-test
+ -->
</goal>
<!-- ================================================================ -->
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java Tue Jan 17 20:24:14 2006
@@ -56,7 +56,8 @@
options.setSoapAction(soapAction);
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
ConfigurationContext configContext =
- new ConfigurationContextFactory().createConfigurationContextFromFileSystem(clientHome);
+ new ConfigurationContextFactory().createConfigurationContextFromFileSystem(clientHome,
+ null);
ServiceClient serviceClient = new ServiceClient(configContext, null);
SOAPEnvelope reqEnv = util.getEchoSoapEnvelope();
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java?rev=370041&r1=370040&r2=370041&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java Tue Jan 17 20:24:14 2006
@@ -55,7 +55,7 @@
ConfigurationContext configContext =
new ConfigurationContextFactory().createConfigurationContextFromFileSystem(
- "target/test-resources/integrationRepo");
+ "target/test-resources/integrationRepo",null);
ServiceClient serviceClient = new ServiceClient(configContext, null);
serviceClient.setOptions(options);
OperationClient opClient = serviceClient.createClient(ServiceClient.ANON_OUT_IN_OP);