Author: dkulp
Date: Thu Jun 6 18:28:03 2013
New Revision: 1490389
URL: http://svn.apache.org/r1490389
Log:
Remove a deprecated constructor
Remove support for the old XML version of the extensions
Removed:
cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/bus/extension/XmlExtensionFragmentParser.java
cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/bus/extension/XmlExtensionFragmentParserTest.java
cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/bus/extension/extension1.xml
Modified:
cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/interceptor/AbstractEndpointSelectionInterceptor.java
cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
Modified:
cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/interceptor/AbstractEndpointSelectionInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/interceptor/AbstractEndpointSelectionInterceptor.java?rev=1490389&r1=1490388&r2=1490389&view=diff
==============================================================================
---
cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/interceptor/AbstractEndpointSelectionInterceptor.java
(original)
+++
cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/interceptor/AbstractEndpointSelectionInterceptor.java
Thu Jun 6 18:28:03 2013
@@ -30,15 +30,7 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.transport.MultipleEndpointObserver;
public abstract class AbstractEndpointSelectionInterceptor extends
AbstractPhaseInterceptor<Message> {
-
- /**
- * @deprecated
- */
- public AbstractEndpointSelectionInterceptor() {
- super(null);
- }
-
-
+
public AbstractEndpointSelectionInterceptor(String phase) {
super(phase);
}
Modified:
cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
URL:
http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java?rev=1490389&r1=1490388&r2=1490389&view=diff
==============================================================================
---
cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
(original)
+++
cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
Thu Jun 6 18:28:03 2013
@@ -165,11 +165,7 @@ public class ExtensionManagerBus extends
if (null == this.getExtension(BindingFactoryManager.class)) {
new BindingFactoryManagerImpl(this);
}
- extensionManager.load(new String[] {
- ExtensionManagerImpl.BUS_EXTENSION_RESOURCE,
- ExtensionManagerImpl.BUS_EXTENSION_RESOURCE_XML,
- ExtensionManagerImpl.BUS_EXTENSION_RESOURCE_OLD_XML});
-
+ extensionManager.load(new String[]
{ExtensionManagerImpl.BUS_EXTENSION_RESOURCE});
extensionManager.activateAllByType(ResourceResolver.class);
extensions.put(ExtensionManager.class, extensionManager);
Modified:
cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java?rev=1490389&r1=1490388&r2=1490389&view=diff
==============================================================================
---
cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
(original)
+++
cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
Thu Jun 6 18:28:03 2013
@@ -29,7 +29,6 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.cxf.Bus;
@@ -49,8 +48,6 @@ public class ExtensionManagerImpl implem
public static final String EXTENSIONMANAGER_PROPERTY_NAME =
"extensionManager";
public static final String ACTIVATION_NAMESPACES_PROPERTY_NAME =
"activationNamespaces";
public static final String ACTIVATION_NAMESPACES_SETTER_METHOD_NAME =
"setActivationNamespaces";
- public static final String BUS_EXTENSION_RESOURCE_XML =
"META-INF/cxf/bus-extensions.xml";
- public static final String BUS_EXTENSION_RESOURCE_OLD_XML =
"bus-extensions.xml";
public static final String BUS_EXTENSION_RESOURCE =
"META-INF/cxf/bus-extensions.txt";
private final ClassLoader loader;
@@ -61,8 +58,7 @@ public class ExtensionManagerImpl implem
public ExtensionManagerImpl(ClassLoader cl, Map<Class<?>, Object>
initialExtensions,
ResourceManager rm, Bus b) {
- this(new String[] {BUS_EXTENSION_RESOURCE, BUS_EXTENSION_RESOURCE_XML,
- BUS_EXTENSION_RESOURCE_OLD_XML},
+ this(new String[] {BUS_EXTENSION_RESOURCE},
cl, initialExtensions, rm, b);
}
public ExtensionManagerImpl(String resource,
@@ -153,7 +149,6 @@ public class ExtensionManagerImpl implem
}
load(resource, loader);
}
- @SuppressWarnings("deprecation")
final synchronized void load(String resource, ClassLoader l) throws
IOException {
Enumeration<URL> urls = l.getResources(resource);
@@ -162,14 +157,7 @@ public class ExtensionManagerImpl implem
URL url = urls.nextElement();
InputStream is = url.openStream();
try {
- List<Extension> exts;
- if (resource.endsWith("xml")) {
- LOG.log(Level.WARNING, "DEPRECATED_EXTENSIONS",
- new Object[] {resource, url,
BUS_EXTENSION_RESOURCE});
- exts = new XmlExtensionFragmentParser().getExtensions(is);
- } else {
- exts = new TextExtensionFragmentParser().getExtensions(is);
- }
+ List<Extension> exts = new
TextExtensionFragmentParser().getExtensions(is);
for (Extension e : exts) {
if (loader != l) {
e.classloader = l;
