Author: dkulp
Date: Fri Jun 26 19:27:42 2009
New Revision: 788825
URL: http://svn.apache.org/viewvc?rev=788825&view=rev
Log:
Merged revisions 788187 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r788187 | dkulp | 2009-06-24 17:29:12 -0400 (Wed, 24 Jun 2009) | 2 lines
Fix all the warnings that the new Eclipse compiler in Galileo was
spitting out.
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ParamReader.java
cxf/branches/2.2.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
cxf/branches/2.2.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 26 19:27:42 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788451
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788451
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ParamReader.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ParamReader.java?rev=788825&r1=788824&r2=788825&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ParamReader.java
(original)
+++
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ParamReader.java
Fri Jun 26 19:27:42 2009
@@ -221,10 +221,8 @@
private static class MethodInfo {
String[] names;
- int maxLocals;
public MethodInfo(int maxLocals) {
- this.maxLocals = maxLocals;
names = new String[maxLocals];
}
}
Modified:
cxf/branches/2.2.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java?rev=788825&r1=788824&r2=788825&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
(original)
+++
cxf/branches/2.2.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
Fri Jun 26 19:27:42 2009
@@ -251,10 +251,6 @@
propsFile = new
File(mcf.getEJBServicePropertiesURLInstance().getPath());
}
- public void setContinue(boolean c) {
- this.continuing = c;
- }
-
public void run() {
do {
try {
Modified:
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java?rev=788825&r1=788824&r2=788825&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
Fri Jun 26 19:27:42 2009
@@ -162,9 +162,7 @@
private Set<URI> roles = new HashSet<URI>();
private Set<QName> understood = new HashSet<QName>();
- public DummySoapInterceptor() {
- super("");
- }
+
public DummySoapInterceptor(String phase) {
super(phase);
}
Modified:
cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=788825&r1=788824&r2=788825&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
Fri Jun 26 19:27:42 2009
@@ -607,7 +607,7 @@
}
}
- private class InnerErrorListener {
+ class InnerErrorListener {
private String url;
Modified:
cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=788825&r1=788824&r2=788825&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
Fri Jun 26 19:27:42 2009
@@ -125,7 +125,7 @@
}
- private static final class CachedClassOrNull {
+ static final class CachedClassOrNull {
private WeakReference<Class<?>> cachedClass;
public CachedClassOrNull(Class<?> cachedClass) {
Modified:
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java?rev=788825&r1=788824&r2=788825&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java
Fri Jun 26 19:27:42 2009
@@ -47,7 +47,7 @@
@Path("/bar")
@Produces("test/bar")
@Consumes("test/foo")
- private static class TestClass {
+ static class TestClass {
@Context UriInfo u;
@Context HttpHeaders h;
@Resource HttpServletRequest req;
@@ -61,21 +61,21 @@
}
}
- private static class TestClass1 extends TestClass {
+ static class TestClass1 extends TestClass {
@GET
public void getIt() {
}
}
- private static class TestClass2 extends TestClass1 {
+ static class TestClass2 extends TestClass1 {
@GET
public void getIt() {
}
}
- private static class TestClass3 {
+ static class TestClass3 {
@Resource HttpServletRequest req;
@Resource HttpServletResponse res;
@Resource ServletContext c;
Modified:
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java?rev=788825&r1=788824&r2=788825&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
Fri Jun 26 19:27:42 2009
@@ -92,7 +92,7 @@
}
- private static class CustomerBean1 {
+ static class CustomerBean1 {
private String a;
private Long b;
private List<String> c;
@@ -124,7 +124,7 @@
}
- private static class CustomerBean2 {
+ static class CustomerBean2 {
private String a;
private Long b;
private List<String> c;
Modified:
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java?rev=788825&r1=788824&r2=788825&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
Fri Jun 26 19:27:42 2009
@@ -332,7 +332,7 @@
return hcAnn;
}
- private static class HandlerChainAnnotation {
+ static class HandlerChainAnnotation {
private final Class<?> declaringClass;
private final HandlerChain ann;
Modified:
cxf/branches/2.2.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java?rev=788825&r1=788824&r2=788825&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
Fri Jun 26 19:27:42 2009
@@ -441,7 +441,7 @@
return ret;
}
- private static class TestResender implements
RetransmissionQueueImpl.Resender {
+ static class TestResender implements RetransmissionQueueImpl.Resender {
Message message;
boolean includeAckRequested;
Modified:
cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=788825&r1=788824&r2=788825&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
Fri Jun 26 19:27:42 2009
@@ -543,7 +543,7 @@
cds.put(cd1.getId(), cd1);
}
- private static class BookInfo {
+ static class BookInfo {
private String name;
private long id;
@@ -589,7 +589,7 @@
}
- private static class BadBook {
+ static class BadBook {
public BadBook(String s) {
throw new RuntimeException("The bad book");
}
