Author: psakar Date: 2014-03-27 08:11:50 -0400 (Thu, 27 Mar 2014) New Revision: 18546 Modified: stack/cxf/trunk/ stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/client/module/SOAPClientAuthModule.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/actas/ActAsOutInterceptor.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl2.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl3.java stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java Log: Removed unused import stmts and fixed warnings Property changes on: stack/cxf/trunk ___________________________________________________________________ Modified: svn:ignore - ant.properties clipboard.* target .classpath .project .settings profiles.xml target.properties transaction.log + ant.properties clipboard.* target .classpath .project .settings profiles.xml target.properties transaction.log .git .gitignore Modified: stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/client/module/SOAPClientAuthModule.java =================================================================== --- stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/client/module/SOAPClientAuthModule.java 2014-03-27 11:41:32 UTC (rev 18545) +++ stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/client/module/SOAPClientAuthModule.java 2014-03-27 12:11:50 UTC (rev 18546) @@ -37,8 +37,8 @@ import org.jboss.security.SimplePrincipal; /** - * SOAPClientAuthModule - * TODO: Investigate what we can do with this module + * SOAPClientAuthModule + * TODO: Investigate what we can do with this module * @author <a href="mailto:ema@redhat.com">Jim Ma</a> */ public class SOAPClientAuthModule implements ClientAuthModule @@ -62,7 +62,7 @@ private CallbackHandler handler = null; @SuppressWarnings( - {"rawtypes"}) + {"rawtypes", "unused"}) private Map options = null; public SOAPClientAuthModule() @@ -87,12 +87,10 @@ this.options = options; } - @SuppressWarnings( - {"unchecked"}) public AuthStatus secureRequest(MessageInfo messageInfo, Subject source) throws AuthException { log = "secureRequest"; - SOAPMessage soapMessage = (SOAPMessage) messageInfo.getRequestMessage(); + messageInfo.getRequestMessage(); return AuthStatus.SUCCESS; } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2014-03-27 11:41:32 UTC (rev 18545) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2014-03-27 12:11:50 UTC (rev 18546) @@ -29,8 +29,6 @@ import org.jboss.ws.api.annotation.EndpointConfig; import org.jboss.ws.api.util.ServiceLoader; import org.jboss.ws.common.management.AbstractServerConfig; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.WSFException; import org.jboss.wsf.spi.classloading.ClassLoaderProvider; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; @@ -47,7 +45,7 @@ import org.jboss.wsf.stack.cxf.security.authentication.AutenticationMgrSubjectCreatingInterceptor; /** - * + * * @author alessio.soldano(a)jboss.com * @since 16-Jun-2010 */ @@ -56,13 +54,13 @@ private WSDLFilePublisher wsdlPublisher; private List<Endpoint> depEndpoints; - + private UnifiedVirtualFile deploymentRoot; - + private String epConfigName; - + private String epConfigFile; - + @Override public void customize(Object beanInstance) { @@ -107,11 +105,11 @@ // setup our invoker for http endpoints if invoker is not configured in jbossws-cxf.xml DD boolean isHttpEndpoint = endpoint.getAddress() != null && endpoint.getAddress().substring(0, 5).toLowerCase().startsWith("http"); - if ((endpoint.getInvoker() == null) && isHttpEndpoint) + if ((endpoint.getInvoker() == null) && isHttpEndpoint) { endpoint.setInvoker(new JBossWSInvoker()); } - + // ** Endpoint configuration setup ** // 1) default values String configName = org.jboss.wsf.spi.metadata.config.EndpointConfig.STANDARD_ENDPOINT_CONFIG; @@ -157,7 +155,7 @@ { UnifiedVirtualFile vf = deploymentRoot.findChild(configFile); ConfigRoot config = ConfigMetaDataParser.parse(vf.toURL()); - endpoint.setEndpointConfig(config.getEndpointConfigByName(configName)); + endpoint.setEndpointConfig(config.getEndpointConfigByName(configName)); } catch (IOException e) { @@ -180,14 +178,14 @@ } } } - + private static ServerConfig getServerConfig() { if(System.getSecurityManager() == null) { return AbstractServerConfig.getServerIntegrationServerConfig(); } return AccessController.doPrivileged(AbstractServerConfig.GET_SERVER_INTEGRATION_SERVER_CONFIG); } - + public void setDeploymentRoot(UnifiedVirtualFile deploymentRoot) { this.deploymentRoot = deploymentRoot; @@ -202,7 +200,7 @@ { this.depEndpoints = endpoints; } - + public void setEpConfigName(String epConfigName) { this.epConfigName = epConfigName; @@ -212,7 +210,7 @@ { this.epConfigFile = epConfigFile; } - - + + } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2014-03-27 11:41:32 UTC (rev 18545) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2014-03-27 12:11:50 UTC (rev 18546) @@ -27,7 +27,6 @@ import javax.xml.ws.spi.Provider; -import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.configuration.Configurer; import org.jboss.ws.api.binding.BindingCustomization; @@ -56,7 +55,7 @@ */ public final class BusDeploymentAspect extends AbstractDeploymentAspect { - + @Override public void start(final Deployment dep) { @@ -68,7 +67,7 @@ } startDeploymentBus(dep); } - + @Override public void stop(final Deployment dep) { @@ -118,7 +117,7 @@ DDBeans metadata = dep.getAttachment(DDBeans.class); holder = new NonSpringBusHolder(metadata); } - + String epConfigName = null; String epConfigFile = null; JSEArchiveMetaData jsemd = dep.getAttachment(JSEArchiveMetaData.class); @@ -131,7 +130,7 @@ epConfigName = wsmd.getConfigName(); epConfigFile = wsmd.getConfigFile(); } - + Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class), new WSDLFilePublisher(aDep), dep.getService().getEndpoints(), aDep.getRootFile(), epConfigName, epConfigFile); holder.configure(resolver, configurer, wsmd, dep); @@ -162,5 +161,5 @@ throw new RuntimeException(e); } } - + } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java 2014-03-27 11:41:32 UTC (rev 18545) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java 2014-03-27 12:11:50 UTC (rev 18546) @@ -41,7 +41,6 @@ public class WSTrustActAsTestCase extends JBossWSTest { private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-trust-actas/ActAsService"; - private final String stsURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService"; public static Test suite() { Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.java 2014-03-27 11:41:32 UTC (rev 18545) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.java 2014-03-27 12:11:50 UTC (rev 18546) @@ -41,7 +41,6 @@ public class WSTrustOnBehalfOfTestCase extends JBossWSTest { private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-trust-onbehalfof/OnBehalfOfService"; - private final String stsURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService"; public static Test suite() { Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/actas/ActAsOutInterceptor.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/actas/ActAsOutInterceptor.java 2014-03-27 11:41:32 UTC (rev 18545) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/actas/ActAsOutInterceptor.java 2014-03-27 12:11:50 UTC (rev 18546) @@ -64,7 +64,7 @@ dumpMsgInfo(key, mInfo); } else if (o instanceof ArrayList) { - for (Object obj: (ArrayList)o){ + for (Object obj: (ArrayList<?>)o){ System.out.println("##ACTAS arrayItem: " + obj.getClass().getCanonicalName()); } } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl.java 2014-03-27 11:41:32 UTC (rev 18545) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl.java 2014-03-27 12:11:50 UTC (rev 18546) @@ -21,35 +21,20 @@ */ package org.jboss.test.ws.jaxws.handlerauth; -import javax.jws.Oneway; -import javax.jws.WebService; -import javax.ejb.Stateless; +import javax.annotation.Resource; import javax.annotation.security.DeclareRoles; import javax.annotation.security.DenyAll; import javax.annotation.security.PermitAll; import javax.annotation.security.RolesAllowed; - -import javax.jws.WebMethod; - -import java.util.Enumeration; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPMessageContext; -import javax.xml.ws.handler.soap.SOAPHandler; +import javax.ejb.Stateless; import javax.jws.HandlerChain; -import javax.xml.soap.SOAPMessage; -import javax.annotation.PostConstruct; +import javax.jws.Oneway; +import javax.jws.WebService; +import javax.xml.ws.WebServiceContext; -import java.io.PrintStream; -import java.util.Map; -import java.util.Set; - -import org.jboss.ws.api.annotation.WebContext; import org.jboss.ejb3.annotation.SecurityDomain; import org.jboss.logging.Logger; +import org.jboss.ws.api.annotation.WebContext; @WebService(name = "SecureEndpoint", targetNamespace = "http://ws/") @HandlerChain(file = "handlers.xml") @@ -61,7 +46,7 @@ public class SecureEndpointImpl implements SecureEndpoint { private Logger log = Logger.getLogger(this.getClass()); - + @Resource WebServiceContext context; @@ -88,23 +73,23 @@ return "Mr. " + name + ", you authenticated as \'" + principalName + "\'"; } } - + public int getHandlerCounter() { return SimpleHandler.counter.get(); } - - + + @Oneway @RolesAllowed("friend") public void ping() { //NOOP } - + @DenyAll public void deniedMethod() { //NOOP } - + @PermitAll public String echo(String s) { return s; Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl2.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl2.java 2014-03-27 11:41:32 UTC (rev 18545) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl2.java 2014-03-27 12:11:50 UTC (rev 18546) @@ -21,35 +21,20 @@ */ package org.jboss.test.ws.jaxws.handlerauth; -import javax.jws.Oneway; -import javax.jws.WebService; -import javax.ejb.Stateless; +import javax.annotation.Resource; import javax.annotation.security.DeclareRoles; import javax.annotation.security.DenyAll; import javax.annotation.security.PermitAll; import javax.annotation.security.RolesAllowed; - -import javax.jws.WebMethod; - -import java.util.Enumeration; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPMessageContext; -import javax.xml.ws.handler.soap.SOAPHandler; +import javax.ejb.Stateless; import javax.jws.HandlerChain; -import javax.xml.soap.SOAPMessage; -import javax.annotation.PostConstruct; +import javax.jws.Oneway; +import javax.jws.WebService; +import javax.xml.ws.WebServiceContext; -import java.io.PrintStream; -import java.util.Map; -import java.util.Set; - -import org.jboss.ws.api.annotation.WebContext; import org.jboss.ejb3.annotation.SecurityDomain; import org.jboss.logging.Logger; +import org.jboss.ws.api.annotation.WebContext; @WebService(name = "SecureEndpoint2", targetNamespace = "http://ws/") @HandlerChain(file = "handlers2.xml") @@ -61,7 +46,7 @@ public class SecureEndpointImpl2 implements SecureEndpoint { private Logger log = Logger.getLogger(this.getClass()); - + @Resource WebServiceContext context; @@ -88,23 +73,23 @@ return "Mr. " + name + ", you authenticated as \'" + principalName + "\'"; } } - + public int getHandlerCounter() { return LogicalSimpleHandler.counter.get(); } - - + + @Oneway @RolesAllowed("friend") public void ping() { //NOOP } - + @DenyAll public void deniedMethod() { //NOOP } - + @PermitAll public String echo(String s) { return s; Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl3.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl3.java 2014-03-27 11:41:32 UTC (rev 18545) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl3.java 2014-03-27 12:11:50 UTC (rev 18546) @@ -21,35 +21,20 @@ */ package org.jboss.test.ws.jaxws.handlerauth; -import javax.jws.Oneway; -import javax.jws.WebService; -import javax.ejb.Stateless; +import javax.annotation.Resource; import javax.annotation.security.DeclareRoles; import javax.annotation.security.DenyAll; import javax.annotation.security.PermitAll; import javax.annotation.security.RolesAllowed; - -import javax.jws.WebMethod; - -import java.util.Enumeration; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPMessageContext; -import javax.xml.ws.handler.soap.SOAPHandler; +import javax.ejb.Stateless; import javax.jws.HandlerChain; -import javax.xml.soap.SOAPMessage; -import javax.annotation.PostConstruct; +import javax.jws.Oneway; +import javax.jws.WebService; +import javax.xml.ws.WebServiceContext; -import java.io.PrintStream; -import java.util.Map; -import java.util.Set; - -import org.jboss.ws.api.annotation.WebContext; import org.jboss.ejb3.annotation.SecurityDomain; import org.jboss.logging.Logger; +import org.jboss.ws.api.annotation.WebContext; @WebService(name = "SecureEndpoint3", targetNamespace = "http://ws/") @HandlerChain(file = "handlers.xml") @@ -61,7 +46,7 @@ public class SecureEndpointImpl3 implements SecureEndpoint { private Logger log = Logger.getLogger(this.getClass()); - + @Resource WebServiceContext context; @@ -88,23 +73,23 @@ return "Mr. " + name + ", you authenticated as \'" + principalName + "\'"; } } - + public int getHandlerCounter() { return SimpleHandler.counter.get(); } - - + + @Oneway @RolesAllowed("friend") public void ping() { //NOOP } - + @DenyAll public void deniedMethod() { //NOOP } - + @PermitAll public String echo(String s) { return s; Modified: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2014-03-27 11:41:32 UTC (rev 18545) +++ stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2014-03-27 12:11:50 UTC (rev 18546) @@ -58,7 +58,7 @@ private static Map<String, AppclientProcess> appclients = Collections.synchronizedMap(new HashMap<String, AppclientProcess>(2)); private static ExecutorService executors = Executors.newCachedThreadPool(AppclientDaemonFactory.INSTANCE); private static String appclientOutputDir; - + private static class AppclientProcess { public Process process; public CopyJob outTask; @@ -66,7 +66,7 @@ public OutputStream output; public OutputStream log; } - + private AppclientHelper() { // forbidden instantiation @@ -75,7 +75,7 @@ /** * Triggers appclient deployment and returns the corresponding Process * Please note the provided output stream (if any) is not automatically closed. - * + * * @param archive * @param appclientOS * @param appclientArgs @@ -149,15 +149,16 @@ args.add(appclientArg); } } - + //note on output streams closing: we're not caring about closing any here as it's quite a complex thing due to the TeeOutputStream nesting; //we're however still safe, given the ap.output is a ByteArrayOutputStream (whose .close() does nothing), ap.log is explicitly closed at //undeploy and closing appclientOS is a caller responsibility. - + ap.log = new FileOutputStream(new File(getAppclientOutputDir(), appclientShortName + ".log-" + System.currentTimeMillis())); + @SuppressWarnings("resource") final OutputStream logOutputStreams = (appclientOS == null) ? ap.log : new TeeOutputStream(ap.log, appclientOS); printLogTrailer(logOutputStreams, appclientFullName); - + final ProcessBuilder pb = new ProcessBuilder().command(args); // always propagate IPv6 related properties final StringBuilder javaOptsValue = new StringBuilder(); @@ -179,7 +180,7 @@ throw e; } } - + private static void printLogTrailer(OutputStream logOutputStreams, String appclientFullName) { final PrintWriter pw = new PrintWriter(logOutputStreams); pw.write("Starting appclient process: " + appclientFullName + "...\n"); @@ -188,7 +189,7 @@ private static String undoIPv6Brackets(final String s) { - return s.startsWith("[") ? s.substring(1, s.length() - 1) : s; + return s.startsWith("[") ? s.substring(1, s.length() - 1) : s; } private static void shutdownAppclient(final String archive, final OutputStream os) throws IOException, InterruptedException @@ -214,7 +215,7 @@ int countOfAttempts = 0; final int maxCountOfAttempts = TIMEOUT * 2; // max wait time: default 2 minutes while (!os.toString().contains(patternToMatch)) - { + { Thread.sleep(500); if (countOfAttempts++ == maxCountOfAttempts) { @@ -223,7 +224,7 @@ } return true; } - + private static String getKillFileName(final String archive) { final int sharpIndex = archive.indexOf('#'); @@ -250,7 +251,7 @@ } return appclientOutputDir; } - + private static String getAppclientFullName(final String archive) { final int sharpIndex = archive.indexOf('#'); @@ -269,7 +270,7 @@ final int sharpIndex = archive.indexOf('#'); return archive.substring(0, sharpIndex); } - + // [JBPAPP-10027] appclient threads are always daemons (to don't block JVM shutdown) private static class AppclientDaemonFactory implements ThreadFactory { static final AppclientDaemonFactory INSTANCE = new AppclientDaemonFactory(); @@ -289,5 +290,5 @@ return t; } } - + }