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 di...@apache.org on 2008/02/27 06:16:29 UTC
svn commit: r631488 - in /webservices/axis2/trunk/java/modules:
jaxws/test/org/apache/axis2/jaxws/catalog/MultiRedirectionCatalogTest.java
metadata/src/org/apache/axis2/jaxws/util/BaseWSDLLocator.java
Author: dims
Date: Tue Feb 26 21:16:27 2008
New Revision: 631488
URL: http://svn.apache.org/viewvc?rev=631488&view=rev
Log:
get MultiRedirectionCatalogTest to pass with HACK from brian on the axis-dev list
Modified:
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/catalog/MultiRedirectionCatalogTest.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/util/BaseWSDLLocator.java
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/catalog/MultiRedirectionCatalogTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/catalog/MultiRedirectionCatalogTest.java?rev=631488&r1=631487&r2=631488&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/catalog/MultiRedirectionCatalogTest.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/catalog/MultiRedirectionCatalogTest.java Tue Feb 26 21:16:27 2008
@@ -41,7 +41,7 @@
*/
public class MultiRedirectionCatalogTest extends TestCase {
private static final String ROOT_WSDL = "/test-resources/catalog/root.wsdl";
- private static final String TEST_RESOURCES = "test-resources/catalog/";
+ private static final String TEST_RESOURCES = "/test-resources/catalog/";
public void testOneCatalogSuccess() {
verifySuccess(ROOT_WSDL, TEST_RESOURCES + "basic-catalog.xml");
@@ -71,11 +71,11 @@
* Ensure that the catalog is used to locate imported resources.
*/
private void verifySuccess(String wsdlLocation, String catalogFile) {
- URL url = getURLFromLocatoinString(wsdlLocation);
+ URL url = getURLFromLocation(wsdlLocation);
try{
OASISCatalogManager catalogManager = new OASISCatalogManager();
- catalogManager.setCatalogFiles(catalogFile);
+ catalogManager.setCatalogFiles(getAbsolutePath(catalogFile));
WSDL4JWrapper w4j = new WSDL4JWrapper(url, catalogManager);
Definition wsdlDef = w4j.getDefinition();
assertNotNull(wsdlDef);
@@ -103,11 +103,11 @@
* catalog entry.
*/
private void verifyFailure(String wsdlLocation, String catalogFile) {
- URL url = getURLFromLocatoinString(wsdlLocation);
+ URL url = getURLFromLocation(wsdlLocation);
try{
OASISCatalogManager catalogManager = new OASISCatalogManager();
- catalogManager.setCatalogFiles(catalogFile);
+ catalogManager.setCatalogFiles(getAbsolutePath(catalogFile));
WSDL4JWrapper w4j = new WSDL4JWrapper(url, catalogManager);
w4j.getDefinition();
fail("Should have received a WSDLException due to the invalid WSDL location "
@@ -125,7 +125,7 @@
* @param wsdlLocation
* @return
*/
- private URL getURLFromLocatoinString(String wsdlLocation) {
+ private URL getURLFromLocation(String wsdlLocation) {
URL url = null;
try {
try{
@@ -143,5 +143,16 @@
}
return url;
+ }
+
+ private String getAbsolutePath(String location) {
+ try {
+ String baseDir = new File(System.getProperty("basedir",".")).getCanonicalPath();
+ return new File(baseDir + location).getAbsolutePath();
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ return null;
+ }
}
}
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/util/BaseWSDLLocator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/util/BaseWSDLLocator.java?rev=631488&r1=631487&r2=631488&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/util/BaseWSDLLocator.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/util/BaseWSDLLocator.java Tue Feb 26 21:16:27 2008
@@ -101,7 +101,15 @@
lastestImportURI = absoluteURL.toExternalForm();
}
catch(Throwable t){
- //No FFDC code needed
+ if (relativeLocation.startsWith("file://")) {
+ try {
+ relativeLocation = "file:/" + relativeLocation.substring("file://".length());
+ absoluteURL = new URL(relativeLocation);
+ is = absoluteURL.openStream();
+ lastestImportURI = absoluteURL.toExternalForm();
+ } catch (Throwable t2) {
+ }
+ }
}
if(is == null){
try{
@@ -269,4 +277,4 @@
}
return pathToRelativeLocation.toString();
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org