Author: dkulp
Date: Thu Jan 12 22:06:10 2012
New Revision: 1230813
URL: http://svn.apache.org/viewvc?rev=1230813&view=rev
Log:
Fix some more java5 compile failures
Modified:
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/AddressingFeatureApplier.java
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImplLoader.java
cxf/trunk/rt/ws/policy/pom.xml
Modified:
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/AddressingFeatureApplier.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/AddressingFeatureApplier.java?rev=1230813&r1=1230812&r2=1230813&view=diff
==============================================================================
---
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/AddressingFeatureApplier.java
(original)
+++
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/AddressingFeatureApplier.java
Thu Jan 12 22:06:10 2012
@@ -32,7 +32,6 @@ import org.apache.cxf.ws.addressing.soap
@NoJSR250Annotations
public class AddressingFeatureApplier implements
WSAddressingFeature.WSAddressingFeatureApplier {
- @Override
public void initializeProvider(WSAddressingFeature feature,
InterceptorProvider provider, Bus bus) {
MAPCodec mapCodec = new MAPCodec();
MAPAggregatorImpl mapAggregator = new MAPAggregatorImpl();
Modified:
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImplLoader.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImplLoader.java?rev=1230813&r1=1230812&r2=1230813&view=diff
==============================================================================
---
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImplLoader.java
(original)
+++
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImplLoader.java
Thu Jan 12 22:06:10 2012
@@ -28,7 +28,6 @@ import org.apache.cxf.ws.addressing.MAPA
public class MAPAggregatorImplLoader implements MAPAggregatorLoader {
/** {@inheritDoc}*/
- @Override
public MAPAggregator createImplementation(MAPAggregator mag) {
return new MAPAggregatorImpl(mag);
}
Modified: cxf/trunk/rt/ws/policy/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/pom.xml?rev=1230813&r1=1230812&r2=1230813&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/pom.xml (original)
+++ cxf/trunk/rt/ws/policy/pom.xml Thu Jan 12 22:06:10 2012
@@ -189,6 +189,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ </dependency>
</dependencies>
</profile>
</profiles>
