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

Author: richard.opalka(a)jboss.com Date: 2012-09-26 00:52:13 -0400 (Wed, 26 Sep 2012) New Revision: 16764 Removed: common/trunk/src/main/java/org/jboss/ws/common/invocation/DefaultResourceInjectorFactory.java common/trunk/src/main/java/org/jboss/ws/common/invocation/WebServiceContextAdapter.java common/trunk/src/main/java/org/jboss/ws/common/invocation/WebServiceContextInjector.java common/trunk/src/main/java/org/jboss/ws/common/servlet/ Modified: common/trunk/ common/trunk/src/main/java/org/jboss/ws/common/spi/DefaultSPIProvider.java Log: [JBWS-3550] removing useless classes - svn merge -r 16755:16756 https://svn.jboss.org/repos/jbossws/common/branches/ropalka_JBWS-3550 Property changes on: common/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /common/branches/asoldano:14028-14056 + /common/branches/asoldano:14028-14056 /common/branches/ropalka_JBWS-3550:16756 Deleted: common/trunk/src/main/java/org/jboss/ws/common/invocation/DefaultResourceInjectorFactory.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/invocation/DefaultResourceInjectorFactory.java 2012-09-26 04:49:18 UTC (rev 16763) +++ common/trunk/src/main/java/org/jboss/ws/common/invocation/DefaultResourceInjectorFactory.java 2012-09-26 04:52:13 UTC (rev 16764) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.common.invocation; - -import org.jboss.wsf.spi.invocation.ResourceInjectorFactory; -import org.jboss.wsf.spi.invocation.ResourceInjector; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jul 19, 2007 - */ -public class DefaultResourceInjectorFactory extends ResourceInjectorFactory -{ - public ResourceInjector newResourceInjector() - { - return new WebServiceContextInjector(); - } -} Deleted: common/trunk/src/main/java/org/jboss/ws/common/invocation/WebServiceContextAdapter.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/invocation/WebServiceContextAdapter.java 2012-09-26 04:49:18 UTC (rev 16763) +++ common/trunk/src/main/java/org/jboss/ws/common/invocation/WebServiceContextAdapter.java 2012-09-26 04:52:13 UTC (rev 16764) @@ -1,61 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.common.invocation; - -import java.security.Principal; - -import javax.servlet.http.HttpServletRequest; -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.handler.MessageContext; - -import org.jboss.wsf.spi.invocation.WebServiceContextDelegate; - -/** - * Web service context which security related methods delegate to servlet container. - * - * @author alessio.soldano(a)jboss.com - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public final class WebServiceContextAdapter extends WebServiceContextDelegate -{ - - private final HttpServletRequest httpRequest; - - public WebServiceContextAdapter(final WebServiceContext ctx) - { - super(ctx); - httpRequest = (HttpServletRequest)ctx.getMessageContext().get(MessageContext.SERVLET_REQUEST); - } - - @Override - public Principal getUserPrincipal() - { - return httpRequest.getUserPrincipal(); - } - - @Override - public boolean isUserInRole(String role) - { - return httpRequest.isUserInRole(role); - } - -} Deleted: common/trunk/src/main/java/org/jboss/ws/common/invocation/WebServiceContextInjector.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/invocation/WebServiceContextInjector.java 2012-09-26 04:49:18 UTC (rev 16763) +++ common/trunk/src/main/java/org/jboss/ws/common/invocation/WebServiceContextInjector.java 2012-09-26 04:52:13 UTC (rev 16764) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.common.invocation; - -import javax.xml.ws.WebServiceContext; - -import org.jboss.ws.common.injection.InjectionHelper; -import org.jboss.wsf.spi.invocation.ResourceInjector; - -/** - * Inject the JAXWS WebServiceContext - * - * @author Thomas.Diesler(a)jboss.org - * @author ropalka(a)redhat.com - */ -public class WebServiceContextInjector extends ResourceInjector -{ - public void inject(Object instance, WebServiceContext context) - { - InjectionHelper.injectWebServiceContext(instance, context); - } -} Modified: common/trunk/src/main/java/org/jboss/ws/common/spi/DefaultSPIProvider.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/spi/DefaultSPIProvider.java 2012-09-26 04:49:18 UTC (rev 16763) +++ common/trunk/src/main/java/org/jboss/ws/common/spi/DefaultSPIProvider.java 2012-09-26 04:52:13 UTC (rev 16764) @@ -25,7 +25,6 @@ import org.jboss.ws.common.Messages; import org.jboss.ws.common.deployment.DefaultDeploymentModelFactory; import org.jboss.ws.common.deployment.DefaultLifecycleHandlerFactory; -import org.jboss.ws.common.invocation.DefaultResourceInjectorFactory; import org.jboss.ws.common.management.DefaultEndpointMetricsFactory; import org.jboss.ws.common.management.DefaultEndpointRegistryFactory; import org.jboss.ws.common.management.DefaultJMSEndpointResolver; @@ -34,7 +33,6 @@ import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.deployment.DeploymentModelFactory; import org.jboss.wsf.spi.deployment.LifecycleHandlerFactory; -import org.jboss.wsf.spi.invocation.ResourceInjectorFactory; import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; import org.jboss.wsf.spi.management.EndpointMetricsFactory; import org.jboss.wsf.spi.management.EndpointRegistryFactory; @@ -68,10 +66,6 @@ { returnType = loadService(spiType, DefaultLifecycleHandlerFactory.class, loader); } - else if (ResourceInjectorFactory.class.equals(spiType)) - { - returnType = loadService(spiType, DefaultResourceInjectorFactory.class, loader); - } else if (ServiceRefHandlerFactory.class.equals(spiType)) { returnType = loadService(spiType, DefaultServiceRefHandlerFactory.class, loader);