You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/01/06 23:09:08 UTC
svn commit: r1556048 - in /cxf/trunk:
core/src/main/java/org/apache/cxf/bus/extension/
core/src/main/java/org/apache/cxf/bus/spring/
core/src/main/java/org/apache/cxf/staxutils/transform/
rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/inter...
Author: dkulp
Date: Mon Jan 6 22:09:07 2014
New Revision: 1556048
URL: http://svn.apache.org/r1556048
Log:
Remove some more deprectated stuff and unused properties
Removed:
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java
Modified:
cxf/trunk/core/src/main/java/org/apache/cxf/bus/extension/Messages.properties
cxf/trunk/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties
cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
cxf/trunk/rt/databinding/jaxb/pom.xml
Modified: cxf/trunk/core/src/main/java/org/apache/cxf/bus/extension/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/bus/extension/Messages.properties?rev=1556048&r1=1556047&r2=1556048&view=diff
==============================================================================
--- cxf/trunk/core/src/main/java/org/apache/cxf/bus/extension/Messages.properties (original)
+++ cxf/trunk/core/src/main/java/org/apache/cxf/bus/extension/Messages.properties Mon Jan 6 22:09:07 2014
@@ -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}.
\ No newline at end of file
Modified: cxf/trunk/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties?rev=1556048&r1=1556047&r2=1556048&view=diff
==============================================================================
--- cxf/trunk/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties (original)
+++ cxf/trunk/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties Mon Jan 6 22:09:07 2014
@@ -25,5 +25,3 @@ USER_CFG_FILE_URL_NOT_FOUND_MSG = Could
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.
\ No newline at end of file
Modified: cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java?rev=1556048&r1=1556047&r2=1556048&view=diff
==============================================================================
--- cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java (original)
+++ cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java Mon Jan 6 22:09:07 2014
@@ -105,20 +105,6 @@ public final class TransformUtils {
}
}
- /*
- * @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) {
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java?rev=1556048&r1=1556047&r2=1556048&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java Mon Jan 6 22:09:07 2014
@@ -41,13 +41,6 @@ import org.apache.cxf.staxutils.StaxUtil
public abstract class AbstractSoapInterceptor extends AbstractPhaseInterceptor<SoapMessage>
implements SoapInterceptor {
-
- /**
- * @deprecated
- */
- public AbstractSoapInterceptor() {
- super(null);
- }
public AbstractSoapInterceptor(String p) {
super(p);
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java?rev=1556048&r1=1556047&r2=1556048&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java Mon Jan 6 22:09:07 2014
@@ -354,16 +354,6 @@ public class AegisContext {
* 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.
- *
- * @return Returns the configuration.
*/
public TypeCreationOptions getTypeCreationOptions() {
return configuration;
@@ -373,16 +363,6 @@ public class AegisContext {
* 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.
- *
- * @param configuration The configuration to set.
*/
public void setTypeCreationOptions(TypeCreationOptions newConfiguration) {
this.configuration = newConfiguration;
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java?rev=1556048&r1=1556047&r2=1556048&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java Mon Jan 6 22:09:07 2014
@@ -43,6 +43,7 @@ import org.apache.cxf.Bus;
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.cxf.wsdl11.WSDLManager
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 @@ public abstract class AbstractAegisTest
setupAegis(sf, null);
}
- @SuppressWarnings("deprecation")
protected void setupAegis(AbstractWSDLBasedEndpointFactory sf, AegisDatabinding binding) {
if (binding == null) {
AegisContext context = new AegisContext();
@@ -227,7 +226,7 @@ public abstract class AbstractAegisTest
}
}
sf.getServiceFactory().getServiceConfigurations()
- .add(0, new org.apache.cxf.aegis.databinding.AegisServiceConfiguration());
+ .add(0, new XFireCompatibilityServiceConfiguration());
sf.getServiceFactory().setDataBinding(binding);
}
Modified: cxf/trunk/rt/databinding/jaxb/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/pom.xml?rev=1556048&r1=1556047&r2=1556048&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/pom.xml (original)
+++ cxf/trunk/rt/databinding/jaxb/pom.xml Mon Jan 6 22:09:07 2014
@@ -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>