You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2012/06/12 04:29:38 UTC
svn commit: r1349097 -
/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AxisServiceGenerator.java
Author: xuhaihong
Date: Tue Jun 12 02:29:38 2012
New Revision: 1349097
URL: http://svn.apache.org/viewvc?rev=1349097&view=rev
Log:
GERONIMO-6364 jaxws-catalog-tests test failed for UnknownHostException, use the new parse method to load the jax-ws-catalog.xml file.
Modified:
geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AxisServiceGenerator.java
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AxisServiceGenerator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AxisServiceGenerator.java?rev=1349097&r1=1349096&r2=1349097&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AxisServiceGenerator.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AxisServiceGenerator.java Tue Jun 12 02:29:38 2012
@@ -59,6 +59,7 @@ import org.apache.geronimo.jaxws.JAXWSUt
import org.apache.geronimo.jaxws.PortInfo;
import org.apache.ws.commons.schema.utils.NamespaceMap;
import org.apache.xbean.osgi.bundle.util.BundleUtils;
+import org.apache.xml.resolver.Catalog;
import org.osgi.framework.Bundle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -154,7 +155,12 @@ public class AxisServiceGenerator
OASISCatalogManager catalogManager = new OASISCatalogManager();
URL catalogURL = JAXWSUtils.getOASISCatalogURL(bundle, this.catalogName);
if (catalogURL != null) {
- catalogManager.setCatalogFiles(catalogURL.toString());
+ Catalog catalog = catalogManager.getCatalog();
+ catalog.parseCatalog(catalogURL);
+ //The default logic in the Catalog.parseCatalogFile(String) method always assume that the URL is file-based
+ //This is not correct in OSGi environment, so considering that one Catalog instance will be shared per OASISCatalogManager
+ //instance, we will call the parseCatalog(URL) to add the file
+ //catalogManager.setCatalogFiles(catalogURL.toString());
}
URL wsdlURL = getWsdlURL(wsdlFile, bundle);
WSDL4JWrapper wsdlWrapper = new WSDL4JWrapper(wsdlURL, this.configurationContext, catalogManager);