Author: dkulp Date: Tue Jun 30 13:59:49 2009 New Revision: 789734 URL: http://svn.apache.org/viewvc?rev=789734&view=rev Log: Merged revisions 788825 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r788825 | dkulp | 2009-06-26 15:27:42 -0400 (Fri, 26 Jun 2009) | 10 lines 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.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ParamReader.java cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java cxf/branches/2.1.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java cxf/branches/2.1.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 30 13:59:49 2009 @@ -1,2 +1,2 @@ -/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873 67,788824 -/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060 +/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873 67,788824-788825 +/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ParamReader.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ParamReader.java?rev=789734&r1=789733&r2=789734&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ParamReader.java (original) +++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ParamReader.java Tue Jun 30 13:59:49 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.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java?rev=789734&r1=789733&r2=789734&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java (original) +++ cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java Tue Jun 30 13:59:49 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.1.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java?rev=789734&r1=789733&r2=789734&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java (original) +++ cxf/branches/2.1.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java Tue Jun 30 13:59:49 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.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=789734&r1=789733&r2=789734&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java (original) +++ cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java Tue Jun 30 13:59:49 2009 @@ -607,7 +607,7 @@ } } - private class InnerErrorListener { + class InnerErrorListener { private String url; Modified: cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=789734&r1=789733&r2=789734&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java (original) +++ cxf/branches/2.1.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Tue Jun 30 13:59:49 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.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java?rev=789734&r1=789733&r2=789734&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java Tue Jun 30 13:59:49 2009 @@ -44,7 +44,7 @@ @Path("/bar") @ProduceMime("test/bar") @ConsumeMime("test/foo") - private static class TestClass { + static class TestClass { @Context UriInfo u; @Context HttpHeaders h; @Resource HttpServletRequest req; @@ -58,21 +58,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.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java?rev=789734&r1=789733&r2=789734&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java Tue Jun 30 13:59:49 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.1.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.1.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java?rev=789734&r1=789733&r2=789734&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java (original) +++ cxf/branches/2.1.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java Tue Jun 30 13:59:49 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.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=789734&r1=789733&r2=789734&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java (original) +++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java Tue Jun 30 13:59:49 2009 @@ -511,7 +511,7 @@ cds.put(cd1.getId(), cd1); } - private static class BookInfo { + static class BookInfo { private String name; private long id; @@ -557,7 +557,7 @@ } - private static class BadBook { + static class BadBook { public BadBook(String s) { throw new RuntimeException("The bad book"); }
