[jbossws-commits] JBossWS SVN: r11812 - in framework/trunk: src/main/java/org/jboss/wsf/framework/serviceref and 4 other directories.

Author: richard.opalka(a)jboss.com Date: 2010-03-19 05:41:01 -0400 (Fri, 19 Mar 2010) New Revision: 11812 Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/JAXBIntroDeploymentAspect.java framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ResourceResolverImpl.java framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/StringRPCTest.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528TestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java Log: [JBWS-2968] removing most of compilation warnings Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java 2010-03-19 09:24:06 UTC (rev 11811) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java 2010-03-19 09:41:01 UTC (rev 11812) @@ -40,8 +40,8 @@ public void start(Endpoint ep) { - if (log.isDebugEnabled()) - log.debug("Start: " + ep.getName()); + if (log.isTraceEnabled()) + log.trace("Start: " + ep.getName()); EndpointState state = ep.getState(); if (state != EndpointState.UNDEFINED) @@ -64,8 +64,8 @@ public void stop(Endpoint ep) { - if (log.isDebugEnabled()) - log.debug("Stop: " + ep.getName()); + if (log.isTraceEnabled()) + log.trace("Stop: " + ep.getName()); EndpointState state = ep.getState(); if (state != EndpointState.STARTED) Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2010-03-19 09:24:06 UTC (rev 11811) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2010-03-19 09:41:01 UTC (rev 11812) @@ -78,14 +78,14 @@ depAspects.clear(); depAspects.addAll(aspects); - if (log.isDebugEnabled()) + if (log.isTraceEnabled()) { // Debug the aspect list StringBuilder builder = new StringBuilder("setDeploymentAspects on " + name); for (DeploymentAspect aspect : aspects) builder.append("\n " + aspect.getClass().getName() + " provides: " + aspect.getProvidesAsSet() + " requires: " + aspect.getRequiresAsSet()); - log.debug(builder); + log.trace(builder); } } @@ -166,10 +166,12 @@ private void logInvocation(DeploymentAspect aspect, String method) { - String name = aspect.getClass().getName(); - name = name.substring(name.lastIndexOf(".") + 1); - if (log.isDebugEnabled()) - log.debug("[" + this.name + "]" + name + ":" + method); + if (log.isTraceEnabled()) + { + String name = aspect.getClass().getName(); + name = name.substring(name.lastIndexOf(".") + 1); + log.trace("[" + this.name + "]" + name + ":" + method); + } } } Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/JAXBIntroDeploymentAspect.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/JAXBIntroDeploymentAspect.java 2010-03-19 09:24:06 UTC (rev 11811) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/JAXBIntroDeploymentAspect.java 2010-03-19 09:41:01 UTC (rev 11812) @@ -51,8 +51,8 @@ // assert ArchiveDeployment if(! (deployment instanceof ArchiveDeployment) ) { - if (log.isDebugEnabled()) - log.debug("JAXBIntroDeploymentAspect doesn't work on " + deployment.getClass()); + if (log.isTraceEnabled()) + log.trace("JAXBIntroDeploymentAspect doesn't work on " + deployment.getClass()); return; } Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ResourceResolverImpl.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ResourceResolverImpl.java 2010-03-19 09:24:06 UTC (rev 11811) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ResourceResolverImpl.java 2010-03-19 09:41:01 UTC (rev 11812) @@ -84,8 +84,8 @@ } else { - if (log.isDebugEnabled()) - log.debug("Cannot get " + resourcePath + " from root file, trying with additional metadata files", e); + if (log.isTraceEnabled()) + log.trace("Cannot get " + resourcePath + " from root file, trying with additional metadata files", e); } } } @@ -112,8 +112,8 @@ } catch (IOException e) { - if (log.isDebugEnabled()) - log.debug("Cannot get " + resourcePath + " from " + uvf, e); + if (log.isTraceEnabled()) + log.trace("Cannot get " + resourcePath + " from " + uvf, e); } } } Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java 2010-03-19 09:24:06 UTC (rev 11811) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java 2010-03-19 09:41:01 UTC (rev 11812) @@ -108,7 +108,7 @@ // update the rootFile try { - vfsRoot = new URLLoaderAdapter(expandedDirectory.toURL()); + vfsRoot = new URLLoaderAdapter(expandedDirectory.toURI().toURL()); } catch (MalformedURLException e) { Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/StringRPCTest.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/StringRPCTest.java 2010-03-19 09:24:06 UTC (rev 11811) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/StringRPCTest.java 2010-03-19 09:41:01 UTC (rev 11812) @@ -21,17 +21,10 @@ */ package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest; import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesRPCTest; import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointRPC; -import com.sun.corba.se.impl.protocol.giopmsgheaders.Message; - /** * @author pmacik(a)redhat.com * @since 09-Mar-2010 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2010-03-19 09:24:06 UTC (rev 11811) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2010-03-19 09:41:01 UTC (rev 11812) @@ -37,8 +37,6 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import sun.reflect.ReflectionFactory.GetReflectionFactoryAction; - /** * A complex JAX-WS test * Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528TestCase.java 2010-03-19 09:24:06 UTC (rev 11811) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2528/JBWS2528TestCase.java 2010-03-19 09:41:01 UTC (rev 11812) @@ -88,7 +88,7 @@ String command = JBOSS_HOME + FS + "bin" + FS + "wsprovide" + EXT + " -k -w -o " + absOutput + " --classpath " + CLASSES_DIR + " " + ENDPOINT_CLASS; executeCommand(command, "wsprovide"); - URL wsdlURL = new File(destDir, "JBWS2528EndpointService.wsdl").toURL(); + URL wsdlURL = new File(destDir, "JBWS2528EndpointService.wsdl").toURI().toURL(); WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); Definition wsdlDefinition = wsdlReader.readWSDL(wsdlURL.toString()); PortType portType = wsdlDefinition.getPortType(new QName("http://jbws2528.jaxws.ws.test.jboss.org/";, "JBWS2528Endpoint")); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2010-03-19 09:24:06 UTC (rev 11811) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2010-03-19 09:41:01 UTC (rev 11812) @@ -98,12 +98,12 @@ { if( filtered(s) ) continue; - jarURLs.add( new File(s).toURL() ); + jarURLs.add( new File(s).toURI().toURL() ); jarURLString.append( s ).append(File.pathSeparator); } else { - classDirUrls.add( new File(s).toURL() ); + classDirUrls.add( new File(s).toURI().toURL() ); } } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2010-03-19 09:24:06 UTC (rev 11811) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2010-03-19 09:41:01 UTC (rev 11812) @@ -359,7 +359,7 @@ private ClassLoader getArtefactClassLoader() throws Exception { URLClassLoader loader = new URLClassLoader( - new URL[] { outputDirectory.toURL() }, + new URL[] { outputDirectory.toURI().toURL() }, Thread.currentThread().getContextClassLoader() ); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2010-03-19 09:24:06 UTC (rev 11811) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2010-03-19 09:41:01 UTC (rev 11812) @@ -67,7 +67,7 @@ private ClassLoader getArtefactClassLoader() throws Exception { URLClassLoader loader = new URLClassLoader( - new URL[] { outputDirectory.toURL() }, + new URL[] { outputDirectory.toURI().toURL() }, Thread.currentThread().getContextClassLoader() );