Skip to content
Permalink
Browse files
Remove some more deprectated stuff and unused properties
git-svn-id: https://svn.apache.org/repos/asf/cxf/trunk@1556048 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
dkulp committed Jan 6, 2014
1 parent 93ea062 commit 8eb0e72d3da0247bcea0a29fcdc29946c2fc4c73
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 92 deletions.
@@ -18,7 +18,6 @@
# under the License.
#
#
DEPRECATED_EXTENSIONS = Loading Bus extensions via {0} (found url {1}) is deprecated. Use {2} instead.
PROBLEM_LOADING_EXTENSION_CLASS = Could not load extension class {0}.
PROBLEM_CREATING_EXTENSION_CLASS = Could not create object of extension class {0}.
PROBLEM_FINDING_CONSTRUCTOR = Could not find constructor for class {0} for args {1}.
@@ -25,5 +25,3 @@ USER_CFG_FILE_URL_NOT_FOUND_MSG = Could not find the configuration file in the u
APP_CONTEXT_CREATION_FAILED_MSG = Failed to create application context.
INITIAL_APP_CONTEXT_CREATION_FAILED_MSG = Initial attempt to create application context was unsuccessful.
USER_CFG_FILE_NOT_LOADED=Failed to load configuration {0}
DEPRECATED_IMPORT=Import of META-INF/cxf/{0} has been deprecated and is unnecessary.
DEPRECATED_OBJECT_RETRIEVAL=Depending on Object {0} from Spring has been deprecated.
@@ -105,20 +105,6 @@ protected static void convertToQNamesMap(Map<String, String> map,
}
}

/*
* @deprecated
*/
protected static void convertToMapOfQNames(Map<String, String> map,
Map<QName, QName> elementsMap) {
if (map != null) {
for (Map.Entry<String, String> entry : map.entrySet()) {
QName lname = DOMUtils.convertStringToQName(entry.getKey());
QName rname = DOMUtils.convertStringToQName(entry.getValue());
elementsMap.put(lname, rname);
}
}
}

static void convertToMapOfElementProperties(Map<String, String> map,
Map<QName, ElementProperty> elementsMap) {
if (map != null) {
@@ -41,13 +41,6 @@

public abstract class AbstractSoapInterceptor extends AbstractPhaseInterceptor<SoapMessage>
implements SoapInterceptor {

/**
* @deprecated
*/
public AbstractSoapInterceptor() {
super(null);
}

public AbstractSoapInterceptor(String p) {
super(p);
@@ -350,16 +350,6 @@ public void setRootClassNames(Set<String> classNames) {
rootClassNames = classNames;
}

/**
* Return the type mapping configuration associated with this context.
*
* @return Returns the configuration.
* @deprecated 2.1
*/
public TypeCreationOptions getConfiguration() {
return configuration;
}

/**
* Return the type mapping configuration associated with this context.
*
@@ -369,16 +359,6 @@ public TypeCreationOptions getTypeCreationOptions() {
return configuration;
}

/**
* Set the configuration object. The configuration specifies default type mapping behaviors.
*
* @param configuration The configuration to set.
* @deprecated 2.1
*/
public void setConfiguration(TypeCreationOptions newConfiguration) {
this.configuration = newConfiguration;
}

/**
* Set the configuration object. The configuration specifies default type mapping behaviors.
*

This file was deleted.

@@ -43,6 +43,7 @@
import org.apache.cxf.BusException;
import org.apache.cxf.BusFactory;
import org.apache.cxf.aegis.databinding.AegisDatabinding;
import org.apache.cxf.aegis.databinding.XFireCompatibilityServiceConfiguration;
import org.apache.cxf.aegis.type.AegisType;
import org.apache.cxf.aegis.xml.stax.ElementWriter;
import org.apache.cxf.binding.BindingFactoryManager;
@@ -73,7 +74,6 @@
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.constants.Constants;
import org.apache.ws.commons.schema.utils.NamespaceMap;

import org.junit.Before;

public abstract class AbstractAegisTest extends AbstractCXFTest {
@@ -212,7 +212,6 @@ protected void setupAegis(AbstractWSDLBasedEndpointFactory sf) {
setupAegis(sf, null);
}

@SuppressWarnings("deprecation")
protected void setupAegis(AbstractWSDLBasedEndpointFactory sf, AegisDatabinding binding) {
if (binding == null) {
AegisContext context = new AegisContext();
@@ -227,7 +226,7 @@ protected void setupAegis(AbstractWSDLBasedEndpointFactory sf, AegisDatabinding
}
}
sf.getServiceFactory().getServiceConfigurations()
.add(0, new org.apache.cxf.aegis.databinding.AegisServiceConfiguration());
.add(0, new XFireCompatibilityServiceConfiguration());
sf.getServiceFactory().setDataBinding(binding);
}

@@ -86,12 +86,6 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
<!-- Remove when deprecated JAXBToStringBuilder is removed -->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>

0 comments on commit 8eb0e72

Please sign in to comment.