You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2007/04/09 18:57:32 UTC
svn commit: r526827 [2/2] - in /webservices/axis2/trunk/java/modules:
adb/src/org/apache/axis2/rpc/receivers/
integration/test/org/apache/axis2/async/
integration/test/org/apache/axis2/engine/
integration/test/org/apache/axis2/engine/util/ integration/...
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/OperationExcludeTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/OperationExcludeTest.java?view=diff&rev=526827&r1=526826&r2=526827
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/OperationExcludeTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/OperationExcludeTest.java Mon Apr 9 09:57:27 2007
@@ -2,6 +2,7 @@
import junit.framework.TestCase;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.AbstractTestCase;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.engine.AxisConfiguration;
@@ -34,7 +35,7 @@
DeploymentException,
AxisFault,
XMLStreamException {
- String filename = System.getProperty("basedir") + "/test-resources/deployment/exculeRepo";
+ String filename = AbstractTestCase.basedir + "/test-resources/deployment/exculeRepo";
er = ConfigurationContextFactory.createConfigurationContextFromFileSystem(filename, null)
.getAxisConfiguration();
AxisService service = er.getService("excludeService");
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ServiceGroupTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ServiceGroupTest.java?view=diff&rev=526827&r1=526826&r2=526827
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ServiceGroupTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ServiceGroupTest.java Mon Apr 9 09:57:27 2007
@@ -18,6 +18,7 @@
import junit.framework.TestCase;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.AbstractTestCase;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
@@ -25,7 +26,7 @@
public class ServiceGroupTest extends TestCase {
AxisConfiguration ar;
- String repo = System.getProperty("basedir") + "/test-resources/deployment/serviceGroupRepo";
+ String repo = AbstractTestCase.basedir + "/test-resources/deployment/serviceGroupRepo";
protected void setUp() throws Exception {
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/TransportDeploymentTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/TransportDeploymentTest.java?view=diff&rev=526827&r1=526826&r2=526827
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/TransportDeploymentTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/TransportDeploymentTest.java Mon Apr 9 09:57:27 2007
@@ -37,7 +37,7 @@
PhaseException,
DeploymentException,
XMLStreamException {
- String repositoryName = System.getProperty("basedir") + "/target/test-resources/deployment";
+ String repositoryName = AbstractTestCase.basedir + "/target/test-resources/deployment";
File repo = new File(repositoryName);
String xmlFile = repositoryName + "/server-transport.xml";
File xml = new File(xmlFile);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleConfigTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleConfigTest.java?view=diff&rev=526827&r1=526826&r2=526827
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleConfigTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleConfigTest.java Mon Apr 9 09:57:27 2007
@@ -18,6 +18,7 @@
import junit.framework.TestCase;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.AbstractTestCase;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.deployment.DeploymentException;
@@ -36,9 +37,9 @@
public class ModuleConfigTest extends TestCase {
AxisConfiguration ar;
- String axis2xml = System.getProperty("basedir") +
+ String axis2xml = AbstractTestCase.basedir +
"/target/test-resources/deployment/moduleConfig/axis2.xml";
- String repo = System.getProperty("basedir") + "/target/test-resources/deployment/moduleConfig";
+ String repo = AbstractTestCase.basedir + "/target/test-resources/deployment/moduleConfig";
public void testModuleConfigAtAxisConfig() {
try {
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleEngageTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleEngageTest.java?view=diff&rev=526827&r1=526826&r2=526827
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleEngageTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleEngageTest.java Mon Apr 9 09:57:27 2007
@@ -18,6 +18,7 @@
import junit.framework.TestCase;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.AbstractTestCase;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.deployment.DeploymentException;
import org.apache.axis2.description.AxisModule;
@@ -35,7 +36,7 @@
DeploymentException,
AxisFault,
XMLStreamException {
- String filename = System.getProperty("basedir") + "/target/test-resources/deployment";
+ String filename = AbstractTestCase.basedir + "/target/test-resources/deployment";
ac = ConfigurationContextFactory.createConfigurationContextFromFileSystem(filename, null)
.getAxisConfiguration();
AxisModule module = ac.getModule("module1");
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/action/Action.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/action/Action.java?view=diff&rev=526827&r1=526826&r2=526827
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/action/Action.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/action/Action.java Mon Apr 9 09:57:27 2007
@@ -19,6 +19,7 @@
import org.apache.axis2.java.security.driver.Java2SecTest;
import org.apache.axis2.java.security.interf.Actor;
+import org.apache.axis2.AbstractTestCase;
import java.io.CharArrayWriter;
import java.io.FileReader;
@@ -44,7 +45,7 @@
public void takeAction() {
try {
// Print out maven's base,build, and test direcotories
- String baseDir = System.getProperty("basedir");
+ String baseDir = AbstractTestCase.basedir;
System.out.println("basedir => " + baseDir);
String buildDir = System.getProperty("maven_build_dir");
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/driver/Java2SecTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/driver/Java2SecTest.java?view=diff&rev=526827&r1=526826&r2=526827
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/driver/Java2SecTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/driver/Java2SecTest.java Mon Apr 9 09:57:27 2007
@@ -28,6 +28,7 @@
import org.apache.axis2.java.security.more.MorePermission;
import org.apache.axis2.java.security.more.MorePermissionAccessControlContext;
import org.apache.axis2.java.security.more.MorePermissionPrivilegedExceptionAction;
+import org.apache.axis2.AbstractTestCase;
import java.security.AccessControlException;
import java.security.Permission;
@@ -448,7 +449,7 @@
try {
// Print out maven's base,build, and test direcotories
- String baseDir = System.getProperty("basedir");
+ String baseDir = AbstractTestCase.basedir;
System.out.println("basedir => " + baseDir);
// Convert the \ (back slash) to / (forward slash)
String baseDirM = baseDir.replace('\\', '/');
@@ -504,7 +505,7 @@
try {
// Print out maven's base,build, and test direcotories
- String baseDir = System.getProperty("basedir");
+ String baseDir = AbstractTestCase.basedir;
System.out.println("basedir => " + baseDir);
// Convert the \ (back slash) to / (forward slash)
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/more/MorePermissionAccessControlContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/more/MorePermissionAccessControlContext.java?view=diff&rev=526827&r1=526826&r2=526827
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/more/MorePermissionAccessControlContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/more/MorePermissionAccessControlContext.java Mon Apr 9 09:57:27 2007
@@ -18,6 +18,7 @@
import org.apache.axis2.java.security.AccessController;
import org.apache.axis2.java.security.interf.Actor;
+import org.apache.axis2.AbstractTestCase;
import java.security.AccessControlContext;
import java.security.Permission;
@@ -45,7 +46,7 @@
if (_usingDoPrivilege) {
final AccessControlContext acc = AccessController.getContext();
// Print out maven's base,build, and test direcotories
- String baseDir = System.getProperty("basedir");
+ String baseDir = AbstractTestCase.basedir;
System.out.println("basedir => " + baseDir);
// Convert the \ (back slash) to / (forward slash)
Modified: webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/AnnotationProviderImplDescriptionTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/AnnotationProviderImplDescriptionTests.java?view=diff&rev=526827&r1=526826&r2=526827
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/AnnotationProviderImplDescriptionTests.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/AnnotationProviderImplDescriptionTests.java Mon Apr 9 09:57:27 2007
@@ -128,8 +128,7 @@
public void testNoWebServiceProvider() {
// Use the description factory directly; this will be done within the JAX-WS runtime
try {
- ServiceDescription serviceDesc =
- DescriptionFactory.createServiceDescription(NoWebServiceProviderTestImpl.class);
+ DescriptionFactory.createServiceDescription(NoWebServiceProviderTestImpl.class);
fail("Expected WebServiceException not caught");
}
catch (WebServiceException e) {
@@ -144,9 +143,7 @@
public void testBothWebServiceAnnotations() {
// Use the description factory directly; this will be done within the JAX-WS runtime
try {
- ServiceDescription serviceDesc =
- DescriptionFactory
- .createServiceDescription(BothWebServiceAnnotationTestImpl.class);
+ DescriptionFactory.createServiceDescription(BothWebServiceAnnotationTestImpl.class);
fail("Expected WebServiceException not caught");
}
catch (WebServiceException e) {
Modified: webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/DescriptionTestUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/DescriptionTestUtils.java?view=diff&rev=526827&r1=526826&r2=526827
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/DescriptionTestUtils.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/DescriptionTestUtils.java Mon Apr 9 09:57:27 2007
@@ -42,7 +42,7 @@
static public URL getWSDLURL(String wsdlFileName) {
URL wsdlURL = null;
// Get the URL to the WSDL file. Note that 'basedir' is setup by Maven
- String basedir = System.getProperty("basedir");
+ String basedir = System.getProperty("basedir", ".");
String urlString = "file://localhost/" + basedir + "/test-resources/wsdl/" + wsdlFileName;
try {
wsdlURL = new URL(urlString);
Modified: webservices/axis2/trunk/java/modules/saaj/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test-resources/axis2.xml?view=diff&rev=526827&r1=526826&r2=526827
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test-resources/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj/test-resources/axis2.xml Mon Apr 9 09:57:27 2007
@@ -111,8 +111,26 @@
<phase name="MessageOut"/>
</phaseOrder>
<phaseOrder type="InFaultFlow">
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
+ <handler name="SOAPMessageBodyBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ <handler name="HTTPLocationBasedDispatcher"
+ class="org.apache.axis2.engine.HTTPLocationBasedDispatcher"/>
+ <handler name="InstanceDispatcher"
+ class="org.apache.axis2.engine.InstanceDispatcher"/>
+ </phase>
<!-- user can add his own phases to this area -->
- <phase name="userphase1"/>
+ <phase name="OperationInFaultPhase"/>
+ <phase name="soapmonitorPhase"/>
</phaseOrder>
<phaseOrder type="OutFaultFlow">
<!-- user can add his own phases to this area -->
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java?view=diff&rev=526827&r1=526826&r2=526827
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java Mon Apr 9 09:57:27 2007
@@ -106,7 +106,7 @@
assertFalse(response.getAttachments().hasNext());
assertEquals(0, response.countAttachments());
- String requestStr = printSOAPMessage(request);
+ printSOAPMessage(request);
String responseStr = printSOAPMessage(response);
assertTrue(responseStr.indexOf("echo") != -1);
sCon.close();
@@ -221,7 +221,6 @@
Iterator attachIter = response.getAttachments();
- int i = 0;
while (attachIter.hasNext()) {
AttachmentPart attachment = (AttachmentPart)attachIter.next();
final Object content = attachment.getDataHandler().getContent();
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java?view=diff&rev=526827&r1=526826&r2=526827
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java Mon Apr 9 09:57:27 2007
@@ -86,8 +86,8 @@
throws Exception {
File file = new File(repository);
if (!file.exists()) {
- throw new Exception("repository directory "
- + file.getAbsolutePath() + " does not exists");
+ throw new Exception("repository directory " + file.getAbsolutePath() +
+ " does not exist");
}
return ConfigurationContextFactory
.createConfigurationContextFromFileSystem(file.getAbsolutePath(), null);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org