cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r764053 - in /cxf/branches/2.1.x-fixes: ./ common/common/src/test/java/org/apache/cxf/common/util/ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/ rt/manageme...
Date Fri, 10 Apr 2009 20:59:41 GMT
Author: dkulp
Date: Fri Apr 10 20:59:40 2009
New Revision: 764053

URL: http://svn.apache.org/viewvc?rev=764053&view=rev
Log:
Merged revisions 763942 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r763942 | dkulp | 2009-04-10 10:19:43 -0400 (Fri, 10 Apr 2009) | 2 lines
  
  Fix some warnings with JDK 6 and the IBM JDK
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/common/common/src/test/java/org/apache/cxf/common/util/TwoStageCacheTest.java
    cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XMLBeansElementProvider.java
    cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
    cxf/branches/2.1.x-fixes/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java
    cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
    cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionInfo.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 10 20:59:40 2009
@@ -1 +1 @@
-/cxf/trunk: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
+/cxf/trunk: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

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/common/common/src/test/java/org/apache/cxf/common/util/TwoStageCacheTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/test/java/org/apache/cxf/common/util/TwoStageCacheTest.java?rev=764053&r1=764052&r2=764053&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/src/test/java/org/apache/cxf/common/util/TwoStageCacheTest.java
(original)
+++ cxf/branches/2.1.x-fixes/common/common/src/test/java/org/apache/cxf/common/util/TwoStageCacheTest.java
Fri Apr 10 20:59:40 2009
@@ -125,8 +125,13 @@
         }
         objs = null;
         
-        
-        
+
+        if (System.getProperty("java.vendor").contains("IBM")) {
+            //The IBM VM will dump a core file and a heap dump 
+            //at OOM which kind of pollutes the svn space
+            return;
+        }
+
         List<byte[]> list = new LinkedList<byte[]>();
         int allocCount = 0;
         try {

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XMLBeansElementProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XMLBeansElementProvider.java?rev=764053&r1=764052&r2=764053&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XMLBeansElementProvider.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XMLBeansElementProvider.java
Fri Apr 10 20:59:40 2009
@@ -95,7 +95,7 @@
         XmlObject result = null;
 
         // get XMLBeans inner class Factory
-        Class factory = getFactory(type);
+        Class<?> factory = getFactory(type);
 
         try {
 
@@ -149,7 +149,7 @@
     protected XmlObject parseXmlBean(Class type, Reader reader) {
         XmlObject result = null;
 
-        Class factory = getFactory(type);
+        Class<?> factory = getFactory(type);
 
         try {
 

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java?rev=764053&r1=764052&r2=764053&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
Fri Apr 10 20:59:40 2009
@@ -90,7 +90,7 @@
                 // set the validate option for XMLBeans Wrapper Helper
                 if (Boolean.TRUE.equals(en) || "true".equals(en)) {
                     try {                        
-                        Class xmlBeanWrapperHelperClass = 
+                        Class<?> xmlBeanWrapperHelperClass = 
                             Class.forName("org.apache.cxf.xmlbeans.XmlBeansWrapperHelper");
                         if (xmlBeanWrapperHelperClass.isInstance(helper)) {
                             Method method = xmlBeanWrapperHelperClass.getMethod("setValidate",
boolean.class);

Modified: cxf/branches/2.1.x-fixes/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java?rev=764053&r1=764052&r2=764053&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java
Fri Apr 10 20:59:40 2009
@@ -35,6 +35,7 @@
 import javax.management.remote.JMXServiceURL;
 
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.management.ManagementConstants;
 
 
@@ -84,12 +85,11 @@
         mbsc = jmxc.getMBeanServerConnection();
     }
     
-    @SuppressWarnings("unchecked")
     void listAllManagedEndpoint() {        
         try {
             ObjectName queryEndpointName = new ObjectName(ManagementConstants.DEFAULT_DOMAIN_NAME

                                                           + ":type=Bus.Service.Endpoint,*");
-            Set<ObjectName> endpointNames = mbsc.queryNames(queryEndpointName, null);
+            Set<ObjectName> endpointNames = CastUtils.cast(mbsc.queryNames(queryEndpointName,
null));
             System.out.println("The endpoints are : ");
             for (ObjectName oName : endpointNames) {
                 System.out.println(oName);
@@ -109,13 +109,12 @@
         return new ObjectName(buffer.toString());
     }
     
-    @SuppressWarnings("unchecked")
     private void invokeEndpoint(String operation) {
         ObjectName endpointName = null;
         ObjectName queryEndpointName;
         try {
             queryEndpointName = getEndpointObjectName();
-            Set<ObjectName> endpointNames = mbsc.queryNames(queryEndpointName, null);
+            Set<ObjectName> endpointNames = CastUtils.cast(mbsc.queryNames(queryEndpointName,
null));
             // now get the ObjectName with the busId 
             Iterator it = endpointNames.iterator();
         

Modified: cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java?rev=764053&r1=764052&r2=764053&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
Fri Apr 10 20:59:40 2009
@@ -217,8 +217,8 @@
         } else {
             // handle the deprecated sun case
             try {
-                Class connectionClass = getDeprecatedSunHttpsURLConnectionClass();
-                Class verifierClass = getDeprecatedSunHostnameVerifierClass();
+                Class<?> connectionClass = getDeprecatedSunHttpsURLConnectionClass();
+                Class<?> verifierClass = getDeprecatedSunHostnameVerifierClass();
                 Method setHostnameVerifier = connectionClass.getMethod("setHostnameVerifier",
verifierClass);
                 InvocationHandler handler = new InvocationHandler() {
                     public Object invoke(Object proxy, 

Modified: cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionInfo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionInfo.java?rev=764053&r1=764052&r2=764053&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionInfo.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionInfo.java
Fri Apr 10 20:59:40 2009
@@ -87,7 +87,7 @@
         } else {
             Exception ex = null;
             try {
-                Class deprecatedSunClass = getDeprecatedSunHttpsURLConnectionOldImplClass();
+                Class<?> deprecatedSunClass = getDeprecatedSunHttpsURLConnectionOldImplClass();
                 Method method = null;
                 method = deprecatedSunClass.getMethod("getCipherSuite", (Class[]) null);
                 enabledCipherSuite = (String) method.invoke(connection, (Object[]) null);



Mime
View raw message