[jbossws-commits] JBossWS SVN: r11810 - in common/trunk/src/main/java/org/jboss: wsf/common and 2 other directories.

Author: richard.opalka(a)jboss.com Date: 2010-03-19 05:19:28 -0400 (Fri, 19 Mar 2010) New Revision: 11810 Modified: common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java common/trunk/src/main/java/org/jboss/wsf/common/JavaUtils.java common/trunk/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java common/trunk/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java common/trunk/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java common/trunk/src/main/java/org/jboss/wsf/test/XOPTestSupport.java Log: [JBWS-2968] removing most of compilation warnings Modified: common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2010-03-19 09:02:11 UTC (rev 11809) +++ common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2010-03-19 09:19:28 UTC (rev 11810) @@ -130,7 +130,7 @@ public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { - if(log.isDebugEnabled()) log.debug("resolveEntity: [pub=" + publicId + ",sysid=" + systemId + "]"); + if(log.isTraceEnabled()) log.trace("resolveEntity: [pub=" + publicId + ",sysid=" + systemId + "]"); InputSource inputSource = super.resolveEntity(publicId, systemId); if (inputSource == null) @@ -138,8 +138,7 @@ if (inputSource == null) { - if (log.isDebugEnabled()) - log.debug("Cannot resolve entity: [pub=" + publicId + ",sysid=" + systemId + "]"); + log.debug("Cannot resolve entity: [pub=" + publicId + ",sysid=" + systemId + "]"); } return inputSource; Modified: common/trunk/src/main/java/org/jboss/wsf/common/JavaUtils.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/JavaUtils.java 2010-03-19 09:02:11 UTC (rev 11809) +++ common/trunk/src/main/java/org/jboss/wsf/common/JavaUtils.java 2010-03-19 09:19:28 UTC (rev 11810) @@ -404,7 +404,7 @@ { ClassLoader destLoader = dest.getClassLoader(); ClassLoader srcLoader = src.getClassLoader(); - if(log.isDebugEnabled()) log.debug("Not assignable because of conflicting class loaders:\ndstLoader=" + destLoader + "\nsrcLoader=" + srcLoader); + if(log.isTraceEnabled()) log.trace("Not assignable because of conflicting class loaders:\ndstLoader=" + destLoader + "\nsrcLoader=" + srcLoader); } if (isAssignable == false && isPrimitive(dest)) @@ -638,7 +638,7 @@ } catch (Exception e) { - if(log.isDebugEnabled()) log.debug("Could not clear blacklists on " + loader); + if(log.isTraceEnabled()) log.trace("Could not clear blacklists on " + loader); } } } Modified: common/trunk/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2010-03-19 09:02:11 UTC (rev 11809) +++ common/trunk/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2010-03-19 09:19:28 UTC (rev 11810) @@ -89,7 +89,7 @@ { File file = new File(resourcePath); if (file.exists()) - resourceURL = file.toURL(); + resourceURL = file.toURI().toURL(); } catch (MalformedURLException e) { @@ -203,7 +203,7 @@ { for (File f : files) { - list.add(new ResourceLoaderAdapter(loader, f.toURL())); + list.add(new ResourceLoaderAdapter(loader, f.toURI().toURL())); } } } Modified: common/trunk/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2010-03-19 09:02:11 UTC (rev 11809) +++ common/trunk/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2010-03-19 09:19:28 UTC (rev 11810) @@ -90,7 +90,7 @@ { File file = new File(resourcePath); if (file.exists()) - resourceURL = file.toURL(); + resourceURL = file.toURI().toURL(); } catch (MalformedURLException e) { @@ -216,7 +216,7 @@ { for (File f : files) { - list.add(new URLLoaderAdapter(rootURL, loader, f.toURL())); + list.add(new URLLoaderAdapter(rootURL, loader, f.toURI().toURL())); } } } Modified: common/trunk/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java 2010-03-19 09:02:11 UTC (rev 11809) +++ common/trunk/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java 2010-03-19 09:19:28 UTC (rev 11810) @@ -169,8 +169,8 @@ if (methods.size() > 0) { final Method method = methods.iterator().next(); - if (LOG.isDebugEnabled()) - LOG.debug("Calling @PostConstruct annotated method: " + method); + if (LOG.isTraceEnabled()) + LOG.trace("Calling @PostConstruct annotated method: " + method); try { invokeMethod(instance, method, null); @@ -200,8 +200,8 @@ if (methods.size() > 0) { final Method method = methods.iterator().next(); - if (LOG.isDebugEnabled()) - LOG.debug("Calling @PreDestroy annotated method: " + method); + if (LOG.isTraceEnabled()) + LOG.trace("Calling @PreDestroy annotated method: " + method); try { invokeMethod(instance, method, null); @@ -395,8 +395,8 @@ private static void inject(final Object instance, final Method method, final String jndiName, final Context ctx) { final Object value = lookup(jndiName, ctx); - if (LOG.isDebugEnabled()) - LOG.debug("Injecting method: " + method); + if (LOG.isTraceEnabled()) + LOG.trace("Injecting method: " + method); invokeMethod(instance, method, new Object[] {value}); } @@ -411,8 +411,8 @@ private static void inject(final Object instance, final Field field, final String jndiName, final Context ctx) { final Object value = lookup(jndiName, ctx); - if (LOG.isDebugEnabled()) - LOG.debug("Injecting field: " + field); + if (LOG.isTraceEnabled()) + LOG.trace("Injecting field: " + field); setField(instance, field, value); } Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2010-03-19 09:02:11 UTC (rev 11809) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2010-03-19 09:19:28 UTC (rev 11810) @@ -66,7 +66,7 @@ { if ( DEPLOY_PROCESS_ENABLED ) { - URL archiveURL = getArchiveFile(archive).toURL(); + URL archiveURL = getArchiveFile(archive).toURI().toURL(); getDeployer().deploy(archiveURL); } } @@ -77,7 +77,7 @@ { if ( DEPLOY_PROCESS_ENABLED ) { - URL archiveURL = getArchiveFile(archive).toURL(); + URL archiveURL = getArchiveFile(archive).toURI().toURL(); getDeployer().undeploy(archiveURL); } } @@ -251,7 +251,7 @@ /** Try to discover the URL for the deployment archive */ public static URL getArchiveURL(String archive) throws MalformedURLException { - return getArchiveFile(archive).toURL(); + return getArchiveFile(archive).toURI().toURL(); } /** Try to discover the File for the deployment archive */ @@ -272,7 +272,7 @@ /** Try to discover the URL for the test resource */ public static URL getResourceURL(String resource) throws MalformedURLException { - return getResourceFile(resource).toURL(); + return getResourceFile(resource).toURI().toURL(); } /** Try to discover the File for the test resource */ Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2010-03-19 09:02:11 UTC (rev 11809) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2010-03-19 09:19:28 UTC (rev 11810) @@ -77,7 +77,7 @@ public URL getArchiveURL(String archive) throws MalformedURLException { - return delegate.getArchiveFile(archive).toURL(); + return delegate.getArchiveFile(archive).toURI().toURL(); } public File getResourceFile(String resource) @@ -87,7 +87,7 @@ public URL getResourceURL(String resource) throws MalformedURLException { - return delegate.getResourceFile(resource).toURL(); + return delegate.getResourceFile(resource).toURI().toURL(); } private void getArchiveArray(String archiveList) Modified: common/trunk/src/main/java/org/jboss/wsf/test/XOPTestSupport.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/XOPTestSupport.java 2010-03-19 09:02:11 UTC (rev 11809) +++ common/trunk/src/main/java/org/jboss/wsf/test/XOPTestSupport.java 2010-03-19 09:19:28 UTC (rev 11810) @@ -55,7 +55,7 @@ Image image = null; try { - URL url = imgFile.toURL(); + URL url = imgFile.toURI().toURL(); image = null; try @@ -84,7 +84,7 @@ { try { - URL url = imgFile.toURL(); + URL url = imgFile.toURI().toURL(); return new DataHandler(url); } catch (MalformedURLException e)