You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2009/01/13 20:27:35 UTC
svn commit: r734223 -
/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFCatalogUtils.java
Author: gawor
Date: Tue Jan 13 11:27:31 2009
New Revision: 734223
URL: http://svn.apache.org/viewvc?rev=734223&view=rev
Log:
fix oasis catalog support for CXF (GERONIMO-4501)
Modified:
geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFCatalogUtils.java
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFCatalogUtils.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFCatalogUtils.java?rev=734223&r1=734222&r2=734223&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFCatalogUtils.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFCatalogUtils.java Tue Jan 13 11:27:31 2009
@@ -27,7 +27,6 @@
import org.slf4j.LoggerFactory;
import org.apache.cxf.Bus;
import org.apache.cxf.catalog.OASISCatalogManager;
-import org.apache.xml.resolver.Catalog;
public class CXFCatalogUtils {
@@ -57,7 +56,7 @@
try {
catalog.loadCatalog(catalogURL);
LOG.debug("Loaded " + catalogURL + " catalog.");
- bus.setExtension(catalog.getCatalog(), Catalog.class);
+ bus.setExtension(catalog, OASISCatalogManager.class);
} catch (IOException e) {
LOG.warn("Failed to load catalog file: " + catalogURL, e);
}