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 2011/01/05 19:43:13 UTC
svn commit: r1055573 - in /cxf/trunk:
integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/
integration/jca/src/main/java/org/apache/cxf/jca/cxf/
integration/jca/src/test/java/org/apache/cxf/jca/cxf/
rt/bindings/soap/src/main/java/org/...
Author: dkulp
Date: Wed Jan 5 18:43:13 2011
New Revision: 1055573
URL: http://svn.apache.org/viewvc?rev=1055573&view=rev
Log:
Remove a bunch of stuff that has long been deprecated.
Removed:
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionOutInterceptor.java
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/InitializingPolicyEngine.java
Modified:
cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java
cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap11.java
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap12.java
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersion.java
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http-server.xml
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http.xml
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm.xml
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl_server.xml
Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java?rev=1055573&r1=1055572&r2=1055573&view=diff
==============================================================================
--- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java (original)
+++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java Wed Jan 5 18:43:13 2011
@@ -38,11 +38,6 @@ public class ResourceBean implements Ser
public static final String DEFAULT_VALUE_STRING = "DEFAULT";
public static final String LOG_LEVEL = "log.level";
- @Deprecated
- public static final String CONFIG_DOMAIN = "cxf";
- @Deprecated
- public static final String CONFIG_SCOPE = "j2ee";
-
public static final String DEFAULT_MONITOR_POLL_INTERVAL = "120";
public static final String EJB_SERVICE_PROPERTIES_URL = "ejb.service.properties.url";
public static final String MONITOR_EJB_SERVICE_PROPERTIES = "monitor.ejb.service.properties";
Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java?rev=1055573&r1=1055572&r2=1055573&view=diff
==============================================================================
--- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java (original)
+++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java Wed Jan 5 18:43:13 2011
@@ -60,16 +60,6 @@ public class ManagedConnectionFactoryImp
public void setLogLevel(String logLevel) {
setProperty(LOG_LEVEL, logLevel);
}
-
- @Deprecated
- public void setConfigurationDomain(String name) {
- setProperty(CONFIG_DOMAIN, name);
- }
-
- @Deprecated
- public void setConfigurationScope(String name) {
- setProperty(CONFIG_SCOPE, name);
- }
public void setEJBServicePropertiesURL(String name) {
setProperty(EJB_SERVICE_PROPERTIES_URL, name);
@@ -86,17 +76,7 @@ public class ManagedConnectionFactoryImp
public String getLogLevel() {
return getPluginProps().getProperty(LOG_LEVEL);
}
-
- @Deprecated
- public String getConfigurationDomain() {
- return getPluginProps().getProperty(CONFIG_DOMAIN, CONFIG_DOMAIN);
- }
-
- @Deprecated
- public String getConfigurationScope() {
- return getPluginProps().getProperty(CONFIG_SCOPE, CONFIG_SCOPE);
- }
-
+
public String getEJBServicePropertiesURL() {
return getPluginProps().getProperty(EJB_SERVICE_PROPERTIES_URL);
}
Modified: cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java?rev=1055573&r1=1055572&r2=1055573&view=diff
==============================================================================
--- cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java (original)
+++ cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java Wed Jan 5 18:43:13 2011
@@ -73,47 +73,6 @@ public class ManagedConnectionFactoryImp
new QName("fooPort3"));
}
- @SuppressWarnings("deprecation")
- @Test
- public void testSetConfigurationDomain() throws Exception {
- final String domainName = "SomeDomain";
- Properties p = new Properties();
- ManagedConnectionFactoryImpl mcf = new ManagedConnectionFactoryImpl(p);
-
- mcf.setConfigurationDomain(domainName);
- assertTrue(p.containsValue(domainName));
- assertEquals(domainName, mcf.getConfigurationDomain());
- }
-
- @SuppressWarnings("deprecation")
- @Test
- public void testGetConfigurationDomainReturnsDefaultValue() throws Exception {
- Properties p = new Properties();
- ManagedConnectionFactoryImpl mcf = new ManagedConnectionFactoryImpl(p);
- assertEquals(ManagedConnectionFactoryImpl.CONFIG_DOMAIN, mcf.getConfigurationDomain());
- }
-
- @SuppressWarnings("deprecation")
- @Test
- public void testSetConfigurationScope() throws Exception {
- final String name = "a.b.c";
- Properties p = new Properties();
- ManagedConnectionFactoryImpl mcf = new ManagedConnectionFactoryImpl(p);
-
- mcf.setConfigurationScope(name);
- assertTrue(p.containsValue(name));
- assertEquals(name, mcf.getConfigurationScope());
- }
-
- @SuppressWarnings("deprecation")
- @Test
- public void testGetConfigurationScopeReturnsDefaultValue() throws Exception {
- Properties p = new Properties();
- ManagedConnectionFactoryImpl mcf = new ManagedConnectionFactoryImpl(p);
- assertEquals(ManagedConnectionFactoryImpl.CONFIG_SCOPE, mcf.getConfigurationScope());
- }
-
-
@Test
public void testSetEJBServicePropertiesURL() throws Exception {
final String name = "file://foo.txt";
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap11.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap11.java?rev=1055573&r1=1055572&r2=1055573&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap11.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap11.java Wed Jan 5 18:43:13 2011
@@ -156,9 +156,4 @@ public final class Soap11 implements Soa
public String getContentType() {
return "text/xml";
}
-
-
- public String getPrefix() {
- return "soap";
- }
}
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap12.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap12.java?rev=1055573&r1=1055572&r2=1055573&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap12.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap12.java Wed Jan 5 18:43:13 2011
@@ -137,9 +137,5 @@ public final class Soap12 implements Soa
public String getContentType() {
return "application/soap+xml";
}
-
- public String getPrefix() {
- return "soap";
- }
}
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersion.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersion.java?rev=1055573&r1=1055572&r2=1055573&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersion.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersion.java Wed Jan 5 18:43:13 2011
@@ -28,9 +28,6 @@ public interface SoapVersion {
String getNamespace();
- @Deprecated
- String getPrefix();
-
QName getEnvelope();
QName getHeader();
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http-server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http-server.xml?rev=1055573&r1=1055572&r2=1055573&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http-server.xml (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http-server.xml Wed Jan 5 18:43:13 2011
@@ -24,7 +24,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
- <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.spring.InitializingPolicyEngine">
+ <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.PolicyEngineImpl">
<property name="bus" ref="cxf"/>
<property name="enabled" value="true"/>
</bean>
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http.xml?rev=1055573&r1=1055572&r2=1055573&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http.xml (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/http.xml Wed Jan 5 18:43:13 2011
@@ -24,7 +24,7 @@
http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.spring.InitializingPolicyEngine">
+ <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.PolicyEngineImpl">
<property name="bus" ref="cxf"/>
<property name="enabled" value="true"/>
</bean>
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm.xml?rev=1055573&r1=1055572&r2=1055573&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm.xml (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm.xml Wed Jan 5 18:43:13 2011
@@ -30,7 +30,7 @@ http://www.springframework.org/schema/be
<http:client DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>
</http:conduit>
- <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.spring.InitializingPolicyEngine">
+ <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.PolicyEngineImpl">
<property name="bus" ref="cxf"/>
<property name="enabled" value="true"/>
</bean>
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml?rev=1055573&r1=1055572&r2=1055573&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml Wed Jan 5 18:43:13 2011
@@ -30,7 +30,7 @@ http://www.springframework.org/schema/be
<http:client DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>
</http:conduit>
- <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.spring.InitializingPolicyEngine">
+ <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.PolicyEngineImpl">
<property name="bus" ref="cxf"/>
<property name="enabled" value="true"/>
</bean>
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl_server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl_server.xml?rev=1055573&r1=1055572&r2=1055573&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl_server.xml (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl_server.xml Wed Jan 5 18:43:13 2011
@@ -39,7 +39,7 @@ http://www.springframework.org/schema/be
</http:conduit>
- <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.spring.InitializingPolicyEngine">
+ <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.PolicyEngineImpl">
<property name="bus" ref="cxf"/>
<property name="enabled" value="true"/>
</bean>